From 3c73f6ed3e04eefdc6c224ad1bbd3730400e1e11 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 24 Feb 2024 22:41:13 +0100 Subject: [PATCH 0001/3013] package/mongoose: bump to version 7.13 https://github.com/cesanta/mongoose/releases/tag/7.13 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/mongoose/mongoose.hash | 2 +- package/mongoose/mongoose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index ed5db5ebf68..716833eeed0 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 91e719e164816b349be3cb71293927f3f6abbe3fb02187e2d9b5e56f542c2063 mongoose-7.12.tar.gz +sha256 5c9dc8d1d1762ef483b6d2fbf5234e421ca944b722225bb533d2d0507b118a0f mongoose-7.13.tar.gz sha256 4ba646f5a7012d8b52f3a74398e446f56960dde0572f7241a2215430da5dd5a2 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 74594ff48cb..e2e3be790aa 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.12 +MONGOOSE_VERSION = 7.13 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE From 814f9f17d5c345f4c20ed3cca4873f7411db96d5 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 2 Mar 2024 12:16:55 +0100 Subject: [PATCH 0002/3013] package/quickjs: bump to version 2024-01-13 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/quickjs/quickjs.hash | 2 +- package/quickjs/quickjs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/quickjs/quickjs.hash b/package/quickjs/quickjs.hash index 916fb6e3a27..30613b982ad 100644 --- a/package/quickjs/quickjs.hash +++ b/package/quickjs/quickjs.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8afe386f875d0e52310ea91aa48e2b0e04182e821f19147794e3e272f4c8d8c quickjs-2023-12-09.tar.xz +sha256 3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03 quickjs-2024-01-13.tar.xz sha256 f41baf09eef895d468d18c23055d74f711e4b8b2641cef279b5d71285c07bfe8 LICENSE diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index 186397f9aa3..e745923b87b 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUICKJS_VERSION = 2023-12-09 +QUICKJS_VERSION = 2024-01-13 QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT From fa9e575776ee3d3d47a31fee3c09a94753c77cc7 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Mar 2024 23:03:36 +0100 Subject: [PATCH 0003/3013] package/pcre2: bump to version 10.43 diff LICENCE: update copyright dates Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/pcre2/pcre2.hash | 6 +++--- package/pcre2/pcre2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index f609bdaee29..f2e17df7535 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature: -# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig -sha256 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 pcre2-10.42.tar.bz2 +# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2.sig +sha256 e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb pcre2-10.43.tar.bz2 # Locally computed -sha256 87d884eceb7fc54611470ce9f74280d28612b0c877adfc767e9676892a638987 LICENCE +sha256 030087e2e8dd7c1bdd26057d25d4ded8f45bbf01ad458d68665ad04b8b0fbedf LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index c35056f8a26..9641f22e814 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.42 +PCRE2_VERSION = 10.43 PCRE2_SITE = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From 64b8cbc13cfd5f9d4863531ab768bf0afbc1f340 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Mar 2024 23:03:31 +0100 Subject: [PATCH 0004/3013] package/mc: bump to version 4.8.31 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/mc/mc.hash | 4 ++-- package/mc/mc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 93462afa60e..84ea4b2ac7a 100644 --- a/package/mc/mc.hash +++ b/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.30.sha256 -sha256 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df mc-4.8.30.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.31.sha256 +sha256 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a mc-4.8.31.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 2b4279c308c..a6c3e0bc845 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.30 +MC_VERSION = 4.8.31 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ From f7f03445cf320adbbc41270a806b38c911d3454a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:41:21 +0100 Subject: [PATCH 0005/3013] package/musl: bump to version 1.2.5 This release adds two new ports: loongarch64 and riscv32. The former is not supported in Buildroot, but the latter is, so it gets enabled in this commit. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/musl/Config.in | 2 +- package/musl/musl.hash | 4 ++-- package/musl/musl.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/musl/Config.in b/package/musl/Config.in index 89f41d2ff10..7fba85bcd94 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_MUSL_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_powerpc64 default y if BR2_powerpc64le - default y if BR2_RISCV_64 + default y if BR2_riscv default y if BR2_sh default y if BR2_x86_64 depends on !BR2_POWERPC_CPU_HAS_SPE # not supported, build breaks diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 3b5fccc9e28..b105320bace 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://musl.libc.org/releases/musl-1.2.4.tar.gz.asc -sha256 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 musl-1.2.4.tar.gz +# http://musl.libc.org/releases/musl-1.2.5.tar.gz.asc +sha256 a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4 musl-1.2.5.tar.gz sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 08706c139ff..783a103fcd1 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.2.4 +MUSL_VERSION = 1.2.5 MUSL_SITE = http://musl.libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT From ae910aac6298fb1d39c40ae8aa5a5b5fc52c97c4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:09 +0100 Subject: [PATCH 0006/3013] package/binutils: add support for 2.42 Note that the hash of the tarball does not need to be added, as it was already added as part of commit 11b439ce1bd28506051fff14646f8bbdbbbe58d8 ("package/binutils-bare-metal: new package"). Our existing 2 patches are simply rebased, with minor conflict resolution required. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: keep version list in strict version order] Signed-off-by: Yann E. MORIN --- package/binutils/2.42/0001-sh-conf.patch | 50 +++ .../2.42/0002-poison-system-directories.patch | 309 ++++++++++++++++++ package/binutils/Config.in.host | 4 + 3 files changed, 363 insertions(+) create mode 100644 package/binutils/2.42/0001-sh-conf.patch create mode 100644 package/binutils/2.42/0002-poison-system-directories.patch diff --git a/package/binutils/2.42/0001-sh-conf.patch b/package/binutils/2.42/0001-sh-conf.patch new file mode 100644 index 00000000000..c3810178500 --- /dev/null +++ b/package/binutils/2.42/0001-sh-conf.patch @@ -0,0 +1,50 @@ +From d71fb5a9999ee7c8963342caa0d5cbb16872ab07 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +Upstream: N/A [Buildroot specific] + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 670684d83d1..967c6708a0c 100755 +--- a/configure ++++ b/configure +@@ -4042,7 +4042,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 88b4800e298..2c8d08ff6ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1269,7 +1269,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.43.0 + diff --git a/package/binutils/2.42/0002-poison-system-directories.patch b/package/binutils/2.42/0002-poison-system-directories.patch new file mode 100644 index 00000000000..5c790999d4e --- /dev/null +++ b/package/binutils/2.42/0002-poison-system-directories.patch @@ -0,0 +1,309 @@ +From 00f6b0a7d31085831429834b2bc8f511b8fab6ce Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Waldemar: rebase on top of 2.39] +Signed-off-by: Waldemar Brodkorb +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] +Upstream: N/A [Buildroot specific] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 52d62f06ff0..b5944e7ba55 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -70,6 +70,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index ba1e5e2a215..2220d7afe2a 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -844,6 +844,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1534,6 +1535,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15587,7 +15590,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 4a11787ae71..104a531fb0f 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 54d9079678c..9f0163b2911 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -166,6 +166,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index 4fda259a552..11fd8f7547b 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -3108,6 +3108,18 @@ string identifying the original linked file does not change. + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. + ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. ++ + @kindex --package-metadata=@var{JSON} + @item --package-metadata=@var{JSON} + Request the creation of a @code{.note.package} ELF note section. The +diff --git a/ld/ldfile.c b/ld/ldfile.c +index dc9875d8813..49d899ee49d 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 161a9d4d8dc..4ca50b9c299 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -168,6 +168,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_EXECSTACK, + OPTION_NO_ERROR_EXECSTACK, + OPTION_WARN_EXECSTACK_OBJECTS, +diff --git a/ld/ldmain.c b/ld/ldmain.c +index e90c2021b33..43fe888eba8 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -325,6 +325,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 099dff8ecde..01626712c77 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -642,6 +642,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -654,6 +662,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1769,6 +1778,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1922,6 +1939,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.43.0 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 2f1ddf4bdc3..cc8dfa31d80 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -29,6 +29,9 @@ config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.41)" depends on BR2_arc +config BR2_BINUTILS_VERSION_2_42_X + bool "binutils 2.42" + endchoice config BR2_BINUTILS_VERSION @@ -37,6 +40,7 @@ config BR2_BINUTILS_VERSION default "2.39" if BR2_BINUTILS_VERSION_2_39_X default "2.40" if BR2_BINUTILS_VERSION_2_40_X default "2.41" if BR2_BINUTILS_VERSION_2_41_X + default "2.42" if BR2_BINUTILS_VERSION_2_42_X config BR2_BINUTILS_GPROFNG bool "gprofng support" From e88225ed8820881970ec33de7a15a1e0d50443da Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:10 +0100 Subject: [PATCH 0007/3013] package/binutils: make 2.41 the default version Now that 2.42 has been introduced, let's make 2.41 the latest version, following the traditional Buildroot policy. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index cc8dfa31d80..b6a2a2cd6cf 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -10,7 +10,7 @@ config BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_40_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_41_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 6846933646d..5209da0252b 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2023.09-release else -BINUTILS_VERSION = 2.40 +BINUTILS_VERSION = 2.41 endif endif # BINUTILS_VERSION From 3b33b26633833f506c009082b604dad36a42fae3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2024 11:30:08 +0100 Subject: [PATCH 0008/3013] support/config-fragments/autobuild/br-arm-internal-glibc: update to bleeding edge components As Thomas stated in 3bb260cf3860: The br-arm-internal-glibc.config is generally used as a configuration to test the bleeding edge versions of components. However, it has been lagging behind somewhat, so let's bring it up-to-date: - Binutils 2.42.x - GCC 13.x Let the fun begin in the autobuilders! Signed-off-by: Yann E. MORIN --- .../config-fragments/autobuild/br-arm-internal-glibc.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config index cd148f32e63..4986d409128 100644 --- a/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_BINUTILS_VERSION_2_39_X=y -BR2_GCC_VERSION_12_X=y +BR2_BINUTILS_VERSION_2_42_X=y +BR2_GCC_VERSION_13_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From f4187bd1ee99cb5561271bf8ebcd591ece1ef0a9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:11 +0100 Subject: [PATCH 0009/3013] package/binutils: drop support for binutils 2.39 Now that we have integrated support for binutils 2.42, and made binutils 2.41 the default, following our tradition, we can drop support for binutils 2.39. In addition to the usual things, there is an additional minor change in elf2flt.mk, which had a special condition applicable to binutils 2.39 or 2.40, which can be simplified to only apply to binutils 2.40 now. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 - Config.in.legacy | 6 + package/binutils/2.39/0001-sh-conf.patch | 48 --- .../2.39/0002-poison-system-directories.patch | 298 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 --- package/binutils/Config.in.host | 5 - package/binutils/binutils.hash | 1 - package/elf2flt/elf2flt.mk | 2 +- 8 files changed, 7 insertions(+), 406 deletions(-) delete mode 100644 package/binutils/2.39/0001-sh-conf.patch delete mode 100644 package/binutils/2.39/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch diff --git a/.checkpackageignore b/.checkpackageignore index a6cc58c448c..f5668c1992f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -195,9 +195,6 @@ package/berkeleydb/0001-cwd-db_config.patch Upstream package/berkeleydb/0002-atomic_compare_exchange.patch Upstream package/bind/0001-cross.patch Upstream package/bind/S81named Indent Shellcheck Variables -package/binutils/2.39/0001-sh-conf.patch Upstream -package/binutils/2.39/0002-poison-system-directories.patch Upstream -package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch Upstream package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch Upstream package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index a869279af78..94756a70ff4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_BINUTILS_VERSION_2_39_X + bool "binutils 2.39 has been removed" + select BR2_LEGACY + help + binutils 2.39 has been removed, use a newer version. + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/package/binutils/2.39/0001-sh-conf.patch b/package/binutils/2.39/0001-sh-conf.patch deleted file mode 100644 index fcc597e4d94..00000000000 --- a/package/binutils/2.39/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.32] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 3dd206525a7..6881ce632f5 100755 ---- a/configure -+++ b/configure -@@ -3892,7 +3892,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 797a624621e..1f9256bbf18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1175,7 +1175,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.31.1 - diff --git a/package/binutils/2.39/0002-poison-system-directories.patch b/package/binutils/2.39/0002-poison-system-directories.patch deleted file mode 100644 index 1d9447b5c26..00000000000 --- a/package/binutils/2.39/0002-poison-system-directories.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Waldemar: rebase on top of 2.39] -Signed-off-by: Waldemar Brodkorb -[Romain: rebase on top of 2.33.1] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff -Nur binutils-2.39.orig/ld/config.in binutils-2.39/ld/config.in ---- binutils-2.39.orig/ld/config.in 2022-08-05 11:56:56.000000000 +0200 -+++ binutils-2.39/ld/config.in 2022-08-11 13:00:55.310472243 +0200 -@@ -55,6 +55,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff -Nur binutils-2.39.orig/ld/configure binutils-2.39/ld/configure ---- binutils-2.39.orig/ld/configure 2022-08-05 11:56:54.000000000 +0200 -+++ binutils-2.39/ld/configure 2022-08-11 13:00:55.370470806 +0200 -@@ -836,6 +836,7 @@ - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1514,6 +1515,8 @@ - --enable-checking enable run-time checks - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15370,7 +15373,18 @@ - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff -Nur binutils-2.39.orig/ld/configure.ac binutils-2.39/ld/configure.ac ---- binutils-2.39.orig/ld/configure.ac 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/configure.ac 2022-08-11 13:00:55.370470806 +0200 -@@ -102,6 +102,16 @@ - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff -Nur binutils-2.39.orig/ld/ldfile.c binutils-2.39/ld/ldfile.c ---- binutils-2.39.orig/ld/ldfile.c 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ldfile.c 2022-08-11 13:00:55.394470231 +0200 -@@ -117,6 +117,23 @@ - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff -Nur binutils-2.39.orig/ld/ld.h binutils-2.39/ld/ld.h ---- binutils-2.39.orig/ld/ld.h 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ld.h 2022-08-11 13:00:55.382470519 +0200 -@@ -162,6 +162,14 @@ - in the linker script. */ - bool force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bool poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bool error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff -Nur binutils-2.39.orig/ld/ldlex.h binutils-2.39/ld/ldlex.h ---- binutils-2.39.orig/ld/ldlex.h 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ldlex.h 2022-08-11 13:03:35.462636396 +0200 -@@ -164,6 +164,8 @@ - OPTION_CTF_VARIABLES, - OPTION_NO_CTF_VARIABLES, - OPTION_CTF_SHARE_TYPES, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - OPTION_WARN_EXECSTACK, - OPTION_NO_WARN_EXECSTACK, - OPTION_WARN_RWX_SEGMENTS, -diff -Nur binutils-2.39.orig/ld/ldmain.c binutils-2.39/ld/ldmain.c ---- binutils-2.39.orig/ld/ldmain.c 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ldmain.c 2022-08-11 13:00:55.402470040 +0200 -@@ -321,6 +321,8 @@ - command_line.warn_mismatch = true; - command_line.warn_search_mismatch = true; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = true; -+ command_line.error_poison_system_directories = false; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff -Nur binutils-2.39.orig/ld/ld.texi binutils-2.39/ld/ld.texi ---- binutils-2.39.orig/ld/ld.texi 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ld.texi 2022-08-11 13:02:44.627853889 +0200 -@@ -2936,6 +2936,18 @@ - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. - -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. -+ - @kindex --package-metadata=@var{JSON} - @item --package-metadata=@var{JSON} - Request the creation of a @code{.note.package} ELF note section. The -diff -Nur binutils-2.39.orig/ld/lexsup.c binutils-2.39/ld/lexsup.c ---- binutils-2.39.orig/ld/lexsup.c 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/lexsup.c 2022-08-11 13:00:55.434469274 +0200 -@@ -608,6 +608,14 @@ - " is: share-unconflicted (default),\n" - " share-duplicated"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -620,6 +628,7 @@ - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1679,6 +1688,14 @@ - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = false; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = true; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1824,6 +1841,10 @@ - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = true; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.31.1 diff --git a/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index bfd531b8185..00000000000 --- a/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.31.1 - diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index b6a2a2cd6cf..b6b1c56b5f1 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -15,10 +15,6 @@ choice help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_39_X - bool "binutils 2.39" - select BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME - config BR2_BINUTILS_VERSION_2_40_X bool "binutils 2.40" @@ -37,7 +33,6 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2023.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.39" if BR2_BINUTILS_VERSION_2_39_X default "2.40" if BR2_BINUTILS_VERSION_2_40_X default "2.41" if BR2_BINUTILS_VERSION_2_41_X default "2.42" if BR2_BINUTILS_VERSION_2_42_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index e4c6a0b0b66..ac724d5c158 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,5 +1,4 @@ # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 0def282c025..aa5595843ff 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -23,7 +23,7 @@ HOST_ELF2FLT_AUTORECONF = YES # considered because Buildroot only supports ARC CPUs with a MMU and # therefore host-elf2flt is never used on ARC. libiberty.a has # remained at the same location. -ifeq ($(BR2_BINUTILS_VERSION_2_39_X)$(BR2_BINUTILS_VERSION_2_40_X),y) +ifeq ($(BR2_BINUTILS_VERSION_2_40_X),y) HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/libbfd.a else HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/.libs/libbfd.a From e1f9c988080097de02762e53ad57a9376e68066c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:12 +0100 Subject: [PATCH 0010/3013] package/binutils: drop BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME Now that binutils 2.39 is gone, we can drop BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME, which was only used for binutils 2.39. This was a blind option, so Config.in.legacy handling is not needed. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/binutils/Config.in.host | 3 --- package/binutils/binutils.mk | 8 +------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index b6b1c56b5f1..cb65f5f5e4c 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -5,9 +5,6 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI default y depends on !BR2_microblaze -config BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME - bool - choice prompt "Binutils Version" default BR2_BINUTILS_VERSION_2_41_X if !BR2_arc diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 5209da0252b..d98dd7b8309 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -105,19 +105,13 @@ endif # our TARGET_CONFIGURE_ARGS are taken into consideration for those BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) -ifeq ($(BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME),) -define BINUTILS_INSTALL_STAGING_LIBSFRAME - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libsframe DESTDIR=$(STAGING_DIR) install -endef -endif - # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging define BINUTILS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install - $(BINUTILS_INSTALL_STAGING_LIBSFRAME) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libsframe DESTDIR=$(STAGING_DIR) install endef # If we don't want full binutils on target From 57008d384bc1f2e42d6add6cd73203e11a75d6c9 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sun, 3 Mar 2024 11:19:13 -0400 Subject: [PATCH 0011/3013] package/iozone: bump to version 3.506 - Upstream archive moved back to tar from tgz - For change log, see end of file: https://www.iozone.org/src/current/Changes.txt Signed-off-by: Gilles Talis Reviewed-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/iozone/iozone.hash | 3 ++- package/iozone/iozone.mk | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 9ecf1d1af85..936ab5a6469 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz +sha256 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 iozone3_506.tar +sha256 bff7909fd698708d15613a4fb977a193cff98f44ef170c2dc1dd502974df75b2 docs/License.txt diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2df4a2aa84d..b1b29d1098f 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,12 +4,11 @@ # ################################################################################ -IOZONE_VERSION = 3.493 -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz +IOZONE_VERSION = 3.506 +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) -# IOzone license details can be found at: -# http://www.iozone.org/docs/Iozone_License.txt +IOZONE_LICENSE_FILES = docs/License.txt # AIO support not available on uClibc, use the linux (non-aio) target. ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From e8545ee43923242c74a5ebbb7ef1b8857ae90550 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 10:58:03 +0100 Subject: [PATCH 0012/3013] package/python-uvicorn: bump to 0.27.1 Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0271---2024-02-10 Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index c7feaf3bfe6..773995ab9de 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz -sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz +md5 98f40515e34fb49e9d2842b6a147acec uvicorn-0.27.1.tar.gz +sha256 3d9a267296243532db80c83a959a3400502165ade2c1338dea4e67915fd4745a uvicorn-0.27.1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 502cc06ad87..899b9660f66 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.27.0.post1 +PYTHON_UVICORN_VERSION = 0.27.1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/09/d8/8aa69c76585035ca81851d99c3b00fd6be050aefd478a5376ff9fc5feb69 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md From bd172e52e7f4d1a0fab860478bd8aba47cf1befd Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 12 Feb 2024 18:04:20 -0800 Subject: [PATCH 0013/3013] package/xz: bump version to 5.4.6 Change Log - https://github.com/tukaani-project/xz/commit/0ef8192e8d5af4e6200d5d4aee22d1f177f7a2df COPYING is updated with the new URL (tukaani.org -> github). Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- package/xz/xz.hash | 6 +++--- package/xz/xz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3d93ad6b5ee..e8025a80650 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,9 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.4.5.tar.bz2.sig -sha256 8ccf5fff868c006f29522e386fb4c6a1b66463fbca65a4cfc3c4bd596e895e79 xz-5.4.5.tar.bz2 +# https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.bz2.sig +sha256 913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49 xz-5.4.6.tar.bz2 # Hash for license files -sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING +sha256 29a1e305b2e34eefe5d4602d00cde1d528b71c5d9f2eec5106972cf6ddb6f73f COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 547959c743d..40fa59ca7c6 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,9 +4,9 @@ # ################################################################################ -XZ_VERSION = 5.4.5 +XZ_VERSION = 5.4.6 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = https://tukaani.org/xz +XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ From 47b6737e841baf8b666ea9f37edc5f169652e88d Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 12 Feb 2024 18:17:44 -0800 Subject: [PATCH 0014/3013] package/zlib-ng: bump version to 2.1.6 Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index a2fe98435c9..908164aa60f 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a zlib-ng-2.1.3.tar.gz +sha256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 zlib-ng-2.1.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index 33e8754c9d2..c9d022da3ef 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 2.1.3 +ZLIB_NG_VERSION = 2.1.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md From 4308c270a7ee4300e29e39d9d7f1de91179679ba Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 12 Feb 2024 20:42:19 -0800 Subject: [PATCH 0015/3013] package/hwdata: bump version to 0.379 Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 6915e04e46d..92b7eaab6d8 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0db28dc635d5059ad23d068d2e56ef5dc540f95bc813ea5a3c0f5d63b03d20d6 hwdata-0.373.tar.gz +sha256 b98ef646d530d5fd3afa3180efbf7c8e22d3da0088f5836f41ee25380d87b092 hwdata-0.379.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 025f5b49691..555fb58f143 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.373 +HWDATA_VERSION = 0.379 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From 2ce680b991d390a75990e7cb1a55acc9ace7ae81 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 10:40:15 +0100 Subject: [PATCH 0016/3013] package/python-jc: new package All dependencies are optional, and thus only mentioned in the package help text. Signed-off-by: Marcus Hoffmann [Arnout: - add to DEVELOPERS; - add BSD-3-Clause license for vendored pbPlist. ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-jc/Config.in | 12 ++++++++++ package/python-jc/python-jc.hash | 5 +++++ package/python-jc/python-jc.mk | 14 ++++++++++++ .../testing/tests/package/test_python_jc.py | 22 +++++++++++++++++++ 6 files changed, 55 insertions(+) create mode 100644 package/python-jc/Config.in create mode 100644 package/python-jc/python-jc.hash create mode 100644 package/python-jc/python-jc.mk create mode 100644 support/testing/tests/package/test_python_jc.py diff --git a/DEVELOPERS b/DEVELOPERS index 0bfe91f064a..a6364cdd441 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2092,6 +2092,7 @@ F: utils/config F: utils/diffconfig N: Marcus Hoffmann +F: package/python-jc/ F: support/testing/tests/package/test_python_fastapi.py F: support/testing/tests/package/sample_python_fastapi.py diff --git a/package/Config.in b/package/Config.in index bf0fe078b95..bbcc5b57749 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1150,6 +1150,7 @@ menu "External python modules" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-functools/Config.in" + source "package/python-jc/Config.in" source "package/python-jedi/Config.in" source "package/python-jeepney/Config.in" source "package/python-jinja2/Config.in" diff --git a/package/python-jc/Config.in b/package/python-jc/Config.in new file mode 100644 index 00000000000..b88150e0691 --- /dev/null +++ b/package/python-jc/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_JC + bool "python-jc" + help + Converts the output of popular command-line tools and file- + types to JSON. + + Optionally requires python-pygments for syntax highlighting, + python-ruamel-yaml for yaml parsing and output and + python-xmltodict for xml parsing. PYTHON3_PYEXPAT is required + for xml and plist parsers. + + https://github.com/kellyjonbrazil/jc diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash new file mode 100644 index 00000000000..f54e69eaeba --- /dev/null +++ b/package/python-jc/python-jc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jc/json +md5 80e4c7d46ec856255577c6b364e7f931 jc-1.25.1.tar.gz +sha256 683352e903ece9a86eae0c3232188e40178139e710c740a466ef91ed87c4cc7e jc-1.25.1.tar.gz +# Locally computed sha256 checksums +sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk new file mode 100644 index 00000000000..ec8826d1c20 --- /dev/null +++ b/package/python-jc/python-jc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jc +# +################################################################################ + +PYTHON_JC_VERSION = 1.25.1 +PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/53/a6/065f0796a0a21bc040bc88c8a33410c12729a2a6f4c269d0349f685796da +PYTHON_JC_SETUP_TYPE = setuptools +PYTHON_JC_LICENSE = MIT, BSD-3-Clause (bundled pbPlist) +PYTHON_JC_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_jc.py b/support/testing/tests/package/test_python_jc.py new file mode 100644 index 00000000000..974ce0c4b08 --- /dev/null +++ b/support/testing/tests/package/test_python_jc.py @@ -0,0 +1,22 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Jc(TestPythonPackageBase): + __test__ = True + # We deliberately run the test without the optional dependencies, + # as this configuration is less tested upstream. + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_JC=y + """ + timeout = 60 + + def test_run(self): + self.login() + cmd = "jc -h > /dev/null 2>&1" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc id | grep -q root" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc env | grep -q PATH" + self.assertRunOk(cmd, self.timeout) From c5c15b606bb56a4ff77cd935de8cccb01202ddda Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 5 Mar 2024 16:16:25 +0100 Subject: [PATCH 0017/3013] docs/website/news.html: add 2024.02 announcement link And fix the s/2023/2024 typo in the title. Signed-off-by: Peter Korsgaard --- docs/website/news.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/website/news.html b/docs/website/news.html index a51da7f4bb7..4d19605e8b9 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -13,14 +13,15 @@

News

-

2023.02 released

+

2024.02 released

5 March 2024

The stable 2024.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2024.02 release.

From 38b9fee944c05191f086b62238e8a73558db1f38 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 5 Mar 2024 16:17:28 +0100 Subject: [PATCH 0018/3013] Kickoff 2024.05 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6d5e9a79722..91973cca606 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02 +export BR2_VERSION := 2024.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1709640000 From a94f816e4595e651e78eebfa49fa695cfe44cd77 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 5 Mar 2024 16:34:54 -0800 Subject: [PATCH 0019/3013] package/go: security bump to go1.21.8 Fixes the following CVEs: CVE-2024-24783: crypto/x509: Verify panics on certificates with an unknown public key algorithm CVE-2023-45290: net/http: memory exhaustion in Request.ParseMultipartForm CVE-2023-45289: net/http, net/http/cookiejar: incorrect forwarding of sensitive headers and cookies on HTTP redirect CVE-2024-24785: html/template: errors returned from MarshalJSON methods may break template escaping CVE-2024-24784: net/mail: comments in display names are incorrectly handled https://go.dev/doc/devel/release#go1.21.8 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index d008019e94b..b1aed10c7c4 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 go1.21.7.src.tar.gz +sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 9efd4a3123e..3ca055b25d7 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.7 +GO_VERSION = 1.21.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 2695f48ead67e951668d20240dbb9ad122d20f1d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:59:20 +0100 Subject: [PATCH 0020/3013] package/ell: bump to version 0.63 https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.63 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 8bc61ee293a..f5ded676c3d 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0 ell-0.61.tar.xz +sha256 7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965 ell-0.63.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 300c1eee885..f43dbdb5f7e 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.61 +ELL_VERSION = 0.63 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From e2bcdcdd109561780e5e419ccaa3ca5135fa7b3e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:59:21 +0100 Subject: [PATCH 0021/3013] package/iwd: security bump to version 2.16 Fix CVE-2023-52161: The Access Point functionality in eapol_auth_key_handle in eapol.c in iNet wireless daemon (IWD) before 2.14 allows attackers to gain unauthorized access to a protected Wi-Fi network. An attacker can complete the EAPOL handshake by skipping Msg2/4 and instead sending Msg4/4 with an all-zero key. https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 4eea644842c..3f18146e133 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 f7ac93aeef672604f5b5194ca038035ae222925be392c4345873c9742f477797 iwd-2.6.tar.xz +sha256 c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba iwd-2.16.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index f20427114b5..af6b2f849a7 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.6 +IWD_VERSION = 2.16 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From 1c2dbcdcf0bb589d325c379246acaa39bb07b7be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:21:48 +0100 Subject: [PATCH 0022/3013] package/libcgroup: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from ../include/libcgroup/error.h:9, from ../include/libcgroup.h:21, from log.c:15: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround is there since the addition of the package in commit ff7191c12e88b044848f6655f7015335235bdc7a and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcgroup/libcgroup.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index cfe1d0f9f86..28f572d3256 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -12,13 +12,6 @@ LIBCGROUP_CPE_ID_VALID = YES LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 -# for more information. -LIBCGROUP_CONF_ENV = \ - CXXFLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" - LIBCGROUP_CONF_OPTS = \ --disable-daemon \ --disable-initscript-install From 85acd9b5b9b46808749d1618b26789c782cc81a0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:47:46 +0100 Subject: [PATCH 0023/3013] package/restorecond: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/fts.h:53, from restore.h:6, from restore.c:1: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was there since the addititon of the package in commit 9d6da7a264a5b36ad641a0d26b3a3d27188d3624 and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/restorecond/restorecond.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index cd409052305..96ef8d2a507 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -11,13 +11,8 @@ RESTORECOND_LICENSE_FILES = LICENSE RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information RESTORECOND_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ ARCH="$(BR2_ARCH)" # We need to pass DESTDIR at build time because it's used by From 0ac2d5a41ad776b493e6b0c44c760968a28ec81e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:57:24 +0100 Subject: [PATCH 0024/3013] package/policycoreutils: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/errno.h:25, from pp.c:20: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was there since the addition of the package in commit cb328f77f8f07bfd89d6b69385c941a7b281732b and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/policycoreutils/policycoreutils.mk | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 61d91066d40..0e639760fa6 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -11,7 +11,7 @@ POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) -POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) +POLICYCOREUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam @@ -28,14 +28,6 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy) POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y endif -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -POLICYCOREUTILS_MAKE_OPTS += \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" - POLICYCOREUTILS_MAKE_DIRS = \ load_policy newrole run_init \ secon semodule sestatus setfiles \ @@ -59,14 +51,9 @@ endef HOST_POLICYCOREUTILS_DEPENDENCIES = host-libsemanage -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -# We also need to pass PREFIX because it defaults to $(DESTDIR)/usr +# We need to pass PREFIX because it defaults to $(DESTDIR)/usr HOST_POLICYCOREUTILS_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \ PREFIX=$(HOST_DIR) \ ETCDIR=$(HOST_DIR)/etc \ SBINDIR=$(HOST_DIR)/sbin From c944f455adf9730b1c72e70cf5b5e14a64a470be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 13:52:56 +0100 Subject: [PATCH 0025/3013] package/botan: fix build without NPTL botan unconditionally uses pthread_setname_np since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 and https://github.com/randombit/botan/commit/313e439c786d68bcf374b2cb0edfe3ffd891db94 resulting in the following build failure: src/lib/utils/os_utils.cpp:625:22: error: 'pthread_setname_np' was not declared in this scope 625 | static_cast(pthread_setname_np(thread.native_handle(), name.c_str())); | ^~~~~~~~~~~~~~~~~~ So only enable threads if NPTL is available Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/03677de6270ff5de61fff2a76e5cd723aa34e64e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/botan/Config.in | 5 ++--- package/botan/botan.mk | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/botan/Config.in b/package/botan/Config.in index 5c3f31726eb..c74128bb9d3 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_BOTAN bool "botan" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 - depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -24,7 +23,7 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ C++, threads, gcc >= 10" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ +comment "botan needs a toolchain w/ C++, gcc >= 10" + depends on !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 88dbfa58072..95352ea41b1 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -48,6 +48,12 @@ else BOTAN_CONF_OPTS += --without-stack-protector endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) +BOTAN_CONF_OPTS += --with-os-feature=threads +else +BOTAN_CONF_OPTS += --without-os-feature=threads +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif From 2824aa8a23a765b660219c129d4980f1b7c7691c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:40:03 +0100 Subject: [PATCH 0026/3013] package/php: add libucontext optional dependency Select libucontext if the toolchain doesn't support ucontext to allow building php on musl Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/php/Config.in | 3 +++ package/php/php.mk | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/package/php/Config.in b/package/php/Config.in index 69b4268c1d4..af8574ac754 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_PHP_ARCH_SUPPORTS default y if BR2_RISCV_64 default y if BR2_s390x default y if BR2_TOOLCHAIN_HAS_UCONTEXT + default y if BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS config BR2_PACKAGE_PHP bool "php" @@ -25,6 +26,8 @@ config BR2_PACKAGE_PHP BR2_USE_MMU select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_LIBUCONTEXT if \ + BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS help PHP is a widely-used general-purpose scripting language that is especially suited for Web development diff --git a/package/php/php.mk b/package/php/php.mk index 4daf7f633dc..28893be4c64 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -40,6 +40,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PHP_EXTRA_LIBS += -latomic endif +ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) +PHP_DEPENDENCIES += libucontext +PHP_EXTRA_LIBS += -lucontext +endif + ifeq ($(call qstrip,$(BR2_TARGET_LOCALTIME)),) PHP_LOCALTIME = UTC else From 5fb79cad04d73f18a5a1316152573ac1abc2b06d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 12:47:10 +0100 Subject: [PATCH 0027/3013] package/iozone: fix uclibc build Fix the following uclibc build failure raised since bump to version 3.506 in commit 57008d384bc1f2e42d6add6cd73203e11a75d6c9: /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/12.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: iozone_linux-noaio.o: in function `read_perf_test': iozone.c:(.text+0x11a74): undefined reference to `end_async' Fixes: - http://autobuild.buildroot.org/results/31a4f0ac9eeb71df5d2f40ffe9f1f256cb58e399 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../iozone/0002-fix-build-without-aio.patch | 176 ++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 package/iozone/0002-fix-build-without-aio.patch diff --git a/package/iozone/0002-fix-build-without-aio.patch b/package/iozone/0002-fix-build-without-aio.patch new file mode 100644 index 00000000000..8b54bef4e1d --- /dev/null +++ b/package/iozone/0002-fix-build-without-aio.patch @@ -0,0 +1,176 @@ +Fix build without ASYNC_IO + +Fix the following build failure without ASYNC_IO: + +/home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/12.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: iozone_linux-noaio.o: in function `read_perf_test': +iozone.c:(.text+0x11a74): undefined reference to `end_async' + +Fixes: + - http://autobuild.buildroot.org/results/31a4f0ac9eeb71df5d2f40ffe9f1f256cb58e399 + +Signed-off-by: Fabrice Fontaine +Upstream: sent to capps@iozone.org + +diff '--color=auto' -Nura iozone3_506.orig/src/current/iozone.c iozone3_506/src/current/iozone.c +--- iozone3_506.orig/src/current/iozone.c 2024-03-06 12:28:16.734023725 +0100 ++++ iozone3_506/src/current/iozone.c 2024-03-06 12:39:14.453991162 +0100 +@@ -9153,6 +9153,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -9160,6 +9161,7 @@ + end_async(gc); + gc=0; + } ++#endif + buffer1=0; + if(hist_summary) + { +@@ -9634,6 +9636,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -9641,6 +9644,7 @@ + end_async(gc); + gc=0; + } ++#endif + if(rlocking) + { + lock_offset=I_LSEEK(fd,0,SEEK_CUR); +@@ -10097,6 +10101,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -10104,6 +10109,7 @@ + end_async(gc); + gc=0; + } ++#endif + if(rlocking) + { + mylockr((int) fd, (int) 0, (int)1, +@@ -10749,6 +10755,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -10756,6 +10763,7 @@ + end_async(gc); + gc=0; + } ++#endif + + /* This is a bit tricky. The goal is to read with a stride through + the file. The problem is that you need to touch all of the file +@@ -15485,6 +15493,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -15492,6 +15501,7 @@ + end_async(gc); + gc=0; + } ++#endif + read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -16050,6 +16060,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -16057,6 +16068,7 @@ + end_async(gc); + gc=0; + } ++#endif + read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -16665,6 +16677,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -16672,6 +16685,7 @@ + end_async(gc); + gc=0; + } ++#endif + re_read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -17244,6 +17258,7 @@ + lock_offset, reclen); + } + current_position+=reclen; ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -17251,6 +17266,7 @@ + end_async(gc); + gc=0; + } ++#endif + t_offset = (off64_t)reclen*2; + if (!(h_flag || k_flag || mmapflag)) + { +@@ -17778,6 +17794,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -17785,6 +17802,7 @@ + end_async(gc); + gc=0; + } ++#endif + if(current_position + (stride * reclen) >= (numrecs64 * reclen)-reclen) + { + current_position=0; +@@ -18528,6 +18546,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -18535,6 +18554,7 @@ + end_async(gc); + gc=0; + } ++#endif + ranread_so_far+=reclen/1024; + if(*stop_flag) + { From b8db5c466046dc2f3d9c411e6c9924667dd1a40c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 13:18:23 +0100 Subject: [PATCH 0028/3013] package/squid: needs gcc and host gcc >= 8 cf_gen.cc is compiled by host compiler and unconditionally uses auto since bump to version 6.6 in commit c13199c9326fa2daa574f08ec8fc063a48d0eb06 and https://github.com/squid-cache/squid/commit/09835feb258c3058d028918e36d959dccb3f7496 resulting in the following build failure with host gcc < 8: /usr/bin/g++ -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src ./cf_gen.cc: In function 'int main(int, char**)': ./cf_gen.cc:268:63: error: forming reference to void auto &newEntry = entries.emplace_back(name); ^ So add a dependency on host gcc >= 8 and gcc >= 8 as advocated by upstream in https://github.com/squid-cache/squid/blob/9d3433c4ac6cd547c10cf298b8a5e61a463fb753/doc/release-notes/release-6.sgml.in: This release adds a dependency on C++17 support in any compiler used to build Squid. GCC 8+ and Clang 8+ support C++17. While at it, drop BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is always false with gcc >= 7 Fixes: c13199c9326fa2daa574f08ec8fc063a48d0eb06 - http://autobuild.buildroot.org/results/f1766d1a3b2ce7745fa23cdeae1101806cd97aea Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/squid/Config.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 89b5a377c77..149884d8150 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,18 +1,18 @@ -comment "squid needs a toolchain w/ C++, threads, gcc >= 7 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP From 6b56e0b4f09b36140e2cb9e41072d5ac6074f375 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 20:26:04 +0100 Subject: [PATCH 0029/3013] linux: disable -Werror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable -Werror to fix the following build failure with esp-hosted raised at least since commit a382a7d55432918d2a1e47ae4cbe7ed50fa17a08: In function ‘destroy_cmd_wq’, inlined from ‘esp_commands_teardown’ at /home/autobuild/autobuild/instance-4/output-1/build/esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404/esp_hosted_ng/host/esp_cmd.c:1467:2: ./include/linux/workqueue.h:639:9: error: call to ‘__warn_flushing_systemwide_wq’ declared with attribute warning: Please avoid flushing system-wide workqueues. [-Werror=attribute-warning] 639 | __warn_flushing_systemwide_wq(); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/autobuild/autobuild/instance-4/output-1/build/esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404/esp_hosted_ng/host/esp_cmd.c:408:17: note: in expansion of macro ‘flush_scheduled_work’ 408 | flush_scheduled_work(); | ^~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/6ac7a4601938d3296ed1657c06f8cdf433757d73 - http://autobuild.buildroot.org/results/7997cc8a67645a6e1cf4e24d172c6feae459dcfb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- linux/linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/linux.mk b/linux/linux.mk index 53e2ad6d488..4e12b36c1fd 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -436,6 +436,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO) $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224)) $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) + $(call KCONFIG_DISABLE_OPT,CONFIG_WERROR) $(PACKAGES_LINUX_CONFIG_FIXUPS) endef From 31abe2f6a9f5787e8ddb9ce9353b2ea72466be4c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:45:40 -0800 Subject: [PATCH 0030/3013] package/docker-compose: bump version to 2.24.7 https://github.com/docker/compose/releases/tag/v2.24.7 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 92f7b227d3c..ca3d08cf636 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed132bcc226261a595469f5ca6d4ea20b02965867216b56d4e7a5962efb46570 docker-compose-2.24.5.tar.gz +sha256 931bfcc34eb43106be07787372bb853d4cd82830a5785f3049c5192ab0e4ac35 docker-compose-2.24.7.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 947f09d0b3d..5417ba2d4f3 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.24.5 +DOCKER_COMPOSE_VERSION = 2.24.7 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 45a3a8bd5a26953d4f5419fda7079fa0608dd43f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 11 Feb 2024 23:27:05 +0100 Subject: [PATCH 0031/3013] package/util-linux: bump to version 2.39.3 Fixes: http://autobuild.buildroot.net/results/623/623b21e29693e1de8945cb25e258488f06e6040e/ Changes between 2.39.2 and 2.39.3: 2da5c904e18fdcffd2b252d641e6f76374c7b406 build-sys: release++ (v2.39.3) 03c939edda81c5a4d6e5f5c1cb896e79c1e82e16 docs: update v2.39.3-ReleaseNotes dafb120ef79c878cfd1b65c1d1c46497f17a7f7e docs: update AUTHORS file bfc9691ce5d964b87f6c02cc236361b4772456d0 po-man: merge changes d2232b60963a6e4e43fd359d1a4b552c4291b327 po: merge changes 4ab356c1c02c34cd3935e1bb0aa47ed6e27cfe3c po: add ro.po (from translationproject.org) 7e147d16c06f14b3f760b620d4f359cef12fe4ad po: update es.po (from translationproject.org) e8cb61f07430d5f1d624245a219c2e21694c5f52 lsfd: fix memory leak in append_filter_expr() 192d8aaa07e088e44fcb78736a53baae1ead7ccd lsfd: avoid undefined behavior 756588f8c8b2ed93c124ca15cfb3f0efc4a0f9f6 lsfd: (man) fix the form for the optional argument of --inet option 8d78c1306d1a9d5ebf9ec058344685da0360b87b Add Phytium FTC310 & FTC664 support b75322cdb13c6c0b3789ff8fc19dcd017c069784 Add Phytium FTC862 cpu model. fix:#2486 ec1b0eb36bd6c5a5079293ab03241163f61a8bf4 libmount: accept '\' as escape for options separator 2e5f5c8d85338811595d321a77647a40e12321c9 tests: add ts_skip_docker 0b3254cac3a275bbe32af57c6037cd29c21324d7 Merge branch 'stable-2.39/bcachefs-fixes' of https://github.com/t-8ch/util-linux into PR/stable-v2.39.3 6498439340a16e6acee54987df016c6b7928b17a tests: skip broken tests on docker fa9b5365861934faab9ba73bd405095f56f02e45 libblkid: (bcachefs) add support for sub-device labels 3c5d991b0323b33816e661e52da5d6f5402f47b5 libblkid: (bcachefs) adapt to major.minor version ece194082fb318d0fa3fec31193ce6f61b97c67a libuuid: avoid truncate clocks.txt to improve performance 84a62c1a5a614bde2530544bf2558c73f0179d42 libuuid/src/gen_uuid.c: fix cs_min declaration 93239aa7869ddd236db8e5a28b4e6873ce6e0f22 libmount: fix possible NULL dereference [coverity scan] a6def815e21d50db7a99ec74080c3fd7eb64e934 meson: install wall executable with group 'tty' c6c1c69c3e83606eced938d841af03c1acef03a0 meson: install write executable with group 'tty' bf2cd1d5a6eb273fbb11931b86ae165e7da5a397 libmount: improve mnt_table_next_child_fs() c14f5bf37adf681c378fc004f0996e0bcfd30ce0 docs: add SPDX to boilerplate.c fdd9f11f5e38b044617d3bc5f6c00789096b233f disk-utils: add SPDX and Copyright notices e7dbe9c788da98b86f8cf87bc20ec74e32206451 include/audit-arch: add missing SPDX 5ec7b14a72d9893d2a8d8c7f40cd45b44c9575c9 setterm: avoid restoring flags from uninitialized memory 64d2300e6443c311219f187433046751a86ed18e Fix man page for col to correct documentation error 7cc2c962567fe40daa9b12481224e5a0e6f96c47 Update col.c to fix option mistake 122d7e7afb44d8a823e362673b0d2d1e31f7d478 umount: handle bindmounts during --recursive da18b31ff1cb504e3d288f77d1f1d1179c39e4d8 lscpu: fix caches separator for --parse= 3a5c9c1dd6935fb16f15f210b80ce9c5228e6a19 Use empty libuser config file. 7058d793def09c3d4645e9efd1d8a5d212e839b0 libblkid: exfat: fix fail to find volume label d065ff00a36b7244842f743372099837bc61328b blkpr: store return value of getopt_long in int 9ca6f1712a5803e32e26e065e32e99837ba8b5d2 lib/path: Set errno in case of fgets failure e2f0aa5c25c0295ef6187d3c53c2801fe17385e5 autotools: fix AC_DEFINE_UNQUOTED() use cefd05c479e5456af8db2a86fabad165d247176b autotools: fix librtas check f27fbafb24bdcefaa2463d47abc18491c3497451 lib/path: fix typos f8ab70477e2ca7ac050fd4e2337b76a1972c8aa3 lib/path: set errno in case of error 5ec30a362a5dd91c018c04a64fd1a481029dc4c6 lib/path: fix possible out of boundary access edc723cd3341ff3d3e660051525dca40a2af6b3b libblkid: reset errno before calling probefuncs 8de89778b945d552796f09576925310810ce798b setpriv: fix group argument completion 41599054c7248f12c8a54d02f7161d0aff4275a9 libfdisk: reset errno before calling read() cce4e44059405f3170b166fbf1774bf4b89c11c4 blkid: fix call to err_exclusive_options b718f985cb6cc3bc65618649e9f231ecafcf81fb docs: use HTTPS for GitHub clone URLs 2bddfa6928af328675b2ffbfc9b6546e9ee81722 libblkid: (probe) handle probe without chain gracefully 3d31216787d6725fed361d27f0f01aff6ef46981 lib/idcache: always gracefully handle null cache 368521e45e1c9cb44145fc72c04d1cc903a883e8 script-playutils: close filestream in case ignore_line() fails 087b0d2383b8ab1ee4564d692d5f797ac781896f libblkid: (vxfs) report endianness 7e5056f33bdfd867ce6f1a642f560fdf0b402c1e libblkid: (ntfs) validate that sector_size is a power of two f368ccc759f9684338da723a93449764d0a8e312 libsmartcols: handle nameless tables in export format f5cace8da07291c94b76b5cf80da1f921be67419 ldattach: don't call exit() from signal handler 03c12a34c58d2550c6c718275950866d387d33f5 lslogins: fix realloc() loop allocation size 83ba179b12d3c6c5f400bf78f2f742b1cc7ce256 lib/env: avoid underflow of read_all_alloc() return value 813851fba28cb3ecde6a7f0c90a7e343920cd8c7 libblkid: avoid memory leak of cachefile path 4459623cde42a5d021a6d71e38fcdfd4fff3e171 libmount: gracefully handle NULL path in mnt_resolve_target() dbde7a537f27b23d64a8d3f583af472357de7192 more: avoid out-of-bound access c26badd5d4295d52e987c75e69113edfb407fb27 libfdisk: handle allocation failure in fdisk_new_partition 5c250aa6425fc3e35c07bce019eb4b7fa34bf722 login: Use pid_t for child_pid be3f1712ee2e1e43d9b82b7cf4987c8a609a81ef login: move comment 98be90b5bafa66d98655f8639efb3ffa984fc530 build-sys: fix libmount/src/hooks.c use a711af02d32c0a0a31f1bbb943ffff2e94203e86 lscpu: Use 4K buffer size instead of BUFSIZ 45c6136cba5f7607cca08c5aaab8e9b22ef87c25 autotools: fix typos aa98c4ecc938a3459ffb759a444a8a585a9d0a3a libmount: make.stx_mnt_id use more robust c697c2bb69f55aa24b6c0e2e752548f823c53796 libmount: report statx in features list 13711f3ab79dfa92e8815eb9b752ec2bf4832d80 libmount: fix statx() includes e9ed5a2b80bf8a76924caf8cd93b4cfff4d210a7 libblkid: (vfat) avoid modifying shared buffer d2cadf0992cce589bfffeb603325c3c2fe54a991 libblkid: (jmicron_raid) use checksum APIs c54c99efd0c3fc7f1e8db8b7191a6e1e3b295f1f libblkid: (jmicron_raid) avoid modifying shared buffer 64418c52bc594abf01fc4ae8148e7aa93e4b3f22 libblkid: (zonefs) avoid modifying shared buffer b66da7ce4a04d6c960817a56fe82498c4e7dea44 losetup: fix JSON MAJ:MIN 44d7bf2c8d1c6d34a40416807d16db6c07ac4916 lslogins: (man) fix -y option formatting 7d6c71e51ed3c5f8505c67962b6d03490738a879 include: add DragonFlyBSD GPT partition types 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f libblkid: (bcachefs) fix size validation acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] 1ec71634aa4ef5ddca23d65c8a296f3614231e8a libblkid: (bcachefs) fix not detecting large superblocks 68564ebb50f8afab5a9527c534417e247cca0b27 libmount: Fix regression when mounting with atime We can drop 0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch as it was backported by upstream to the 2.39.x branch, and included in 2.39.3. Update the hash for README.licensing after upstream clarified the licensing situation with https://github.com/util-linux/util-linux/commit/fdd9f11f5e38b044617d3bc5f6c00789096b233f Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 80 ------------------- package/util-linux/util-linux.hash | 4 +- package/util-linux/util-linux.mk | 2 +- 3 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch deleted file mode 100644 index bba4d54619a..00000000000 --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Nov 2023 18:43:57 +0100 -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration - -Define cs_min through a define and not a const int to avoid the -following build failure with -O0 raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: - -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant - THREAD_LOCAL int cache_size = cs_min; - ^~~~~~ - -For consistency, also use define for cs_max and cs_factor - -Fixes: - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f ---- - libuuid/src/gen_uuid.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 619ef0131..db793c374 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - return __uuid_generate_time_internal(out, num, cont_offset); - } - -+#define CS_MIN (1<<6) -+#define CS_MAX (1<<18) -+#define CS_FACTOR 2 -+ - /* - * Generate time-based UUID and store it to @out - * -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - static int uuid_generate_time_generic(uuid_t out) { - #ifdef HAVE_TLS - /* thread local cache for uuidd based requests */ -- const int cs_min = (1<<6); -- const int cs_max = (1<<18); -- const int cs_factor = 2; - THREAD_LOCAL int num = 0; -- THREAD_LOCAL int cache_size = cs_min; -+ THREAD_LOCAL int cache_size = CS_MIN; - THREAD_LOCAL int last_used = 0; - THREAD_LOCAL struct uuid uu; - THREAD_LOCAL time_t last_time = 0; -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { - * Start with a small cache size to cover short running applications - * and adjust the cache size over the runntime. - */ -- if ((last_used == cache_size) && (cache_size < cs_max)) -- cache_size *= cs_factor; -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) -- cache_size /= cs_factor; -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) -+ cache_size *= CS_FACTOR; -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) -+ cache_size /= CS_FACTOR; - - num = cache_size; - -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { - } - /* request to daemon failed, reset cache */ - num = 0; -- cache_size = cs_min; -+ cache_size = CS_MIN; - } - if (num > 0) { /* serve uuid from cache */ - uu.time_low++; --- -2.43.0 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 1638cd9967b..d47f47fdbae 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,7 +1,7 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz # License files, locally calculated -sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing +sha256 13f0ea46d12d798c095a6ad39d7ddc988e2e4d274c6494115f6b463f7bc4f702 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72126adb005..a9e5b0bf685 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From a3a88ff1c85ba0067af1028bc232f8f61b628979 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 9 Mar 2024 17:52:37 +0100 Subject: [PATCH 0032/3013] package/bitcoin: security bump to version 26.0 For all release notes since 0.21.2, see [1]. This commit also: - removes the package patches, all included in this release, - removes the patch entry in ".checkpackageignore", - adds a comment about pgp signature check in the hash file, - updates the license hash, due to year update, - adds the requirement on gcc >= 9, see [2], - removes the dependency on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is no longer needed, due to the gcc version requirement. Fixes: - [3] Note: this CVE-2023-33297 is not explicitly mentioned in the Bitcoin core release notes. It is not either appearing in CVE list at [4]. The change corresponding to this vulnerability is "#27610 Improve performance of p2p inv to send queues" in the version 24.1 release note. See [5] and [6]. [1] https://github.com/bitcoin/bitcoin/tree/v26.0/doc/release-notes [2] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/dependencies.md [3] https://nvd.nist.gov/vuln/detail/CVE-2023-33297 [4] https://en.bitcoin.it/wiki/Common_Vulnerabilities_and_Exposures [5] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/release-notes/release-notes-24.1.md?plain=1#L45 [6] https://github.com/bitcoin/bitcoin/pull/27610 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...rc-randomenv.cpp-fix-build-on-uclibc.patch | 48 ------------------- ...includes-to-fix-gcc-13-compile-error.patch | 48 ------------------- ...efactor-add-most-of-src-util-to-iwyu.patch | 34 ------------- .../0004-src-util-string-h-fix-gcc13.patch | 23 --------- package/bitcoin/Config.in | 11 ++--- package/bitcoin/bitcoin.hash | 8 ++-- package/bitcoin/bitcoin.mk | 2 +- 8 files changed, 10 insertions(+), 165 deletions(-) delete mode 100644 package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch delete mode 100644 package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch delete mode 100644 package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch delete mode 100644 package/bitcoin/0004-src-util-string-h-fix-gcc13.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5f4928b6487..f413e5a4971 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -194,7 +194,6 @@ package/berkeleydb/0002-atomic_compare_exchange.patch Upstream package/bind/0001-cross.patch Upstream package/bind/S81named Indent Shellcheck Variables package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch Upstream -package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch Upstream package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstream package/bmx7/0002-Fix-linking-error.patch Upstream package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch Upstream diff --git a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch b/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch deleted file mode 100644 index 8038a311d36..00000000000 --- a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 330cb33985d0ce97c20f4a0f0bbda0fbffe098d4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 9 Nov 2020 21:18:40 +0100 -Subject: [PATCH] src/randomenv.cpp: fix build on uclibc - -Check for HAVE_STRONG_GETAUXVAL or HAVE_WEAK_GETAUXVAL before using -getauxval to avoid a build failure on uclibc - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/bitcoin/bitcoin/pull/20358] ---- - src/randomenv.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/randomenv.cpp b/src/randomenv.cpp -index 07122b7f6..5e07c3db4 100644 ---- a/src/randomenv.cpp -+++ b/src/randomenv.cpp -@@ -53,7 +53,7 @@ - #include - #endif - #endif --#ifdef __linux__ -+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) - #include - #endif - -@@ -326,7 +326,7 @@ void RandAddStaticEnv(CSHA512& hasher) - // Bitcoin client version - hasher << CLIENT_VERSION; - --#ifdef __linux__ -+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) - // Information available through getauxval() - # ifdef AT_HWCAP - hasher << getauxval(AT_HWCAP); -@@ -346,7 +346,7 @@ void RandAddStaticEnv(CSHA512& hasher) - const char* exec_str = (const char*)getauxval(AT_EXECFN); - if (exec_str) hasher.Write((const unsigned char*)exec_str, strlen(exec_str) + 1); - # endif --#endif // __linux__ -+#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL - - #ifdef HAVE_GETCPUID - AddAllCPUID(hasher); --- -2.28.0 - diff --git a/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch b/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch deleted file mode 100644 index 22c0ca2adf6..00000000000 --- a/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 339a95b7537b47e5d6b732c0633a00afd96e3ca0 Mon Sep 17 00:00:00 2001 -From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> -Date: Thu, 19 Jan 2023 19:35:43 +0100 -Subject: [PATCH] Add missing includes to fix gcc-13 compile error - -Upstream: https://github.com/bitcoin/bitcoin/commit/fadeb6b103cb441e0e91ef506ef29febabb10715 - -Signed-off-by: Bernd Kuhls ---- - src/support/lockedpool.cpp | 3 +++ - src/support/lockedpool.h | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp -index 26de780f2..11131d551 100644 ---- a/src/support/lockedpool.cpp -+++ b/src/support/lockedpool.cpp -@@ -22,6 +22,9 @@ - #endif - - #include -+#include -+#include -+#include - #ifdef ARENA_DEBUG - #include - #include -diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h -index b9e2e99d1..25b4c0f36 100644 ---- a/src/support/lockedpool.h -+++ b/src/support/lockedpool.h -@@ -5,11 +5,11 @@ - #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H - #define BITCOIN_SUPPORT_LOCKEDPOOL_H - --#include -+#include - #include - #include --#include - #include -+#include - #include - - /** --- -2.39.2 - diff --git a/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch b/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch deleted file mode 100644 index 095fa648dd3..00000000000 --- a/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c187efa907fd64ea2c7b7d699c5c97f9d5b79960 Mon Sep 17 00:00:00 2001 -From: fanquake -Date: Thu, 9 Jun 2022 16:26:55 +0100 -Subject: [PATCH] refactor: add most of src/util to iwyu - -These files change infrequently, and not much header shuffling is required. - -We don't add everything in src/util/ yet, because IWYU makes some -dubious suggestions, which I'm going to follow up with upstream. - -Upstream: https://github.com/bitcoin/bitcoin/commit/07f2c25d04c39a0074e1d9ee1b24b3e359c8153f - -[Bernd: backported relevant part from upstream commit to version 0.21.2 - to fix build error with gcc 13.x] -Signed-off-by: Bernd Kuhls ---- - src/util/bip32.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/util/bip32.h b/src/util/bip32.h -index 347e83db9..6ef051c48 100644 ---- a/src/util/bip32.h -+++ b/src/util/bip32.h -@@ -6,6 +6,7 @@ - #define BITCOIN_UTIL_BIP32_H - - #include -+#include - #include - #include - --- -2.39.2 - diff --git a/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch b/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch deleted file mode 100644 index 00a9ef2b971..00000000000 --- a/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fa2deae2a86417d7e0d4cd33fb933b1000d20313 Mon Sep 17 00:00:00 2001 -From: MacroFake -Date: Thu, 5 May 2022 08:28:29 +0200 -Subject: [PATCH] Wrap boost::replace_all - -Upstream: https://github.com/bitcoin/bitcoin/commit/fa2deae2a86417d7e0d4cd33fb933b1000d20313 - -[Bernd: backported relevant part from upstream commit to version 0.21.2 - to fix build error with gcc 13.x] -Signed-off-by: Bernd Kuhls ---- -diff --git a/src/util/string.h b/src/util/string.h -index 2e91347b27a10..df20e34ae9aaa 100644 ---- a/src/util/string.h -+++ b/src/util/string.h -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index a344811d6b4..c4a2447fc95 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -11,8 +11,8 @@ config BR2_PACKAGE_BITCOIN bool "bitcoin" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR select BR2_PACKAGE_BOOST @@ -36,12 +36,9 @@ config BR2_PACKAGE_BITCOIN https://bitcoincore.org -comment "bitcoin needs a toolchain w/ C++, threads, wchar" +comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - -comment "bitcoin needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index 643fcbc1419..6b3008af863 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,5 +1,7 @@ -# From https://bitcoincore.org/bin/bitcoin-core-0.21.2/SHA256SUMS.asc -sha256 4146f751fc5691bdcf911cbdb8d32d8d25c297d29d58173227ae1ae6438edb9e bitcoin-0.21.2.tar.gz +# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS +# After checking pgp signature from: +# https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS.asc +sha256 ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1 bitcoin-26.0.tar.gz # Hash for license file -sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING +sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 10ae32202cf..493c569336a 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITCOIN_VERSION = 0.21.2 +BITCOIN_VERSION = 26.0 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT From 36ed69f0bf6415243741e8d5b5357ab7c91a57b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:42:18 +0100 Subject: [PATCH 0033/3013] package/kodi: bump version to 20.5-Nexus Release notes: https://github.com/xbmc/xbmc/releases/tag/20.5-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index b785a71b6ee..a43ee57e008 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.5-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 98101930142..e640ab3a904 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 20.4-Nexus +KODI_TEXTUREPACKER_VERSION = 20.5-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7b26778b681..b497ab7dca5 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz +sha256 9bf3257ebf251d20f276b7f90681985a270779150af2fb395d4b593c04002deb kodi-20.5-Nexus.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index eebb48238a4..085169367d2 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 20.4 +KODI_VERSION_MAJOR = 20.5 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From aebe2b1dae2dd5c1e7952d00ad124064821be718 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:41:52 +0100 Subject: [PATCH 0034/3013] package/kodi-pvr-hts: bump version to 20.7.2-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index a268940b0eb..2a59b7bbe56 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15d68d928e0794fb42fd0f3483403fb0290c5c94aa3d3b648a8a2f8e8316dfff kodi-pvr-hts-20.7.0-Nexus.tar.gz +sha256 244cfc1488aa0c51465af411f3df8884b4a571a08acfa20ac9defdb8ef49022e kodi-pvr-hts-20.7.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index c56d0e0546f..ebc31ddbdfe 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 20.7.0-Nexus +KODI_PVR_HTS_VERSION = 20.7.2-Nexus KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md From 646918e03ac49445bbb938dbb5e3a0ca30f4a1b3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:41:53 +0100 Subject: [PATCH 0035/3013] package/kodi-pvr-mythtv: bump version to 20.6.9-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c3918255..ff3d0f05b71 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 32196265ee5b78bb97e0bd8e633778f4566e95d54df96e4577764e5d3681fcf1 kodi-pvr-mythtv-20.6.9-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f19487414..a3a5678651a 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.9-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From 150a1722a78c51dd7996c5aaa3b42476f60451d1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:07 +0100 Subject: [PATCH 0036/3013] package/intel-mediadriver: bump version to 24.1.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index a1b098094bb..4b410fb961c 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171 intel-media-24.1.3.tar.gz +sha256 7ea727b3e2890cf8f50307a3910664209bcbae1ce0d3d8f81bb9f522b0f66d59 intel-media-24.1.4.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 72a22fe5c9a..9fdbef93bbd 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.3 +INTEL_MEDIADRIVER_VERSION = 24.1.4 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 45f964d8dde03161fdfbe69013d19e9a13fb005f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:08 +0100 Subject: [PATCH 0037/3013] package/libvpl: bump version to 2.10.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libvpl/libvpl.hash | 2 +- package/libvpl/libvpl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index df1914e4a41..19407e01bad 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 524299a7b920ac0de1f6913ca90515858ea3a8ea2daaea60f8e0be62f22c8041 libvpl-2.10.1.tar.gz +sha256 ad956ea7ecf14614325f59dfb44cc5ba08e2fcac373342d61c7db152ac651253 libvpl-2.10.2.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 0c5d3548741..645fda14de6 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2.10.1 +LIBVPL_VERSION = 2.10.2 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE From 1d69b083e8c724a82d7e0cfbf5989147b3c2f5e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:09 +0100 Subject: [PATCH 0038/3013] package/onevpl-intel-gpu: bump version to 24.1.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index a45758a2c39..8dd42c47136 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15d34e4304d7aeb5ea5e529b6f51171109cef42525113321f675bc14e56c697e onevpl-intel-gpu-24.1.3.tar.gz +sha256 879a232351ce0647522a0981edded3760104aec9f2bdc2ad31f70df03c95a6a9 onevpl-intel-gpu-24.1.4.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 509698ce265..ca2c866735e 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.3 +ONEVPL_INTEL_GPU_VERSION = 24.1.4 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From bb8766cc5463e59b931a10ec67793a79fb06eda7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:48:47 +0100 Subject: [PATCH 0039/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 07d6b2b5ec8..df84cce539e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.18" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.21" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 15c0dc8d3d5..977ad30f730 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz -sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz +sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz +sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz -sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz -sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz +sha256 8a1e760bf2660947234109aa4fdbbe3686238b4e852157b96c59356689107e49 linux-5.15.151.tar.xz +sha256 0cf3e467bd8d35533888327e9f8a9a9d354fdf83e8f82e9fe5a234f896a07493 linux-5.10.212.tar.xz +sha256 cdbc61334cdadbd3945b08f03ed197c65bdf358c3383a4334b3e5b483bd95850 linux-5.4.271.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz +sha256 95ada7aa6ef1c69d7a469432f936365e35b004d24e751d82c21a371edd2c84f9 linux-4.19.309.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 63e82c49dfd..fe4fc5011e7 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.307" if BR2_KERNEL_HEADERS_4_19 - default "5.4.269" if BR2_KERNEL_HEADERS_5_4 - default "5.10.210" if BR2_KERNEL_HEADERS_5_10 - default "5.15.149" if BR2_KERNEL_HEADERS_5_15 - default "6.1.79" if BR2_KERNEL_HEADERS_6_1 - default "6.6.18" if BR2_KERNEL_HEADERS_6_6 + default "4.19.309" if BR2_KERNEL_HEADERS_4_19 + default "5.4.271" if BR2_KERNEL_HEADERS_5_4 + default "5.10.212" if BR2_KERNEL_HEADERS_5_10 + default "5.15.151" if BR2_KERNEL_HEADERS_5_15 + default "6.1.81" if BR2_KERNEL_HEADERS_6_1 + default "6.6.21" if BR2_KERNEL_HEADERS_6_6 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 1dfe980b19b83ee695e51e92aecb0c8cdf202a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 14 Mar 2024 17:16:20 +0100 Subject: [PATCH 0040/3013] package/expat: security bump to version 2.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Security fixes: - CVE-2024-28757 -- Prevent billion laughs attacks with isolated use of external parsers. Please see the commit message of commit 1d50b80cf31de87750103656f6eb693746854aa8 for details. https://blog.hartwork.org/posts/expat-2-6-2-released/ https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes Signed-off-by: Sébastien Szymanski Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 980a9ab6a79..63890b54df2 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.6.1/ -md5 84d0ee1c554212dc8f068e538de5b823 expat-2.6.1.tar.xz -sha1 1a1804b7c565a8b21abbd3433ef67ed8a4476960 expat-2.6.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.2/ +md5 0cb75c8feb842c0794ba89666b762a2d expat-2.6.1.tar.xz +sha1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd expat-2.6.1.tar.xz # Locally calculated -sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz +sha256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index e09fcc673fa..c6b7fc8b44f 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.1 +EXPAT_VERSION = 2.6.2 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From b7eb1dcbb65682b2e800b6523688102ffb4d4821 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Thu, 14 Mar 2024 13:27:34 +0100 Subject: [PATCH 0041/3013] package/libgit2: security bump to version 1.7.2 Fixes the following security issues: - CVE-2024-24575 (infinite loop DoS on revision lookup) and - CVE-2024-24577 (heap out of bound write on index update) https://github.com/libgit2/libgit2/releases/tag/v1.7.2 Signed-off-by: Nicolas Cavallari [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 76d599b81e5..022fb35a9c9 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327 libgit2-1.7.1.tar.gz +sha256 de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f libgit2-1.7.2.tar.gz sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 46ccc1e5173..498b6658088 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.7.1 +LIBGIT2_VERSION = 1.7.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From 9246579f01d768c038fe5891f77937c977dbb76d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Mar 2024 22:51:57 +0100 Subject: [PATCH 0042/3013] package/znc: bump version to 1.9.0 Removed all patches, they are included in this release. Bumped gcc dependency to >= 8 according to changelog: https://wiki.znc.in/ChangeLog/1.9.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - ...0001-LibreSSL-3.5-opaqued-structures.patch | 27 -------- .../znc/0002-Fix-build-with-libressl.patch | 68 ------------------- ...DH_get0_key-have-existed-since-Libre.patch | 30 -------- ...rt-SWIG-4.1.0-drop-support-for-4.0.1.patch | 53 --------------- package/znc/Config.in | 6 +- package/znc/znc.hash | 2 +- package/znc/znc.mk | 2 +- 8 files changed, 5 insertions(+), 186 deletions(-) delete mode 100644 package/znc/0001-LibreSSL-3.5-opaqued-structures.patch delete mode 100644 package/znc/0002-Fix-build-with-libressl.patch delete mode 100644 package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch delete mode 100644 package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch diff --git a/.checkpackageignore b/.checkpackageignore index f413e5a4971..0a993096829 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1429,9 +1429,6 @@ package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch Upstrea package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch Upstream package/zip/0008-fix-musl-static-build.patch Upstream package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch Upstream -package/znc/0001-LibreSSL-3.5-opaqued-structures.patch Upstream -package/znc/0002-Fix-build-with-libressl.patch Upstream -package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch Upstream package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch Upstream support/dependencies/check-host-asciidoc.sh Shellcheck support/dependencies/check-host-cmake.sh Shellcheck diff --git a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch deleted file mode 100644 index d0019e21a40..00000000000 --- a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 87f3dac8ba8dea5628b05416bdef454b4ef2d236 Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Mon, 14 Mar 2022 17:36:36 -0400 -Subject: [PATCH] LibreSSL 3.5 opaqued structures - -Downloaded from upstream commit -https://github.com/znc/Csocket/commit/87f3dac8ba8dea5628b05416bdef454b4ef2d236 - -Signed-off-by: Bernd Kuhls -(rebased for znc) ---- - Csocket.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Csocket.cc b/Csocket.cc -index 46a3bfd..a30da14 100644 ---- a/third_party/Csocket/Csocket.cc -+++ b/third_party/Csocket/Csocket.cc -@@ -61,7 +61,7 @@ - # define OPENSSL_NO_TLS1_1 /* 1.0.1-pre~: openssl/openssl@637f374ad49d5f6d4f81d87d7cdd226428aa470c */ - # define OPENSSL_NO_TLS1_2 /* 1.0.1-pre~: openssl/openssl@7409d7ad517650db332ae528915a570e4e0ab88b */ - # endif --# ifndef LIBRESSL_VERSION_NUMBER /* forked from OpenSSL 1.0.1g, sets high version "with the idea of discouraging software from relying on magic numbers for detecting features"(!) */ -+# if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL) - # if OPENSSL_VERSION_NUMBER >= 0x10100000 - # undef HAVE_ERR_REMOVE_THREAD_STATE /* 1.1.0-pre4: openssl/openssl@8509dcc9f319190c565ab6baad7c88d37a951d1c */ - # undef OPENSSL_NO_SSL2 /* 1.1.0-pre4: openssl/openssl@e80381e1a3309f5d4a783bcaa508a90187a48882 */ diff --git a/package/znc/0002-Fix-build-with-libressl.patch b/package/znc/0002-Fix-build-with-libressl.patch deleted file mode 100644 index b8d22445fb0..00000000000 --- a/package/znc/0002-Fix-build-with-libressl.patch +++ /dev/null @@ -1,68 +0,0 @@ -From dcb5f3df82fcfec48aab356252067dc897fb98cf Mon Sep 17 00:00:00 2001 -From: Alexey Sokolov -Date: Sun, 14 Nov 2021 00:45:01 +0000 -Subject: [PATCH] Fix build with libressl - -It got another feature of openssl implemented, which broke this - -Downloaded from upstream commit -https://github.com/znc/znc/commit/dcb5f3df82fcfec48aab356252067dc897fb98cf - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 14 ++++++++++++++ - include/znc/zncconfig.h.cmake.in | 1 + - modules/schat.cpp | 3 +-- - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0913ff2691..1f77f5632b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,6 +82,20 @@ endmacro() - tristate_option(OPENSSL "Support SSL") - if(WANT_OPENSSL) - find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED}) -+ -+ if(OPENSSL_FOUND) -+ # SSL_SESSION was made opaque in OpenSSL 1.1.0; -+ # LibreSSL gained that function later too. -+ # TODO: maybe remove this check at some point, and stop supporting old -+ # libssl versions -+ function(check_SSL_SESSION_get0_cipher) -+ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) -+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) -+ check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h -+ HAVE_SSL_SESSION_get0_cipher) -+ endfunction() -+ check_SSL_SESSION_get0_cipher() -+ endif() - endif() - set(HAVE_LIBSSL "${OPENSSL_FOUND}") - -diff --git a/include/znc/zncconfig.h.cmake.in b/include/znc/zncconfig.h.cmake.in -index 5426b828af..7b07b99aec 100644 ---- a/include/znc/zncconfig.h.cmake.in -+++ b/include/znc/zncconfig.h.cmake.in -@@ -31,6 +31,7 @@ - #define HAVE_PTHREAD 1 - #cmakedefine HAVE_THREADED_DNS 1 - #cmakedefine HAVE_LIBSSL 1 -+#cmakedefine HAVE_SSL_SESSION_get0_cipher 1 - #cmakedefine HAVE_IPV6 1 - #cmakedefine HAVE_ZLIB 1 - #cmakedefine HAVE_I18N 1 -diff --git a/modules/schat.cpp b/modules/schat.cpp -index aa7a338dcd..66e67e695c 100644 ---- a/modules/schat.cpp -+++ b/modules/schat.cpp -@@ -25,8 +25,7 @@ - #include - #include - --#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \ -- OPENSSL_VERSION_NUMBER < 0x10100007 -+#ifndef HAVE_SSL_SESSION_get0_cipher - /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2 - weeks before the public release. - See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */ diff --git a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch deleted file mode 100644 index a2946643fc8..00000000000 --- a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7c8ac8981a8516edaba469641aff4d8ec452ae9e Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Mon, 14 Mar 2022 18:32:46 -0400 -Subject: [PATCH] DH_set0_pqg and DH_get0_key have existed since LibreSSL 2.7 - -https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf -https://github.com/libressl-portable/openbsd/commit/3789e379353c1d53313a249461b3d735de4ac742 - -Downloaded from upstream commit -https://github.com/znc/znc/commit/7c8ac8981a8516edaba469641aff4d8ec452ae9e - -Signed-off-by: Bernd Kuhls ---- - modules/crypt.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/crypt.cpp b/modules/crypt.cpp -index 7655371b6e..68f7aafcea 100644 ---- a/modules/crypt.cpp -+++ b/modules/crypt.cpp -@@ -68,7 +68,8 @@ class CCryptMod : public CModule { - CString m_sPrivKey; - CString m_sPubKey; - --#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0X10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) - static int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g) { - /* If the fields p and g in dh are nullptr, the corresponding input - * parameters MUST be non-nullptr. q may remain nullptr. diff --git a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch deleted file mode 100644 index cb0988e6314..00000000000 --- a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 -From: Alexey Sokolov -Date: Sat, 5 Nov 2022 12:54:40 +0000 -Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 - -https://bugs.gentoo.org/878587 - -Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 2 +- - modules/modperl/CMakeLists.txt | 1 - - modules/modpython/CMakeLists.txt | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9d43578e0e..efab0ee1ee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS - endif() - endif() - if(search_swig) -- find_package(SWIG 3.0.0) -+ find_package(SWIG 4.0.1) - if(NOT SWIG_FOUND) - message(FATAL_ERROR - "Can't find SWIG, therefore Perl and Python aren't supported. " -diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt -index e18fe47644..a87f74e478 100644 ---- a/modules/modperl/CMakeLists.txt -+++ b/modules/modperl/CMakeLists.txt -@@ -53,7 +53,6 @@ if(SWIG_FOUND) - "-I${PROJECT_SOURCE_DIR}/include" - "-I${CMAKE_CURRENT_SOURCE_DIR}/.." - "-I${CMAKE_CURRENT_SOURCE_DIR}/include" -- -DZNC_EXPORT_LIB_EXPORT - -outdir "${CMAKE_CURRENT_BINARY_DIR}" - -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" -diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt -index edbeb41ed5..36a2e649f0 100644 ---- a/modules/modpython/CMakeLists.txt -+++ b/modules/modpython/CMakeLists.txt -@@ -50,7 +50,6 @@ if(SWIG_FOUND) - "-I${PROJECT_BINARY_DIR}/include" - "-I${PROJECT_SOURCE_DIR}/include" - "-I${CMAKE_CURRENT_SOURCE_DIR}/.." -- -DZNC_EXPORT_LIB_EXPORT - -outdir "${CMAKE_CURRENT_BINARY_DIR}" - -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" diff --git a/package/znc/Config.in b/package/znc/Config.in index 915b5f632cd..3b8f0f71954 100644 --- a/package/znc/Config.in +++ b/package/znc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_ZNC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL help @@ -11,7 +11,7 @@ config BR2_PACKAGE_ZNC http://www.znc.in -comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads" +comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 8, threads" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU diff --git a/package/znc/znc.hash b/package/znc/znc.hash index e86171ba1fa..8d59c7a1dc8 100644 --- a/package/znc/znc.hash +++ b/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ff238aae3f2ae0e44e683c4aee17dc8e4fdd261ca9379d83b48a7d422488de0d znc-1.8.2.tar.gz +sha256 8b99c9dbb21c1309705073460be9bfacb6f7b0e83a15fe5d4b7140201b39d2a1 znc-1.9.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/znc/znc.mk b/package/znc/znc.mk index 07fced84073..a9106551959 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.8.2 +ZNC_VERSION = 1.9.0 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE From 05dabbd5fcc08724f20f8a4168a5a6e0b97aec06 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sun, 10 Mar 2024 09:08:33 +0300 Subject: [PATCH 0043/3013] package/postgis: bump to version 3.4.2 https://github.com/postgis/postgis/blob/3.4.2/NEWS Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgis/postgis.hash | 2 +- package/postgis/postgis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 2d2676d0d6d..7e62e8e1681 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fef6a141213d0ff27bf45b33b849cc396c22ddb1ffc6fed435469c9e891fc81d postgis-3.4.1.tar.gz +sha256 c8c874c00ba4a984a87030af6bf9544821502060ad473d5c96f1d4d0835c5892 postgis-3.4.2.tar.gz sha256 2a3bde0a77224496ea6d8efa686da7e29ab0dd6b1a8f90ba12beaf7ae28e878a LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index 5f1c643ceb2..867aa4caea9 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.4.1 +POSTGIS_VERSION = 3.4.2 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) From 9f0090ed45fe69989f4759a4076e74f586f5747c Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sun, 10 Mar 2024 09:17:14 +0300 Subject: [PATCH 0044/3013] package/timescaledb: bump version to 2.14.2 Release notes: https://github.com/timescale/timescaledb/blob/2.14.2/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 8d0fc125d62..f98098bdb80 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ca4f48147cb1bf3bf22af9f643822a5931e12a89909cc73c4a89ddae3c828ac1 timescaledb-2.13.1.tar.gz +sha256 c7768b267ea67914d0491b28da102faecd317060e429b2da7530517fbc94e73b timescaledb-2.14.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index a5d77eda806..59731270c58 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.13.1 +TIMESCALEDB_VERSION = 2.14.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 7ee7b1ba6d5031405533193ec7c6edfd5dbde175 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Mar 2024 20:52:33 +0100 Subject: [PATCH 0045/3013] package/mmc-utils: bump version to 2024-03-05 Fixes: http://autobuild.buildroot.net/results/06f972f95f4f2e0e7504b1fa069b89695b7377ef Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/mmc-utils/mmc-utils.hash | 2 +- package/mmc-utils/mmc-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash index cd9d13324fc..2c1bb860660 100644 --- a/package/mmc-utils/mmc-utils.hash +++ b/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 84be5003ae83b4fdb0279a693f320fd472aebd14908a1ac16bda4f675e92ad40 mmc-utils-80271e9a6fd0db9cb3a85d024664da886e94315c-br1.tar.gz +sha256 83b1bd7602b0c8d05a8ff2f842d80fa7c9a0b084b7159bb9eed796b0075b94d1 mmc-utils-e1281d4de9166b7254ba30bb58f9191fc2c9e7fb-br1.tar.gz sha256 4207d81122a02555f78c5a11b61c83a331ee03dc933e1ef9dd932ef9b434d12d README diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk index ef4d97c1caa..48c347d8466 100644 --- a/package/mmc-utils/mmc-utils.mk +++ b/package/mmc-utils/mmc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -MMC_UTILS_VERSION = 80271e9a6fd0db9cb3a85d024664da886e94315c +MMC_UTILS_VERSION = e1281d4de9166b7254ba30bb58f9191fc2c9e7fb MMC_UTILS_SITE = https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git MMC_UTILS_SITE_METHOD = git MMC_UTILS_LICENSE = GPL-2.0 From 387bf13c6292837c6847d9c0f79a7872f0f2176e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Mar 2024 21:10:42 +0100 Subject: [PATCH 0046/3013] package/cryptsetup: bump version to 2.7.1 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index df92ff36b88..531432aaaf2 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795 cryptsetup-2.7.0.tar.xz +sha256 da5d1419e2a86e01aa32fd79582cd54d208857cb541bca2fd426a5ff1aaabbc3 cryptsetup-2.7.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d17de961438..b15f4585763 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From 50c7bf3b22fd609000150938df6e9b35fa8cc549 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:49:24 +0100 Subject: [PATCH 0047/3013] package/sqlite: bump version to 3.45.1 Release notes: https://sqlite.org/releaselog/3_45_1.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 38cff902d73..e7b5d2b2249 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c6719a148bc41cf0f2bbbe3926d7ce3f5ca09d878f1246fcc20767b175bb407 sqlite-autoconf-3440200.tar.gz +sha256 cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a sqlite-autoconf-3450100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b54bd9580c4..040d405b8ad 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.44.2 -SQLITE_TAR_VERSION = 3440200 +SQLITE_VERSION = 3.45.1 +SQLITE_TAR_VERSION = 3450100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2023 +SQLITE_SITE = https://www.sqlite.org/2024 SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite From d566d6a3692df6859a2b62c994bddd0ec8768a24 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:49:47 +0100 Subject: [PATCH 0048/3013] package/xmrig: bump version to 6.21.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 3a54d66ce44..9d84ab7957b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b197c71fa06030216b641b4ea57f7a3d977a17df1b55bd13759d4705dbf5941 xmrig-6.21.0.tar.gz +sha256 c45baea5a210143b647349b5234a2192164d3473a39d2b1cab7fb35b1a2a8ba9 xmrig-6.21.1.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 35cd1d8d821..37a613820d7 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.0 +XMRIG_VERSION = 6.21.1 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 2c00fbfb9bd86c825f07c259d9c4a4cfd0bab42b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 10 Mar 2024 20:26:17 +0100 Subject: [PATCH 0049/3013] configs/ci20_defconfig: bump Linux to version 6.1.81 The kernel build now requires FIT support in mkimage: ITB arch/mips/boot/vmlinux.gz.itb /home/peko/source/buildroot/output-ci20/host/bin/mkimage: unsupported type Flat Device Tree So enable that. Signed-off-by: Peter Korsgaard --- configs/ci20_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 7e119376e15..f9070d5098f 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -3,7 +3,7 @@ BR2_mipsel=y BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set BR2_KERNEL_HEADERS_AS_KERNEL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.254" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.81" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="32768" From dedb7dc6d6543d5ce16ac73f927e0a33806075e1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 10 Mar 2024 20:26:18 +0100 Subject: [PATCH 0050/3013] configs/ci20_defconfig: bump u-boot to version 2024.01 Signed-off-by: Peter Korsgaard --- configs/ci20_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index f9070d5098f..31019aeae27 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From a3629797616433b0cd5b876aa3ae0996ff90b696 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 10 Mar 2024 20:26:19 +0100 Subject: [PATCH 0051/3013] configs/ci20_defconfig: configure eth0 through BR2_SYSTEM_DHCP rather than kernel cmdline Passing ip=dhcp to the kernel will cause it to try to configure the network interface using DHCP and wait up to 120s for the interface to detect a link, slowing down boots without a network cable a lot. Instead use the "normal" BR2_SYSTEM_DHCP, E.G. trigger ifup to run the DHCP client in the background. Signed-off-by: Peter Korsgaard --- board/ci20/uboot-env.txt | 2 +- configs/ci20_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/ci20/uboot-env.txt b/board/ci20/uboot-env.txt index 3093496cc9c..2d693af7b79 100644 --- a/board/ci20/uboot-env.txt +++ b/board/ci20/uboot-env.txt @@ -1,6 +1,6 @@ baudrate=115200 board_mfr=NP -bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 ip=dhcp +bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000 bootdelay=1 ethargs=env set bootargs ${bootargs} diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 31019aeae27..4b3c742173b 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -7,6 +7,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" +BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From 53a8c5150e5eeeb6dbbead0275dbf9141f507511 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2024 17:49:46 +0100 Subject: [PATCH 0052/3013] toolchain: drop codesourcery arm/aarch64 toolchains codesourcery arm/aarch64 toolchains are old (2014) and use glibc 2.18/2.20 which are not compatible with 64-bit time_t raising the following build failure with libcgroup since commit 1c2dbcdcf0bb589d325c379246acaa39bb07b7be: In file included from ./libcgroup-internal.h:25:0, from parse.y:21: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/fts.h:41:3: error: #error " cannot be used with -D_FILE_OFFSET_BITS==64" # error " cannot be used with -D_FILE_OFFSET_BITS==64" ^ Fixes: 1c2dbcdcf0bb589d325c379246acaa39bb07b7be - http://autobuild.buildroot.org/results/e28f955f2b360f6e7bb231a5a3800cfbd17a23d7 Signed-off-by: Fabrice Fontaine [Peter: add Config.in.legacy entries] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 14 +++ package/guile/guile.mk | 5 - package/mesa3d/mesa3d.mk | 6 -- package/tpm2-totp/Config.in | 2 - .../autobuild/sourcery-arm-armv4t.config | 4 - .../autobuild/sourcery-arm-thumb2.config | 7 -- .../autobuild/sourcery-arm.config | 3 - .../autobuild/toolchain-configs.csv | 5 - .../testing/tests/toolchain/test_external.py | 97 ------------------- toolchain/Config.in | 1 - toolchain/toolchain-external/Config.in | 4 - .../Config.in | 19 ---- .../Config.in.options | 9 -- ...olchain-external-codesourcery-aarch64.hash | 3 - ...toolchain-external-codesourcery-aarch64.mk | 12 --- .../Config.in | 35 ------- .../Config.in.options | 9 -- .../toolchain-external-codesourcery-arm.hash | 3 - .../toolchain-external-codesourcery-arm.mk | 13 --- 19 files changed, 14 insertions(+), 237 deletions(-) delete mode 100644 support/config-fragments/autobuild/sourcery-arm-armv4t.config delete mode 100644 support/config-fragments/autobuild/sourcery-arm-thumb2.config delete mode 100644 support/config-fragments/autobuild/sourcery-arm.config delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk diff --git a/Config.in.legacy b/Config.in.legacy index e899fc3afa8..b99d9c1fb56 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 + bool "CodeSourcery AArch64 2014.11" + select BR2_LEGACY + help + The Sourcery CodeBench AArch64 toolchain has been removed, + use an ARM/Bootlin/Linaro toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + bool "Sourcery CodeBench ARM 2014.05 has been removed" + select BR2_LEGACY + help + The Sourcery CodeBench ARM toolchain has been removed, use + an ARM/Bootlin/Linaro toolchain instead. + config BR2_BINUTILS_VERSION_2_39_X bool "binutils 2.39 has been removed" select BR2_LEGACY diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 1d2e8038f0e..82daaf5ad44 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -44,11 +44,6 @@ ifeq ($(BR2_STATIC_LIBS),y) GUILE_CFLAGS += -DGC_NO_DLOPEN endif -# Triggers assembler error with -Os -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) -GUILE_CFLAGS += -O2 -endif - # jit triggers build failures with gcc < 5 ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) GUILE_CONF_OPTS += --disable-jit diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 8e3cd7245de..df0079bf80e 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -29,12 +29,6 @@ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ -Dpower8=disabled -# Codesourcery ARM 2014.05 fail to link libmesa_dri_drivers.so with --as-needed linker -# flag due to a linker bug between binutils 2.24 and 2.25 (2.24.51.20140217). -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) -MESA3D_CONF_OPTS += -Db_asneeded=false -endif - ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) MESA3D_CONF_OPTS += -Ddri3=enabled ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) diff --git a/package/tpm2-totp/Config.in b/package/tpm2-totp/Config.in index dcadf5a5f28..a26604abb8b 100644 --- a/package/tpm2-totp/Config.in +++ b/package/tpm2-totp/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TOTP bool "tpm2-totp" depends on !BR2_STATIC_LIBS # tpm2-tss - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.20 select BR2_PACKAGE_LIBQRENCODE select BR2_PACKAGE_TPM2_TSS help @@ -20,4 +19,3 @@ config BR2_PACKAGE_TPM2_TOTP comment "tpm2-totp needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/support/config-fragments/autobuild/sourcery-arm-armv4t.config b/support/config-fragments/autobuild/sourcery-arm-armv4t.config deleted file mode 100644 index 4c0e01fecba..00000000000 --- a/support/config-fragments/autobuild/sourcery-arm-armv4t.config +++ /dev/null @@ -1,4 +0,0 @@ -BR2_arm=y -BR2_arm920t=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y diff --git a/support/config-fragments/autobuild/sourcery-arm-thumb2.config b/support/config-fragments/autobuild/sourcery-arm-thumb2.config deleted file mode 100644 index e726757a161..00000000000 --- a/support/config-fragments/autobuild/sourcery-arm-thumb2.config +++ /dev/null @@ -1,7 +0,0 @@ -BR2_arm=y -BR2_cortex_a8=y -BR2_ARM_EABI=y -BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y -BR2_TARGET_OPTIMIZATION="" diff --git a/support/config-fragments/autobuild/sourcery-arm.config b/support/config-fragments/autobuild/sourcery-arm.config deleted file mode 100644 index 8ade4647f20..00000000000 --- a/support/config-fragments/autobuild/sourcery-arm.config +++ /dev/null @@ -1,3 +0,0 @@ -BR2_arm=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index a65e9bacc39..2c4fa45fe7d 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -18,9 +18,6 @@ support/config-fragments/autobuild/bootlin-x86-64-musl.config,x86_64 # Test a MMU toolchain without dynamic library support support/config-fragments/autobuild/br-arm-full-static.config,x86_64 -# Test a toolchain with an old gcc version (gcc 4.8) -support/config-fragments/autobuild/sourcery-arm.config,x86 - # Toolchains used by test-pkg only when the '-a' option is passed: support/config-fragments/autobuild/arm-aarch64.config,x86_64 support/config-fragments/autobuild/bootlin-aarch64-glibc.config,x86_64 @@ -66,8 +63,6 @@ support/config-fragments/autobuild/br-xtensa-full-internal.config,any support/config-fragments/autobuild/linaro-aarch64.config,x86 support/config-fragments/autobuild/linaro-aarch64-be.config,x86 support/config-fragments/autobuild/linaro-arm.config,x86 -support/config-fragments/autobuild/sourcery-arm-armv4t.config,x86 -support/config-fragments/autobuild/sourcery-arm-thumb2.config,x86 support/config-fragments/autobuild/sourcery-mips64.config,x86 support/config-fragments/autobuild/sourcery-mips.config,x86 support/config-fragments/autobuild/sourcery-nios2.config,x86 diff --git a/support/testing/tests/toolchain/test_external.py b/support/testing/tests/toolchain/test_external.py index d22f38cedcd..27dfd68500e 100644 --- a/support/testing/tests/toolchain/test_external.py +++ b/support/testing/tests/toolchain/test_external.py @@ -37,103 +37,6 @@ def common_check(self): self.assertTrue(os.path.exists(interp_path)) -class TestExternalToolchainSourceryArmv4(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_arm920t=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v4T") - - # Check the sysroot symlink - symlink = os.path.join(self.builddir, "staging", "armv4t") - self.assertTrue(os.path.exists(symlink)) - self.assertEqual(os.readlink(symlink), "./") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - -class TestExternalToolchainSourceryArmv5(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v5TE") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - -class TestExternalToolchainSourceryArmv7(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_cortex_a8=y - BR2_ARM_EABI=y - BR2_ARM_INSTRUCTIONS_THUMB2=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v7") - isa = infra.get_elf_arch_tag(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6", - "Tag_THUMB_ISA_use") - self.assertEqual(isa, "Thumb-2") - - # Check we have the sysroot symlink - symlink = os.path.join(self.builddir, "staging", "thumb2") - self.assertTrue(os.path.exists(symlink)) - self.assertEqual(os.readlink(symlink), "./") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv7", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - class TestExternalToolchainLinaroArm(TestExternalToolchain): config = BASIC_CONFIG + \ """ diff --git a/toolchain/Config.in b/toolchain/Config.in index 3dd6e83d354..1641dbae062 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -886,7 +886,6 @@ config BR2_TOOLCHAIN_HAS_SYNC_8 config BR2_TOOLCHAIN_HAS_LIBATOMIC bool default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 && \ BR2_TOOLCHAIN_HAS_THREADS && \ !BR2_BINFMT_FLAT diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c1c159cb8eb..b5432b71d7d 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -11,7 +11,6 @@ choice # Aarch64 (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" -source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in" @@ -23,7 +22,6 @@ source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" # ARM (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" -source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" @@ -115,7 +113,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX # Aarch64 source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options" @@ -127,7 +124,6 @@ source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.o # ARM source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in deleted file mode 100644 index 8c0f985c5bf..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" - depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 - # a57/a53 and a72/a53 appeared in gcc-6 or were broken before - depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - Sourcery CodeBench toolchain for the AArch64 architecture, - from Mentor Graphics. It uses gcc 4.9.1, binutils - 2.24.51.20140217, glibc 2.20, gdb 7.7.50 and kernel headers - 3.16.2. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options deleted file mode 100644 index 1eab8392166..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "aarch64-amd-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-aarch64" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash deleted file mode 100644 index 8f8fca0d0c3..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 405aada821146755c5f2df566375c2a682456d6b8451ee47b88cf1a52b093676 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 3f50dd6ee433eb5b6992a1071b988e50379a738f54f58722bc60081613764716 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk deleted file mode 100644 index 192763a0e0e..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-aarch64 -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION = 2014.11-95 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SOURCE = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_ACTUAL_SOURCE_TARBALL = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in deleted file mode 100644 index aea2ba34f25..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - bool "Sourcery CodeBench ARM 2014.05" - depends on BR2_arm - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABI - # Unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8A - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - help - Sourcery CodeBench toolchain for the ARM architecture, from - Mentor Graphics. It uses gcc 4.8.3, binutils 2.24.51, glibc - 2.18 and gdb 7.7.50, kernel headers 3.13. It has support - for the following variants: - - ARMv5TE, little endian, soft-float, glibc - Select ARM926T, ARM10T, XScale or another ARMv5 core - Select BR2_SOFT_FLOAT - - ARMv4T, little endian, soft-float, glibc - Select ARM720T, ARM920T, ARM922T or another ARMv4 core - Select BR2_SOFT_FLOAT - - ARMv7-A, Thumb 2, little endian, soft-float, glibc - Select Cortex-A8, Cortex-A9 or another ARMv7-A core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mthumb - -comment "Sourcery CodeBench toolchains available for the EABI ABI" - depends on BR2_arm - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - depends on !BR2_ARM_EABI diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options deleted file mode 100644 index 7f3654dc70a..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "arm-none-linux-gnueabi" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-arm" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash deleted file mode 100644 index c01a7b17c59..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 -sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk deleted file mode 100644 index f15a50c43e1..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-arm -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION = 2014.05-29 - -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SOURCE = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_ACTUAL_SOURCE_TARBALL = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) From 665086ba5ddff7653dd283074d67e74f5dc25c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 15 Mar 2024 18:24:16 +0100 Subject: [PATCH 0053/3013] package/rt-tests: bump version to 2.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Arnout Vandecappelle --- package/rt-tests/rt-tests.hash | 2 +- package/rt-tests/rt-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index eb28f4d441a..017447bce66 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 2ed2e4c965c7f336a15d3354dec090e27a0b1e9ada91ae0b9ef18bbcb993874e rt-tests-2.5.tar.xz +sha256 761d10c4b7f5b28400f0c301fe0171eaa74f347df64cb359210254b8e6aff19f rt-tests-2.6.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 8ad4215ee19..4b1aa317964 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.5 +RT_TESTS_VERSION = 2.6 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING From 44f3c736a800d2afd154e5e476cdc60ae30a0108 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 15 Mar 2024 16:08:02 +0100 Subject: [PATCH 0054/3013] package/rauc: bump version to 1.11.3 Contains a single fix for a regression since 1.11.0. https://github.com/rauc/rauc/releases/tag/v1.11.3 Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 6899ca94fe1..391d89a8f65 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 e47070e97f89136ca8d0b2b044c40e68ac0f44432046176d08d66717320df4a7 rauc-1.11.2.tar.xz +sha256 ef82ee452939c03a24fd40649afa96497f3cec965994e6c9c0d94239b640bc10 rauc-1.11.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 7bb374259fc..7239d84cc74 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11.2 +RAUC_VERSION = 1.11.3 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From 136d4dfbe6126b5ed20237c571f599dfc163d110 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:51:52 +0100 Subject: [PATCH 0055/3013] package/libpciaccess: bump to version 0.18 - Update hash of COPYING (update in year with: https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/cde74b51014053175497ac75cbaea10d6184ab57) - Switch to meson-package https://lists.x.org/archives/xorg-announce/2024-February/003453.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libpciaccess/libpciaccess.hash | 6 +++--- package/libpciaccess/libpciaccess.mk | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/libpciaccess/libpciaccess.hash b/package/libpciaccess/libpciaccess.hash index 27ec59a4523..4662314509a 100644 --- a/package/libpciaccess/libpciaccess.hash +++ b/package/libpciaccess/libpciaccess.hash @@ -1,4 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2022-October/003226.html -sha512 8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47 libpciaccess-0.17.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-February/003453.html +sha512 54dff9a493344586d072edf8c8eb8f7960c7dfd64aa5c51a8ec8d4e341f703fd39eb606ee41c4fdd9d5aad3372b7efe6e0fe96eadc575ea91de276320ebc3fbd libpciaccess-0.18.tar.xz # Hash for license file: -sha256 47012fd746980d1712ac4f3841ab6164bda1d2b84880760e45dbe1e1dc07f608 COPYING +sha256 f33f360f8905940dac01aa21597fe8a6727ca6f4ffa43b380e2116fd0666aa8a COPYING diff --git a/package/libpciaccess/libpciaccess.mk b/package/libpciaccess/libpciaccess.mk index 525a3bcd027..04f3e2083b5 100644 --- a/package/libpciaccess/libpciaccess.mk +++ b/package/libpciaccess/libpciaccess.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCIACCESS_VERSION = 0.17 +LIBPCIACCESS_VERSION = 0.18 LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.xz LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib LIBPCIACCESS_LICENSE = MIT @@ -13,10 +13,10 @@ LIBPCIACCESS_INSTALL_STAGING = YES LIBPCIACCESS_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBPCIACCESS_CONF_OPTS += --with-zlib +LIBPCIACCESS_CONF_OPTS += -Dzlib=enabled LIBPCIACCESS_DEPENDENCIES += zlib else -LIBPCIACCESS_CONF_OPTS += --without-zlib +LIBPCIACCESS_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From dbc6398f1d4c68fa32c5f9d6329dfff7cb109a4b Mon Sep 17 00:00:00 2001 From: Wilfred Mallawa Date: Fri, 15 Mar 2024 07:44:23 +1000 Subject: [PATCH 0056/3013] package/libspdm: bump version to 3.2.0 Additionally, add an upstream patch that fixes the configuration for "NONE" toolchain variant in libspdm. That is, where the build environment provides compile/link options. Reviewed-by: Alistair Francis Signed-off-by: Wilfred Mallawa Signed-off-by: Arnout Vandecappelle --- ...eLists-remove-fixed-options-for-NONE.patch | 52 +++++++++++++++++++ package/libspdm/libspdm.hash | 2 +- package/libspdm/libspdm.mk | 2 +- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch new file mode 100644 index 00000000000..0de0ad00793 --- /dev/null +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch @@ -0,0 +1,52 @@ +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 +From: Wilfred Mallawa +Date: Mon, 19 Feb 2024 09:56:14 +1000 +Subject: [PATCH] CMakeLists: remove fixed options for NONE + +The use of the NONE toolchain option is such that we can provide at the +build project level (buildroot etc...). However, the changes introduced +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker +option that does not comply with the definition of the options as +specified in [1]. This change removes those options. + +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments + +Upstream: https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 +Signed-off-by: Wilfred Mallawa +--- + CMakeLists.txt | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c300cc817..f6cf17d269 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(CMAKE_EXE_LINKER_FLAGS "") + + SET(CMAKE_C_LINK_EXECUTABLE "") +- +- elseif(TOOLCHAIN STREQUAL "NONE") +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- ADD_COMPILE_OPTIONS(-g) +- endif() +- if(GCOV STREQUAL "ON") +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) +- endif() +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) +- +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) +- if(GCOV STREQUAL "ON") +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") +- endif() +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") +- + endif() + + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") +-- +2.43.2 + diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 23faba1c4b0..32415bcfcec 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 34dbb457c4d..2ec35be0ac4 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.1.1 +LIBSPDM_VERSION = 3.2.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md From 0a0b522b23fdadeafbca904a56047b8cf35760df Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:42:25 +0100 Subject: [PATCH 0057/3013] package/libnfs: bump to version 5.0.3 https://github.com/sahlberg/libnfs/blob/libnfs-5.0.3/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libnfs/libnfs.hash | 2 +- package/libnfs/libnfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash index b67a5d2eda0..c5e5197c130 100644 --- a/package/libnfs/libnfs.hash +++ b/package/libnfs/libnfs.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 637e56643b19da9fba98f06847788c4dad308b723156a64748041035dcdf9bd3 libnfs-5.0.2.tar.gz +sha256 d945cb4f4c8f82ee1f3640893a168810f794a28e1010bb007ec5add345e9df3e libnfs-5.0.3.tar.gz sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index b013decfc7e..eb919406f30 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFS_VERSION = 5.0.2 +LIBNFS_VERSION = 5.0.3 LIBNFS_SITE = $(call github,sahlberg,libnfs,libnfs-$(LIBNFS_VERSION)) LIBNFS_INSTALL_STAGING = YES LIBNFS_AUTORECONF = YES From 355ceb893078b4e1d458a3367fc2c989911fefe1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:32:52 +0100 Subject: [PATCH 0058/3013] package/libkrb5: force arm mode instead of Thumb mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure in Thumb mode: /tmp/ccdzbA2E.s:845: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/08be1fa0fee0f05818cd78d4718caa3476c570ae Signed-off-by: Fabrice Fontaine Reviewed-by: André Zwing Signed-off-by: Arnout Vandecappelle --- package/libkrb5/libkrb5.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 62a34b23791..c58763eddd3 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -33,6 +33,13 @@ LIBKRB5_CONF_OPTS = \ --without-tcl \ --disable-rpath +# libkrb5 has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # Enabling static and shared at the same time is not supported ifeq ($(BR2_SHARED_STATIC_LIBS),y) LIBKRB5_CONF_OPTS += --disable-static From 773ef1fdbafc461be787f9ac69f64de62a6f55e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 Mar 2024 22:20:43 +0100 Subject: [PATCH 0059/3013] package/{mesa3d, mesa3d-headers}: bump version to 24.0.3 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000749.html https://lists.freedesktop.org/archives/mesa-announce/2024-February/000751.html https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1d006dbc910..7f39fefaf56 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.0 +MESA3D_HEADERS_VERSION = 24.0.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 49b42e2132b..1e94c2c612b 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html -sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz -sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html +sha256 77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe mesa-24.0.3.tar.xz +sha512 76b3b479877c40f729d7f530af4e3577fa74363edcd3d9474350d498a51dbb761fc034b39bee8547e97c30fd3a520cbc50c742d5a187746e83ddab1df44f37e9 mesa-24.0.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index df0079bf80e..29c67b77b99 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.0 +MESA3D_VERSION = 24.0.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From e2f87b3c15c100a411d277589ba8de1de564efd4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 Mar 2024 22:15:57 +0100 Subject: [PATCH 0060/3013] package/mesa3d: rework dri3 handling While fixing a build error ../src/egl/drivers/dri2/platform_x11.c: In function 'dri2_x11_get_msc_rate': ../src/egl/drivers/dri2/platform_x11.c:1229:44: error: 'struct dri2_egl_display' has no member named 'screen_resources' with this defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_XORG7=y (crocus and i915 drivers are also affected) it turns out that we can assume the need for dri3 support when X.org is enabled as a hard depen- dency even if mesa3d's configure does not throw errors when missing, like for the Intel drivers. Before this patch these Config.in options were used: config BR2_PACKAGE_MESA3D_DRI3 select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 which can be translated into: select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 and used at option BR2_PACKAGE_MESA3D_DRIVER. Configure option -Ddri3=enabled is passed to mesa3d when at least one driver is enabled along with X.org: ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/mesa3d/Config.in | 15 ++------------- package/mesa3d/mesa3d.mk | 4 +--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 39a4f706e23..459051b2dba 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -56,11 +56,7 @@ config BR2_PACKAGE_MESA3D_OPENCL select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL -# inform the .mk file of gallium, dri, dri3 or vulkan driver selection -config BR2_PACKAGE_MESA3D_DRI3 - bool - select BR2_PACKAGE_XLIB_LIBXSHMFENCE - +# inform the .mk file of gallium or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER @@ -71,6 +67,7 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER config BR2_PACKAGE_MESA3D_DRIVER bool + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 # Gallium xa state tracker. # Quote from mesa3d meson.build: "XA state tracker requires at least @@ -103,7 +100,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV help @@ -117,7 +113,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO # can't see is just spurious. However, that dependency is about # the toolchain having sync4 primitives, which is always a given # for arm/aarch64. - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_FREEDRENO help @@ -141,7 +136,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Utgard GPUs. @@ -158,7 +152,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. @@ -239,7 +232,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D bool "Gallium v3d driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime select BR2_PACKAGE_MESA3D_OPENGL_EGL @@ -255,7 +247,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL @@ -295,7 +286,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM bool "Vulkan broadcom driver" depends on BR2_arm || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # dri3/libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan broadcom driver. @@ -306,7 +296,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan driver for Intel hardware from Ivy Bridge onward. diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 29c67b77b99..bdb7ea9a6c2 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -29,11 +29,9 @@ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ -Dpower8=disabled -ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) MESA3D_CONF_OPTS += -Ddri3=enabled -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -endif else MESA3D_CONF_OPTS += -Ddri3=disabled endif From 9a5160ed5abded9d2b843a2422a48d4964cff42e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:41:25 +0100 Subject: [PATCH 0061/3013] package/libnfs: fix pthread option Fix typo added by commit f9f5b3a6cbc4e62beefdd0448842ef0c8c3eb6f6 Fixes: f9f5b3a6cbc4e62beefdd0448842ef0c8c3eb6f6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libnfs/libnfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index eb919406f30..e5e302a4f8b 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -17,9 +17,9 @@ LIBNFS_DEPENDENCIES += libtirpc endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBNFS_CONF_OPTS += --enable-threads +LIBNFS_CONF_OPTS += --enable-pthread else -LIBNFS_CONF_OPTS += --disable-threads +LIBNFS_CONF_OPTS += --disable-pthread endif $(eval $(autotools-package)) From 89bc66d08e17bca0c1ca40346c0c248f550b6013 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:11:17 +0100 Subject: [PATCH 0062/3013] package/multipath-tools: fix legal info Commit cc363e9a93484e734313b17962b931b3df6eedaa forgot to update hash of README.md (changes not related to license) Fixes: cc363e9a93484e734313b17962b931b3df6eedaa - http://autobuild.buildroot.org/results/d41b3eedb337ac7559afceed459c3e28a9bf15a2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/multipath-tools/multipath-tools.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 0f51c388464..c1f32e7a3b0 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 5887418b2e0e595da5aca08b2dff25298f20618f9894d5e26ce852d9d1ae90c4 README.md +sha256 9c69bb0089aa0b82b10a25095c04a7c4aec6b5bbf0776b7129123c8459fe7725 README.md From 2b59ee9f191bfaaf9dcb8d74efdcc67754d8db3e Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 15 Mar 2024 20:38:36 +0100 Subject: [PATCH 0063/3013] Config.in.legacy: fix indentation (tab instead of spaces) Found by check-package. Fixes: 53a8c5150e5eeeb6dbbead0275dbf9141f507511 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6406596540 Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b99d9c1fb56..5aaaae0eec5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -147,14 +147,14 @@ endif comment "Legacy options removed in 2024.05" config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" + bool "CodeSourcery AArch64 2014.11" select BR2_LEGACY help The Sourcery CodeBench AArch64 toolchain has been removed, use an ARM/Bootlin/Linaro toolchain instead. config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - bool "Sourcery CodeBench ARM 2014.05 has been removed" + bool "Sourcery CodeBench ARM 2014.05 has been removed" select BR2_LEGACY help The Sourcery CodeBench ARM toolchain has been removed, use From 8b025251d370357a0580acfdba876d4f8387559f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 14 Mar 2024 18:31:30 +0100 Subject: [PATCH 0064/3013] package/luarocks: bump to version 3.11.0 COPYING: update copyright notice see https://github.com/luarocks/luarocks/commit/a0bc05dcc7f44b94fb4585c560928ba9be6d8bdc Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/luarocks/buildroot.lua | 3 +++ package/luarocks/luarocks.hash | 4 ++-- package/luarocks/luarocks.mk | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/luarocks/buildroot.lua b/package/luarocks/buildroot.lua index 3c044d89b5f..2b52358667e 100644 --- a/package/luarocks/buildroot.lua +++ b/package/luarocks/buildroot.lua @@ -350,8 +350,11 @@ function buildroot.command(args) return nil, "Error loading rockspec: " .. err end if rockspec.source.file then + rockspec.source.dir = rockspec.source.dir or dir.deduce_base_dir(rockspec.source.file) ok, err = fs.unpack_archive(rockspec.source.file) if not ok then return nil, err end + else + rockspec.source.dir = rockspec.source.dir or '.' end if rockspec.source.dir ~= '.' then diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 71364569231..fbf52702168 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ffafd83b1c42aa38042166a59ac3b618c838ce4e63f4ace9d961a5679ef58253 luarocks-3.9.1.tar.gz -sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING +sha256 25f56b3c7272fb35b869049371d649a1bbe668a56d24df0a66e3712e35dd44a6 luarocks-3.11.0.tar.gz +sha256 660773f53ed17cd0d8be7d67168c25e8cc664a506788c7b5971192bdd2994a9d COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 2bec2fca255..4c992291426 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.9.1 +LUAROCKS_VERSION = 3.11.0 LUAROCKS_SITE = https://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From 30af227f9bac1e568c1208cfc392748a8ddbbf0d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 13 Mar 2024 13:19:39 -0300 Subject: [PATCH 0065/3013] configs/imx7d-sdb: bump the kernel version Bump the kernel version to 6.6.21. Also pass the nxp/imx/ path due to the devicetree reorganization in kernel 6.6. Signed-off-by: Fabio Estevam Signed-off-by: Arnout Vandecappelle --- configs/imx7d-sdb_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx7d-sdb_defconfig b/configs/imx7d-sdb_defconfig index cf4da342c15..e7f3df81568 100644 --- a/configs/imx7d-sdb_defconfig +++ b/configs/imx7d-sdb_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,10 +12,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.34" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y From 945b9f8d8e9704fd3d2dbd2579ebf9178ed49d89 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 15:14:13 -0500 Subject: [PATCH 0066/3013] package/targetcli-fb: needs python-gobject Without python-gobject, we get the following runtime error: ModuleNotFoundError: No module named 'gi' Add python-gobject and propagate its dependencies. While we're at it, split the DEPENDENCIES over several line and sort them alphabetically. Signed-off-by: Jeremy J. Peper Reviewed-by: Adam Duskett [Arnout: reorder everything alphabeticall, split DEPENDENCIES over several lines.] Signed-off-by: Arnout Vandecappelle --- package/targetcli-fb/Config.in | 13 ++++++++++++- package/targetcli-fb/targetcli-fb.mk | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/Config.in b/package/targetcli-fb/Config.in index 04c6a1ac09d..eb7528fbea4 100644 --- a/package/targetcli-fb/Config.in +++ b/package/targetcli-fb/Config.in @@ -1,12 +1,23 @@ -comment "targetcli-fb depends on Python" +comment "targetcli-fb needs Python, a glibc toolchain, gcc >= 4.9, host gcc >= 8" depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_TARGETCLI_FB bool "targetcli-fb" depends on BR2_PACKAGE_PYTHON3 # python-configshell-fb + depends on BR2_USE_MMU # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection select BR2_PACKAGE_PYTHON_CONFIGSHELL_FB select BR2_PACKAGE_PYTHON_RTSLIB_FB select BR2_PACKAGE_PYTHON_SIX + select BR2_PACKAGE_PYTHON_GOBJECT help targetcli-fb is a command-line interface for configuring the LIO generic SCSI target, present in 3.x Linux kernel diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index d2cbf79e264..56ed7c6174e 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -12,7 +12,11 @@ TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING TARGETCLI_FB_CPE_ID_VALID = YES TARGETCLI_FB_SETUP_TYPE = setuptools -TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six +TARGETCLI_FB_DEPENDENCIES = \ + python-configshell-fb \ + python-gobject \ + python-rtslib-fb \ + python-six define TARGETCLI_FB_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/targetcli-fb/S50target \ From 242781bb61bdad2690b089cc5eaf7705d2632e5d Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:25 -0500 Subject: [PATCH 0067/3013] package/targetcli-fb: bump version to 2.1.58 bump to latest version because previous version did not work with python 3.11 corrected version mismatch with my first submission Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 64f68a6675a..1732fa99e54 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz +sha256 605f4e4e4e7189d6a03f11a4f55e7ddb4671002d542c2f684f87dd68391dcdc2 targetcli-fb-2.1.58.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 56ed7c6174e..503b9224d03 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.54 +TARGETCLI_FB_VERSION = 2.1.58 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From 0c27711002a82bbbb47363efceb526be7862bab3 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:26 -0500 Subject: [PATCH 0068/3013] package/python-configshell-fb: bump version to 1.1.30 bump to latest version because previous version did not work with python 3.11 Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle --- package/python-configshell-fb/python-configshell-fb.hash | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 8fc38f61a6b..e090501056a 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz +sha256 44696b92bea2b44c1d0bf2828477dddeb3b4dfb312ad82ce06d7b704c0985e27 python-configshell-fb-1.1.30.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index d0dd421e8da..3446a86e8db 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.30 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING From 8a69af5fa4b545767ab292d1ad01266b87d45e92 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:27 -0500 Subject: [PATCH 0069/3013] package/python-rtslib-fb: 2.1.76 bump to latest version because previous version did not work with python 3.11 Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle --- package/python-rtslib-fb/python-rtslib-fb.hash | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index 3c2e39fffd1..39c390edb26 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz +sha256 ac15c113d09209c7b0d14d94a12ed88205a7c2feadd1096f573049fd737f7e74 python-rtslib-fb-2.1.76.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 09bde874f0b..6396d26a3f5 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.74 +PYTHON_RTSLIB_FB_VERSION = 2.1.76 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 From 33605ea6d9b370d052dbf6b06d89e7b2a16d4275 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 13:51:32 +0100 Subject: [PATCH 0070/3013] toolchain: drop codescape mips toolchains Codescape mips toolchains are old (2018) and use glibc 2.20 which is not compatible with 64-bit time_t raising the following build failure with libselinux since commit 1c2dbcdcf0bb589d325c379246acaa39bb07b7be: In file included from selinux_restorecon.c:17:0: /home/buildroot/autobuild/instance-1/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/fts.h:41:3: error: #error " cannot be used with -D_FILE_OFFSET_BITS==64" # error " cannot be used with -D_FILE_OFFSET_BITS==64" ^~~~~ Fixes: 1c2dbcdcf0bb589d325c379246acaa39bb07b7be - http://autobuild.buildroot.org/results/a4d38af627a42a2c55d60129787c51353d5883bf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 16 +++- package/openblas/Config.in | 4 - toolchain/toolchain-external/Config.in | 6 +- .../Config.in | 66 ---------------- .../Config.in.options | 9 --- ...toolchain-external-codescape-img-mips.hash | 4 - .../toolchain-external-codescape-img-mips.mk | 51 ------------- .../Config.in | 76 ------------------- .../Config.in.options | 9 --- ...toolchain-external-codescape-mti-mips.hash | 4 - .../toolchain-external-codescape-mti-mips.mk | 51 ------------- 11 files changed, 16 insertions(+), 280 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk diff --git a/Config.in.legacy b/Config.in.legacy index 5aaaae0eec5..1d3dc8b5c8a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,8 +146,22 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape IMG GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + bool "Codescape MTI GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape MTI GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" + bool "CodeSourcery AArch64 2014.11 has been removed" select BR2_LEGACY help The Sourcery CodeBench AArch64 toolchain has been removed, diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 74c4a3aa5cc..7d4727003b5 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -26,11 +26,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "PPC970" if BR2_powerpc_970 default "PPC440" if BR2_powerpc_440 default "PPC440FP2" if BR2_powerpc_440fp - # P5600 is built with MSA support which is only available in Codescape toolchains - default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS default "MIPS64_GENERIC" if BR2_MIPS_CPU_MIPS64 - # I6400 is built with MSA support which is only available in Codescape toolchains - default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS # OpenBLAS assumes SPARC=Sparc v9 default "SPARC" if BR2_sparc_v9 # Cortex-A15 always have a VFPv4 diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index b5432b71d7d..af9082cf6eb 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -26,10 +26,8 @@ source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" -# MIPS (use codesourcery toolchain by default) +# MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" -source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" -source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in" # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" @@ -130,8 +128,6 @@ source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.o # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options" # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in deleted file mode 100644 index d49c6102375..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ /dev/null @@ -1,66 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - bool "Codescape IMG GNU Linux Toolchain 2018.09" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - help - Codescape IMG GNU Linux Toolchain 2018.09 for the MIPS - architecture, from MIPS Tech LLC. It uses gcc 6.3.0, - binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers - 4.7. It has support for the following variants: - - MIPS32r6 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Big-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options deleted file mode 100644 index 3eaa2a9522b..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "mips-img-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codescape-img-mips" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash deleted file mode 100644 index 65e1861f127..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Codescape toolchains from MIPS Tech LLC -# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 ac035f3b6a8767522977963d8e1490520d58bccca7956f4503a1eefff6492b71 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz -sha256 09280f4fcbb993607905bf9a43bf5f3db2beed85726f0675b8453e19a9ddc429 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk deleted file mode 100644 index 55424918c77..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# toolchain-external-codescape-img-mips -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION = 2018.09-02 -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STRIP_COMPONENTS = 2 - -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz -else -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz -endif - -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n64 -endif - -define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef - -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} -endef - -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_POST_INSTALL_STAGING_HOOKS += \ - TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS \ - TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK - -$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in deleted file mode 100644 index 720d705d14b..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ /dev/null @@ -1,76 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - bool "Codescape MTI GNU Linux Toolchain 2018.09" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - help - Codescape MTI GNU Linux Toolchain 2018.09 for the MIPS - architecture, from MIPS Tech LLC. It uses gcc 6.3.0, - binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers - 4.7. It has support for the following variants: - - MIPS32r2 - Big-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Big-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options deleted file mode 100644 index 464c9b84489..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "mips-mti-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codescape-mti-mips" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash deleted file mode 100644 index b07281de488..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Codescape toolchains from MIPS Tech LLC -# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 c883a404fd7ea5718e2249a530802e223381f2be52265f88e9b1ce7035c232f3 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz -sha256 d6310a970b0a8a19ad8e0a2b3ead8c38ee90d0e284a9b2511200ce447f460d2c Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk deleted file mode 100644 index 9bee1ab87d8..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# toolchain-external-codescape-mti-mips -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION = 2018.09-02 -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STRIP_COMPONENTS = 2 - -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz -else -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz -endif - -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n64 -endif - -define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef - -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} -endef - -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_POST_INSTALL_STAGING_HOOKS += \ - TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS \ - TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK - -$(eval $(toolchain-external-package)) From 9347905b95dfe045ee40ae69d9d3f00a2c1b7168 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 13:56:31 +0100 Subject: [PATCH 0071/3013] package/squid: fix build with host gcc 10 Pass -std=c++17 to fix the following build failure with host gcc 10 raised since bump to version 6.6 in commit c13199c9326fa2daa574f08ec8fc063a48d0eb06: /usr/bin/g++ -O2 -I/home/buildroot/instance-0/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src ./cf_gen.cc: In function 'int main(int, char**)': ./cf_gen.cc:268:63: error: forming reference to void 268 | auto &newEntry = entries.emplace_back(name); | ^ Fixes: - http://autobuild.buildroot.org/results/613fee008c77f8dbbe04df9a4ce4347e43de9ef9 - https://bugs.buildroot.org/show_bug.cgi?id=15997 Reported-by: Roland Franke Suggested-by: Peter Seiderer Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/squid/squid.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 3a9edac71e3..6a2b5223364 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -21,7 +21,7 @@ SQUID_CONF_ENV = \ ac_cv_func_strnstr=no \ ac_cv_have_squid=yes \ BUILDCXX="$(HOSTCXX)" \ - BUILDCXXFLAGS="$(HOST_CXXFLAGS)" + BUILDCXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" SQUID_CONF_OPTS = \ --enable-async-io=8 \ --enable-linux-netfilter \ From 54dbd8e2c5c0b2f40cb53066b265535266eaf8d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 10:40:37 +0100 Subject: [PATCH 0072/3013] package/poco: needs C++17 poco needs C++17 and gcc >=8 since bump to version 1.13.2 in commit 433c4fd38b15efcf74b410e5068e2e51eeba6e46 and https://github.com/pocoproject/poco/commit/78234857bf416b718455496800d1b7be3a0d0a53 https://github.com/pocoproject/poco/commit/10f41c06d9416a6ae0884c4827ea2a91bf5d2cf8 resulting in the following build failure with gcc 7: In file included from src/Thread.cpp:28:0: src/Thread_POSIX.cpp: In member function 'void Poco::ThreadImpl::setNameImpl(const string&)': src/Thread_POSIX.cpp:162:56: error: no matching function for call to 'std::__cxx11::basic_string::append(const string&, std::__cxx11::basic_string::size_type)' truncName.append(threadName, threadName.size() - half); ^ Fixes: 433c4fd38b15efcf74b410e5068e2e51eeba6e46 - http://autobuild.buildroot.org/results/7b1c144f39a8be4ce8f964aa13a52d0bf62dd0aa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/poco/Config.in | 6 +++--- package/poco/poco.mk | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index 7cb9987ec7a..9bdef125ad3 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() @@ -116,8 +116,8 @@ config BR2_PACKAGE_POCO_ZIP endif # BR2_PACKAGE_POCO -comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14" +comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 8" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS diff --git a/package/poco/poco.mk b/package/poco/poco.mk index cc8a22fc2a3..233252c67b0 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -68,7 +68,6 @@ define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ - --cflags=-std=c++14 \ --ldflags="$(POCO_LDFLAGS)" \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ From 0ee43b015768dc13649fb13096ed6d3f1da654c9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 16 Feb 2024 21:59:04 +0100 Subject: [PATCH 0073/3013] package/libnss: bump version to 3.99 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index fdfe9773d27..8c7c807f792 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_97_RTM/src/SHA256SUMS -sha256 078efb8393f32e40b1fb4bf6930fff7f1aabed01287fcc5fe58aba736765fa0a nss-3.97.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_99_RTM/src/SHA256SUMS +sha256 5cd5c2c8406a376686e6fa4b9c2de38aa280bea07bf927c0d521ba07c88b09bd nss-3.99.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 60a33456b0a..671228ec8f8 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.97 +LIBNSS_VERSION = 3.99 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From f68c45f73334b9c83c44e5bbb3d505050f8b720e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:32 +0100 Subject: [PATCH 0074/3013] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c6..c3ad555a818 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y From fde806f8220720b95cb3973fe9d7e55057a1bee7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:33 +0100 Subject: [PATCH 0075/3013] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d..097175bd8f3 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y From a01997fd393cdbc9b7912afa0f1aaaba0684fb56 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:34 +0100 Subject: [PATCH 0076/3013] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a818..a129e216d25 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From e3a3e163253cd702d99ba731d546f2cdb6eedc05 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:35 +0100 Subject: [PATCH 0077/3013] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f3..26195194c7d 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From a904f1530f9a8613c077c17395d92a065cf11737 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:36 +0100 Subject: [PATCH 0078/3013] boot/ti-k3-r5-loader: bump to version 2024.01 All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version. Keep the old hash so that defconfigs still have a hash to validate downloads against. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi [yann.morin.1998@free.fr: keep the old hash] Signed-off-by: Yann E. MORIN --- boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a..5f86c045c99 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f..279cb7763af 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From 2d004d83016f0c69c63ec30aaef2f8e25de155a2 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:37 +0100 Subject: [PATCH 0079/3013] package/python-attrs: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc440..fb1729e62fa 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) From 7e2387edaf33b15eb96aa453af3c9631437f8511 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:38 +0100 Subject: [PATCH 0080/3013] package/python-rpds-py: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fd..cee2ff290a4 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) From a86104ea9575ee693f768b1a64b2b18b534ff68e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:39 +0100 Subject: [PATCH 0081/3013] package/python-referencing: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913..66d59ed8091 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) From 1ddb3c82ea6d29f1b80ddd206e0e35a0dfdec762 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:40 +0100 Subject: [PATCH 0082/3013] package/python-jsonschema-specifications: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- .../python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d..653c839bb45 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) From c93d137303693cfb91b5d0d79433930cfe7d59c7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:41 +0100 Subject: [PATCH 0083/3013] package/python-jsonschema: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa775..9e8b6e18b87 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) From 455ce5fc02488983a6732087bcbbb15e04c75937 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Mar 2024 21:06:46 +0100 Subject: [PATCH 0084/3013] package/putty: fix arm uclibc build Fix the following arm uclibc build failure raised since bump to version 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 which wrongly removed patch because file was renamed. Patch was sent upstream in 2021 but rejected, even a second iteration defining AT_HWCAP2 to 26 if needed was also rejected. Fixes: 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f Signed-off-by: Fabrice Fontaine [Arnout: add Upstream: to patch comment] Signed-off-by: Arnout Vandecappelle --- ...-arm_arch_queries.h-fix-uclibc-build.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch diff --git a/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch new file mode 100644 index 00000000000..d2abcb64cf7 --- /dev/null +++ b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch @@ -0,0 +1,41 @@ +From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 19 Mar 2024 20:37:33 +0100 +Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build + +Build on uclibc is broken since version 0.75 and commit +65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used +even if is not available: + +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: In function 'platform_aes_neon_available': +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: error: 'AT_HWCAP2' undeclared (first use in this function) + 18 | return getauxval(AT_HWCAP2) & HWCAP2_AES; + | ^~~~~~~~~ + +To fix this build failure, include + +Fixes: + - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f + +Upstream: Rejected after sending to Simon Tatham +Signed-off-by: Fabrice Fontaine +--- + unix/utils/arm_arch_queries.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/unix/utils/arm_arch_queries.h b/unix/utils/arm_arch_queries.h +index fa46c622..5cce7f31 100644 +--- a/unix/utils/arm_arch_queries.h ++++ b/unix/utils/arm_arch_queries.h +@@ -18,6 +18,8 @@ + + #if defined __arm__ || defined __aarch64__ + ++#include ++ + #if HAVE_SYS_TYPES_H + #include + #endif +-- +2.43.0 + From 87504a1b7948dbfa3648ad02c3c034a3c36dcd92 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Mar 2024 23:24:08 +0100 Subject: [PATCH 0085/3013] package/pulseaudio: bump to version 17.0 - Drop three upstreamed patches - This bump will fix the following build failure raised since bump of webrtc-audio-processsing to version 1.3 in commit ef0fa986eb7ff25c0a5db70ec0b62032e2d71538: ../output-1/build/pulseaudio-16.1/meson.build:723:15: ERROR: Dependency "webrtc-audio-processing" not found, tried pkgconfig and cmake https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/blob/v17.0/NEWS Fixes: ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 - http://autobuild.buildroot.org/results/528717c7481adbb5333d77758ef94830f46bc3f1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 3 - ...ild-sys-Fix-atomic-support-detection.patch | 59 -------- ...d-missing-libatomic_ops-dependencies.patch | 129 ------------------ ...0004-meson.build-fix-build-without-C.patch | 56 -------- package/pulseaudio/pulseaudio.hash | 4 +- package/pulseaudio/pulseaudio.mk | 2 +- 6 files changed, 3 insertions(+), 250 deletions(-) delete mode 100644 package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch delete mode 100644 package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch delete mode 100644 package/pulseaudio/0004-meson.build-fix-build-without-C.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0a993096829..3b64c90d8bc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1030,9 +1030,6 @@ package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch Upst package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch Upstream package/ptpd2/S65ptpd2 Indent Shellcheck Variables package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch Upstream -package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch Upstream -package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch Upstream -package/pulseaudio/0004-meson.build-fix-build-without-C.patch Upstream package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch Upstream package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch Upstream diff --git a/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch b/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch deleted file mode 100644 index 631cb7f0161..00000000000 --- a/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a5392576ceba92d04706cefc1929ddd5ace5537a Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Fri, 1 Jul 2022 14:03:44 +0200 -Subject: [PATCH] build-sys: Fix atomic support detection - -Attempting to use atomics operations on an architecture that does not -support them generally results in a link error: - -ld: /tmp/ccjYcMPP.o: in function `func': -testfile.c:(.text+0x1c): undefined reference to `__sync_bool_compare_and_swap_4' - -The current build system uses cc.compiles() to check if atomic ops are -supported, but cc.compiles() does not attempt to link, so the test fails -to enable libatomics_opts. - -Fix this by using cc.links() instead of cc.compiles(). - -Signed-off-by: Nicolas Cavallari -Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] ---- - meson.build | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index c6db7e670..c5135330f 100644 ---- a/meson.build -+++ b/meson.build -@@ -498,22 +498,24 @@ endif - - need_libatomic_ops = false - --atomictest = '''void func() { -+atomictest = '''int main() { - volatile int atomic = 2; - __sync_bool_compare_and_swap (&atomic, 2, 3); -+ return 0; - } - ''' - --if cc.compiles(atomictest) -+if cc.links(atomictest) - cdata.set('HAVE_ATOMIC_BUILTINS', 1) - -- newatomictest = '''void func() { -+ newatomictest = '''int main() { - int c = 0; - __atomic_store_n(&c, 4, __ATOMIC_SEQ_CST); -+ return 0; - } - ''' - -- if(cc.compiles(newatomictest)) -+ if(cc.links(newatomictest)) - cdata.set('HAVE_ATOMIC_BUILTINS_MEMORY_MODEL', 1) - endif - --- -2.36.1 - diff --git a/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch b/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch deleted file mode 100644 index fac441e7dd2..00000000000 --- a/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 96361ff2a8f37dd3ce7ea188ce4e7b038bb6a5aa Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Mon, 4 Jul 2022 13:49:34 +0200 -Subject: [PATCH] build-sys: Add missing libatomic_ops dependencies - -Add libatomic_ops dependencies to libraries/modules that showed a -failure on an arch that does not have native atomic operations support. - -Not all optional dependencies were tested, so it is possible that -some optional modules are still missing libatomic_ops dependencies. - -Signed-off-by: Nicolas Cavallari -Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] ---- - src/meson.build | 2 +- - src/modules/meson.build | 6 +++--- - src/pulse/meson.build | 2 +- - src/pulsecore/meson.build | 10 +++++----- - 4 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index 96dcec354..9efb561d8 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -205,7 +205,7 @@ else - libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep, - x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true), - gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep, -- platform_dep, platform_socket_dep, execinfo_dep, -+ platform_dep, platform_socket_dep, execinfo_dep, libatomic_ops_dep, - ], - implicit_include_directories : false) - -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 1d8004300..1e12569dc 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -14,7 +14,7 @@ all_modules = [ - [ 'module-cli-protocol-tcp', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_TCP_SOCKETS'], [], libprotocol_cli ], - [ 'module-cli-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_UNIX_SOCKETS'], [], libprotocol_cli ], - [ 'module-combine', 'module-combine.c' ], -- [ 'module-combine-sink', 'module-combine-sink.c' ], -+ [ 'module-combine-sink', 'module-combine-sink.c', [], [], [libatomic_ops_dep] ], - # [ 'module-coreaudio-detect', 'macosx/module-coreaudio-detect.c' ], - # [ 'module-coreaudio-device', 'macosx/module-coreaudio-device.c' ], - [ 'module-default-device-restore', 'module-default-device-restore.c', [], [], [], libprotocol_native ], -@@ -73,7 +73,7 @@ endif - - if host_machine.system() != 'windows' - all_modules += [ -- [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [], librtp ], -+ [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [libatomic_ops_dep], librtp ], - [ 'module-rtp-send', 'rtp/module-rtp-send.c' , [], [], [], librtp ], - ] - endif -@@ -243,7 +243,7 @@ module_echo_cancel_sources = [ - ] - module_echo_cancel_orc_sources = [] - module_echo_cancel_flags = [] --module_echo_cancel_deps = [] -+module_echo_cancel_deps = [libatomic_ops_dep] - module_echo_cancel_libs = [] - - if get_option('adrian-aec') -diff --git a/src/pulse/meson.build b/src/pulse/meson.build -index c2128e087..1b82c807c 100644 ---- a/src/pulse/meson.build -+++ b/src/pulse/meson.build -@@ -85,7 +85,7 @@ libpulse = shared_library('pulse', - link_args : [nodelete_link_args, versioning_link_args], - install : true, - install_rpath : privlibdir, -- dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep], -+ dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep, libatomic_ops_dep], - implicit_include_directories : false) - - libpulse_dep = declare_dependency(link_with: libpulse) -diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build -index b30264b3a..b37fec499 100644 ---- a/src/pulsecore/meson.build -+++ b/src/pulsecore/meson.build -@@ -251,7 +251,7 @@ libcli = shared_library('cli', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -268,7 +268,7 @@ libprotocol_cli = shared_library('protocol-cli', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep, libatomic_ops_dep], - install : true, - install_rpath : rpath_dirs, - install_dir : modlibexecdir, -@@ -280,7 +280,7 @@ libprotocol_http = shared_library('protocol-http', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -292,7 +292,7 @@ libprotocol_native = shared_library('protocol-native', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -304,7 +304,7 @@ libprotocol_simple = shared_library('protocol-simple', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, --- -2.36.1 - diff --git a/package/pulseaudio/0004-meson.build-fix-build-without-C.patch b/package/pulseaudio/0004-meson.build-fix-build-without-C.patch deleted file mode 100644 index e770927f541..00000000000 --- a/package/pulseaudio/0004-meson.build-fix-build-without-C.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ac88536d7c3fde3c22933368296c9029bb67b9fc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 25 Jul 2022 21:49:25 +0200 -Subject: [PATCH] meson.build: fix build without C++ - -Fix the following build failure without C++: - -../output-1/build/pulseaudio-16.1/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++']] -The following exception(s) were encountered: -Running "/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++ --version" gave "[Errno 2] No such file or directory: '/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++'" - -Fixes: - - http://autobuild.buildroot.org/results/6526a21bd4da3b8458188f27c1ec04c381e4b673 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/737] ---- - meson.build | 3 ++- - src/modules/echo-cancel/meson.build | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c5135330f..8248f263b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('pulseaudio', 'c', 'cpp', -+project('pulseaudio', 'c', - version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(), - meson_version : '>= 0.50.0', - default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] -@@ -433,6 +433,7 @@ endif - # Code coverage - - if get_option('gcov') -+ add_languages('cpp') - add_project_arguments('--coverage', language: ['c', 'cpp']) - add_project_link_arguments('--coverage', language: ['c', 'cpp']) - endif -diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build -index 641cd35e7..3b998364e 100644 ---- a/src/modules/echo-cancel/meson.build -+++ b/src/modules/echo-cancel/meson.build -@@ -6,6 +6,8 @@ - # '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails - # at link time. - -+add_languages('cpp') -+ - libwebrtc_util_sources = [ - 'webrtc.cc' - ] --- -GitLab - diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index acbb56a07df..67f6cc6ef2e 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2022-June/032287.html -sha256 8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4 pulseaudio-16.1.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2024-January/032426.html +sha256 053794d6671a3e397d849e478a80b82a63cb9d8ca296bd35b73317bb5ceb87b5 pulseaudio-17.0.tar.xz # Locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 89191db541d..254e05348d4 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 16.1 +PULSEAUDIO_VERSION = 17.0 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = https://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES From fee7efafd05872282e24a6923e40c1505e041196 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 18 Mar 2024 23:04:20 +0100 Subject: [PATCH 0086/3013] support/scripts: use FKIE git tree Currently, we grab the per-year CVE feeds, in two passes: first, we grab the meta files, and check whether something has changed since last we downloaded it; second, we download the feed proper, unless the meta file has not changed, in which case we use the locally cached feed. However, it has appeared that the FKIE releases no longer provide the meta files, which means that (once again), our daily reports are broken. The obvious fix would be to drop the use of the meta file, and always and unconditionally download the feeds. That's relatively trivial to do, but the feeds are relatively big (even as xz-xompressed). However, the CVE database from FKIE is available as a git tree. Git is pretty good at only sending delta when updating a local copy. In addition, the git tree, contains each CVE as an individual file, so it is relatively easier to scan and parse. Switch to using a local git clone. Slightly surprisingly (but not so much either), parsing the CVE files is much faster when using the git working copy, than it is when parsing the per-year feeds: indeed, the per-year feeds are xz-compressed, and even if python is slow-ish to scan a directory and opening files therein, it is still much faster than to decompress xz files. The timing delta [0] is ~100s before and ~10s now, about a ten time improvement, over the whole package set. The drawback, however, is that the git tree is much bigger on-disk, from ~55MiB for the per-year compressed feeds, to 2.1GiB for the git tree (~366MiB) and a working copy (~1.8GiB)... Given very few people are going to use that, that's considered acceptable... Eventually, with a bit of hacking [1], the two pkg-stats, before and after this change, yield the same data (except for the date and commit hash). [0] hacking support/scripts/pkg-stats to display the time before/after the CVE scan, and hacking support/scripts/cve.py to do no download so that only the CVE scan happens (and also because the meta files are no longer available). [1] sorting the CVE lists in json, sorting the json keys, and using the commit from the FKIE git tree that was used for the current per-year feeds. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 88 ++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 59 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 7167ecbc6a8..e25825581e0 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -19,29 +19,16 @@ import datetime import os -import requests # URL checking import distutils.version -import lzma -import time +import json +import subprocess import sys import operator -try: - import ijson - # backend is a module in < 2.5, a string in >= 2.5 - if 'python' in getattr(ijson.backend, '__name__', ijson.backend): - try: - import ijson.backends.yajl2_cffi as ijson - except ImportError: - sys.stderr.write('Warning: Using slow ijson python backend\n') -except ImportError: - sys.stderr.write("You need ijson to parse NVD for CVE check\n") - exit(1) - sys.path.append('utils/') NVD_START_YEAR = 1999 -NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" +NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/" ops = { '>=': operator.ge, @@ -81,41 +68,24 @@ def __init__(self, nvd_cve): self.nvd_cve = nvd_cve @staticmethod - def download_nvd_year(nvd_path, year): - metaf = "CVE-%s.meta" % year - path_metaf = os.path.join(nvd_path, metaf) - jsonf_xz = "CVE-%s.json.xz" % year - path_jsonf_xz = os.path.join(nvd_path, jsonf_xz) - - # If the database file is less than a day old, we assume the NVD data - # locally available is recent enough. - if os.path.exists(path_jsonf_xz) and os.stat(path_jsonf_xz).st_mtime >= time.time() - 86400: - return path_jsonf_xz - - # If not, we download the meta file - url = "%s/%s" % (NVD_BASE_URL, metaf) - print("Getting %s" % url) - page_meta = requests.get(url) - page_meta.raise_for_status() - - # If the meta file already existed, we compare the existing - # one with the data newly downloaded. If they are different, - # we need to re-download the database. - # If the database does not exist locally, we need to redownload it in - # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_xz): - meta_known = open(path_metaf, "r").read() - if page_meta.text == meta_known: - return path_jsonf_xz - - # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_xz) - print("Getting %s" % url) - page_json = requests.get(url) - page_json.raise_for_status() - open(path_jsonf_xz, "wb").write(page_json.content) - open(path_metaf, "w").write(page_meta.text) - return path_jsonf_xz + def download_nvd(nvd_git_dir): + print(f"Updating from {NVD_BASE_URL}") + if os.path.exists(nvd_git_dir): + subprocess.check_call( + ["git", "pull"], + cwd=nvd_git_dir, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + else: + # Create the directory and its parents; git + # happily clones into an empty directory. + os.makedirs(nvd_git_dir) + subprocess.check_call( + ["git", "clone", NVD_BASE_URL, nvd_git_dir], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) @staticmethod def sort_id(cve_ids): @@ -131,15 +101,15 @@ def read_nvd_dir(cls, nvd_dir): feeds since NVD_START_YEAR. If the files are missing or outdated in nvd_dir, a fresh copy will be downloaded, and kept in .json.gz """ + nvd_git_dir = os.path.join(nvd_dir, "git") + CVE.download_nvd(nvd_git_dir) for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): - filename = CVE.download_nvd_year(nvd_dir, year) - try: - content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') - except: # noqa: E722 - print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) - raise - for cve in content: - yield cls(cve) + for dirpath, _, filenames in os.walk(os.path.join(nvd_git_dir, f"CVE-{year}")): + for filename in filenames: + if filename[-5:] != ".json": + continue + with open(os.path.join(dirpath, filename), "rb") as f: + yield cls(json.load(f)) def each_product(self): """Iterate over each product section of this cve""" From 356a93594de1c6a67dc35c335b35531c4607d284 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 18 Mar 2024 21:38:55 +0100 Subject: [PATCH 0087/3013] package/harfbuzz: bump to version 8.3.1 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index fbe890910ae..f107aee8c2b 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847 harfbuzz-8.3.0.tar.xz +sha256 f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c harfbuzz-8.3.1.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 599ea548d08..e3da4add43f 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.3.0 +HARFBUZZ_VERSION = 8.3.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From f9ef4ed8657cf58d743ada711071303d6f3d800a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 18 Mar 2024 21:35:37 +0100 Subject: [PATCH 0088/3013] package/rtl8812au-aircrack-ng: bump to version 2024-03-16 on branch v5.6.4.2 This version adds support up to Linux version 6.8. Signed-off-by: Giulio Benetti Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index 414ea98b08b..6283cb0f87f 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 969fa96c90e16fcaf8f6b30d4576a8446c7041932bea34bbfea7e9c91038bfe5 rtl8812au-aircrack-ng-4a983e47dafc048019412350d36270864f6b5f2d.tar.gz +sha256 752d9ae67140966eddc463238fde1f6b86457db22a45f61c13886c3244eaffe1 rtl8812au-aircrack-ng-f23979f0d20aafb563ac71b56fcbc74268c798c2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index df3b03998e4..d5571b9d5c7 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = 4a983e47dafc048019412350d36270864f6b5f2d +RTL8812AU_AIRCRACK_NG_VERSION = f23979f0d20aafb563ac71b56fcbc74268c798c2 RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From 3d8e92e318c39b9d838ca607a3213c7ed1f69bc0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 23:00:28 +0100 Subject: [PATCH 0089/3013] package/osm2pgsql: only supports 64 bits osm2pgsql only supports 64 bits architectures since bump to version 1.10.0 in commit e056aeeca9cf8c00c6da62c39979ce6c55c92791 and https://github.com/osm2pgsql-dev/osm2pgsql/commit/389904269a1b1f246641d203abadfcd5cebb97cc resulting in the following build failure with arm: CMake Error at CMakeLists.txt:20 (message): osm2pgsql needs a 64 bit architecture Fixes: e056aeeca9cf8c00c6da62c39979ce6c55c92791 - http://autobuild.buildroot.org/results/30c2675a732fd810c68dffbb6483f9cf8e4fcbf3 Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle --- package/osm2pgsql/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index c6a38f31806..439309df951 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" + depends on BR2_ARCH_IS_64 depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium @@ -24,9 +25,11 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_ARCH_IS_64 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS comment "osm2pgsql needs a toolchain not affected by GCC bug 64735" + depends on BR2_ARCH_IS_64 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 From 752ab5a9e635f4c039c031ed00381356b60f4398 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:47:01 +0100 Subject: [PATCH 0090/3013] package/mraa: fix build with musl >= 1.2.5 Fix the following build failure with musl >= 1.2.5 (raised since commit f7f03445cf320adbbc41270a806b38c911d3454a): /home/autobuild/autobuild/instance-9/output-1/build/mraa-2.2.0/src/mraa.c: In function 'mraa_count_iio_devices': /home/autobuild/autobuild/instance-9/output-1/build/mraa-2.2.0/src/mraa.c:341:38: error: implicit declaration of function 'basename'; did you mean 'rename'? [-Werror=implicit-function-declaration] 341 | if (fnmatch(IIO_DEVICE_WILDCARD, basename(path), 0) == 0) { | ^~~~~~~~ | rename Fixes: f7f03445cf320adbbc41270a806b38c911d3454a - http://autobuild.buildroot.org/results/1f16df70e49a9f8823a791c0fcc677de07136835 Signed-off-by: Fabrice Fontaine Reviewed-by: Pieterjan Camerlynck Signed-off-by: Arnout Vandecappelle --- .../mraa/0002-mraa-Use-posix-basename.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/mraa/0002-mraa-Use-posix-basename.patch diff --git a/package/mraa/0002-mraa-Use-posix-basename.patch b/package/mraa/0002-mraa-Use-posix-basename.patch new file mode 100644 index 00000000000..3c5c99f031c --- /dev/null +++ b/package/mraa/0002-mraa-Use-posix-basename.patch @@ -0,0 +1,45 @@ +From 47c3850cddd63cebd9dc48e411963314449118f1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 31 Dec 2023 19:16:35 -0800 +Subject: [PATCH] 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 + +Upstream: https://github.com/eclipse/mraa/commit/47c3850cddd63cebd9dc48e411963314449118f1 +Signed-off-by: Fabrice Fontaine +--- + src/mraa.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/mraa.c b/src/mraa.c +index 653ea1fa7..b556d0455 100644 +--- a/src/mraa.c ++++ b/src/mraa.c +@@ -12,6 +12,7 @@ + #endif + + #include ++#include + #include + #include + #include +@@ -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; + } + From 43ca417c0c883f245dde9be82d49c49adaceea2c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:12:45 +0100 Subject: [PATCH 0091/3013] package/containerd: fix btrfs handling btrfs handling doesn't depend on btrfs-progs but on kernel >= 4.12 since bump to version 1.7.7 in commit 79e01ef9506a6cdc4836912607dc594ae7b1999d and https://github.com/containerd/containerd/commit/024a748c092cbddde0918f2e93a646ce50116e11 resulting in the following build failure: In file included from vendor/github.com/containerd/btrfs/v2/btrfs.go:21:0: ./btrfs.h:19:2: error: #error "Headers from kernel >= 4.12 are required on compilation time (not on run time)" #error "Headers from kernel >= 4.12 are required on compilation time (not on run time)" ^~~~~ In file included from vendor/github.com/containerd/btrfs/v2/btrfs.go:21:0: ./btrfs.h:22:10: fatal error: linux/btrfs_tree.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~ Fixes: 79e01ef9506a6cdc4836912607dc594ae7b1999d - http://autobuild.buildroot.org/results/d6afeef47daae1783dcce3e2b6a0a16e3e5d5fbd Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/containerd/Config.in | 7 ++++--- package/containerd/containerd.mk | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 12a53bc1112..2dd04b109c7 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -20,12 +20,13 @@ if BR2_PACKAGE_CONTAINERD config BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS bool "btrfs snapshot driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 help Build the btrfs snapshot driver for containerd. +comment "brtfs snapshot driver needs headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_CONTAINERD_DRIVER_DEVMAPPER bool "devmapper snapshot driver" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 50c2965b873..9bf51c93ae4 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -35,9 +35,7 @@ CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf CONTAINERD_TAGS += seccomp endif -ifeq ($(BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS),y) -CONTAINERD_DEPENDENCIES += btrfs-progs -else +ifneq ($(BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS),y) CONTAINERD_TAGS += no_btrfs endif From e30b38f1c5bcc62d387f4b96d20a7a9f4715c7a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:14:56 +0100 Subject: [PATCH 0092/3013] package/docker-engine: fix btrfs handling btrfs doesn't depend on btrfs-progs but on headers >= 4.12 since bump to version 24.0.2 in commit 314f62eda347ba02b4688ac94c6bab55b4a4d6c9 and https://github.com/moby/moby/commit/3208dcabdc8997340b255f5b880fef4e3f54580d resulting in the following build failure: daemon/graphdriver/btrfs/btrfs.go:13:6: error: #error "Headers from kernel >= 4.12 are required to build with Btrfs support." #error "Headers from kernel >= 4.12 are required to build with Btrfs support." ^~~~~ daemon/graphdriver/btrfs/btrfs.go:14:6: error: #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs." #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs." ^~~~~ daemon/graphdriver/btrfs/btrfs.go:18:10: fatal error: linux/btrfs_tree.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~ Fixes: 314f62eda347ba02b4688ac94c6bab55b4a4d6c9 - http://autobuild.buildroot.org/results/7d07eba37149d341dc86f9742bd166de874dcd5e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 7 ++++--- package/docker-engine/docker-engine.mk | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 71bf670f17f..d48ffe6484a 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -21,12 +21,13 @@ if BR2_PACKAGE_DOCKER_ENGINE config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS bool "btrfs filesystem driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 help Build the btrfs filesystem driver for Docker. +comment "brtfs filesystem driver needs headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER bool "devicemapper filesystem driver" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 262be2df202..05bf23ad3de 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -35,9 +35,7 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) -DOCKER_ENGINE_DEPENDENCIES += btrfs-progs -else +ifneq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) DOCKER_ENGINE_TAGS += exclude_graphdriver_btrfs endif From 8b3497f3ab19ec828a94eaf19923a07603b5e916 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:05:05 +0100 Subject: [PATCH 0093/3013] package/mariadb: requires DES in openssl Enable DES in openssl to avoid the following build failure raised since commit a83d41867c8d69a77d5cd0a665aa216af5340359: In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/mysqld.cc:50, from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/lib_sql.cc:34: /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:26:3: error: 'DES_cblock' does not name a type 26 | DES_cblock key1, key2, key3; | ^~~~~~~~~~ /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:31:3: error: 'DES_key_schedule' does not name a type; did you mean 'st_des_keyschedule'? 31 | DES_key_schedule ks1, ks2, ks3; | ^~~~~~~~~~~~~~~~ | st_des_keyschedule Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359 - http://autobuild.buildroot.org/results/bd067de9c2699dc9628c00b929a01890b14d53c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mariadb/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mariadb/Config.in b/package/mariadb/Config.in index d88dda3cdac..acedd1da9d8 100644 --- a/package/mariadb/Config.in +++ b/package/mariadb/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_MARIADB select BR2_PACKAGE_FMT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_PCRE2 help MariaDB is one of the most popular database servers in the From 4e5ea3163094e4c8cf185959b983ce95c97944e4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 14:14:46 +0100 Subject: [PATCH 0094/3013] package/spice: fix libressl build Fix the following build failure raised since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: red-stream.cpp: In function 'RedStreamSslStatus red_stream_ssl_accept(RedStream*)': red-stream.cpp:526:22: error: invalid use of incomplete type 'SSL' {aka 'struct ssl_st'} 526 | stream->priv->ssl->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS; | ^~ In file included from /home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/err.h:120, from red-stream.cpp:33: /home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/ossl_typ.h:173:16: note: forward declaration of 'SSL' {aka 'struct ssl_st'} 173 | typedef struct ssl_st SSL; | ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/273eadf9e49af55e0932a8293ca65762fb43114f - http://autobuild.buildroot.org/results/97601f321efc532de0c2ea6aa618ce11fad9e851 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...SL_OP_NO_RENEGOTIATION-fallback-path.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch diff --git a/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch new file mode 100644 index 00000000000..edb8b2ed179 --- /dev/null +++ b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch @@ -0,0 +1,43 @@ +From 5e580eefac44d0c709afcf93eb5fca2fb353166a Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 26 May 2023 13:38:34 -0700 +Subject: [PATCH] server: add SSL_OP_NO_RENEGOTIATION fallback path + +With LibreSSL SSL_OP_NO_CLIENT_RENEGOTIATION is opaque which is not +compatible with the OpenSSL 1.0.2 and earlier code path in +red-stream.cpp while SSL_OP_NO_RENEGOTIATION is not yet defined for the +newer OpenSSL code path in reds.cpp. + +So with OpenSSL 1.1.0 and later if SSL_OP_NO_RENEGOTIATION is undefined +and SSL_OP_NO_CLIENT_RENEGOTIATION is defined then define the former as +the latter. This will allow the build to succeed with LibreSSL 3.7.2 and +in the future when newer LibreSSL versions add SSL_OP_NO_RENEGOTIATION +that code path will then be used automatically. + +Signed-off-by: orbea +Acked-by: Frediano Ziglio + +Upstream: https://gitlab.freedesktop.org/spice/spice/-/commit/5e580eefac44d0c709afcf93eb5fca2fb353166a +Signed-off-by: Fabrice Fontaine +--- + server/red-stream.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/server/red-stream.h b/server/red-stream.h +index 716e93317..8e57c5e5e 100644 +--- a/server/red-stream.h ++++ b/server/red-stream.h +@@ -25,6 +25,10 @@ + + SPICE_BEGIN_DECLS + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(SSL_OP_NO_RENEGOTIATION) && defined(SSL_OP_NO_CLIENT_RENEGOTIATION) ++#define SSL_OP_NO_RENEGOTIATION SSL_OP_NO_CLIENT_RENEGOTIATION ++#endif ++ + typedef void (*AsyncReadDone)(void *opaque); + typedef void (*AsyncReadError)(void *opaque, int err); + +-- +GitLab + From c09830644466022de14a350d569e06041b394c53 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2024 16:22:05 +0100 Subject: [PATCH 0095/3013] package/axel: needs gcc >= 4.9 Fix the following build failure raised since bump to version 2.17.12 in commit 50ba0b0a40187b695740a2fce2d2f3ed7cbf58c5 and https://github.com/axel-download-accelerator/axel/commit/517d3ea036c2837b779a15b410331cd0df4fb066: src/random.c:1:23: fatal error: stdatomic.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/ca62edddd42252bf21caa8243f8aaba38992fc68 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/axel/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/axel/Config.in b/package/axel/Config.in index 4507855ff8e..740095a5051 100644 --- a/package/axel/Config.in +++ b/package/axel/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_AXEL bool "axel" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help HTTP/FTP download accelerator. https://github.com/axel-download-accelerator/axel/ -comment "axel needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "axel needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From f84b73bfa25ac388e3edd3df85ac642f063055c9 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 14:25:39 -0800 Subject: [PATCH 0096/3013] package/ttyd: bump version to 1.7.4 change log - https://github.com/tsl0922/ttyd/releases/tag/1.7.4 Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/ttyd/ttyd.hash | 2 +- package/ttyd/ttyd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ttyd/ttyd.hash b/package/ttyd/ttyd.hash index 85bd71ba2d8..b11327c4655 100644 --- a/package/ttyd/ttyd.hash +++ b/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099 ttyd-1.7.3.tar.gz +sha256 300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b ttyd-1.7.4.tar.gz sha256 8b7e100f8311cb428c57609164d93099bada2599f948359045d1ac876a7a625b LICENSE diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index d17e21d60ba..d0e144b2522 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.7.3 +TTYD_VERSION = 1.7.4 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE From 66d11f8942fd48887bc19a1c07d036ab7eca2007 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 17:32:22 -0800 Subject: [PATCH 0097/3013] package/{tzdata, zic}: bump version to 2024a Release notes - https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 5488625ddd2..d353bc4410f 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 tzdata2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 33e296d7d74..e3672052771 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2023c +TZDATA_VERSION = 2024a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_SELINUX_MODULES = tzdata diff --git a/package/zic/zic.hash b/package/zic/zic.hash index a2720a27baa..80c96ed7934 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c tzcode2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index a915f6d2565..95fa1eaa96e 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2023c +ZIC_VERSION = 2024a ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From 4ac57d33fcbe73fcd17a4f002803a81e455d949a Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 22:08:14 -0800 Subject: [PATCH 0098/3013] package/bash: bump to version 5.2.21 Build tested using the following config option: BR2_PACKAGE_BASH=y $ ./utils/test-pkg -c bash.config -p bash bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/bash/bash.hash | 4 ++-- package/bash/bash.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bash/bash.hash b/package/bash/bash.hash index e0a1ebac916..44c1c5ed50e 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig -sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz.sig +sha256 c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 bash-5.2.21.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9a73ed8c367..9d173a5c7c0 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.2.15 +BASH_VERSION = 5.2.21 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From 9f94b3b35423a3d7b93e7fdd67e97dea6e33de60 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 23:00:11 -0800 Subject: [PATCH 0099/3013] package/iperf3: bump to version 3.16 Release notes - https://github.com/esnet/iperf/releases/tag/3.16 Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/iperf3/iperf3.hash | 4 ++-- package/iperf3/iperf3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 02ada0dcc64..a8634c4a7ed 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.14.tar.gz.sha256 -sha256 723fcc430a027bc6952628fa2a3ac77584a1d0bd328275e573fc9b206c155004 iperf-3.14.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.16.tar.gz.sha256 +sha256 cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e iperf-3.16.tar.gz # Locally computed sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index c00b16ce613..6d902c3b13b 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.14 +IPERF3_VERSION = 3.16 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT From 38a20a0998117f3debb4de06e209ba5d82bb7a9d Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:06 -0400 Subject: [PATCH 0100/3013] package/fdk-aac: bump to version 2.0.3 Change log: https://github.com/mstorsjo/fdk-aac/blob/master/ChangeLog Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/fdk-aac/fdk-aac.hash | 5 ++--- package/fdk-aac/fdk-aac.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/fdk-aac/fdk-aac.hash b/package/fdk-aac/fdk-aac.hash index b10d5f92b16..ae5c81b30fd 100644 --- a/package/fdk-aac/fdk-aac.hash +++ b/package/fdk-aac/fdk-aac.hash @@ -1,6 +1,5 @@ # From https://sourceforge.net/projects/opencore-amr/files/fdk-aac/ -sha1 579b34e8174b4feb21a9c598695f5ff4a7ceef8c fdk-aac-2.0.2.tar.gz -md5 b41222194b31f570b3132bd622a9aef6 fdk-aac-2.0.2.tar.gz +sha1 29f5485a6ec718335243440600ff78418cd4765b fdk-aac-2.0.3.tar.gz # Locally computed: -sha256 c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f fdk-aac-2.0.2.tar.gz +sha256 829b6b89eef382409cda6857fd82af84fabb63417b08ede9ea7a553f811cb79e fdk-aac-2.0.3.tar.gz sha256 95ec80da40b4af12ad4c4f3158c9cfb80f2479f3246e4260cb600827cc8c7836 NOTICE diff --git a/package/fdk-aac/fdk-aac.mk b/package/fdk-aac/fdk-aac.mk index c66f6df7975..01a100fa948 100644 --- a/package/fdk-aac/fdk-aac.mk +++ b/package/fdk-aac/fdk-aac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FDK_AAC_VERSION = 2.0.2 +FDK_AAC_VERSION = 2.0.3 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac FDK_AAC_LICENSE = fdk-aac license FDK_AAC_LICENSE_FILES = NOTICE From d0d443dd9f17e660b9120770d48721a4f1d5f253 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:08 -0400 Subject: [PATCH 0101/3013] package/leptonica: bump to version 1.84.1 Change log: http://www.leptonica.org/source/version-notes.html Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.hash | 2 +- package/leptonica/leptonica.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 6511d6b4103..3416cfeb399 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8f18615e0743af7df7f50985c730dfcf0c93548073d1f56621e4156a8b54d3dd leptonica-1.83.1.tar.gz +sha256 2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6 leptonica-1.84.1.tar.gz sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 4cb73296e81..0e902c6488a 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEPTONICA_VERSION = 1.83.1 +LEPTONICA_VERSION = 1.84.1 LEPTONICA_SITE = https://github.com/DanBloomberg/leptonica/releases/download/$(LEPTONICA_VERSION) LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt From e9d97cf81dce303cbe104c310ca7631d1cf94806 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:09 -0400 Subject: [PATCH 0102/3013] package/libolm: bump to version 3.2.16 Change log: https://gitlab.matrix.org/matrix-org/olm/-/blob/master/CHANGELOG.rst Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 044bb24f061..a95115d2fee 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz +sha256 1e90f9891009965fd064be747616da46b232086fe270b77605ec9bda34272a68 olm-3.2.16.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 6f066865550..5c8bcd1f592 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.9 +LIBOLM_VERSION = 3.2.16 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 From 39b5a8afb02e85fc31e4378b3284029a15b42180 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:10 -0400 Subject: [PATCH 0103/3013] package/ocrad: bump to version 0.29 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/ocrad/ocrad.hash | 2 +- package/ocrad/ocrad.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index cd5b0039ea7..736dd6ad4ca 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz +sha256 11200cc6b0b7ba16884a72dccb58ef694f7aa26cd2b2041e555580f064d2d9e9 ocrad-0.29.tar.lz sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index d62b7af3515..2452070bcf0 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCRAD_VERSION = 0.28 +OCRAD_VERSION = 0.29 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPL-2.0+ From c2ca1249e1d227c55c4044c4ef6aca2bc09c99ba Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:11 -0400 Subject: [PATCH 0104/3013] package/opencl-clhpp: bump to version 2023.12.14 Change log: https://github.com/KhronosGroup/OpenCL-CLHPP/releases/tag/v2023.12.14 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/opencl-clhpp/opencl-clhpp.hash | 2 +- package/opencl-clhpp/opencl-clhpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash index 27b27cd80cc..3f038d63409 100644 --- a/package/opencl-clhpp/opencl-clhpp.hash +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -1,3 +1,3 @@ # Locally Computed -sha256 869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4 opencl-clhpp-2.0.16.tar.gz +sha256 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82 opencl-clhpp-2023.12.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk index 933b40e3fef..93c25d0d660 100644 --- a/package/opencl-clhpp/opencl-clhpp.mk +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCL_CLHPP_VERSION = 2.0.16 +OPENCL_CLHPP_VERSION = 2023.12.14 OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) OPENCL_CLHPP_LICENSE = Apache-2.0 OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt From 56abf4742519e989207b563e7344853c72eb68c0 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:12 -0400 Subject: [PATCH 0105/3013] package/tesseract-ocr: bump to version 5.3.4 Changes since version 5.3.3: https://github.com/tesseract-ocr/tesseract/compare/5.3.3...5.3.4 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 45b9def27fd..41c8498bec1 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 dc4329f85f41191b2d813b71b528ba6047745813474e583ccce8795ff2ff5681 tesseract-ocr-5.3.3.tar.gz +sha256 141afc12b34a14bb691a939b4b122db0d51bd38feda7f41696822bacea7710c7 tesseract-ocr-5.3.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index d65111d4681..0bc90f48710 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,7 +4,7 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 5.3.3 +TESSERACT_OCR_VERSION = 5.3.4 TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 From 36902b51314d93ba2e7283d605738a38aba9d0bf Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:13 -0400 Subject: [PATCH 0106/3013] package/xapian: bump to version 1.4.24 Change log: https://xapian.org/docs/xapian-core-1.4.24/NEWS Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index e570f7e2f25..16889b45594 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html -sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2023-November/010009.html +sha256 eda5ae6dcf6b0553a8676af64b1fd304e998cd20f779031ccaaf7ab9a373531a xapian-core-1.4.24.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 464e5478df0..33c36a5a26a 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.19 +XAPIAN_VERSION = 1.4.24 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ From 756fdeb76dc4479c9bad42e33c58c60c7150379c Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 15 Feb 2024 15:31:44 +0100 Subject: [PATCH 0107/3013] package/shadow: bump to version 4.14.5 Omit 4.14.4 since it was broken. Signed-off-by: Michael Vetter Signed-off-by: Peter Korsgaard --- package/shadow/shadow.hash | 4 ++-- package/shadow/shadow.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 4689a994de7..23c292d6594 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,4 +1,4 @@ -# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz.asc +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc # with key A9348594CE31283A826FBDD8D57633D441E25BB5 -sha256 6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 shadow-4.14.3.tar.xz +sha256 cba74bc7b05d89c015afe23131f9159ece38779d40a8af4cf162852e6e85ca23 shadow-4.14.5.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 1e7ada61483..2092903b2d7 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.14.3 +SHADOW_VERSION = 4.14.5 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause From 52fc3452ec9d41abc18a69f05b6bd2d18409697f Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 15:42:41 +0100 Subject: [PATCH 0108/3013] package/libmbim: bump to 1.30.0 Explicitly disable newly introduced fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/blob/mbim-1-30/NEWS Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/libmbim/libmbim.hash | 2 +- package/libmbim/libmbim.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 8e7633cb946..ebc37504c58 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz +sha256 cfc729d23b9bf699b23a7ef2f5d732d6eff96234e31fed36b778771a6e3d3ee5 libmbim-1.30.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-or-later.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 59f55a57bc1..717c2396f7e 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.28.2 +LIBMBIM_VERSION = 1.30.0 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = \ @@ -13,7 +13,7 @@ LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 -LIBMBIM_CONF_OPTS = -Dman=false +LIBMBIM_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBMBIM_DEPENDENCIES += gobject-introspection From 575d7e31c6f87b0733915e376f22d614b21fc5da Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 15:42:42 +0100 Subject: [PATCH 0109/3013] package/libqmi: bump to version 1.34.0 Explicitly disable new fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/qmi-1-34/NEWS Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 5036c1d3c0e..7937f989a09 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 aec96bf2733a7b5ba27bb52346ce3a1ab54440800843f78001cc2a51213ce1b9 libqmi-1.32.2.tar.gz +sha256 8690d25b4d110b6df28b31da0a8bf16c7e966d31abcfeeb854f2753451e7a400 libqmi-1.34.0.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index eae41446e2c..524333febaf 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.32.2 +LIBQMI_VERSION = 1.34.0 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB @@ -12,7 +12,7 @@ LIBQMI_CPE_ID_VALID = YES LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 -LIBQMI_CONF_OPTS = -Dman=false +LIBQMI_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBQMI_DEPENDENCIES += gobject-introspection From 354855c4bbdaea82fe8cce5829161ff3363e2292 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 15:42:43 +0100 Subject: [PATCH 0110/3013] package/modem-manager: bump to 1.22.0 Explicitly disable newly introduced build options. Changelog: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/blob/mm-1-22/NEWS Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/modem-manager/modem-manager.hash | 4 ++-- package/modem-manager/modem-manager.mk | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 4b8b795af78..fa81acd9dc2 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ -#Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.tar.gz +#Locally calculated +sha256 6c8f8720737a3788e394c700f36236278c9de09d76069a079e6f1daaf08b2768 ModemManager-1.22.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 979a80a8e94..495dbcd258a 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.20.4 +MODEM_MANAGER_VERSION = 1.22.0 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) @@ -13,6 +13,8 @@ MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ + -Dbuiltin_plugins=false \ + -Dfuzzer=false \ -Dman=false \ -Dpowerd_suspend_resume=false \ -Dtests=false \ From b253f76cd26920c5f036a45ee45b8f7bb9b66910 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 18:13:42 +0100 Subject: [PATCH 0111/3013] package/python-hatchling: bump to 1.21.1 Changelog: https://hatch.pypa.io/dev/history/hatchling/#hatchling-v1.21.1 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index e1798e882c8..df703088e4c 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 21e5e7ed5fa6dd0618c5b66eb847f370 hatchling-1.21.0.tar.gz -sha256 5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c hatchling-1.21.0.tar.gz +md5 d40aaea58a04a36a2b641f6efe99e362 hatchling-1.21.1.tar.gz +sha256 bba440453a224e7d4478457fa2e8d8c3633765bafa02975a6b53b9bf917980bc hatchling-1.21.1.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index d1ed4d23c29..550dbf0beb2 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.21.0 +PYTHON_HATCHLING_VERSION = 1.21.1 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/fd/4a/8196e79c0d6e5eb10436dd2fcccc889a76af6ecf9bc35f87408159497d4d +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/d8/a1/7dd1caa87c0b15c04c6291e25112e5d082cce02ee87f221a8be1d594f857 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From a0535ef4f34a4cceda70aa695a2167ce7d466187 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Thu, 15 Feb 2024 18:18:52 +0100 Subject: [PATCH 0112/3013] package/eza: bump to version 0.18.3 Release notes: https://github.com/eza-community/eza/releases/tag/v0.18.3 Signed-off-by: Saeed Kazemi Signed-off-by: Peter Korsgaard --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 64f46759d77..48c2fa8ffeb 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11e6127a615744b52d52d66ebcdf9e5366f62746e8123b3eec00e35a057db988 eza-0.16.0.tar.gz +sha256 995a77848e75737a267b64613acaa6096ba8943f048676d5722c3ff238fb29f9 eza-0.18.3.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index b11c1a1e7f0..7ec3f127b40 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.16.0 +EZA_VERSION = 0.18.3 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE From 5883b227bfaa9d34390ec0dbee940c3b2c03aee8 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Thu, 15 Feb 2024 18:30:24 +0100 Subject: [PATCH 0113/3013] package/procs: bump to version 0.14.4 Release notes: https://github.com/dalance/procs/releases/tag/v0.14.4 Signed-off-by: Saeed Kazemi Signed-off-by: Peter Korsgaard --- package/procs/procs.hash | 2 +- package/procs/procs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index 19832e38976..a3ec5d2b75d 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2f9fdbcf7324952e22565ded58148fa40387b5a5f8723996620d6c4588925713 procs-0.14.3.tar.gz +sha256 22d9ef44bf06bbd6d0d463a40678a1560a9125fdc6e6fbb5db294e05a174ea01 procs-0.14.4.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index 8567bf3da36..34e874a4f20 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.3 +PROCS_VERSION = 0.14.4 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE From f1759be118de16950063e3c27396fd69b8f2df23 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Thu, 15 Feb 2024 11:32:06 -0800 Subject: [PATCH 0114/3013] package/iptables: bump version to 1.8.10 Change Log : https://netfilter.org/projects/iptables/files/changes-iptables-1.8.10.txt Build test results: iptables.config BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY=y BR2_PACKAGE_IPTABLES_NFTABLES=y $ ./utils/test-pkg -c iptables.config iptables bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/iptables/iptables.hash | 2 +- package/iptables/iptables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index a908b9cbc1a..be8b0df3d6f 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f iptables-1.8.9.tar.xz +sha256 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c iptables-1.8.10.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 561c82ca0bd..6712136962a 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.9 +IPTABLES_VERSION = 1.8.10 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES From f805e05a20d61409645f6a611ea3e24d211de7b3 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Thu, 15 Feb 2024 12:31:21 -0800 Subject: [PATCH 0115/3013] package/libusb: bump version to 1.0.27 Change Log : https://github.com/libusb/libusb/blob/d52e355daa09f17ce64819122cb067b8a2ee0d4b/ChangeLog#L4 Build test results: libusb.config BR2_PACKAGE_LIBUSB=y BR2_PACKAGE_LIBUSB_EXAMPLES=y BR2_PACKAGE_LIBUSB_COMPAT=y $./utils/test-pkg -k -c libusb.config -p libusb bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: SKIPPED 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index bbb0ccf5b9f..8ca68f03baf 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 libusb-1.0.26.tar.bz2 +sha256 ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575 libusb-1.0.27.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 98a4a578b20..15649a2ab11 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).26 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).27 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ From 0eaf90622947758719762463214f729462771075 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 16 Feb 2024 22:13:21 +0100 Subject: [PATCH 0116/3013] package/libnvme: bump to version 1.8 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/libnvme/libnvme.hash | 2 +- package/libnvme/libnvme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 69963578cd6..469006d6326 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 e9c3ad59c068788faf0f0af4296f92f8ce410d12749f0f35a541d6a21e630393 libnvme-1.7.1.tar.gz +sha256 d59939a280eec41eb7a716e1681d0d0c612099385204ffb55d07134a6be08d75 libnvme-1.8.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index 813f7279e88..bf131d2a385 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.7.1 +LIBNVME_VERSION = 1.8 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING From 012b6cc874e944fb098136c697fc0f71bcc264ef Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 24 Mar 2024 00:36:52 +0800 Subject: [PATCH 0117/3013] configs/beaglebone_defconfig: bump Linux to 6.1.80-ti-r34 and U-Boot to 2024.01 Tested on beaglebone black. [1] https://github.com/beagleboard/linux/releases/tag/6.1.80-ti-r34 Signed-off-by: Scott Fan Signed-off-by: Arnout Vandecappelle --- configs/beaglebone_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index e2d67019b10..064f2834895 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.46-ti-r13)/linux-6.1.46-ti-r13.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.80-ti-r34)/linux-6.1.80-ti-r34.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 94636d39ca324cb48ca83b329e4ecac166c24a10 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 24 Mar 2024 00:01:19 +0800 Subject: [PATCH 0118/3013] package/owfs: add missing slash after the OWFS_PKGDIR variable Signed-off-by: Scott Fan Signed-off-by: Arnout Vandecappelle --- package/owfs/owfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 986dca921a2..6b22282486e 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -28,7 +28,7 @@ OWFS_CONF_OPTS += \ --with-fuseinclude=$(STAGING_DIR)/usr/include \ --with-fuselib=$(STAGING_DIR)/usr/lib define OWFS_INSTALL_FUSE_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S60owfs \ + $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)/S60owfs \ $(TARGET_DIR)/etc/init.d/S60owfs endef define OWFS_CREATE_MOUNTPOINT @@ -78,7 +78,7 @@ endif OWFS_MAKE = $(MAKE) $(OWFS_EXTRA_MAKE_OPTS) define OWFS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S55owserver \ + $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)/S55owserver \ $(TARGET_DIR)/etc/init.d/S55owserver $(OWFS_INSTALL_FUSE_INIT_SYSV) endef From f95069814bd68cfc10ccf2dbc41efa6f1e127495 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 22 Mar 2024 18:49:41 +0100 Subject: [PATCH 0119/3013] package/libdrm: disable tests Disable tests to avoid the following build failure with amdgpu and gcc 5 if cunit is built before libdrm: In file included from ../tests/amdgpu/shader_test_util.c:10:0: ../tests/amdgpu/shader_code.h:113:2: error: initializer element is not constant ps_##_ps##_shader_patchinfo_code_size_gfx##_n, \ ^ tests can be disabled since https://gitlab.freedesktop.org/mesa/drm/-/commit/46d1e99a5d291b22d86ac52710b079491beedff8 Fixes: - http://autobuild.buildroot.org/results/612aad1fa642993da36bbec6c16c9020ac283e34 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libdrm/libdrm.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 61d1c24377b..a04331c2da8 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -17,7 +17,8 @@ LIBDRM_DEPENDENCIES = \ LIBDRM_CONF_OPTS = \ -Dcairo-tests=disabled \ - -Dman-pages=disabled + -Dman-pages=disabled \ + -Dtests=false ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops From 59674e5f8de5cb0a13344d04083287eb7fd3cf22 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:16:12 +0100 Subject: [PATCH 0120/3013] package/cctz: bump to version 2.4 https://github.com/google/cctz/releases/tag/v2.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/cctz/cctz.hash | 2 +- package/cctz/cctz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cctz/cctz.hash b/package/cctz/cctz.hash index b3a83207909..ac78cd611b9 100644 --- a/package/cctz/cctz.hash +++ b/package/cctz/cctz.hash @@ -1,3 +1,3 @@ # locally computed -sha256 8615b20d4e33e02a271c3b93a3b208e3d7d5d66880f5f6208b03426e448f32db cctz-2.3.tar.gz +sha256 e1a00957d472044808a24a26f1ba020f36dc26949a69c214562d96b74093adb3 cctz-2.4.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE.txt diff --git a/package/cctz/cctz.mk b/package/cctz/cctz.mk index bcc80bad470..7f5d960a42e 100644 --- a/package/cctz/cctz.mk +++ b/package/cctz/cctz.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCTZ_VERSION = 2.3 +CCTZ_VERSION = 2.4 CCTZ_SITE = $(call github,google,cctz,v$(CCTZ_VERSION)) CCTZ_LICENSE = Apache-2.0 CCTZ_LICENSE_FILES = LICENSE.txt From 2e9f161d4a7a68a041860e5855e98bee9d3a1498 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:11:44 +0100 Subject: [PATCH 0121/3013] package/glog: bump to version 0.7.0 - Drop patch (already in version) - Update hash of COPYING (year updated and gettimeofday license dropped with: https://github.com/google/glog/commit/70285fddc728cd5dbc2d1a20b373d358f6ae62ae) - elf detection has been reworked with https://github.com/google/glog/commit/7e6fca90e8bc69c6500ec61a6cc334dd8f682224 - threads are mandatory since https://github.com/google/glog/commit/fe46778bd326e3c012875eb756acaa4a1ca304f7 https://github.com/google/glog/releases/tag/v0.7.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - .../glog/0001-added-emscripten-support.patch | 292 ------------------ package/glog/Config.in | 9 +- package/glog/glog.hash | 4 +- package/glog/glog.mk | 6 +- 5 files changed, 8 insertions(+), 304 deletions(-) delete mode 100644 package/glog/0001-added-emscripten-support.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3b64c90d8bc..ef1c661812d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -461,7 +461,6 @@ package/gerbera/S99gerbera Indent package/giblib/0001-fix-imlib2-detection.patch Upstream package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch Upstream package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream -package/glog/0001-added-emscripten-support.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream diff --git a/package/glog/0001-added-emscripten-support.patch b/package/glog/0001-added-emscripten-support.patch deleted file mode 100644 index bb601affce5..00000000000 --- a/package/glog/0001-added-emscripten-support.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 6ed0c9e58b11680779c571996a3007bd972e0853 Mon Sep 17 00:00:00 2001 -From: Sergiu Deitsch -Date: Thu, 4 Aug 2022 22:52:47 +0200 -Subject: [PATCH] added emscripten support (#846) - -[Retrieved from: -https://github.com/google/glog/commit/6ed0c9e58b11680779c571996a3007bd972e0853, -to fix build without threads, a fix that is lost in the middle of a -larger commit adding emscripten support.] -Signed-off-by: Fabrice Fontaine ---- - .github/workflows/emscripten.yml | 60 ++++++++++++++++++++++++++++++++ - CMakeLists.txt | 14 ++++---- - src/config.h.cmake.in | 6 ++-- - src/glog/logging.h.in | 6 ++-- - src/glog/platform.h | 2 ++ - src/logging.cc | 11 ++++-- - src/raw_logging.cc | 9 ++--- - src/stacktrace_unwind-inl.h | 2 +- - src/symbolize.cc | 2 +- - src/utilities.h | 2 +- - 10 files changed, 93 insertions(+), 21 deletions(-) - create mode 100644 .github/workflows/emscripten.yml - -diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml -new file mode 100644 -index 00000000..566c67eb ---- /dev/null -+++ b/.github/workflows/emscripten.yml -@@ -0,0 +1,60 @@ -+name: Emscripten -+ -+on: [push, pull_request] -+ -+jobs: -+ build-linux: -+ defaults: -+ run: -+ shell: bash -+ name: Emscripten-C++${{matrix.std}}-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.extra}} -+ runs-on: ubuntu-latest -+ container: emscripten/emsdk -+ strategy: -+ fail-fast: true -+ matrix: -+ build_type: [Release, Debug] -+ extra: [no-custom-prefix, custom-prefix] -+ lib: [static] -+ std: [98, 11, 14, 17, 20] -+ -+ steps: -+ - uses: actions/checkout@v2 -+ -+ - name: Setup Dependencies -+ run: | -+ apt-get update -+ DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \ -+ cmake \ -+ ninja-build -+ -+ - name: Setup C++98 Environment -+ if: matrix.std == '98' -+ run: | -+ echo 'CXXFLAGS=-Wno-error=variadic-macros -Wno-error=long-long ${{env.CXXFLAGS}}' >> $GITHUB_ENV -+ -+ - name: Configure -+ env: -+ CXXFLAGS: -Wall -Wextra -Wsign-conversion -Wtautological-compare -Wformat-nonliteral -Wundef -Werror -Wno-error=wasm-exception-spec ${{env.CXXFLAGS}} -+ run: | -+ cmake -S . -B build_${{matrix.build_type}} \ -+ -DBUILD_SHARED_LIBS=${{matrix.lib == 'shared'}} \ -+ -DCMAKE_AR=$(which emar) \ -+ -DCMAKE_C_COMPILER=$(which emcc) \ -+ -DCMAKE_CXX_COMPILER=$(which em++) \ -+ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ -+ -DCMAKE_CXX_STANDARD_REQUIRED=ON \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ -+ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install \ -+ -DCMAKE_RANLIB=$(which emranlib) \ -+ -DWITH_CUSTOM_PREFIX=${{matrix.extra == 'custom-prefix'}} \ -+ -G Ninja \ -+ -Werror -+ -+ - name: Build -+ run: | -+ cmake --build build_${{matrix.build_type}} \ -+ --config ${{matrix.build_type}} -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 643a8b8a..ce6daa40 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,11 +93,11 @@ find_package (Unwind) - if (Unwind_FOUND) - set (HAVE_LIB_UNWIND 1) - else (Unwind_FOUND) -- check_include_file_cxx (unwind.h HAVE_UNWIND_H) - # Check whether linking actually succeeds. ARM toolchains of LLVM unwind - # implementation do not necessarily provide the _Unwind_Backtrace function - # which causes the previous check to succeed but the linking to fail. - check_cxx_symbol_exists (_Unwind_Backtrace unwind.h HAVE__UNWIND_BACKTRACE) -+ check_cxx_symbol_exists (_Unwind_GetIP unwind.h HAVE__UNWIND_GETIP) - endif (Unwind_FOUND) - - check_include_file_cxx (dlfcn.h HAVE_DLFCN_H) -@@ -197,9 +197,10 @@ int main(void) - } - " HAVE___SYNC_VAL_COMPARE_AND_SWAP) - --cmake_push_check_state (RESET) --set (CMAKE_REQUIRED_LIBRARIES Threads::Threads) --check_cxx_source_compiles (" -+if (Threads_FOUND) -+ cmake_push_check_state (RESET) -+ set (CMAKE_REQUIRED_LIBRARIES Threads::Threads) -+ check_cxx_source_compiles (" - #define _XOPEN_SOURCE 500 - #include - int main(void) -@@ -209,8 +210,9 @@ int main(void) - pthread_rwlock_rdlock(&l); - return 0; - } --" HAVE_RWLOCK) --cmake_pop_check_state () -+ " HAVE_RWLOCK) -+ cmake_pop_check_state () -+endif (Threads_FOUND) - - check_cxx_source_compiles (" - __declspec(selectany) int a; -diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in -index b67e8a77..20b5f1c4 100644 ---- a/src/config.h.cmake.in -+++ b/src/config.h.cmake.in -@@ -118,12 +118,12 @@ - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_UNISTD_H ${HAVE_UNISTD_H} - --/* Define if you have the header file. */ --#cmakedefine HAVE_UNWIND_H -- - /* Define if you linking to _Unwind_Backtrace is possible. */ - #cmakedefine HAVE__UNWIND_BACKTRACE - -+/* Define if you linking to _Unwind_GetIP is possible. */ -+#cmakedefine HAVE__UNWIND_GETIP -+ - /* define if the compiler supports using expression for operator */ - #cmakedefine HAVE_USING_OPERATOR - -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index c6def152..098e28fe 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -97,7 +97,7 @@ - - @ac_google_start_namespace@ - --#if @ac_cv_have_uint16_t@ // the C99 format -+#if @ac_cv_have_stdint_h@ // the C99 format - typedef int32_t int32; - typedef uint32_t uint32; - typedef int64_t int64; -@@ -1822,8 +1822,8 @@ GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, - - // A simple function that sends email. dest is a commma-separated - // list of addressess. Thread-safe. --GLOG_EXPORT bool SendEmail(const char *dest, -- const char *subject, const char *body); -+GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, -+ const char* body); - - GLOG_EXPORT const std::vector& GetLoggingDirectories(); - -diff --git a/src/glog/platform.h b/src/glog/platform.h -index e6144119..7893c45d 100644 ---- a/src/glog/platform.h -+++ b/src/glog/platform.h -@@ -50,6 +50,8 @@ - #define GLOG_OS_NETBSD - #elif defined(__OpenBSD__) - #define GLOG_OS_OPENBSD -+#elif defined(__EMSCRIPTEN__) -+#define GLOG_OS_EMSCRIPTEN - #else - // TODO(hamaji): Add other platforms. - #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. -diff --git a/src/logging.cc b/src/logging.cc -index e65e80e9..1df1034a 100644 ---- a/src/logging.cc -+++ b/src/logging.cc -@@ -2188,6 +2188,7 @@ void SetExitOnDFatal(bool value) { - } // namespace internal - } // namespace base - -+#ifndef GLOG_OS_EMSCRIPTEN - // Shell-escaping as we need to shell out ot /bin/mail. - static const char kDontNeedShellEscapeChars[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -@@ -2222,14 +2223,14 @@ static string ShellEscape(const string& src) { - } - return result; - } -- -+#endif - - // use_logging controls whether the logging functions LOG/VLOG are used - // to log errors. It should be set to false when the caller holds the - // log_mutex. - static bool SendEmailInternal(const char*dest, const char *subject, - const char*body, bool use_logging) { --#ifndef __EMSCRIPTEN__ -+#ifndef GLOG_OS_EMSCRIPTEN - if (dest && *dest) { - if ( use_logging ) { - VLOG(1) << "Trying to send TITLE:" << subject -@@ -2275,6 +2276,12 @@ static bool SendEmailInternal(const char*dest, const char *subject, - } - } - } -+#else -+ (void)dest; -+ (void)subject; -+ (void)body; -+ (void)use_logging; -+ LOG(WARNING) << "Email support not available; not sending message"; - #endif - return false; - } -diff --git a/src/raw_logging.cc b/src/raw_logging.cc -index 43159832..befeac89 100644 ---- a/src/raw_logging.cc -+++ b/src/raw_logging.cc -@@ -59,11 +59,12 @@ - # include - #endif - --#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined(GLOG_OS_MACOSX))) --# define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) -+#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \ -+ (!(defined(GLOG_OS_MACOSX))) && !defined(GLOG_OS_EMSCRIPTEN) -+#define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) - #else -- // Not so safe, but what can you do? --# define safe_write(fd, s, len) write(fd, s, len) -+// Not so safe, but what can you do? -+#define safe_write(fd, s, len) write(fd, s, len) - #endif - - _START_GOOGLE_NAMESPACE_ -diff --git a/src/stacktrace_unwind-inl.h b/src/stacktrace_unwind-inl.h -index fbb5f988..dc1665b4 100644 ---- a/src/stacktrace_unwind-inl.h -+++ b/src/stacktrace_unwind-inl.h -@@ -73,7 +73,7 @@ static _Unwind_Reason_Code GetOneFrame(struct _Unwind_Context *uc, void *opq) { - if (targ->skip_count > 0) { - targ->skip_count--; - } else { -- targ->result[targ->count++] = (void *) _Unwind_GetIP(uc); -+ targ->result[targ->count++] = reinterpret_cast(_Unwind_GetIP(uc)); - } - - if (targ->count == targ->max_depth) { -diff --git a/src/symbolize.cc b/src/symbolize.cc -index 51025018..f56e97c9 100644 ---- a/src/symbolize.cc -+++ b/src/symbolize.cc -@@ -834,7 +834,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) -+#elif (defined(GLOG_OS_MACOSX) || defined(GLOG_OS_EMSCRIPTEN)) && defined(HAVE_DLADDR) - - #include - #include -diff --git a/src/utilities.h b/src/utilities.h -index bd0ec632..760c142c 100644 ---- a/src/utilities.h -+++ b/src/utilities.h -@@ -88,7 +88,7 @@ - - #if defined(HAVE_LIB_UNWIND) - # define STACKTRACE_H "stacktrace_libunwind-inl.h" --#elif defined(HAVE__UNWIND_BACKTRACE) -+#elif defined(HAVE__UNWIND_BACKTRACE) && defined(HAVE__UNWIND_GETIP) - # define STACKTRACE_H "stacktrace_unwind-inl.h" - #elif !defined(NO_FRAME_POINTER) - # if defined(__i386__) && __GNUC__ >= 2 diff --git a/package/glog/Config.in b/package/glog/Config.in index 33763230041..bbdd1e2151a 100644 --- a/package/glog/Config.in +++ b/package/glog/Config.in @@ -1,13 +1,12 @@ config BR2_PACKAGE_GLOG bool "glog" - # __ELF__ not defined on Microblaze - depends on !BR2_microblaze depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help C++ implementation of the Google logging module https://github.com/google/glog -comment "glog needs a toolchain w/ C++" - depends on !BR2_microblaze - depends on !BR2_INSTALL_LIBSTDCPP +comment "glog needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glog/glog.hash b/package/glog/glog.hash index fab77c522be..fb0ea93979c 100644 --- a/package/glog/glog.hash +++ b/package/glog/glog.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6 glog-0.6.0.tar.gz +sha256 375106b5976231b92e66879c1a92ce062923b9ae573c42b56ba28b112ee4cc11 glog-0.7.0.tar.gz # Hash for License file: -sha256 0fc497129c5c69ff6f22da6933c7e4aaef082fde8437fd57680c2780100772a4 COPYING +sha256 136d48dea7a681413691f3db3098f6cf5ffaa3119d96d97bb83b8cff3ce38c4a COPYING diff --git a/package/glog/glog.mk b/package/glog/glog.mk index ddf71fd15a8..4b3f39be3a8 100644 --- a/package/glog/glog.mk +++ b/package/glog/glog.mk @@ -4,14 +4,12 @@ # ################################################################################ -GLOG_VERSION = 0.6.0 +GLOG_VERSION = 0.7.0 GLOG_SITE = $(call github,google,glog,v$(GLOG_VERSION)) GLOG_INSTALL_STAGING = YES GLOG_LICENSE = BSD-3-Clause GLOG_LICENSE_FILES = COPYING -GLOG_CONF_OPTS = \ - -DWITH_GTEST=OFF \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),-DWITH_THREADS=ON, -DWITH_THREADS=OFF) +GLOG_CONF_OPTS = -DWITH_GTEST=OFF ifeq ($(BR2_PACKAGE_GFLAGS),y) GLOG_DEPENDENCIES += gflags From 1f418a6d1412911a3853307752f774ebae888309 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Mar 2024 22:41:52 +0100 Subject: [PATCH 0122/3013] package/libpciaccess: fix static build Fix the following static build failure raised since bump to version 0.18 in commit 136d4dfbe6126b5ed20237c571f599dfc163d110: /home/autobuild/autobuild/instance-0/output-1/host/bin/arceb-buildroot-linux-uclibc-gcc -o src/libpciaccess.so.0.11.1 src/libpciaccess.so.0.11.1.p/common_bridge.c.o src/libpciaccess.so.0.11.1.p/common_iterator.c.o src/libpciaccess.so.0.11.1.p/common_init.c.o src/libpciaccess.so.0.11.1.p/common_interface.c.o src/libpciaccess.so.0.11.1.p/common_io.c.o src/libpciaccess.so.0.11.1.p/common_capability.c.o src/libpciaccess.so.0.11.1.p/common_device_name.c.o src/libpciaccess.so.0.11.1.p/common_map.c.o src/libpciaccess.so.0.11.1.p/linux_sysfs.c.o src/libpciaccess.so.0.11.1.p/linux_devmem.c.o src/libpciaccess.so.0.11.1.p/common_vgaarb.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group -Wl,-soname,libpciaccess.so.0 -static /home/autobuild/autobuild/instance-0/output-1/host/arceb-buildroot-linux-uclibc/sysroot/usr/lib/libz.a -Wl,--end-group /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/arceb-buildroot-linux-uclibc/11.4.0/../../../../arceb-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/arceb-buildroot-linux-uclibc/11.4.0/crtbeginT.o: relocation R_ARC_32_ME against `__TMC_END__' can not be used when making a shared object; recompile with -fPIC Fixes: 136d4dfbe6126b5ed20237c571f599dfc163d110 - http://autobuild.buildroot.org/results/7604706f4f4ab96a485a1dabe7cb4c98a2ef27d4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...lding-static-library-not-just-shared.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch diff --git a/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch b/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch new file mode 100644 index 00000000000..df1b4b415ae --- /dev/null +++ b/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch @@ -0,0 +1,48 @@ +From ad7e9cb4b291a46812eea321f0634cfc46fb94e2 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Thu, 14 Mar 2024 13:55:55 -0700 +Subject: [PATCH] meson: allow building static library, not just shared + +Lets builders specify -Ddefault_library={shared,static,both} +to control which types of libpciaccess library are built + +Closes: #20 +Reported-by: Maxime Gauduin (@alucryd) +Signed-off-by: Alan Coopersmith + +Upstream: https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/ad7e9cb4b291a46812eea321f0634cfc46fb94e2 +Signed-off-by: Fabrice Fontaine +--- + .gitlab-ci.yml | 2 +- + src/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index bcb75cf..185edc2 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -91,7 +91,7 @@ meson: + - MESON_OPTIONS: ['-Dzlib=disabled', '-Dzlib=enabled'] + script: + - mkdir -p ../_inst +- - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 $MESON_OPTIONS ++ - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 -Ddefault_library=both $MESON_OPTIONS + - meson configure builddir + - ninja -C builddir test + - ninja -C builddir install +diff --git a/src/meson.build b/src/meson.build +index 24eee04..e319688 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -38,7 +38,7 @@ endif + + inc_src = include_directories('.') + +-libpciaccess = shared_library( ++libpciaccess = library( + 'pciaccess', + [ + 'common_bridge.c', +-- +GitLab + From 2fd5876a7bedd9051865e73f831a6c05bf62179e Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:55 +0000 Subject: [PATCH 0123/3013] configs/zynq_zc702_defconfig: bump to 6.1.70 This patch bumps the zynq_zc702_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_zc702_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index e85285a8321..7f762abc582 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 566001a61368f99e66dbdf0200806dc3c4cfd73c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:56 +0000 Subject: [PATCH 0124/3013] configs/zynq_zc706_defconfig: bump to 6.1.70 This patch bumps the zynq_zc706_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_zc706_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 3489f864e1e..ffa734348a8 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 8977c4d77b27cd918e308a0ac8b5b910df7caf4a Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:57 +0000 Subject: [PATCH 0125/3013] configs/zynq_zed_defconfig: bump to 6.1.70 This patch bumps the zynq_zed_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_zed_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index a3a94687f58..4bc1880481c 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From f2846f8fea5ff8798047266f346762a7671d6b32 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:58 +0000 Subject: [PATCH 0126/3013] configs/zynq_microzed_defconfig: bump to 6.1.70 This patch bumps the zynq_microzed_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_microzed_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index d598a46c396..7ada84cb6c9 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 9d4874819948a654510bea71a7d5e3db7ff10bee Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Thu, 8 Feb 2024 22:15:16 +0100 Subject: [PATCH 0127/3013] board/visionfive2: fix genimage.cfg path Set correct directory for the BR2_ROOTFS_POST_SCRIPT_ARGS. Signed-off-by: Lukasz Tekieli Signed-off-by: Peter Korsgaard --- configs/visionfive2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index dc086953a0f..3a1a4f527c7 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" From 6dfeb165ee9170920e9a0b1f021170a736ac4d73 Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Thu, 8 Feb 2024 22:15:17 +0100 Subject: [PATCH 0128/3013] board/visionfive2: enable u-boot Enables U-Boot and required OpenSBI builds for the VisionFive2. Changes the sdcard.img to use GPT and adds the SPL and U-Boot to partitions specified in U-Boot's documentation for the board: https://docs.u-boot.org/en/v2024.01/board/starfive/visionfive2.html U-Boot config uses BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME with value "u-boot.itb". Using BR2_TARGET_UBOOT_FORMAT_ITB fails, because the build does not support u-boot.itb make target. Signed-off-by: Lukasz Tekieli [Peter: document boot mode setting, add U-Boot documentation link] Signed-off-by: Peter Korsgaard --- board/visionfive2/genimage.cfg | 16 +++++++++------- board/visionfive2/readme.txt | 4 ++++ configs/visionfive2_defconfig | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg index c221b49c7b7..8133e740c0d 100644 --- a/board/visionfive2/genimage.cfg +++ b/board/visionfive2/genimage.cfg @@ -2,20 +2,22 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } - # u-boot is hard coded to look at 3rd partition - partition dummy1 { - size = 512 + partition spl { + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + image = "u-boot-spl.bin.normal.out" } - partition dummy2 { - size = 512 + partition uboot { + partition-type-uuid = BC13C2FF-59E6-4262-A352-B275FD6F7172 + image = "u-boot.itb" } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = true image = "rootfs.ext4" - bootable = "true" } } diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 1924cbc12b7..85be1d5dfc4 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -27,6 +27,10 @@ Preparing the board Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). +Change the boot mode pins to SD card booting (RGPIO_0=1, GRPIO_1=0): + +https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/boot_mode_settings.html + Insert your SD card. Power-up the board using an USB-C cable. diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 3a1a4f527c7..c8576a35a7f 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -15,4 +15,23 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out" BR2_PACKAGE_HOST_GENIMAGE=y From 2fda7322f999c551ad088458e661d1edd52b5b88 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 15:00:46 +0100 Subject: [PATCH 0129/3013] package/kodi-pvr-plutotv: bump version to 20.3.2-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash | 2 +- package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash index 0c56c8b6b4c..162905218c1 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11505556200029a48a293e97f94e0469a5f78580d0e56d5d0a1da05d61f0f5b5 kodi-pvr-plutotv-20.3.1a-Nexus.tar.gz +sha256 7bccc0001acb796aa706f8a1bcce2661fcb67a7f346420c691ee0461ab5aace8 kodi-pvr-plutotv-20.3.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk index fadb47efaf2..8a47d8c265e 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PLUTOTV_VERSION = 20.3.1a-Nexus +KODI_PVR_PLUTOTV_VERSION = 20.3.2-Nexus KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md From ad89a4567d50da964298d43a6606a27469085795 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:17 +0100 Subject: [PATCH 0130/3013] package/onevpl-intel-gpu: bump version to 24.1.5 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index 8dd42c47136..680ada76ea0 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 879a232351ce0647522a0981edded3760104aec9f2bdc2ad31f70df03c95a6a9 onevpl-intel-gpu-24.1.4.tar.gz +sha256 e006d59399dbd0c3b3ecd91610822d655e9303b25a385a9a3ac94a42bf34b284 onevpl-intel-gpu-24.1.5.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index ca2c866735e..440d73efa25 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.4 +ONEVPL_INTEL_GPU_VERSION = 24.1.5 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From 1355c2c59f70223800fd8bc8de0b85b6ae8975b5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:18 +0100 Subject: [PATCH 0131/3013] package/intel-mediadriver: bump version to 24.1.5 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 4b410fb961c..6bc9549c11e 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7ea727b3e2890cf8f50307a3910664209bcbae1ce0d3d8f81bb9f522b0f66d59 intel-media-24.1.4.tar.gz +sha256 e23ea37c98d8d4b9d1a3a134b6489256d8f5a7a4ee71967b1db8ade70052654f intel-media-24.1.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 9fdbef93bbd..875e7e7c785 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.4 +INTEL_MEDIADRIVER_VERSION = 24.1.5 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 0ac9fdfb01ad3e16bfb10a10bb77c0a3d5f453e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:19 +0100 Subject: [PATCH 0132/3013] package/intel-gmmlib: bump version to 22.3.18 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 9527cb9a56f..d9cad026c4e 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5fa23407d4780c4ee8acd68e9ec9186e1721238150dc36ca9ab469a335891d2a intel-gmmlib-22.3.17.tar.gz +sha256 381f7ad104e3d0d8dd6c3ec0c8304e410a479c439e72db35c83fb7e2b0ec556f intel-gmmlib-22.3.18.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 5502687a4ac..94a07ebfb8a 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.17 +INTEL_GMMLIB_VERSION = 22.3.18 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 9cdf736efd67c94ac77d5faa8335b35460335c32 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:20 +0100 Subject: [PATCH 0133/3013] package/libva-utils: bump version to 2.21.0 Release notes: https://github.com/intel/libva-utils/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index f82a251ef83..2c80435ca6c 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 97413a7ec27ec479b97ffc7ab8acebe053615224a4b051602859cf9f88e4e889 libva-utils-2.20.1.tar.gz +sha256 15ca12bd11c7001c04af5079512754fea6ba8d79151b9f07908c99b27622714e libva-utils-2.21.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 1f539647890..f58685e51be 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.20.1 +LIBVA_UTILS_VERSION = 2.21.0 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From 3cae883e7fd1e4175527a95e89aabcf5e3849103 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:21 +0100 Subject: [PATCH 0134/3013] package/libva: bump version to 2.21.0 Release notes: https://github.com/intel/libva/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libva/libva.hash | 2 +- package/libva/libva.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 2fffe8701f2..24825ddc1fc 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 117f8d658a5fc9ea406ca80a3eb4ae1d70b15a54807c9ed77199c812bed73b60 libva-2.20.0.tar.gz +sha256 f7c3fffef3f04eb146e036dad2587d852bfb70e4926d014bf437244915ef7425 libva-2.21.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 4481be9e7bb..79dbe577c8b 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.20.0 +LIBVA_VERSION = 2.21.0 LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING From 2178fce10c4bdad779b35130915e85f13d2c1938 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:06:38 +0100 Subject: [PATCH 0135/3013] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 62c954234da..972db9300ec 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 99a2fd954d8e620029759f5a65dc09271c168cd047a6a152a0fe643de64823cf tvheadend-b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f.tar.gz +sha256 e3f05da73596097757fb4c0f9306e415b1772f26a52b5b86c50d63811e7e65af tvheadend-c63115464d8f6556fb4cac93ce8740afea1b00d5.tar.gz sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 816ec6e161f..8f2e37b1220 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f +TVHEADEND_VERSION = c63115464d8f6556fb4cac93ce8740afea1b00d5 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From b4eb96e36c2d02a1b7d49ac99680b9d6c2cac87f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:06:03 +0100 Subject: [PATCH 0136/3013] package/openvpn: bump version to 2.6.10 Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst The fixed CVEs are only relevant for Windows. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 6dc470360a9..932483507e7 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 5ede1565c8a6d880100f7f235317a7ee9eea83d5052db5547f13a9e76af7805d openvpn-2.6.8.tar.gz +sha256 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b openvpn-2.6.10.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 28948a3ab3a..abcb123eeab 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.8 +OPENVPN_VERSION = 2.6.10 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From f9b1cc87d421356c91c8a9beb35691a35e9adb72 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:05:29 +0100 Subject: [PATCH 0137/3013] package/libxml2: bump version to 2.12.6 https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.12.6/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 959887ab0e6..086bb410986 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.5.sha256sum -sha256 a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21 libxml2-2.12.5.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.6.sha256sum +sha256 889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb libxml2-2.12.6.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 6070c07b031..e7ed6fb7527 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).5 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From d8c440936d51b7f76472b43002780f5490b7a3bf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:04:51 +0100 Subject: [PATCH 0138/3013] package/dav1d: bump version to 1.4.1 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 0b2c53ec212..a62193810ed 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.3.0/dav1d-1.3.0.tar.xz.sha256 -sha256 6d8be2741c505c47f8f1ced3c9cc427759243436553d01d1acce201f87b39e71 dav1d-1.3.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.4.1/dav1d-1.4.1.tar.xz.sha256 +sha256 8d407dd5fe7986413c937b14e67f36aebd06e1fa5cfec679d10e548476f2d5f8 dav1d-1.4.1.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 3650f28730e..74c68d16603 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.3.0 +DAV1D_VERSION = 1.4.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From 3646c48c64cd87cbbe9c20f25a6db9e5054628a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 13:39:26 +0100 Subject: [PATCH 0139/3013] package/mpc: bump to version 1.3.1 https://gitlab.inria.fr/mpc/mpc/-/blob/1.3.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/mpc/mpc.hash | 2 +- package/mpc/mpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpc/mpc.hash b/package/mpc/mpc.hash index 0520a7b9b4a..f69a5b66ca6 100644 --- a/package/mpc/mpc.hash +++ b/package/mpc/mpc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459 mpc-1.2.1.tar.gz +sha256 ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8 mpc-1.3.1.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk index 364e4c3c85a..467bed4dbed 100644 --- a/package/mpc/mpc.mk +++ b/package/mpc/mpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPC_VERSION = 1.2.1 +MPC_VERSION = 1.3.1 MPC_SITE = $(BR2_GNU_MIRROR)/mpc MPC_LICENSE = LGPL-3.0+ MPC_LICENSE_FILES = COPYING.LESSER From 00f7bd06d66b05ec694f8a3e90d56e5c4f532e6b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 13:33:00 +0100 Subject: [PATCH 0140/3013] package/neon: bump to version 0.33.0 Update hash of README, changes not related to license: https://github.com/notroj/neon/commit/7d39a09945830c664205dd307723c2ff51ae13e3 https://github.com/notroj/neon/commit/9c3a4cb82db956357f120556efb7d8e706b5d46c https://github.com/notroj/neon/blob/0.33.0/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/neon/neon.hash | 4 ++-- package/neon/neon.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 9bd6195e391..d773b0f316a 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 b1e2120e4ae07df952c4a858731619733115c5f438965de4fab41d6bf7e7a508 neon-0.32.4.tar.gz +sha256 659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8 neon-0.33.0.tar.gz # Hash for license files -sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md +sha256 6c4f5d59a60a66cc970642c0f3799cf03b40a81c9dccbc4a254f20487d143f74 README.md sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 96ee6087808..a801eae28f7 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_VERSION = 0.32.4 +NEON_VERSION = 0.33.0 NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md From f85a1eb173954cfcdda1c0e947913bba598290d8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 13:31:59 +0100 Subject: [PATCH 0141/3013] package/neon: drop unrecognized rpath option rpath is an unrecognized option since the addition of the package in commit 59a9c02e1355bcd630a207e8be319a044597ad1d Fixes: 59a9c02e1355bcd630a207e8be319a044597ad1d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/neon/neon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/neon/neon.mk b/package/neon/neon.mk index a801eae28f7..e7872df3c9c 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,7 +10,7 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES -NEON_CONF_OPTS = --without-gssapi --disable-rpath +NEON_CONF_OPTS = --without-gssapi NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) NEON_CONF_ENV = ne_cv_libsfor_bindtextdomain=$(TARGET_NLS_LIBS) From 5e545cd269e0a3bbd6f859f885c887f14d3bd2d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 10:49:34 +0100 Subject: [PATCH 0142/3013] package/vdr: bump to version 2.6.5 https://github.com/vdr-projects/vdr/blob/2.6.5/HISTORY Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/vdr/vdr.hash | 2 +- package/vdr/vdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index 1b7ced0b773..47179a9907f 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 70352c7558d627202c02e80d88c83d25d9df4c5e49a010f7d1d9ae631bd54ad0 vdr-2.6.3.tar.gz +sha256 293e355b2cc22e6152dae9c315d5b8903f3e647a2e60b6217d306ff4bceb83e1 vdr-2.6.5.tar.gz sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index a44e1ff5122..c717d40e024 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.6.3 +VDR_VERSION = 2.6.5 VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING From e248a312b04a86881b5a243433a213bfd8eea057 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 10:08:17 +0100 Subject: [PATCH 0143/3013] package/i2pd: bump to version 2.50.2 Update hash of license file (date updated with https://github.com/PurpleI2P/i2pd/commit/d5ee1f602fdc7a47ccc9a4e239ea720dd63f123a) https://github.com/PurpleI2P/i2pd/blob/2.50.2/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/i2pd/i2pd.hash | 6 +++--- package/i2pd/i2pd.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/i2pd/i2pd.hash b/package/i2pd/i2pd.hash index 98c0db243dd..cc099a94ffd 100644 --- a/package/i2pd/i2pd.hash +++ b/package/i2pd/i2pd.hash @@ -1,4 +1,4 @@ -# From https://github.com/PurpleI2P/i2pd/releases/download/2.43.0/SHA512SUMS -sha512 7247850cd47cccc540346b4a1becc6dba5f40bcb333cd722e9fc59fd8b0beddee700376829d29add05cea6b84bb34303ed37e01914a1a41cf8cd94fe5c826e4a i2pd-2.43.0.tar.gz +# From https://github.com/PurpleI2P/i2pd/releases/download/2.50.2/SHA512SUMS +sha512 7df7a578711a959feee4326060829cf87c0d1669e473934549cb59d868a7aef7300ecd2d7a6b92a2295aa7e97964cc16d0e44a334db917e22b0b59573a9052de i2pd-2.50.2.tar.gz # Locally computed: -sha256 9c87aff490b272254d716475e3c4973f5f64af1d18f9f6962c1e61e252e1ad9a LICENSE +sha256 e32cc0171ce3301afa67d83f61598f29af7efdf8218dfb66cc1a72224474ec2c LICENSE diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index ad268a235c2..402931c6559 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2PD_VERSION = 2.43.0 +I2PD_VERSION = 2.50.2 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE From 49384a0a01ad8b73ea1dc10043c3605d035933f8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 09:58:36 +0100 Subject: [PATCH 0144/3013] package/libtorrent-rasterbar: bump to version 1.2.19 https://github.com/arvidn/libtorrent/releases/tag/v1.2.19 https://github.com/arvidn/libtorrent/releases/tag/v1.2.18 https://github.com/arvidn/libtorrent/releases/tag/v1.2.17 https://github.com/arvidn/libtorrent/releases/tag/v1.2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libtorrent-rasterbar/libtorrent-rasterbar.hash | 2 +- package/libtorrent-rasterbar/libtorrent-rasterbar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash index 3f59642b729..b1abe85d847 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8ad8638684c0a903ebabc30490079e31b1a6a638da2adec5a8bef6a0e62214b libtorrent-rasterbar-1.2.15.tar.gz +sha256 eee8e99548dc5eb5e643e49db9202f4f97112c032dba883dfdc8144af5b6e40e libtorrent-rasterbar-1.2.19.tar.gz sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 085b38343c4..6b497bbe58c 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTORRENT_RASTERBAR_VERSION = 1.2.15 +LIBTORRENT_RASTERBAR_VERSION = 1.2.19 LIBTORRENT_RASTERBAR_SITE = \ https://github.com/arvidn/libtorrent/releases/download/v$(LIBTORRENT_RASTERBAR_VERSION) LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause From c1c096f91da5bfc45f1842b6dd12f1f0e016dbc4 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 22:11:51 -0700 Subject: [PATCH 0145/3013] package/msmtp: bump version to 1.8.25 Release notes - https://marlam.de/msmtp/news/msmtp-1-8-25/ Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- package/msmtp/msmtp.hash | 4 ++-- package/msmtp/msmtp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index c5fe9d9176b..ba4ef027464 100644 --- a/package/msmtp/msmtp.hash +++ b/package/msmtp/msmtp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.24.tar.xz.sig +# https://marlam.de/msmtp/releases/msmtp-1.8.25.tar.xz.sig # with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 -sha256 bd6644b1aaab17d61b86647993e3efad860b23c54283b00ddc579c1f5110aa59 msmtp-1.8.24.tar.xz +sha256 2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738 msmtp-1.8.25.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index 93c923a123b..b964970bfa5 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.24 +MSMTP_VERSION = 1.8.25 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf From 33139ca6ac738861d3b8783202d04a77e38f09bf Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 21:09:02 -0700 Subject: [PATCH 0146/3013] package/iproute2: bump to version 6.8.0 Changelog - https://github.com/iproute2/iproute2/compare/v6.7.0...v6.8.0 Drop 0001-Revert-ss-prevent-Process-column-from-being-printed-.patch. See the upstream fix https://github.com/iproute2/iproute2/commit/87d804ca0854b09c07872e9fd6036bf5d3e0cc85 Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- ...t-Process-column-from-being-printed-.patch | 45 ------------------- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch diff --git a/package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch b/package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch deleted file mode 100644 index 10fa472d64f..00000000000 --- a/package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f22c49730c3691c25a1147081363eb35aa9d1048 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger -Date: Sat, 13 Jan 2024 08:51:55 -0800 -Subject: [PATCH] Revert "ss: prevent "Process" column from being printed - unless requested" - -This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56. - -This commit is being reverted because it breaks output of tcp info. -The order of the columns enum is order sensistive. - -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=218372 -Signed-off-by: Stephen Hemminger -Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=f22c49730c3691c25a1147081363eb35aa9d1048 ---- - misc/ss.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/misc/ss.c b/misc/ss.c -index 09dc1f37..9438382b 100644 ---- a/misc/ss.c -+++ b/misc/ss.c -@@ -100,8 +100,8 @@ enum col_id { - COL_SERV, - COL_RADDR, - COL_RSERV, -- COL_PROC, - COL_EXT, -+ COL_PROC, - COL_MAX - }; - -@@ -5795,9 +5795,6 @@ int main(int argc, char *argv[]) - if (ssfilter_parse(¤t_filter.f, argc, argv, filter_fp)) - usage(); - -- if (!show_processes) -- columns[COL_PROC].disabled = 1; -- - if (!(current_filter.dbs & (current_filter.dbs - 1))) - columns[COL_NETID].disabled = 1; - --- -2.43.0 - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 0be058e64bc..d57a93de7d1 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d iproute2-6.7.0.tar.xz +sha256 03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce iproute2-6.8.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 4adb4e3356a..3db2ab925d0 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.7.0 +IPROUTE2_VERSION = 6.8.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From d4620a3128474d8e1b41ec56351eaafd8df898ce Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 20:28:57 -0700 Subject: [PATCH 0147/3013] package/ethtool: bump to version 6.7 Changelog - https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/NEWS?id=0aadd41eab7ea76501e557ccba705a08c07ce088 Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index a37c8000158..b9bc768e8f8 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 833a8493cb9cd5809ab59743092d9a38742c282290800e9626407511bbcebf9e ethtool-6.6.tar.xz +sha256 c3ae526b01ce4d8df6c794ab170de4a4104d111ea8d8db3f1fd7c25fcb905619 ethtool-6.7.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index c9c28566126..77a7e16937a 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.6 +ETHTOOL_VERSION = 6.7 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From 89f24c5cac91d3fe5dd8922daeb5427e8f4f1e7f Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 19:50:59 -0700 Subject: [PATCH 0148/3013] package/strace: bump to version 6.8 Changelog - https://github.com/strace/strace/releases/tag/v6.8 Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index a35d2b0be6e..68b9cc5f935 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.7/strace-6.7.tar.xz.asc -sha256 2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7 strace-6.7.tar.xz +# https://strace.io/files/6.8/strace-6.8.tar.xz.asc +sha256 ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 strace-6.8.tar.xz sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index ddcdfabb291..908aed6653b 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.7 +STRACE_VERSION = 6.8 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From 9496ff57e54c136d6961294aa2c5f8d560673ebf Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 17:17:53 -0700 Subject: [PATCH 0149/3013] package/openssh: bump to version 9.7p1 Release notes - https://www.openssh.com/txt/release-9.7 Drop upstream patch - 001-better-detection-of-broken-fzero-call-used-regs.patch Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- ...ction-of-broken-fzero-call-used-regs.patch | 57 ------------------- package/openssh/openssh.hash | 4 +- package/openssh/openssh.mk | 2 +- 3 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch deleted file mode 100644 index 5c056033a9b..00000000000 --- a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Fri, 22 Dec 2023 17:56:26 +1100 -Subject: [PATCH] better detection of broken -fzero-call-used-regs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc 13.2.0 on ppc64le refuses to compile some function, including -cipher.c:compression_alg_list() with an error: - -> sorry, unimplemented: argument ‘used’ is not supportedcw -> for ‘-fzero-call-used-regs’ on this target - -This extends the autoconf will-it-work test with a similarly- -structured function that seems to catch this. - -Spotted/tested by Colin Watson; bz3645 - -Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch -Signed-off-by: Brandon Maier ---- - m4/openssh.m4 | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/m4/openssh.m4 b/m4/openssh.m4 -index 5d4c56280fc..033df501c3d 100644 ---- a/m4/openssh.m4 -+++ b/m4/openssh.m4 -@@ -20,18 +20,24 @@ char *f2(char *s, ...) { - va_end(args); - return strdup(ret); - } -+const char *f3(int s) { -+ return s ? "good" : "gooder"; -+} - int main(int argc, char **argv) { -- (void)argv; - char b[256], *cp; -+ const char *s; - /* Some math to catch -ftrapv problems in the toolchain */ - int i = 123 * argc, j = 456 + argc, k = 789 - argc; - float l = i * 2.1; - double m = l / 0.5; - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; -+ (void)argv; - f(1); -- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); -+ s = f3(f(2)); -+ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); - if (write(1, b, 0) == -1) exit(0); -- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); -+ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); -+ if (write(1, cp, 0) == -1) exit(0); - free(cp); - /* - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 618b13133d8..58297aa6949 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.4p1 -sha256 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c openssh-9.6p1.tar.gz +# From https://www.openssh.com/txt/release-9.7 +sha256 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd openssh-9.7p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ef530cc8503..ce552531209 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.6 +OPENSSH_VERSION_MAJOR = 9.7 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) From 94e072849e6c86a8c75402b1e600642673ebfb57 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sun, 24 Mar 2024 00:21:16 +0100 Subject: [PATCH 0150/3013] package/fluent-bit: bump to v3.0.0 Release Notes: - https://fluentbit.io/announcements/v3.0.0/ Also drop 0004-wasm-restore-support-for-some-targets-8401.patch, which was accepted upstream. (See: https://github.com/fluent/fluent-bit/commit/40bb0fbe17efa6b4b1a96940e9ff7374b1a0c3eb) Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- ...estore-support-for-some-targets-8401.patch | 43 ------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch diff --git a/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch b/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch deleted file mode 100644 index ed6206268fa..00000000000 --- a/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4a6c5f56cd1a979b91c168fb8e245587c2927aca Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 22 Jan 2024 19:27:56 +0100 -Subject: [PATCH] wasm: restore support for some targets (#8401) - -Somehow, support for ARC, MIPS, and XTENSA got dropped by bumping to v1.3.0, -so restore it now. Remark that those targets are mentioned in the section above. - -See commit fa6a248746f9f481b5f6aef49716141fa0222650. - -Upstream: https://github.com/fluent/fluent-bit/pull/8401 -Signed-off-by: Thomas Devoogdt ---- - src/wasm/CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/wasm/CMakeLists.txt b/src/wasm/CMakeLists.txt -index a258dc063..4ea7eba65 100644 ---- a/src/wasm/CMakeLists.txt -+++ b/src/wasm/CMakeLists.txt -@@ -51,6 +51,10 @@ elseif (WAMR_BUILD_TARGET MATCHES "AARCH64.*") - elseif (WAMR_BUILD_TARGET MATCHES "ARM.*") - add_definitions(-DBUILD_TARGET_ARM) - add_definitions(-DBUILD_TARGET="${WAMR_BUILD_TARGET}") -+elseif (WAMR_BUILD_TARGET STREQUAL "MIPS") -+ add_definitions(-DBUILD_TARGET_MIPS) -+elseif (WAMR_BUILD_TARGET STREQUAL "XTENSA") -+ add_definitions(-DBUILD_TARGET_XTENSA) - elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64" OR WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64D") - add_definitions(-DBUILD_TARGET_RISCV64_LP64D) - elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64") -@@ -59,6 +63,8 @@ elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32" OR WAMR_BUILD_TARGET STREQUAL "RISC - add_definitions(-DBUILD_TARGET_RISCV32_ILP32D) - elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32_ILP32") - add_definitions(-DBUILD_TARGET_RISCV32_ILP32) -+elseif (WAMR_BUILD_TARGET STREQUAL "ARC") -+ add_definitions(-DBUILD_TARGET_ARC) - else () - message (FATAL_ERROR "-- Build target isn't set") - endif () --- -2.34.1 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 2c34583f7a4..cc9c976d604 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8e7e951b2907e9d29508699c71c8949a4a22d750d54ffa5ee5b96537e59371dd fluent-bit-2.2.2.tar.gz +sha256 e70ae5be2f0ca1cb842a1c8d2762437907c522765f79b5c0c391eaa1b57c9f4c fluent-bit-3.0.0.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 00a8904c55b..33054bea66b 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.2.2 +FLUENT_BIT_VERSION = 3.0.0 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From eda991ab095a1adc95d25bd85ed88669ed364e1e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Mar 2024 22:49:51 +0100 Subject: [PATCH 0151/3013] package/fdk-aac: enable on s390x s390x is supported since bump to version 2.0.3 in commit 38a20a0998117f3debb4de06e209ba5d82bb7a9d and https://github.com/mstorsjo/fdk-aac/commit/c16d5d72c99a77c8bcb788a922323b0b59035803 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/fdk-aac/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in index 26e060b93d3..831db13b21d 100644 --- a/package/fdk-aac/Config.in +++ b/package/fdk-aac/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc default y if BR2_sh + default y if BR2_s390x config BR2_PACKAGE_FDK_AAC bool "fdk-aac" From 9efeb7e91440c20aea6cb0e07027081dbba4604d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Mar 2024 22:07:53 +0100 Subject: [PATCH 0152/3013] package/gnu-efi: bump to version 3.0.18 For commit logs, see: https://sourceforge.net/p/gnu-efi/code/ci/3.0.18/log/ This bump is motivated by riscv64 improvements. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/gnu-efi/gnu-efi.hash | 6 +++--- package/gnu-efi/gnu-efi.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index 7d986509917..e059da867e0 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 832496719182e7d6a4b12bc7c0b534d2 gnu-efi-3.0.17.tar.bz2 -sha1 9715285022124b231520d58b26709f5ab338e981 gnu-efi-3.0.17.tar.bz2 +md5 0b93ad70dff96991dd87978fc4275bd1 gnu-efi-3.0.18.tar.bz2 +sha1 4f12dc4ab3e7940070c87affea17bf8a6209957a gnu-efi-3.0.18.tar.bz2 # Locally computed -sha256 7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4 gnu-efi-3.0.17.tar.bz2 +sha256 7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c gnu-efi-3.0.18.tar.bz2 sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 8b9a6aa4c66..96caaeb9336 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.17 +GNU_EFI_VERSION = 3.0.18 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES From 2bf3dc5b84cf9586406d1ff6aa87860eb28d037a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Mar 2024 21:35:16 +0100 Subject: [PATCH 0153/3013] support/testing: add iptables runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + .../testing/tests/package/test_iptables.py | 78 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 support/testing/tests/package/test_iptables.py diff --git a/DEVELOPERS b/DEVELOPERS index a6364cdd441..328c654faed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1797,6 +1797,7 @@ F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_iptables.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ diff --git a/support/testing/tests/package/test_iptables.py b/support/testing/tests/package/test_iptables.py new file mode 100644 index 00000000000..ee57b315589 --- /dev/null +++ b/support/testing/tests/package/test_iptables.py @@ -0,0 +1,78 @@ +import os + +import infra.basetest + + +class TestIptables(infra.basetest.BRTest): + # The iptables package has _LINUX_CONFIG_FIXUPS, so we cannot use + # the runtime test pre-built Kernel. We need to compile a Kernel + # to make sure it will include the required configuration. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.82" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_IPTABLES=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # We check the program can execute. + self.assertRunOk("iptables --version") + + # We delete all rules in all chains. We also set default + # policies to ACCEPT for INPUT and OUPUT chains. This should + # already be the case (default Kernel config). This makes sure + # this test starts from a known state and also those common + # command invocations works. + self.assertRunOk("iptables --flush") + self.assertRunOk("iptables --policy INPUT ACCEPT") + self.assertRunOk("iptables --policy OUTPUT ACCEPT") + + # We add a filter rule to drop all the ICMP protocol to the + # IPv4 destination 127.0.0.2, in the INPUT chain. This should + # block all pings (icmp echo-requests). + cmd = "iptables --append INPUT" + cmd += " --protocol icmp --destination 127.0.0.2 --jump DROP" + self.assertRunOk(cmd) + + # We check we can list rules. + self.assertRunOk("iptables --list") + + # A ping to 127.0.0.1 is expected to work, because it's not + # matching our rule. We expect 3 replies (-c), with 0.5s + # internal (-i), and set a maximum timeout of 2s. + ping_cmd_prefix = "ping -c 3 -i 0.5 -W 2 " + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + + # A ping to 127.0.0.2 is expected to fail, because our rule is + # supposed to drop it. + ping_test_cmd = ping_cmd_prefix + "127.0.0.2" + _, exit_code = self.emulator.run(ping_test_cmd) + self.assertNotEqual(exit_code, 0) + + # We delete our only rule #1 in the INPUT chain. + self.assertRunOk("iptables --delete INPUT 1") + + # Since we deleted the rule, the ping test command which was + # supposed to fail earlier is now supposed to succeed. + self.assertRunOk(ping_test_cmd) From 748fc4be21ed46e2c562735bffed1ea67dbbc7b9 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 24 Mar 2024 00:01:18 +0800 Subject: [PATCH 0154/3013] package/pkg-utils.mk: remove trailing slash in pkgdir definition Signed-off-by: Scott Fan [Arnout: move to definition of pkgdir instead of PKGDIR] Signed-off-by: Arnout Vandecappelle --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 723bbe4e246..6181ae7a996 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -42,7 +42,7 @@ KCONFIG_DISABLE_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $ # directory from its makefile directory, using the $(MAKEFILE_LIST) # variable provided by make. This is used by the *-package macros to # automagically find where the package is located. -pkgdir = $(dir $(lastword $(MAKEFILE_LIST))) +pkgdir = $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) pkgname = $(lastword $(subst /, ,$(pkgdir))) # Helper to build the extension for a package archive, based on various From e50460f9f12a8c5f82f2166733afe9cca3c8cd19 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2024 22:13:27 +0100 Subject: [PATCH 0155/3013] package/php: bump version to 8.3.4 Removed patch 0006 which is included in this release. Rebased patch 0005. Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://www.php.net/releases/8_3_4.php Release notes: https://www.php.net/releases/8_3_3.php Release notes: https://www.php.net/releases/8_3_2.php Release notes: https://www.php.net/releases/8_3_1.php Release notes: https://www.php.net/releases/8_3_0.php Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .../0005-allow-opcache-cross-compiling.patch | 4 +- package/php/0006-xxhash-h-Fix-GCC-12-Og.patch | 94 ------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 4 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 package/php/0006-xxhash-h-Fix-GCC-12-Og.patch diff --git a/package/php/0005-allow-opcache-cross-compiling.patch b/package/php/0005-allow-opcache-cross-compiling.patch index f9bc8b3ef59..468864b0a4e 100644 --- a/package/php/0005-allow-opcache-cross-compiling.patch +++ b/package/php/0005-allow-opcache-cross-compiling.patch @@ -14,7 +14,7 @@ CFLAGS when opcache is enabled: Signed-off-by: Adam Duskett Signed-off-by: Bernd Kuhls -[Bernd: rebased for 8.1.7] +[Bernd: rebased for 8.1.7 & 8.3.3] --- ext/opcache/config.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -23,7 +23,7 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 5492fd92..10c150ff 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -331,10 +331,6 @@ int main() { +@@ -315,10 +315,6 @@ int main() { PHP_ADD_EXTENSION_DEP(opcache, pcre) diff --git a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch deleted file mode 100644 index 9b5b9966cd5..00000000000 --- a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch +++ /dev/null @@ -1,94 +0,0 @@ -From adcb38b1ffa8e401293e5028ee5af586fd304e00 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 12 Apr 2023 13:33:07 +0800 -Subject: [PATCH] xxhash.h: Fix GCC 12 -Og - -Change whether to inline XXH3_hashLong_withSecret to a config option - -Ref: https://github.com/Cyan4973/xxHash/commit/ace22bddc7a366a5dd8a71e8b8247694530684ec - -Signed-off-by: Mingli Yu - -Closes GH-11062. - -Upstream: https://github.com/php/php-src/commit/adcb38b1ffa8e401293e5028ee5af586fd304e00 - -Signed-off-by: Bernd Kuhls ---- - ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++-- - 1 file changed, 33 insertions(+), 2 deletions(-) - -diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h -index b5bd286496c7..8e816c0584eb 100644 ---- a/ext/hash/xxhash/xxhash.h -+++ b/ext/hash/xxhash/xxhash.h -@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, - */ - # define XXH_NO_INLINE_HINTS 0 - -+/*! -+ * @def XXH3_INLINE_SECRET -+ * @brief Determines whether to inline the XXH3 withSecret code. -+ * -+ * When the secret size is known, the compiler can improve the performance -+ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). -+ * -+ * However, if the secret size is not known, it doesn't have any benefit. This -+ * happens when xxHash is compiled into a global symbol. Therefore, if -+ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. -+ * -+ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers -+ * that are *sometimes* force inline on -Og, and it is impossible to automatically -+ * detect this optimization level. -+ */ -+# define XXH3_INLINE_SECRET 0 -+ - /*! - * @def XXH32_ENDJMP - * @brief Whether to use a jump for `XXH32_finalize`. -@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, - # endif - #endif - -+#ifndef XXH3_INLINE_SECRET -+# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ -+ || !defined(XXH_INLINE_ALL) -+# define XXH3_INLINE_SECRET 0 -+# else -+# define XXH3_INLINE_SECRET 1 -+# endif -+#endif -+ - #ifndef XXH32_ENDJMP - /* generally preferable for performance */ - # define XXH32_ENDJMP 0 -@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) - # define XXH_NO_INLINE static - #endif - -+#if XXH3_INLINE_SECRET -+# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE -+#else -+# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE -+#endif - - - /* ************************************* -@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, - * so that the compiler can properly optimize the vectorized loop. - * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. - */ --XXH_FORCE_INLINE XXH64_hash_t -+XXH3_WITH_SECRET_INLINE XXH64_hash_t - XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, - XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) - { -@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, - * It's important for performance to pass @secretLen (when it's static) - * to the compiler, so that it can properly optimize the vectorized loop. - */ --XXH_FORCE_INLINE XXH128_hash_t -+XXH3_WITH_SECRET_INLINE XXH128_hash_t - XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, - XXH64_hash_t seed64, - const void* XXH_RESTRICT secret, size_t secretLen) diff --git a/package/php/php.hash b/package/php/php.hash index 4ce3616de3e..96f16ff2a76 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz +sha256 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63 php-8.3.4.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 28893be4c64..99dbec9de79 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.16 +PHP_VERSION = 8.3.4 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From e511539cd29015f08d7417094cbf202a861ad533 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2024 22:47:12 +0100 Subject: [PATCH 0156/3013] package/multipath-tools: drop README.md from license files Drop README.md from license files as advocated by Arnout Vandecappelle: https://patchwork.ozlabs.org/project/buildroot/patch/20240314211117.9103-1-fontaine.fabrice@gmail.com The only license-related part of README.md is that specifies that the default license, if not mentioned in the file, is LGPL-2.0. Since the README file is likely to be updated with every new release, this is a lot of overhead for such a small added value. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/multipath-tools/multipath-tools.hash | 1 - package/multipath-tools/multipath-tools.mk | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index c1f32e7a3b0..03a2867144a 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 9c69bb0089aa0b82b10a25095c04a7c4aec6b5bbf0776b7129123c8459fe7725 README.md diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index e62e85e14da..164d8506004 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -16,8 +16,7 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ LICENSES/GPL-2.0 \ LICENSES/GPL-3.0 \ LICENSES/LGPL-2.0 \ - LICENSES/LGPL-2.1 \ - README.md + LICENSES/LGPL-2.1 MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = \ From 1455d5241b288770aeea7f5ba6dcd1ea31966ba1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2024 23:10:29 +0100 Subject: [PATCH 0157/3013] package/cvs: fix build without editor Set default editor to /bin/vi to fix the following build failure when no editor is found on host: configure:40833: checking for vim configure:40862: result: no configure:40833: checking for vi configure:40862: result: no configure:40833: checking for emacs configure:40862: result: no configure:40833: checking for nano configure:40862: result: no configure:40833: checking for pico configure:40862: result: no configure:40833: checking for edit configure:40862: result: no configure:40874: error: Failed to find a text file editor. CVS cannot be compiled without a default log message editor. Searched for `vim vi emacs nano pico edit'. Try `configure --with-editor'. While at it, drop CVS_CONFIGURE_ARGS variable for simplicity Fixes: - http://autobuild.buildroot.org/results/5b8a747698bc2e64eb1f001e87577e86e4cb8d14 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/cvs/cvs.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index bd1e04eee00..64c15f16fee 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -18,18 +18,18 @@ CVS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ cvs_cv_func_printf_ptr=yes -CVS_CONFIGURE_ARGS = --disable-old-info-format-support +CVS_CONF_OPTS = \ + --disable-old-info-format-support \ + --with-editor=/bin/vi ifeq ($(BR2_PACKAGE_CVS_SERVER),y) -CVS_CONFIGURE_ARGS += --enable-server +CVS_CONF_OPTS += --enable-server else -CVS_CONFIGURE_ARGS += --disable-server +CVS_CONF_OPTS += --disable-server endif ifeq ($(BR2_PACKAGE_ZLIB),y) -CVS_CONFIGURE_ARGS += --with-external-zlib +CVS_CONF_OPTS += --with-external-zlib endif -CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS) - define CVS_BZIP_UNPACK $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 From 9553dc9a55c13916c26aaae4fac037d35ddacca3 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 15 Mar 2024 23:43:16 +0000 Subject: [PATCH 0158/3013] package/gmp: fix target build with host gcc 4.9 GMP does not build if the host gcc is v4.9 due to the following error gen-sieve.c: In function 'setmask': gen-sieve.c:99:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i < 2 * a * b; ++i) ^ gen-sieve.c:99:3: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code The gen-sieve utility was added in GMP v6.3.0. It is built using CC_FOR_BUILD (host compiler) during cross compilation as it generates build files. Autoconf does not have a macro for add -std=c99 to CC_FOR_BUILD, so it must be set manually. For the target, it is set correctly thanks to the AC_PROG_CC_C99 macro. Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- package/gmp/gmp.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index bd401c6a80e..7e8da9025c9 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -14,6 +14,8 @@ GMP_CPE_ID_VENDOR = gmplib GMP_DEPENDENCIES = host-m4 HOST_GMP_DEPENDENCIES = host-m4 +GMP_CONF_ENV += CC_FOR_BUILD="$(HOSTCC) -std=c99" + # GMP doesn't support assembly for coldfire or mips r6 ISA yet # Disable for ARM v7m since it has different asm constraints ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M),y) From c21a0556db93a85b3363e4a5b6e3a832d061ccfd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:31 +0100 Subject: [PATCH 0159/3013] {toolchain, linux-headers}: add support for 6.7 headers And add (and default to) 6.7 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 977ad30f730..6b0c5de1f60 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fe4fc5011e7..1c2500fb798 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_6 + default BR2_KERNEL_HEADERS_6_7 help Select the kernel version to get headers from. @@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_1 config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 + +config BR2_KERNEL_HEADERS_6_7 + bool "Linux 6.7.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -124,8 +128,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5 @@ -409,6 +417,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.151" if BR2_KERNEL_HEADERS_5_15 default "6.1.81" if BR2_KERNEL_HEADERS_6_1 default "6.6.21" if BR2_KERNEL_HEADERS_6_6 + default "6.7.10" if BR2_KERNEL_HEADERS_6_7 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 1641dbae062..d71fb96d40f 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -658,6 +662,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 5554d56719a..a7c239dcabd 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -162,8 +162,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5 From 75bad69099dfb66433feaf4accf1105e1f8a4319 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:35 +0100 Subject: [PATCH 0160/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 6b0c5de1f60..5595e51fe01 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz -sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz -sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz +sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 8a1e760bf2660947234109aa4fdbbe3686238b4e852157b96c59356689107e49 linux-5.15.151.tar.xz -sha256 0cf3e467bd8d35533888327e9f8a9a9d354fdf83e8f82e9fe5a234f896a07493 linux-5.10.212.tar.xz -sha256 cdbc61334cdadbd3945b08f03ed197c65bdf358c3383a4334b3e5b483bd95850 linux-5.4.271.tar.xz +sha256 f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e linux-5.15.152.tar.xz +sha256 84cf30223239ec3333a5f7b2a7fba2042bba70d1582a139f7543956af871ad80 linux-5.10.213.tar.xz +sha256 3599d5959a403e64be407d7f05e56cb270d6ddd154e89a596609919ab1e2e366 linux-5.4.272.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 95ada7aa6ef1c69d7a469432f936365e35b004d24e751d82c21a371edd2c84f9 linux-4.19.309.tar.xz +sha256 95ec94c4ab8f46d8a54430893f9bd653c46b0f1587d216818aa8f52fd313de69 linux-4.19.310.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1c2500fb798..874a0a261c3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -411,12 +411,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.309" if BR2_KERNEL_HEADERS_4_19 - default "5.4.271" if BR2_KERNEL_HEADERS_5_4 - default "5.10.212" if BR2_KERNEL_HEADERS_5_10 - default "5.15.151" if BR2_KERNEL_HEADERS_5_15 - default "6.1.81" if BR2_KERNEL_HEADERS_6_1 - default "6.6.21" if BR2_KERNEL_HEADERS_6_6 + default "4.19.310" if BR2_KERNEL_HEADERS_4_19 + default "5.4.272" if BR2_KERNEL_HEADERS_5_4 + default "5.10.213" if BR2_KERNEL_HEADERS_5_10 + default "5.15.152" if BR2_KERNEL_HEADERS_5_15 + default "6.1.82" if BR2_KERNEL_HEADERS_6_1 + default "6.6.22" if BR2_KERNEL_HEADERS_6_6 default "6.7.10" if BR2_KERNEL_HEADERS_6_7 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From f30f5e4f61e72a507df96bea1960a9388c780a82 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 22:37:18 +0100 Subject: [PATCH 0161/3013] package/pure-ftpd: remove optional dependency to libiconv Buildroot commit 26d5d1c0a20719876220b429a43f8b1bcc29138b removed the configure option --with-rfc2640 due to upstream commit: https://github.com/jedisct1/pure-ftpd/commit/33eda763bfca8dfcf736275272b84602dcd18549 In the same upstream commit the iconv support was also removed because it was only needed for rfc2640 support, this removal was forgotten in the forementioned buildroot commit. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/pure-ftpd/pure-ftpd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index ffd27d7b992..b918c709303 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -10,7 +10,6 @@ PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC PURE_FTPD_LICENSE_FILES = COPYING PURE_FTPD_CPE_ID_VENDOR = pureftpd -PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) PURE_FTPD_CONF_OPTS = \ --with-altlog \ From 24e996d14d28decfb9863996456b6b2720939422 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 10:58:11 +0100 Subject: [PATCH 0162/3013] package/xvisor: fix build without python interpreter Fix the following build failures on a system not providing the "python" interpreter binary raised at least since bump to version 0.3.1 in commit c4f8b8968770ecbf6444a5921c6472f126717626 and more probably since the addition of the package in commit e23ddf0c13e6d3b054782b86188396a0c2add1a5 and https://github.com/xvisor/xvisor/commit/ba904b4066f4b375cb1ad76ca41570741dbec62e: /bin/sh: line 1: /home/buildroot/autobuild/instance-2/output-1/build/xvisor-0.3.1/tools/scripts/d2c.py: cannot execute: required file not found or /bin/sh: /home/buildroot/instance-0/output-1/build/xvisor-0.3.2/tools/scripts/d2c.py: /usr/bin/python: bad interpreter: No such file or directory Fixes: - http://autobuild.buildroot.org/results/2e100bacc9e9face8351287e4c979c1729709d7b - http://autobuild.buildroot.org/results/5d8a08512db1b3095158753e3a7843b0fd6c9749 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...plicitly-use-the-python3-interpreter.patch | 35 +++++++++++++++++++ package/xvisor/xvisor.mk | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch diff --git a/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch new file mode 100644 index 00000000000..349d4415e2c --- /dev/null +++ b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch @@ -0,0 +1,35 @@ +From 888c94e7a121d96aa88f84c58fe7e2bd771fc5ac Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 25 Aug 2023 21:56:37 +0200 +Subject: [PATCH] TOOLS: d2c.py: explicitly use the python3 interpreter + +When compiling Xvisor on a system not providing the "python" +interpreter binary, compilation fails with output: + + (d2c) core/vio/keymaps/modifiers.c + /bin/sh: 1: /build/xvisor-0.3.2/tools/scripts/d2c.py: not found + +This commit fixes the issue following the PEP 394 recommendation: +https://peps.python.org/pep-0394/ + +It sets the "shebang" to `#! /usr/bin/env python3` to allow using other +interpreters in the PATH, or virtual environment. + +Signed-off-by: Julien Olivain + +Upstream: https://github.com/xvisor/xvisor/commit/888c94e7a121d96aa88f84c58fe7e2bd771fc5ac +Signed-off-by: Fabrice Fontaine +--- + tools/scripts/d2c.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/scripts/d2c.py b/tools/scripts/d2c.py +index b46a7bc468..daac4a5450 100755 +--- a/tools/scripts/d2c.py ++++ b/tools/scripts/d2c.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#! /usr/bin/env python3 + #/** + # Copyright (c) 2013 Anup Patel. + # All rights reserved. diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index eba37be9b7a..2a51706b55a 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -11,7 +11,7 @@ XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-dtc host-flex +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex host-python3 XVISOR_MAKE_TARGETS = all From 4eba5e002c1e71b1d8decba101f9b8f945a9cd3a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 11:53:26 +0100 Subject: [PATCH 0163/3013] package/libunwind: drop autoreconf Commit 67d87bf7d255cd05f84fab3e3625e073b5bfccf8 forgot to drop autoreconf Fixes: 67d87bf7d255cd05f84fab3e3625e073b5bfccf8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libunwind/libunwind.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index d7ddb8f179e..15c4e4863f5 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -10,7 +10,6 @@ LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING LIBUNWIND_LICENSE = MIT LIBUNWIND_CPE_ID_VALID = YES -LIBUNWIND_AUTORECONF = YES LIBUNWIND_CONF_OPTS = \ --disable-tests \ From 766c1613aed2fe10bee96b8b515f88bb6ee7a310 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 11:55:29 +0100 Subject: [PATCH 0164/3013] package/libunwind: fix libucontext handling Commit 6ea2a27f9047696ce1c463ad55fb4a78df136954 forgot to add -lucontext to LIBS resulting in the following build failure with zeromq: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib32/libunwind.so.8: undefined reference to `setcontext' Fixes: 6ea2a27f9047696ce1c463ad55fb4a78df136954 - http://autobuild.buildroot.org/results/893defe1588b2ca03c115b59b47be3f4aed438fb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libunwind/libunwind.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index 15c4e4863f5..94e9bbd1b87 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -17,6 +17,7 @@ LIBUNWIND_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) LIBUNWIND_DEPENDENCIES += libucontext +LIBUNWIND_CONF_OPTS += LIBS=-lucontext endif $(eval $(autotools-package)) From b6816034ebddd522a8fef9daa454c28fa1230dd6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:14:38 +0100 Subject: [PATCH 0165/3013] package/privoxy: fix build with root Fix the following build failure when the configuration files are installed as root: id: 'privoxy': no such user ****************************************************************** WARNING! WARNING! installing config files as root! It is strongly recommended to run privoxy as a non-root user, and to install the config files as that user and/or group! Please read INSTALL, and create a privoxy user and group! ******************************************************************* make[1]: *** [GNUmakefile:861: install] Error 1 This failure is probably raised since the addition of the package in commit f8a263fe361ab37ec6765b9ff6478c3b15e3d139 and https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=26baf6bcc0b5db47b8cf5c55eece0614712b5180 Fixes: - http://autobuild.buildroot.org/results/28d8ca6f0e2d81d62196a0958c9274ad2c8c9871 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...on-t-exit-if-configuration-files-are.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch diff --git a/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch new file mode 100644 index 00000000000..e04d191ce00 --- /dev/null +++ b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch @@ -0,0 +1,30 @@ +From 4b3b267db159dc23314de3062859481b7c397e32 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Mar 2024 12:36:31 +0100 +Subject: [PATCH] GNUmakefile.in: Don't exit if configuration files are + installed as root + +... as this can be considered acceptable when cross-compiling +Privoxy inside an autobuilder with only a root user. + +Upstream: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=4b3b267db159dc23314de3062859481b7c397e32 +Signed-off-by: Fabrice Fontaine +--- + GNUmakefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/GNUmakefile.in b/GNUmakefile.in +index 04cceb15..cf79aae1 100644 +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -927,7 +927,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T + $(ECHO) " and to install the config files as that user and/or group!" ;\ + $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ + $(ECHO) "*******************************************************************" ;\ +- exit 1 ;\ + fi ;\ + else \ + GROUP_T=$(GROUP) ;\ +-- +2.39.2 + From 0b96e29723029c0a856cd558a21218fbbede7234 Mon Sep 17 00:00:00 2001 From: Javad Rahimipetroudi Date: Tue, 19 Mar 2024 13:23:42 +0100 Subject: [PATCH 0166/3013] configs/avenger96_defconfig: bump U-Boot version to 2024.01 Signed-off-by: Javad Rahimipetroudi Signed-off-by: Arnout Vandecappelle --- configs/avenger96_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 536899583cf..82702bcfc73 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -41,7 +41,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_DTB=y From 21629634adee2e0c5541ff1d74b8bd297676815f Mon Sep 17 00:00:00 2001 From: Javad Rahimipetroudi Date: Tue, 19 Mar 2024 13:23:43 +0100 Subject: [PATCH 0167/3013] configs/avenger96_defconfig: bump Linux version to 6.6.22 LTS This patch upgrades Kernel version to 6.6.22 LTS on avenger96 board. Beside that, In accordance with the kernel 6.5rc1 commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") the device tree path also has been modified to point the device tree in the proper location. As another change, due to commit 3108eb2e8aa7 ("mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS"), the order of SD card and eMMC probing has swapped. The SD card is now mmcblk0 instead of mmcblk1. Thus, the default root append (mmcblk1p4) in 'extlinux.conf' file in the overlay directory of the board is changed, otherwise the rootfs was not possible to be detected. Signed-off-by: Javad Rahimipetroudi Signed-off-by: Arnout Vandecappelle --- board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf | 2 +- configs/avenger96_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf index 5d506b3daea..7d6d7f8a447 100644 --- a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf +++ b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label stm32mp157c-dk2-buildroot kernel /boot/zImage devicetree /boot/stm32mp157a-dhcor-avenger96.dtb - append root=/dev/mmcblk1p4 rootwait + append root=/dev/mmcblk0p4 rootwait diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 82702bcfc73..218955fc026 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -3,7 +3,7 @@ BR2_arm=y BR2_cortex_a7=y # Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches" @@ -13,10 +13,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-im # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157a-dhcor-avenger96" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From b9b40901d1bd27aef9de13391956c959899581c6 Mon Sep 17 00:00:00 2001 From: Javad Rahimipetroudi Date: Tue, 19 Mar 2024 13:23:44 +0100 Subject: [PATCH 0168/3013] configs/avenger96_defconfig: bump ATF version to v2.8 LTS This patch upgrades the ATF version to the v2.8 LTS version. Please note that due to DTS changes from upstream commit 51e223058fe70b311542178f1865514745fa7874 ("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM") The ATF additional build variable is also modified to use the new DTS file. Note that the old DTS file still exists, but no longer works. Furthermore, the 'E=0' flag is removed from ATF additional build variable. It was added by commit deb8d71c9285eb60bc3d28e8abcf7208f78980a7 to avoid TFA build failure because of '-Werror' flag. However, from version v2.6 or later, it is not required anymore, the compiler warning was fixed. The ATF patch "board/arrow/avenger96/patches/arm-trusted-firmware/ 0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch" also has been removed. As it was not required due to using the new dhcore DTS file for the ATF build. Signed-off-by: Javad Rahimipetroudi [Arnout: switch to BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION instead of custom lts-v2.8.16] Signed-off-by: Arnout Vandecappelle --- ...ger96.dts-enable-hash-device-to-unbr.patch | 51 ------------------- configs/avenger96_defconfig | 5 +- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch diff --git a/board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch b/board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch deleted file mode 100644 index 8cec0af3b1f..00000000000 --- a/board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 336dc301e02d64507447f82020ce7a349797bef3 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sun, 5 Nov 2023 14:59:16 +0100 -Subject: [PATCH] stm32mp157a-avenger96.dts: enable hash device to unbreak boot - issue - -The avenger96 board was forgotten when authentication support was added with -commit 4bdb1a7a6a1325343 (stm32mp1: add authentication support for -stm32image), causing a panic when stm32mp_init_auth() is called, so fix it -similar to how it was done for the STM32MP157C-ED1 board with: - -commit b37b52ef8bc05bfd8dcca992d4ba84cd7c5d23bb -Author: Yann Gautier -Date: Tue Oct 13 18:05:06 2020 +0200 - - fdts: add missing hash node in STM32MP157C-ED1 board DT - - Without this node, the board fails to boot and panics in the function - stm32mp_init_auth(). - - Change-Id: Ia54924410dac2a8c94dd6e45d7e93977fe7d87e2 - Signed-off-by: Yann Gautier - -Upstream: N/A - Upstream reworked authentication to skip it for MP157A - variant since v2.7, see "feat(st): disable authentication based on - part_number" - (https://github.com/ARM-software/arm-trusted-firmware/commit/49abdfd8cececb91a4bc7e7b29a30c09dce461c7) - -Signed-off-by: Peter Korsgaard ---- - fdts/stm32mp157a-avenger96.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/fdts/stm32mp157a-avenger96.dts b/fdts/stm32mp157a-avenger96.dts -index b967736e4..76edecb83 100644 ---- a/fdts/stm32mp157a-avenger96.dts -+++ b/fdts/stm32mp157a-avenger96.dts -@@ -271,6 +271,10 @@ - }; - }; - -+&hash1 { -+ status = "okay"; -+}; -+ - &rng1 { - status = "okay"; - }; --- -2.39.2 - diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 218955fc026..f73b654dc87 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -6,7 +6,6 @@ BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration -BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches" BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" @@ -29,13 +28,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.8.16" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dhcor-avenger96.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y From d8a729d1731339da141612be33c5e59bc9928748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 22 Mar 2024 00:07:38 +0100 Subject: [PATCH 0169/3013] package/igt-gpu-tools: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit IGT GPU Tools is a collection of tools for development and testing of the DRM drivers Signed-off-by: Gaël PORTAY Signed-off-by: Andy Yan Signed-off-by: Bernd Kuhls [Bernd: v4 - add myself to DEVELOPERS - add dependencies to locales, mmu, wchar and headers >= 4.11 - rework libunwind dependency - remove duplicate libglib2 dependency v5 - added optional dependency to json_c - remove broken igt_stats binary v6 - updated patch series after upstream review v8 - bumped to current git HEAD to fix musl build errors - removed all patches which are included in upstream repo - added fix for segfaults with hardened toolchains on x86/x86_64] Signed-off-by: Bernd Kuhls Signed-off-by: Francois Dugast [Francois: v7 - depend on !BR2_RELRO_FULL - remove specific workaround for igt_stats binary] Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in | 1 + package/igt-gpu-tools/Config.in | 32 +++++++++++++++ package/igt-gpu-tools/igt-gpu-tools.hash | 5 +++ package/igt-gpu-tools/igt-gpu-tools.mk | 52 ++++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 package/igt-gpu-tools/Config.in create mode 100644 package/igt-gpu-tools/igt-gpu-tools.hash create mode 100644 package/igt-gpu-tools/igt-gpu-tools.mk diff --git a/DEVELOPERS b/DEVELOPERS index 328c654faed..c045a8cd7c6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -372,6 +372,7 @@ F: package/gpsd/ F: package/gptfdisk/ F: package/hddtemp/ F: package/hdparm/ +F: package/igt-gpu-tools/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ diff --git a/package/Config.in b/package/Config.in index c677c3ff4a9..1a62bfb1be6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -323,6 +323,7 @@ comment "Graphic applications" source "package/glmark2/Config.in" source "package/glslsandbox-player/Config.in" source "package/gnuplot/Config.in" + source "package/igt-gpu-tools/Config.in" source "package/ivi-homescreen/Config.in" source "package/jhead/Config.in" source "package/kmscube/Config.in" diff --git a/package/igt-gpu-tools/Config.in b/package/igt-gpu-tools/Config.in new file mode 100644 index 00000000000..809c8e28ac5 --- /dev/null +++ b/package/igt-gpu-tools/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_IGT_GPU_TOOLS + bool "igt-gpu-tools" + depends on BR2_USE_MMU # fork() + depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_USE_WCHAR # elfutils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 # linux/dma-buf.h + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBPCIACCESS + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_PROCPS_NG + select BR2_PACKAGE_ZLIB + help + IGT GPU Tools is a collection of tools for development and + testing of the DRM drivers. + + https://gitlab.freedesktop.org/drm/igt-gpu-tools + +comment "igt-gpu-tools needs udev /dev management and toolchain w/ threads, wchar, dynamic library, locale, headers >= 4.11" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_ENABLE_LOCALE || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 diff --git a/package/igt-gpu-tools/igt-gpu-tools.hash b/package/igt-gpu-tools/igt-gpu-tools.hash new file mode 100644 index 00000000000..bf760b91d7e --- /dev/null +++ b/package/igt-gpu-tools/igt-gpu-tools.hash @@ -0,0 +1,5 @@ +# Locally calculated from download +sha256 de6e9443d569e76333ec6c8ffc53937b6831224161fe69bf2f07efad3bd0e04a igt-gpu-tools-0ee4074685c1e184f2d3612ea6eb4d126f9a2e23.tar.bz2 + +# Hash for license file: +sha256 1b7e266857b05808660f42369a4a797459d7b7bec7245e378aa28a8db2f213da COPYING diff --git a/package/igt-gpu-tools/igt-gpu-tools.mk b/package/igt-gpu-tools/igt-gpu-tools.mk new file mode 100644 index 00000000000..927a1225a5e --- /dev/null +++ b/package/igt-gpu-tools/igt-gpu-tools.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# igt-gpu-tools +# +################################################################################ + +IGT_GPU_TOOLS_VERSION = 0ee4074685c1e184f2d3612ea6eb4d126f9a2e23 +IGT_GPU_TOOLS_SOURCE = igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION).tar.bz2 +IGT_GPU_TOOLS_SITE = https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/$(IGT_GPU_TOOLS_VERSION) +IGT_GPU_TOOLS_LICENSE = MIT +IGT_GPU_TOOLS_LICENSE_FILES = COPYING +IGT_GPU_TOOLS_INSTALL_STAGING = YES +IGT_GPU_TOOLS_DEPENDENCIES = \ + host-pkgconf \ + cairo \ + elfutils \ + kmod \ + libdrm \ + libglib2 \ + libpciaccess \ + pixman \ + procps-ng \ + udev \ + zlib + +# On x86 systems, libigt resolves igt_half_to_float and igt_float_to_half as +# indirect functions at runtime by checking CPU features with igt_x86_features. +# The igt_x86_features function is implemented is a different object and the +# call uses the PLT itself. If lazy binding is disabled, this causes a segfault +# while resolving the symbols for libigt on x64 systems. Disable BINDNOW on X86 +# systems to prevent the segfaults. +# https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/102 +# https://bugs.gentoo.org/788625#c13 +ifeq ($(BR2_i386)$(BR2_x86_64)x$(BR2_RELRO_NONE),yx) +IGT_GPU_TOOLS_LDFLAGS = $(TARGET_LDFLAGS) -Wl,-z,lazy +endif + +ifeq ($(BR2_PACKAGE_JSON_C),y) +IGT_GPU_TOOLS_CONF_OPTS += -Drunner=enabled +IGT_GPU_TOOLS_DEPENDENCIES += json-c +else +IGT_GPU_TOOLS_CONF_OPTS += -Drunner=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +IGT_GPU_TOOLS_CONF_OPTS += -Dlibunwind=enabled +IGT_GPU_TOOLS_DEPENDENCIES += libunwind +else +IGT_GPU_TOOLS_CONF_OPTS += -Dlibunwind=disabled +endif + +$(eval $(meson-package)) From 958085d5f6a90c46f812c64bbe4ac2963f83bca1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 12 Mar 2024 19:38:36 +0100 Subject: [PATCH 0170/3013] package/bitcoin: add the wallet support option The bitcoin Buildroot package has always disabled the wallet support. This commit adds a config option to enable this support. This allows the bitcoin-cli command to create wallets, generate addresses and send an amount to a given address. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/bitcoin/Config.in | 10 ++++++++++ package/bitcoin/bitcoin.mk | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index c4a2447fc95..060cae24f5f 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -36,6 +36,16 @@ config BR2_PACKAGE_BITCOIN https://bitcoincore.org +if BR2_PACKAGE_BITCOIN + +config BR2_PACKAGE_BITCOIN_WALLET + bool "wallet support" + select BR2_PACKAGE_SQLITE + help + Enable bitcoin wallet support. + +endif + comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 493c569336a..2f8a1777a26 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -13,14 +13,27 @@ BITCOIN_CPE_ID_VENDOR = bitcoin BITCOIN_CPE_ID_PRODUCT = bitcoin_core BITCOIN_DEPENDENCIES = host-pkgconf boost libevent BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1 +# Berkeley Database (bdb) support is always disabled. It is only +# needed for legacy wallet format. New wallets are using SQLite. BITCOIN_CONF_OPTS = \ --disable-bench \ - --disable-wallet \ --disable-tests \ --with-boost-libdir=$(STAGING_DIR)/usr/lib/ \ --disable-hardening \ + --without-bdb \ --without-gui +ifeq ($(BR2_PACKAGE_BITCOIN_WALLET),y) +BITCOIN_DEPENDENCIES += sqlite +BITCOIN_CONF_OPTS += \ + --enable-wallet \ + --with-sqlite +else +BITCOIN_CONF_OPTS += \ + --disable-wallet \ + --without-sqlite +endif + ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) BITCOIN_DEPENDENCIES += libminiupnpc BITCOIN_CONF_OPTS += --with-miniupnpc From bc76d786a40548333be5cb9c0833e458498c06dd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 15 Mar 2024 22:05:01 +0100 Subject: [PATCH 0171/3013] support/testing: add bitcoin runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + support/testing/tests/package/test_bitcoin.py | 184 ++++++++++++++++++ 2 files changed, 185 insertions(+) create mode 100644 support/testing/tests/package/test_bitcoin.py diff --git a/DEVELOPERS b/DEVELOPERS index c045a8cd7c6..cb2132e67ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1771,6 +1771,7 @@ F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_bc.py +F: support/testing/tests/package/test_bitcoin.py F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py diff --git a/support/testing/tests/package/test_bitcoin.py b/support/testing/tests/package/test_bitcoin.py new file mode 100644 index 00000000000..93aa9383ab6 --- /dev/null +++ b/support/testing/tests/package/test_bitcoin.py @@ -0,0 +1,184 @@ +import os +import time + +import infra.basetest + + +class TestBitcoin(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG cannot be used as it does + # not include BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS + # needed by bitcoin. This config also uses an ext4 rootfs as + # bitcoind needs some free disk space to start (so we avoid having + # a larger initrd in RAM). + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.81" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_BITCOIN=y + BR2_PACKAGE_BITCOIN_WALLET=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + # Command prefix for the bitcoin command line interface. + cli_cmd = "bitcoin-cli -regtest" + + def create_btc_wallet(self, wallet_name): + """Create an empty wallet.""" + cmd = f"{self.cli_cmd} -named createwallet wallet_name={wallet_name}" + self.assertRunOk(cmd) + + def gen_btc_address(self, wallet_name): + """Generate an address in a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet_name} getnewaddress" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return out[0] + + def init_wallet(self, wallet_name): + """Create a wallet and generate an address in it.""" + self.create_btc_wallet(wallet_name) + return self.gen_btc_address(wallet_name) + + def get_wallet_balance(self, wallet): + """Return the (confirmed) balance of a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet} getbalance" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return float(out[0]) + + def get_wallet_unconfirmed_balance(self, wallet): + """Return the unconfirmed balance of a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet} getunconfirmedbalance" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return float(out[0]) + + def get_block_count(self): + """Returns the height of the most-work fully-validated chain.""" + cmd = f"{self.cli_cmd} getblockcount" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return int(out[0]) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a53", + "-m", "256M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Values for the test. + wallet1 = "AliceWallet" + wallet2 = "BobWallet" + btc_test_amount = 10 + btc_fee = 0.00001 + req_blk_count = 101 + + # Check the binary can execute. + self.assertRunOk("bitcoind --version") + + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will make sure the test always + # starts from a clean state. + cmd = "rm -rf ~/.bitcoin" + self.assertRunOk(cmd) + + # The bitcoin daemon is not started. A client ping is expected + # to fail. + ping_cmd = f"{self.cli_cmd} ping" + _, ret = self.emulator.run(ping_cmd) + self.assertNotEqual(ret, 0) + + # Start the daemon. + cmd = f"bitcoind -regtest -daemonwait -fallbackfee={btc_fee:f}" + self.assertRunOk(cmd) + + time.sleep(2 * self.timeout_multiplier) + + # Now the daemon is started, the ping is expected to succeed. + self.assertRunOk(ping_cmd) + + # We create two wallets and addresses. + btc_addr1 = self.init_wallet(wallet1) + btc_addr2 = self.init_wallet(wallet2) + + # Since the regression test block chain is at its genesis + # block, we expect a height of zero. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, 0) + + # We also expect our wallets to be empty. + for wallet in [wallet1, wallet2]: + balance = self.get_wallet_balance(wallet) + self.assertAlmostEqual(balance, 0.0) + + # We request the generation of several blocks for address + # #1. We should receive the 50 BTC reward at this address. + cmd = self.cli_cmd + cmd += f" generatetoaddress {req_blk_count} {btc_addr1}" + self.assertRunOk(cmd) + + # We should now see the previously created blocks. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, req_blk_count) + + # We should also see the 50 BTC reward in the wallet #1. + balance = self.get_wallet_balance(wallet1) + self.assertAlmostEqual(balance, 50.0) + + # The wallet #2 should still be empty. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) + + # We send an amount from wallet #1 to #2. + cmd = f"{self.cli_cmd} -rpcwallet={wallet1}" + cmd += f" sendtoaddress {btc_addr2} {btc_test_amount}" + self.assertRunOk(cmd) + + # The wallet #1 balance is expected to be subtracted by the + # spent amount and the transaction fees. + expected_balance = 50 - btc_test_amount - btc_fee + balance = self.get_wallet_balance(wallet1) + self.assertAlmostEqual(balance, expected_balance, places=4) + + # The transaction is sent, but not confirmed yet. So we should + # still see a (confirmed) balance of zero. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) + + # We should see the transferred amount in the unconfirmed + # balance. + balance = self.get_wallet_unconfirmed_balance(wallet2) + self.assertAlmostEqual(balance, btc_test_amount) + + # We generate 1 block to address #2. This action will confirm + # the previous transaction (but this will not give the 50 BTC + # reward). + cmd = f"{self.cli_cmd} generatetoaddress 1 {btc_addr2}" + self.assertRunOk(cmd) + + # We should see one more block. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, req_blk_count + 1) + + # We should now see the amount in the confirmed balance. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, btc_test_amount) + + # The unconfirmed balance should now be zero. + balance = self.get_wallet_unconfirmed_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) From 44c221c856a473179daeb9e49bcb89af2b1b1405 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:32 +0100 Subject: [PATCH 0172/3013] package/busybox: remove tc from default config Busybox tc fails to build with kernel >= 6.8 For details see https://bugs.busybox.net/show_bug.cgi?id=15934 In addition, tc is a very rarely used tool, so not something that you expect to be available in busybox by default. Therefore, remove it from the default config. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/busybox/busybox-minimal.config | 3 +-- package/busybox/busybox.config | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 1e7ad1d357e..5d2a30806ac 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -955,8 +955,7 @@ CONFIG_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 6e8bd2799d1..cfd16172fa6 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -968,8 +968,7 @@ CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y From 807a44925697b9567d5bd9872a334a073b3dcf55 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:33 +0100 Subject: [PATCH 0173/3013] {toolchain, linux-headers}: add support for 6.8 headers And add (and default to) 6.8 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 5595e51fe01..4fa9f701cd5 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 8d0c8936e3140a0fbdf511ad7a9f21121598f3656743898f47bb9052d37cff68 linux-6.8.1.tar.xz sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 874a0a261c3..4c3651450ea 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_7 + default BR2_KERNEL_HEADERS_6_8 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_7 bool "Linux 6.7.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + +config BR2_KERNEL_HEADERS_6_8 + bool "Linux 6.8.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -128,8 +132,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8 + bool "6.8.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 - bool "6.7.x or later" + bool "6.7.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 @@ -418,6 +426,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.82" if BR2_KERNEL_HEADERS_6_1 default "6.6.22" if BR2_KERNEL_HEADERS_6_6 default "6.7.10" if BR2_KERNEL_HEADERS_6_7 + default "6.8.1" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index d71fb96d40f..e8b3db64fb9 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -649,6 +649,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -662,6 +666,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index a7c239dcabd..f7825cb88eb 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -162,8 +162,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_8 + bool "6.8.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7 - bool "6.7.x or later" + bool "6.7.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 From 3ba99f0a5aa15222f5517f041154e09b8d6a98b1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:34 +0100 Subject: [PATCH 0174/3013] linux: bump latest version to 6.8 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index df84cce539e..2767b709d46 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.6)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.8)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.21" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.8.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From f98239dada59270efe19de9d9fae50ec9ab9d28c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 18:28:55 +0100 Subject: [PATCH 0175/3013] package/giflib: bump to version 5.2.2 - Refresh first and fourth patches - Drop second nad third patches (already in version) https://sourceforge.net/p/giflib/code/ci/5.2.2/tree/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...dd-targets-to-manage-static-building.patch | 44 ++++++------- package/giflib/0002-Fix-CVE-2022-28506.patch | 34 ----------- ...veral-defects-found-by-Coverity-scan.patch | 59 ++++++++++++++++++ package/giflib/0003-Fix-CVE-2023-39742.patch | 36 ----------- ...veral-defects-found-by-Coverity-scan.patch | 61 ------------------- package/giflib/giflib.hash | 5 +- package/giflib/giflib.mk | 7 +-- 8 files changed, 86 insertions(+), 161 deletions(-) delete mode 100644 package/giflib/0002-Fix-CVE-2022-28506.patch create mode 100644 package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch delete mode 100644 package/giflib/0003-Fix-CVE-2023-39742.patch delete mode 100644 package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch diff --git a/.checkpackageignore b/.checkpackageignore index ef1c661812d..0735b0c5dad 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -459,7 +459,6 @@ package/genromfs/0001-build-system.patch Sob Upstream package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch Upstream package/gerbera/S99gerbera Indent package/giblib/0001-fix-imlib2-detection.patch Upstream -package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch Upstream package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch index 384457d0bd9..ba8d426bea1 100644 --- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -8,8 +8,7 @@ targets to allow the user to build giflib when dynamic library support is not available or enable on the toolchain Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceforge.net/p/giflib/code/merge-requests/7] +Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7 --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) @@ -18,16 +17,19 @@ diff --git a/Makefile b/Makefile index b2bf6de..111f52f 100644 --- a/Makefile +++ b/Makefile -@@ -61,10 +61,17 @@ UTILS = $(INSTALLABLE) \ +@@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) + LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) + endif - LDLIBS=libgif.a -lm - --all: libgif.so libgif.a libutil.so libutil.a $(UTILS) -+SHARED_LIBS = libgif.so libutil.so +-all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS) ++SHARED_LIBS = $(LIBGIFSO) $(LIBUTILSO) +STATIC_LIBS = libgif.a libutil.a + +all: shared-lib static-lib $(UTILS) + ifeq ($(UNAME), Darwin) + else $(MAKE) -C doc + endif -$(UTILS):: libgif.a libutil.a +$(UTILS):: $(STATIC_LIBS) @@ -36,18 +38,18 @@ index b2bf6de..111f52f 100644 + +static-lib: $(STATIC_LIBS) - libgif.so: $(OBJECTS) $(HEADERS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) -@@ -79,7 +86,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) + $(LIBGIFSO): $(OBJECTS) $(HEADERS) + ifeq ($(UNAME), Darwin) +@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) $(AR) rcs libutil.a $(UOBJECTS) clean: -- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o +- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o - rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) - rm -f libgif.so.$(LIBMAJOR) - rm -fr doc/*.1 *.html doc/staging -@@ -96,12 +103,15 @@ install-bin: $(INSTALLABLE) + rm -f $(LIBGIFSOVER) + rm -f $(LIBGIFSOMAJOR) + rm -fr doc/*.[17] *.html doc/staging +@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE) install-include: $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" @@ -57,13 +59,13 @@ index b2bf6de..111f52f 100644 $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" +install-shared-lib: + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" - ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" - ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)" + ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)" + ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-lib: install-static-lib install-shared-lib install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" - $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7" + $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1" -- -2.20.1 +2.43.0 diff --git a/package/giflib/0002-Fix-CVE-2022-28506.patch b/package/giflib/0002-Fix-CVE-2022-28506.patch deleted file mode 100644 index 35d5f60a95d..00000000000 --- a/package/giflib/0002-Fix-CVE-2022-28506.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c0cca041fc4fb6748d8dff3675fe7a839253d668 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:24:32 -0700 -Subject: [PATCH] Fix CVE-2022-28506 - -From: giflib-5.2.1-17.fc39.src.rpm -Fixes https://nvd.nist.gov/vuln/detail/CVE-2022-28506 -Upstream: https://sourceforge.net/p/giflib/bugs/159/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gif2rgb.c b/gif2rgb.c -index 8d7c0ff..d9a469f 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileName, int OneFileFlag, - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { -+ /* Check if color is within color palete */ -+ if (GifRow[j] >= ColorMap->ColorCount) -+ { -+ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); -+ } - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - *BufferP++ = ColorMapEntry->Red; - *BufferP++ = ColorMapEntry->Green; --- -2.43.0 - diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch new file mode 100644 index 00000000000..f6816d07530 --- /dev/null +++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch @@ -0,0 +1,59 @@ +From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:38:48 -0700 +Subject: [PATCH] Fix several defects found by Coverity scan + +From: giflib-5.2.1-17.fc39.src.rpm +Upstream: Not submitted + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +[Fabrice: updated for 5.2.2] +Signed-off-by: Fabrice Fontaine +--- + gif2rgb.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gif2rgb.c b/gif2rgb.c +index d9a469f..02cea41 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == + GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + for (i = 0; i < Height; i++) { + if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); +@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + } +-- +2.43.0 + diff --git a/package/giflib/0003-Fix-CVE-2023-39742.patch b/package/giflib/0003-Fix-CVE-2023-39742.patch deleted file mode 100644 index 2ba01ac8a4d..00000000000 --- a/package/giflib/0003-Fix-CVE-2023-39742.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4288b993ee9df6550a367fe06ede3c003dc7bbc6 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:35:40 -0700 -Subject: [PATCH] Fix CVE-2023-39742 - -From: giflib-5.2.1-17.fc39.src.rpm -Fix segmentation faults due to non correct checking for args -Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-39742 -Upstream: https://sourceforge.net/p/giflib/bugs/166/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - getarg.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/getarg.c b/getarg.c -index d569f6c..51fbe0b 100644 ---- a/getarg.c -+++ b/getarg.c -@@ -307,6 +307,12 @@ GAGetParmeters(void *Parameters[], - int i = 0, ScanRes; - - while (!(ISSPACE(CtrlStrCopy[i]))) { -+ -+ if ((*argv) == argv_end) { -+ GAErrorToken = Option; -+ return CMD_ERR_NumRead; -+ } -+ - switch (CtrlStrCopy[i + 1]) { - case 'd': /* Get signed integers. */ - ScanRes = sscanf(*((*argv)++), "%d", --- -2.43.0 - diff --git a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch deleted file mode 100644 index 17197698722..00000000000 --- a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:38:48 -0700 -Subject: [PATCH] Fix several defects found by Coverity scan - -From: giflib-5.2.1-17.fc39.src.rpm -Upstream: Not submitted - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/gif2rgb.c b/gif2rgb.c -index d9a469f..02cea41 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, - /* Open stdout for the output file: */ - if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, - EGifPutImageDesc(GifFile, - 0, 0, Width, Height, false, NULL) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputBuffer, - GifFile->Image.Width, GifFile->Image.Height); - - for (i = 0; i < Height; i++) { -- if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) -+ if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); -+ } - GifQprintf("\b\b\b\b%-4d", Height - i - 1); - - Ptr += Width; -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, - - if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - } --- -2.43.0 - diff --git a/package/giflib/giflib.hash b/package/giflib/giflib.hash index 445e9c4b3de..f11d4f15059 100644 --- a/package/giflib/giflib.hash +++ b/package/giflib/giflib.hash @@ -1,5 +1,6 @@ # From http://sourceforge.net/projects/giflib/files -md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz -sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz +md5 913dd251492134e235ee3c9a91987a4d giflib-5.2.2.tar.gz +sha1 608ba98d2dd8d03dfa7476f434d57de50a33e10b giflib-5.2.2.tar.gz # Locally computed +sha256 be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb giflib-5.2.2.tar.gz sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 3ac74f92444..770338507bc 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -4,18 +4,13 @@ # ################################################################################ -GIFLIB_VERSION = 5.2.1 +GIFLIB_VERSION = 5.2.2 GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING GIFLIB_CPE_ID_VALID = YES -# 0002-Fix-CVE-2022-28506.patch -GIFLIB_IGNORE_CVES = CVE-2022-28506 -# 0003-Fix-CVE-2023-39742.patch -GIFLIB_IGNORE_CVES += CVE-2023-39742 - ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib GIFLIB_INSTALL_LIBS = install-static-lib From bb4371d0863a2714e81b81bb2d5bafe18b4b3110 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 07:48:13 +0100 Subject: [PATCH 0176/3013] package/doc-asciidoc.mk: unbreak docs logic after pkgdir change Commit 748fc4be21e (package/pkg-utils.mk: remove trailing slash in pkgdir definition) broke the docs generation logic: make manual-html >>> Preparing the manual sources... >>> Generating HTML manual... a2x: ERROR: missing ASCIIDOC_FILE: /home/peko/source/buildroot/output/build/docs/manual/manual.adoc make: *** [docs/manual/manual.mk:12: /home/peko/source/buildroot/output/docs/manual/manual.html] Error 1 As it now ends up with the .adoc file one level below (../docs/manual/manual/manual.adoc). The reason is that the pkgdir macro is used to define $(2)_DOCDIR, which is passed to rsync: rsync -a docs/manual /home/peko/source/buildroot/output/build/docs/manual Fix it by appending a / to the rsync arguments like we do elsewhere. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/doc-asciidoc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 40c9a725d11..d6ecd1e30ee 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -155,7 +155,7 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") $$(Q)mkdir -p $$(@D) - $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) + $$(Q)rsync -a $$($(2)_DOCDIR)/ $$(@D)/ $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) .PHONY: $(1)-prepare-sources From 7a480207fda5ebfba0b4138f491975880ed773cc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 09:41:51 +0100 Subject: [PATCH 0177/3013] package/openssh: drop autoreconf Commit 9496ff57e54c (package/openssh: bump to version 9.7p1) dropped 0001-better-detection-of-broken-fzero-call-used-regs.patch but forgot to drop the autoreconf. Do that now. Signed-off-by: Peter Korsgaard --- package/openssh/openssh.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ce552531209..f0b499590a5 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,9 +13,6 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE -# 0001-better-detection-of-broken-fzero-call-used-regs.patch -OPENSSH_AUTORECONF = YES - OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From 7f08dc612c2a52a297c50bc047d5fabd7ef7317c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 13:23:14 +0100 Subject: [PATCH 0178/3013] package/xvisor: use BR2_PYTHON3_HOST_DEPENDENCY to ensure python3 is available Commit 24e996d14d28d (package/xvisor: fix build without python interpreter) added a dependency on host-python3 for the d2c.py script, but this script does not use any non-standard python modules so we can instead use BR2_PYTHON3_HOST_DEPENDENCY to only build host-python3 if the build host does not have python3. Signed-off-by: Peter Korsgaard --- package/xvisor/xvisor.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 2a51706b55a..c1b61270f15 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -11,7 +11,7 @@ XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-dtc host-flex host-python3 +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex $(BR2_PYTHON3_HOST_DEPENDENCY) XVISOR_MAKE_TARGETS = all From dd2eec6b2fc8fd949ff37b3572fee21850851e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Zwing?= Date: Mon, 25 Mar 2024 20:27:04 +0100 Subject: [PATCH 0179/3013] package/p7zip: bump to version v17.05 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project now has its own group on github, so switch to that one. Also update the Config.in URL to point to that one - the sourceforge project is pretty much abandoned. What's Changed - add UTF-8 support for Client7z by @flyfishzy in #214 - fix issue 130 by @jinfeihan57 in 295dac8 Signed-off-by: André Zwing [Arnout: also update URL; extend commit message] Signed-off-by: Arnout Vandecappelle --- package/p7zip/Config.in | 2 +- package/p7zip/p7zip.hash | 2 +- package/p7zip/p7zip.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/p7zip/Config.in b/package/p7zip/Config.in index be2206eb769..f1b80d2d778 100644 --- a/package/p7zip/Config.in +++ b/package/p7zip/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_P7ZIP 7-Zip is a file archiver with highest compression ratio. - http://sourceforge.net/projects/p7zip + https://github.com/p7zip-project/p7zip if BR2_PACKAGE_P7ZIP diff --git a/package/p7zip/p7zip.hash b/package/p7zip/p7zip.hash index 0048777d897..f0b9c271134 100644 --- a/package/p7zip/p7zip.hash +++ b/package/p7zip/p7zip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef p7zip-17.04.tar.gz +sha256 d2788f892571058c08d27095c22154579dfefb807ebe357d145ab2ddddefb1a6 p7zip-17.05.tar.gz sha256 555806657dcf0f1e720b581c52643c195ec86ae3f00bd18cc66d2e0f88ffa210 DOC/License.txt diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk index b6c5adae264..803fd38b7f9 100644 --- a/package/p7zip/p7zip.mk +++ b/package/p7zip/p7zip.mk @@ -4,8 +4,8 @@ # ################################################################################ -P7ZIP_VERSION = 17.04 -P7ZIP_SITE = $(call github,jinfeihan57,p7zip,v$(P7ZIP_VERSION)) +P7ZIP_VERSION = 17.05 +P7ZIP_SITE = $(call github,p7zip-project,p7zip,v$(P7ZIP_VERSION)) P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction P7ZIP_LICENSE_FILES = DOC/License.txt P7ZIP_CPE_ID_VENDOR = 7-zip From 189dd76fd7ce791cfd7a4f9afede52224a8ca1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Tue, 27 Feb 2024 12:38:15 -0300 Subject: [PATCH 0180/3013] package/rsyslog: bump version to 8.2402.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 9c003653559..212a1accead 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 774032006128a896437f5913e132aa27dbfb937cd8847e449522d5a12d63d03e rsyslog-8.2312.0.tar.gz +sha256 acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba rsyslog-8.2402.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index dc30a2edcd3..fac78795c27 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2312.0 +RSYSLOG_VERSION = 8.2402.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 From 425b5ba6809c55e5368060afd2a7aabfb9113572 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Tue, 27 Feb 2024 15:01:23 +0300 Subject: [PATCH 0181/3013] package/sdbus-cpp: bump to version 1.5.0 Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v1.5.0 Signed-off-by: Sergey Bobrenok Signed-off-by: Thomas Petazzoni --- package/sdbus-cpp/sdbus-cpp.hash | 2 +- package/sdbus-cpp/sdbus-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index f4336228af0..b5ca7ecdffb 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ca7405c7f0f9ae3023dcfa37bc68974c4b8a1c9ea2909b970e0aedc3e8657ee6 sdbus-cpp-1.4.0.tar.gz +sha256 577986929f911320fb9ef6a3e2badd464dc38411ebc25d2966f5cb85c39f0897 sdbus-cpp-1.5.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 9ffaeb26d2b..18fc6a88a96 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.4.0 +SDBUS_CPP_VERSION = 1.5.0 SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd From e999c9fbaec0ab3f31fb3058b3f6e37c4cad9abe Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:51:05 -0800 Subject: [PATCH 0182/3013] package/go-bootstrap-stage2: bump version to go1.19.13 Update to the latest 1.19.x version available. Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/go-bootstrap-stage2/go-bootstrap-stage2.hash | 2 +- package/go-bootstrap-stage2/go-bootstrap-stage2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash index 6d4c718a405..d61663cac9e 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz +sha256 ccf36b53fb0024a017353c3ddb22c1f00bc7a8073c6aac79042da24ee34434d3 go1.19.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk index 72f3200a2ef..98bf624b575 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -6,7 +6,7 @@ # Use last Go version that go-bootstrap-stage1 can build: v1.19.x # See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_STAGE2_VERSION = 1.19.11 +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.13 GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz From f00eb37de9b4b0ddbdeb5c7ebae48c883c27e132 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:51:06 -0800 Subject: [PATCH 0183/3013] package/go-bootstrap-stage3: add stage3 for go1.22 support Add a third bootstrap stage with Go1.21.x necessary for go1.22 bootstrap. go-bootstrap-stage1 is Go1.4.x, the final version to support bootstrap using a C compiler (later versions require the Go compiler for bootstrapping). See: https://go.dev/doc/install/source#bootstrapFromSource go-bootstrap-stage2 is Go 1.19.13, the last version to support bootstrap using the Go1.4.x compiler. go-bootstrap-stage3 is Go 1.21.8, the last version to support bootstrap using the Go1.19.13 compiler. Go 1.20 requires a minimum of go 1.17.13 to bootstrap. See: https://go.dev/doc/go1.20#bootstrap This patch is in preparation for bumping the host-go package to >go1.22.x, which requires a minimum of Go1.20.x for bootstrap. See: https://go.dev/doc/go1.22#bootstrap Signed-off-by: Christian Stewart [Arnout: add GOCACHE definition] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/go-bootstrap-stage3/Config.in.host | 4 ++ .../go-bootstrap-stage3.hash | 3 ++ .../go-bootstrap-stage3.mk | 54 +++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/go-bootstrap-stage3/Config.in.host create mode 100644 package/go-bootstrap-stage3/go-bootstrap-stage3.hash create mode 100644 package/go-bootstrap-stage3/go-bootstrap-stage3.mk diff --git a/DEVELOPERS b/DEVELOPERS index cb2132e67ae..99b0b1ec8f8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -596,6 +596,7 @@ F: package/fuse-overlayfs/ F: package/go/ F: package/go-bootstrap-stage1/ F: package/go-bootstrap-stage2/ +F: package/go-bootstrap-stage3/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index f03ca16b7b7..9543a22ffc6 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -46,6 +46,7 @@ menu "Host utilities" source "package/go/Config.in.host" source "package/go-bootstrap-stage1/Config.in.host" source "package/go-bootstrap-stage2/Config.in.host" + source "package/go-bootstrap-stage3/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage3/Config.in.host b/package/go-bootstrap-stage3/Config.in.host new file mode 100644 index 00000000000..1714c2fb152 --- /dev/null +++ b/package/go-bootstrap-stage3/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.hash b/package/go-bootstrap-stage3/go-bootstrap-stage3.hash new file mode 100644 index 00000000000..b1aed10c7c4 --- /dev/null +++ b/package/go-bootstrap-stage3/go-bootstrap-stage3.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.mk b/package/go-bootstrap-stage3/go-bootstrap-stage3.mk new file mode 100644 index 00000000000..bdc84595952 --- /dev/null +++ b/package/go-bootstrap-stage3/go-bootstrap-stage3.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# go-bootstrap-stage3 +# +################################################################################ + +# Use last Go version that go-bootstrap-stage2 can build: v1.21.x +# See https://go.dev/doc/go1.22#bootstrap +GO_BOOTSTRAP_STAGE3_VERSION = 1.21.8 +GO_BOOTSTRAP_STAGE3_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE3_SOURCE = go$(GO_BOOTSTRAP_STAGE3_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE3_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE3_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage2 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE3_DEPENDENCIES = host-go-bootstrap-stage2 + +HOST_GO_BOOTSTRAP_STAGE3_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE3_VERSION) + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE3_MAKE_ENV = \ + GO111MODULE=off \ + GOCACHE=$(HOST_GO_HOST_CACHE) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE3_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE3_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE3_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg + cp -a $(@D)/pkg/include $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg/ + + # The Go sources must be installed to the host/ tree for the Go stdlib. + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/ +endef + +$(eval $(host-generic-package)) From 84caea5d58b979490260e733841f2dde591b75cc Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:51:07 -0800 Subject: [PATCH 0184/3013] package/go: bump to version go1.22.1 Upgrade Go to the latest v1.22.x point release, go1.22.1. This requires go-bootstrap-stage3 at version go1.21.8: See: https://go.dev/doc/go1.22#bootstrap https://go.dev/doc/devel/release#go1.22.1 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/go/Config.in.host | 4 ++-- package/go/go.hash | 2 +- package/go/go.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec0..0d89e875adc 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,7 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS # See https://go.dev/doc/install/source#environment # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS diff --git a/package/go/go.hash b/package/go/go.hash index b1aed10c7c4..06d8776db27 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz +sha256 79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321 go1.22.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 3ca055b25d7..a8ec5d95a0c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.8 +GO_VERSION = 1.22.1 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -128,7 +128,7 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ From 631647f4a7c580e8964515f275584a628eca61bd Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:12 -0600 Subject: [PATCH 0185/3013] package/flutter-packages/flutter-markdown-example: new package The maintainers of the flutter-gallery package archived the project as of February 16, 2024, necessitating a new reference package for users to port their Flutter applications to Buildroot. The flutter-packages repository is the perfect candidate for a reference package for several reasons: - It contains the source code for Flutter's first-party packages. - Many of the packages contain examples. - Many of the examples include Linux-specific examples. - The repository is updated regularly and often automatically, ensuring compatibility with the latest versions of Flutter. However, the layout of the flutter-packages repository stores all of the examples in sub-directories, which creates an organizational problem; either every example application is stored in packages/flutter-example-${name}, with the version, site, site_method, license, license_files, and dependencies of each package independent from each other, or, each example application is in a sub-directory of the flutter-packages directory, and flutter-packages acts as the primary source of the above variables. As option one is a nightmare to maintain, this patch provides option two, which only necessitates the use of two features rarely used together in Buildroot: $(PKG_NAME)_DL_SUBDIR and $(PKG_NAME)_SOURCE. With these two options appropriately set, each sub-package uses the flutter-packages source tarball, which downloads once, saving time, disk space, bandwidth, and future maintenance headaches. Three variables in the .mk file help with subsequent patches that add more example applications: - FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME: - Set to the name of the application. - FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR: - It uses the PKG_NAME variable to set the installation directory. - FLUTTER_MARKDOWN_EXAMPLE_SUBDIR: - Provides the directory in which to build the package. With the above variables, adding subsequent packages involves minimal effort: - Copy, paste, and rename a sub-directory to a new package name. - Set the above variables to new names and directories. - Check to see if there are any new build commands, such as specifying a dart_plugin_registrant.dart file. Another option that seems appealing is to have a single package, with the Config.in options to select which example(s) to build. However, this option does not work well for two reasons: - The logic between this package and the flutter-gallery package it replaces would be very different. As the flutter-gallery package acts as a reference package for other users, changing the logic would make the package difficult to parse and possibly useless for other users to use as a reference when porting their Flutter-based applications to Buildroot. - Not all packages in the flutter-package repository use the same directory structure. Take, for example, the flutter-rfw-local-example. The build directory is located at rfw/example/local, whereas most other packages are at ${pkg_name}/example, which makes a pure-foreach loop impossible. These packages are intended for reference, and changing the logic instead of using the same would hinder users from attempting to port their Flutter applications to Buildroot. As such, this option is ruled out for the above reasons. The first package in this series is a Markdown example application that displays several Markdown formatting demos. However, it does not support inline HTML. This package also lacks a dart_plugin_registrant file, and unlike the flutter-gallery package, the lines referencing such a file are not included in the build commands. This is not a problem, but is something to note. Also, the `FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE)` line from the configure commands is not copied from the flutter-gallery package, as it was included by mistake and did not have any effecton the clean command. Note: The version of the flutter-packages git hash is set to 947e34ce9fedcdd6750b54eb1cc74b854b49ab48, the last commit that supported Flutter 3.16.x. Newer versions require Flutter 3.19.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 + package/Config.in | 1 + package/flutter-packages/Config.in | 15 ++++++ .../flutter-markdown-example/Config.in | 7 +++ .../flutter-markdown-example.hash | 1 + .../flutter-markdown-example.mk | 54 +++++++++++++++++++ .../flutter-packages/flutter-packages.hash | 3 ++ package/flutter-packages/flutter-packages.mk | 17 ++++++ 8 files changed, 100 insertions(+) create mode 100644 package/flutter-packages/Config.in create mode 100644 package/flutter-packages/flutter-markdown-example/Config.in create mode 120000 package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash create mode 100644 package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk create mode 100644 package/flutter-packages/flutter-packages.hash create mode 100644 package/flutter-packages/flutter-packages.mk diff --git a/DEVELOPERS b/DEVELOPERS index 99b0b1ec8f8..cf2d9e93cde 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -33,6 +33,8 @@ F: package/fcft/ F: package/foot/ F: package/flutter-engine/ F: package/flutter-gallery/ +F: package/flutter-packages/ +F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ F: package/ivi-homescreen/ diff --git a/package/Config.in b/package/Config.in index 1a62bfb1be6..dfdc7168570 100644 --- a/package/Config.in +++ b/package/Config.in @@ -316,6 +316,7 @@ comment "Graphic applications" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" source "package/flutter-gallery/Config.in" + source "package/flutter-packages/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" source "package/fswebcam/Config.in" diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in new file mode 100644 index 00000000000..7cedf7c4735 --- /dev/null +++ b/package/flutter-packages/Config.in @@ -0,0 +1,15 @@ +menuconfig BR2_PACKAGE_FLUTTER_PACKAGES + bool "flutter packages" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on BR2_PACKAGE_FLUTTER_ENGINE + select BR2_PACKAGE_HOST_FLUTTER_SDK_BIN + help + First-party Flutter package examples. + +if BR2_PACKAGE_FLUTTER_PACKAGES +source "package/flutter-packages/flutter-markdown-example/Config.in" +endif + +comment "flutter packages need flutter-engine" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on !BR2_PACKAGE_FLUTTER_ENGINE diff --git a/package/flutter-packages/flutter-markdown-example/Config.in b/package/flutter-packages/flutter-markdown-example/Config.in new file mode 100644 index 00000000000..939b21053c7 --- /dev/null +++ b/package/flutter-packages/flutter-markdown-example/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FLUTTER_MARKDOWN_EXAMPLE + bool "flutter markdown example" + help + A markdown renderer for Flutter. It supports the original + format, but no inline HTML. + + https://github.com/flutter/packages/tree/main/packages/flutter_markdown diff --git a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash new file mode 120000 index 00000000000..879f2adb39e --- /dev/null +++ b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk new file mode 100644 index 00000000000..eb6792fb020 --- /dev/null +++ b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-markdown-example +# +################################################################################ + +FLUTTER_MARKDOWN_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_MARKDOWN_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_MARKDOWN_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_MARKDOWN_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_MARKDOWN_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_MARKDOWN_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_MARKDOWN_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_MARKDOWN_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME = flutter_markdown_example +FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_MARKDOWN_EXAMPLE_SUBDIR = packages/flutter_markdown/example + +define FLUTTER_MARKDOWN_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_MARKDOWN_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_MARKDOWN_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) diff --git a/package/flutter-packages/flutter-packages.hash b/package/flutter-packages/flutter-packages.hash new file mode 100644 index 00000000000..994434e25ce --- /dev/null +++ b/package/flutter-packages/flutter-packages.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 8276276e050c1ea45787f74b0f8c915b8cf2162b6af8537ffa9886bd423f2828 flutter-packages-947e34ce9fedcdd6750b54eb1cc74b854b49ab48-br1.tar.gz +sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE diff --git a/package/flutter-packages/flutter-packages.mk b/package/flutter-packages/flutter-packages.mk new file mode 100644 index 00000000000..4beaa393256 --- /dev/null +++ b/package/flutter-packages/flutter-packages.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# flutter-packages +# +################################################################################ + +FLUTTER_PACKAGES_VERSION = 947e34ce9fedcdd6750b54eb1cc74b854b49ab48 +FLUTTER_PACKAGES_SITE = $(call github,flutter,packages,$(FLUTTER_PACKAGES_VERSION)) +FLUTTER_PACKAGES_LICENSE = BSD-3-Clause +FLUTTER_PACKAGES_LICENSE_FILES = LICENSE +FLUTTER_PACKAGES_DL_SUBDIR = flutter-packages +FLUTTER_PACKAGES_SOURCE = flutter-packages-$(FLUTTER_PACKAGES_VERSION)-br1.tar.gz +FLUTTER_PACKAGES_DEPENDENCIES = \ + host-flutter-sdk-bin \ + flutter-engine + +include $(sort $(wildcard package/flutter-packages/*/*.mk)) From 88a300753a8c729714570fd1ac20eda9db074555 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:13 -0600 Subject: [PATCH 0186/3013] package/flutter-packages/flutter-adaptive-scaffold-example: new package This package provides a nice-looking Gmail lookalike application using Material 3. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../Config.in | 8 +++ .../flutter-adaptive-scaffold-example.hash | 1 + .../flutter-adaptive-scaffold-example.mk | 54 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/flutter-packages/flutter-adaptive-scaffold-example/Config.in create mode 120000 package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash create mode 100644 package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index cf2d9e93cde..7a909f947f0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -34,6 +34,7 @@ F: package/foot/ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-packages/ +F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 7cedf7c4735..9c4b42b74c6 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES First-party Flutter package examples. if BR2_PACKAGE_FLUTTER_PACKAGES +source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/Config.in b/package/flutter-packages/flutter-adaptive-scaffold-example/Config.in new file mode 100644 index 00000000000..f7c448e06c5 --- /dev/null +++ b/package/flutter-packages/flutter-adaptive-scaffold-example/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE + bool "flutter adaptive scaffold example" + help + Adaptive Scaffold reacts to input from users, devices and + screen elements and renders your Flutter application + according to the Material 3 guidelines. + + https://github.com/flutter/packages/tree/main/packages/flutter_adaptive_scaffold/example diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash new file mode 120000 index 00000000000..879f2adb39e --- /dev/null +++ b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk new file mode 100644 index 00000000000..f6ac0861150 --- /dev/null +++ b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-adaptive-scaffold-example +# +################################################################################ + +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME = flutter_adaptive_scaffold_example +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SUBDIR = packages/flutter_adaptive_scaffold/example + +define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From a3239d18257fa4e5cd8268959d553693fd141ebf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:14 -0600 Subject: [PATCH 0187/3013] package/flutter-packages/flutter-animations-example: new package This package provides examples of the following animations: - OpenContainer - SharedAxisTransition - FadeThroughTransisiton - FadeScaleTransition The package also provides a toggle that slows all the animations. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-animations-example/Config.in | 6 +++ .../flutter-animations-example.hash | 1 + .../flutter-animations-example.mk | 54 +++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/flutter-packages/flutter-animations-example/Config.in create mode 120000 package/flutter-packages/flutter-animations-example/flutter-animations-example.hash create mode 100644 package/flutter-packages/flutter-animations-example/flutter-animations-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7a909f947f0..774f3748577 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,6 +35,7 @@ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ +F: package/flutter-packages/flutter-animations-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 9c4b42b74c6..365e91cd99d 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -8,6 +8,7 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" +source "package/flutter-packages/flutter-animations-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-animations-example/Config.in b/package/flutter-packages/flutter-animations-example/Config.in new file mode 100644 index 00000000000..c7801dccf1d --- /dev/null +++ b/package/flutter-packages/flutter-animations-example/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_FLUTTER_ANIMATIONS_EXAMPLE + bool "flutter animations example" + help + High quality pre-built Animations for Flutter + + https://github.com/flutter/packages/tree/main/packages/animations/example diff --git a/package/flutter-packages/flutter-animations-example/flutter-animations-example.hash b/package/flutter-packages/flutter-animations-example/flutter-animations-example.hash new file mode 120000 index 00000000000..879f2adb39e --- /dev/null +++ b/package/flutter-packages/flutter-animations-example/flutter-animations-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk new file mode 100644 index 00000000000..2b5c8967360 --- /dev/null +++ b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-animations-example +# +################################################################################ + +FLUTTER_ANIMATIONS_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_ANIMATIONS_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_ANIMATIONS_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_ANIMATIONS_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_ANIMATIONS_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_ANIMATIONS_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_ANIMATIONS_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_ANIMATIONS_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME = animations_example +FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_ANIMATIONS_EXAMPLE_SUBDIR = packages/animations/example + +define FLUTTER_ANIMATIONS_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_ANIMATIONS_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From a1b8cb90166c6e7cff0e4fcc53a490648080fdee Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:15 -0600 Subject: [PATCH 0188/3013] package/flutter-packages/flutter-dynamic-layouts-example: new package This package provides two multi-sized tiles and different layouts: Stagger and Wrap. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-dynamic-layouts-example/Config.in | 8 +++ .../flutter-dynamic-layouts-example.hash | 1 + .../flutter-dynamic-layouts-example.mk | 54 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/flutter-packages/flutter-dynamic-layouts-example/Config.in create mode 120000 package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash create mode 100644 package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index 774f3748577..0ca7579f8b2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -36,6 +36,7 @@ F: package/flutter-gallery/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ +F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 365e91cd99d..17e68da8e12 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -9,6 +9,7 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" +source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/Config.in b/package/flutter-packages/flutter-dynamic-layouts-example/Config.in new file mode 100644 index 00000000000..a3f66307959 --- /dev/null +++ b/package/flutter-packages/flutter-dynamic-layouts-example/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE + bool "flutter dynamic layouts example" + help + This package provides support for multi sized tiles and + different layouts. Currently the layouts that are implemented + in this package are Stagger and Wrap. + + https://github.com/flutter/packages/tree/main/packages/dynamic_layouts/example diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash new file mode 120000 index 00000000000..879f2adb39e --- /dev/null +++ b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk new file mode 100644 index 00000000000..aefcf3f62c9 --- /dev/null +++ b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-dynamic-layouts-example +# +################################################################################ + +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME = example +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/dynamc-layouts-$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SUBDIR = packages/dynamic_layouts/example + +define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From 26ab7ee00a0212db37da3189cfbd241ab8fe817e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:16 -0600 Subject: [PATCH 0189/3013] package/flutter-packages/flutter-go-router-example: new package A Flutter plugin that manages files and interactions with file dialogs. This package contains a dart_plugin_registrant dart file, much like the flutter-gallery package. The build commands contain the three lines from the flutter-gallery package referencing the dart_plugin_registrant dart file. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-go-router-example/Config.in | 7 +++ .../flutter-go-router-example.hash | 1 + .../flutter-go-router-example.mk | 57 +++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 package/flutter-packages/flutter-go-router-example/Config.in create mode 120000 package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash create mode 100644 package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0ca7579f8b2..a4c8fba6d24 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -37,6 +37,7 @@ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ F: package/flutter-packages/flutter-dynamic-layouts-example/ +F: package/flutter-packages/flutter-go-router-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 17e68da8e12..bbcd3aec93c 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -10,6 +10,7 @@ if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" +source "package/flutter-packages/flutter-go-router-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-go-router-example/Config.in b/package/flutter-packages/flutter-go-router-example/Config.in new file mode 100644 index 00000000000..8cdb61e3bc8 --- /dev/null +++ b/package/flutter-packages/flutter-go-router-example/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FLUTTER_GO_ROUTER_EXAMPLE + bool "flutter go router example" + help + A Flutter plugin that manages files and interactions + with file dialogs. + + https://github.com/flutter/packages/tree/main/packages/go_router/example diff --git a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash new file mode 120000 index 00000000000..879f2adb39e --- /dev/null +++ b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk new file mode 100644 index 00000000000..a7fa36ca9e4 --- /dev/null +++ b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# flutter-go-router-example +# +################################################################################ + +FLUTTER_GO_ROUTER_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_GO_ROUTER_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_GO_ROUTER_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_GO_ROUTER_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_GO_ROUTER_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_GO_ROUTER_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_GO_ROUTER_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_GO_ROUTER_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME = go_router_examples +FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_GO_ROUTER_EXAMPLE_SUBDIR = packages/go_router/example + +define FLUTTER_GO_ROUTER_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_GO_ROUTER_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + -Dflutter.dart_plugin_registrant=file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source package:flutter/src/dart_plugin_registrant.dart \ + --native-assets $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From 83c1ba5f449182afac6f6c9c6fa7288519bc241b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:17 -0600 Subject: [PATCH 0190/3013] package/flutter-packages/flutter-image-example: new package This package uses the NetworkImageWithRetry method to download the Flutter logo. The package requires ca-certificates, or else SSL errors occur when the application attempts to download the image. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-image-example/Config.in | 8 +++ .../flutter-image-example.hash | 1 + .../flutter-image-example.mk | 54 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/flutter-packages/flutter-image-example/Config.in create mode 120000 package/flutter-packages/flutter-image-example/flutter-image-example.hash create mode 100644 package/flutter-packages/flutter-image-example/flutter-image-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index a4c8fba6d24..d5ef02b7ad2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -38,6 +38,7 @@ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-go-router-example/ +F: package/flutter-packages/flutter-image-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index bbcd3aec93c..bfaccef2645 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -11,6 +11,7 @@ source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-go-router-example/Config.in" +source "package/flutter-packages/flutter-image-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-image-example/Config.in b/package/flutter-packages/flutter-image-example/Config.in new file mode 100644 index 00000000000..15ae20872ac --- /dev/null +++ b/package/flutter-packages/flutter-image-example/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FLUTTER_IMAGE_EXAMPLE + bool "flutter image example" + select BR2_PACKAGE_CA_CERTIFICATES # runtime + help + Use NetworkImageWithRetry instead of Image.network to + load images from the network with a retry mechanism. + + https://github.com/flutter/packages/tree/main/packages/flutter_image/example diff --git a/package/flutter-packages/flutter-image-example/flutter-image-example.hash b/package/flutter-packages/flutter-image-example/flutter-image-example.hash new file mode 120000 index 00000000000..879f2adb39e --- /dev/null +++ b/package/flutter-packages/flutter-image-example/flutter-image-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-image-example/flutter-image-example.mk b/package/flutter-packages/flutter-image-example/flutter-image-example.mk new file mode 100644 index 00000000000..20f185896d2 --- /dev/null +++ b/package/flutter-packages/flutter-image-example/flutter-image-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-image-example +# +################################################################################ + +FLUTTER_IMAGE_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_IMAGE_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_IMAGE_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_IMAGE_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_IMAGE_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_IMAGE_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_IMAGE_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_IMAGE_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_IMAGE_EXAMPLE_PKG_NAME = flutter_image_example +FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_IMAGE_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_IMAGE_EXAMPLE_SUBDIR = packages/flutter_image/example + +define FLUTTER_IMAGE_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_IMAGE_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_IMAGE_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_IMAGE_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From c51e0f4aec80ea71d812ff9956dc8214e7efdb7e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:18 -0600 Subject: [PATCH 0191/3013] package/flutter-packages/flutter-rfw-local-example: new package Displays a custom "Hello, World!" custom widget in a remote Flutter widget (RFW) for use by a remote widget. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-rfw-local-example/Config.in | 7 +++ .../flutter-rfw-local-example.hash | 1 + .../flutter-rfw-local-example.mk | 54 +++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 package/flutter-packages/flutter-rfw-local-example/Config.in create mode 120000 package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash create mode 100644 package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index d5ef02b7ad2..a76bf350bf0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -40,6 +40,7 @@ F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-go-router-example/ F: package/flutter-packages/flutter-image-example/ F: package/flutter-packages/flutter-markdown-example/ +F: package/flutter-packages/flutter-rfw-local-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ F: package/ivi-homescreen/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index bfaccef2645..4e3e29582f0 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -13,6 +13,7 @@ source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-go-router-example/Config.in" source "package/flutter-packages/flutter-image-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" +source "package/flutter-packages/flutter-rfw-local-example/Config.in" endif comment "flutter packages need flutter-engine" diff --git a/package/flutter-packages/flutter-rfw-local-example/Config.in b/package/flutter-packages/flutter-rfw-local-example/Config.in new file mode 100644 index 00000000000..42324a1eaae --- /dev/null +++ b/package/flutter-packages/flutter-rfw-local-example/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FLUTTER_RFW_LOCAL_EXAMPLE + bool "remote flutter widgets example" + help + This example shows how one can create custom widgets in an RFW + client, for use by remote widgets. + + https://github.com/flutter/packages/tree/main/packages/rfw/example/local diff --git a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash new file mode 120000 index 00000000000..879f2adb39e --- /dev/null +++ b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk new file mode 100644 index 00000000000..b57c021f8b9 --- /dev/null +++ b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-rfw-local-example +# +################################################################################ + +FLUTTER_RFW_LOCAL_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_RFW_LOCAL_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_RFW_LOCAL_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_RFW_LOCAL_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_RFW_LOCAL_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_RFW_LOCAL_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_RFW_LOCAL_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_RFW_LOCAL_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME = local +FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/rfw-$(FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME)-example/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_RFW_LOCAL_EXAMPLE_SUBDIR = packages/rfw/example/local + +define FLUTTER_RFW_LOCAL_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_RFW_LOCAL_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From a92e7c3cec351ed2d79192c08abb341130b34c81 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:19 -0600 Subject: [PATCH 0192/3013] support/testing/tests/package/test_flutter.py: use flutter-markdown-example The maintainers of the flutter-gallery package archived the project as of February 16, 2024. In addition, the flutter-gallery package is incompatible with Flutter 3.19.x. Because of these problems, using the flutter-gallery package as the testing application for Flutter is no longer reasonable nor maintainable. However, it is reasonable to use the flutter-markdown-example package from flutter-packages, as it is a first-party application updated regularly and often automatically, ensuring compatibility with the latest versions of Flutter. - Switch the package used for Flutter testing from flutter-gallery to flutter-markdown-example - Rename flutter-gallery.service to flutter-markdown-example.service - Change /usr/share/flutter/gallery/release/ to /usr/share/flutter/flutter_markdown_example/release/ - Run `systemctl is-active flutter-markdown-example` instead of `systemctl is-active flutter-gallery` Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_flutter.py | 5 +++-- .../multi-user.target.wants/flutter-gallery.service | 1 - .../flutter-markdown-example.service | 1 + .../usr/lib/systemd/system/flutter-gallery.service | 11 ----------- .../systemd/system/flutter-markdown-example.service | 11 +++++++++++ 5 files changed, 15 insertions(+), 14 deletions(-) delete mode 120000 support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service create mode 120000 support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service delete mode 100644 support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service create mode 100644 support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service diff --git a/support/testing/tests/package/test_flutter.py b/support/testing/tests/package/test_flutter.py index a3e98a43e5f..3a150a69e1b 100644 --- a/support/testing/tests/package/test_flutter.py +++ b/support/testing/tests/package/test_flutter.py @@ -25,7 +25,8 @@ class TestFlutter(infra.basetest.BRTest): BR2_PACKAGE_FLUTTER_PI=y BR2_PACKAGE_FLUTTER_PI_RAW_KEYBOARD_PLUGIN=y BR2_PACKAGE_FLUTTER_PI_TEXT_INPUT_PLUGIN=y - BR2_PACKAGE_FLUTTER_GALLERY=y + BR2_PACKAGE_FLUTTER_PACKAGES=y + BR2_PACKAGE_FLUTTER_MARKDOWN_EXAMPLE=y BR2_PACKAGE_FLUTTER_ENGINE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -48,7 +49,7 @@ def test_run(self): "-vnc", "none", "-drive", f"file={img},if=virtio,format=raw"]) self.emulator.login() - cmd = "systemctl is-active flutter-gallery" + cmd = "systemctl is-active flutter-markdown-example" output, exit_code = self.emulator.run(cmd, 10) self.assertEqual(exit_code, 0) self.assertEqual(output[0], "active") diff --git a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service deleted file mode 120000 index 40993fb16c4..00000000000 --- a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service +++ /dev/null @@ -1 +0,0 @@ -../../../../usr/lib/systemd/system/flutter-gallery.service \ No newline at end of file diff --git a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service new file mode 120000 index 00000000000..83e731ba2df --- /dev/null +++ b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service @@ -0,0 +1 @@ +../../../../usr/lib/systemd/system/flutter-markdown-example.service \ No newline at end of file diff --git a/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service b/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service deleted file mode 100644 index 88a2bcbf0bb..00000000000 --- a/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=flutter-gallery daemon -After=dbus.service systemd-udevd.service - -[Service] -ExecStart=/usr/bin/flutter-pi --release /usr/share/flutter/gallery/release/ -Restart=always -KillMode=process - -[Install] -WantedBy=multi-user.target diff --git a/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service b/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service new file mode 100644 index 00000000000..2a64b88c2db --- /dev/null +++ b/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service @@ -0,0 +1,11 @@ +[Unit] +Description=flutter-markdown-example daemon +After=dbus.service systemd-udevd.service + +[Service] +ExecStart=/usr/bin/flutter-pi --release /usr/share/flutter/flutter_markdown_example/release/ +Restart=always +KillMode=process + +[Install] +WantedBy=multi-user.target From c6f7ad6d9264c278d5012aa4475fa9277b5e68f8 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:20 -0600 Subject: [PATCH 0193/3013] package/flutter-gallery: drop package The maintainers of the flutter-gallery package archived the project as of February 16, 2024. In addition, the flutter-gallery package is incompatible with Flutter 3.19.x. Now that the flutter tests do not use this package, it is safe to drop it. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 9 ++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-remove-GetStorage.patch | 84 ------------------- package/flutter-gallery/Config.in | 16 ---- package/flutter-gallery/flutter-gallery.hash | 3 - package/flutter-gallery/flutter-gallery.mk | 57 ------------- 7 files changed, 9 insertions(+), 162 deletions(-) delete mode 100644 package/flutter-gallery/0001-remove-GetStorage.patch delete mode 100644 package/flutter-gallery/Config.in delete mode 100644 package/flutter-gallery/flutter-gallery.hash delete mode 100644 package/flutter-gallery/flutter-gallery.mk diff --git a/Config.in.legacy b/Config.in.legacy index 1d3dc8b5c8a..d00196e08b0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2024.05" +config BR2_PACKAGE_FLUTTER_GALLERY + bool "flutter-gallery removed" + select BR2_LEGACY + help + flutter-gallery has been removed due to being abandoned + and no longer working with flutter 3.19+. It is replaced by + flutter-packages, where individual sub-packages (examples) + must be selected for the build. + config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a76bf350bf0..884edfe149c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -32,7 +32,6 @@ F: package/dmenu-wayland/ F: package/fcft/ F: package/foot/ F: package/flutter-engine/ -F: package/flutter-gallery/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ diff --git a/package/Config.in b/package/Config.in index dfdc7168570..410fe0f4935 100644 --- a/package/Config.in +++ b/package/Config.in @@ -315,7 +315,6 @@ comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" - source "package/flutter-gallery/Config.in" source "package/flutter-packages/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" diff --git a/package/flutter-gallery/0001-remove-GetStorage.patch b/package/flutter-gallery/0001-remove-GetStorage.patch deleted file mode 100644 index 142cf853da2..00000000000 --- a/package/flutter-gallery/0001-remove-GetStorage.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a1d38d78163d84d3506c188e195cd5fa363f4be6 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 17 Aug 2023 13:00:07 -0600 -Subject: [PATCH] remove GetStorage - -Commit 287b20a8bfc71196cd733625e622b98b2f84bef1 introduced the get_storage -plugin which breaks with the following error when the application is ran: - -Unhandled Exception: MissingPluginException(No implementation found for method -getApplicataionDocumentsDirectory on channel plugins.flutter.io/path_provider) - -Revert the change. - -Upstream: https://github.com/flutter/gallery/issues/994 -Signed-off-by: Adam Duskett ---- - lib/feature_discovery/feature_discovery.dart | 10 ---------- - lib/main.dart | 2 -- - pubspec.yaml | 1 - - 3 files changed, 13 deletions(-) - -diff --git a/lib/feature_discovery/feature_discovery.dart b/lib/feature_discovery/feature_discovery.dart -index 288c78b..965d83c 100644 ---- a/lib/feature_discovery/feature_discovery.dart -+++ b/lib/feature_discovery/feature_discovery.dart -@@ -6,7 +6,6 @@ import 'package:flutter/material.dart'; - import 'package:flutter/scheduler.dart'; - import 'package:gallery/feature_discovery/animation.dart'; - import 'package:gallery/feature_discovery/overlay.dart'; --import 'package:get_storage/get_storage.dart'; - - const _featureHighlightShownKey = 'feature_highlight_shown'; - -@@ -271,15 +270,6 @@ class _FeatureDiscoveryState extends State - - initAnimationControllers(); - initAnimations(); -- -- final localStorage = GetStorage(); -- final featureHiglightShown = -- localStorage.read(_featureHighlightShownKey) ?? false; -- localStorage.write(_featureHighlightShownKey, true); -- showOverlay = widget.showOverlay && !featureHiglightShown; -- if (showOverlay) { -- localStorage.write(_featureHighlightShownKey, true); -- } - } - - void initAnimationControllers() { -diff --git a/lib/main.dart b/lib/main.dart -index e9f4ff9..8c7a4e3 100644 ---- a/lib/main.dart -+++ b/lib/main.dart -@@ -16,7 +16,6 @@ import 'package:gallery/pages/backdrop.dart'; - import 'package:gallery/pages/splash.dart'; - import 'package:gallery/routes.dart'; - import 'package:gallery/themes/gallery_theme_data.dart'; --import 'package:get_storage/get_storage.dart'; - import 'package:google_fonts/google_fonts.dart'; - - import 'firebase_options.dart'; -@@ -26,7 +25,6 @@ export 'package:gallery/data/demos.dart' show pumpDeferredLibraries; - - void main() async { - GoogleFonts.config.allowRuntimeFetching = false; -- await GetStorage.init(); - - if (defaultTargetPlatform != TargetPlatform.linux && - defaultTargetPlatform != TargetPlatform.windows && -diff --git a/pubspec.yaml b/pubspec.yaml -index 964edad..4b00e40 100644 ---- a/pubspec.yaml -+++ b/pubspec.yaml -@@ -24,7 +24,6 @@ dependencies: - firebase_core: ^2.7.0 - firebase_crashlytics: ^3.1.1 - firebase_performance: ^0.9.0+14 -- get_storage: ^2.1.1 - google_fonts: ^5.0.0 - intl: any # An exact version pin will be provided by the Flutter SDK - meta: ^1.7.0 --- -2.41.0 - diff --git a/package/flutter-gallery/Config.in b/package/flutter-gallery/Config.in deleted file mode 100644 index 224457ea6f7..00000000000 --- a/package/flutter-gallery/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_FLUTTER_GALLERY - bool "flutter-gallery" - depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS - depends on BR2_PACKAGE_FLUTTER_ENGINE - select BR2_PACKAGE_HOST_FLUTTER_SDK_BIN - help - Flutter Gallery is a resource to help developers evaluate - and use Flutter. It is a collection of Material Design & - Cupertino widgets, behaviors, and vignettes implemented - with Flutter. - - https://github.com/flutter/gallery - -comment "flutter-gallery needs flutter-engine" - depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS - depends on !BR2_PACKAGE_FLUTTER_ENGINE diff --git a/package/flutter-gallery/flutter-gallery.hash b/package/flutter-gallery/flutter-gallery.hash deleted file mode 100644 index aea1ed39bea..00000000000 --- a/package/flutter-gallery/flutter-gallery.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 14272aba90b7d26db33bac7b4692f0e3ed1a008286a08eaf2ea79abd478f23e9 flutter-gallery-2.10.2.tar.gz -sha256 c731cf5a33db0e12647e0680ef0bc7839f99749404ac1ba4626cf7192065b3b0 LICENSE diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk deleted file mode 100644 index acad706daef..00000000000 --- a/package/flutter-gallery/flutter-gallery.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# flutter-gallery -# -################################################################################ - -FLUTTER_GALLERY_VERSION = 2.10.2 -FLUTTER_GALLERY_SITE = $(call github,flutter,gallery,v$(FLUTTER_GALLERY_VERSION)) -FLUTTER_GALLERY_LICENSE = BSD-3-Clause -FLUTTER_GALLERY_LICENSE_FILES = LICENSE -FLUTTER_GALLERY_DEPENDENCIES = \ - host-flutter-sdk-bin \ - flutter-engine - -FLUTTER_GALLERY_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/gallery/$(FLUTTER_ENGINE_RUNTIME_MODE) - -define FLUTTER_GALLERY_CONFIGURE_CMDS - cd $(@D) && \ - FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle -endef - -define FLUTTER_GALLERY_BUILD_CMDS - cd $(@D) && \ - FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ - $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - -Dflutter.dart_plugin_registrant=file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ - --source file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ - --source package:flutter/src/dart_plugin_registrant.dart \ - --native-assets $(@D)/.dart_tool/flutter_build/*/native_assets.yaml \ - package:gallery/main.dart && \ - $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ - --deterministic \ - --obfuscate \ - --snapshot_kind=app-aot-elf \ - --elf=libapp.so \ - .dart_tool/flutter_build/*/app.dill -endef - -define FLUTTER_GALLERY_INSTALL_TARGET_CMDS - mkdir -p $(FLUTTER_GALLERY_INSTALL_DIR)/{data,lib} - cp -dprf $(@D)/build/flutter_assets $(FLUTTER_GALLERY_INSTALL_DIR)/data/ - - $(INSTALL) -D -m 0755 $(@D)/libapp.so \ - $(FLUTTER_GALLERY_INSTALL_DIR)/lib/libapp.so - - ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ - $(FLUTTER_GALLERY_INSTALL_DIR)/data/ - - ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/ - $(RM) $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin - touch $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin -endef - -$(eval $(generic-package)) From 2f843331a1d7c0df7cd2b2e33a9ed03c6fc5c9ef Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:21 -0600 Subject: [PATCH 0194/3013] package/flutter-pi: bump version to 783db32ec6441b878783bfa241777d3bfe6b35e2 Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/flutter-pi/flutter-pi.hash | 2 +- package/flutter-pi/flutter-pi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash index df47d666bd9..956827a5b3e 100644 --- a/package/flutter-pi/flutter-pi.hash +++ b/package/flutter-pi/flutter-pi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b11f260567a4589915cf29ce2ffa62b6f80414242a65c616f01983ae3a177b7 flutter-pi-75e72fef8e8ce65ec72a002c00d9c6db4d1479d3-br1.tar.gz +sha256 4ab2ae849d46261fe22ed94eae5726841d34119a5656e85b26c7c8802050d14c flutter-pi-783db32ec6441b878783bfa241777d3bfe6b35e2-br1.tar.gz sha256 b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70 LICENSE diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index 9edc62e7ace..ee54a2bf4ee 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PI_VERSION = 75e72fef8e8ce65ec72a002c00d9c6db4d1479d3 +FLUTTER_PI_VERSION = 783db32ec6441b878783bfa241777d3bfe6b35e2 FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git FLUTTER_PI_SITE_METHOD = git FLUTTER_PI_LICENSE = MIT From 2f2af48e7762d52841fbdf8909b4bc7dbf5f2171 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:22 -0600 Subject: [PATCH 0195/3013] package/flutter-sdk-bin: bump version to 3.19.4 Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index 48c9c7d7e3d..1102c50cc6a 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7cb12032cf615a92a7bc9042100f3f2af62df7df3ca3bee27f4b153fe218b239 flutter_linux_3.16.8-stable.tar.xz +sha256 66adfe6b6559a2e2f1fdbf89c938d0af53add3860c854c79dbbd5452f5d2290a flutter_linux_3.19.4-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 0d9a44596de..f8453c3090c 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.16.8 +FLUTTER_SDK_BIN_VERSION = 3.19.4 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause From cc38dde3575a4e69db9ad182f691542dc4aa4e06 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:23 -0600 Subject: [PATCH 0196/3013] package/flutter-engine: bump version to 3.19.4 Add 0005-skip-configuration-dependency-if-unit-tests-are-disa.patch, which fixes gtk+-3.0 being an unconditional requirement. Other changes: Flutter 3.19.x made Wayland and X11 an unconditional requirement, resulting in the following errors when compiling: """ ../../flutter/third_party/swiftshader/src/WSI/libWaylandClient.hpp:18:10: fatal error: 'wayland-client.h' file not found 18 | #include | ^~~~~~~~~~~~~~~~~~ ../../flutter/third_party/swiftshader/src/WSI/WaylandSurfaceKHR.cpp:15: ../../flutter/third_party/swiftshader/src/WSI/WaylandSurfaceKHR.hpp:22:10: fatal error: 'wayland-client.h' file not found 22 | #include | ^~~~~~~~~~~~~~~~~~ 1 error generated. [1369/11229] CC obj/flutter/third_party/sqlite/sqlite.sqlite3.o """ After raising an issue found here: https://github.com/flutter/flutter/issues/144635 and after several hours of searching, the problem is https://github.com/flutter/buildroot/commit/d01da2716 which hardcodes the following values if building for a Linux platform: - ozone_platform_x11 = true - ozone_platform_wayland = true As upstream maintainers listed the above as low priority (P3), a simple fix is to add two additional sed calls in FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP and FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP which set ozone_platform_x11 and ozone_platform_wayland to the appropriate values. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- ...on-dependency-if-unit-tests-are-disa.patch | 32 +++++++++++++++++++ package/flutter-engine/flutter-engine.mk | 8 ++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch diff --git a/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch b/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch new file mode 100644 index 00000000000..125bfc6910b --- /dev/null +++ b/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch @@ -0,0 +1,32 @@ +From 2252a85e59669b5826019f60a98b7a69939dacfd Mon Sep 17 00:00:00 2001 +From: Greg Spencer +Date: Mon, 4 Mar 2024 12:30:41 -0800 +Subject: [PATCH] Skip configuration dependency if unit tests are disabled. + +Commit 88baf62f made gtk+-3.0 an unconditional requirement, see: + +Issue: https://github.com/flutter/flutter/issues/144421 +Upstream: Merged. https://github.com/flutter/engine/pull/51179 + +Signed-off-by: Greg Spencer +Signed-off-by: Adam Duskett +--- + flutter/testing/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/flutter/testing/BUILD.gn b/flutter/testing/BUILD.gn +index 9eac29452..a7d094695 100644 +--- a/flutter/testing/BUILD.gn ++++ b/flutter/testing/BUILD.gn +@@ -51,7 +51,7 @@ source_set("testing") { + + sources = [ "run_all_unittests.cc" ] + +- if (is_linux) { ++ if (enable_unittests && is_linux) { + # So that we can call gtk_init in main(). + configs += [ "//flutter/shell/platform/linux/config:gtk" ] + } +-- +2.44.0 + diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index d08274f546c..ff21e0949d6 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.16.8 +FLUTTER_ENGINE_VERSION = 3.19.4 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = @@ -154,6 +154,9 @@ else define FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP $(SED) "s%vulkan_use_x11.*%vulkan_use_x11 = false%g" -i \ $(@D)/build_overrides/vulkan_headers.gni + + $(SED) "s%ozone_platform_x11.*%ozone_platform_x11 = false%g" \ + $(@D)/build/config/BUILDCONFIG.gn endef FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP endif @@ -164,6 +167,9 @@ else define FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP $(SED) "s%vulkan_use_wayland.*%vulkan_use_wayland = false%g" \ $(@D)/build_overrides/vulkan_headers.gni + + $(SED) "s%ozone_platform_wayland.*%ozone_platform_wayland = false%g" \ + $(@D)/build/config/BUILDCONFIG.gn endef FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP endif From 9b1c4300dd69f18b3bffd22aa7a2b2d45be9e38b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Mar 2024 10:25:25 +0100 Subject: [PATCH 0197/3013] Update for 2024.02.1 Signed-off-by: Peter Korsgaard (cherry picked from commit 9a3d34139b018bf79ac1c37b0212b5b775e3ae77) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 33 +++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 8f0b4042fa1..9643d524230 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,36 @@ +2024.02.1, released March 26th, 2024 + + Important / security related fixes. + + Toolchain: Dropped old Codesourcery ARM / AARCH64 and + Codescape MIPS external toolchains as they use old Glibc + versions not compatible with 64-bit time_t + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. TI am62x_sk / am64_sk: Use correct optee-os + platform setting and use a fixed ti-k3-r5-loader version. + + Infrastructure: Use git to fetch CVE data from the FKIE + repository to work around an issue with missing meta files in + the releases. + + Updated/fixed packages: axel, bash, bitcoin, botan, busybox, + containerd, cryptsetup, cvs, docker-compose, docker-engine, + ell, expat, giflib, gmp, go, harfbuzz, intel-gmmlib, + intel-mediadriver, iwd, kodi, kodi-pvr-hts, libcgroup, libdrm, + libgit2, libkrb5, libnfs, libunwind, libvpl, + libtorrent-rasterbar, libxml2, linux, mariadb, mesa3d, + mmc-utils, msmtp, multipath-tools, neon, onevpl-intel-gpu, + openssh, openvpn, osm2pgsql, owfs, php, poco, policycoreutils, + postgis, privoxy, pulseaudio, pure-ftpd, putty, + python-configshell-fb, python-rtslib-fb, rauc, restorecond, + spice, squid, targetcli-fb, tzdata, util-linux, vdr, xmrig, + xvisor, zic + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + 2024.02, released March 5th, 2024 Various fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 73bdcc8b5e7..cb7a81af6ec 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02' +RELEASE='2024.02.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 32c192fec91e8c8241412e061312a5302d31dcaf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Mar 2024 11:41:29 +0100 Subject: [PATCH 0198/3013] docs/website: Update for 2024.02.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index c1393134df2..559d396ed29 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
Download
-

Latest stable / long term support release: 2024.02

+

Latest stable / long term support release: 2024.02.1

- +
- +
-

buildroot-2024.02.tar.gz

-

PGP signature

+

buildroot-2024.02.1.tar.gz

+

PGP signature

- +
- +
-

buildroot-2024.02.tar.xz

-

PGP signature

+

buildroot-2024.02.1.tar.xz

+

PGP signature

- From f578744ad43fe59e5639ce0c766877622117a84f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Mar 2024 21:13:41 +0100 Subject: [PATCH 0206/3013] Update for 2023.02.11 Signed-off-by: Peter Korsgaard (cherry picked from commit cc34b5b2abf2588f0ef55e46a4fe85a60c19ba1f) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGES b/CHANGES index a5ee80016ec..4b0cc082442 100644 --- a/CHANGES +++ b/CHANGES @@ -728,6 +728,29 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.11, released March 26th, 2024 + + Important / security related fixes. + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. + + Updated/fixed packages: bind, bitcoin, botan, c-ares, clamav, + cvs, dash, dnsmasq, ell, exim, expat, freetype, ghostscript, + gnupg2, google-breakpad, gst1-python, gst1-vaapi, iwd, + libcoap, libcurl, libgit2, libkrb5, libmodsecurity, libunwind, + libuv, libxml2, lua-http, luvi, nginx-naxsi, nodejs, openssh, + openvmtools, parted, php, poco, postgresql, privoxy, + pure-ftpd, putty, python-cheroot, python-configshell-fb, + python-django, python-rtslib-fb, python3, rsync, sdl2, shim, + spice, squid, strace, strongswan, sudo, systemd, targetcli-fb, + unbound, uvw, v4l2loopback, vim, webkitgtk, wpewebkit, xvisor, + zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + 2023.02.10, released March 1st, 2024 Important / security related fixes. From cd44a480e154693c5352bf9119cbb02c0f7a6f25 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Mar 2024 10:40:18 +0100 Subject: [PATCH 0207/3013] docs/website: Update for 2023.02.11 Signed-off-by: Peter Korsgaard --- docs/website/news.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 457a2eaead6..a5211fdbba2 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

News

    +
  • +
    +
    +
    +

    2023.02.11 released

    +

    27 March 2024

    +
    +
    +

    The 2023.02.11 bugfix release is out, fixing a number of important / + security related issues discovered since the 2023.02.10 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2023.02.11 release.

    + +

    Notice that the 2023.02.x series is now end of life. Please migrate to + the 2024.02.x series instead.

    +
    +
    +
    • +
  • From dde89fe703507798e52c8250e3a38dd4d4fa5a36 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Mar 2024 22:17:03 +0100 Subject: [PATCH 0208/3013] configs/lafrite_defconfig: bump kernel to 6.6.22 And add a hash for it / enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Signed-off-by: Peter Korsgaard --- .../lafrite/patches/linux-headers/linux-headers.hash | 1 + board/librecomputer/lafrite/patches/linux/linux.hash | 2 ++ configs/lafrite_defconfig | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash create mode 100644 board/librecomputer/lafrite/patches/linux/linux.hash diff --git a/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash b/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/librecomputer/lafrite/patches/linux/linux.hash b/board/librecomputer/lafrite/patches/linux/linux.hash new file mode 100644 index 00000000000..899adefd079 --- /dev/null +++ b/board/librecomputer/lafrite/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz diff --git a/configs/lafrite_defconfig b/configs/lafrite_defconfig index b3326f6b497..19fca02c541 100644 --- a/configs/lafrite_defconfig +++ b/configs/lafrite_defconfig @@ -1,6 +1,8 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/librecomputer/lafrite/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/librecomputer/lafrite/overlay/" @@ -8,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/librecomputer/lafrite/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s805x-libretech-ac" From f0bc79fc8dd6be999f11df9b9f774434d1ba513f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 24 Mar 2024 13:28:47 -0300 Subject: [PATCH 0209/3013] package/python-sqlalchemy: add cython for python-sqlalchemy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-sqlalchemy. Signed-off-by: James Hilliard Tested-By: Flávio Tapajós Signed-off-by: Flávio Tapajós Signed-off-by: Arnout Vandecappelle --- package/python-sqlalchemy/python-sqlalchemy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 400ad92f637..167c3a44983 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -12,5 +12,6 @@ PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE PYTHON_SQLALCHEMY_CPE_ID_VENDOR = sqlalchemy PYTHON_SQLALCHEMY_CPE_ID_PRODUCT = sqlalchemy +PYTHON_SQLALCHEMY_DEPENDENCIES = host-python-cython $(eval $(python-package)) From bb5cb8955bea6cd127c06ea946cf6825066385fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Sun, 24 Mar 2024 13:28:48 -0300 Subject: [PATCH 0210/3013] package/python-sqlalchemy: bump version to 2.0.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós [Arnout: fix check-package error in hash file] Signed-off-by: Arnout Vandecappelle --- package/python-sqlalchemy/python-sqlalchemy.hash | 4 ++-- package/python-sqlalchemy/python-sqlalchemy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 7951a329785..0bc9256c548 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 7abfc2972d7e16315c8b7492ea0e0fdb SQLAlchemy-2.0.25.tar.gz -sha256 a2c69a7664fb2d54b8682dd774c3b54f67f84fa123cf84dda2a5f40dcaa04e08 SQLAlchemy-2.0.25.tar.gz +md5 ea746e69e0702cc8d2c91c5140ce35cc SQLAlchemy-2.0.28.tar.gz +sha256 bd9566b8e58cabd700bc367b60e90d9349cd16f0984973f98a9a09f9c64e86f0 SQLAlchemy-2.0.29.tar.gz # Locally computed sha256 checksums sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 167c3a44983..b7dac92a994 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.25 +PYTHON_SQLALCHEMY_VERSION = 2.0.29 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/7b/bb/85bd8e211f54983e927c7cd9b2ad66773fbef507957156fc72e481a62681 +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/99/04/59971bfc2f192e3b52376ca8d1e134c78d04bc044ef7e04cf10c42d2ce17 PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE From 9d92841d5ae919957b9494bad3d186330a808d84 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:47 -0700 Subject: [PATCH 0211/3013] package/python-poetry-core: new host package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-poetry-core/python-poetry-core.hash | 5 +++++ package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 00000000000..c6b180c852e --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 7461547cac0e0e9c8cd7463aa87e7470 poetry_core-1.7.0.tar.gz +sha256 8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 poetry_core-1.7.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 00000000000..4ca587b11d2 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.7.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/cb/1c/af7f886e723b2dfbaea9b8a739153f227b386dd856cf956f9fd0ed0a502b +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = MIT +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) From 830eda38e1590f449bd479ca89e08108aa1ade81 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:48 -0700 Subject: [PATCH 0212/3013] package/python-terminaltables: use correct pep517 build backend We need to migrate python-terminaltables to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Thus, specifying setuptools as the build backend is simply wrong. The current release of python-terminaltables still uses poetry rather than poetry-core as a build backend. poetry is much more heavyweight, it would need to pull in a large number of build dependencies. Therefore, include an upstream patch to switch from poetry to poetry-core. Signed-off-by: James Hilliard [Arnout: use a patch instead of sed] Signed-off-by: Arnout Vandecappelle --- ...-switch-build-backend-to-poetry-core.patch | 28 +++++++++++++++++++ .../python-terminaltables.mk | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch diff --git a/package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch b/package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch new file mode 100644 index 00000000000..2906dd740da --- /dev/null +++ b/package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch @@ -0,0 +1,28 @@ +From 9e3dda0efb54fee6934c744a13a7336d24c6e9e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 27 Jan 2022 10:33:08 +0100 +Subject: [PATCH] Switch build-backend to poetry-core + +poetry-core is the lightweight counterpart of poetry that is intended +to be used as a build-backend. Unlike poetry, it does not require +installing all the dependencies of the package manager, making +the builds much faster. The generated artifacts are the same. + +Upstream: https://github.com/matthewdeanmartin/terminaltables/commit/9e3dda0efb54fee6934c744a13a7336d24c6e9e9 +Signed-off-by: Arnout Vandecappelle +--- + pyproject.toml | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a861add..ff4b190 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -62,5 +62,5 @@ python = ">=2.6 || >=3.0" + pytest = "==6.0.1" + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index b31ed332b6d..062643adeed 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -7,8 +7,9 @@ PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 -PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_SETUP_TYPE = pep517 PYTHON_TERMINALTABLES_LICENSE = MIT PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE +PYTHON_TERMINALTABLES_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From 4ccca0d77a9c61f3730aae0289210c4724aa1887 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:49 -0700 Subject: [PATCH 0213/3013] package/python-setuptools-rust: add host setuptools-scm dependency We need host-python-setuptools-scm for python-setuptools-rust to build correctly when using a pep517 frontend. Fixes: * Getting build dependencies for wheel... running egg_info writing setuptools_rust.egg-info/PKG-INFO writing dependency_links to setuptools_rust.egg-info/dependency_links.txt writing entry points to setuptools_rust.egg-info/entry_points.txt writing requirements to setuptools_rust.egg-info/requires.txt writing top-level names to setuptools_rust.egg-info/top_level.txt reading manifest file 'setuptools_rust.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'LICENSE' writing manifest file 'setuptools_rust.egg-info/SOURCES.txt' ERROR Missing dependencies: setuptools_scm Signed-off-by: James Hilliard [Arnout: order dependencies alphabetically] Signed-off-by: Arnout Vandecappelle --- package/python-setuptools-rust/python-setuptools-rust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index f07263becfb..1203fbf6161 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -10,6 +10,9 @@ PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/f2/40/f1e9 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + host-python-semantic-version \ + host-python-setuptools-scm \ + host-rustc $(eval $(host-python-package)) From 3c0c08e80f98f0a7a27f5f6fdd48b801ec7490d0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:51 -0700 Subject: [PATCH 0214/3013] package/python-pyyaml: add cython for host-python-pyyaml When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for pyyaml. Signed-off-by: James Hilliard [Arnout: order dependencies alphabetically] Signed-off-by: Arnout Vandecappelle --- package/python-pyyaml/python-pyyaml.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 846c57df4ff..40a1c25758a 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -14,7 +14,8 @@ PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 -HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml host-python-cython +HOST_PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 $(eval $(python-package)) $(eval $(host-python-package)) From 05f315c83b63ac36211e3aaf9d30c4027fa73766 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:52 -0700 Subject: [PATCH 0215/3013] package/python-aiofiles: migrate to hatchling pep517 build backend When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. Fixes: ERROR Backend 'hatchling.build' is not available. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aiofiles/python-aiofiles.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index 582f7908cdd..954647bf766 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -7,8 +7,9 @@ PYTHON_AIOFILES_VERSION = 23.2.1 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/af/41/cfed10bc64d774f497a86e5ede9248e1d062db675504b41c320954d99641 -PYTHON_AIOFILES_SETUP_TYPE = setuptools +PYTHON_AIOFILES_SETUP_TYPE = pep517 PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE +PYTHON_AIOFILES_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) From 72c08122c051044628bc6391458b8ba980b32153 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:53 -0700 Subject: [PATCH 0216/3013] package/python-aiologstash: migrate to flit build backend We need to add a patch which selects the correct flit build backend. As flit is configured as the pep517 build backend for aiologstash we need to migrate from setuptools to flit prior to migrating setuptools to pep517 as the frontend will not fall back to using setuptools once migrated. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...Fix-flit_core-build-requires-backend.patch | 31 +++++++++++++++++++ .../python-aiologstash/python-aiologstash.mk | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch diff --git a/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 00000000000..99a150a3449 --- /dev/null +++ b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,31 @@ +From 3c4d1203eb9ee3dbe79b096d587c9baaf8b802ed Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 13:26:31 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +Upstream: https://github.com/aio-libs/aiologstash/pull/258 +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 7bdaebb..252a660 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires = ["flit"] +-build-backend = "flit.buildapi" ++requires = ["flit_core"] ++build-backend = "flit_core.buildapi" + + [tool.flit.metadata] + module = "aiologstash" +-- +2.34.1 + diff --git a/package/python-aiologstash/python-aiologstash.mk b/package/python-aiologstash/python-aiologstash.mk index de0ed820a0e..bcf60a72e97 100644 --- a/package/python-aiologstash/python-aiologstash.mk +++ b/package/python-aiologstash/python-aiologstash.mk @@ -7,7 +7,7 @@ PYTHON_AIOLOGSTASH_VERSION = 2.0.0 PYTHON_AIOLOGSTASH_SOURCE = aiologstash-$(PYTHON_AIOLOGSTASH_VERSION).tar.gz PYTHON_AIOLOGSTASH_SITE = https://files.pythonhosted.org/packages/1c/dc/382861d5d25ccc976d02118922598fc4547f74f3287793e270ed614d8176 -PYTHON_AIOLOGSTASH_SETUP_TYPE = setuptools +PYTHON_AIOLOGSTASH_SETUP_TYPE = flit PYTHON_AIOLOGSTASH_LICENSE = MIT PYTHON_AIOLOGSTASH_LICENSE_FILES = LICENSE From 0722978efbc9966c5595ebb60bf9667072af0cbe Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:54 -0700 Subject: [PATCH 0217/3013] package/python-bleak: use correct pep517 build backend We need to migrate python-bleak to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-bleak/python-bleak.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index ed3c3f2f933..716b6327edf 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -7,8 +7,9 @@ PYTHON_BLEAK_VERSION = 0.21.1 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/6a/c0/3aca655fa43b8ff5340d99fac4e67061f53f42f092fc847bdd0559d67846 -PYTHON_BLEAK_SETUP_TYPE = setuptools +PYTHON_BLEAK_SETUP_TYPE = pep517 PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE +PYTHON_BLEAK_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From 6b6975a87e842c1a56677bb981f516b4797f56f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 21:53:24 +0100 Subject: [PATCH 0218/3013] package/thermald: bump to version 2.5.6 https://github.com/intel/thermal_daemon/blob/v2.5.6/README.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index 9693813ca9f..fff5ae62847 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5 thermald-2.5.1.tar.gz +sha256 e5a452624f133d71f4aff0bd0c8f8258399a5ae1a7d5aea177fa6a6e33dad1fd thermald-2.5.6.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index fd0246745f8..9faa47683be 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.5.1 +THERMALD_VERSION = 2.5.6 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From 9ff9d5f8861aac2521e2ab72188bc85e1668def9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 22:17:00 +0100 Subject: [PATCH 0219/3013] package/domoticz: bump to version 2024.4 openzwave dependency is back since https://github.com/domoticz/domoticz/commit/b0eadaa2ec6d6340df7eeba0e6e373b71ba393fc https://github.com/domoticz/domoticz/blob/2024.4/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 546177332e8..ae86a67b79e 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9effa792f856d8d9036c53b9ae500ee3bffa1488addf9d6f1fe4bf960f73f740 domoticz-2024.1.tar.gz +sha256 d87113d7cacd0b52b9126fcc1ef24e140a4f7042d5bc6262e86e4b4752f5cf38 domoticz-2024.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 88bad154278..95d3335adb0 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2024.1 +DOMOTICZ_VERSION = 2024.4 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt @@ -51,6 +51,16 @@ else DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF endif +ifeq ($(BR2_PACKAGE_OPENZWAVE),y) +DOMOTICZ_DEPENDENCIES += openzwave + +# Due to the dependency on mosquitto, domoticz depends on +# !BR2_STATIC_LIBS so set USE_STATIC_OPENZWAVE to OFF otherwise +# domoticz will not find the openzwave library as it searches by +# default a static library. +DOMOTICZ_CONF_OPTS += -DUSE_STATIC_OPENZWAVE=OFF +endif + ifeq ($(BR2_PACKAGE_PYTHON3),y) DOMOTICZ_DEPENDENCIES += python3 DOMOTICZ_CONF_OPTS += -DUSE_PYTHON=ON From c4878d530e8bbcf29173b62a725c66ac51849c65 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 19:06:45 +0100 Subject: [PATCH 0220/3013] package/log4cxx: bump to version 1.1.0 - Drop patch (already in version) - Drop LOG4CXX_IGNORE_CVES as CVE-2023-31038 has been fixed in 1.1.0 - Add unixodbc optional dependency https://logging.apache.org/log4cxx/latest_stable/changelog.html#1.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .../0001-Make-ODBC-and-SMTP-opt-in-191.patch | 73 ------------------- package/log4cxx/log4cxx.hash | 4 +- package/log4cxx/log4cxx.mk | 15 ++-- 3 files changed, 11 insertions(+), 81 deletions(-) delete mode 100644 package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch diff --git a/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch deleted file mode 100644 index a116fcc4915..00000000000 --- a/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 4900c27cc284ba2f671ae92e6ffb4ab391f9507a Mon Sep 17 00:00:00 2001 -From: Robert Middleton -Date: Mon, 6 Feb 2023 20:39:02 -0500 -Subject: [PATCH] Make ODBC and SMTP opt-in (#191) - -See #189 - -Upstream: afeaab6d0f0107c77dfadcbe3708f170c48d5ed9 -Signed-off-by: Thomas Petazzoni ---- - src/main/include/CMakeLists.txt | 40 ++++++++++++++++++++++++--------- - 1 file changed, 30 insertions(+), 10 deletions(-) - -diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt -index e31443fb..d6835293 100644 ---- a/src/main/include/CMakeLists.txt -+++ b/src/main/include/CMakeLists.txt -@@ -85,22 +85,42 @@ include(CheckIncludeFiles) - include(CheckIncludeFileCXX) - include(CheckLibraryExists) - --if(WIN32) -- CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) -+option(LOG4CXX_ENABLE_ODBC "Support logging via ODBC" OFF) -+if(LOG4CXX_ENABLE_ODBC) -+ if(WIN32) -+ CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) -+ else() -+ include(FindPkgConfig) -+ -+ pkg_check_modules( odbc odbc ) -+ if(${odbc_FOUND}) -+ set(HAS_ODBC 1) -+ else() -+ set(HAS_ODBC 0) -+ endif(${odbc_FOUND}) -+ endif(WIN32) -+ -+ if(NOT ${HAS_ODBC}) -+ message(SEND_ERROR "ODBC not found but requested") -+ endif() - else() -- include(FindPkgConfig) -- -- pkg_check_modules( odbc QUIET odbc ) -- if(${odbc_FOUND}) -- set(HAS_ODBC 1) -- endif(${odbc_FOUND}) --endif(WIN32) -+ set(HAS_ODBC 0) -+endif(LOG4CXX_ENABLE_ODBC) -+ -+option(LOG4CXX_ENABLE_ESMTP "Support logging via libesmtp" OFF) -+if(LOG4CXX_ENABLE_ESMTP) -+ CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) -+ if(NOT HAS_LIBESMTP) -+ message(SEND_ERROR "SMTP support with libesmtp not found but requested") -+ endif() -+else() -+ set(HAS_LIBESMTP 0) -+endif(LOG4CXX_ENABLE_ESMTP) - - CHECK_INCLUDE_FILE_CXX(locale HAS_STD_LOCALE) - CHECK_FUNCTION_EXISTS(mbsrtowcs HAS_MBSRTOWCS) - CHECK_FUNCTION_EXISTS(wcstombs HAS_WCSTOMBS) - CHECK_FUNCTION_EXISTS(fwide HAS_FWIDE) --CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) - CHECK_FUNCTION_EXISTS(syslog HAS_SYSLOG) - if(UNIX) - set(CMAKE_REQUIRED_LIBRARIES "pthread") --- -2.41.0 - diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 8190f94aa3f..728d49ee382 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/0.13.0/apache-log4cxx-0.13.0.tar.gz.sha512 -sha512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5 apache-log4cxx-0.13.0.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/1.1.0/apache-log4cxx-1.1.0.tar.gz.sha512 +sha512 66a66eab933a6afd0779e3f73f65afa4fb82481208b591fd7c7c86ded805f50abcd9cdf954bdb49e1e7f5198e6c1c4fff8a7e180ff5fff9491f1946e9ba6fe2b apache-log4cxx-1.1.0.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index aee682529c8..8024c96d46f 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,21 +4,17 @@ # ################################################################################ -LOG4CXX_VERSION = 0.13.0 +LOG4CXX_VERSION = 1.1.0 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE LOG4CXX_CPE_ID_VENDOR = apache -# We do not support ODBC functionality -LOG4CXX_IGNORE_CVES = CVE-2023-31038 -# Note: if you want to support odbc, make sure CVE-2023-31038 is fixed LOG4CXX_CONF_OPTS = \ -DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \ - -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config \ - -DLOG4CXX_ENABLE_ODBC=OFF + -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config LOG4CXX_DEPENDENCIES = apr apr-util @@ -33,6 +29,13 @@ else LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=OFF endif +ifeq ($(BR2_PACKAGE_UNIXODBC),y) +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_ODBC=ON +LOG4CXX_DEPENDENCIES += unixodbc +else +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_ODBC=OFF +endif + ifeq ($(BR2_USE_WCHAR),y) LOG4CXX_CONF_OPTS += -DLOG4CXX_WCHAR_T=ON else From f382de2b0f8a528a09bb975cc088a4342b663134 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Feb 2024 20:55:20 +0100 Subject: [PATCH 0221/3013] package/libffi: bump version to 3.4.6 Removed patch 0001 and instead added new configure option --disable-multi-os-directory which was added upstream: https://github.com/libffi/libffi/commit/877ea9bf9ac2c98cb858c12f5a6aeeec13cf978f Removed patch 0003 due to various upstream fixes for mips soft-float support since its addition in 2016: https://github.com/libffi/libffi/commits/master/src/mips Renumbered remaining patch. Updated license hash due to copyright year bump: https://github.com/libffi/libffi/commit/91739a1a912476adbf1e0e4dcb091b9a2c5007d9 Signed-off-by: Bernd Kuhls Reviewed-by: Adam Duskett Tested-by: Adam Duskett [yann.morin.1998@free.fr: fix check-package] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 4 +- ...-Fix-installation-location-of-libffi.patch | 55 ------------------- ...ix-use-of-compact-eh-frames-on-MIPS.patch} | 4 +- ...-hardfloat-in-the-MIPS-assembly-code.patch | 44 --------------- package/libffi/libffi.hash | 4 +- package/libffi/libffi.mk | 7 ++- 6 files changed, 10 insertions(+), 108 deletions(-) delete mode 100644 package/libffi/0001-Fix-installation-location-of-libffi.patch rename package/libffi/{0002-Fix-use-of-compact-eh-frames-on-MIPS.patch => 0001-Fix-use-of-compact-eh-frames-on-MIPS.patch} (94%) delete mode 100644 package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0735b0c5dad..b7d45df2a24 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -594,9 +594,7 @@ package/libedit/0001-check-bsd-functions-in-libbsd.patch Upstream package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch Upstream package/libfcgi/0001-link-against-math.patch Upstream package/libfcgi/0002-disable-examples.patch Sob Upstream -package/libffi/0001-Fix-installation-location-of-libffi.patch Upstream -package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch Upstream -package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch Upstream +package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch Upstream package/libfm/0001-modules-fix-cross-compilation.patch Upstream package/libfreeimage/0001-no-root-install.patch Upstream package/libfreeimage/0002-fix-cpuid-x86.patch Upstream diff --git a/package/libffi/0001-Fix-installation-location-of-libffi.patch b/package/libffi/0001-Fix-installation-location-of-libffi.patch deleted file mode 100644 index 6ac91237303..00000000000 --- a/package/libffi/0001-Fix-installation-location-of-libffi.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 7 Feb 2013 22:26:56 +0100 -Subject: [PATCH] Fix installation location of libffi -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The libffi is currently declared as toolexeclib_LTLIBRARIES. In many -cases, toolexeclib libraries will be installed in /usr/lib, so it -doesn't make any difference. - -However, with multilib toolchains, they get installed in a -subdirectory of /usr/lib/. For example, with a Sourcery CodeBench -PowerPC toolchain, if the e500mc multilib variant is used, the libffi -library gets installed in /usr/lib/te500mc/. This is due to the -following code in the configure script: - - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) ;; # Avoid trailing /. - *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; - esac - -Once the library is installed in /usr/lib/te500mc/, nothing works -because this installation location is inconsistent with the -installation location declared in libffi.pc. - -So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use -the more standard lib_LTLIBRARIES, which ensures that the libffi -library is always installed in /usr/lib. - -Signed-off-by: Thomas Petazzoni -[unfuzz for 3.2.1] -Signed-off-by: Jörg Krause ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 0e40451..309474c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) - - MAKEOVERRIDES= - --toolexeclib_LTLIBRARIES = libffi.la -+lib_LTLIBRARIES = libffi.la - noinst_LTLIBRARIES = libffi_convenience.la - - libffi_la_SOURCES = src/prep_cif.c src/types.c \ --- -2.5.3 - diff --git a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch similarity index 94% rename from package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch rename to package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch index c19e395f900..7786b984a22 100644 --- a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch +++ b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch @@ -15,6 +15,8 @@ Mips and compiler support it. Signed-off-by: Jérôme Pouiller [unfuzz for 3.2.1] Signed-off-by: Jörg Krause +[rebased for 3.4.6] +Signed-off-by: Bernd Kuhls --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) @@ -23,7 +25,7 @@ diff --git a/configure.ac b/configure.ac index a7bf5ee..36cd0d4 100644 --- a/configure.ac +++ b/configure.ac -@@ -469,6 +469,16 @@ esac +@@ -238,6 +238,16 @@ esac AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1) AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE) diff --git a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch b/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch deleted file mode 100644 index 168972a8718..00000000000 --- a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 48bc37fabbc685b1e3293055bd33ca66c619305e Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 13 Jan 2016 14:49:59 +0000 -Subject: [PATCH] libffi: enable hardfloat in the MIPS assembly code - -This way it will be possible to build it for soft-float. This is only a -temporary fix. The package needs to be fixed properly. - -Signed-off-by: Vicente Olivert Riera -[Update for 3.3-rc0] -Signed-off-by: Fabrice Fontaine ---- - src/mips/n32.S | 1 + - src/mips/o32.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/mips/n32.S b/src/mips/n32.S -index c6985d3..dc842d5 100644 ---- a/src/mips/n32.S -+++ b/src/mips/n32.S -@@ -44,6 +44,7 @@ - #endif - #if !defined(__mips_isa_rev) || (__mips_isa_rev<6) - .set mips4 - #endif -+ .set hardfloat - .text - .align 2 - .globl ffi_call_N32 -diff --git a/src/mips/o32.S b/src/mips/o32.S -index eb27981..b653daf 100644 ---- a/src/mips/o32.S -+++ b/src/mips/o32.S -@@ -42,6 +42,7 @@ - #define RA_OFF (SIZEOF_FRAME - 1 * FFI_SIZEOF_ARG) - - .abicalls -+ .set hardfloat - .text - .align 2 - .globl ffi_call_O32 --- -2.4.10 - diff --git a/package/libffi/libffi.hash b/package/libffi/libffi.hash index 8d2349ec21d..c2ef588f6be 100644 --- a/package/libffi/libffi.hash +++ b/package/libffi/libffi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 libffi-3.4.4.tar.gz +sha256 b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e libffi-3.4.6.tar.gz # License files, locally calculated -sha256 2c9c2acb9743e6b007b91350475308aee44691d96aa20eacef8e199988c8c388 LICENSE +sha256 67894089811f93fca47a76f85e017da6f8582d4ba0905963c6e0f1ad6df7a195 LICENSE diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 6249023eaed..9c47cf39734 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,19 +4,20 @@ # ################################################################################ -LIBFFI_VERSION = 3.4.4 +LIBFFI_VERSION = 3.4.6 LIBFFI_SITE = \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_CPE_ID_VALID = YES LIBFFI_INSTALL_STAGING = YES -# We're patching Makefile.am +# We're patching configure.ac LIBFFI_AUTORECONF = YES +LIBFFI_CONF_OPTS = --disable-multi-os-directory # The static exec trampolines is enabled by default since # libffi 3.4.2. However it doesn't work with gobject-introspection. -LIBFFI_CONF_OPTS = --disable-exec-static-tramp +LIBFFI_CONF_OPTS += --disable-exec-static-tramp $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 409b76aea4e3e6c4795447d1e46cc377bd2a062f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 11 Mar 2024 10:03:23 -0600 Subject: [PATCH 0222/3013] package/network-manager: bump to version 1.46.0 Drop patch which is now upstream. CONTRIBUTING.md hash changed due to details added: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5481ba156804f979cb2d585df3dc012ff3002755 Signed-off-by: James Hilliard Reviewed-By: Marcus Hoffmann Tested-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- ...-curl-timeout-callback-non-repeating.patch | 44 ------------------- package/network-manager/network-manager.hash | 6 +-- package/network-manager/network-manager.mk | 4 +- 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch diff --git a/package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch b/package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch deleted file mode 100644 index 8e25805d0c9..00000000000 --- a/package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch +++ /dev/null @@ -1,44 +0,0 @@ -From abc6e1cf258ab332bed161036a358bbe9c2d1e90 Mon Sep 17 00:00:00 2001 -From: Tatsuyuki Ishi -Date: Fri, 13 Oct 2023 16:46:09 +0000 -Subject: [PATCH] connectivity: Make curl timeout callback non-repeating. - -This reverts commit 05c31da4d9. - -In the linked commit the callback was made repeating on the assumption -that forward progress would result in the callback getting canceled in -cb_data_complete. However, this assumption does not hold since a timeout -callback does not guarantee completion (or error out) of a request. - -curl tweaked some internals in v8.4.0 and started giving 0 timeouts, and -a repeating callback is firing back-to-back without making any progress -in doing so. - -Revert the change and make the callback non-repeating again. - -Fixes: 05c31da4d9cb ('connectivity: don't cancel curl timerfunction from timeout') -Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/abc6e1cf258ab332bed161036a358bbe9c2d1e90 -Signed-off-by: Christian Hitz ---- - src/core/nm-connectivity.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c -index 92de44f17d..d8b0004c38 100644 ---- a/src/core/nm-connectivity.c -+++ b/src/core/nm-connectivity.c -@@ -406,9 +406,10 @@ _con_curl_timeout_cb(gpointer user_data) - { - NMConnectivityCheckHandle *cb_data = user_data; - -+ cb_data->concheck.curl_timer = 0; - _con_curl_check_connectivity(cb_data->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0); - _complete_queued(cb_data->self); -- return G_SOURCE_CONTINUE; -+ return G_SOURCE_REMOVE; - } - - static int --- -GitLab - diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 0196d68c553..8a3c3895fe7 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.44/NetworkManager-1.44.2.sha256sum -sha256 4b58bf3ac57e2cefb5652efd0945eb0b4bc36a63d92a61ab471d8bb2c9a420e1 NetworkManager-1.44.2.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.46/NetworkManager-1.46.0.sha256sum +sha256 722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068 NetworkManager-1.46.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 e7cf3d92bda8e5365eaf4514d572146a19e93336f7a966493778d0d0c4476fae CONTRIBUTING.md +sha256 9f7f0d40116e5a0f1566b9da71e9c95738c99364e4b5437d8115aa614490372b CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index f6ef923d55a..09bc6aed027 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.44 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 +NETWORK_MANAGER_VERSION_MAJOR = 1.46 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES From 96b3295ca1fc00973fa2754dafb80fe6db23f48f Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 28 Mar 2024 21:32:31 +0100 Subject: [PATCH 0223/3013] system: expose BR2_ROOTFS_POST_SCRIPT_ARGS for PRE_BUILD scripts Currently, we pass BR2_ROOTFS_POST_SCRIPT_ARGS to each of the scripts in BR2_ROOTFS_PRE_BUILD_SCRIPT, but the option is not exposed in menuconfig when only pre-build scripts are used. Add the pre-build scripts to the condition exposing the extra args option. Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- system/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/Config.in b/system/Config.in index 33ca69b9339..e590a8a3ff9 100644 --- a/system/Config.in +++ b/system/Config.in @@ -695,12 +695,13 @@ config BR2_ROOTFS_POST_IMAGE_SCRIPT config BR2_ROOTFS_POST_SCRIPT_ARGS string "Extra arguments passed to custom scripts" - depends on BR2_ROOTFS_POST_BUILD_SCRIPT != "" \ + depends on BR2_ROOTFS_PRE_BUILD_SCRIPT != "" \ + || BR2_ROOTFS_POST_BUILD_SCRIPT != "" \ || BR2_ROOTFS_POST_FAKEROOT_SCRIPT != "" \ || BR2_ROOTFS_POST_IMAGE_SCRIPT != "" help - Pass these additional arguments to each post-build or - post-image scripts. + Pass these additional arguments to each pre-build, post-build, + post-fakeroot and post-image scripts. Note that all the post-build and post-image scripts will be passed the same set of arguments, you can not pass different From b7cc572208f4723e16c3e7a9971fcbe4df988f53 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 28 Mar 2024 15:09:20 +0100 Subject: [PATCH 0224/3013] Add BR2_ROOTFS_{PRE_BUILD|POST_{BUILD|FAKEROOT|IMAGE}}_SCRIPT_ARGS Currently, one may only specify one list of arguments that are passed to several scripts (BR2_ROOTFS_PRE_BUILD_SCRIPT, BR2_ROOTFS_POST_BUILD_SCRIPT, BR2_ROOTFS_POST_FAKEROOT_SCRIPT and BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS). So one has to be careful that the arguments for these scripts do noti collide. To allow specifiying dedicated arguments to each type of scripts, new config options are introduced. For backward compatibility the value of BR2_ROOTFS_POST_SCRIPT_ARGS is still passed to the scripts. But now one can add specific arguments from the new config option. Signed-off-by: Heiko Thiery [yann.morin.1998@free.fr: - mention common args in help texts - slight coding style beautification - slight rewording in commit log ] Signed-off-by: Yann E. MORIN --- Makefile | 15 ++++++-- docs/manual/customize-post-image.adoc | 5 +++ docs/manual/customize-rootfs.adoc | 6 +++ fs/common.mk | 2 +- system/Config.in | 54 +++++++++++++++++++++++++-- 5 files changed, 75 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 91973cca606..d1caec63b52 100644 --- a/Makefile +++ b/Makefile @@ -584,7 +584,10 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) prepare: $(BUILD_DIR)/buildroot-config/auto.conf @$(foreach s, $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT)), \ $(call MESSAGE,"Executing pre-build script $(s)"); \ - $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(EXTRA_ENV) $(s) \ + $(TARGET_DIR) \ + $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \ + $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT_ARGS))$(sep)) .PHONY: world world: target-post-image @@ -801,7 +804,10 @@ endif # merged /usr $(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ @$(call MESSAGE,"Executing post-build script $(s)")$(sep) \ - $(Q)$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(Q)$(EXTRA_ENV) $(s) \ + $(TARGET_DIR) \ + $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \ + $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS))$(sep)) touch $(TARGET_DIR)/usr @@ -819,7 +825,10 @@ target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize $(Q)mkdir -p $(BINARIES_DIR) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ - $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(EXTRA_ENV) $(s) \ + $(BINARIES_DIR) \ + $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \ + $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS))$(sep)) .PHONY: source source: $(foreach p,$(PACKAGES),$(p)-all-source) diff --git a/docs/manual/customize-post-image.adoc b/docs/manual/customize-post-image.adoc index 5308093d06d..1f11cf915f4 100644 --- a/docs/manual/customize-post-image.adoc +++ b/docs/manual/customize-post-image.adoc @@ -26,6 +26,11 @@ arguments will be passed to the script too. All the scripts will be passed the exact same set of arguments, it is not possible to pass different sets of arguments to each script. +Note that the arguments from +BR2_ROOTFS_POST_SCRIPT_ARGS+ will also be +passed to post-build and post-fakeroot scripts. If you want to use +arguments that are only used for the post-image scripts you can use ++BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS+. + Again just like for the post-build scripts, the scripts have access to the environment variables +BR2_CONFIG+, +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+, +BUILD_DIR+, +BINARIES_DIR+, +CONFIG_DIR+ and diff --git a/docs/manual/customize-rootfs.adoc b/docs/manual/customize-rootfs.adoc index d5d8b9288fe..1384c1d2d33 100644 --- a/docs/manual/customize-rootfs.adoc +++ b/docs/manual/customize-rootfs.adoc @@ -56,6 +56,12 @@ The post-build scripts are run with the main Buildroot tree as current passed to the script too. All the scripts will be passed the exact same set of arguments, it is not possible to pass different sets of arguments to each script. + + Note that the arguments from +BR2_ROOTFS_POST_SCRIPT_ARGS+ will also be + passed to post-image and post-fakeroot scripts. If you want to use + arguments that are only used for the post-build scripts you can use + +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS+. + + In addition, you may also use these environment variables: diff --git a/fs/common.mk b/fs/common.mk index 37eafac4f7a..2f3f8bcc7e3 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -182,7 +182,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ - echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) + echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) $$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) diff --git a/system/Config.in b/system/Config.in index e590a8a3ff9..3fb17ed1c67 100644 --- a/system/Config.in +++ b/system/Config.in @@ -708,8 +708,56 @@ config BR2_ROOTFS_POST_SCRIPT_ARGS arguments to each script. Note also, as stated in their respective help text, that the - first argument to each post-build or post-image script is the - target directory / images directory. The arguments in this - option will be passed *after* those. + first argument to each script is the target directory / images + directory. The arguments in this option will be passed *after* + those. + +config BR2_ROOTFS_PRE_BUILD_SCRIPT_ARGS + string "Extra arguments passed to BR2_ROOTFS_PRE_BUILD_SCRIPT" + depends on BR2_ROOTFS_PRE_BUILD_SCRIPT != "" + help + Pass these additional arguments to the pre-build script. + + Note also, as stated in the respective help text, that the + first argument to each script is the target directory, then + the common arguments specified in BR2_ROOTFS_POST_SCRIPT_ARGS + above, and then the arguments in this option will be passed + *after* those. + +config BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS + string "Extra arguments passed to BR2_ROOTFS_POST_BUILD_SCRIPT" + depends on BR2_ROOTFS_POST_BUILD_SCRIPT != "" + help + Pass these additional arguments to the post-build script. + + Note also, as stated in the respective help text, that the + first argument to each script is the target directory, then + the common arguments specified in BR2_ROOTFS_POST_SCRIPT_ARGS + above, and then the arguments in this option will be passed + *after* those. + +config BR2_ROOTFS_POST_FAKEROOT_SCRIPT_ARGS + string "Extra arguments passed to BR2_ROOTFS_POST_FAKEROOT_SCRIPT" + depends on BR2_ROOTFS_POST_FAKEROOT_SCRIPT != "" + help + Pass these additional arguments to the post-fakeroot script. + + Note also, as stated in the respective help text, that the + first argument to each script is the target directory, then + the common arguments specified in BR2_ROOTFS_POST_SCRIPT_ARGS + above, and then the arguments in this option will be passed + *after* those. + +config BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS + string "Extra arguments passed to POST_IMAGE_SCRIPT" + depends on BR2_ROOTFS_POST_IMAGE_SCRIPT != "" + help + Pass these additional arguments to the post-image script. + + Note also, as stated in the respective help text, that the + first argument to each script is the images directory, then + the common arguments specified in BR2_ROOTFS_POST_SCRIPT_ARGS + above, and then the arguments in this option will be passed + *after* those. endmenu From 81bb14a93535da0fbf02ca715ac9ebdca3486732 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 31 Mar 2024 22:21:52 +0200 Subject: [PATCH 0225/3013] utils/check-package: don't ignore check-package Commit 32934b526b64 (utils/checkpackagelib: check for Upstream trailers) introduced a new python module to check Upstream tags in patch files. In doing so, it introduced a flake8 coding style issue. That was not caught when applying the change, and neither was it caught by our daily checks, because the .checkpackagefile was regenerated right just in the next commit, to apply ignore patterns to existing patch files. It is a bit sad that one of our checks does not itself passes all our checks... Fix that trivial issue now. Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - utils/checkpackagelib/lib_patch.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index b7d45df2a24..6f8d37feefc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1462,4 +1462,3 @@ support/scripts/setlocalversion Shellcheck support/testing/tests/core/post-build.sh Shellcheck support/testing/tests/package/test_opkg/post-build.sh Shellcheck support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch NumberedSubject Upstream -utils/checkpackagelib/lib_patch.py Flake8 diff --git a/utils/checkpackagelib/lib_patch.py b/utils/checkpackagelib/lib_patch.py index 1909d3acd06..b01d28a7e72 100644 --- a/utils/checkpackagelib/lib_patch.py +++ b/utils/checkpackagelib/lib_patch.py @@ -62,6 +62,7 @@ def after(self): "({}#_format_and_licensing_of_the_package_patches)" .format(self.filename, self.url_to_manual)] + class Upstream(_CheckFunction): UPSTREAM_ENTRY = re.compile(r"^Upstream: .*$") From 0cd8fea7cfbfb692e3b0938dce8c41d59147ccf0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 09:32:07 +0100 Subject: [PATCH 0226/3013] package/davfs2: fix build with neon 0.33 Fix the following build failure raised since bump of neon to version 0.33 in commit 00f7bd06d66b05ec694f8a3e90d56e5c4f532e6b: configure: incompatible neon library version 0.33.0: wanted 0.27 28 29 30 31 32 configure: error: could not find neon Fixes: 00f7bd06d66b05ec694f8a3e90d56e5c4f532e6b - http://autobuild.buildroot.org/results/3386c44447b09e434c60837ddd7eb08b5ef3d9a3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...2-configure.ac-add-neon-version-0.33.patch | 27 +++++++++++++++++++ package/davfs2/davfs2.mk | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 package/davfs2/0002-configure.ac-add-neon-version-0.33.patch diff --git a/package/davfs2/0002-configure.ac-add-neon-version-0.33.patch b/package/davfs2/0002-configure.ac-add-neon-version-0.33.patch new file mode 100644 index 00000000000..93eff48cd56 --- /dev/null +++ b/package/davfs2/0002-configure.ac-add-neon-version-0.33.patch @@ -0,0 +1,27 @@ +From 1c539d158ae73e867d0d30b8c3d27f48d742ed06 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 30 Mar 2024 09:18:15 +0100 +Subject: [PATCH] configure.ac: add neon version 0.33 + +Signed-off-by: Fabrice Fontaine +Upstream: https://savannah.nongnu.org/bugs/?65247 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4f86cde..ede9b1e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -36,7 +36,7 @@ AC_PROG_LN_S + # Checks for libraries. + AM_GNU_GETTEXT_VERSION(0.19.8) + AM_GNU_GETTEXT([external]) +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + DAV_CHECK_NEON + + # Checks for header files. +-- +2.43.0 + diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk index a67c5062506..9f9e4a70736 100644 --- a/package/davfs2/davfs2.mk +++ b/package/davfs2/davfs2.mk @@ -9,6 +9,8 @@ DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2 DAVFS2_LICENSE = GPL-3.0+ DAVFS2_LICENSE_FILES = COPYING DAVFS2_CPE_ID_VENDOR = werner_baumann +# 0002-configure.ac-add-neon-version-0.33.patch +DAVFS2_AUTORECONF = YES DAVFS2_DEPENDENCIES = \ neon \ From d8910b71bc81b47a074f316e3e83735184ff371c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:33:12 +0100 Subject: [PATCH 0227/3013] package/gcc: add patches to remove crypt()/crypt_r() libsanitizer interceptors In preparation for the upgrade of glibc to version 2.39, we need to backport some gcc patches. Indeed glibc 2.39 drops libcrypt, causing a build failure of libsanitizer (part of gcc) as it has code to intercept crypt() and crypt_r() calls. This has been fixed in gcc master, but we need to backport the fix for gcc 11.x, 12.x and 13.x. gcc 8.x doesn't need to be fixed because (1) its libsanitizer does not have an interceptor for crypt()/crypt_r() and (2) we only allow gcc 8.x for PowerPC SPE, for which we only support uClibc-ng, so this issue with crypt/crypt_r going away from glibc is not relevant. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- ...emove-crypt-and-crypt_r-interceptors.patch | 140 +++++++++++++++++ ...emove-crypt-and-crypt_r-interceptors.patch | 140 +++++++++++++++++ ...emove-crypt-and-crypt_r-interceptors.patch | 146 ++++++++++++++++++ 3 files changed, 426 insertions(+) create mode 100644 package/gcc/11.4.0/0008-Remove-crypt-and-crypt_r-interceptors.patch create mode 100644 package/gcc/12.3.0/0004-Remove-crypt-and-crypt_r-interceptors.patch create mode 100644 package/gcc/13.2.0/0003-Remove-crypt-and-crypt_r-interceptors.patch diff --git a/package/gcc/11.4.0/0008-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/11.4.0/0008-Remove-crypt-and-crypt_r-interceptors.patch new file mode 100644 index 00000000000..36db9681cd8 --- /dev/null +++ b/package/gcc/11.4.0/0008-Remove-crypt-and-crypt_r-interceptors.patch @@ -0,0 +1,140 @@ +From 0ef972d11dda9051941656e5797889b8fbf2dca6 Mon Sep 17 00:00:00 2001 +From: Fangrui Song +Date: Fri, 28 Apr 2023 09:59:17 -0700 +Subject: [PATCH] Remove crypt and crypt_r interceptors + +From Florian Weimer's D144073 + +> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation. +> +> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets. + +Let's remove crypt and crypt_r interceptors (D68431) to fix issues with +newer glibc. + +For older glibc, msan will not know that an uninstrumented crypt_r call +initializes `data`, so there is a risk for false positives. However, with some +codebase survey, I think crypt_r uses are very few and the call sites typically +have a `memset(&data, 0, sizeof(data));` anyway. + +Fix https://github.com/google/sanitizers/issues/1365 +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432 + +Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka + +Differential Revision: https://reviews.llvm.org/D149403 + +[Thomas: taken from Crosstool-NG] +Upstream: (llvm) https://github.com/llvm/llvm-project/commit/d7bead833631486e337e541e692d9b4a1ca14edd +Upstream: (gcc) https://github.com/gcc-mirror/gcc/commit/d96e14ceb9475f9bccbbc0325d5b11419fad9246 +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common_interceptors.inc | 37 ------------------- + .../sanitizer_platform_interceptors.h | 2 - + .../sanitizer_platform_limits_posix.cpp | 2 - + .../sanitizer_platform_limits_posix.h | 1 - + 4 files changed, 42 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +index ff2acfc7c010..6d802bc7159f 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +@@ -9814,41 +9814,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) { + #define INIT_GETRANDOM + #endif + +-#if SANITIZER_INTERCEPT_CRYPT +-INTERCEPTOR(char *, crypt, char *key, char *salt) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt)(key, salt); +- if (res != nullptr) +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- return res; +-} +-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt); +-#else +-#define INIT_CRYPT +-#endif +- +-#if SANITIZER_INTERCEPT_CRYPT_R +-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt_r)(key, salt, data); +- if (res != nullptr) { +- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data, +- __sanitizer::struct_crypt_data_sz); +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- } +- return res; +-} +-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r); +-#else +-#define INIT_CRYPT_R +-#endif +- + #if SANITIZER_INTERCEPT_GETENTROPY + INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) { + void *ctx; +@@ -10337,8 +10302,6 @@ static void InitializeCommonInterceptors() { + INIT_GETUSERSHELL; + INIT_SL_INIT; + INIT_GETRANDOM; +- INIT_CRYPT; +- INIT_CRYPT_R; + INIT_GETENTROPY; + INIT_QSORT; + INIT_QSORT_R; +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +index 18bab346ce6e..cf329b76836e 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +@@ -572,8 +572,6 @@ + #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD + #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID) + #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD) +-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID) +-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID) + + #define SANITIZER_INTERCEPT_GETRANDOM \ + ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD) +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 5743516c0460..980776fc7d78 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -142,7 +142,6 @@ typedef struct user_fpregs elf_fpregset_t; + #include + #include + #include +-#include + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + + #if SANITIZER_ANDROID +@@ -244,7 +243,6 @@ namespace __sanitizer { + unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +- unsigned struct_crypt_data_sz = sizeof(struct crypt_data); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 83861105a509..7ad11b943157 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -295,7 +295,6 @@ extern unsigned struct_msqid_ds_sz; + extern unsigned struct_mq_attr_sz; + extern unsigned struct_timex_sz; + extern unsigned struct_statvfs_sz; +-extern unsigned struct_crypt_data_sz; + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + + struct __sanitizer_iovec { +-- +2.43.0 + diff --git a/package/gcc/12.3.0/0004-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/12.3.0/0004-Remove-crypt-and-crypt_r-interceptors.patch new file mode 100644 index 00000000000..de3c27c8c7d --- /dev/null +++ b/package/gcc/12.3.0/0004-Remove-crypt-and-crypt_r-interceptors.patch @@ -0,0 +1,140 @@ +From bf61483b6a5e32cb397f97a1cd4af2a41d46ade3 Mon Sep 17 00:00:00 2001 +From: Fangrui Song +Date: Fri, 28 Apr 2023 09:59:17 -0700 +Subject: [PATCH] Remove crypt and crypt_r interceptors + +From Florian Weimer's D144073 + +> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation. +> +> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets. + +Let's remove crypt and crypt_r interceptors (D68431) to fix issues with +newer glibc. + +For older glibc, msan will not know that an uninstrumented crypt_r call +initializes `data`, so there is a risk for false positives. However, with some +codebase survey, I think crypt_r uses are very few and the call sites typically +have a `memset(&data, 0, sizeof(data));` anyway. + +Fix https://github.com/google/sanitizers/issues/1365 +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432 + +Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka + +Differential Revision: https://reviews.llvm.org/D149403 + +[Thomas: taken from Crosstool-NG] +Upstream: (llvm) https://github.com/llvm/llvm-project/commit/d7bead833631486e337e541e692d9b4a1ca14edd +Upstream: (gcc) https://github.com/gcc-mirror/gcc/commit/d96e14ceb9475f9bccbbc0325d5b11419fad9246 +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common_interceptors.inc | 37 ------------------- + .../sanitizer_platform_interceptors.h | 2 - + .../sanitizer_platform_limits_posix.cpp | 2 - + .../sanitizer_platform_limits_posix.h | 1 - + 4 files changed, 42 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +index abb38ccfa15d..61250226aa56 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +@@ -9977,41 +9977,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) { + #define INIT_GETRANDOM + #endif + +-#if SANITIZER_INTERCEPT_CRYPT +-INTERCEPTOR(char *, crypt, char *key, char *salt) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt)(key, salt); +- if (res != nullptr) +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- return res; +-} +-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt); +-#else +-#define INIT_CRYPT +-#endif +- +-#if SANITIZER_INTERCEPT_CRYPT_R +-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt_r)(key, salt, data); +- if (res != nullptr) { +- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data, +- __sanitizer::struct_crypt_data_sz); +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- } +- return res; +-} +-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r); +-#else +-#define INIT_CRYPT_R +-#endif +- + #if SANITIZER_INTERCEPT_GETENTROPY + INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) { + void *ctx; +@@ -10521,8 +10486,6 @@ static void InitializeCommonInterceptors() { + INIT_GETUSERSHELL; + INIT_SL_INIT; + INIT_GETRANDOM; +- INIT_CRYPT; +- INIT_CRYPT_R; + INIT_GETENTROPY; + INIT_QSORT; + INIT_QSORT_R; +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +index 14610f2df78d..787db66ae2b7 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +@@ -568,8 +568,6 @@ + #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD + #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID) + #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD) +-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID) +-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID) + + #define SANITIZER_INTERCEPT_GETRANDOM \ + ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD) +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index c335f33dda58..bfdccd5df078 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t; + #include + #include + #include +-#include + #endif // SANITIZER_ANDROID + + #include +@@ -254,7 +253,6 @@ namespace __sanitizer { + unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +- unsigned struct_crypt_data_sz = sizeof(struct crypt_data); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index da53b5abef27..2605bb849a78 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -298,7 +298,6 @@ extern unsigned struct_msqid_ds_sz; + extern unsigned struct_mq_attr_sz; + extern unsigned struct_timex_sz; + extern unsigned struct_statvfs_sz; +-extern unsigned struct_crypt_data_sz; + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + + struct __sanitizer_iovec { +-- +2.43.0 + diff --git a/package/gcc/13.2.0/0003-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/13.2.0/0003-Remove-crypt-and-crypt_r-interceptors.patch new file mode 100644 index 00000000000..98bfed59491 --- /dev/null +++ b/package/gcc/13.2.0/0003-Remove-crypt-and-crypt_r-interceptors.patch @@ -0,0 +1,146 @@ +From 3521d93c552a11640a959ee61d551c225981c448 Mon Sep 17 00:00:00 2001 +From: Fangrui Song +Date: Fri, 28 Apr 2023 09:59:17 -0700 +Subject: [PATCH] Remove crypt and crypt_r interceptors + +From Florian Weimer's D144073 + +> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation. +> +> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets. + +Let's remove crypt and crypt_r interceptors (D68431) to fix issues with +newer glibc. + +For older glibc, msan will not know that an uninstrumented crypt_r call +initializes `data`, so there is a risk for false positives. However, with some +codebase survey, I think crypt_r uses are very few and the call sites typically +have a `memset(&data, 0, sizeof(data));` anyway. + +Fix https://github.com/google/sanitizers/issues/1365 +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432 + +Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka + +Differential Revision: https://reviews.llvm.org/D149403 + +[Thomas: taken from Crosstool-NG] +Upstream: (llvm) https://github.com/llvm/llvm-project/commit/d7bead833631486e337e541e692d9b4a1ca14edd +Upstream: (gcc) https://github.com/gcc-mirror/gcc/commit/d96e14ceb9475f9bccbbc0325d5b11419fad9246 +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common_interceptors.inc | 37 ------------------- + .../sanitizer_platform_interceptors.h | 2 - + .../sanitizer_platform_limits_posix.cpp | 8 ---- + .../sanitizer_platform_limits_posix.h | 1 - + 4 files changed, 48 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +index ba4b80081f0..662c4199742 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +@@ -10187,41 +10187,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) { + #define INIT_GETRANDOM + #endif + +-#if SANITIZER_INTERCEPT_CRYPT +-INTERCEPTOR(char *, crypt, char *key, char *salt) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt)(key, salt); +- if (res != nullptr) +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- return res; +-} +-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt); +-#else +-#define INIT_CRYPT +-#endif +- +-#if SANITIZER_INTERCEPT_CRYPT_R +-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt_r)(key, salt, data); +- if (res != nullptr) { +- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data, +- __sanitizer::struct_crypt_data_sz); +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- } +- return res; +-} +-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r); +-#else +-#define INIT_CRYPT_R +-#endif +- + #if SANITIZER_INTERCEPT_GETENTROPY + INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) { + void *ctx; +@@ -10772,8 +10737,6 @@ static void InitializeCommonInterceptors() { + INIT_GETUSERSHELL; + INIT_SL_INIT; + INIT_GETRANDOM; +- INIT_CRYPT; +- INIT_CRYPT_R; + INIT_GETENTROPY; + INIT_QSORT; + INIT_QSORT_R; +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +index 8307b1ec28b..d50166ee6ce 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +@@ -571,8 +571,6 @@ + #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD + #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID) + #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD) +-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID) +-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID) + + #define SANITIZER_INTERCEPT_GETRANDOM \ + ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD) +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index c85cf1626a7..bcbd143d19d 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -176,10 +176,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include "sanitizer_platform_interceptors.h" + # include "sanitizer_platform_limits_posix.h" + +-#if SANITIZER_INTERCEPT_CRYPT_R +-#include +-#endif +- + namespace __sanitizer { + unsigned struct_utsname_sz = sizeof(struct utsname); + unsigned struct_stat_sz = sizeof(struct stat); +@@ -283,10 +279,6 @@ namespace __sanitizer { + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + +-#if SANITIZER_INTERCEPT_CRYPT_R +- unsigned struct_crypt_data_sz = sizeof(struct crypt_data); +-#endif +- + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_timex_sz = sizeof(struct timex); + unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 44dd3d9e22d..29ebb304a9b 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -319,7 +319,6 @@ extern unsigned struct_msqid_ds_sz; + extern unsigned struct_mq_attr_sz; + extern unsigned struct_timex_sz; + extern unsigned struct_statvfs_sz; +-extern unsigned struct_crypt_data_sz; + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + + struct __sanitizer_iovec { +-- +2.43.0 + From b5680f53d60acf8ff6010082f873438a39bd5d97 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:33:13 +0100 Subject: [PATCH 0228/3013] package/glibc: bump to 2.39 The 3 patches we had have all been merged upstream as of 2.39, so they can be dropped. The libcrypt library is gone from glibc, and therefore the --enable-crypt option is also gone. The LICENSES file has changed with the addition of a copyright notice from IBM (some files contributed by IBM have been relicensed), and the license is MIT, which is already listed in GLIBC_LICENSES, so no changes are needed on our side. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: - also update localedef - rebase localedef patches ] Signed-off-by: Yann E. MORIN --- ...d-with-mcpu-68040-or-higher-BZ-30740.patch | 57 ------------ ...shift-and-__mpn_rshift-for-non-68020.patch | 47 ---------- ...ALE_AVAILABLE-on-__mpn_lshift-and-__.patch | 93 ------------------- package/glibc/glibc.hash | 4 +- package/glibc/glibc.mk | 5 +- ...ACK-only-build-and-install-localedef.patch | 47 ++++++---- ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 12 ++- package/localedef/localedef.mk | 2 +- 8 files changed, 39 insertions(+), 228 deletions(-) delete mode 100644 package/glibc/0001-m68k-Fix-build-with-mcpu-68040-or-higher-BZ-30740.patch delete mode 100644 package/glibc/0002-m68k-fix-__mpn_lshift-and-__mpn_rshift-for-non-68020.patch delete mode 100644 package/glibc/0003-m68k-Use-M68K_SCALE_AVAILABLE-on-__mpn_lshift-and-__.patch diff --git a/package/glibc/0001-m68k-Fix-build-with-mcpu-68040-or-higher-BZ-30740.patch b/package/glibc/0001-m68k-Fix-build-with-mcpu-68040-or-higher-BZ-30740.patch deleted file mode 100644 index 61f48e5893a..00000000000 --- a/package/glibc/0001-m68k-Fix-build-with-mcpu-68040-or-higher-BZ-30740.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b85880633f69b737050c22eede858f8c13bb2248 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella -Date: Fri, 18 Aug 2023 14:59:51 -0300 -Subject: [PATCH] m68k: Fix build with -mcpu=68040 or higher (BZ 30740) - -GCC currently does not define __mc68020__ for -mcpu=68040 or higher, -which memcpy/memmove assumptions. Since this memory copy optimization -seems only intended for m68020, disable for other m680X0 variants. - -Checked on a build for m68k-linux-gnu target mc68020 and mc68040. - -Signed-off-by: Waldemar Brodkorb -Upstream: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b85880633f69b737050c22eede858f8c13bb2248 ---- - sysdeps/m68k/m680x0/m68020/wordcopy.S | 1 - - sysdeps/m68k/wordcopy.c | 21 +++++++++++++++++++++ - 2 files changed, 21 insertions(+), 1 deletion(-) - delete mode 100644 sysdeps/m68k/m680x0/m68020/wordcopy.S - create mode 100644 sysdeps/m68k/wordcopy.c - -diff --git a/sysdeps/m68k/m680x0/m68020/wordcopy.S b/sysdeps/m68k/m680x0/m68020/wordcopy.S -deleted file mode 100644 -index 4fb1a4518f..0000000000 ---- a/sysdeps/m68k/m680x0/m68020/wordcopy.S -+++ /dev/null -@@ -1 +0,0 @@ --/* Empty, not needed. */ -diff --git a/sysdeps/m68k/wordcopy.c b/sysdeps/m68k/wordcopy.c -new file mode 100644 -index 0000000000..f12d5b7803 ---- /dev/null -+++ b/sysdeps/m68k/wordcopy.c -@@ -0,0 +1,21 @@ -+/* Definitions for memory copy functions. Motorola 680X0 version -+ Copyright (C) 2023 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library. If not, see -+ . */ -+ -+#ifndef __mc68020__ -+# include -+#endif --- -2.39.2 - diff --git a/package/glibc/0002-m68k-fix-__mpn_lshift-and-__mpn_rshift-for-non-68020.patch b/package/glibc/0002-m68k-fix-__mpn_lshift-and-__mpn_rshift-for-non-68020.patch deleted file mode 100644 index 256da58d66c..00000000000 --- a/package/glibc/0002-m68k-fix-__mpn_lshift-and-__mpn_rshift-for-non-68020.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 464fd8249e8b791248cab7b0e0cd91757435fa9e Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Thu, 17 Aug 2023 17:15:34 +0200 -Subject: [PATCH] m68k: fix __mpn_lshift and __mpn_rshift for non-68020 - -From revision 03f3d275d0d6 in the gmp repository. - -Signed-off-by: Waldemar Brodkorb -Upstream: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=464fd8249e8b791248cab7b0e0cd91757435fa9e ---- - sysdeps/m68k/m680x0/lshift.S | 4 ++-- - sysdeps/m68k/m680x0/rshift.S | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/sysdeps/m68k/m680x0/lshift.S b/sysdeps/m68k/m680x0/lshift.S -index 2aee10348e..4240738959 100644 ---- a/sysdeps/m68k/m680x0/lshift.S -+++ b/sysdeps/m68k/m680x0/lshift.S -@@ -77,8 +77,8 @@ L(Lnormal:) - #else /* not mc68000 */ - movel R(s_size),R(d0) - asll #2,R(d0) -- addl R(s_size),R(s_ptr) -- addl R(s_size),R(res_ptr) -+ addl R(d0),R(s_ptr) -+ addl R(d0),R(res_ptr) - #endif - movel MEM_PREDEC(s_ptr),R(d2) - movel R(d2),R(d0) -diff --git a/sysdeps/m68k/m680x0/rshift.S b/sysdeps/m68k/m680x0/rshift.S -index d16bca9307..d56a2b4a44 100644 ---- a/sysdeps/m68k/m680x0/rshift.S -+++ b/sysdeps/m68k/m680x0/rshift.S -@@ -127,8 +127,8 @@ L(Lspecial:) - #else /* not mc68000 */ - movel R(s_size),R(d0) - asll #2,R(d0) -- addl R(s_size),R(s_ptr) -- addl R(s_size),R(res_ptr) -+ addl R(d0),R(s_ptr) -+ addl R(d0),R(res_ptr) - #endif - - clrl R(d0) /* initialize carry */ --- -2.39.2 - diff --git a/package/glibc/0003-m68k-Use-M68K_SCALE_AVAILABLE-on-__mpn_lshift-and-__.patch b/package/glibc/0003-m68k-Use-M68K_SCALE_AVAILABLE-on-__mpn_lshift-and-__.patch deleted file mode 100644 index 2ea190eb5ad..00000000000 --- a/package/glibc/0003-m68k-Use-M68K_SCALE_AVAILABLE-on-__mpn_lshift-and-__.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 87ced255bdf2681f5bf6c89d7121e59f6f342161 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella -Date: Fri, 18 Aug 2023 14:49:31 -0300 -Subject: [PATCH] m68k: Use M68K_SCALE_AVAILABLE on __mpn_lshift and - __mpn_rshift - -This patch adds a new macro, M68K_SCALE_AVAILABLE, similar to gmp -scale_available_p (mpn/m68k/m68k-defs.m4) that expand to 1 if a -scale factor can be used in addressing modes. This is used -instead of __mc68020__ for some optimization decisions. - -Checked on a build for m68k-linux-gnu target mc68020 and mc68040. - -Signed-off-by: Waldemar Brodkorb -Upstream: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=87ced255bdf2681f5bf6c89d7121e59f6f342161 ---- - sysdeps/m68k/m680x0/lshift.S | 6 +++--- - sysdeps/m68k/m680x0/rshift.S | 8 ++++---- - sysdeps/m68k/m680x0/sysdep.h | 7 +++++++ - 3 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/sysdeps/m68k/m680x0/lshift.S b/sysdeps/m68k/m680x0/lshift.S -index 4240738959..74de90380b 100644 ---- a/sysdeps/m68k/m680x0/lshift.S -+++ b/sysdeps/m68k/m680x0/lshift.S -@@ -57,9 +57,9 @@ ENTRY(__mpn_lshift) - bne L(Lnormal) - cmpl R(s_ptr),R(res_ptr) - bls L(Lspecial) /* jump if s_ptr >= res_ptr */ --#if (defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) -+#if M68K_SCALE_AVAILABLE - lea MEM_INDX1(s_ptr,s_size,l,4),R(a2) --#else /* not mc68020 */ -+#else - movel R(s_size),R(d0) - asll #2,R(d0) - lea MEM_INDX(s_ptr,d0,l),R(a2) -@@ -71,7 +71,7 @@ L(Lnormal:) - moveql #32,R(d5) - subl R(cnt),R(d5) - --#if (defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) -+#if M68K_SCALE_AVAILABLE - lea MEM_INDX1(s_ptr,s_size,l,4),R(s_ptr) - lea MEM_INDX1(res_ptr,s_size,l,4),R(res_ptr) - #else /* not mc68000 */ -diff --git a/sysdeps/m68k/m680x0/rshift.S b/sysdeps/m68k/m680x0/rshift.S -index d56a2b4a44..d398d0287e 100644 ---- a/sysdeps/m68k/m680x0/rshift.S -+++ b/sysdeps/m68k/m680x0/rshift.S -@@ -56,9 +56,9 @@ ENTRY(__mpn_rshift) - bne L(Lnormal) - cmpl R(res_ptr),R(s_ptr) - bls L(Lspecial) /* jump if res_ptr >= s_ptr */ --#if (defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) -+#if M68K_SCALE_AVAILABLE - lea MEM_INDX1(res_ptr,s_size,l,4),R(a2) --#else /* not mc68020 */ -+#else - movel R(s_size),R(d0) - asll #2,R(d0) - lea MEM_INDX(res_ptr,d0,l),R(a2) -@@ -121,10 +121,10 @@ L(Lend:) - - cfi_restore_state - L(Lspecial:) --#if (defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) -+#if M68K_SCALE_AVAILABLE - lea MEM_INDX1(s_ptr,s_size,l,4),R(s_ptr) - lea MEM_INDX1(res_ptr,s_size,l,4),R(res_ptr) --#else /* not mc68000 */ -+#else - movel R(s_size),R(d0) - asll #2,R(d0) - addl R(d0),R(s_ptr) -diff --git a/sysdeps/m68k/m680x0/sysdep.h b/sysdeps/m68k/m680x0/sysdep.h -index b31e101273..bee5b3391c 100644 ---- a/sysdeps/m68k/m680x0/sysdep.h -+++ b/sysdeps/m68k/m680x0/sysdep.h -@@ -37,3 +37,10 @@ - OP " " SRC "(" PC "), " DST - - #endif /* __ASSEMBLER__ */ -+ -+# if defined __mc68020__ || defined __mc68030__ || defined __mc68040__ \ -+ || defined __mc68060__ -+# define M68K_SCALE_AVAILABLE 1 -+# else -+# define M68K_SCALE_AVAILABLE 0 -+# endif --- -2.39.2 - diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 15ae55b9e61..94b7819a30c 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) -sha256 e38f4284d6909c6b5db7d79c6e450daeaf136a67e547290eec0b063a55eaaa42 glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0.tar.gz +sha256 2ba018b344e0e8330dcadd6130f4174f0fc2502b2e032210345e0e5a2f7ed12e glibc-2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES +sha256 bba29819a3e938fae92674d6a88533e10605e389da8b51cdcba0a94f6221c5bc LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d198d6f04cb..96a850516f5 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 +GLIBC_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -195,7 +195,6 @@ define GLIBC_CONFIGURE_CMDS --without-gd \ --with-headers=$(STAGING_DIR)/usr/include \ $(if $(BR2_aarch64)$(BR2_aarch64_be),--enable-mathvec) \ - --enable-crypt \ $(GLIBC_CONF_OPTS)) $(GLIBC_ADD_MISSING_STUB_H) endef @@ -206,7 +205,7 @@ endef # GLIBC_LIBS_LIB = \ - ld*.so.* libanl.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* \ + ld*.so.* libanl.so.* libc.so.* libdl.so.* libgcc_s.so.* \ libm.so.* libpthread.so.* libresolv.so.* librt.so.* \ libutil.so.* libnss_files.so.* libnss_dns.so.* libmvec.so.* diff --git a/package/localedef/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/0001-HACK-only-build-and-install-localedef.patch index 49bbfd227c8..a65c896eb73 100644 --- a/package/localedef/0001-HACK-only-build-and-install-localedef.patch +++ b/package/localedef/0001-HACK-only-build-and-install-localedef.patch @@ -9,6 +9,8 @@ Upstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc- Signed-off-by: Peter Seiderer [Romain: rebase on 2.38] Signed-off-by: Romain Naour +[yann.morin.1998@free.fr: rebase for 2.39] +Signed-off-by: Yann E. MORIN --- Rules | 14 ++++++++++---- locale/Makefile | 6 +++--- @@ -20,7 +22,7 @@ index 279ae490ac..1321956be6 100644 +++ b/Rules @@ -221,10 +221,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ $(binaries-all-notests)) - + ifneq "$(strip $(binaries-shared-notests))" "" -$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \ - $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ @@ -37,31 +39,36 @@ index 279ae490ac..1321956be6 100644 + $(common-objpfx)libc% $(+postinit),$^) \ + $(link-extra-libs) endif - + ifneq "$(strip $(binaries-shared-tests))" "" diff --git a/locale/Makefile b/locale/Makefile index d7036b0855..68afdddc7f 100644 --- a/locale/Makefile +++ b/locale/Makefile -@@ -33,15 +33,15 @@ categories = ctype messages monetary numeric time paper name \ - address telephone measurement identification collate - aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ - xlocale localename global-locale coll-lookup --others = localedef locale -+others = localedef - #others-static = localedef locale --install-bin = localedef locale -+install-bin = localedef - extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \ - $(locale-modules:=.o) $(lib-modules:=.o) - generated += C-translit.h - before-compile += $(objpfx)C-translit.h - --extra-libs = libBrokenLocale -+#extra-libs = libBrokenLocale +@@ -76,7 +76,6 @@ + xlocale \ + # aux + others = \ +- locale \ + localedef \ + # others + #others-static = \ +@@ -84,7 +83,6 @@ + # locale \ + # # others-static + install-bin = \ +- locale \ + localedef \ + # install-bin + extra-objs = \ +@@ -96,7 +94,6 @@ + generated += C-translit.h + before-compile += $(objpfx)C-translit.h + +-extra-libs = libBrokenLocale extra-libs-others = $(extra-libs) - + libBrokenLocale-routines = broken_cur_max --- +-- 2.41.0 diff --git a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch index 70d2b34bc1e..1aecc244056 100644 --- a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +++ b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -28,6 +28,8 @@ Signed-off-by: Matthew Weber Signed-off-by: Yann E. MORIN [Romain: rebase on 2.38] Signed-off-by: Romain Naour +[yann.morin.1998@free.fr: rebase for 2.39] +Signed-off-by: Yann E. MORIN --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -36,7 +38,7 @@ diff --git a/configure b/configure index 4ef387146d..4c6f91117d 100755 --- a/configure +++ b/configure -@@ -5293,7 +5293,7 @@ printf %s "checking version of $LD... " >&6; } +@@ -5157,7 +5157,7 @@ printf %s "checking version of $LD... " >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -44,16 +46,16 @@ index 4ef387146d..4c6f91117d 100755 + 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -@@ -5735,7 +5735,7 @@ int + +@@ -5599,7 +5599,7 @@ int main (void) { - + -#if !defined __GNUC__ || __GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2) +#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) #error insufficient compiler #endif ; --- +-- 2.41.0 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index c017c0e00e4..f304ba8021b 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 +LOCALEDEF_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From 9139159d3917d8d5f1db0c7e84562c0ba4922048 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 1 Apr 2024 13:24:21 +0200 Subject: [PATCH 0229/3013] package/zic: fix host compile (needs CC/HOST_CONFIGURE_OPTS set) zic needs CC defined since version bump to 2024a, and upstream commit c3ebd8e98846 (make Makefile more compatible with POSIX). Use HOST_CONFIGURE_OPTS which contains the appropriate host CC setting, as well as our host CFLAGS and LDFLAGS. Fixes: c99 -O1 -c -o zic.o zic.c make[2]: c99: No such file or directory Signed-off-by: Peter Seiderer [yann.morin.1998@free.fr: reword commit log, refer to upstream commit] Signed-off-by: Yann E. MORIN --- package/zic/zic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 95fa1eaa96e..8abcec93605 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -12,7 +12,7 @@ ZIC_LICENSE = Public domain ZIC_LICENSE_FILES = LICENSE define HOST_ZIC_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) zic endef define HOST_ZIC_INSTALL_CMDS From 1c178b6892a7f54e38cb4edfe63a4c52fd5e3a85 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 31 Mar 2024 00:46:13 -0700 Subject: [PATCH 0230/3013] package/docker-engine: security bump to version v26.0.0 Update to the latest major release of docker-engine. Fixes CVE-2024-29018: potential data exfiltration from 'internal' networks via authoritative DNS servers. Do not forward requests to external DNS servers for a container that is only connected to an 'internal' network. https://github.com/moby/moby/releases/tag/v26.0.0 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 931d6529e10..5c76b99af33 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 docker-engine-24.0.7.tar.gz +sha256 fae1aabb63ed5cf6d302a5f4266ed092716b1cea9a974a9d61154ef31b03c302 docker-engine-26.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 05bf23ad3de..86106d3ccb5 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 24.0.7 +DOCKER_ENGINE_VERSION = 26.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From ff8f48055fb14a64b4d815fea04b75e4674fd3d2 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 31 Mar 2024 00:46:14 -0700 Subject: [PATCH 0231/3013] package/docker-cli: bump version to v26.0.0 Update to the latest major release of docker-cli. https://github.com/moby/moby/releases/tag/v26.0.0 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 9c8d08bba51..26558814c15 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72a54d131c28938221c81bd08364459fed9c71c093d4d615d324aaf31de6db1d docker-cli-24.0.7.tar.gz +sha256 96ed5d7c33a12f505d13fa03fa48f94cb41cf871178df0df84aa0b76839ad321 docker-cli-26.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 95fce27ffb0..5f9242329a5 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 24.0.7 +DOCKER_CLI_VERSION = 26.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From ea8f0d72b305913d3349c6ab6899f653d68d1820 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Mar 2024 23:06:05 +0100 Subject: [PATCH 0232/3013] package/mbedtls: security bump to version 2.28.8 - Use official tar.bz2 tarball - Fix CVE-2024-28960 https://github.com/Mbed-TLS/mbedtls-docs/blob/main/security-advisories/mbedtls-security-advisory-2024-03.md https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 3ec151a8599..5466b0e7de4 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.7: -sha256 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a mbedtls-2.28.7.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.8: +sha256 241c68402cef653e586be3ce28d57da24598eb0df13fcdea9d99bfce58717132 mbedtls-2.28.8.tar.bz2 # Locally calculated sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index cdb4aef4f4c..9757b8b0804 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,8 +4,9 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.7 -MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) +MBEDTLS_VERSION = 2.28.8 +MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/v$(MBEDTLS_VERSION) +MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION).tar.bz2 MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From fbeec56312e1d2a5ec7c2803c0d2aa3f0e673c5f Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 28 Mar 2024 10:50:24 +0100 Subject: [PATCH 0233/3013] package/libcurl: security bump to 8.7.1 Drop patch that is included in this release. Drop autoreconf that was introduced for this patch. Fixes the following security issues: * CVE-2024-2004 * CVE-2024-2379 * CVE-2024-2398 * CVE-2024-2466 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- ...igure.ac-find-libpsl-with-pkg-config.patch | 109 ------------------ package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 4 +- 3 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch deleted file mode 100644 index 46df1e36a25..00000000000 --- a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Feb 2024 20:59:25 +0100 -Subject: [PATCH] configure.ac: find libpsl with pkg-config - -Find libpsl with pkg-config to avoid static build failures. - -Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 - -Signed-off-by: Fabrice Fontaine -Closes #12947 - -Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 ---- - configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- - docs/TODO | 7 ----- - 2 files changed, 67 insertions(+), 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cd0e2d07d8d164..09d5364f4de575 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2075,19 +2075,74 @@ dnl ********************************************************************** - dnl Check for libpsl - dnl ********************************************************************** - --AC_ARG_WITH(libpsl, -- AS_HELP_STRING([--without-libpsl], -- [disable support for libpsl]), -- with_libpsl=$withval, -- with_libpsl=yes) --curl_psl_msg="no (libpsl disabled)" --if test $with_libpsl != "no"; then -- AC_SEARCH_LIBS(psl_builtin, psl, -- [curl_psl_msg="enabled"; -- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) -- ], -- [AC_MSG_ERROR([libpsl was not found]) ] -+dnl Default to compiler & linker defaults for LIBPSL files & libraries. -+OPT_LIBPSL=off -+AC_ARG_WITH(libpsl,dnl -+AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) -+AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), -+ OPT_LIBPSL=$withval) -+ -+if test X"$OPT_LIBPSL" != Xno; then -+ dnl backup the pre-libpsl variables -+ CLEANLDFLAGS="$LDFLAGS" -+ CLEANCPPFLAGS="$CPPFLAGS" -+ CLEANLIBS="$LIBS" -+ -+ case "$OPT_LIBPSL" in -+ yes) -+ dnl --with-libpsl (without path) used -+ CURL_CHECK_PKGCONFIG(libpsl) -+ -+ if test "$PKGCONFIG" != "no" ; then -+ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` -+ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` -+ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` -+ else -+ dnl no libpsl pkg-config found -+ LIB_PSL="-lpsl" -+ fi -+ -+ ;; -+ off) -+ dnl no --with-libpsl option given, just check default places -+ LIB_PSL="-lpsl" -+ ;; -+ *) -+ dnl use the given --with-libpsl spot -+ LIB_PSL="-lpsl" -+ PREFIX_PSL=$OPT_LIBPSL -+ ;; -+ esac -+ -+ dnl if given with a prefix, we set -L and -I based on that -+ if test -n "$PREFIX_PSL"; then -+ LD_PSL=-L${PREFIX_PSL}/lib$libsuff -+ CPP_PSL=-I${PREFIX_PSL}/include -+ fi -+ -+ LDFLAGS="$LDFLAGS $LD_PSL" -+ CPPFLAGS="$CPPFLAGS $CPP_PSL" -+ LIBS="$LIB_PSL $LIBS" -+ -+ AC_CHECK_LIB(psl, psl_builtin, -+ [ -+ AC_CHECK_HEADERS(libpsl.h, -+ curl_psl_msg="enabled" -+ LIBPSL_ENABLED=1 -+ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) -+ AC_SUBST(USE_LIBPSL, [1]) -+ ) -+ ], -+ dnl not found, revert back to clean variables -+ LDFLAGS=$CLEANLDFLAGS -+ CPPFLAGS=$CLEANCPPFLAGS -+ LIBS=$CLEANLIBS - ) -+ -+ if test X"$OPT_LIBPSL" != Xoff && -+ test "$LIBPSL_ENABLED" != "1"; then -+ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) -+ fi - fi - AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 1f3dce0fd55..7fcad973c3c 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.6.0.tar.xz.asc +# https://curl.se/download/curl-8.7.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd curl-8.7.1.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 4281cfabb1d..99320c13157 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.6.0 +LIBCURL_VERSION = 8.7.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -14,8 +14,6 @@ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES -# 0001-configure.ac-find-libpsl-with-pkg-config.patch -LIBCURL_AUTORECONF = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') # support because it uses fork(), which doesn't work on non-MMU platforms. From f6453835d69f6a5bc9c2794464c3e4599f6c9fa0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Mar 2024 10:53:19 +0200 Subject: [PATCH 0234/3013] package/lxc: fix m68k build with gcc 12 Fix the following m68k build failure with gcc 12: In file included from ../src/lxc/syscall_wrappers.h:19, from ../src/lxc/mount_utils.h:15, from ../src/lxc/conf.h:24, from ../src/lxc/log.h:19, from ../src/lxc/storage/btrfs.c:20: ../src/lxc/syscall_numbers.h:423:25: error: macro names must be identifiers 423 | #define -1 | ^ Fixes: - http://autobuild.buildroot.org/results/f40a517eba86838b11b4b1d6a8a05b8233a3394d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-lxc-syscall_numbers.h-drop-define-1.patch | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch diff --git a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch new file mode 100644 index 00000000000..4a944e35b12 --- /dev/null +++ b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch @@ -0,0 +1,133 @@ +From 82fe01821cd5cb8548598d7d93b07d6ef3f6b604 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 30 Mar 2024 16:50:46 +0100 +Subject: [PATCH] src/lxc/syscall_numbers.h: drop define -1 + +Drop "#define -1" to avoid the following m68k build failure with gcc 12: + +In file included from ../src/lxc/syscall_wrappers.h:19, + from ../src/lxc/mount_utils.h:15, + from ../src/lxc/conf.h:24, + from ../src/lxc/log.h:19, + from ../src/lxc/storage/btrfs.c:20: +../src/lxc/syscall_numbers.h:423:25: error: macro names must be identifiers + 423 | #define -1 + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/f40a517eba86838b11b4b1d6a8a05b8233a3394d + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 +--- + src/lxc/syscall_numbers.h | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h +index 58840a5981..5e659d1b81 100644 +--- a/src/lxc/syscall_numbers.h ++++ b/src/lxc/syscall_numbers.h +@@ -53,7 +53,6 @@ + #elif defined __loongarch64 + #define __NR_keyctl 219 + #else +- #define -1 + #warning "__NR_keyctl not defined for your architecture" + #endif + #endif +@@ -92,7 +91,6 @@ + #elif defined __loongarch64 + #define __NR_memfd_create 279 + #else +- #define -1 + #warning "__NR_memfd_create not defined for your architecture" + #endif + #endif +@@ -129,7 +127,6 @@ + #elif defined __loongarch64 + #define __NR_pivot_root 41 + #else +- #define -1 + #warning "__NR_pivot_root not defined for your architecture" + #endif + #endif +@@ -166,7 +163,6 @@ + #elif defined __loongarch64 + #define __NR_setns 268 + #else +- #define -1 + #warning "__NR_setns not defined for your architecture" + #endif + #endif +@@ -203,7 +199,6 @@ + #elif defined __loongarch64 + #define __NR_sethostname 161 + #else +- #define -1 + #warning "__NR_sethostname not defined for your architecture" + #endif + #endif +@@ -272,7 +267,6 @@ + #elif defined __loongarch64 + #define __NR_signalfd4 74 + #else +- #define -1 + #warning "__NR_signalfd4 not defined for your architecture" + #endif + #endif +@@ -309,7 +303,6 @@ + #elif defined __loongarch64 + #define __NR_unshare 97 + #else +- #define -1 + #warning "__NR_unshare not defined for your architecture" + #endif + #endif +@@ -346,7 +339,6 @@ + #elif defined __loongarch64 + #define __NR_bpf 280 + #else +- #define -1 + #warning "__NR_bpf not defined for your architecture" + #endif + #endif +@@ -383,7 +375,6 @@ + #elif defined __loongarch64 + #define __NR_faccessat 48 + #else +- #define -1 + #warning "__NR_faccessat not defined for your architecture" + #endif + #endif +@@ -440,7 +431,6 @@ + #elif defined __loongarch64 + #define __NR_seccomp 277 + #else +- #define -1 + #warning "__NR_seccomp not defined for your architecture" + #endif + #endif +@@ -477,7 +467,6 @@ + #elif defined __loongarch64 + #define __NR_gettid 178 + #else +- #define -1 + #warning "__NR_gettid not defined for your architecture" + #endif + #endif +@@ -518,7 +507,6 @@ + #elif defined __loongarch64 + #define __NR_execveat 281 + #else +- #define -1 + #warning "__NR_execveat not defined for your architecture" + #endif + #endif +@@ -759,7 +747,6 @@ + #elif defined __loongarch64 + #define __NR_personality 92 + #else +- #define -1 + #warning "__NR_personality not defined for your architecture" + #endif + #endif From ef07e8da6fb3d294a23b7536365e293d6332c3a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Mar 2024 12:09:55 +0200 Subject: [PATCH 0235/3013] package/igt-gpu-tools: disable tests Disable tests to avoid the following build failure raised since the addition of the package in commit d8a729d1731339da141612be33c5e59bc9928748: ../tests/intel/kms_pm_backlight.c: In function '__igt_unique____real_main257': ../tests/intel/kms_pm_backlight.c:320:32: error: implicit declaration of function 'basename'; did you mean 'rename'? [-Werror=implicit-function-declaration] 320 | name = basename(full_name); | ^~~~~~~~ | rename Fixes: d8a729d1731339da141612be33c5e59bc9928748 - http://autobuild.buildroot.org/results/ff5de58ca9408f3a4fc6b6d5bd8c62093c1021ad Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/igt-gpu-tools/igt-gpu-tools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/igt-gpu-tools/igt-gpu-tools.mk b/package/igt-gpu-tools/igt-gpu-tools.mk index 927a1225a5e..d4997c9c28b 100644 --- a/package/igt-gpu-tools/igt-gpu-tools.mk +++ b/package/igt-gpu-tools/igt-gpu-tools.mk @@ -23,6 +23,8 @@ IGT_GPU_TOOLS_DEPENDENCIES = \ udev \ zlib +IGT_GPU_TOOLS_CONF_OPTS = -Dtests=disabled + # On x86 systems, libigt resolves igt_half_to_float and igt_float_to_half as # indirect functions at runtime by checking CPU features with igt_x86_features. # The igt_x86_features function is implemented is a different object and the From 51fd4b4109852cf547d41ea85ec2e93eb6330a1d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Mar 2024 18:43:54 +0200 Subject: [PATCH 0236/3013] package/giflib: fix host build without convert Do not build docs for host-giflib to avoid the following build failure without convert on host raised since bump to version 5.2.2 in commit f98239dada59270efe19de9d9fae50ec9ab9d28c and https://sourceforge.net/p/giflib/code/ci/d565f6fa04be8973425bd7cd3f169908ac9e95c2: convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif make[2]: convert: No such file or directory Fixes: f98239dada59270efe19de9d9fae50ec9ab9d28c - http://autobuild.buildroot.org/results/04dd54f5060881cb8aa030de34edb4ceea863fa6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/giflib/giflib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 770338507bc..f37ec8af214 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -27,7 +27,7 @@ define GIFLIB_BUILD_CMDS endef define HOST_GIFLIB_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) shared-lib endef define GIFLIB_INSTALL_STAGING_CMDS @@ -42,7 +42,7 @@ endef define HOST_GIFLIB_INSTALL_CMDS $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ - PREFIX=/usr install + PREFIX=/usr install-include install-shared-lib endef $(eval $(generic-package)) From 2fa0f383b6d3edd1d3963b2fe4bee2bb2ef11ad8 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 30 Mar 2024 23:59:31 -0700 Subject: [PATCH 0237/3013] package/containerd: bump version to v1.7.14 Updates containerd to v1.7.14. Highlights Fix various timing issues with docker pusher Register imagePullThroughput and count with MiB Move high volume event logs to Trace level Container Runtime Interface (CRI) Handle pod transition states gracefully while listing pod stats Runtime Update runc-shim to process exec exits before init https://github.com/containerd/containerd/releases/tag/1.7.14 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 25dc7ff55d2..193003e5a34 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf containerd-1.7.13.tar.gz +sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 containerd-1.7.14.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 9bf51c93ae4..81875f763c0 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.13 +CONTAINERD_VERSION = 1.7.14 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From 300917542d97062a94354080fe6135155c46f256 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 31 Mar 2024 01:03:02 -0700 Subject: [PATCH 0238/3013] package/delve: bump version to v1.22.1 https://github.com/go-delve/delve/releases/tag/v1.22.1 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 105249f7f9e..3b0798e77c7 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58ad7a7fb42ae2ddd33e7d52dad688b249ca8a358eb73b9e48f91eda79e862a8 delve-1.20.2.tar.gz +sha256 fe6f0d97c233d4f0f1ed422c11508cc57c14e9e0915f9a258f1912c46824cbfb delve-1.22.1.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index f261d240b22..408286e3b47 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.20.2 +DELVE_VERSION = 1.22.1 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE From 6748b4d35f37d2466c6b571b813f542d291c08ef Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 31 Mar 2024 01:08:29 -0700 Subject: [PATCH 0239/3013] package/fuse-overlayfs: bump version to v1.13 Updated hash for COPYING. The license changed to GPL-2.0+ in v1.12 https://github.com/containers/fuse-overlayfs/releases/tag/v1.13 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/fuse-overlayfs/fuse-overlayfs.hash | 4 ++-- package/fuse-overlayfs/fuse-overlayfs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fuse-overlayfs/fuse-overlayfs.hash b/package/fuse-overlayfs/fuse-overlayfs.hash index b8df6c88a59..f1a326c82e0 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.hash +++ b/package/fuse-overlayfs/fuse-overlayfs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 320a411425414679736dcb7f3b05146430ca4af20ded0096c69ac3c7540ebca2 fuse-overlayfs-1.11.tar.gz +sha256 96d10344921d5796bcba7a38580ae14a53c4e60399bb90b238ac5a10b3bb65b2 fuse-overlayfs-1.13.tar.gz # Locally computed -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/fuse-overlayfs/fuse-overlayfs.mk b/package/fuse-overlayfs/fuse-overlayfs.mk index 4db2ccd7d54..2aa208d554d 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.mk +++ b/package/fuse-overlayfs/fuse-overlayfs.mk @@ -4,9 +4,9 @@ # ################################################################################ -FUSE_OVERLAYFS_VERSION = 1.11 +FUSE_OVERLAYFS_VERSION = 1.13 FUSE_OVERLAYFS_SITE = $(call github,containers,fuse-overlayfs,v$(FUSE_OVERLAYFS_VERSION)) -FUSE_OVERLAYFS_LICENSE = GPL-3.0 +FUSE_OVERLAYFS_LICENSE = GPL-2.0+ FUSE_OVERLAYFS_LICENSE_FILES = COPYING FUSE_OVERLAYFS_AUTORECONF = YES From dc101babfd5fd36062b8c7551e41cace84192a70 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 31 Mar 2024 22:14:23 +0200 Subject: [PATCH 0240/3013] support/testing: add ed runtime test Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + support/testing/tests/package/test_ed.py | 98 ++++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 support/testing/tests/package/test_ed.py diff --git a/DEVELOPERS b/DEVELOPERS index 313fc16b9d7..288a3ce0e68 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1780,6 +1780,7 @@ F: support/testing/tests/package/test_cryptsetup/ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py +F: support/testing/tests/package/test_ed.py F: support/testing/tests/package/test_file.py F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py diff --git a/support/testing/tests/package/test_ed.py b/support/testing/tests/package/test_ed.py new file mode 100644 index 00000000000..eee5f8c4fc6 --- /dev/null +++ b/support/testing/tests/package/test_ed.py @@ -0,0 +1,98 @@ +import os + +import infra.basetest + + +class TestEd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ED=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def run_ed_cmds(self, ed_cmds): + cmd = "ed < Date: Sun, 31 Mar 2024 22:23:26 +0200 Subject: [PATCH 0241/3013] package/ed: bump to version 1.20 See release announce: https://lists.gnu.org/archive/html/bug-ed/2024-01/msg00000.html Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/ed/ed.hash | 4 ++-- package/ed/ed.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ed/ed.hash b/package/ed/ed.hash index 007f645f513..5deb5e74efc 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2023-01/msg00000.html -sha256 ce2f2e5c424790aa96d09dacb93d9bbfdc0b7eb6249c9cb7538452e8ec77cd48 ed-1.19.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2024-01/msg00000.html +sha256 c6030defe6ae172f1687906d7354054c75a6a9130af319d4e73c50a91959c5a6 ed-1.20.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index a90d1f005e9..edfadf02a64 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,7 +4,7 @@ # ################################################################################ -ED_VERSION = 1.19 +ED_VERSION = 1.20 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-2.0+ From d69e13b0e965961019b4aab38e187267af3cab78 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Mar 2024 10:49:24 +0200 Subject: [PATCH 0242/3013] package/dav1d: fix riscv32 build Fix the following riscv32 build failure raised since bump to version 1.4.1 in commit d8c440936d51b7f76472b43002780f5490b7a3bf and https://github.com/videolan/dav1d/commit/43ee02a99cce1f221bdb574c9ee484180d71013f: /home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv32-buildroot-linux-gnu/13.2.0/../../../../riscv32-buildroot-linux-gnu/bin/ld: src/libdav1d_bitdepth_8.a.p/itx_tmpl.c.o: in function `.L0 ': itx_tmpl.c:(.text.unlikely+0x76c): undefined reference to `dav1d_inv_txfm_add_dct_dct_4x4_8bpc_rvv' Fixes: d8c440936d51b7f76472b43002780f5490b7a3bf - http://autobuild.buildroot.org/results/28192c494c7a2f88cc90205b6a08afd11782df40 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dav1d/dav1d.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 74c68d16603..18cb81868aa 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -24,6 +24,11 @@ ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y) DAV1D_CONF_OPTS += -Denable_asm=false endif +# riscv assembly requires riscv64 +ifeq ($(BR2_riscv):$(BR2_RISCV_64),y:) +DAV1D_CONF_OPTS += -Denable_asm=false +endif + # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) DAV1D_LDFLAGS += $(TARGET_LDFLAGS) -latomic From ebbcf5a0a752519efffeba432f347b49950b1f16 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:25 +0100 Subject: [PATCH 0243/3013] support/scripts/mkusers: fix UID/GID confusion Commit 41ea61d59c3e (support/scripts/mkusers: allow option for system uid/gid) confused GID and UID variables: the GID limits were used to create UIDs. Fix that. Note that this fixes a shellcheck error; although there are many more shellcheck errors, these fixes are semantically a bug that need to be fixed separately from the coding style issues reported by shellcheck. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/mkusers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 4fc06f8fdf8..d786943cf8e 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -324,9 +324,9 @@ add_one_user() { # Generate a new UID if needed if [ ${uid} -eq ${AUTO_USER_ID} ]; then - uid="$( generate_uid "${username}" $FIRST_USER_GID $LAST_USER_GID )" + uid="$( generate_uid "${username}" $FIRST_USER_UID $LAST_USER_UID )" elif [ ${uid} -eq ${AUTO_SYSTEM_ID} ]; then - uid="$( generate_uid "${username}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" fi # Remove any previous instance of this user From 01b3053ceccad2486e25a17af6dfc5039b7eea3e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:26 +0100 Subject: [PATCH 0244/3013] support/scripts/mkusers: fix shellcheck errors the user tables do not use trailing backslash \ to continue lines, so we don't want them to be interpreted thusly, so we use 'read -r' (SC2162). Integer variables need not be quoted (SC2086). In any case, should there be an actual issue and they be set empty, that would cause a runtime issue, wether they be quoted or not. The binary -o and -a ar perfectly defined in bash's test (SC2166). Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - support/scripts/mkusers | 27 +++++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 6f8d37feefc..89814f4e9b0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1457,7 +1457,6 @@ support/scripts/expunge-gconv-modules Shellcheck support/scripts/fix-configure-powerpc64.sh EmptyLastLine support/scripts/generate-gitlab-ci-yml Shellcheck support/scripts/mkmakefile ConsecutiveEmptyLines Shellcheck -support/scripts/mkusers Shellcheck support/scripts/setlocalversion Shellcheck support/testing/tests/core/post-build.sh Shellcheck support/testing/tests/package/test_opkg/post-build.sh Shellcheck diff --git a/support/scripts/mkusers b/support/scripts/mkusers index d786943cf8e..ee09bbd1f27 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -26,6 +26,7 @@ error() { shift printf "%s: " "${myname}" >&2 + # shellcheck disable=SC2059 # fmt is the format passed to error() printf "${fmt}" "${@}" >&2 } fail() { @@ -145,6 +146,8 @@ check_user_validity() { fail "invalid username '%s\n'" "${username}" fi + # shellcheck disable=SC2086 # gid is a non-empty int + # shellcheck disable=SC2166 # [ .. -o .. ] works well in this case if [ ${gid} -lt -2 -o ${gid} -eq 0 ]; then fail "invalid gid '%d' for '%s'\n" ${gid} "${username}" elif [ ${gid} -ge 0 ]; then @@ -171,6 +174,8 @@ check_user_validity() { fi fi + # shellcheck disable=SC2086 # uid is a non-empty int + # shellcheck disable=SC2166 # [ .. -o .. ] works well in this case if [ ${uid} -lt -2 -o ${uid} -eq 0 ]; then fail "invalid uid '%d' for '%s'\n" ${uid} "${username}" elif [ ${uid} -ge 0 ]; then @@ -190,6 +195,7 @@ check_user_validity() { fi # check the user does not already exist in another group + # shellcheck disable=SC2166 # [ .. -a .. ] works well in this case if [ -n "${_ugroup}" -a "${_ugroup}" != "${group}" ]; then fail "user '%s' already exists with group '%s' (wants '%s')\n" \ "${username}" "${_ugroup}" "${group}" @@ -218,6 +224,7 @@ generate_gid() { break fi done + # shellcheck disable=SC2086 # gid and maxgid are non-empty ints if [ ${gid} -gt ${maxgid} ]; then fail "can not allocate a GID for group '%s'\n" "${group}" fi @@ -233,6 +240,7 @@ add_one_group() { local members # Generate a new GID if needed + # shellcheck disable=SC2086 # gid is a non-empty int if [ ${gid} -eq ${AUTO_USER_ID} ]; then gid="$( generate_gid "${group}" $FIRST_USER_GID $LAST_USER_GID )" elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then @@ -272,6 +280,7 @@ generate_uid() { break fi done + # shellcheck disable=SC2086 # uid is a non-empty int if [ ${uid} -gt ${maxuid} ]; then fail "can not allocate a UID for user '%s'\n" "${username}" fi @@ -323,6 +332,7 @@ add_one_user() { check_user_validity "${username}" "${uid}" "${group}" "${gid}" # Generate a new UID if needed + # shellcheck disable=SC2086 # uid is a non-empty int if [ ${uid} -eq ${AUTO_USER_ID} ]; then uid="$( generate_uid "${username}" $FIRST_USER_UID $LAST_USER_UID )" elif [ ${uid} -eq ${AUTO_SYSTEM_ID} ]; then @@ -399,7 +409,7 @@ main() { fi # Read in all the file in memory, exclude empty lines and comments - while read line; do + while read -r line; do ENTRIES+=( "${line}" ) done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) @@ -410,14 +420,16 @@ main() { # First, create all the main groups which gid is *not* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" + # shellcheck disable=SC2086 # gid is a non-empty int [ ${gid} -ge 0 ] || continue # Automatic gid add_one_group "${group}" "${gid}" done # Then, create all the main groups which gid *is* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" + # shellcheck disable=SC2086 # gid is a non-empty int [ ${gid} -lt 0 ] || continue # Non-automatic gid add_one_group "${group}" "${gid}" done @@ -428,8 +440,9 @@ main() { # system gid if the uid is a system user (<= LAST_SYSTEM_UID), # otherwise a user gid. for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then + # shellcheck disable=SC2086 # uid is a non-empty int if [ ${uid} -le 0 ]; then auto_id=${uid} elif [ ${uid} -le ${LAST_SYSTEM_UID} ]; then @@ -450,8 +463,9 @@ main() { # Now, add users whose uid is *not* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation + # shellcheck disable=SC2086 # uid is a non-empty int [ ${uid} -ge 0 ] || continue # Automatic uid add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ "${home}" "${shell}" "${groups}" "${comment}" @@ -459,8 +473,9 @@ main() { # Finally, add users whose uid *is* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation + # shellcheck disable=SC2086 # uid is a non-empty int [ ${uid} -lt 0 ] || continue # Non-automatic uid add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ "${home}" "${shell}" "${groups}" "${comment}" From 9cb421c16f9aa026eabe050d94664c137f93eff5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:28 +0100 Subject: [PATCH 0245/3013] support/download/check-hash: fix shellcheck errors The hash files do not use trailing backslash \ to continue lines, so we don't want them to be interpreted thusly, so we use 'read -r' (SC2162). The h_file is used twice in the same loop, once for reading from it, and once just to print it, so there is no conflict (SC2094). Integrer variables need not be quoted (SC2086). In any case, should there be an actual issue and they be set empty, that would cause a runtime issue, wether they be quoted or not. Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - support/download/check-hash | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 89814f4e9b0..6f4bf676299 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1434,7 +1434,6 @@ support/dependencies/check-host-xzcat.sh Shellcheck support/dependencies/dependencies.sh Shellcheck support/download/bzr ConsecutiveEmptyLines Shellcheck support/download/cargo-post-process Shellcheck -support/download/check-hash Shellcheck support/download/cvs Shellcheck support/download/dl-wrapper Shellcheck support/download/file Shellcheck diff --git a/support/download/check-hash b/support/download/check-hash index 03a65571877..9db647885a6 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -57,7 +57,7 @@ check_one_hash() { esac # Do the hashes match? - _hash=$( ${_h}sum "${_file}" |cut -d ' ' -f 1 ) + _hash="$( "${_h}sum" "${_file}" |cut -d ' ' -f 1 )" if [ "${_hash}" = "${_known}" ]; then printf "%s: OK (%s: %s)\n" "${base}" "${_h}" "${_hash}" return 0 @@ -78,7 +78,8 @@ nb_checks=0 for h_file in "${h_files[@]}"; do [ -f "${h_file}" ] || continue : $((nb_h_files++)) - while read t h f; do + # shellcheck disable=SC2094 # we're really reading it only once + while read -r t h f; do case "${t}" in ''|'#'*) # Skip comments and empty lines @@ -86,6 +87,7 @@ for h_file in "${h_files[@]}"; do ;; *) if [ "${f}" = "${base}" ]; then + # shellcheck disable=SC2094 # we're only printing the h_file filename check_one_hash "${t}" "${h}" "${file}" "${h_file}" : $((nb_checks++)) fi @@ -94,11 +96,13 @@ for h_file in "${h_files[@]}"; do done <"${h_file}" done +# shellcheck disable=SC2086 # nb_h_files is a non-empty int if [ ${nb_h_files} -eq 0 ]; then printf "WARNING: no hash file for %s\n" "${base}" >&2 exit 0 fi +# shellcheck disable=SC2086 # nb_checks is a non-empty int if [ ${nb_checks} -eq 0 ]; then case " ${BR_NO_CHECK_HASH_FOR} " in *" ${base} "*) From ccb4e5db5cbfe91dfd00e173ef481de313c828b8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 31 Mar 2024 19:26:06 +0200 Subject: [PATCH 0246/3013] utils/check-package: emit library name along with check function name Currently, when we generate .checkpackageignore, we store, for each error, only the name of the function that generated that error. Although we currently do not have two check libs that have same-name check functions, there is nothing that would prevent that, and there is no reason why two unrelated libs could not implement checks with the same name. If such a situation were to arise, we'd have no way, when parsing the ignore list (in-tree: .checkpackageignore), to know which of the libs the exclusion would apply to. Fix that by storing both the library and function names together. The leading "checkpackagelib." (with the trailing dot, 16 chars) is removed for brevity, because it's present in all libs' names. As a consequence, regenerate .checkpackageignore. Note: people using that script to validate their br2-external trees will also have to regenerate their own exclusion list if they have one. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski Reviewed-by: Arnout Vandecappelle --- .checkpackageignore | 2682 +++++++++++++++++++++---------------------- utils/check-package | 2 +- 2 files changed, 1342 insertions(+), 1342 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 6f4bf676299..449e94fd390 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1,61 +1,61 @@ board/aarch64-efi/post-image.sh Shellcheck board/amarula/vyasa/post-build.sh Shellcheck -board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch Upstream -board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch Upstream +board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch lib_patch.Upstream +board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch lib_patch.Upstream board/andes/ae350/post-build.sh Shellcheck board/arcturus/aarch64-ucls1012a/post-build.sh Shellcheck board/arcturus/aarch64-ucls1012a/post-image.sh Shellcheck board/aspeed/common/post-image.sh Shellcheck board/asus/tinker/post-build.sh Shellcheck board/atmel/flasher.sh Shellcheck -board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch Upstream +board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch lib_patch.Upstream board/beaglebone/post-build.sh Shellcheck -board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch Upstream +board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch lib_patch.Upstream board/beagleboneai/post-build.sh Shellcheck board/beaglev/post-build.sh Shellcheck board/beelink/gs1/post-build.sh Shellcheck board/boundarydevices/common/post-build.sh Shellcheck board/boundarydevices/common/post-image.sh Shellcheck board/broadcom/northstar/post-image.sh Shellcheck -board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh EmptyLastLine Shellcheck +board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh Shellcheck lib_shellscript.EmptyLastLine board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh Shellcheck board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh Shellcheck -board/bsh/imx8mn-bsh-smm-s2/flash.sh EmptyLastLine Shellcheck +board/bsh/imx8mn-bsh-smm-s2/flash.sh Shellcheck lib_shellscript.EmptyLastLine board/bsh/imx8mn-bsh-smm-s2/post-build.sh Shellcheck board/canaan/k210-soc/post-build.sh Shellcheck board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck board/chromebook/elm/sign.sh Shellcheck board/chromebook/mksd.sh Shellcheck -board/chromebook/snow/linux-4.15-dts-tpm.patch ApplyOrder Upstream +board/chromebook/snow/linux-4.15-dts-tpm.patch lib_patch.ApplyOrder lib_patch.Upstream board/chromebook/snow/sign.sh Shellcheck -board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch Upstream +board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch lib_patch.Upstream board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck -board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream +board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch lib_patch.Upstream board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck board/hardkernel/odroidc2/post-image.sh Shellcheck -board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables -board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck -board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch Upstream +board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck lib_sysv.Variables +board/hardkernel/odroidxu4/post-image.sh Shellcheck lib_shellscript.EmptyLastLine +board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch lib_patch.Upstream board/intel/galileo/post-build.sh Shellcheck -board/intel/galileo/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables +board/intel/galileo/rootfs_overlay/etc/init.d/S09modload Shellcheck lib_sysv.Variables board/kontron/bl-imx8mm/post-build.sh Shellcheck -board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch NumberedSubject Upstream +board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch lib_patch.NumberedSubject lib_patch.Upstream board/kontron/pitx-imx8m/post-build.sh Shellcheck board/kontron/smarc-sal28/post-build.sh Shellcheck board/lego/ev3/post-image.sh Shellcheck -board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch Upstream +board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch lib_patch.Upstream board/lemaker/bananapro/post-build.sh Shellcheck board/lemaker/bananapro/post-image.sh Shellcheck -board/mender/x86_64/post-image-efi.sh ConsecutiveEmptyLines +board/mender/x86_64/post-image-efi.sh lib_shellscript.ConsecutiveEmptyLines board/minnowboard/post-build.sh Shellcheck board/nexbox/a95x/post-build.sh Shellcheck board/nexbox/a95x/post-image.sh Shellcheck -board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch NumberedSubject Upstream -board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch NumberedSubject Upstream -board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch NumberedSubject Upstream -board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch NumberedSubject Upstream +board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch lib_patch.NumberedSubject lib_patch.Upstream +board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch lib_patch.NumberedSubject lib_patch.Upstream +board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch lib_patch.NumberedSubject lib_patch.Upstream +board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch lib_patch.NumberedSubject lib_patch.Upstream board/olimex/a13_olinuxino/post-build.sh Shellcheck board/olimex/a20_olinuxino/post-build.sh Shellcheck board/olimex/a33_olinuxino/post-build.sh Shellcheck @@ -63,11 +63,11 @@ board/olpc/post-build.sh Shellcheck board/orangepi/common/post-build.sh Shellcheck board/orangepi/orangepi-lite2/post-build.sh Shellcheck board/orangepi/orangepi-one-plus/post-build.sh Shellcheck -board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch Upstream -board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch Upstream -board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch Upstream -board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch Upstream -board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch Upstream +board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch lib_patch.Upstream +board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch lib_patch.Upstream +board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch lib_patch.Upstream +board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch lib_patch.Upstream +board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch lib_patch.Upstream board/pine64/rock64/post-build.sh Shellcheck board/pine64/rockpro64/post-build.sh Shellcheck board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck @@ -76,10 +76,10 @@ board/qemu/x86_64/post-build.sh Shellcheck board/radxa/rockpi-n8/post-build.sh Shellcheck board/raspberrypi/post-build.sh Shellcheck board/raspberrypi/post-image.sh Shellcheck -board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch Upstream +board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch lib_patch.Upstream board/roseapplepi/post-build.sh Shellcheck -board/seeed/stm32mp157c-odyssey/patches/linux/0001-ARM-dts-stm32-fix-stm32mp157c-odyssey-card-detect.patch Upstream -board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch Upstream +board/seeed/stm32mp157c-odyssey/patches/linux/0001-ARM-dts-stm32-fix-stm32mp157c-odyssey-card-detect.patch lib_patch.Upstream +board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch lib_patch.Upstream board/sifive/hifive-unleashed/post-build.sh Shellcheck board/solidrun/clearfog/post-build.sh Shellcheck board/solidrun/macchiatobin/post-build-mainline.sh Shellcheck @@ -94,1335 +94,1335 @@ board/synopsys/axs10x/post-build.sh Shellcheck board/technologic/ts4900/post-image.sh Shellcheck board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck -board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch Upstream -boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Upstream -boot/at91bootstrap/0001-eabi-fix.patch Upstream -boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch Upstream -boot/at91bootstrap/0003-u-boot-relocation-fix.patch Upstream -boot/at91dataflashboot/0001-do-not-install.patch Upstream -boot/at91dataflashboot/0002-eabi-fixes.patch Upstream -boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch Upstream -boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch Upstream -boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch Upstream -boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch Upstream -boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch Upstream -boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch Upstream -boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch Upstream -boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch Upstream -boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch Upstream -boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch Upstream -boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch Upstream -boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream -boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch Upstream -boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch Upstream -boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch Upstream -linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch Upstream -package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream -package/4th/0001-avoid-regen-during-install.patch Upstream -package/acl/0001-Build-with-old-GCC-versions.patch Upstream -package/acpid/0001-dont-use-isfdtype.patch Upstream -package/alchemy/0001-toolchains-remove-hash-style-management.patch Upstream -package/alsamixergui/0001-misc-fixes.patch Sob Upstream -package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch Upstream -package/am335x-pru-package/0001-install-does-not-build.patch Upstream -package/am33x-cm3/0001-fix-makefile.patch Upstream -package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch Upstream -package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch Upstream -package/am33x-cm3/0004-Makefile-add-fno-builtin.patch Upstream -package/am33x-cm3/S93-am335x-pm-firmware-load Variables -package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch Upstream -package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch Upstream -package/android-tools/0003-Fix-build-issue-with-uclibc.patch Upstream -package/android-tools/0004-Fix-build-issue-with-musl.patch Upstream -package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch Upstream -package/android-tools/0006-fix-big-endian-build.patch Upstream -package/android-tools/0007-include-cdefs-h-when-needed.patch Upstream -package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob Upstream -package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch Upstream -package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch Upstream -package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch Upstream -package/apache/0001-cross-compile.patch Upstream -package/apache/0002-nios2_is_not_os2.patch Upstream -package/apache/S50apache Indent Shellcheck Variables -package/apitrace/0001-thirdparty-libbacktrace-backtrace-h-include-config.h.patch Upstream -package/apitrace/0002-gltrace-Avoid-__libc_dlsym-and-__libc_dlopen_mode-on-GLIBC-2-34.patch Upstream -package/apr-util/0001-remove-checkapr.patch Upstream -package/apr/0001-sys-param-h.patch Upstream -package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch Upstream -package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch Upstream -package/arptables/0001-Fix-musl-build-issue.patch Upstream -package/arptables/0002-libarptc-libarptc_incl.c-fix-build-with-O0.patch Upstream -package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch Upstream -package/asterisk/0002-configure-fix-detection-of-libcrypt.patch Upstream -package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch Upstream -package/asterisk/0004-install-samples-need-the-data-files.patch Upstream -package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch Upstream -package/at/S99at Indent Variables -package/attr/0001-build-with-older-GCCs.patch Upstream -package/audit/S02auditd Shellcheck Variables -package/aufs-util/0001-remove-user-settings.patch Upstream -package/aufs-util/0002-no-check-ver.patch Upstream -package/aufs-util/0003-no-strip-lib.patch Upstream -package/aumix/0001-fix-incorrect-makefile-am.patch Upstream -package/autoconf/0001-dont-add-dirty-to-version.patch Upstream -package/automake/0001-noman.patch Upstream -package/avahi/0001-Fix-NULL-pointer-crashes-from-175.patch Upstream -package/avahi/S05avahi-setup.sh Indent Variables -package/avahi/S50avahi-daemon Indent Variables -package/babeld/S50babeld Indent Shellcheck Variables -package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch Upstream -package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch Upstream -package/bash/0001-input.h-add-missing-include-on-stdio.h.patch Upstream -package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch Upstream -package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch Upstream -package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch Upstream -package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch Upstream -package/bc/0003-dc-fix-exit-code-of-q-command.patch Upstream -package/bc/0004-no-gen-libmath.patch Upstream -package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch Upstream -package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch Upstream -package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch Upstream -package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch Upstream -package/bearssl/0001-Fix-missing-objdir-dependency.patch Upstream -package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch Upstream -package/beecrypt/0002-build-system.patch Upstream -package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch Upstream -package/benejson/0001-c-std.patch Upstream -package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch Upstream -package/berkeleydb/0001-cwd-db_config.patch Upstream -package/berkeleydb/0002-atomic_compare_exchange.patch Upstream -package/bind/0001-cross.patch Upstream -package/bind/S81named Indent Shellcheck Variables -package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch Upstream -package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstream -package/bmx7/0002-Fix-linking-error.patch Upstream -package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch Upstream -package/boinc/S99boinc-client Indent Shellcheck Variables -package/brickd/S70brickd Indent Shellcheck Variables -package/bridge-utils/0001-fix-build-on-musl.patch Upstream -package/brltty/0001-Fix-linking-error-on-mips64el.patch Upstream -package/brltty/S10brltty Indent Shellcheck Variables -package/bsdiff/0001-Add-missing-header-for-u_char.patch Upstream -package/bustle/0001-Makefile-fix-pcap-config-call.patch Upstream -package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch Upstream -package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch Upstream -package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch Upstream -package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch Upstream -package/busybox/S02sysctl Variables -package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck -package/busybox/S15watchdog Indent Variables -package/busybox/S50telnet Indent Shellcheck Variables +board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch lib_patch.Upstream +boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch lib_patch.Upstream +boot/at91bootstrap/0001-eabi-fix.patch lib_patch.Upstream +boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch lib_patch.Upstream +boot/at91bootstrap/0003-u-boot-relocation-fix.patch lib_patch.Upstream +boot/at91dataflashboot/0001-do-not-install.patch lib_patch.Upstream +boot/at91dataflashboot/0002-eabi-fixes.patch lib_patch.Upstream +boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch lib_patch.Upstream +boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch lib_patch.Upstream +boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch lib_patch.Upstream +boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch lib_patch.Upstream +boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch lib_patch.Upstream +boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch lib_patch.Upstream +boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch lib_patch.Upstream +boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch lib_patch.Upstream +boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch lib_patch.Upstream +boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch lib_patch.Upstream +boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch lib_patch.Upstream +boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch lib_patch.Upstream +boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch lib_patch.Upstream +boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch lib_patch.Upstream +boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch lib_patch.Upstream +linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch lib_patch.Upstream +package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/4th/0001-avoid-regen-during-install.patch lib_patch.Upstream +package/acl/0001-Build-with-old-GCC-versions.patch lib_patch.Upstream +package/acpid/0001-dont-use-isfdtype.patch lib_patch.Upstream +package/alchemy/0001-toolchains-remove-hash-style-management.patch lib_patch.Upstream +package/alsamixergui/0001-misc-fixes.patch lib_patch.Sob lib_patch.Upstream +package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch lib_patch.Upstream +package/am335x-pru-package/0001-install-does-not-build.patch lib_patch.Upstream +package/am33x-cm3/0001-fix-makefile.patch lib_patch.Upstream +package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch lib_patch.Upstream +package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch lib_patch.Upstream +package/am33x-cm3/0004-Makefile-add-fno-builtin.patch lib_patch.Upstream +package/am33x-cm3/S93-am335x-pm-firmware-load lib_sysv.Variables +package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch lib_patch.Upstream +package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch lib_patch.Upstream +package/android-tools/0003-Fix-build-issue-with-uclibc.patch lib_patch.Upstream +package/android-tools/0004-Fix-build-issue-with-musl.patch lib_patch.Upstream +package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch lib_patch.Upstream +package/android-tools/0006-fix-big-endian-build.patch lib_patch.Upstream +package/android-tools/0007-include-cdefs-h-when-needed.patch lib_patch.Upstream +package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch lib_patch.Sob lib_patch.Upstream +package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch lib_patch.Upstream +package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch lib_patch.Upstream +package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch lib_patch.Upstream +package/apache/0001-cross-compile.patch lib_patch.Upstream +package/apache/0002-nios2_is_not_os2.patch lib_patch.Upstream +package/apache/S50apache Shellcheck lib_sysv.Indent lib_sysv.Variables +package/apitrace/0001-thirdparty-libbacktrace-backtrace-h-include-config.h.patch lib_patch.Upstream +package/apitrace/0002-gltrace-Avoid-__libc_dlsym-and-__libc_dlopen_mode-on-GLIBC-2-34.patch lib_patch.Upstream +package/apr-util/0001-remove-checkapr.patch lib_patch.Upstream +package/apr/0001-sys-param-h.patch lib_patch.Upstream +package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch lib_patch.Upstream +package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch lib_patch.Upstream +package/arptables/0001-Fix-musl-build-issue.patch lib_patch.Upstream +package/arptables/0002-libarptc-libarptc_incl.c-fix-build-with-O0.patch lib_patch.Upstream +package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch lib_patch.Upstream +package/asterisk/0002-configure-fix-detection-of-libcrypt.patch lib_patch.Upstream +package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch lib_patch.Upstream +package/asterisk/0004-install-samples-need-the-data-files.patch lib_patch.Upstream +package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch lib_patch.Upstream +package/at/S99at lib_sysv.Indent lib_sysv.Variables +package/attr/0001-build-with-older-GCCs.patch lib_patch.Upstream +package/audit/S02auditd Shellcheck lib_sysv.Variables +package/aufs-util/0001-remove-user-settings.patch lib_patch.Upstream +package/aufs-util/0002-no-check-ver.patch lib_patch.Upstream +package/aufs-util/0003-no-strip-lib.patch lib_patch.Upstream +package/aumix/0001-fix-incorrect-makefile-am.patch lib_patch.Upstream +package/autoconf/0001-dont-add-dirty-to-version.patch lib_patch.Upstream +package/automake/0001-noman.patch lib_patch.Upstream +package/avahi/0001-Fix-NULL-pointer-crashes-from-175.patch lib_patch.Upstream +package/avahi/S05avahi-setup.sh lib_sysv.Indent lib_sysv.Variables +package/avahi/S50avahi-daemon lib_sysv.Indent lib_sysv.Variables +package/babeld/S50babeld Shellcheck lib_sysv.Indent lib_sysv.Variables +package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch lib_patch.Upstream +package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/bash/0001-input.h-add-missing-include-on-stdio.h.patch lib_patch.Upstream +package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch lib_patch.Upstream +package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch lib_patch.Upstream +package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch lib_patch.Upstream +package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch lib_patch.Upstream +package/bc/0003-dc-fix-exit-code-of-q-command.patch lib_patch.Upstream +package/bc/0004-no-gen-libmath.patch lib_patch.Upstream +package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch lib_patch.Upstream +package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch lib_patch.Upstream +package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch lib_patch.Upstream +package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch lib_patch.Upstream +package/bearssl/0001-Fix-missing-objdir-dependency.patch lib_patch.Upstream +package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch lib_patch.Upstream +package/beecrypt/0002-build-system.patch lib_patch.Upstream +package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch lib_patch.Upstream +package/benejson/0001-c-std.patch lib_patch.Upstream +package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch lib_patch.Upstream +package/berkeleydb/0001-cwd-db_config.patch lib_patch.Upstream +package/berkeleydb/0002-atomic_compare_exchange.patch lib_patch.Upstream +package/bind/0001-cross.patch lib_patch.Upstream +package/bind/S81named Shellcheck lib_sysv.Indent lib_sysv.Variables +package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch lib_patch.Upstream +package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch lib_patch.Upstream +package/bmx7/0002-Fix-linking-error.patch lib_patch.Upstream +package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch lib_patch.Upstream +package/boinc/S99boinc-client Shellcheck lib_sysv.Indent lib_sysv.Variables +package/brickd/S70brickd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/bridge-utils/0001-fix-build-on-musl.patch lib_patch.Upstream +package/brltty/0001-Fix-linking-error-on-mips64el.patch lib_patch.Upstream +package/brltty/S10brltty Shellcheck lib_sysv.Indent lib_sysv.Variables +package/bsdiff/0001-Add-missing-header-for-u_char.patch lib_patch.Upstream +package/bustle/0001-Makefile-fix-pcap-config-call.patch lib_patch.Upstream +package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch lib_patch.Upstream +package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch lib_patch.Upstream +package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch lib_patch.Upstream +package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch lib_patch.Upstream +package/busybox/S02sysctl lib_sysv.Variables +package/busybox/S10mdev Shellcheck lib_sysv.ConsecutiveEmptyLines lib_sysv.Indent +package/busybox/S15watchdog lib_sysv.Indent lib_sysv.Variables +package/busybox/S50telnet Shellcheck lib_sysv.Indent lib_sysv.Variables package/busybox/udhcpc.script Shellcheck -package/bzip2/0001-build-objects-twice.patch Upstream -package/bzip2/0002-improve-build-system.patch Upstream -package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstream -package/c-icap/S96cicap Indent Shellcheck Variables -package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream -package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream -package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream -package/cairo/0002-Fix-mask-usage-in-image-compositor.patch Upstream -package/caps/0001-Fix-stdint-types-with-musl.patch Upstream -package/cdrkit/0001-no-rcmd.patch Upstream -package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream -package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch Upstream -package/cfm/S65cfm Indent Variables -package/cgic/0001-prepare_makefile.patch Upstream -package/cgic/0002-file_enhancements.patch Upstream -package/cgic/0003-restore-cgiFormFileGetTempfileName.patch Upstream -package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables -package/chipmunk/0001-Fix-build-failure-on-musl.patch Upstream -package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch Upstream -package/chrony/S49chrony Indent Shellcheck Variables -package/cmake/0001-rename-cmake-rootfile.patch Upstream -package/cmocka/0001-Don-t-redefine-uintptr_t.patch Upstream -package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch Upstream -package/connman/S45connman Variables -package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch Upstream +package/bzip2/0001-build-objects-twice.patch lib_patch.Upstream +package/bzip2/0002-improve-build-system.patch lib_patch.Upstream +package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch lib_patch.Upstream +package/c-icap/S96cicap Shellcheck lib_sysv.Indent lib_sysv.Variables +package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch lib_patch.Upstream +package/cache-calibrator/0001-Fix-conflicting-round-function.patch lib_patch.Upstream +package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch lib_patch.Upstream +package/cairo/0002-Fix-mask-usage-in-image-compositor.patch lib_patch.Upstream +package/caps/0001-Fix-stdint-types-with-musl.patch lib_patch.Upstream +package/cdrkit/0001-no-rcmd.patch lib_patch.Upstream +package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch lib_patch.Upstream +package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch lib_patch.Upstream +package/cfm/S65cfm lib_sysv.Indent lib_sysv.Variables +package/cgic/0001-prepare_makefile.patch lib_patch.Upstream +package/cgic/0002-file_enhancements.patch lib_patch.Upstream +package/cgic/0003-restore-cgiFormFileGetTempfileName.patch lib_patch.Upstream +package/cgroupfs-mount/S30cgroupfs Shellcheck lib_sysv.Indent lib_sysv.Variables +package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream +package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch lib_patch.Upstream +package/chrony/S49chrony Shellcheck lib_sysv.Indent lib_sysv.Variables +package/cmake/0001-rename-cmake-rootfile.patch lib_patch.Upstream +package/cmocka/0001-Don-t-redefine-uintptr_t.patch lib_patch.Upstream +package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch lib_patch.Upstream +package/connman/S45connman lib_sysv.Variables +package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch lib_patch.Upstream package/coremark-pro/coremark-pro.sh.in Shellcheck -package/cppdb/0001-mysql-library-suffix.patch Upstream -package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch Upstream -package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch Upstream -package/cpulimit/0003-Fix-an-infrequent-crash.patch Upstream -package/cpulimit/0004-Remove-procfs.h-inclusion.patch Upstream -package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch Upstream -package/crda/0002-drop-ldconfig-call.patch Upstream -package/crda/0003-drop-werror.patch Upstream -package/ctorrent/0001-fix-musl-build.patch Upstream -package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch Upstream -package/cups/0002-Do-not-use-genstrings.patch Upstream -package/cups/0003-Sanitize-the-installation-process.patch Upstream -package/cups/0004-Remove-PIE-flags-from-the-build.patch Upstream -package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob Upstream -package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob Upstream -package/curlftpfs/0003-nocache-memleak-fix.patch Sob Upstream -package/curlftpfs/0004-fix-musl-build-off-t.patch Upstream -package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch Upstream -package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch Upstream -package/cwiid/0002-configure-make-wmgui-build-optional.patch Upstream -package/dahdi-tools/0001-no-build-docs.patch Upstream -package/dahdi-tools/0002-no-perl-manpages.patch Upstream -package/dante/0001-fix-sparc-compile.patch Upstream -package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch Upstream -package/dante/S50dante Indent Shellcheck Variables -package/daq/0001-Fix-build-against-the-musl-C-library.patch Upstream -package/daq/0002-parallel-grammar.patch Upstream -package/darkhttpd/S50darkhttpd Indent Shellcheck Variables -package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch Upstream -package/dbus-cpp/0001-gcc4.7.patch Upstream -package/dbus-cpp/0002-cross-compile-tools.patch Upstream -package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch Upstream -package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables -package/dc3dd/0001-no_man.patch Upstream -package/dc3dd/0002-fix-autoreconf.patch Upstream -package/dc3dd/0003-fix-for-glibc-2.28.patch Upstream -package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch Upstream -package/dcron/S90dcron Variables -package/dhcp/S80dhcp-relay Shellcheck Variables -package/dhcp/S80dhcp-server Shellcheck Variables -package/dhcp/dhclient-script Shellcheck TrailingSpace -package/dhcpcd/S41dhcpcd Indent Variables -package/dhcpdump/0001-use-non-bsd-structures.patch Upstream -package/dhrystone/0001-cmdline-nruns.patch Sob Upstream -package/dhrystone/0002-HZ.patch Sob Upstream -package/dhrystone/0003-exit.patch Sob Upstream -package/dhrystone/0004-headers.patch Sob Upstream -package/dhrystone/0005-prototypes.patch Sob Upstream -package/dht/0001-cmake.patch Upstream -package/dillo/0001-usr-local-include.patch Upstream -package/dillo/0002-Fix-openssl-detection.patch Upstream -package/dillo/0004-fix-build-with-gcc-10.patch Upstream -package/directfb-examples/0001-remove-bzero.patch Sob Upstream -package/directfb/0001-fix-missing-davinci-voodoo-header.patch Upstream -package/directfb/0002-imlib2-config.patch Upstream -package/directfb/0003-setregion-lock.patch Upstream -package/directfb/0004-use-gcc-link.patch Upstream -package/directfb/0005-add-missing-idivine-header.patch Upstream -package/directfb/0006-fix-client-gfx_state-initialisation.patch Upstream -package/dmalloc/0001-configure-fix-build-on-mips.patch Upstream -package/dmalloc/0003-configure-allow-overriding-some-tests.patch Upstream -package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch Upstream -package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch Upstream -package/dmraid/0001-fix-compilation-under-musl.patch Upstream -package/dmraid/S20dmraid Variables +package/cppdb/0001-mysql-library-suffix.patch lib_patch.Upstream +package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch lib_patch.Upstream +package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch lib_patch.Upstream +package/cpulimit/0003-Fix-an-infrequent-crash.patch lib_patch.Upstream +package/cpulimit/0004-Remove-procfs.h-inclusion.patch lib_patch.Upstream +package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch lib_patch.Upstream +package/crda/0002-drop-ldconfig-call.patch lib_patch.Upstream +package/crda/0003-drop-werror.patch lib_patch.Upstream +package/ctorrent/0001-fix-musl-build.patch lib_patch.Upstream +package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch lib_patch.Upstream +package/cups/0002-Do-not-use-genstrings.patch lib_patch.Upstream +package/cups/0003-Sanitize-the-installation-process.patch lib_patch.Upstream +package/cups/0004-Remove-PIE-flags-from-the-build.patch lib_patch.Upstream +package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch lib_patch.Sob lib_patch.Upstream +package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch lib_patch.Sob lib_patch.Upstream +package/curlftpfs/0003-nocache-memleak-fix.patch lib_patch.Sob lib_patch.Upstream +package/curlftpfs/0004-fix-musl-build-off-t.patch lib_patch.Upstream +package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch lib_patch.Upstream +package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch lib_patch.Upstream +package/cwiid/0002-configure-make-wmgui-build-optional.patch lib_patch.Upstream +package/dahdi-tools/0001-no-build-docs.patch lib_patch.Upstream +package/dahdi-tools/0002-no-perl-manpages.patch lib_patch.Upstream +package/dante/0001-fix-sparc-compile.patch lib_patch.Upstream +package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch lib_patch.Upstream +package/dante/S50dante Shellcheck lib_sysv.Indent lib_sysv.Variables +package/daq/0001-Fix-build-against-the-musl-C-library.patch lib_patch.Upstream +package/daq/0002-parallel-grammar.patch lib_patch.Upstream +package/darkhttpd/S50darkhttpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch lib_patch.Upstream +package/dbus-cpp/0001-gcc4.7.patch lib_patch.Upstream +package/dbus-cpp/0002-cross-compile-tools.patch lib_patch.Upstream +package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch lib_patch.Upstream +package/dbus/S30dbus Shellcheck lib_sysv.Indent lib_sysv.TrailingSpace lib_sysv.Variables +package/dc3dd/0001-no_man.patch lib_patch.Upstream +package/dc3dd/0002-fix-autoreconf.patch lib_patch.Upstream +package/dc3dd/0003-fix-for-glibc-2.28.patch lib_patch.Upstream +package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch lib_patch.Upstream +package/dcron/S90dcron lib_sysv.Variables +package/dhcp/S80dhcp-relay Shellcheck lib_sysv.Variables +package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables +package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace +package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables +package/dhcpdump/0001-use-non-bsd-structures.patch lib_patch.Upstream +package/dhrystone/0001-cmdline-nruns.patch lib_patch.Sob lib_patch.Upstream +package/dhrystone/0002-HZ.patch lib_patch.Sob lib_patch.Upstream +package/dhrystone/0003-exit.patch lib_patch.Sob lib_patch.Upstream +package/dhrystone/0004-headers.patch lib_patch.Sob lib_patch.Upstream +package/dhrystone/0005-prototypes.patch lib_patch.Sob lib_patch.Upstream +package/dht/0001-cmake.patch lib_patch.Upstream +package/dillo/0001-usr-local-include.patch lib_patch.Upstream +package/dillo/0002-Fix-openssl-detection.patch lib_patch.Upstream +package/dillo/0004-fix-build-with-gcc-10.patch lib_patch.Upstream +package/directfb-examples/0001-remove-bzero.patch lib_patch.Sob lib_patch.Upstream +package/directfb/0001-fix-missing-davinci-voodoo-header.patch lib_patch.Upstream +package/directfb/0002-imlib2-config.patch lib_patch.Upstream +package/directfb/0003-setregion-lock.patch lib_patch.Upstream +package/directfb/0004-use-gcc-link.patch lib_patch.Upstream +package/directfb/0005-add-missing-idivine-header.patch lib_patch.Upstream +package/directfb/0006-fix-client-gfx_state-initialisation.patch lib_patch.Upstream +package/dmalloc/0001-configure-fix-build-on-mips.patch lib_patch.Upstream +package/dmalloc/0003-configure-allow-overriding-some-tests.patch lib_patch.Upstream +package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch lib_patch.Upstream +package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch lib_patch.Upstream +package/dmraid/0001-fix-compilation-under-musl.patch lib_patch.Upstream +package/dmraid/S20dmraid lib_sysv.Variables package/dnsmasq/S80dnsmasq Shellcheck -package/docker-engine/S60dockerd Indent Shellcheck Variables -package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch Upstream +package/docker-engine/S60dockerd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch lib_patch.Upstream package/domoticz/S99domoticz Shellcheck -package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch Upstream -package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch Upstream +package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch lib_patch.Upstream +package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch lib_patch.Upstream package/dracut/merged-usr-module-setup.sh Shellcheck -package/dropbear/S50dropbear Indent Shellcheck Variables -package/dt/0001-adjust-os-symlink.patch Upstream -package/dt/0002-dt-default-source-define.patch Upstream -package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch Upstream -package/dvb-apps/0001-Fix-generate-keynames.patch Upstream -package/dvb-apps/0002-Fix-compiler-warning-flags.patch Upstream -package/dvb-apps/0003-handle-static-shared-only-build.patch Upstream -package/dvb-apps/0004-Makefile-remove-test.patch Upstream -package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch Upstream -package/dvb-apps/0006-fix-glibc-2.31.patch Upstream -package/dvblast/0001-missing-lm.patch Upstream -package/dvblast/0002-fix-int-types.patch Upstream -package/dvbsnoop/0001-musl-types-h.patch Upstream -package/dvdrw-tools/0001-limits.h.patch Upstream -package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch Upstream -package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch Upstream -package/earlyoom/S02earlyoom Indent Shellcheck -package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch Upstream -package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch Upstream -package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch Upstream -package/ecryptfs-utils/0001-musl.patch Upstream -package/ecryptfs-utils/0002-openssl110.patch Upstream -package/ecryptfs-utils/0003-fix-parallel-build-issue.patch Upstream -package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch Upstream -package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch Upstream -package/efl/0003-ecore_fb-fix-build-with-tslib.patch Upstream -package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch Upstream -package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch Upstream -package/ejabberd/0002-fix-ejabberdctl.patch Upstream -package/ejabberd/0003-correct-includes.patch Upstream -package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/dropbear/S50dropbear Shellcheck lib_sysv.Indent lib_sysv.Variables +package/dt/0001-adjust-os-symlink.patch lib_patch.Upstream +package/dt/0002-dt-default-source-define.patch lib_patch.Upstream +package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch lib_patch.Upstream +package/dvb-apps/0001-Fix-generate-keynames.patch lib_patch.Upstream +package/dvb-apps/0002-Fix-compiler-warning-flags.patch lib_patch.Upstream +package/dvb-apps/0003-handle-static-shared-only-build.patch lib_patch.Upstream +package/dvb-apps/0004-Makefile-remove-test.patch lib_patch.Upstream +package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch lib_patch.Upstream +package/dvb-apps/0006-fix-glibc-2.31.patch lib_patch.Upstream +package/dvblast/0001-missing-lm.patch lib_patch.Upstream +package/dvblast/0002-fix-int-types.patch lib_patch.Upstream +package/dvbsnoop/0001-musl-types-h.patch lib_patch.Upstream +package/dvdrw-tools/0001-limits.h.patch lib_patch.Upstream +package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch lib_patch.Upstream +package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch lib_patch.Upstream +package/earlyoom/S02earlyoom Shellcheck lib_sysv.Indent +package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch lib_patch.Upstream +package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch lib_patch.Upstream +package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch lib_patch.Upstream +package/ecryptfs-utils/0001-musl.patch lib_patch.Upstream +package/ecryptfs-utils/0002-openssl110.patch lib_patch.Upstream +package/ecryptfs-utils/0003-fix-parallel-build-issue.patch lib_patch.Upstream +package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch lib_patch.Upstream +package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch lib_patch.Upstream +package/efl/0003-ecore_fb-fix-build-with-tslib.patch lib_patch.Upstream +package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch lib_patch.Upstream +package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch lib_patch.Upstream +package/ejabberd/0002-fix-ejabberdctl.patch lib_patch.Upstream +package/ejabberd/0003-correct-includes.patch lib_patch.Upstream +package/ejabberd/S50ejabberd Shellcheck lib_sysv.Indent lib_sysv.Variables package/ejabberd/check-erlang-lib Shellcheck -package/elftosb/0001-fixes-includes.patch Upstream -package/elftosb/0002-force-cxx-compiler.patch Upstream -package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch Upstream -package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch Upstream -package/empty/0001-respect-LDFLAGS.patch Upstream -package/erlang-p1-sip/0001-correct-include.patch Upstream -package/erlang-p1-xmpp/0001-fix-includes.patch Upstream -package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch Upstream -package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch Upstream -package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch Upstream -package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables -package/evemu/0001-Include-limits.h-for-PATH_MAX.patch Upstream -package/evemu/0002-evemu-Update-struct-input_event.patch Upstream -package/evemu/0003-src-evemu.c-fix-build-with-kernels-4.16.patch Upstream -package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch Upstream -package/exim/0001-Build-buildconfig-for-the-host.patch Upstream -package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch Upstream -package/exim/0003-Skip-version-check-and-symlink-installation.patch Upstream -package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch Upstream -package/exim/0005-sieve-fix-build-errors.patch Upstream -package/exim/S86exim Indent Variables -package/expect/0001-enable-cross-compilation.patch Upstream -package/expect/0002-allow-tcl-build-directory.patch Upstream -package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch Upstream -package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch Upstream -package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch Upstream -package/fail2ban/S60fail2ban Shellcheck Variables +package/elftosb/0001-fixes-includes.patch lib_patch.Upstream +package/elftosb/0002-force-cxx-compiler.patch lib_patch.Upstream +package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch lib_patch.Upstream +package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch lib_patch.Upstream +package/empty/0001-respect-LDFLAGS.patch lib_patch.Upstream +package/erlang-p1-sip/0001-correct-include.patch lib_patch.Upstream +package/erlang-p1-xmpp/0001-fix-includes.patch lib_patch.Upstream +package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch lib_patch.Upstream +package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch lib_patch.Upstream +package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch lib_patch.Upstream +package/eudev/S10udev Shellcheck lib_sysv.ConsecutiveEmptyLines lib_sysv.Indent lib_sysv.Variables +package/evemu/0001-Include-limits.h-for-PATH_MAX.patch lib_patch.Upstream +package/evemu/0002-evemu-Update-struct-input_event.patch lib_patch.Upstream +package/evemu/0003-src-evemu.c-fix-build-with-kernels-4.16.patch lib_patch.Upstream +package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch lib_patch.Upstream +package/exim/0001-Build-buildconfig-for-the-host.patch lib_patch.Upstream +package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch lib_patch.Upstream +package/exim/0003-Skip-version-check-and-symlink-installation.patch lib_patch.Upstream +package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch lib_patch.Upstream +package/exim/0005-sieve-fix-build-errors.patch lib_patch.Upstream +package/exim/S86exim lib_sysv.Indent lib_sysv.Variables +package/expect/0001-enable-cross-compilation.patch lib_patch.Upstream +package/expect/0002-allow-tcl-build-directory.patch lib_patch.Upstream +package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch lib_patch.Upstream +package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch lib_patch.Upstream +package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch lib_patch.Upstream +package/fail2ban/S60fail2ban Shellcheck lib_sysv.Variables package/fakedate/fakedate Shellcheck -package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch Upstream -package/fbgrab/0001-fix-static-build.patch Upstream -package/fbset/0001-Fix-musl-compile.patch Upstream -package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch Upstream -package/fbterm/0002-mouse.cpp-fix-musl-compile.patch Upstream -package/fbterm/0003-C++11-compliance.patch Upstream -package/fbterm/0004-iconv.patch Upstream -package/fbv/0001-cross.patch Sob Upstream -package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob Upstream -package/fbv/0003-fix-bgr555.patch Upstream -package/fbv/0004-giflib.patch Upstream -package/fbv/0005-include.patch Sob Upstream -package/fbv/0006-libpng15.patch Upstream -package/fbv/0007-gif.c-fic-build-with-gcc-10.patch Upstream -package/fcgiwrap/0001-use-LIBS-from-configure.patch Upstream -package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch Upstream -package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch Upstream -package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch Upstream -package/ffmpeg/0003-libavutil-Fix-mips-build.patch Upstream -package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch Upstream -package/ficl/0001-fix-Makefile.patch Upstream -package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch Upstream -package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch Upstream -package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch Upstream -package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch Upstream -package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch Upstream -package/flite/0001-fix-alsa-static.patch Upstream -package/fltk/0001-disable-tests.patch Upstream -package/fluxbox/0001-fixes-bug-1138.patch Upstream -package/freeradius-client/0001-fix-for-nettle.patch Upstream -package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream -package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream -package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables -package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch Upstream -package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch Upstream -package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch Upstream -package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch Upstream +package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch lib_patch.Upstream +package/fbgrab/0001-fix-static-build.patch lib_patch.Upstream +package/fbset/0001-Fix-musl-compile.patch lib_patch.Upstream +package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch lib_patch.Upstream +package/fbterm/0002-mouse.cpp-fix-musl-compile.patch lib_patch.Upstream +package/fbterm/0003-C++11-compliance.patch lib_patch.Upstream +package/fbterm/0004-iconv.patch lib_patch.Upstream +package/fbv/0001-cross.patch lib_patch.Sob lib_patch.Upstream +package/fbv/0002-fix-24bpp-support-on-big-endian.patch lib_patch.Sob lib_patch.Upstream +package/fbv/0003-fix-bgr555.patch lib_patch.Upstream +package/fbv/0004-giflib.patch lib_patch.Upstream +package/fbv/0005-include.patch lib_patch.Sob lib_patch.Upstream +package/fbv/0006-libpng15.patch lib_patch.Upstream +package/fbv/0007-gif.c-fic-build-with-gcc-10.patch lib_patch.Upstream +package/fcgiwrap/0001-use-LIBS-from-configure.patch lib_patch.Upstream +package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch lib_patch.Upstream +package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch lib_patch.Upstream +package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch lib_patch.Upstream +package/ffmpeg/0003-libavutil-Fix-mips-build.patch lib_patch.Upstream +package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch lib_patch.Upstream +package/ficl/0001-fix-Makefile.patch lib_patch.Upstream +package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch lib_patch.Upstream +package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch lib_patch.Upstream +package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch lib_patch.Upstream +package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch lib_patch.Upstream +package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch lib_patch.Upstream +package/flite/0001-fix-alsa-static.patch lib_patch.Upstream +package/fltk/0001-disable-tests.patch lib_patch.Upstream +package/fluxbox/0001-fixes-bug-1138.patch lib_patch.Upstream +package/freeradius-client/0001-fix-for-nettle.patch lib_patch.Upstream +package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch lib_patch.Upstream +package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch lib_patch.Upstream +package/freescale-imx/imx-uuc/S80imx-uuc Shellcheck lib_sysv.Indent lib_sysv.Variables +package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch lib_patch.Upstream +package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch lib_patch.Upstream +package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch lib_patch.Upstream +package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch lib_patch.Upstream package/frr/S50frr Shellcheck -package/fstrcmp/0001-disable-rpath.patch Upstream -package/ftop/0001-overflow.patch Upstream -package/fwts/0001-build-do-not-use-Werror.patch Upstream -package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch Upstream -package/fxload/0001-fix-static-build.patch Upstream -package/gamin/0001-no-abstract-sockets.patch Upstream -package/gamin/0002-no-const-return.patch Sob Upstream -package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch Upstream -package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstream -package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream -package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream -package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream -package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch Upstream -package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Upstream -package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch Upstream -package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream -package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch Upstream -package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream -package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream -package/gdb/12.1/0003-use-asm-sgidefs.h.patch Upstream -package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch Upstream -package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream -package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream -package/gdb/12.1/0007-fix-musl-build-on-riscv.patch Upstream -package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream -package/gdb/12.1/0009-gdb-Fix-native-build-on-xtensa.patch Upstream -package/gdb/13.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream -package/gdb/13.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream -package/gdb/13.2/0003-use-asm-sgidefs.h.patch Upstream -package/gdb/13.2/0004-gdbserver-fix-build-for-m68k.patch Upstream -package/gdb/13.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream -package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream -package/gdb/13.2/0007-fix-musl-build-on-riscv.patch Upstream -package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream -package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch Upstream -package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream -package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream -package/gdb/14.1/0003-use-asm-sgidefs.h.patch Upstream -package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch Upstream -package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream -package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream -package/gdb/14.1/0007-fix-musl-build-on-riscv.patch Upstream -package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream -package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch Upstream -package/gengetopt/0001-configure.ac-add-disable-doc-option.patch Upstream -package/genpart/0001-fix-return-code.patch Upstream -package/genromfs/0001-build-system.patch Sob Upstream -package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch Upstream -package/gerbera/S99gerbera Indent -package/giblib/0001-fix-imlib2-detection.patch Upstream -package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream -package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream -package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream -package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream -package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch Upstream -package/gnuplot/0001-configure-add-without-demo-option.patch Upstream -package/go/0001-build.go-explicit-option-for-crosscompilation.patch Upstream -package/gob2/0001-dont-include-from-prefix.patch Upstream -package/gobject-introspection/0001-disable-tests.patch Upstream -package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch Upstream -package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch Upstream -package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch Upstream -package/gpm/0002-Install-unversioned-solibrary.patch Upstream -package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch Upstream -package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch Upstream -package/gpm/0005-fix-building-w-newer-glibc.patch Upstream -package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch Upstream -package/gpsd/S50gpsd Indent Shellcheck Variables -package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch Upstream -package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch Upstream -package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch Upstream -package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch Upstream -package/grpc/0003-host-grpc-only-cpp-plugin.patch Upstream -package/grpc/0004-disable-unconditionally-downloading-api-repos.patch Upstream -package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch Upstream -package/guile/0001-calculate-csqrt_manually.patch Upstream -package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch Upstream -package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch Upstream -package/gutenprint/0001-use-pregen-xmli18n-header.patch Upstream -package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch Upstream -package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch Upstream -package/harfbuzz/0001-meson.build-check-for-pthread.h.patch Upstream -package/haserl/0001-add-haserl_lualib.inc.patch Upstream -package/haveged/S21haveged Shellcheck Variables -package/heirloom-mailx/0001-fix-libressl-support.patch Upstream -package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch Upstream -package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch Upstream +package/fstrcmp/0001-disable-rpath.patch lib_patch.Upstream +package/ftop/0001-overflow.patch lib_patch.Upstream +package/fwts/0001-build-do-not-use-Werror.patch lib_patch.Upstream +package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch lib_patch.Upstream +package/fxload/0001-fix-static-build.patch lib_patch.Upstream +package/gamin/0001-no-abstract-sockets.patch lib_patch.Upstream +package/gamin/0002-no-const-return.patch lib_patch.Sob lib_patch.Upstream +package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch lib_patch.Upstream +package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch lib_patch.Upstream +package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream +package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream +package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream +package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch lib_patch.Upstream +package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream +package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream +package/gdb/12.1/0003-use-asm-sgidefs.h.patch lib_patch.Upstream +package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream +package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream +package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream +package/gdb/12.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream +package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream +package/gdb/12.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream +package/gdb/13.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream +package/gdb/13.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream +package/gdb/13.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream +package/gdb/13.2/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream +package/gdb/13.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream +package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream +package/gdb/13.2/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream +package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream +package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream +package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream +package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream +package/gdb/14.1/0003-use-asm-sgidefs.h.patch lib_patch.Upstream +package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream +package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream +package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream +package/gdb/14.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream +package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream +package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream +package/gengetopt/0001-configure.ac-add-disable-doc-option.patch lib_patch.Upstream +package/genpart/0001-fix-return-code.patch lib_patch.Upstream +package/genromfs/0001-build-system.patch lib_patch.Sob lib_patch.Upstream +package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch lib_patch.Upstream +package/gerbera/S99gerbera lib_sysv.Indent +package/giblib/0001-fix-imlib2-detection.patch lib_patch.Upstream +package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream +package/glorytun/0001-Add-support-for-Apple-silicon.patch lib_patch.Upstream +package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch lib_patch.Upstream +package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch lib_patch.Upstream +package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_patch.Upstream +package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream +package/go/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream +package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream +package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream +package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream +package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch lib_patch.Upstream +package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch lib_patch.Upstream +package/gpm/0002-Install-unversioned-solibrary.patch lib_patch.Upstream +package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch lib_patch.Upstream +package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch lib_patch.Upstream +package/gpm/0005-fix-building-w-newer-glibc.patch lib_patch.Upstream +package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch lib_patch.Upstream +package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream +package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch lib_patch.Upstream +package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream +package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch lib_patch.Upstream +package/grpc/0003-host-grpc-only-cpp-plugin.patch lib_patch.Upstream +package/grpc/0004-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream +package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream +package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream +package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch lib_patch.Upstream +package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch lib_patch.Upstream +package/gutenprint/0001-use-pregen-xmli18n-header.patch lib_patch.Upstream +package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch lib_patch.Upstream +package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch lib_patch.Upstream +package/harfbuzz/0001-meson.build-check-for-pthread.h.patch lib_patch.Upstream +package/haserl/0001-add-haserl_lualib.inc.patch lib_patch.Upstream +package/haveged/S21haveged Shellcheck lib_sysv.Variables +package/heirloom-mailx/0001-fix-libressl-support.patch lib_patch.Upstream +package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch lib_patch.Upstream +package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch lib_patch.Upstream package/htpdate/S43htpdate Shellcheck -package/httping/0001-fix-math-library-linking.patch Upstream -package/httping/0002-Makefile-allow-build-without-gettext.patch Upstream -package/i2pd/S99i2pd Indent Shellcheck Variables -package/i7z/0001-fix-build-with-gcc-10.patch Upstream -package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch Upstream -package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch Upstream -package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch Upstream -package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch Upstream -package/icu/0001-dont-build-static-dynamic-twice.patch Upstream -package/icu/0002-workaround-toolchain-bugs.patch Upstream -package/icu/0003-link-icudata-as-data-only.patch Upstream -package/icu/0004-fix-static-linking-with-icu-uc.patch Upstream -package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch Upstream -package/ifplugd/0001-cross.patch Sob Upstream -package/ifplugd/0002-fix-headers.patch Sob Upstream -package/ifplugd/0003-no-cxx.patch Upstream -package/ifplugd/0004-musl-fix-types.patch Upstream -package/ifplugd/0005-src-interface.h-fix-build-with-gcc-10.patch Upstream -package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch Upstream -package/iftop/0002-Rename-pcap_filter-to-iftop_pcap_filter.patch Upstream -package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables -package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck +package/httping/0001-fix-math-library-linking.patch lib_patch.Upstream +package/httping/0002-Makefile-allow-build-without-gettext.patch lib_patch.Upstream +package/i2pd/S99i2pd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/i7z/0001-fix-build-with-gcc-10.patch lib_patch.Upstream +package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch lib_patch.Upstream +package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch lib_patch.Upstream +package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch lib_patch.Upstream +package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch lib_patch.Upstream +package/icu/0001-dont-build-static-dynamic-twice.patch lib_patch.Upstream +package/icu/0002-workaround-toolchain-bugs.patch lib_patch.Upstream +package/icu/0003-link-icudata-as-data-only.patch lib_patch.Upstream +package/icu/0004-fix-static-linking-with-icu-uc.patch lib_patch.Upstream +package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch lib_patch.Upstream +package/ifplugd/0001-cross.patch lib_patch.Sob lib_patch.Upstream +package/ifplugd/0002-fix-headers.patch lib_patch.Sob lib_patch.Upstream +package/ifplugd/0003-no-cxx.patch lib_patch.Upstream +package/ifplugd/0004-musl-fix-types.patch lib_patch.Upstream +package/ifplugd/0005-src-interface.h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/iftop/0002-Rename-pcap_filter-to-iftop_pcap_filter.patch lib_patch.Upstream +package/ifupdown-scripts/S40network Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/ifupdown-scripts/network/if-pre-up.d/wait_iface Shellcheck lib_shellscript.EmptyLastLine package/ifupdown-scripts/nfs_check Shellcheck -package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch Upstream -package/ifupdown/0001-dont-use-dpkg-architecture.patch Upstream -package/igd2-for-linux/S99upnpd Indent Shellcheck Variables -package/imx-mkimage/0001-Add-unused-fake-version.patch Upstream -package/inadyn/S70inadyn Indent NotExecutable -package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck -package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck -package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables -package/intel-gmmlib/0001-Drop-hardening-related-flags.patch Upstream -package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch Upstream -package/intltool/0001-perl-5.26-compatibility.patch Upstream -package/iotop/0001-Fix-build-error-with-Python-3.patch Upstream -package/iozone/0001-Add-new-targets-for-iozone.patch Upstream -package/ipmitool/0001-configure.ac-fix-readline-static-build.patch Upstream -package/ipmitool/0002-Fix-enterprise-numbers-URL.patch Upstream -package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch Upstream -package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch Upstream -package/iprutils/0001-configure.ac-add-AC_USE_SYSTEM_EXTENSIONS.patch Upstream +package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch lib_patch.Upstream +package/ifupdown/0001-dont-use-dpkg-architecture.patch lib_patch.Upstream +package/igd2-for-linux/S99upnpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/imx-mkimage/0001-Add-unused-fake-version.patch lib_patch.Upstream +package/inadyn/S70inadyn NotExecutable lib_sysv.Indent +package/initscripts/init.d/rcK Shellcheck lib_shellscript.ConsecutiveEmptyLines lib_shellscript.EmptyLastLine +package/initscripts/init.d/rcS Shellcheck lib_shellscript.ConsecutiveEmptyLines lib_shellscript.EmptyLastLine +package/input-event-daemon/S99input-event-daemon lib_sysv.ConsecutiveEmptyLines lib_sysv.Indent lib_sysv.Variables +package/intel-gmmlib/0001-Drop-hardening-related-flags.patch lib_patch.Upstream +package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch lib_patch.Upstream +package/intltool/0001-perl-5.26-compatibility.patch lib_patch.Upstream +package/iotop/0001-Fix-build-error-with-Python-3.patch lib_patch.Upstream +package/iozone/0001-Add-new-targets-for-iozone.patch lib_patch.Upstream +package/ipmitool/0001-configure.ac-fix-readline-static-build.patch lib_patch.Upstream +package/ipmitool/0002-Fix-enterprise-numbers-URL.patch lib_patch.Upstream +package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch lib_patch.Upstream +package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch lib_patch.Upstream +package/iprutils/0001-configure.ac-add-AC_USE_SYSTEM_EXTENSIONS.patch lib_patch.Upstream package/iptables/S35iptables Shellcheck -package/irda-utils/0001-daemon.patch Sob Upstream -package/irda-utils/0002-nommu.patch Sob Upstream -package/irda-utils/0003-subdir.patch Sob Upstream -package/irda-utils/0004-musl.patch Upstream -package/irqbalance/S13irqbalance Indent Shellcheck Variables -package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch Upstream -package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch Upstream -package/iucode-tool/S00iucode-tool Variables -package/iwd/S40iwd Shellcheck Variables -package/janus-gateway/0001-disable-ssp.patch Upstream -package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch Upstream -package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch Upstream -package/jose/0002-man-add-option-to-skip-building-man-pages.patch Upstream -package/kexec-lite/0001-clean-restart.patch Upstream -package/keyutils/0001-fix-install-rule.patch Upstream -package/keyutils/0002-cifs.patch Sob Upstream -package/kmod/0001-fix-O_CLOEXEC.patch Upstream -package/kodi-texturepacker/0001-texturepacker.patch Upstream -package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch Upstream -package/kodi/S50kodi Shellcheck Variables -package/latencytop/0001-makefile.patch Upstream -package/lbase64/0001-retro-compatible-with-Lua-5.1.patch Upstream -package/lcdproc/0001-LCDd.conf.patch Upstream -package/lcdproc/0002-Add-missing-ioctl-header.patch Upstream -package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch Upstream -package/leafnode2/0001-cross_makefile.patch Upstream -package/let-me-create/0001-fix-build-with-musl-C-library.patch Upstream -package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch Upstream -package/leveldb/0002-CMake-install-libmemenv.a.patch Upstream -package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch Upstream -package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch Upstream -package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch Upstream -package/libabseil-cpp/0001-force-position-independent-code.patch Upstream -package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch Upstream -package/libart/0001-art-config-cross.patch Sob Upstream -package/libatasmart/0001-strpool-cross-flags.patch Upstream -package/libavl/0001-fix-makefile.patch Upstream -package/libb64/0001-Integer-overflows.patch Upstream -package/libb64/0002-Initialize-C++-objects.patch Upstream -package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch Upstream -package/libcec/0001-cecloader-h-fix-null-return.patch Upstream -package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream -package/libcgicc/0001-disable-documentation-option.patch Sob Upstream -package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch Upstream -package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch Upstream -package/libcuefile/0001-fix-static-link.patch Upstream -package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch Upstream -package/libdnet/0001-python-makefile.patch Upstream -package/libdrm/0001-tests-meson.build-disable-nouveau-tests-for-static-b.patch Upstream -package/libdvbcsa/0001-altivec-powerpc64.patch Upstream -package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch Upstream -package/libedit/0001-check-bsd-functions-in-libbsd.patch Upstream -package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch Upstream -package/libfcgi/0001-link-against-math.patch Upstream -package/libfcgi/0002-disable-examples.patch Sob Upstream -package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch Upstream -package/libfm/0001-modules-fix-cross-compilation.patch Upstream -package/libfreeimage/0001-no-root-install.patch Upstream -package/libfreeimage/0002-fix-cpuid-x86.patch Upstream -package/libfreeimage/0003-fix-big-endian-os.patch Upstream -package/libfreeimage/0004-fixed-C-11-warnings.patch Upstream -package/libftdi/0001-pkgconfig_libusb.patch Sob Upstream -package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob Upstream -package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch Upstream -package/libftdi1/0002-CMakeLists.txt-fix-paths-when-FTDIPP-is-set.patch Upstream -package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch Upstream -package/libfuse/0001-fix-aarch64-build.patch Upstream -package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch Upstream -package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch Upstream -package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch Upstream -package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch Upstream -package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch Upstream -package/libgsm/0001-misc-fixes-from-archlinux.patch Upstream -package/libgtk2/0001-reduce-dependencies.patch Upstream -package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch Upstream -package/libhdhomerun/0001-dont-strip.patch Upstream -package/libhid/0001-dont-fiddle-with-debug-flags.patch Upstream -package/libhid/0002-no-newline-in-ldflags.patch Upstream -package/libhid/0003-uclinux.patch Upstream -package/libical/0001-no-tests.patch Upstream -package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch Upstream -package/libiio/S99iiod Shellcheck Variables -package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch Upstream -package/libiqrf/0002-use-only-c-language.patch Upstream -package/libjson/0001-fix-broken-makefile.patch Upstream -package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream -package/liblinear/0001-build-static-lib.patch Upstream -package/liblockfile/0001-Makefile.in-fix-cross-compilation.patch Upstream -package/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch Upstream -package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch Upstream -package/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch Upstream -package/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch Upstream -package/liblog4c-localtime/0005-Fix-C-support.patch Upstream -package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch Upstream -package/libloki/0002-use-ln-snf.patch Upstream -package/libmad/0001-mips-h-constraint-removal.patch Sob Upstream -package/libmad/0002-configure-ac-automake-foreign.patch Upstream -package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch Upstream -package/libmng/0001-jpeg-9a.patch Upstream -package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch Upstream -package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch Upstream -package/libmpeg2/0001-altivec.patch Upstream -package/libmpeg2/0002-armv4l.patch Upstream -package/libmpeg2/0003-fix-arm-detection.patch Upstream -package/libmpeg2/0004-fix-sparc.patch Upstream -package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch Upstream -package/libnfc/0001-autotools-make-example-build-optional.patch Upstream -package/libnids/0001-libpcap-use-pkg-config.patch Upstream -package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch Upstream -package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch Upstream -package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch Upstream -package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch Upstream -package/libodb-mysql/0002-mariadb-FTBFS-fix.patch Upstream -package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch Upstream -package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch Upstream -package/liboping/0001-fix-utf8-support.patch Upstream -package/liboping/0002-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch Upstream -package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch Upstream -package/liboping/0004-Fix-compile-error-on-GCC-7.patch Upstream -package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch Upstream -package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch Upstream -package/libplatform/0001-cmake-require-c-11-as-the-minimum-standard.patch Upstream -package/libpthsem/0001-fix-build-on-linux-3.x-host.patch Upstream -package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch Upstream -package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch Upstream -package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch Upstream -package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch Upstream -package/libselinux/0001-fix-musl-build.patch Upstream -package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch Upstream -package/libsepol/0001-support-static-only.patch Upstream -package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch Upstream -package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch Upstream -package/libserialport/0001-uclinux-detection.patch Upstream -package/libshdata/0001-backend-Add-missing-include-files.patch Upstream -package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch Upstream -package/libsidplay2/0001-sidplay2-libs-2.1.1.patch Upstream -package/libsidplay2/0002-pkg-config.patch Upstream -package/libsidplay2/0003-gcc6.patch Upstream -package/libsigrok/0001-Support-glibmm-2.68.patch Upstream -package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-9.patch Upstream -package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch Upstream -package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch Upstream -package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch Upstream -package/libsoxr/0001-Add-Libs.private-for-static-linking.patch Upstream -package/libspatialindex/0001-allow-building-static-libs.patch Upstream -package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch Upstream -package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch Upstream -package/libsvg/0001-fix-expat-static-declaration.patch Upstream -package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch Upstream -package/libsvgtiny/0001-disable-debug-printfs.patch Upstream -package/libsvgtiny/0002-Remove-Werror.patch Upstream -package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch Upstream -package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch Upstream -package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch Upstream -package/libtelnet/0001-fix-compilation-without-zlib.patch Upstream -package/libtheora/0001-link-libtheoradec.patch Upstream -package/libtheora/0002-fix-autoreconf.patch Upstream -package/libtomcrypt/0001-fix-CVE-2019-17362.patch Upstream -package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch Upstream -package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch Upstream -package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch Upstream -package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch Upstream -package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch Upstream -package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch Upstream -package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch Upstream -package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch Upstream -package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch Upstream -package/libwebsock/0002-fix-ssl.patch Upstream -package/libwebsock/0003-fix-incorrect-inline.patch Upstream -package/libyuv/0001-i386-sse2.patch Upstream -package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch Upstream -package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables -package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch Upstream -package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch Upstream -package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch Upstream -package/linux-fusion/0001-fix-for-linux-4-and-above.patch Upstream -package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch Upstream -package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch Upstream -package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch Upstream -package/linux-zigbee/0001-test-serial-Remove-test-serial.patch Upstream -package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch Upstream -package/linuxptp/S65ptp4l Indent Shellcheck -package/linuxptp/S66phc2sys Indent Shellcheck -package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch Upstream -package/lirc-tools/0002-configure-add-disable-doc-option.patch Upstream -package/lirc-tools/S25lircd Indent Variables -package/lite/0001-dfbspy-stat.patch Sob Upstream -package/lite/0002-no-tests.patch Sob Upstream -package/lite/0003-pkg-config.patch Sob Upstream -package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch Upstream -package/lldpd/S60lldpd Indent Shellcheck Variables -package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch Upstream -package/llvm-project/libclc/0001-support-out-of-tree-build.patch Upstream -package/lm-sensors/0001-static-build.patch Upstream -package/lm-sensors/0002-no-host-ldconfig.patch Upstream -package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch Upstream -package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch Upstream -package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch Upstream -package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch Upstream -package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch Upstream -package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch Upstream -package/lockfile-progs/0001-sus3v-legacy.patch Sob Upstream -package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch Upstream -package/ltrace/0001-arm-plt.patch Upstream -package/ltrace/0002-sparc-add-missing-library.h-include.patch Upstream -package/ltrace/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch Upstream -package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch Upstream -package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch Upstream -package/lttng-libust/0001-configure.ac-add-disable-tests.patch Upstream -package/lttng-tools/0001-configure.ac-add-disable-tests.patch Upstream -package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch Upstream -package/lua-lunix/0001-remove-link-with-librt.patch Upstream -package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch Upstream -package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch Upstream -package/lua/5.1.5/0001-root-path.patch Upstream -package/lua/5.1.5/0002-shared-libs-for-lua.patch Upstream -package/lua/5.1.5/0011-linenoise.patch Upstream -package/lua/5.1.5/0012-fix-reader-at-eoz.patch Upstream -package/lua/5.3.6/0001-root-path.patch Upstream -package/lua/5.3.6/0002-shared-libs-for-lua.patch Upstream -package/lua/5.3.6/0003-linenoise.patch Upstream -package/lua/5.4.6/0001-root-path.patch Upstream -package/lua/5.4.6/0002-shared-libs-for-lua.patch Upstream -package/lua/5.4.6/0011-linenoise.patch Upstream -package/luajit/0001-no-bin-symlink.patch Upstream -package/luajit/0002-install-inc.patch Upstream -package/luasyslog/0001-remove-AX_LUA_LIBS.patch Upstream -package/luasyslog/0002-build-ax_lua.m4-fix-cross-compilation.patch Upstream -package/lugaru/0001-ImageIO-fix-invalid-conversion.patch Upstream -package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch Upstream -package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch Upstream -package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch Upstream -package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch Upstream -package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch Upstream -package/lz4/0001-build-Support-BUILD_SHARED-no.patch Upstream -package/lzma/0001-Remove-static-from-LDFLAGS.patch Upstream -package/lzop/0001-allow-overriding-modification-time.patch Upstream -package/macchanger/0001-Fix-missing-include-for-caddr_t.patch Upstream -package/madplay/0001-switch-to-new-alsa-api.patch Sob Upstream -package/madplay/0002-configure-ac-automake-foreign.patch Upstream -package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch Upstream -package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch Upstream -package/makedumpfile/0002-Handle-__mips64.patch Upstream -package/mariadb/0001-add-extra-check-for-librt.patch Upstream -package/mariadb/S97mysqld Indent Shellcheck Variables -package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace -package/matchbox-lib/0001-index-is-legacy.patch Upstream -package/matchbox-panel/0001-index-is-legacy.patch Upstream -package/matchbox-panel/0002-mb-applet-wireless.patch Upstream -package/matchbox-panel/0003-mb-applet-battery.patch Upstream -package/matchbox-startup-monitor/0001-true-false.patch Upstream -package/matchbox/0001-defaulttheme.patch Upstream -package/matchbox/0002-src-Fix-build-with-gcc-10.patch Upstream -package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch Upstream -package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch Upstream -package/memstat/0001-PATH_MAX.patch Upstream +package/irda-utils/0001-daemon.patch lib_patch.Sob lib_patch.Upstream +package/irda-utils/0002-nommu.patch lib_patch.Sob lib_patch.Upstream +package/irda-utils/0003-subdir.patch lib_patch.Sob lib_patch.Upstream +package/irda-utils/0004-musl.patch lib_patch.Upstream +package/irqbalance/S13irqbalance Shellcheck lib_sysv.Indent lib_sysv.Variables +package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch lib_patch.Upstream +package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch lib_patch.Upstream +package/iucode-tool/S00iucode-tool lib_sysv.Variables +package/iwd/S40iwd Shellcheck lib_sysv.Variables +package/janus-gateway/0001-disable-ssp.patch lib_patch.Upstream +package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch lib_patch.Upstream +package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch lib_patch.Upstream +package/jose/0002-man-add-option-to-skip-building-man-pages.patch lib_patch.Upstream +package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream +package/keyutils/0001-fix-install-rule.patch lib_patch.Upstream +package/keyutils/0002-cifs.patch lib_patch.Sob lib_patch.Upstream +package/kmod/0001-fix-O_CLOEXEC.patch lib_patch.Upstream +package/kodi-texturepacker/0001-texturepacker.patch lib_patch.Upstream +package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch lib_patch.Upstream +package/kodi/S50kodi Shellcheck lib_sysv.Variables +package/latencytop/0001-makefile.patch lib_patch.Upstream +package/lbase64/0001-retro-compatible-with-Lua-5.1.patch lib_patch.Upstream +package/lcdproc/0001-LCDd.conf.patch lib_patch.Upstream +package/lcdproc/0002-Add-missing-ioctl-header.patch lib_patch.Upstream +package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch lib_patch.Upstream +package/leafnode2/0001-cross_makefile.patch lib_patch.Upstream +package/let-me-create/0001-fix-build-with-musl-C-library.patch lib_patch.Upstream +package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch lib_patch.Upstream +package/leveldb/0002-CMake-install-libmemenv.a.patch lib_patch.Upstream +package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch lib_patch.Upstream +package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch lib_patch.Upstream +package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch lib_patch.Upstream +package/libabseil-cpp/0001-force-position-independent-code.patch lib_patch.Upstream +package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch lib_patch.Upstream +package/libart/0001-art-config-cross.patch lib_patch.Sob lib_patch.Upstream +package/libatasmart/0001-strpool-cross-flags.patch lib_patch.Upstream +package/libavl/0001-fix-makefile.patch lib_patch.Upstream +package/libb64/0001-Integer-overflows.patch lib_patch.Upstream +package/libb64/0002-Initialize-C++-objects.patch lib_patch.Upstream +package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch lib_patch.Upstream +package/libcec/0001-cecloader-h-fix-null-return.patch lib_patch.Upstream +package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream +package/libcgicc/0001-disable-documentation-option.patch lib_patch.Sob lib_patch.Upstream +package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch lib_patch.Upstream +package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch lib_patch.Upstream +package/libcuefile/0001-fix-static-link.patch lib_patch.Upstream +package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch lib_patch.Upstream +package/libdnet/0001-python-makefile.patch lib_patch.Upstream +package/libdrm/0001-tests-meson.build-disable-nouveau-tests-for-static-b.patch lib_patch.Upstream +package/libdvbcsa/0001-altivec-powerpc64.patch lib_patch.Upstream +package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch lib_patch.Upstream +package/libedit/0001-check-bsd-functions-in-libbsd.patch lib_patch.Upstream +package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch lib_patch.Upstream +package/libfcgi/0001-link-against-math.patch lib_patch.Upstream +package/libfcgi/0002-disable-examples.patch lib_patch.Sob lib_patch.Upstream +package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch lib_patch.Upstream +package/libfm/0001-modules-fix-cross-compilation.patch lib_patch.Upstream +package/libfreeimage/0001-no-root-install.patch lib_patch.Upstream +package/libfreeimage/0002-fix-cpuid-x86.patch lib_patch.Upstream +package/libfreeimage/0003-fix-big-endian-os.patch lib_patch.Upstream +package/libfreeimage/0004-fixed-C-11-warnings.patch lib_patch.Upstream +package/libftdi/0001-pkgconfig_libusb.patch lib_patch.Sob lib_patch.Upstream +package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch lib_patch.Sob lib_patch.Upstream +package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch lib_patch.Upstream +package/libftdi1/0002-CMakeLists.txt-fix-paths-when-FTDIPP-is-set.patch lib_patch.Upstream +package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch lib_patch.Upstream +package/libfuse/0001-fix-aarch64-build.patch lib_patch.Upstream +package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch lib_patch.Upstream +package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_patch.Upstream +package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch lib_patch.Upstream +package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch lib_patch.Upstream +package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream +package/libgsm/0001-misc-fixes-from-archlinux.patch lib_patch.Upstream +package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream +package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch lib_patch.Upstream +package/libhdhomerun/0001-dont-strip.patch lib_patch.Upstream +package/libhid/0001-dont-fiddle-with-debug-flags.patch lib_patch.Upstream +package/libhid/0002-no-newline-in-ldflags.patch lib_patch.Upstream +package/libhid/0003-uclinux.patch lib_patch.Upstream +package/libical/0001-no-tests.patch lib_patch.Upstream +package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch lib_patch.Upstream +package/libiio/S99iiod Shellcheck lib_sysv.Variables +package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch lib_patch.Upstream +package/libiqrf/0002-use-only-c-language.patch lib_patch.Upstream +package/libjson/0001-fix-broken-makefile.patch lib_patch.Upstream +package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream +package/liblinear/0001-build-static-lib.patch lib_patch.Upstream +package/liblockfile/0001-Makefile.in-fix-cross-compilation.patch lib_patch.Upstream +package/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch lib_patch.Upstream +package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch lib_patch.Upstream +package/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch lib_patch.Upstream +package/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch lib_patch.Upstream +package/liblog4c-localtime/0005-Fix-C-support.patch lib_patch.Upstream +package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch lib_patch.Upstream +package/libloki/0002-use-ln-snf.patch lib_patch.Upstream +package/libmad/0001-mips-h-constraint-removal.patch lib_patch.Sob lib_patch.Upstream +package/libmad/0002-configure-ac-automake-foreign.patch lib_patch.Upstream +package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch lib_patch.Upstream +package/libmng/0001-jpeg-9a.patch lib_patch.Upstream +package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch lib_patch.Upstream +package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch lib_patch.Upstream +package/libmpeg2/0001-altivec.patch lib_patch.Upstream +package/libmpeg2/0002-armv4l.patch lib_patch.Upstream +package/libmpeg2/0003-fix-arm-detection.patch lib_patch.Upstream +package/libmpeg2/0004-fix-sparc.patch lib_patch.Upstream +package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch lib_patch.Upstream +package/libnfc/0001-autotools-make-example-build-optional.patch lib_patch.Upstream +package/libnids/0001-libpcap-use-pkg-config.patch lib_patch.Upstream +package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch lib_patch.Upstream +package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch lib_patch.Upstream +package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch lib_patch.Upstream +package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch lib_patch.Upstream +package/libodb-mysql/0002-mariadb-FTBFS-fix.patch lib_patch.Upstream +package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch lib_patch.Upstream +package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch lib_patch.Upstream +package/liboping/0001-fix-utf8-support.patch lib_patch.Upstream +package/liboping/0002-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch lib_patch.Upstream +package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch lib_patch.Upstream +package/liboping/0004-Fix-compile-error-on-GCC-7.patch lib_patch.Upstream +package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch lib_patch.Upstream +package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch lib_patch.Upstream +package/libplatform/0001-cmake-require-c-11-as-the-minimum-standard.patch lib_patch.Upstream +package/libpthsem/0001-fix-build-on-linux-3.x-host.patch lib_patch.Upstream +package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch lib_patch.Upstream +package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch lib_patch.Upstream +package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch lib_patch.Upstream +package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch lib_patch.Upstream +package/libselinux/0001-fix-musl-build.patch lib_patch.Upstream +package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch lib_patch.Upstream +package/libsepol/0001-support-static-only.patch lib_patch.Upstream +package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch lib_patch.Upstream +package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch lib_patch.Upstream +package/libserialport/0001-uclinux-detection.patch lib_patch.Upstream +package/libshdata/0001-backend-Add-missing-include-files.patch lib_patch.Upstream +package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch lib_patch.Upstream +package/libsidplay2/0001-sidplay2-libs-2.1.1.patch lib_patch.Upstream +package/libsidplay2/0002-pkg-config.patch lib_patch.Upstream +package/libsidplay2/0003-gcc6.patch lib_patch.Upstream +package/libsigrok/0001-Support-glibmm-2.68.patch lib_patch.Upstream +package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-9.patch lib_patch.Upstream +package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch lib_patch.Upstream +package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch lib_patch.Upstream +package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch lib_patch.Upstream +package/libsoxr/0001-Add-Libs.private-for-static-linking.patch lib_patch.Upstream +package/libspatialindex/0001-allow-building-static-libs.patch lib_patch.Upstream +package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch lib_patch.Upstream +package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch lib_patch.Upstream +package/libsvg/0001-fix-expat-static-declaration.patch lib_patch.Upstream +package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch lib_patch.Upstream +package/libsvgtiny/0001-disable-debug-printfs.patch lib_patch.Upstream +package/libsvgtiny/0002-Remove-Werror.patch lib_patch.Upstream +package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch lib_patch.Upstream +package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch lib_patch.Upstream +package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch lib_patch.Upstream +package/libtelnet/0001-fix-compilation-without-zlib.patch lib_patch.Upstream +package/libtheora/0001-link-libtheoradec.patch lib_patch.Upstream +package/libtheora/0002-fix-autoreconf.patch lib_patch.Upstream +package/libtomcrypt/0001-fix-CVE-2019-17362.patch lib_patch.Upstream +package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch lib_patch.Upstream +package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch lib_patch.Upstream +package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch lib_patch.Upstream +package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch lib_patch.Upstream +package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch lib_patch.Upstream +package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch lib_patch.Upstream +package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch lib_patch.Upstream +package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch lib_patch.Upstream +package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch lib_patch.Upstream +package/libwebsock/0002-fix-ssl.patch lib_patch.Upstream +package/libwebsock/0003-fix-incorrect-inline.patch lib_patch.Upstream +package/libyuv/0001-i386-sse2.patch lib_patch.Upstream +package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch lib_patch.Upstream +package/lighttpd/S50lighttpd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch lib_patch.Upstream +package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch lib_patch.Upstream +package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch lib_patch.Upstream +package/linux-fusion/0001-fix-for-linux-4-and-above.patch lib_patch.Upstream +package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch lib_patch.Upstream +package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch lib_patch.Upstream +package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch lib_patch.Upstream +package/linux-zigbee/0001-test-serial-Remove-test-serial.patch lib_patch.Upstream +package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch lib_patch.Upstream +package/linuxptp/S65ptp4l Shellcheck lib_sysv.Indent +package/linuxptp/S66phc2sys Shellcheck lib_sysv.Indent +package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch lib_patch.Upstream +package/lirc-tools/0002-configure-add-disable-doc-option.patch lib_patch.Upstream +package/lirc-tools/S25lircd lib_sysv.Indent lib_sysv.Variables +package/lite/0001-dfbspy-stat.patch lib_patch.Sob lib_patch.Upstream +package/lite/0002-no-tests.patch lib_patch.Sob lib_patch.Upstream +package/lite/0003-pkg-config.patch lib_patch.Sob lib_patch.Upstream +package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch lib_patch.Upstream +package/lldpd/S60lldpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch lib_patch.Upstream +package/llvm-project/libclc/0001-support-out-of-tree-build.patch lib_patch.Upstream +package/lm-sensors/0001-static-build.patch lib_patch.Upstream +package/lm-sensors/0002-no-host-ldconfig.patch lib_patch.Upstream +package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch lib_patch.Upstream +package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch lib_patch.Upstream +package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch lib_patch.Upstream +package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch lib_patch.Upstream +package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch lib_patch.Upstream +package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch lib_patch.Upstream +package/lockfile-progs/0001-sus3v-legacy.patch lib_patch.Sob lib_patch.Upstream +package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch lib_patch.Upstream +package/ltrace/0001-arm-plt.patch lib_patch.Upstream +package/ltrace/0002-sparc-add-missing-library.h-include.patch lib_patch.Upstream +package/ltrace/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch lib_patch.Upstream +package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch lib_patch.Upstream +package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch lib_patch.Upstream +package/lttng-libust/0001-configure.ac-add-disable-tests.patch lib_patch.Upstream +package/lttng-tools/0001-configure.ac-add-disable-tests.patch lib_patch.Upstream +package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch lib_patch.Upstream +package/lua-lunix/0001-remove-link-with-librt.patch lib_patch.Upstream +package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch lib_patch.Upstream +package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch lib_patch.Upstream +package/lua/5.1.5/0001-root-path.patch lib_patch.Upstream +package/lua/5.1.5/0002-shared-libs-for-lua.patch lib_patch.Upstream +package/lua/5.1.5/0011-linenoise.patch lib_patch.Upstream +package/lua/5.1.5/0012-fix-reader-at-eoz.patch lib_patch.Upstream +package/lua/5.3.6/0001-root-path.patch lib_patch.Upstream +package/lua/5.3.6/0002-shared-libs-for-lua.patch lib_patch.Upstream +package/lua/5.3.6/0003-linenoise.patch lib_patch.Upstream +package/lua/5.4.6/0001-root-path.patch lib_patch.Upstream +package/lua/5.4.6/0002-shared-libs-for-lua.patch lib_patch.Upstream +package/lua/5.4.6/0011-linenoise.patch lib_patch.Upstream +package/luajit/0001-no-bin-symlink.patch lib_patch.Upstream +package/luajit/0002-install-inc.patch lib_patch.Upstream +package/luasyslog/0001-remove-AX_LUA_LIBS.patch lib_patch.Upstream +package/luasyslog/0002-build-ax_lua.m4-fix-cross-compilation.patch lib_patch.Upstream +package/lugaru/0001-ImageIO-fix-invalid-conversion.patch lib_patch.Upstream +package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch lib_patch.Upstream +package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch lib_patch.Upstream +package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch lib_patch.Upstream +package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream +package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream +package/lz4/0001-build-Support-BUILD_SHARED-no.patch lib_patch.Upstream +package/lzma/0001-Remove-static-from-LDFLAGS.patch lib_patch.Upstream +package/lzop/0001-allow-overriding-modification-time.patch lib_patch.Upstream +package/macchanger/0001-Fix-missing-include-for-caddr_t.patch lib_patch.Upstream +package/madplay/0001-switch-to-new-alsa-api.patch lib_patch.Sob lib_patch.Upstream +package/madplay/0002-configure-ac-automake-foreign.patch lib_patch.Upstream +package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch lib_patch.Upstream +package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch lib_patch.Upstream +package/makedumpfile/0002-Handle-__mips64.patch lib_patch.Upstream +package/mariadb/0001-add-extra-check-for-librt.patch lib_patch.Upstream +package/mariadb/S97mysqld Shellcheck lib_sysv.Indent lib_sysv.Variables +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck lib_shellscript.TrailingSpace +package/matchbox-lib/0001-index-is-legacy.patch lib_patch.Upstream +package/matchbox-panel/0001-index-is-legacy.patch lib_patch.Upstream +package/matchbox-panel/0002-mb-applet-wireless.patch lib_patch.Upstream +package/matchbox-panel/0003-mb-applet-battery.patch lib_patch.Upstream +package/matchbox-startup-monitor/0001-true-false.patch lib_patch.Upstream +package/matchbox/0001-defaulttheme.patch lib_patch.Upstream +package/matchbox/0002-src-Fix-build-with-gcc-10.patch lib_patch.Upstream +package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch lib_patch.Upstream +package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch lib_patch.Upstream +package/memstat/0001-PATH_MAX.patch lib_patch.Upstream package/mender-connect/S43mender-connect Shellcheck -package/menu-cache/0001-Support-gcc10-compilation.patch Upstream -package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch Upstream -package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch Upstream -package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch Upstream -package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch Upstream -package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch Upstream -package/metacity/0001-add-libm-reference.patch Upstream -package/metacity/0002-gconf.patch Upstream -package/metacity/0003-mag-add-libm-reference.patch Upstream -package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch Upstream -package/midori/0001-disable-vala-fatal-warnings.patch Upstream -package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch Upstream -package/mii-diag/0001-strchr.patch Sob Upstream -package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch Upstream -package/mini-snmpd/0001-linux.c-fix-musl-build.patch Upstream -package/minidlna/S60minidlnad Indent Shellcheck Variables -package/minissdpd/S50minissdpd Indent Shellcheck Variables -package/modem-manager/S44modem-manager Shellcheck Variables -package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch Upstream -package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch Upstream -package/mongrel2/0001-Do-not-run-tests.patch Upstream -package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch Upstream -package/mongrel2/0003-fix-build-with-gcc-4.8.patch Upstream -package/monit/0001-no-force-static.patch Upstream -package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch Upstream -package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch Upstream -package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch Upstream -package/mono/0002-Ongoing-work-on-the-cmake-build.patch Upstream -package/mosquitto/S50mosquitto Indent Shellcheck Variables -package/motion/S99motion Indent Shellcheck Variables -package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch Upstream -package/mpd/S95mpd Variables -package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch Upstream -package/mpv/0001-fix-powerpc64-altivec.patch Upstream -package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch Upstream +package/menu-cache/0001-Support-gcc10-compilation.patch lib_patch.Upstream +package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch lib_patch.Upstream +package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch lib_patch.Upstream +package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch lib_patch.Upstream +package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch lib_patch.Upstream +package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch lib_patch.Upstream +package/metacity/0001-add-libm-reference.patch lib_patch.Upstream +package/metacity/0002-gconf.patch lib_patch.Upstream +package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream +package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream +package/midori/0001-disable-vala-fatal-warnings.patch lib_patch.Upstream +package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch lib_patch.Upstream +package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream +package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch lib_patch.Upstream +package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream +package/minidlna/S60minidlnad Shellcheck lib_sysv.Indent lib_sysv.Variables +package/minissdpd/S50minissdpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/modem-manager/S44modem-manager Shellcheck lib_sysv.Variables +package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch lib_patch.Upstream +package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch lib_patch.Upstream +package/mongrel2/0001-Do-not-run-tests.patch lib_patch.Upstream +package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch lib_patch.Upstream +package/mongrel2/0003-fix-build-with-gcc-4.8.patch lib_patch.Upstream +package/monit/0001-no-force-static.patch lib_patch.Upstream +package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch lib_patch.Upstream +package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch lib_patch.Upstream +package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch lib_patch.Upstream +package/mono/0002-Ongoing-work-on-the-cmake-build.patch lib_patch.Upstream +package/mosquitto/S50mosquitto Shellcheck lib_sysv.Indent lib_sysv.Variables +package/motion/S99motion Shellcheck lib_sysv.Indent lib_sysv.Variables +package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch lib_patch.Upstream +package/mpd/S95mpd lib_sysv.Variables +package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch lib_patch.Upstream +package/mpv/0001-fix-powerpc64-altivec.patch lib_patch.Upstream +package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch lib_patch.Upstream package/mrouted/S41mrouted NotExecutable -package/mrp/S65mrp Indent Variables -package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch Upstream +package/mrp/S65mrp lib_sysv.Indent lib_sysv.Variables +package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch lib_patch.Upstream package/multipath-tools/S60multipathd Shellcheck -package/musepack/0001-shared.patch Upstream -package/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch Upstream -package/musepack/0003-include-fpu-control-with-glibc-only.patch Upstream -package/musepack/0004-missing-sys-select.patch Upstream -package/musepack/0005-fix-build-with-gcc-10.patch Upstream -package/musl/0001-avoid-kernel-if_ether.h.patch Upstream -package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch Upstream -package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream -package/nanocom/0001-fix-build-with-gcc-10.patch Upstream -package/ncftp/0001-fix-gcc-10.patch Upstream -package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch Upstream -package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch Upstream -package/ne10/0002-fix-build-without-C.patch Upstream -package/neard/S53neard Indent Shellcheck Variables -package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch Upstream -package/netatalk/S50netatalk EmptyLastLine Indent Variables -package/netcat/0001-signed-bit-counting.patch Sob Upstream -package/netopeer2/S52netopeer2 Shellcheck Variables -package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch Upstream -package/netplug/0001-makefile-flags.patch Sob Upstream -package/netplug/0002-add-missing-time-include.patch Upstream -package/netplug/0003-remove-assert-fail.patch Upstream -package/netplug/S29netplug Indent Shellcheck Variables -package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck -package/netsniff-ng/0001-Detect-libpcap-dependencies-using-pkg-config.patch Upstream -package/netsnmp/S59snmpd Indent Shellcheck Variables -package/netsurf/0001-avoid-system-perl-dependencies.patch Upstream -package/netsurf/0002-do-not-cross-compile-nsgenbind.patch Upstream -package/netsurf/0003-fix-compilation-without-curl.patch Upstream -package/netsurf/0004-framebuffer-Fix-internal-font-generated-source-for-GCC-10.patch Upstream -package/nettle/0001-disable-testsuite-examples.patch Upstream -package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables -package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables -package/nginx-modsecurity/0001-config-use-pkg-config.patch Upstream -package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch Upstream -package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch Upstream -package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch Upstream -package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch Upstream -package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch Upstream -package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch Upstream -package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch Upstream -package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Upstream -package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch Upstream -package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream -package/nginx/S50nginx Indent Variables -package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch Upstream -package/nmap/0001-libdnet-wrapper-configure.patch Upstream -package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch Upstream -package/nodejs/nodejs-src/0002-check-if-uclibc-has-backtrace-support.patch Upstream -package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch Upstream -package/nodejs/nodejs-src/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch Upstream -package/nodm/S90nodm Indent Shellcheck Variables -package/norm/0001-protolib-drop-linux-version-check.patch Upstream -package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch Upstream -package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch Upstream -package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables -package/ntp/0001-nano.patch Upstream -package/ntp/0002-ntp-syscalls-fallback.patch Upstream -package/ntp/S49ntp.in Variables -package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch Upstream -package/numactl/0001-link-with-latomic-if-needed-again.patch Upstream -package/nuttcp/0001-susv3-legacy.patch Upstream -package/nvidia-driver/0001-use-LDFLAGS.patch Upstream -package/octave/0001-Fix-BLAS-library-integer-size-detection.patch Upstream -package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch Upstream -package/odb/0002-Remove-gratuitous-classes.patch Upstream -package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch Upstream -package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch Upstream -package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch Upstream -package/odb/0006-Adapt-to-changes-in-GCC-8.patch Upstream -package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch Upstream -package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch Upstream -package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch Upstream -package/odb/0010-Add-initial-support-for-GCC-9.patch Upstream -package/odb/0011-Adjust-to-changes-in-GCC-10.patch Upstream -package/odb/0012-Adjust-to-changes-in-GCC-11.patch Upstream -package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch Upstream -package/ofono/0001-uclibc-backtrace.patch Upstream -package/ofono/S46ofono Variables -package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch Upstream -package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch Upstream -package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch Upstream -package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch Upstream -package/olsr/0005-lib-pud-src-gpsdclient.c-drop-handling-of-gpsdata-fi.patch Upstream -package/olsr/0006-build-patch-for-gpsd-3-25.patch Upstream -package/olsr/S50olsr Indent Shellcheck Variables -package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Upstream -package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream -package/open2300/0001-fix-makefile.patch Upstream -package/openjdk/17.0.9+9/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream -package/openjdk/21.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream -package/openldap/0001-fix-bignum.patch Upstream -package/openldap/0002-disable-docs.patch Upstream -package/openntpd/S49ntp Shellcheck Variables -package/openocd/0001-configure-enable-build-on-uclinux.patch Upstream -package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch Upstream -package/openpgm/0002-openpgm-pgm-checksum.c-fix-build-with-32-bits-MMX.patch Upstream -package/openpgm/0003-fix-build-on-macOS-ARM.patch Upstream -package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch Upstream -package/openpowerlink/0002-cmake-install-oplk-headers-files.patch Upstream -package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch Upstream -package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch Upstream -package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch Upstream -package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch Upstream -package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch Upstream -package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch Upstream -package/openrc/0006-Also-create-run-lock-subsys-directory.patch Upstream -package/openssh/S50sshd EmptyLastLine Indent Variables -package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch Upstream -package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch Upstream -package/openvmtools/0001-no_cflags_werror.patch Upstream -package/openvmtools/0002-dont-force-cppflags.patch Upstream -package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch Upstream -package/openvmtools/0004-Remove-assumptions-about-glibc-being-only-libc-imple.patch Upstream -package/openvmtools/0005-Use-configure-test-for-struct-timespec.patch Upstream -package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch Upstream -package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch Upstream -package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch Upstream -package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch Upstream -package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch Upstream +package/musepack/0001-shared.patch lib_patch.Upstream +package/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch lib_patch.Upstream +package/musepack/0003-include-fpu-control-with-glibc-only.patch lib_patch.Upstream +package/musepack/0004-missing-sys-select.patch lib_patch.Upstream +package/musepack/0005-fix-build-with-gcc-10.patch lib_patch.Upstream +package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream +package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream +package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream +package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream +package/ncftp/0001-fix-gcc-10.patch lib_patch.Upstream +package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream +package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream +package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream +package/neard/S53neard Shellcheck lib_sysv.Indent lib_sysv.Variables +package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/netatalk/S50netatalk lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/netcat/0001-signed-bit-counting.patch lib_patch.Sob lib_patch.Upstream +package/netopeer2/S52netopeer2 Shellcheck lib_sysv.Variables +package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch lib_patch.Upstream +package/netplug/0001-makefile-flags.patch lib_patch.Sob lib_patch.Upstream +package/netplug/0002-add-missing-time-include.patch lib_patch.Upstream +package/netplug/0003-remove-assert-fail.patch lib_patch.Upstream +package/netplug/S29netplug Shellcheck lib_sysv.Indent lib_sysv.Variables +package/netplug/netplug-script Shellcheck lib_shellscript.ConsecutiveEmptyLines +package/netsniff-ng/0001-Detect-libpcap-dependencies-using-pkg-config.patch lib_patch.Upstream +package/netsnmp/S59snmpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/netsurf/0001-avoid-system-perl-dependencies.patch lib_patch.Upstream +package/netsurf/0002-do-not-cross-compile-nsgenbind.patch lib_patch.Upstream +package/netsurf/0003-fix-compilation-without-curl.patch lib_patch.Upstream +package/netsurf/0004-framebuffer-Fix-internal-font-generated-source-for-GCC-10.patch lib_patch.Upstream +package/nettle/0001-disable-testsuite-examples.patch lib_patch.Upstream +package/network-manager/S45network-manager Shellcheck lib_sysv.ConsecutiveEmptyLines lib_sysv.EmptyLastLine lib_sysv.Variables +package/nfs-utils/S60nfs Shellcheck lib_sysv.ConsecutiveEmptyLines lib_sysv.Variables +package/nginx-modsecurity/0001-config-use-pkg-config.patch lib_patch.Upstream +package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch lib_patch.Upstream +package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch lib_patch.Upstream +package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch lib_patch.Upstream +package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch lib_patch.Upstream +package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch lib_patch.Upstream +package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch lib_patch.Upstream +package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch lib_patch.Upstream +package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch lib_patch.Upstream +package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch lib_patch.Upstream +package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream +package/nginx/S50nginx lib_sysv.Indent lib_sysv.Variables +package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch lib_patch.Upstream +package/nmap/0001-libdnet-wrapper-configure.patch lib_patch.Upstream +package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch lib_patch.Upstream +package/nodejs/nodejs-src/0002-check-if-uclibc-has-backtrace-support.patch lib_patch.Upstream +package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch lib_patch.Upstream +package/nodejs/nodejs-src/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch lib_patch.Upstream +package/nodm/S90nodm Shellcheck lib_sysv.Indent lib_sysv.Variables +package/norm/0001-protolib-drop-linux-version-check.patch lib_patch.Upstream +package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch lib_patch.Upstream +package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch lib_patch.Upstream +package/nss-pam-ldapd/S45nslcd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/ntp/0001-nano.patch lib_patch.Upstream +package/ntp/0002-ntp-syscalls-fallback.patch lib_patch.Upstream +package/ntp/S49ntp.in lib_sysv.Variables +package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch lib_patch.Upstream +package/numactl/0001-link-with-latomic-if-needed-again.patch lib_patch.Upstream +package/nuttcp/0001-susv3-legacy.patch lib_patch.Upstream +package/nvidia-driver/0001-use-LDFLAGS.patch lib_patch.Upstream +package/octave/0001-Fix-BLAS-library-integer-size-detection.patch lib_patch.Upstream +package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch lib_patch.Upstream +package/odb/0002-Remove-gratuitous-classes.patch lib_patch.Upstream +package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch lib_patch.Upstream +package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch lib_patch.Upstream +package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch lib_patch.Upstream +package/odb/0006-Adapt-to-changes-in-GCC-8.patch lib_patch.Upstream +package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch lib_patch.Upstream +package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch lib_patch.Upstream +package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch lib_patch.Upstream +package/odb/0010-Add-initial-support-for-GCC-9.patch lib_patch.Upstream +package/odb/0011-Adjust-to-changes-in-GCC-10.patch lib_patch.Upstream +package/odb/0012-Adjust-to-changes-in-GCC-11.patch lib_patch.Upstream +package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch lib_patch.Upstream +package/ofono/0001-uclibc-backtrace.patch lib_patch.Upstream +package/ofono/S46ofono lib_sysv.Variables +package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch lib_patch.Upstream +package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch lib_patch.Upstream +package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch lib_patch.Upstream +package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch lib_patch.Upstream +package/olsr/0005-lib-pud-src-gpsdclient.c-drop-handling-of-gpsdata-fi.patch lib_patch.Upstream +package/olsr/0006-build-patch-for-gpsd-3-25.patch lib_patch.Upstream +package/olsr/S50olsr Shellcheck lib_sysv.Indent lib_sysv.Variables +package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch lib_patch.Upstream +package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch lib_patch.Upstream +package/open2300/0001-fix-makefile.patch lib_patch.Upstream +package/openjdk/17.0.9+9/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream +package/openjdk/21.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream +package/openldap/0001-fix-bignum.patch lib_patch.Upstream +package/openldap/0002-disable-docs.patch lib_patch.Upstream +package/openntpd/S49ntp Shellcheck lib_sysv.Variables +package/openocd/0001-configure-enable-build-on-uclinux.patch lib_patch.Upstream +package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch lib_patch.Upstream +package/openpgm/0002-openpgm-pgm-checksum.c-fix-build-with-32-bits-MMX.patch lib_patch.Upstream +package/openpgm/0003-fix-build-on-macOS-ARM.patch lib_patch.Upstream +package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch lib_patch.Upstream +package/openpowerlink/0002-cmake-install-oplk-headers-files.patch lib_patch.Upstream +package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch lib_patch.Upstream +package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch lib_patch.Upstream +package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch lib_patch.Upstream +package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch lib_patch.Upstream +package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch lib_patch.Upstream +package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch lib_patch.Upstream +package/openrc/0006-Also-create-run-lock-subsys-directory.patch lib_patch.Upstream +package/openssh/S50sshd lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch lib_patch.Upstream +package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch lib_patch.Upstream +package/openvmtools/0001-no_cflags_werror.patch lib_patch.Upstream +package/openvmtools/0002-dont-force-cppflags.patch lib_patch.Upstream +package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch lib_patch.Upstream +package/openvmtools/0004-Remove-assumptions-about-glibc-being-only-libc-imple.patch lib_patch.Upstream +package/openvmtools/0005-Use-configure-test-for-struct-timespec.patch lib_patch.Upstream +package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch lib_patch.Upstream +package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch lib_patch.Upstream +package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch lib_patch.Upstream +package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch lib_patch.Upstream +package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch lib_patch.Upstream package/openvmtools/shutdown Shellcheck -package/openvpn/S60openvpn Indent Shellcheck Variables -package/oprofile/0001-musl.patch Upstream -package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch Upstream -package/owfs/S55owserver Shellcheck Variables -package/owfs/S60owfs Shellcheck Variables -package/owl-linux/0001-fix-for-linux-3.3.x.patch Upstream -package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch Upstream -package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch Upstream -package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch Upstream -package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch Upstream -package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch Upstream -package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch Upstream -package/paxtest/0001-genpaxtest-move-log-location.patch Upstream -package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch Upstream -package/pcm-tools/0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch Upstream -package/pcmanfm/0001-po-de-po-fix-build-with-gettext-tiny.patch Upstream -package/pcre/0001-Kill-compatibility-bits.patch Upstream -package/pcre/0002-Disable-C-unit-tests.patch Upstream -package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch Upstream -package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch Upstream -package/perl-net-ssleay/0001-fix-build-system.patch Upstream -package/perl-sys-cpu/0001-remove-extraneous-include.patch Upstream -package/perl-xml-libxml/0001-Makefile-PL.patch Upstream -package/php-geoip/0001-add-build-support-for-php8.patch Upstream -package/php-lua/0001-ZEND_ACC_ALLOW_STATIC-ZEND_ACC_STATIC-for-static-met.patch Upstream -package/php-lua/0002-php8-explicitly-declare-arginfo.patch Upstream -package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch Upstream -package/php-zmq/0002-fix-for-php-7.3.patch Upstream -package/php-zmq/0003-fix-for-php-8.0.0beta2.patch Upstream -package/php/0001-acinclude.m4-don-t-unset-variables.patch Upstream -package/php/0002-iconv-tweak-iconv-detection.patch Upstream -package/php/0003-configure-disable-the-phar-tool.patch Upstream -package/php/0004-Call-apxs-with-correct-prefix.patch Upstream -package/php/0005-allow-opcache-cross-compiling.patch Upstream -package/pifmrds/0001-Makefile-cross-compile-friendly.patch Upstream -package/pifmrds/0002-Makefile-use-LDFLAGS.patch Upstream -package/pifmrds/0003-Makefile-fix-static-link.patch Upstream -package/pigpio/S50pigpio Shellcheck Variables -package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch Upstream -package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch Upstream -package/pixman/0001-Disable-tests.patch Upstream -package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch Upstream -package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch Upstream +package/openvpn/S60openvpn Shellcheck lib_sysv.Indent lib_sysv.Variables +package/oprofile/0001-musl.patch lib_patch.Upstream +package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch lib_patch.Upstream +package/owfs/S55owserver Shellcheck lib_sysv.Variables +package/owfs/S60owfs Shellcheck lib_sysv.Variables +package/owl-linux/0001-fix-for-linux-3.3.x.patch lib_patch.Upstream +package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch lib_patch.Upstream +package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch lib_patch.Upstream +package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch lib_patch.Upstream +package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch lib_patch.Upstream +package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch lib_patch.Upstream +package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch lib_patch.Upstream +package/paxtest/0001-genpaxtest-move-log-location.patch lib_patch.Upstream +package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch lib_patch.Upstream +package/pcm-tools/0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch lib_patch.Upstream +package/pcmanfm/0001-po-de-po-fix-build-with-gettext-tiny.patch lib_patch.Upstream +package/pcre/0001-Kill-compatibility-bits.patch lib_patch.Upstream +package/pcre/0002-Disable-C-unit-tests.patch lib_patch.Upstream +package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch lib_patch.Upstream +package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch lib_patch.Upstream +package/perl-net-ssleay/0001-fix-build-system.patch lib_patch.Upstream +package/perl-sys-cpu/0001-remove-extraneous-include.patch lib_patch.Upstream +package/perl-xml-libxml/0001-Makefile-PL.patch lib_patch.Upstream +package/php-geoip/0001-add-build-support-for-php8.patch lib_patch.Upstream +package/php-lua/0001-ZEND_ACC_ALLOW_STATIC-ZEND_ACC_STATIC-for-static-met.patch lib_patch.Upstream +package/php-lua/0002-php8-explicitly-declare-arginfo.patch lib_patch.Upstream +package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch lib_patch.Upstream +package/php-zmq/0002-fix-for-php-7.3.patch lib_patch.Upstream +package/php-zmq/0003-fix-for-php-8.0.0beta2.patch lib_patch.Upstream +package/php/0001-acinclude.m4-don-t-unset-variables.patch lib_patch.Upstream +package/php/0002-iconv-tweak-iconv-detection.patch lib_patch.Upstream +package/php/0003-configure-disable-the-phar-tool.patch lib_patch.Upstream +package/php/0004-Call-apxs-with-correct-prefix.patch lib_patch.Upstream +package/php/0005-allow-opcache-cross-compiling.patch lib_patch.Upstream +package/pifmrds/0001-Makefile-cross-compile-friendly.patch lib_patch.Upstream +package/pifmrds/0002-Makefile-use-LDFLAGS.patch lib_patch.Upstream +package/pifmrds/0003-Makefile-fix-static-link.patch lib_patch.Upstream +package/pigpio/S50pigpio Shellcheck lib_sysv.Variables +package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch lib_patch.Upstream +package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch lib_patch.Upstream +package/pixman/0001-Disable-tests.patch lib_patch.Upstream +package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch lib_patch.Upstream +package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch lib_patch.Upstream package/pkgconf/pkg-config.in Shellcheck -package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch Upstream -package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream -package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch Upstream -package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch Upstream -package/postgresql/S50postgresql Variables -package/pptp-linux/0001-susv3-legacy.patch Upstream -package/pptp-linux/0002-fix-parallel-build.patch Upstream -package/prboom/0001-libpng-1.4.patch Upstream -package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch Upstream -package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch Upstream -package/procps-ng/0001-configure-Add--disable-w.patch Upstream -package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch Upstream -package/procps-ng/0003-fix-pifd_open-check.patch Upstream -package/procps-ng/S02sysctl Variables -package/proftpd/S50proftpd Indent Shellcheck Variables -package/prosody/0001-enable-syslog.patch Upstream -package/prosody/0002-add-pidfile.patch Upstream -package/prosody/S50prosody Indent Shellcheck Variables -package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch Upstream -package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch Upstream -package/ptpd/S65ptpd Indent Shellcheck Variables -package/ptpd2/0001-musl.patch Upstream -package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch Upstream -package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch Upstream -package/ptpd2/S65ptpd2 Indent Shellcheck Variables -package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch Upstream -package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables -package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch Upstream -package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch Upstream -package/pulseview/0003-Support-glibmm-2.68.patch Upstream -package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch Upstream -package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch Upstream -package/python-daphne/0001-remove-pytest-runner-requirement.patch Upstream -package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch Upstream -package/python-pylibftdi/0001-do-not-use-find-library.patch Upstream -package/python-pyqt5/0001-configure-skip-qtdetail.patch Upstream -package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch Upstream -package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch Upstream -package/python-pyzmq/0001-detect.py-fix-the-ZMQ-version-check-to-the-ZMQ-versi.patch Upstream -package/python-scipy/0001-build-sh4-FE.patch Upstream -package/python-setuptools/0001-add-executable.patch Upstream -package/python-sip/0001-remove-join-from-sip-h-files-string.patch Upstream -package/python-web2py/S51web2py Shellcheck Variables -package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch Upstream -package/python3/0001-Make-the-build-of-pyc-files-conditional.patch Upstream -package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch Upstream -package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch Upstream -package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch Upstream -package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch Upstream -package/python3/0006-Don-t-add-multiarch-paths.patch Upstream -package/python3/0007-Abort-on-failed-module-build.patch Upstream -package/python3/0008-Serial-ioctl-workaround.patch Upstream -package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch Upstream -package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch Upstream -package/python3/0011-Add-an-option-to-disable-pydoc.patch Upstream -package/python3/0012-Add-an-option-to-disable-lib2to3.patch Upstream -package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch Upstream -package/python3/0014-Add-an-option-to-disable-the-tk-module.patch Upstream -package/python3/0015-Add-an-option-to-disable-the-curses-module.patch Upstream -package/python3/0016-Add-an-option-to-disable-expat.patch Upstream -package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch Upstream -package/python3/0018-Add-an-option-to-disable-NIS.patch Upstream -package/python3/0019-Add-an-option-to-disable-unicodedata.patch Upstream -package/python3/0020-Add-an-option-to-disable-IDLE.patch Upstream -package/python3/0021-Add-an-option-to-disable-decimal.patch Upstream -package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch Upstream -package/python3/0023-Add-an-option-to-disable-openssl-support.patch Upstream -package/python3/0024-Add-an-option-to-disable-the-readline-module.patch Upstream -package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch Upstream -package/python3/0026-python-config.sh-don-t-reassign-prefix.patch Upstream -package/python3/0027-Add-an-option-to-disable-uuid-module.patch Upstream -package/python3/0028-fix-building-on-older-distributions.patch Upstream -package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch Upstream -package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch Upstream -package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch Upstream -package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch Upstream -package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch Upstream -package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch Upstream -package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch Upstream -package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch Upstream -package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch Upstream -package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch Upstream -package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch Upstream -package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch Upstream -package/qt5/qt5base/0006-Fix-build-on-riscv32.patch Upstream -package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch Upstream -package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch Upstream -package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch Upstream -package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch Upstream -package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch Upstream -package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch Upstream -package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch Upstream -package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch Upstream -package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch Upstream -package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch Upstream -package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch Upstream -package/qt5/qt5webengine/0002-Add-python3-build-support.patch Upstream -package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch Upstream -package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch Upstream -package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch Upstream -package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch Upstream -package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch Upstream -package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https.patch Upstream -package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch Upstream -package/quagga/0001-fix-ipctl-forwarding.patch Upstream -package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch Upstream -package/quagga/0003-Fix-build-with-gcc-10.patch Upstream -package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch Upstream -package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch Upstream -package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch Upstream -package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch Upstream -package/rdesktop/0001-8bit-colors.patch Sob Upstream -package/read-edid/0001-Fix-install-file-list.patch Upstream -package/read-edid/0002-Fix-compiler-check.patch Upstream -package/read-edid/0003-fix-build-with-gcc-10.patch Upstream -package/readline/0001-curses-link.patch Upstream -package/redis/0001-uclibc.patch Upstream -package/redis/0002-largefile-conditional-define.patch Upstream -package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch Upstream -package/redis/S50redis Shellcheck Variables +package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch lib_patch.Upstream +package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream +package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch lib_patch.Upstream +package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch lib_patch.Upstream +package/postgresql/S50postgresql lib_sysv.Variables +package/pptp-linux/0001-susv3-legacy.patch lib_patch.Upstream +package/pptp-linux/0002-fix-parallel-build.patch lib_patch.Upstream +package/prboom/0001-libpng-1.4.patch lib_patch.Upstream +package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch lib_patch.Upstream +package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch lib_patch.Upstream +package/procps-ng/0001-configure-Add--disable-w.patch lib_patch.Upstream +package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch lib_patch.Upstream +package/procps-ng/0003-fix-pifd_open-check.patch lib_patch.Upstream +package/procps-ng/S02sysctl lib_sysv.Variables +package/proftpd/S50proftpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/prosody/0001-enable-syslog.patch lib_patch.Upstream +package/prosody/0002-add-pidfile.patch lib_patch.Upstream +package/prosody/S50prosody Shellcheck lib_sysv.Indent lib_sysv.Variables +package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch lib_patch.Upstream +package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch lib_patch.Upstream +package/ptpd/S65ptpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/ptpd2/0001-musl.patch lib_patch.Upstream +package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch lib_patch.Upstream +package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch lib_patch.Upstream +package/ptpd2/S65ptpd2 Shellcheck lib_sysv.Indent lib_sysv.Variables +package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch lib_patch.Upstream +package/pulseaudio/S50pulseaudio lib_sysv.ConsecutiveEmptyLines lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch lib_patch.Upstream +package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch lib_patch.Upstream +package/pulseview/0003-Support-glibmm-2.68.patch lib_patch.Upstream +package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch lib_patch.Upstream +package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch lib_patch.Upstream +package/python-daphne/0001-remove-pytest-runner-requirement.patch lib_patch.Upstream +package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch lib_patch.Upstream +package/python-pylibftdi/0001-do-not-use-find-library.patch lib_patch.Upstream +package/python-pyqt5/0001-configure-skip-qtdetail.patch lib_patch.Upstream +package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch lib_patch.Upstream +package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch lib_patch.Upstream +package/python-pyzmq/0001-detect.py-fix-the-ZMQ-version-check-to-the-ZMQ-versi.patch lib_patch.Upstream +package/python-scipy/0001-build-sh4-FE.patch lib_patch.Upstream +package/python-setuptools/0001-add-executable.patch lib_patch.Upstream +package/python-sip/0001-remove-join-from-sip-h-files-string.patch lib_patch.Upstream +package/python-web2py/S51web2py Shellcheck lib_sysv.Variables +package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch lib_patch.Upstream +package/python3/0001-Make-the-build-of-pyc-files-conditional.patch lib_patch.Upstream +package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch lib_patch.Upstream +package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch lib_patch.Upstream +package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch lib_patch.Upstream +package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch lib_patch.Upstream +package/python3/0006-Don-t-add-multiarch-paths.patch lib_patch.Upstream +package/python3/0007-Abort-on-failed-module-build.patch lib_patch.Upstream +package/python3/0008-Serial-ioctl-workaround.patch lib_patch.Upstream +package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch lib_patch.Upstream +package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch lib_patch.Upstream +package/python3/0011-Add-an-option-to-disable-pydoc.patch lib_patch.Upstream +package/python3/0012-Add-an-option-to-disable-lib2to3.patch lib_patch.Upstream +package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch lib_patch.Upstream +package/python3/0014-Add-an-option-to-disable-the-tk-module.patch lib_patch.Upstream +package/python3/0015-Add-an-option-to-disable-the-curses-module.patch lib_patch.Upstream +package/python3/0016-Add-an-option-to-disable-expat.patch lib_patch.Upstream +package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch lib_patch.Upstream +package/python3/0018-Add-an-option-to-disable-NIS.patch lib_patch.Upstream +package/python3/0019-Add-an-option-to-disable-unicodedata.patch lib_patch.Upstream +package/python3/0020-Add-an-option-to-disable-IDLE.patch lib_patch.Upstream +package/python3/0021-Add-an-option-to-disable-decimal.patch lib_patch.Upstream +package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch lib_patch.Upstream +package/python3/0023-Add-an-option-to-disable-openssl-support.patch lib_patch.Upstream +package/python3/0024-Add-an-option-to-disable-the-readline-module.patch lib_patch.Upstream +package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch lib_patch.Upstream +package/python3/0026-python-config.sh-don-t-reassign-prefix.patch lib_patch.Upstream +package/python3/0027-Add-an-option-to-disable-uuid-module.patch lib_patch.Upstream +package/python3/0028-fix-building-on-older-distributions.patch lib_patch.Upstream +package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch lib_patch.Upstream +package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch lib_patch.Upstream +package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch lib_patch.Upstream +package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch lib_patch.Upstream +package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch lib_patch.Upstream +package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch lib_patch.Upstream +package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch lib_patch.Upstream +package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch lib_patch.Upstream +package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch lib_patch.Upstream +package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch lib_patch.Upstream +package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch lib_patch.Upstream +package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch lib_patch.Upstream +package/qt5/qt5base/0006-Fix-build-on-riscv32.patch lib_patch.Upstream +package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch lib_patch.Upstream +package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch lib_patch.Upstream +package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch lib_patch.Upstream +package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch lib_patch.Upstream +package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch lib_patch.Upstream +package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch lib_patch.Upstream +package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch lib_patch.Upstream +package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch lib_patch.Upstream +package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch lib_patch.Upstream +package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch lib_patch.Upstream +package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch lib_patch.Upstream +package/qt5/qt5webengine/0002-Add-python3-build-support.patch lib_patch.Upstream +package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch lib_patch.Upstream +package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch lib_patch.Upstream +package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch lib_patch.Upstream +package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch lib_patch.Upstream +package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch lib_patch.Upstream +package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https.patch lib_patch.Upstream +package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch lib_patch.Upstream +package/quagga/0001-fix-ipctl-forwarding.patch lib_patch.Upstream +package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/quagga/0003-Fix-build-with-gcc-10.patch lib_patch.Upstream +package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch lib_patch.Upstream +package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream +package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream +package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream +package/rdesktop/0001-8bit-colors.patch lib_patch.Sob lib_patch.Upstream +package/read-edid/0001-Fix-install-file-list.patch lib_patch.Upstream +package/read-edid/0002-Fix-compiler-check.patch lib_patch.Upstream +package/read-edid/0003-fix-build-with-gcc-10.patch lib_patch.Upstream +package/readline/0001-curses-link.patch lib_patch.Upstream +package/redis/0001-uclibc.patch lib_patch.Upstream +package/redis/0002-largefile-conditional-define.patch lib_patch.Upstream +package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch lib_patch.Upstream +package/redis/S50redis Shellcheck lib_sysv.Variables package/restorecond/S02restorecond Shellcheck -package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch Upstream -package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch Upstream -package/rng-tools/S21rngd Shellcheck Variables -package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch Upstream -package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch Upstream -package/rpcbind/0001-Remove-yellow-pages-support.patch Upstream -package/rpcbind/S30rpcbind EmptyLastLine Indent Variables -package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch Upstream -package/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch Upstream -package/rpi-userland/0003-Disable-Werror-everywhere.patch Upstream -package/rpi-userland/0004-host-applications-disable-missing-applications.patch Upstream -package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch Upstream -package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch Upstream -package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch Upstream -package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch Upstream -package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch Upstream -package/rtmpdump/0001-include-limits.h.patch Upstream -package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream -package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream -package/rubix/0001-dont-use-legacy-functions.patch Upstream -package/rubix/0002-misc-fixes.patch Sob Upstream -package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch Upstream -package/rygel/S99rygel Indent Shellcheck Variables -package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch Upstream -package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch Upstream -package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch Upstream -package/samba4/0001-libreplace-disable-libbsd-support.patch Upstream -package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch Upstream -package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch Upstream -package/samba4/S91smb Indent Shellcheck Variables -package/sane-backends/0001-sane_backend-add-missing-config.h.patch Upstream -package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch Upstream -package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch Upstream -package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch Upstream -package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch Upstream -package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch Upstream -package/screen/0006-comm.h-now-depends-on-term.h.patch Upstream -package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch Upstream -package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch Upstream -package/sdl/0001-use-correct-directfb-config.patch Upstream -package/sdl/0002-fix-compilation-with-libx11.patch Upstream -package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch Upstream -package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch Upstream -package/sdl_mixer/0002-configure__set_macro_directory.patch Upstream -package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch Upstream -package/sdl_sound/0001-fix-constness.patch Upstream -package/sdl_sound/0002-remove-werror.patch Upstream -package/sdl_sound/0003-renamed-physfs-export.patch Upstream -package/seatd/S70seatd NotExecutable Variables -package/sedutil/0001-Common-log.h-time-2-needs-time.h.patch Upstream -package/sentry-native/0001-sentry.h-include-ucontext.h.patch Upstream -package/ser2net/S50ser2net Indent Shellcheck Variables -package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch Upstream -package/setserial/0001-build-system-fix.patch Upstream -package/setserial/0002-tiocghayesesp-build-fix.patch Upstream -package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch Upstream -package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch Upstream -package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch Upstream -package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch Upstream -package/shairport-sync/S99shairport-sync Indent Shellcheck Variables -package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch Upstream -package/shellinabox/0001-Makefile-disable-always-building-statically.patch Upstream -package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch Upstream +package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch lib_patch.Upstream +package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch lib_patch.Upstream +package/rng-tools/S21rngd Shellcheck lib_sysv.Variables +package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch lib_patch.Upstream +package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch lib_patch.Upstream +package/rpcbind/0001-Remove-yellow-pages-support.patch lib_patch.Upstream +package/rpcbind/S30rpcbind lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch lib_patch.Upstream +package/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch lib_patch.Upstream +package/rpi-userland/0003-Disable-Werror-everywhere.patch lib_patch.Upstream +package/rpi-userland/0004-host-applications-disable-missing-applications.patch lib_patch.Upstream +package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch lib_patch.Upstream +package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch lib_patch.Upstream +package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch lib_patch.Upstream +package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch lib_patch.Upstream +package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch lib_patch.Upstream +package/rtmpdump/0001-include-limits.h.patch lib_patch.Upstream +package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patch.Upstream +package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream +package/rubix/0001-dont-use-legacy-functions.patch lib_patch.Upstream +package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream +package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch lib_patch.Upstream +package/rygel/S99rygel Shellcheck lib_sysv.Indent lib_sysv.Variables +package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch lib_patch.Upstream +package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch lib_patch.Upstream +package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch lib_patch.Upstream +package/samba4/0001-libreplace-disable-libbsd-support.patch lib_patch.Upstream +package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch lib_patch.Upstream +package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch lib_patch.Upstream +package/samba4/S91smb Shellcheck lib_sysv.Indent lib_sysv.Variables +package/sane-backends/0001-sane_backend-add-missing-config.h.patch lib_patch.Upstream +package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch lib_patch.Upstream +package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch lib_patch.Upstream +package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch lib_patch.Upstream +package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch lib_patch.Upstream +package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch lib_patch.Upstream +package/screen/0006-comm.h-now-depends-on-term.h.patch lib_patch.Upstream +package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch lib_patch.Upstream +package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch lib_patch.Upstream +package/sdl/0001-use-correct-directfb-config.patch lib_patch.Upstream +package/sdl/0002-fix-compilation-with-libx11.patch lib_patch.Upstream +package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch lib_patch.Upstream +package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch lib_patch.Upstream +package/sdl_mixer/0002-configure__set_macro_directory.patch lib_patch.Upstream +package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch lib_patch.Upstream +package/sdl_sound/0001-fix-constness.patch lib_patch.Upstream +package/sdl_sound/0002-remove-werror.patch lib_patch.Upstream +package/sdl_sound/0003-renamed-physfs-export.patch lib_patch.Upstream +package/seatd/S70seatd NotExecutable lib_sysv.Variables +package/sedutil/0001-Common-log.h-time-2-needs-time.h.patch lib_patch.Upstream +package/sentry-native/0001-sentry.h-include-ucontext.h.patch lib_patch.Upstream +package/ser2net/S50ser2net Shellcheck lib_sysv.Indent lib_sysv.Variables +package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch lib_patch.Upstream +package/setserial/0001-build-system-fix.patch lib_patch.Upstream +package/setserial/0002-tiocghayesesp-build-fix.patch lib_patch.Upstream +package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch lib_patch.Upstream +package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch lib_patch.Upstream +package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch lib_patch.Upstream +package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch lib_patch.Upstream +package/shairport-sync/S99shairport-sync Shellcheck lib_sysv.Indent lib_sysv.Variables +package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch lib_patch.Upstream +package/shellinabox/0001-Makefile-disable-always-building-statically.patch lib_patch.Upstream +package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch lib_patch.Upstream package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck -package/slang/0001-slsh-libs.patch Upstream -package/smcroute/S41smcroute Indent NotExecutable Variables -package/smstools3/0001-fix-Makefile.patch Upstream -package/smstools3/0002-fix-build-with-gcc-10.x.patch Upstream -package/smstools3/S50smsd Shellcheck Variables -package/snmppp/0001-fix-build-without-v3.patch Upstream -package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch Upstream -package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch Upstream -package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch Upstream -package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch Upstream -package/snort/0005-fix-sparc.patch Upstream -package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch Upstream -package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch Upstream -package/snort/0008-Fix-NO-OPTIMIZE.patch Upstream -package/socketcand/0001-Fix-GCC10-build-failure.patch Upstream -package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch Upstream -package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch Upstream -package/softether/0003-use-fhs-install-directories.patch Upstream -package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch Upstream -package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch Upstream -package/softether/0006-cross-compile.patch Upstream -package/softether/0007-iconv.patch Upstream -package/softether/0008-librt.patch Upstream -package/softether/0009-uclibc-ai-addrconfig.patch Upstream -package/solarus/0001-cmake-remove-Werror.patch Upstream -package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob Upstream -package/sox/0001-uclibc.patch Upstream -package/sox/0002-configure.ac-put-back-disable-stack-protector.patch Upstream -package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch Upstream -package/sox/0004-configure.ac-fix-static-linking-with-magic.patch Upstream -package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch Upstream -package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch Upstream -package/sp-oops-extract/0002-stdint-cleanup.patch Upstream -package/spandsp/0001-configure.ac-fix-AVX-SSE-and-MMX-options.patch Upstream -package/speex/0001-thumb2-support.patch Upstream -package/squid/S97squid Indent Shellcheck Variables -package/sredird/0001-termio.patch Upstream -package/sscep/0001-Fix-getopt-linking-error.patch Upstream -package/sshguard/S49sshguard Indent -package/sslh/S35sslh Indent Shellcheck Variables -package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch Upstream -package/start-stop-daemon/0002-just-warn-on-missing-arch.patch Upstream -package/statserial/0001-ncurses-link.patch Upstream -package/stunnel/S50stunnel Indent Shellcheck Variables -package/supervisor/S99supervisord Variables -package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch Upstream +package/slang/0001-slsh-libs.patch lib_patch.Upstream +package/smcroute/S41smcroute NotExecutable lib_sysv.Indent lib_sysv.Variables +package/smstools3/0001-fix-Makefile.patch lib_patch.Upstream +package/smstools3/0002-fix-build-with-gcc-10.x.patch lib_patch.Upstream +package/smstools3/S50smsd Shellcheck lib_sysv.Variables +package/snmppp/0001-fix-build-without-v3.patch lib_patch.Upstream +package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch lib_patch.Upstream +package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch lib_patch.Upstream +package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch lib_patch.Upstream +package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch lib_patch.Upstream +package/snort/0005-fix-sparc.patch lib_patch.Upstream +package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch lib_patch.Upstream +package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch lib_patch.Upstream +package/snort/0008-Fix-NO-OPTIMIZE.patch lib_patch.Upstream +package/socketcand/0001-Fix-GCC10-build-failure.patch lib_patch.Upstream +package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch lib_patch.Upstream +package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch lib_patch.Upstream +package/softether/0003-use-fhs-install-directories.patch lib_patch.Upstream +package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch lib_patch.Upstream +package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch lib_patch.Upstream +package/softether/0006-cross-compile.patch lib_patch.Upstream +package/softether/0007-iconv.patch lib_patch.Upstream +package/softether/0008-librt.patch lib_patch.Upstream +package/softether/0009-uclibc-ai-addrconfig.patch lib_patch.Upstream +package/solarus/0001-cmake-remove-Werror.patch lib_patch.Upstream +package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch lib_patch.Sob lib_patch.Upstream +package/sox/0001-uclibc.patch lib_patch.Upstream +package/sox/0002-configure.ac-put-back-disable-stack-protector.patch lib_patch.Upstream +package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch lib_patch.Upstream +package/sox/0004-configure.ac-fix-static-linking-with-magic.patch lib_patch.Upstream +package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch lib_patch.Upstream +package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch lib_patch.Upstream +package/sp-oops-extract/0002-stdint-cleanup.patch lib_patch.Upstream +package/spandsp/0001-configure.ac-fix-AVX-SSE-and-MMX-options.patch lib_patch.Upstream +package/speex/0001-thumb2-support.patch lib_patch.Upstream +package/squid/S97squid Shellcheck lib_sysv.Indent lib_sysv.Variables +package/sredird/0001-termio.patch lib_patch.Upstream +package/sscep/0001-Fix-getopt-linking-error.patch lib_patch.Upstream +package/sshguard/S49sshguard lib_sysv.Indent +package/sslh/S35sslh Shellcheck lib_sysv.Indent lib_sysv.Variables +package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch lib_patch.Upstream +package/start-stop-daemon/0002-just-warn-on-missing-arch.patch lib_patch.Upstream +package/statserial/0001-ncurses-link.patch lib_patch.Upstream +package/stunnel/S50stunnel Shellcheck lib_sysv.Indent lib_sysv.Variables +package/supervisor/S99supervisord lib_sysv.Variables +package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch lib_patch.Upstream package/suricata/S99suricata Shellcheck package/swupdate/swupdate.sh Shellcheck -package/sylpheed/0001-harden-link-checker-before-accepting-click.patch Upstream -package/sysprof/0001-define-NT_GNU_BUILD_ID.patch Upstream -package/sysrepo/S51sysrepo-plugind Indent Shellcheck -package/sysvinit/0001-Makefile-disable-stack-protector-strong.patch Upstream -package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream -package/targetcli-fb/S50target Shellcheck Variables -package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch Upstream -package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch Upstream -package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch Upstream -package/tcf-agent/S55tcf-agent Shellcheck Variables -package/tcl/0001-Disable-tcl-compatibility-layers.patch Upstream -package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch Upstream -package/tftpd/S80tftpd-hpa Indent Shellcheck Variables -package/ti-gfx/0001-newclkapi.patch Upstream -package/ti-gfx/0002-fix-build-omaplfb-linux.patch Upstream -package/ti-gfx/0003-km_install_modules.patch Upstream -package/ti-gfx/S80ti-gfx Shellcheck Variables +package/sylpheed/0001-harden-link-checker-before-accepting-click.patch lib_patch.Upstream +package/sysprof/0001-define-NT_GNU_BUILD_ID.patch lib_patch.Upstream +package/sysrepo/S51sysrepo-plugind Shellcheck lib_sysv.Indent +package/sysvinit/0001-Makefile-disable-stack-protector-strong.patch lib_patch.Upstream +package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream +package/targetcli-fb/S50target Shellcheck lib_sysv.Variables +package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch lib_patch.Upstream +package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch lib_patch.Upstream +package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch lib_patch.Upstream +package/tcf-agent/S55tcf-agent Shellcheck lib_sysv.Variables +package/tcl/0001-Disable-tcl-compatibility-layers.patch lib_patch.Upstream +package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch lib_patch.Upstream +package/tftpd/S80tftpd-hpa Shellcheck lib_sysv.Indent lib_sysv.Variables +package/ti-gfx/0001-newclkapi.patch lib_patch.Upstream +package/ti-gfx/0002-fix-build-omaplfb-linux.patch lib_patch.Upstream +package/ti-gfx/0003-km_install_modules.patch lib_patch.Upstream +package/ti-gfx/S80ti-gfx Shellcheck lib_sysv.Variables package/ti-gfx/esrev.sh Shellcheck -package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch Upstream -package/ti-sgx-um/S80ti-sgx Variables -package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream -package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream -package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream -package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream -package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream -package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream -package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream -package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables -package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream -package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables -package/triggerhappy/S10triggerhappy Indent Shellcheck Variables -package/trinity/0001-Fix-build-with-GCC-10.patch Upstream -package/trinity/0002-net-proto-ip-raw.c-fix-build-with-kernel-5.13.patch Upstream -package/trinity/0003-Use-fcntl-h-for-dev_t-mode_t.patch Upstream -package/trinity/0004-drop-decnet.patch Upstream -package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch Upstream -package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch Upstream -package/trousers/0003-Fix-build-with-LibreSSL-2-7.patch Upstream -package/tstools/0001-build-get-along-with-buildroot.patch Upstream -package/tvheadend/0001-no-check_config.patch Upstream -package/tvheadend/S99tvheadend Indent Shellcheck Variables -package/uboot-tools/0001-drop-configh-from-tools.patch Upstream -package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch Upstream -package/uboot-tools/0003-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch Upstream -package/ubus/0001-Install-server-and-client-examples.patch Upstream -package/udpcast/0001-fix-musl-build.patch Upstream -package/uemacs/01-clear-ixon-termios-flag.patch Upstream -package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch Upstream -package/uhttpd/0001-Remove-Werror.patch Upstream -package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch Upstream -package/umtprd/0001-Fix-output_dir-make-dependency.patch Upstream +package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch lib_patch.Upstream +package/ti-sgx-um/S80ti-sgx lib_sysv.Variables +package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/tinyalsa/0001-include-time.h-before-asound.h.patch lib_patch.Upstream +package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch lib_patch.Upstream +package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch lib_patch.Upstream +package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch lib_patch.Upstream +package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch lib_patch.Upstream +package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch lib_patch.Upstream +package/tpm2-abrmd/S80tpm2-abrmd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch lib_patch.Upstream +package/transmission/S92transmission Shellcheck lib_sysv.ConsecutiveEmptyLines lib_sysv.Indent lib_sysv.Variables +package/triggerhappy/S10triggerhappy Shellcheck lib_sysv.Indent lib_sysv.Variables +package/trinity/0001-Fix-build-with-GCC-10.patch lib_patch.Upstream +package/trinity/0002-net-proto-ip-raw.c-fix-build-with-kernel-5.13.patch lib_patch.Upstream +package/trinity/0003-Use-fcntl-h-for-dev_t-mode_t.patch lib_patch.Upstream +package/trinity/0004-drop-decnet.patch lib_patch.Upstream +package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch lib_patch.Upstream +package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch lib_patch.Upstream +package/trousers/0003-Fix-build-with-LibreSSL-2-7.patch lib_patch.Upstream +package/tstools/0001-build-get-along-with-buildroot.patch lib_patch.Upstream +package/tvheadend/0001-no-check_config.patch lib_patch.Upstream +package/tvheadend/S99tvheadend Shellcheck lib_sysv.Indent lib_sysv.Variables +package/uboot-tools/0001-drop-configh-from-tools.patch lib_patch.Upstream +package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch lib_patch.Upstream +package/uboot-tools/0003-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch lib_patch.Upstream +package/ubus/0001-Install-server-and-client-examples.patch lib_patch.Upstream +package/udpcast/0001-fix-musl-build.patch lib_patch.Upstream +package/uemacs/01-clear-ixon-termios-flag.patch lib_patch.Upstream +package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch lib_patch.Upstream +package/uhttpd/0001-Remove-Werror.patch lib_patch.Upstream +package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch lib_patch.Upstream +package/umtprd/0001-Fix-output_dir-make-dependency.patch lib_patch.Upstream package/unbound/S70unbound Shellcheck -package/unifdef/0001-Makefile-fix-error-on-install.patch Upstream -package/unscd/S46unscd Indent Shellcheck Variables -package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch Upstream -package/upmpdcli/S99upmpdcli Indent Shellcheck Variables -package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch Upstream -package/urg/0001-select-h.patch Upstream -package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch Upstream -package/usb_modeswitch/0001-fix-systemd-detection.patch Upstream -package/usbguard/S20usbguard Indent Shellcheck Variables -package/usbmount/0001-rules-fix.patch Upstream -package/usbmount/0002-use-udev-environment-instead-of-blkid.patch Upstream -package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch Upstream -package/ussp-push/0001-fix-build-against-bluez-4.patch Upstream -package/ussp-push/0002-fix-build-again-obex-bluez.patch Upstream -package/ussp-push/0003-add-OBEX_CharToUnicode.patch Upstream -package/vala/0001-dont-add-dirty-to-valac-version.patch Upstream +package/unifdef/0001-Makefile-fix-error-on-install.patch lib_patch.Upstream +package/unscd/S46unscd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch lib_patch.Upstream +package/upmpdcli/S99upmpdcli Shellcheck lib_sysv.Indent lib_sysv.Variables +package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch lib_patch.Upstream +package/urg/0001-select-h.patch lib_patch.Upstream +package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch lib_patch.Upstream +package/usb_modeswitch/0001-fix-systemd-detection.patch lib_patch.Upstream +package/usbguard/S20usbguard Shellcheck lib_sysv.Indent lib_sysv.Variables +package/usbmount/0001-rules-fix.patch lib_patch.Upstream +package/usbmount/0002-use-udev-environment-instead-of-blkid.patch lib_patch.Upstream +package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch lib_patch.Upstream +package/ussp-push/0001-fix-build-against-bluez-4.patch lib_patch.Upstream +package/ussp-push/0002-fix-build-again-obex-bluez.patch lib_patch.Upstream +package/ussp-push/0003-add-OBEX_CharToUnicode.patch lib_patch.Upstream +package/vala/0001-dont-add-dirty-to-valac-version.patch lib_patch.Upstream package/vala/vala-wrapper Shellcheck -package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch Upstream -package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch Upstream -package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch Upstream -package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch Upstream -package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch Upstream -package/vboot-utils/0004-Disable-static-futility.patch Upstream -package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch Upstream -package/vboot-utils/0006-Update-for-openssl-1.1.patch Upstream -package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch Upstream -package/vdr/0001-getloadavg.patch Upstream -package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch Upstream -package/vlc/0002-automake-add-subdir-objects-option.patch Upstream -package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch Upstream -package/vlc/0004-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch Upstream -package/vlc/0005-Don-t-assume-strerror_l-is-available.patch Upstream -package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch Upstream -package/vlc/0007-Add-support-for-freerdp2.patch Upstream -package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch Upstream -package/vlc/0009-modules-video_filter-opencv_example.cpp-fix-build-wi.patch Upstream -package/vlc/0010-opengl-missing-library-check.patch Upstream -package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch Upstream -package/vpnc/0002-Makefile-allow-to-override-the-version.patch Upstream -package/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch Upstream -package/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch Upstream -package/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch Upstream -package/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch Upstream -package/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch Upstream -package/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch Upstream -package/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch Upstream -package/vsftpd/0001-utmpx-builddef.patch Upstream -package/vsftpd/0002-fix-CVE-2015-1419.patch Upstream -package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch Upstream -package/vsftpd/S70vsftpd Indent Shellcheck Variables -package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch Upstream -package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch Upstream -package/vtun/0001-fix-installation.patch Upstream -package/vtun/0002-fix-ssl-headers-checks.patch Upstream -package/vtun/0003-openssl11.patch Upstream -package/w_scan/0001-musl.patch Upstream -package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch Upstream -package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch Upstream -package/waffle/0002-wayland-fix-build-against-version-1-20.patch Upstream -package/waffle/0003-drop-C-dependency.patch Upstream -package/wampcc/0001-Add-RISC-V-endian-detection.patch Upstream -package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch Upstream -package/wampcc/0003-Broken-build-on-Windows.patch Upstream -package/watchdogd/S01watchdogd Indent NotExecutable -package/wget/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream -package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch Upstream -package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch Upstream -package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch Upstream -package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch Upstream -package/wilc-driver/0005-Fix-cast-warnings.patch Upstream -package/wipe/0001-musl.patch Upstream -package/wireless_tools/0001-remove-bzero.patch Upstream -package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch Upstream -package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream -package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream +package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch lib_patch.Upstream +package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch lib_patch.Upstream +package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch lib_patch.Upstream +package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch lib_patch.Upstream +package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch lib_patch.Upstream +package/vboot-utils/0004-Disable-static-futility.patch lib_patch.Upstream +package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch lib_patch.Upstream +package/vboot-utils/0006-Update-for-openssl-1.1.patch lib_patch.Upstream +package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch lib_patch.Upstream +package/vdr/0001-getloadavg.patch lib_patch.Upstream +package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch lib_patch.Upstream +package/vlc/0002-automake-add-subdir-objects-option.patch lib_patch.Upstream +package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch lib_patch.Upstream +package/vlc/0004-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch lib_patch.Upstream +package/vlc/0005-Don-t-assume-strerror_l-is-available.patch lib_patch.Upstream +package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch lib_patch.Upstream +package/vlc/0007-Add-support-for-freerdp2.patch lib_patch.Upstream +package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch lib_patch.Upstream +package/vlc/0009-modules-video_filter-opencv_example.cpp-fix-build-wi.patch lib_patch.Upstream +package/vlc/0010-opengl-missing-library-check.patch lib_patch.Upstream +package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch lib_patch.Upstream +package/vpnc/0002-Makefile-allow-to-override-the-version.patch lib_patch.Upstream +package/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch lib_patch.Upstream +package/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch lib_patch.Upstream +package/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch lib_patch.Upstream +package/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch lib_patch.Upstream +package/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch lib_patch.Upstream +package/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch lib_patch.Upstream +package/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch lib_patch.Upstream +package/vsftpd/0001-utmpx-builddef.patch lib_patch.Upstream +package/vsftpd/0002-fix-CVE-2015-1419.patch lib_patch.Upstream +package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch lib_patch.Upstream +package/vsftpd/S70vsftpd Shellcheck lib_sysv.Indent lib_sysv.Variables +package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch lib_patch.Upstream +package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch lib_patch.Upstream +package/vtun/0001-fix-installation.patch lib_patch.Upstream +package/vtun/0002-fix-ssl-headers-checks.patch lib_patch.Upstream +package/vtun/0003-openssl11.patch lib_patch.Upstream +package/w_scan/0001-musl.patch lib_patch.Upstream +package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch lib_patch.Upstream +package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch lib_patch.Upstream +package/waffle/0002-wayland-fix-build-against-version-1-20.patch lib_patch.Upstream +package/waffle/0003-drop-C-dependency.patch lib_patch.Upstream +package/wampcc/0001-Add-RISC-V-endian-detection.patch lib_patch.Upstream +package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch lib_patch.Upstream +package/wampcc/0003-Broken-build-on-Windows.patch lib_patch.Upstream +package/watchdogd/S01watchdogd NotExecutable lib_sysv.Indent +package/wget/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream +package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch lib_patch.Upstream +package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch lib_patch.Upstream +package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch lib_patch.Upstream +package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch lib_patch.Upstream +package/wilc-driver/0005-Fix-cast-warnings.patch lib_patch.Upstream +package/wipe/0001-musl.patch lib_patch.Upstream +package/wireless_tools/0001-remove-bzero.patch lib_patch.Upstream +package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch lib_patch.Upstream +package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch lib_patch.Upstream +package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch lib_patch.Upstream package/wpa_supplicant/ifupdown.sh Shellcheck -package/x11r7/xapp_luit/0001-posix-openpt.patch Upstream -package/x11r7/xapp_xdm/S99xdm Indent Variables -package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch Upstream -package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch Upstream -package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch Upstream -package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch Upstream -package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch Upstream -package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch Upstream -package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch Upstream -package/x11r7/xdriver_xf86-video-fbturbo/0002-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch Upstream -package/x11r7/xdriver_xf86-video-fbturbo/0003-Update-for-1.20-ABI.patch Upstream -package/x11r7/xdriver_xf86-video-fbturbo/0004-xorg.conf-add-mandatory-modules-fb-shadow-fbdevhw.patch Upstream -package/x11r7/xdriver_xf86-video-fbturbo/0005-backing_store_tuner-struct-_Window-backStorage-is-go.patch Upstream -package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch Upstream -package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch Upstream -package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch Upstream -package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch Upstream -package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch Upstream -package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch Upstream -package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob Upstream -package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch Upstream -package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob Upstream -package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch Upstream -package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables -package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch Upstream -package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch Upstream -package/x265/0001-fix-gcc-options.patch Upstream -package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch Upstream -package/xen/0002-Fix-build-with-64-bits-time_t.patch Upstream -package/xen/0003-libs-light-fix-tv_sec-printf-format.patch Upstream -package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch Upstream -package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch Upstream -package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch Upstream -package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch Upstream -package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch Upstream -package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch Upstream -package/xinetd/0001-ar.patch Upstream -package/xinetd/0002-destdir.patch Upstream -package/xinetd/0003-rpc-fix.patch Upstream -package/xinetd/0004-configure-rlim_t.patch Upstream -package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream -package/xl2tp/xl2tpd TrailingSpace -package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream -package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch Upstream -package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch Upstream -package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch Upstream -package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch Upstream -package/ympd/0001-only-c-language.patch Upstream -package/ympd/0002-added-forward-declarations.patch Upstream -package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch Upstream -package/zabbix/0002-fix-build-with-libressl-3.5.0.patch Upstream -package/zic/0001-remove-dependency-check-on-version-file.patch Upstream -package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch Upstream -package/zip/0002-configure-Don-t-use-host-CPP.patch Upstream -package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch Upstream -package/zip/0004-configure-use-LDFLAGS-from-command-line.patch Upstream -package/zip/0005-unix-configure-remove-GID-UID-size-check.patch Upstream -package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch Upstream -package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch Upstream -package/zip/0008-fix-musl-static-build.patch Upstream -package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch Upstream -package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch Upstream +package/x11r7/xapp_luit/0001-posix-openpt.patch lib_patch.Upstream +package/x11r7/xapp_xdm/S99xdm lib_sysv.Indent lib_sysv.Variables +package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0002-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0003-Update-for-1.20-ABI.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0004-xorg.conf-add-mandatory-modules-fb-shadow-fbdevhw.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-fbturbo/0005-backing_store_tuner-struct-_Window-backStorage-is-go.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream +package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Sob lib_patch.Upstream +package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream +package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables +package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream +package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch lib_patch.Upstream +package/x265/0001-fix-gcc-options.patch lib_patch.Upstream +package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch lib_patch.Upstream +package/xen/0002-Fix-build-with-64-bits-time_t.patch lib_patch.Upstream +package/xen/0003-libs-light-fix-tv_sec-printf-format.patch lib_patch.Upstream +package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch lib_patch.Upstream +package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch lib_patch.Upstream +package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch lib_patch.Upstream +package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch lib_patch.Upstream +package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch lib_patch.Upstream +package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch lib_patch.Upstream +package/xinetd/0001-ar.patch lib_patch.Upstream +package/xinetd/0002-destdir.patch lib_patch.Upstream +package/xinetd/0003-rpc-fix.patch lib_patch.Upstream +package/xinetd/0004-configure-rlim_t.patch lib_patch.Upstream +package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch lib_patch.Upstream +package/xl2tp/xl2tpd lib_shellscript.TrailingSpace +package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream +package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch lib_patch.Upstream +package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch lib_patch.Upstream +package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch lib_patch.Upstream +package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch lib_patch.Upstream +package/ympd/0001-only-c-language.patch lib_patch.Upstream +package/ympd/0002-added-forward-declarations.patch lib_patch.Upstream +package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch lib_patch.Upstream +package/zabbix/0002-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream +package/zic/0001-remove-dependency-check-on-version-file.patch lib_patch.Upstream +package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch lib_patch.Upstream +package/zip/0002-configure-Don-t-use-host-CPP.patch lib_patch.Upstream +package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch lib_patch.Upstream +package/zip/0004-configure-use-LDFLAGS-from-command-line.patch lib_patch.Upstream +package/zip/0005-unix-configure-remove-GID-UID-size-check.patch lib_patch.Upstream +package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch lib_patch.Upstream +package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch lib_patch.Upstream +package/zip/0008-fix-musl-static-build.patch lib_patch.Upstream +package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch lib_patch.Upstream +package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch lib_patch.Upstream support/dependencies/check-host-asciidoc.sh Shellcheck support/dependencies/check-host-cmake.sh Shellcheck support/dependencies/check-host-gzip.sh Shellcheck @@ -1432,7 +1432,7 @@ support/dependencies/check-host-python3.sh Shellcheck support/dependencies/check-host-tar.sh Shellcheck support/dependencies/check-host-xzcat.sh Shellcheck support/dependencies/dependencies.sh Shellcheck -support/download/bzr ConsecutiveEmptyLines Shellcheck +support/download/bzr Shellcheck lib_shellscript.ConsecutiveEmptyLines support/download/cargo-post-process Shellcheck support/download/cvs Shellcheck support/download/dl-wrapper Shellcheck @@ -1443,20 +1443,20 @@ support/download/scp Shellcheck support/download/sftp Shellcheck support/download/wget Shellcheck support/gnuconfig/update Shellcheck -support/libtool/buildroot-libtool-v1.5.patch ApplyOrder Sob Upstream -support/libtool/buildroot-libtool-v2.2.patch ApplyOrder Sob Upstream -support/libtool/buildroot-libtool-v2.4.4.patch ApplyOrder Upstream -support/libtool/buildroot-libtool-v2.4.patch ApplyOrder Sob Upstream +support/libtool/buildroot-libtool-v1.5.patch lib_patch.ApplyOrder lib_patch.Sob lib_patch.Upstream +support/libtool/buildroot-libtool-v2.2.patch lib_patch.ApplyOrder lib_patch.Sob lib_patch.Upstream +support/libtool/buildroot-libtool-v2.4.4.patch lib_patch.ApplyOrder lib_patch.Upstream +support/libtool/buildroot-libtool-v2.4.patch lib_patch.ApplyOrder lib_patch.Sob lib_patch.Upstream support/misc/relocate-sdk.sh Shellcheck support/scripts/apply-patches.sh Shellcheck support/scripts/br2-external Shellcheck support/scripts/check-bin-arch Shellcheck support/scripts/check-host-rpath Shellcheck support/scripts/expunge-gconv-modules Shellcheck -support/scripts/fix-configure-powerpc64.sh EmptyLastLine +support/scripts/fix-configure-powerpc64.sh lib_shellscript.EmptyLastLine support/scripts/generate-gitlab-ci-yml Shellcheck -support/scripts/mkmakefile ConsecutiveEmptyLines Shellcheck +support/scripts/mkmakefile Shellcheck lib_shellscript.ConsecutiveEmptyLines support/scripts/setlocalversion Shellcheck support/testing/tests/core/post-build.sh Shellcheck support/testing/tests/package/test_opkg/post-build.sh Shellcheck -support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch NumberedSubject Upstream +support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch lib_patch.NumberedSubject lib_patch.Upstream diff --git a/utils/check-package b/utils/check-package index de41891b561..61b66a8a67b 100755 --- a/utils/check-package +++ b/utils/check-package @@ -224,7 +224,7 @@ def check_file_using_lib(fname): print("{}: would run: {}".format(fname, functions_to_run)) return nwarnings, nlines - objects = [[c[0], c[1](fname, flags.manual_url)] for c in internal_functions] + objects = [[f"{lib.__name__[16:]}.{c[0]}", c[1](fname, flags.manual_url)] for c in internal_functions] for name, cf in objects: warn, fail = print_warnings(cf.before(), name in xfail) From 2f507f1da564cce807b809c893fcf2408ca26bfe Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Apr 2024 19:20:51 +0200 Subject: [PATCH 0247/3013] support/testing: fix trace-cmd runtime test The trace-cmd runtime test has a typo and fails with output: Traceback (most recent call last): File "/build/buildroot/support/testing/tests/package/test_trace_cmd.py", line 53, in test_run self.assertEquals(exit_code, 0) ^^^^^^^^^^^^^^^^^ AttributeError: 'TestTraceCmd' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'? The issue can be reproduced with the command: support/testing/run-tests \ -d dl -o output_test \ tests.package.test_trace_cmd This commit fixes the issue by removing the extra 's'. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_trace_cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_trace_cmd.py b/support/testing/tests/package/test_trace_cmd.py index e7d5e13bce8..5d37aef375f 100644 --- a/support/testing/tests/package/test_trace_cmd.py +++ b/support/testing/tests/package/test_trace_cmd.py @@ -50,5 +50,5 @@ def test_run(self): # Check we have occurrences of "kmalloc:" in the trace report. cmd = "grep -Fc kmalloc: trace.txt" output, exit_code = self.emulator.run(cmd) - self.assertEquals(exit_code, 0) + self.assertEqual(exit_code, 0) self.assertTrue(int(output[0]) > 0) From f10488a4117e2ee544a602a5625cc5e897f18b2d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Apr 2024 19:16:22 +0200 Subject: [PATCH 0248/3013] package/iperf3: fix build with libatomic Commit 9f94b3b354 "package/iperf3: bump to version 3.16" updated the package but forgot to reflect a breaking change mentioned in the release note [1], "iperf3 now requires pthreads and C atomic variables to compile and run". When the toolchain has no atomic support, or the libatomic is not added in the linker flags, the compilation now fail with output: arm-buildroot-linux-gnueabi/bin/ld: ./.libs/libiperf.so: undefined reference to '__atomic_load_8' This issue can be seen when running the iperf3 runtime test, with command: support/testing/run-tests \ -d dl -o output_test \ tests.package.test_iperf3 This commit fixes the issue by adding a dependency on BR2_TOOLCHAIN_HAS_ATOMIC and by adding an upstream patch to detect if linking to libatomic is needed. Fixes: [2] [1] https://github.com/esnet/iperf/releases/tag/3.16 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/6466933622 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- ...1-Check-and-link-libatomic-if-needed.patch | 42 +++++++++++++++++++ package/iperf3/Config.in | 2 + package/iperf3/iperf3.mk | 3 ++ 3 files changed, 47 insertions(+) create mode 100644 package/iperf3/0001-Check-and-link-libatomic-if-needed.patch diff --git a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch b/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch new file mode 100644 index 00000000000..ddb50c46949 --- /dev/null +++ b/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch @@ -0,0 +1,42 @@ +From bbf710e77e4a0438a2d995fd69b472e5ff054c69 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Sun, 3 Dec 2023 12:14:05 +0100 +Subject: [PATCH] Check and link libatomic if needed + +Some architectures without native support for 64-bit atomics need +linking with libatomic. + +Signed-off-by: Julien Olivain +Upstream: https://github.com/esnet/iperf/commit/1511e9f85b548891ea53d4e378903344df1fd31e +--- + configure.ac | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2594b39..ad7eaf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -92,7 +92,19 @@ CXX="$PTHREAD_CXX" + ]) + + # Atomics +-AC_CHECK_HEADERS([stdatomic.h]) ++AC_CHECK_HEADERS([stdatomic.h], ++ [AC_MSG_CHECKING([whether libatomic is required]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], ++ [AC_MSG_RESULT([no])], ++ [save_LIBS="$LIBS" ++ LIBS="$LIBS -latomic" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_ERROR([failed to find working configuration with atomics])] ++ )] ++ )], ++ [] ++) + + # Check for poll.h (it's in POSIX so everyone should have it?) + AC_CHECK_HEADERS([poll.h]) +-- +2.44.0 + diff --git a/package/iperf3/Config.in b/package/iperf3/Config.in index 5b2204c5e01..0c6946f55d9 100644 --- a/package/iperf3/Config.in +++ b/package/iperf3/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_IPERF3 bool "iperf3" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS help iperf is a tool for active measurements of the maximum @@ -13,4 +14,5 @@ config BR2_PACKAGE_IPERF3 http://software.es.net/iperf/index.html comment "iperf3 needs a toolchain w/ threads" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 6d902c3b13b..3ab68bd13b5 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -11,6 +11,9 @@ IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT IPERF3_LICENSE_FILES = LICENSE IPERF3_CPE_ID_VENDOR = es +# 0001-Check-and-link-libatomic-if-needed.patch +IPERF3_AUTORECONF = YES + IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" ifeq ($(BR2_PACKAGE_OPENSSL),y) From 0a71e241baf174b01edfbcb866e96949c93ba796 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:16 -0600 Subject: [PATCH 0249/3013] package/python-canopen: add setuptools-scm build dependency The host-python-setuptools-scm dependency needs to be added prior to migrating setuptools to pep517 as this dependency is listed as a build requirement in the pyproject.toml. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-canopen/python-canopen.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index 963c4ab801e..09ec595ec69 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -10,5 +10,6 @@ PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/49/55/67e555f6f4ea PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt +PYTHON_CANOPEN_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From 9307fca067cab5ecea124f1a40e5dd8127d24ebc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:17 -0600 Subject: [PATCH 0250/3013] package/python-dbus-fast: migrate to poetry core pep517 build backend We need to migrate python-dbus-fast to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. We do need to additinally keep a dependency on host-python-setuptools as that is specified as an additional build requirement. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-dbus-fast/python-dbus-fast.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index b890177c74a..1456ce5e4c6 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -7,10 +7,13 @@ PYTHON_DBUS_FAST_VERSION = 2.12.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/f5/8c/220fcbe4337b842d730d5752f207fc8efd3a02405c71c329e61218e947b8 -PYTHON_DBUS_FAST_SETUP_TYPE = setuptools +PYTHON_DBUS_FAST_SETUP_TYPE = pep517 PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE PYTHON_DBUS_FAST_ENV = REQUIRE_CYTHON=1 -PYTHON_DBUS_FAST_DEPENDENCIES = host-python-cython +PYTHON_DBUS_FAST_DEPENDENCIES = \ + host-python-cython \ + host-python-poetry-core \ + host-python-setuptools $(eval $(python-package)) From bc0e7c275f6041a1c97cf14391e41504b97dcaa5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:18 -0600 Subject: [PATCH 0251/3013] package/python-dnspython: migrate to poetry core pep517 build backend We need to migrate python-dnspython to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. setuptools-scm is not mentioned in pyproject.toml (only in setup.cfg), so not needed as a dependency when using poetry-core. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-dnspython/python-dnspython.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 1459ec8881e..f0df7331433 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -9,9 +9,9 @@ PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/65/2d/372a20e52a87b2ba0160997575809806111a72e18aa92738daccceb8d2b9 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE -PYTHON_DNSPYTHON_SETUP_TYPE = setuptools -PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm -HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm +PYTHON_DNSPYTHON_SETUP_TYPE = pep517 +PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core +HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) $(eval $(host-python-package)) From f76aaf064ffc67944a35f0a3a6bac42311a08c0c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:19 -0600 Subject: [PATCH 0252/3013] package/python-flask-babel: migrate to poetry core pep517 build backend We need to migrate python-flask-babel to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-flask-babel/python-flask-babel.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-flask-babel/python-flask-babel.mk b/package/python-flask-babel/python-flask-babel.mk index b3ecdf6cf6c..3970a14db1c 100644 --- a/package/python-flask-babel/python-flask-babel.mk +++ b/package/python-flask-babel/python-flask-babel.mk @@ -8,7 +8,8 @@ PYTHON_FLASK_BABEL_VERSION = 4.0.0 PYTHON_FLASK_BABEL_SOURCE = flask_babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/58/1a/4c65e3b90bda699a637bfb7fb96818b0a9bbff7636ea91aade67f6020a31 PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause -PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools +PYTHON_FLASK_BABEL_SETUP_TYPE = pep517 PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE +PYTHON_FLASK_BABEL_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From 367104d837f84bb73e8db6b45ce96ee11b378ea3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:20 -0600 Subject: [PATCH 0253/3013] package/python-flask-wtf: migrate to hatching pep517 build backend When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is hatchling and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-flask-wtf/python-flask-wtf.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-flask-wtf/python-flask-wtf.mk b/package/python-flask-wtf/python-flask-wtf.mk index 8274585ad3a..bb32d55e255 100644 --- a/package/python-flask-wtf/python-flask-wtf.mk +++ b/package/python-flask-wtf/python-flask-wtf.mk @@ -9,6 +9,7 @@ PYTHON_FLASK_WTF_SOURCE = flask_wtf-$(PYTHON_FLASK_WTF_VERSION).tar.gz PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/9b/ef/b6ec35e02f479f6e76e02ede14594c9cfa5e6dcbab6ea0e82fa413993a2a PYTHON_FLASK_WTF_LICENSE = BSD-3-Clause PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE.rst -PYTHON_FLASK_WTF_SETUP_TYPE = setuptools +PYTHON_FLASK_WTF_SETUP_TYPE = pep517 +PYTHON_FLASK_WTF_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) From 96e848c9701d23f172a75f900e9dcf7aa8e6faa3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:21 -0600 Subject: [PATCH 0254/3013] package/python-expandvars: new host package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-expandvars/python-expandvars.hash | 5 +++++ package/python-expandvars/python-expandvars.mk | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-expandvars/python-expandvars.hash create mode 100644 package/python-expandvars/python-expandvars.mk diff --git a/package/python-expandvars/python-expandvars.hash b/package/python-expandvars/python-expandvars.hash new file mode 100644 index 00000000000..0123ed54207 --- /dev/null +++ b/package/python-expandvars/python-expandvars.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/expandvars/json +md5 8091f578a547e2b4b9df59100a179266 expandvars-0.12.0.tar.gz +sha256 7d1adfa55728cf4b5d812ece3d087703faea953e0c0a1a78415de9df5024d844 expandvars-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 b8a43c35080fc5855e4f8171e4d0d002f6ff1633d8cfc0b5dee0ac4ced2deac7 LICENSE diff --git a/package/python-expandvars/python-expandvars.mk b/package/python-expandvars/python-expandvars.mk new file mode 100644 index 00000000000..5c9a7249b30 --- /dev/null +++ b/package/python-expandvars/python-expandvars.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-expandvars +# +################################################################################ + +PYTHON_EXPANDVARS_VERSION = 0.12.0 +PYTHON_EXPANDVARS_SOURCE = expandvars-$(PYTHON_EXPANDVARS_VERSION).tar.gz +PYTHON_EXPANDVARS_SITE = https://files.pythonhosted.org/packages/2b/a5/46d1f58edcae1d632fafdfee313e378240e002ae45d26502bac938bd8751 +PYTHON_EXPANDVARS_SETUP_TYPE = pep517 +PYTHON_EXPANDVARS_LICENSE = MIT +PYTHON_EXPANDVARS_LICENSE_FILES = LICENSE +HOST_PYTHON_EXPANDVARS_DEPENDENCIES = host-python-hatchling + +$(eval $(host-python-package)) From 1dd05a198701b783e2616cd86e04dc041fb99d05 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:22 -0600 Subject: [PATCH 0255/3013] package/python-frozenlist: migrate to in-tree pep517 build backend When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is an internal backend and not setuptools. The custom in tree backend depends on setuptools and expandvars, additionally it depends on cython 3 unless disabled. As we do not currently support cython 3, let's use the pure python build instead. Signed-off-by: James Hilliard [Add comment explaining about Cython 3 dependency] Signed-off-by: Arnout Vandecappelle --- package/python-frozenlist/python-frozenlist.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 93335988089..11dcee9da4f 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -7,8 +7,13 @@ PYTHON_FROZENLIST_VERSION = 1.4.1 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085 -PYTHON_FROZENLIST_SETUP_TYPE = setuptools +PYTHON_FROZENLIST_SETUP_TYPE = pep517 PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE +PYTHON_FROZENLIST_DEPENDENCIES = \ + host-python-expandvars \ + host-python-setuptools +# C code generation required Cython 3 which we don't have in Buildroot yet. +PYTHON_FROZENLIST_BUILD_OPTS = -C=pure-python=true $(eval $(python-package)) From 964712550d6e70b8de20e61aa7f95d6fec168183 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:23 -0600 Subject: [PATCH 0256/3013] package/python-humanize: add setuptools-scm build dependency The host-python-setuptools-scm will be enforced once we migrate setuptools to use a pep517 build frontend. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-humanize/python-humanize.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-humanize/python-humanize.mk b/package/python-humanize/python-humanize.mk index 04cb0713fc5..6155954b821 100644 --- a/package/python-humanize/python-humanize.mk +++ b/package/python-humanize/python-humanize.mk @@ -10,5 +10,6 @@ PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/51/19/3e1adf0e7a8 PYTHON_HUMANIZE_SETUP_TYPE = setuptools PYTHON_HUMANIZE_LICENSE = MIT PYTHON_HUMANIZE_LICENSE_FILES = LICENCE +PYTHON_HUMANIZE_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From 9755f7a4aad7fd46d3bc6cb340e9554b00ab8344 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:24 -0600 Subject: [PATCH 0257/3013] package/python-iso8601: migrate to poetry core pep517 build backend We need to migrate python-iso8601 to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-iso8601/python-iso8601.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-iso8601/python-iso8601.mk b/package/python-iso8601/python-iso8601.mk index ce25a2fb285..080daa4693f 100644 --- a/package/python-iso8601/python-iso8601.mk +++ b/package/python-iso8601/python-iso8601.mk @@ -7,8 +7,9 @@ PYTHON_ISO8601_VERSION = 2.1.0 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15 -PYTHON_ISO8601_SETUP_TYPE = setuptools +PYTHON_ISO8601_SETUP_TYPE = pep517 PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE +PYTHON_ISO8601_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From 360c065a4d7c6168e2e78607a51fc01026533f7a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:25 -0600 Subject: [PATCH 0258/3013] package/python-cppy: add setuptools-scm build dependency The host-python-setuptools-scm dependency needs to be added prior to migrating setuptools to pep517 as this dependency is listed as a build requirement in the pyproject.toml. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-cppy/python-cppy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-cppy/python-cppy.mk b/package/python-cppy/python-cppy.mk index adadc352d30..5bfd5a0f166 100644 --- a/package/python-cppy/python-cppy.mk +++ b/package/python-cppy/python-cppy.mk @@ -10,5 +10,6 @@ PYTHON_CPPY_SITE = https://files.pythonhosted.org/packages/c5/7e/6cc5acd93752ee5 PYTHON_CPPY_LICENSE = BSD-3-Clause PYTHON_CPPY_LICENSE_FILES = LICENSE PYTHON_CPPY_SETUP_TYPE = setuptools +HOST_PYTHON_CPPY_DEPENDENCIES = host-python-setuptools-scm $(eval $(host-python-package)) From 9e938f2c0d7bb4b3745dc9ce7c4370c8492b7f94 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:26 -0600 Subject: [PATCH 0259/3013] package/python-pylibftdi: migrate to poetry core pep517 build backend We need to migrate python-pylibftdi to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pylibftdi/python-pylibftdi.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 7dca37e416f..7607c90d4a4 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -9,7 +9,9 @@ PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/d2/ce/ff3e83f3a14eb5b7950ff3657f07cdc3033dd0ded5c8ed093db515e1de33 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt -PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi -PYTHON_PYLIBFTDI_SETUP_TYPE = setuptools +PYTHON_PYLIBFTDI_SETUP_TYPE = pep517 +PYTHON_PYLIBFTDI_DEPENDENCIES = \ + host-python-poetry-core \ + libftdi $(eval $(python-package)) From d082c8ad4bfe5d24ddf6f7e606fe2e57ba9863e7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:27 -0600 Subject: [PATCH 0260/3013] package/python-sip: add missing setuptools dependency The python-sip package requires distutils which is no longer included with python but is now part of setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sip/python-sip.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 3e015fa16c8..392928f01e7 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -9,8 +9,8 @@ PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz PYTHON_SIP_SITE = https://www.riverbankcomputing.com/static/Downloads/sip/$(PYTHON_SIP_VERSION) PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -PYTHON_SIP_DEPENDENCIES = python3 qt5base -HOST_PYTHON_SIP_DEPENDENCIES = host-python3 +PYTHON_SIP_DEPENDENCIES = host-python-setuptools python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 host-python-setuptools define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ From 9502fe2bb59afbe9950ab5d0c673275b2c3eea32 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:28 -0600 Subject: [PATCH 0261/3013] package/python-rsa: migrate to poetry core pep517 build backend We need to migrate python-rsa to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-rsa/python-rsa.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index d84ba8b431d..69a6309b194 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -7,9 +7,10 @@ PYTHON_RSA_VERSION = 4.9 PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 -PYTHON_RSA_SETUP_TYPE = setuptools +PYTHON_RSA_SETUP_TYPE = pep517 PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE PYTHON_RSA_CPE_ID_VALID = YES +PYTHON_RSA_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From d02877f044b5132b6173f4d7b2b0a036b7d83d9f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:29 -0600 Subject: [PATCH 0262/3013] package/python-sh: migrate to poetry core pep517 build backend We need to migrate python-sh to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sh/python-sh.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index af4da3f6c9a..29843d645b7 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -7,8 +7,9 @@ PYTHON_SH_VERSION = 2.0.6 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d -PYTHON_SH_SETUP_TYPE = setuptools +PYTHON_SH_SETUP_TYPE = pep517 PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt +PYTHON_SH_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From 96c6f20de65b0cad79a53cae2b2df297ba65db12 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:30 -0600 Subject: [PATCH 0263/3013] package/python-simplelogging: migrate to poetry core pep517 build backend We need to migrate package/python-simplelogging to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. We also need to add a patch which switches from poetry to poetry core as we do not support the full poetry package. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...-Switch-build-backend-to-poetry-core.patch | 31 +++++++++++++++++++ .../python-simplelogging.mk | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch diff --git a/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch b/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch new file mode 100644 index 00000000000..2c345fe2684 --- /dev/null +++ b/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch @@ -0,0 +1,31 @@ +From 76c1c545bad28f592405ca1e5bcf6081051c946a Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 13 Feb 2024 13:37:00 -0700 +Subject: [PATCH] Switch build-backend to poetry-core + +poetry-core is the lightweight counterpart of poetry that is intended +to be used as a build-backend. Unlike poetry, it does not require +installing all the dependencies of the package manager, making +the builds much faster. The generated artifacts are the same. + +Signed-off-by: James Hilliard +Upstream: https://github.com/vpoulailleau/simplelogging/pull/230 +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a89ab64..79403cb 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -55,5 +55,5 @@ commands = + """ + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" +-- +2.34.1 + diff --git a/package/python-simplelogging/python-simplelogging.mk b/package/python-simplelogging/python-simplelogging.mk index 556628613bc..dbd9ce3ae30 100644 --- a/package/python-simplelogging/python-simplelogging.mk +++ b/package/python-simplelogging/python-simplelogging.mk @@ -7,8 +7,9 @@ PYTHON_SIMPLELOGGING_VERSION = 0.11.0 PYTHON_SIMPLELOGGING_SOURCE = simplelogging-$(PYTHON_SIMPLELOGGING_VERSION).tar.gz PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/73/d6/4c06aa7f2c3b9fc09429a1196fd357357cc555de5e16c09b2d12e9db1ebb -PYTHON_SIMPLELOGGING_SETUP_TYPE = setuptools +PYTHON_SIMPLELOGGING_SETUP_TYPE = pep517 PYTHON_SIMPLELOGGING_LICENSE = BSD-3-Clause PYTHON_SIMPLELOGGING_LICENSE_FILES = LICENSE +PYTHON_SIMPLELOGGING_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From f30f84dd93bcbbb5af4ded17e56e41d4d8d68426 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:31 -0600 Subject: [PATCH 0264/3013] package/python-pyzmq: add cython for python-pyzmq When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-pyzmq. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyzmq/python-pyzmq.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 1d9a7d01cb6..f1444b91245 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -13,6 +13,7 @@ PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ + host-python-cython \ host-python-packaging \ host-python-setuptools-scm \ zeromq From 466d4cc22ab8c9afbc1371abe09fd3a1346600de Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:32 -0600 Subject: [PATCH 0265/3013] package/python-setuptools: bump to version 69.2.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 7f13ac38962..123c9a14552 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools/json -md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz -sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz +md5 940ffdb3a2ce4f6a5ee80032aa115fc7 setuptools-69.2.0.tar.gz +sha256 0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e setuptools-69.2.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 0aea3c6cfaf..afc7348eb24 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 69.0.3 +PYTHON_SETUPTOOLS_VERSION = 69.2.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/4d/5b/dc575711b6b8f2f866131a40d053e30e962e633b332acf7cd2c24843d83d PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From 8937db8dd595e0988751e5dbb568e870b07b39cc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 30 Mar 2024 18:41:33 -0600 Subject: [PATCH 0266/3013] package/pkg-python.mk: migrate setuptools to pep517 Now that setuptools and its dependencies are using pep517 we can migrate the setuptools infrastructure itself to use the pep517 build frontend. As part of this we need to migrate the all python packages using _BUILD_OPTS to the new config settings format used by the pep517 build frontend. We need to use a setup.cfg file to pass the pg_config path when building python-psycopg2 as this package needs the pg_config path for all internal build stages while -C--build-option= only passes the flag to the internal bdist_wheel stage. Use new setup type variables to define setup type specific dependencies instead of using the conditional block. In python-m2crypto, the --openssl option is a build_ext option so we need to add -C--build-option build_ext in front of it. We also need to set --skip-dependency-check for the following packages which specify build dependencies that are not actually required: - python-lxml - python-matplotlib - python-msgpack - python-pymupdf - python-uvloop - python-wsaccel Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov [Arnout: fix indentation in python-pyzmq] Signed-off-by: Arnout Vandecappelle --- package/pkg-python.mk | 160 +++++++++--------- package/python-evdev/python-evdev.mk | 4 +- package/python-lxml/python-lxml.mk | 10 +- package/python-m2crypto/python-m2crypto.mk | 4 +- .../python-matplotlib/python-matplotlib.mk | 1 + package/python-msgpack/python-msgpack.mk | 1 + package/python-pillow/python-pillow.mk | 35 ++-- package/python-psycopg2/python-psycopg2.mk | 7 +- package/python-pymupdf/python-pymupdf.mk | 1 + package/python-pyzmq/python-pyzmq.mk | 4 +- package/python-uvloop/python-uvloop.mk | 7 +- package/python-wsaccel/python-wsaccel.mk | 1 + 12 files changed, 122 insertions(+), 113 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 94f28ff8411..839f728e2fc 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,15 +52,62 @@ HOST_PKG_PYTHON_ENV = \ PYTHONNOUSERSITE=1 \ $(HOST_CONFIGURE_OPTS) -# Target setuptools-based packages -PKG_PYTHON_SETUPTOOLS_ENV = \ +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) -PKG_PYTHON_SETUPTOOLS_CMD = \ - $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') +PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +PKG_PYTHON_PEP517_DEPENDENCIES = \ + host-python-pypa-build \ + host-python-installer + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + $(HOST_PKG_PYTHON_ENV) + +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + --interpreter=$(HOST_DIR)/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) + +# Target setuptools-based packages +PKG_PYTHON_SETUPTOOLS_ENV = \ + $(PKG_PYTHON_PEP517_ENV) PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(PKG_PYTHON_PEP517_BUILD_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ @@ -69,30 +116,24 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --single-version-externally-managed PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install --no-compile \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(TARGET_DIR) + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(STAGING_DIR) + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + +PKG_PYTHON_SETUPTOOLS_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-setuptools # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - $(HOST_PKG_PYTHON_ENV) + $(HOST_PKG_PYTHON_PEP517_ENV) HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - --prefix=$(HOST_DIR) \ - --root=/ \ - --single-version-externally-managed + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) # Target setuptools-rust-based packages PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ @@ -109,6 +150,10 @@ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) +PKG_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + $(PKG_PYTHON_SETUPTOOLS_DEPENDENCIES) \ + host-python-setuptools-rust + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ @@ -121,52 +166,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) -# Target pep517-based packages -PKG_PYTHON_PEP517_ENV = \ - $(PKG_PYTHON_ENV) - -PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ - --script-kind=posix - -PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(TARGET_DIR)/usr/bin \ - --data=$(TARGET_DIR)/usr - -PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(STAGING_DIR)/usr/bin \ - --data=$(STAGING_DIR)/usr - -# Host pep517-based packages -HOST_PKG_PYTHON_PEP517_ENV = \ - $(HOST_PKG_PYTHON_ENV) - -HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - --interpreter=$(HOST_DIR)/bin/python \ - --script-kind=posix \ - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/bin \ - --data=$(HOST_DIR) - # Target flit packages PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) @@ -180,6 +179,10 @@ PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_FLIT_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-flit-core + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -215,6 +218,10 @@ PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_MATURIN_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-maturin + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ @@ -293,28 +300,17 @@ else $(2)_DEPENDENCIES += host-python3 endif # ($(4),target) -# Setuptools based packages will need setuptools for the host Python -# interpreter (both host and target). +# Setup type specific dependencies are the same whether we are +# building for the host or the target. # -ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-setuptools -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_DEPENDENCIES += host-python-setuptools-rust -endif -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer -ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core -endif -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_DEPENDENCIES += host-python-maturin -endif -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) # Don't add dependency on host-python-installer for # host-python-installer itself, and its dependencies. ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) $(2)_DEPENDENCIES += host-python-installer endif +else +$(2)_DEPENDENCIES += $$(PKG_PYTHON_$$($(2)_SETUP_TYPE_UPPER)_DEPENDENCIES) endif # Pyo3 based packages(setuptools-rust and maturin) will need rust diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk index 5cf62b51603..b509b43e8a3 100644 --- a/package/python-evdev/python-evdev.mk +++ b/package/python-evdev/python-evdev.mk @@ -12,7 +12,7 @@ PYTHON_EVDEV_LICENSE = Revised BSD License PYTHON_EVDEV_LICENSE_FILES = LICENSE PYTHON_EVDEV_BUILD_OPTS = \ - build_ecodes \ - --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h + -C--build-option=build_ecodes \ + -C--build-option=--evdev-headers=$(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h $(eval $(python-package)) diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 519a9a77ac2..2da8b8056c2 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -28,11 +28,13 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # python-lxml needs these scripts in order to properly detect libxml2 and # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + --skip-dependency-check \ + -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(HOST_DIR)/bin/xslt-config \ - --xml2-config=$(HOST_DIR)/bin/xml2-config + --skip-dependency-check \ + -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ + -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 69a0c28df55..6c07f42d06a 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -13,6 +13,8 @@ PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig -PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +PYTHON_M2CRYPTO_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--openssl=$(STAGING_DIR)/usr $(eval $(python-package)) diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 4fd2b5f432a..5f5d53172e0 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -20,6 +20,7 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = \ python-pybind \ qhull PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools +PYTHON_MATPLOTLIB_BUILD_OPTS = --skip-dependency-check ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index 3ee7c54ce11..9cdf5263de2 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -10,6 +10,7 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools +PYTHON_MSGPACK_BUILD_OPTS = --skip-dependency-check # When set in the environment, whatever the value, MSGPACK_PUREPYTHON drives # using the pure python implementation rather than rely on the C++ native code. diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 10939d8467d..7f5b4dd0f96 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -14,61 +14,60 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_DEPENDENCIES = host-pkgconf -PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing -PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) +PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype else -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype endif ifeq ($(BR2_PACKAGE_JPEG),y) PYTHON_PILLOW_DEPENDENCIES += jpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg endif ifeq ($(BR2_PACKAGE_LCMS2),y) PYTHON_PILLOW_DEPENDENCIES += lcms2 -PYTHON_PILLOW_BUILD_OPTS += --enable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms else -PYTHON_PILLOW_BUILD_OPTS += --disable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms endif ifeq ($(BR2_PACKAGE_LIBXCB),y) PYTHON_PILLOW_DEPENDENCIES += libxcb -PYTHON_PILLOW_BUILD_OPTS += --enable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb else -PYTHON_PILLOW_BUILD_OPTS += --disable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb endif ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 endif ifeq ($(BR2_PACKAGE_TIFF),y) PYTHON_PILLOW_DEPENDENCIES += tiff -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff else -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff endif ifeq ($(BR2_PACKAGE_WEBP),y) PYTHON_PILLOW_DEPENDENCIES += webp -PYTHON_PILLOW_BUILD_OPTS += --enable-webp +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux else -PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux endif else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux endif $(eval $(python-package)) diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index 0149b8d1854..59a3190ae1f 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -11,9 +11,12 @@ PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE PYTHON_PSYCOPG2_DEPENDENCIES = postgresql + # Force psycopg2 to use the Buildroot provided postgresql version # instead of the one from the host machine -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config +define PYTHON_PSYCOPG2_CREATE_SETUP_CFG + printf "[build_ext]\ndefine=\npg_config=$(STAGING_DIR)/usr/bin/pg_config\n" > $(@D)/setup.cfg +endef +PYTHON_PSYCOPG2_PRE_CONFIGURE_HOOKS += PYTHON_PSYCOPG2_CREATE_SETUP_CFG $(eval $(python-package)) diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 639ce0e00ee..8825868fb59 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -13,6 +13,7 @@ PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib +PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index f1444b91245..48a298b221c 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -11,7 +11,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ host-python-cython \ host-python-packaging \ @@ -27,7 +27,7 @@ endef PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts endif $(eval $(python-package)) diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 285884a2bb2..aaeab2805f3 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -10,8 +10,11 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv PYTHON_UVLOOP_DEPENDENCIES = libuv +PYTHON_UVLOOP_BUILD_OPTS = \ + --skip-dependency-check \ + -C--build-option=build_ext \ + -C--build-option=--inplace \ + -C--build-option=--use-system-libuv $(eval $(python-package)) diff --git a/package/python-wsaccel/python-wsaccel.mk b/package/python-wsaccel/python-wsaccel.mk index 1f63aa5c403..7ccb033256e 100644 --- a/package/python-wsaccel/python-wsaccel.mk +++ b/package/python-wsaccel/python-wsaccel.mk @@ -10,5 +10,6 @@ PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/94/28/41c0e711b538 PYTHON_WSACCEL_LICENSE = Apache-2.0 PYTHON_WSACCEL_LICENSE_FILES = LICENSE PYTHON_WSACCEL_SETUP_TYPE = setuptools +PYTHON_WSACCEL_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) From 6a518322b3dc70e1d589d20b87c44f5fdafa25c6 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Fri, 1 Mar 2024 16:54:44 +0700 Subject: [PATCH 0267/3013] package/git: bump to version 2.44.0 Bump the package version to 2.44.0. For the full release notes, see the release announcement at [1]. [1] https://lore.kernel.org/git/xmqqbk87w164.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Arnout Vandecappelle --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 9cf044cc075..f609a4aaa4a 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec git-2.43.0.tar.xz +sha256 e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 git-2.44.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 1502968186e..a9cc3c30a7b 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.43.0 +GIT_VERSION = 2.44.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 9689b075773edc837af9c33355f3ac34b35d5419 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 13 Feb 2024 19:21:57 +0100 Subject: [PATCH 0268/3013] package/tinycompress: bump to version 1.2.11 For commit log, see: https://github.com/alsa-project/tinycompress/commits/v1.2.11/ Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/tinycompress/tinycompress.hash | 2 +- package/tinycompress/tinycompress.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinycompress/tinycompress.hash b/package/tinycompress/tinycompress.hash index 164f3a36c30..f86b75f3461 100644 --- a/package/tinycompress/tinycompress.hash +++ b/package/tinycompress/tinycompress.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 2f897e5112cd3bca6790b5cecfda6e0662c8bc5ee0fbab972b247a0cc620d66c tinycompress-1.2.8.tar.bz2 +sha256 ebbe788c28328e7cca245aaf9194a5ad0dc91e9e0dc883c2cf9feb6d42c9f3fc tinycompress-1.2.11.tar.bz2 # Locally calculated sha256 912ea37a4435594a3b3c35f04efa4b5b7af2e68a05f5319c16c881711a31e4b7 COPYING diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index c9cfbb574bd..fabd5884b23 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCOMPRESS_VERSION = 1.2.8 +TINYCOMPRESS_VERSION = 1.2.11 TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 From e3ff479443d93a287fc718cf466545e5967173fe Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 13 Feb 2024 21:42:40 +0100 Subject: [PATCH 0269/3013] package/wayland-protocols: bump to 1.33 Announce: https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- package/wayland-protocols/wayland-protocols.hash | 6 +++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index d039cd6fba2..58c432e365c 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-July/042836.html -sha256 7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11 wayland-protocols-1.32.tar.xz -sha512 90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966 wayland-protocols-1.32.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html +sha256 94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a wayland-protocols-1.33.tar.xz +sha512 4584f6ac86367655f9db5d0c0ed0681efa31e73f984e4b620fbe5317df21790927f4f5317ecbbc194ac31eaf88caebc431bcc52c23d9dc0098c71de3cb4a9fef wayland-protocols-1.33.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 2cfaa830e58..50a08d19883 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.32 +WAYLAND_PROTOCOLS_VERSION = 1.33 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT From 79f7d71640061f65aedfa4f8845a6757e8b0f3fc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 13 Feb 2024 21:49:15 +0100 Subject: [PATCH 0270/3013] support/testing: add lvm2 runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 + support/testing/tests/package/test_lvm2.py | 163 ++++++++++++++++++ .../package/test_lvm2/linux-lvm2.fragment | 2 + 3 files changed, 167 insertions(+) create mode 100644 support/testing/tests/package/test_lvm2.py create mode 100644 support/testing/tests/package/test_lvm2/linux-lvm2.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 288a3ce0e68..6b38db08575 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1814,6 +1814,8 @@ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_ltrace.py +F: support/testing/tests/package/test_lvm2.py +F: support/testing/tests/package/test_lvm2/ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_lvm2.py b/support/testing/tests/package/test_lvm2.py new file mode 100644 index 00000000000..bdbae7a4ec7 --- /dev/null +++ b/support/testing/tests/package/test_lvm2.py @@ -0,0 +1,163 @@ +import os +import subprocess + +import infra.basetest + + +class TestLvm2(infra.basetest.BRTest): + # This test creates a lvm2 volume. A specific Kernel need to be + # built with a config fragment enabling this support. This test + # also uses resize2fs from e2fsprogs. + kernel_fragment = \ + infra.filepath("tests/package/test_lvm2/linux-lvm2.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.77" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y + BR2_PACKAGE_LVM2=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def get_free_disk_space(self, path): + out, ret = self.emulator.run(f"df -k {path}") + self.assertEqual(ret, 0) + return int(out[1].split()[3]) + + def test_run(self): + # Test configuration: + storage_devs = ["/dev/vda", "/dev/vdb", "/dev/vdc"] + storage_size = 16 # Mega Bytes + lvm_vg = "br_vg" # Volume Group name + lvm_lv = "br_lv" # Logical Volume name + lv_dev = f"/dev/{lvm_vg}/{lvm_lv}" # Logical Volume dev name + mnt_pt = "/mnt/lvm2-storage" + data_file = f"{mnt_pt}/data.bin" + + qemu_storage_opts = [] + for i in range(len(storage_devs)): + disk_file = os.path.join(self.builddir, "images", f"disk{i}.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", + "bs=1M", f"count={storage_size}"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + opts = ["-drive", f"file={disk_file},if=virtio,format=raw"] + qemu_storage_opts += opts + + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img] + qemu_storage_opts) + self.emulator.login() + + # Test the program can execute. + self.assertRunOk("lvm version") + + # We did not created any Physical Volume yet. We should NOT + # see any of our storage devices in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertNotIn(dev, "\n".join(out)) + + # We initialize our Physical Volumes (PVs). + pv_devs = " ".join(storage_devs) + self.assertRunOk(f"pvcreate {pv_devs}") + + # We run few diagnostic commands related to PVs. + self.assertRunOk(f"pvck {pv_devs}") + self.assertRunOk(f"pvdisplay {pv_devs}") + self.assertRunOk("pvs") + + # Now we initialized the PVs, we should see them in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertIn(dev, "\n".join(out)) + + # We create a Volume Group (VG) including two of our three + # PVs. + cmd = f"vgcreate {lvm_vg} {storage_devs[0]} {storage_devs[1]}" + self.assertRunOk(cmd) + + # We run few diagnostic commands related to VGs. + self.assertRunOk(f"vgck {lvm_vg}") + self.assertRunOk(f"vgdisplay {lvm_vg}") + self.assertRunOk("vgscan") + self.assertRunOk("vgs") + + # We create a Logical Volume (LV) in our VG. + self.assertRunOk(f"lvcreate -l 100%FREE -n {lvm_lv} {lvm_vg}") + + # We check LVM created the LV device. + self.assertRunOk(f"ls -al {lv_dev}") + + # We run few diagnostic commands related to LVs. + self.assertRunOk("lvscan") + self.assertRunOk("lvs") + + # We create a ext4 filesystem on our LV. + self.assertRunOk(f"mkfs.ext4 {lv_dev}") + + # We create a mount point directory and mount the device. + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {lv_dev} {mnt_pt}") + + # We create a data file in our new filesystem. Note: this file + # is slightly larger than a single PV. This data file should + # span over the two PVs in the VG. + data_size = storage_size + 4 + cmd = f"dd if=/dev/urandom of={data_file} bs=1M count={data_size}" + self.assertRunOk(cmd) + + # We compute the hash of our data, and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We compute the free space of the mount point. + fs_free_space = self.get_free_disk_space(mnt_pt) + + # We extend of VG with our third PV. + self.assertRunOk(f"vgextend {lvm_vg} {storage_devs[2]}") + + # We grow the LV to use all the space of the VG. + self.assertRunOk(f"lvresize -l +100%FREE {lvm_vg}/{lvm_lv}") + + # We resize the filesystem to use all the LV space. + self.assertRunOk(f"resize2fs {lv_dev}") + + # Now we grew the LV and resized the filesystem, we recompute + # the free space and check we have more. + fs2_free_space = self.get_free_disk_space(mnt_pt) + self.assertGreater(fs2_free_space, fs_free_space) + + # With all those on-the-fly operations on the mounted + # filesystem, the data file should be intact. We should + # recompute the same data checksum as before. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) + + # Finally, we unmount the filesystem. It should not contain + # any error. + self.assertRunOk(f"umount {mnt_pt}") + self.assertRunOk(f"e2fsck -f -n {lv_dev}") diff --git a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment new file mode 100644 index 00000000000..0fade167a3c --- /dev/null +++ b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment @@ -0,0 +1,2 @@ +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y From 4cbac9f70609e676887ad242c65e02b3cf827176 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 13 Feb 2024 22:45:10 +0100 Subject: [PATCH 0271/3013] package/lvm2: bump to version 2.03.23 For release notes since 2.03.14, see: https://gitlab.com/lvmteam/lvm2/-/blob/22e482d9655e8d041703af984b81d9b742027a78/WHATS_NEW#L4 This commit removes the package patches 1 and 2 which are now included in the new release. Patches 3 and 4 are kept and renumbered. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- ...sible-better-compilation-with-musl-c.patch | 30 ---------------- ...-freopen-to-reopen-standard-streams.patch} | 0 ...-freopen-to-reopen-standard-streams.patch} | 0 ...m-preallocate-memory-only-with-glibc.patch | 34 ------------------- package/lvm2/lvm2.hash | 2 +- package/lvm2/lvm2.mk | 2 +- 6 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch rename package/lvm2/{0003-cmdline-use-freopen-to-reopen-standard-streams.patch => 0001-cmdline-use-freopen-to-reopen-standard-streams.patch} (100%) rename package/lvm2/{0004-log-use-freopen-to-reopen-standard-streams.patch => 0002-log-use-freopen-to-reopen-standard-streams.patch} (100%) delete mode 100644 package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch diff --git a/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch b/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch deleted file mode 100644 index f537331a2c3..00000000000 --- a/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bac596b3685520acaa404dc3ebd2131e6de96d47 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Wed, 16 Feb 2022 00:48:49 +0100 -Subject: [PATCH] clang: possible better compilation with musl c - -Try to help resolving reported compilation problem with -clang & musl C. -https://github.com/lvmteam/lvm2/issues/61 - -Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4fd76de4b69f8e5e6d5afa03d54cb4b8986c4bcc -Signed-off-by: Simon Rowe ---- - libdaemon/server/daemon-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c -index 88905a7dd..96cfc392e 100644 ---- a/libdaemon/server/daemon-server.c -+++ b/libdaemon/server/daemon-server.c -@@ -18,6 +18,7 @@ - - #include - #include -+#include /* help musl C */ - #include - #include - #include --- -2.22.3 - diff --git a/package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch similarity index 100% rename from package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch rename to package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch diff --git a/package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch similarity index 100% rename from package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch rename to package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch diff --git a/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch b/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch deleted file mode 100644 index db16d60acea..00000000000 --- a/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b668022f9b8aecf52109c9e0b7e5847054231361 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Fri, 19 Aug 2022 16:15:17 +0200 -Subject: [PATCH] mm: preallocate memory only with glibc - -Use mallinfo() only with glibc. - -Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8370d117d7ef8a472c95315a3cd085696c90b3be -Signed-off-by: Simon Rowe ---- - lib/mm/memlock.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index 3d1a3927c..efcc6d91f 100644 ---- a/lib/mm/memlock.c -+++ b/lib/mm/memlock.c -@@ -160,7 +160,12 @@ static void _touch_memory(void *mem, size_t size) - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if defined(__GLIBC__) && !defined(VALGRIND_POOL) -+ /* Memory allocation is currently only tested with glibc -+ * for different C libraries, some other mechanisms might be needed -+ * meanwhile let users use lvm2 code without memory preallocation. -+ * Compilation for VALGRIND tracing also goes without preallocation. -+ */ - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; --- -2.22.3 - diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 126748d3393..74c5f4f1bc7 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From https://sourceware.org/ftp/lvm2/sha512.sum -sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz +sha512 293430a80c7f599d14e77610456d0f44cac8164e6159cd0e2e287462278a89787e289fdb4d481eb8fd6b5eea07a6535c41cb7fdc3deee83df7fea9bf77dcbdaa LVM2.2.03.23.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 810d668ec20..bda16489550 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.14 +LVM2_VERSION = 2.03.23 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES From 5c8577e3dcc4a8ea499e2fb6c6bb8839bf87bc98 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 14 Feb 2024 10:31:41 +0100 Subject: [PATCH 0272/3013] package/python-pytz: bump to 2024.1 Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index be6f0e976b7..a8bfe678179 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 84e6569fcc917b096cca1063819c4ab0 pytz-2023.3.post1.tar.gz -sha256 7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b pytz-2023.3.post1.tar.gz +md5 b26bb090d1fe96064019bf7068eeb801 pytz-2024.1.tar.gz +sha256 2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 pytz-2024.1.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 182d8156fc3..300e26befe8 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2023.3.post1 +PYTHON_PYTZ_VERSION = 2024.1 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/69/4f/7bf883f12ad496ecc9514cd9e267b29a68b3e9629661a2bbc24f80eff168 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/90/26/9f1f00a5d021fff16dee3de13d43e5e978f3d58928e129c3a62cf7eb9738 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From 4ee858808d132fe7d290abbdad7d1f38b47e8b6f Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 14 Feb 2024 21:38:45 +0100 Subject: [PATCH 0273/3013] package/weston: bump to 13.0.0 Announce: https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html Drop -Dlauncher-libseat=true, as it has been dropped upstream [1]. Also drop the BR2_PACKAGE_SEATD_DAEMON, which was added in commit 6d677931284d58ae0e8e001cfd990eafaee5cecc "package/weston: select the seatd daemon", and commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab "package/weston: don't select seatd daemon if we have logind", as it is not strictly needed anymore. In package/seatd/Config.in we have: select BR2_PACKAGE_SEATD_BUILTIN \ if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON Here we have: select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND This makes it impossible to select BR2_PACKAGE_SEATD_BUILTIN as the -only- backend if not BR2_PACKAGE_SYSTEMD_LOGIND, so drop it altogether. This kind of logic should be selected in the device defconfigs or by packages that really need one specific backend. [1]: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58> Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- package/weston/Config.in | 1 - package/weston/weston.hash | 6 +++--- package/weston/weston.mk | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a2..1b282fb362f 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -19,7 +19,6 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_SEATD - select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 0ecbaa4168b..ded5d352751 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html -sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz -sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html +sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz +sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e7987650..5ae9c229730 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 12.0.1 +WESTON_VERSION = 13.0.0 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \ -Ddoc=false \ -Dremoting=false \ -Dbackend-vnc=false \ - -Dlauncher-libseat=true \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) From 13607926f1e24a0df34eccf0a9caed1ef78267ef Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 2 Apr 2024 22:09:27 +0200 Subject: [PATCH 0274/3013] .checkpackageignore: regenerate for lvm2 patches Commit 4cbac9f70609e676887ad242c65e02b3cf827176 removed 2 lvm2 patches and renamed the two remaining ones, but forgot to update .checkpackageignore. Do so now. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 449e94fd390..1b336ce7a3e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -769,10 +769,8 @@ package/luasyslog/0001-remove-AX_LUA_LIBS.patch lib_patch.Upstream package/luasyslog/0002-build-ax_lua.m4-fix-cross-compilation.patch lib_patch.Upstream package/lugaru/0001-ImageIO-fix-invalid-conversion.patch lib_patch.Upstream package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch lib_patch.Upstream -package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch lib_patch.Upstream -package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch lib_patch.Upstream -package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream -package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream +package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream +package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream package/lz4/0001-build-Support-BUILD_SHARED-no.patch lib_patch.Upstream package/lzma/0001-Remove-static-from-LDFLAGS.patch lib_patch.Upstream package/lzop/0001-allow-overriding-modification-time.patch lib_patch.Upstream From 305abd7a302a7859eabc934eba0ffb85cd3657ff Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 17:40:12 -0600 Subject: [PATCH 0275/3013] package/libxcrypt: support host package build This is needed by host-systemd. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: set the host _CONF_OPTS] Signed-off-by: Yann E. MORIN --- package/libxcrypt/libxcrypt.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 9ad030fbd21..8cb6751442b 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -13,8 +13,11 @@ LIBXCRYPT_AUTORECONF = YES # Some warnings turn into errors with some sensitive compilers LIBXCRYPT_CONF_OPTS = --disable-werror +HOST_LIBXCRYPT_CONF_OPTS = --disable-werror # Disable obsolete and unsecure API LIBXCRYPT_CONF_OPTS += --disable-obsolete_api +HOST_LIBXCRYPT_CONF_OPTS += --disable-obsolete_api $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 8a29521747e78b68e4bfa3a06150163921dd4908 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 17:40:13 -0600 Subject: [PATCH 0276/3013] package/systemd: fix build with glibc 2.39 When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing systemd's libcrypt dependency this broke any systemd build using glibc version 2.39. To fix this add the libxcrypt dependency to systemd which is the preferred way of providing libcrypt support in systemd as the glibc variant is only used as a fallback due to being deprecated. We should also have host-systemd depend on host-libxcrypt in case the host system does not provide glibc with libcrypt support. Fixes: - http://autobuild.buildroot.net/results/36e/36efcfc76c015c9b4c955c13afa0f81a98b529f4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 1 + package/systemd/systemd.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index aa5143d484a..a94e9b73b89 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -28,6 +28,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBXCRYPT select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index c6b006d1fbb..8987dc19a61 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -55,6 +55,7 @@ SYSTEMD_DEPENDENCIES = \ host-python-jinja2 \ kmod \ libcap \ + libxcrypt \ util-linux-libs \ $(TARGET_NLS_DEPENDENCIES) @@ -882,6 +883,7 @@ HOST_SYSTEMD_DEPENDENCIES = \ host-util-linux \ host-patchelf \ host-libcap \ + host-libxcrypt \ host-gperf \ host-python-jinja2 From be2ed289684e610b2229339b315706c03ca60da7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 22:50:55 -0600 Subject: [PATCH 0277/3013] package/luaposix: fix build with glibc 2.39 When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing luaposix's libcrypt dependency this broke any luaposix build using glibc version 2.39. To fix this select the libxcrypt dependency to luaposix when using a glibc toolchain and add the dependency if selected. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: use more traditional ifeq-endif block] Signed-off-by: Yann E. MORIN --- package/luaposix/Config.in | 1 + package/luaposix/luaposix.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in index 85943f99158..bd2105743d2 100644 --- a/package/luaposix/Config.in +++ b/package/luaposix/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LUAPOSIX # "bit" module, but since it has a different name, luaposix # doesn't find it. select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help This is a POSIX binding for LuaJIT, Lua 5.1 through 5.4; like most libraries it simply binds to C APIs on the diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index d09a1bcd1df..c5d98fbbd40 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -10,6 +10,10 @@ LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE LUAPOSIX_DEPENDENCIES = luainterpreter host-lua +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +LUAPOSIX_DEPENDENCIES += libxcrypt +endif + define LUAPOSIX_BUILD_CMDS (cd $(@D); \ $(LUA_RUN) build-aux/luke \ From 1ee056bfeb8bf8a4e0081ade283db28f21c50017 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 23:26:17 -0600 Subject: [PATCH 0278/3013] package/screen: fix build with glibc 2.39 When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing screen's libcrypt dependency this broke any screen build using glibc version 2.39. To fix this select the libxcrypt dependency for screen when using a glibc toolchain and add the dependency if selected. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/screen/Config.in | 1 + package/screen/screen.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/screen/Config.in b/package/screen/Config.in index ee4c04ca9e5..40cda77b500 100644 --- a/package/screen/Config.in +++ b/package/screen/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SCREEN bool "screen" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NCURSES help Screen is a full-screen window manager that multiplexes a diff --git a/package/screen/screen.mk b/package/screen/screen.mk index d4052b11915..55fecb89bcc 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -16,6 +16,10 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +SCREEN_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam From eedba64ab217a5b15dffe77565ffc129f1097ac3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 28 Mar 2024 22:49:54 +0100 Subject: [PATCH 0279/3013] package/{mesa3d, mesa3d-headers}: bump version to 24.0.4 Release notes: https://lists.freedesktop.org/archives/mesa-dev/2024-March/226176.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 7f39fefaf56..0756296a016 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.3 +MESA3D_HEADERS_VERSION = 24.0.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 1e94c2c612b..e2e0be26417 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html -sha256 77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe mesa-24.0.3.tar.xz -sha512 76b3b479877c40f729d7f530af4e3577fa74363edcd3d9474350d498a51dbb761fc034b39bee8547e97c30fd3a520cbc50c742d5a187746e83ddab1df44f37e9 mesa-24.0.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-dev/2024-March/226176.html +sha256 90febd30a098cbcd97ff62ecc3dcf5c93d76f7fa314de944cfce81951ba745f0 mesa-24.0.4.tar.xz +sha512 1d05b07026417fbe9cf18f7b18f2db9fe5fe327555c590283d87f69bbdd51f64135928a1dbe155d750187fc268bbdbb070bc1ae9ffc3e013b8707b391969d515 mesa-24.0.4.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index bdb7ea9a6c2..c2343488ed3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.3 +MESA3D_VERSION = 24.0.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 4dc75394511b3eb82f49952a49b6b5e1d49cd75f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Mar 2024 22:54:09 +0100 Subject: [PATCH 0280/3013] package/libidn: bump to version 1.42 https://git.savannah.gnu.org/cgit/libidn.git/tree/NEWS?h=v1.42 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libidn/libidn.hash | 2 +- package/libidn/libidn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libidn/libidn.hash b/package/libidn/libidn.hash index 837424d93e1..65201fdfb59 100644 --- a/package/libidn/libidn.hash +++ b/package/libidn/libidn.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945 libidn-1.41.tar.gz +sha256 d6c199dcd806e4fe279360cb4b08349a0d39560ed548ffd1ccadda8cdecb4723 libidn-1.42.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index e1a357de1b2..c7b8b4941c2 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN_VERSION = 1.41 +LIBIDN_VERSION = 1.42 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true From d295c20ae5ee42a2f62f8b94b5fcc20cb9c117bb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Mar 2024 22:54:48 +0100 Subject: [PATCH 0281/3013] package/libidn2: bump to version 2.3.7 https://gitlab.com/libidn/libidn2/-/blob/v2.3.7/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libidn2/libidn2.hash | 2 +- package/libidn2/libidn2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libidn2/libidn2.hash b/package/libidn2/libidn2.hash index 1051231bded..3d2a41a00e8 100644 --- a/package/libidn2/libidn2.hash +++ b/package/libidn2/libidn2.hash @@ -1,5 +1,5 @@ # Calculated locally after checking signature -sha256 93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f libidn2-2.3.4.tar.gz +sha256 4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64 libidn2-2.3.7.tar.gz # Hash for license files: sha256 73483f797a83373fca1b968c11785b98c4fc4803cdc7d3210811ca8b075d6d76 COPYING diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk index 9d24e93d27e..59db3662e4f 100644 --- a/package/libidn2/libidn2.mk +++ b/package/libidn2/libidn2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN2_VERSION = 2.3.4 +LIBIDN2_VERSION = 2.3.7 LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN2_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode From 38db0df41a8989226a7170f8998982a1173c6b58 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Mar 2024 22:55:47 +0100 Subject: [PATCH 0282/3013] package/freeipmi: bump to version 1.6.14 https://lists.gnu.org/archive/html/freeipmi-announce/2024-01/msg00001.html https://lists.gnu.org/archive/html/freeipmi-announce/2024-01/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/freeipmi/freeipmi.hash | 2 +- package/freeipmi/freeipmi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index ac24b7c64e3..2f81d90c1d3 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 65fbd6910fc010457748695414f27c5755b4e8d75734221221f3858c6230a897 freeipmi-1.6.11.tar.gz +sha256 1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5 freeipmi-1.6.14.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index ecff6f99259..e28f63f7154 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.11 +FREEIPMI_VERSION = 1.6.14 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ From eab49e34af17048ca59fcc9ccdc7990fee269ab6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Mar 2024 22:56:38 +0100 Subject: [PATCH 0283/3013] package/libmaxminddb: bump to version 1.9.1 https://github.com/maxmind/libmaxminddb/blob/1.9.1/Changes.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmaxminddb/libmaxminddb.hash | 2 +- package/libmaxminddb/libmaxminddb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmaxminddb/libmaxminddb.hash b/package/libmaxminddb/libmaxminddb.hash index 23830a6afeb..f5c84fc9053 100644 --- a/package/libmaxminddb/libmaxminddb.hash +++ b/package/libmaxminddb/libmaxminddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1107799f77be6aa3b9796ad0eed8ffcc334bf45f8bd18e6a984d8adf3e719c6d libmaxminddb-1.8.0.tar.gz +sha256 a80682a89d915fdf60b35d316232fb04ebf36fff27fda9bd39fe8a38d3cd3f12 libmaxminddb-1.9.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/libmaxminddb/libmaxminddb.mk b/package/libmaxminddb/libmaxminddb.mk index c741f429ed7..1a1a2e302a8 100644 --- a/package/libmaxminddb/libmaxminddb.mk +++ b/package/libmaxminddb/libmaxminddb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.8.0 +LIBMAXMINDDB_VERSION = 1.9.1 LIBMAXMINDDB_SITE = \ https://github.com/maxmind/libmaxminddb/releases/download/$(LIBMAXMINDDB_VERSION) LIBMAXMINDDB_INSTALL_STAGING = YES From f12c77442e1184427eee0960646833728a4c47db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 29 Mar 2024 17:03:58 +0100 Subject: [PATCH 0284/3013] docs/manual: fix host-python-setuptools typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-python.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 9953be66395..67f2f6081d7 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -92,7 +92,7 @@ Note that: dependencies are automatically added as needed by the Python package infrastructure. - * Similarly, it is not needed to add +host-setuptools+ to + * Similarly, it is not needed to add +host-python-setuptools+ to +PYTHON_FOO_DEPENDENCIES+ for setuptools-based packages, since it's automatically added by the Python infrastructure as needed. From 99abd6e406b0bd55a1bcff807a2ab7d89357c3d1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:33 +0200 Subject: [PATCH 0285/3013] package/apg: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing apg's libcrypt dependency this broke the apg build using glibc version 2.39. To fix this select the libxcrypt dependency to apg when using a glibc toolchain and add the dependency if selected. Fixes: http://autobuild.buildroot.net/results/3df84ae300bb648492cffc21e4481fc5abf02aeb/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/apg/Config.in | 1 + package/apg/apg.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/apg/Config.in b/package/apg/Config.in index 94c286a178b..f54ffdba397 100644 --- a/package/apg/Config.in +++ b/package/apg/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_APG bool "apg" + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Automated Password Generator (APG). diff --git a/package/apg/apg.mk b/package/apg/apg.mk index 16661f4b8dc..1929e21f58f 100644 --- a/package/apg/apg.mk +++ b/package/apg/apg.mk @@ -9,6 +9,10 @@ APG_SITE = $(call github,wilx,apg,v$(APG_VERSION)) APG_LICENSE = BSD-3-Clause APG_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +APG_DEPENDENCIES += libxcrypt +endif + define APG_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) FLAGS="$(TARGET_CFLAGS)" -C $(@D) endef From 2402e0f1d31327806422692db6523120227bc5b0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:34 +0200 Subject: [PATCH 0286/3013] package/apr: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing apr's libcrypt dependency this broke the apache build using glibc version 2.39. To fix this select the libxcrypt dependency to apr when using a glibc toolchain and add the dependency if selected. Fixes: http://autobuild.buildroot.net/results/11ccf857a70ae9f44e8d3ae39fc01db68632ca64/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/apr/Config.in | 1 + package/apr/apr.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/apr/Config.in b/package/apr/Config.in index 4606fc5378d..9427b7af2c7 100644 --- a/package/apr/Config.in +++ b/package/apr/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_APR # apr really needs shared library support depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() in apr_proc_fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help The mission of the Apache Portable Runtime (APR) project is to create and maintain software libraries that provide a diff --git a/package/apr/apr.mk b/package/apr/apr.mk index bdc5e915c62..cb8c12dd657 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -68,6 +68,10 @@ else APR_CONF_OPTS += --disable-nonportable-atomics endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +APR_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) APR_DEPENDENCIES += util-linux endif From cbd22bacff2a1d08e9850cd272e3ca97815ce27a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:35 +0200 Subject: [PATCH 0287/3013] package/dovecot: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing dovecot's libcrypt dependency this broke the dovecot build using glibc version 2.39. To fix this select the libxcrypt dependency to dovecot when using a glibc toolchain and add the dependency if selected. Fixes: http://autobuild.buildroot.net/results/99d816fb7a033ec73a958200041f0dcd728e0e87/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/dovecot/Config.in | 1 + package/dovecot/dovecot.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 20b08b62beb..c94421526f1 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_DOVECOT bool "dovecot" depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index f90996fdd7a..b8652900d0b 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -73,6 +73,10 @@ else DOVECOT_CONF_OPTS += --without-sodium endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +DOVECOT_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) DOVECOT_CONF_OPTS += --with-pam DOVECOT_DEPENDENCIES += linux-pam From 78470802b058e15034d67b43207391693d1a54b2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:36 +0200 Subject: [PATCH 0288/3013] package/freeswitch: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing freeswitch's libcrypt dependency this broke the freeswitch build using glibc version 2.39. To fix this select the libxcrypt dependency to freeswitch when using a glibc toolchain and add the dependency if selected. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/freeswitch/Config.in | 1 + package/freeswitch/freeswitch.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index 1ab624c33cd..80d18e064dc 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FREESWITCH depends on BR2_USE_WCHAR # uses wchar_t select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_JPEG # src/mod/applications/mod_cv/mod_cv.cpp includes # highgui.h, imgproc.hpp & objdetect.hpp diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 5b9dc49c9b1..6160fe5fcb3 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -229,6 +229,10 @@ FREESWITCH_DEPENDENCIES += libpng FREESWITCH_ENABLED_MODULES += formats/mod_png endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +FREESWITCH_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LIBYAML),y) FREESWITCH_DEPENDENCIES += libyaml FREESWITCH_ENABLED_MODULES += languages/mod_yaml From f387594730a7a5048d5d6079935af4abab60e384 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:37 +0200 Subject: [PATCH 0289/3013] package/leafnode2: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing leafnode2's libcrypt dependency this broke the leafnode2 build using glibc version 2.39. To fix this select the libxcrypt dependency to leafnode2 when using a glibc toolchain and add the dependency if selected. Fixes: http://autobuild.buildroot.net/results/08f86ce128623105087cda0c5b32a1d0d0cfa166/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/leafnode2/Config.in | 1 + package/leafnode2/leafnode2.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/leafnode2/Config.in b/package/leafnode2/Config.in index 3700b6fb80e..df9b2469464 100644 --- a/package/leafnode2/Config.in +++ b/package/leafnode2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LEAFNODE2 bool "leafnode2" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_PCRE help Leafnode-2 is a store-and-forward NNTP (or Usenet) proxy diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index 3ed2e202664..cba6b1f72a3 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -14,6 +14,10 @@ LEAFNODE2_AUTORECONF = YES LEAFNODE2_CONF_ENV = \ PCRECONFIG="$(STAGING_DIR)/usr/bin/pcre-config" +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +LEAFNODE2_DEPENDENCIES += libxcrypt +endif + # --enable-runas-user use 'news' as default but the configure stop # if news doesn't exist on the build host. # Use 'root' while cross-compiling From 09c882573cea6e18d98bea3132bf4e0b566a042a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:38 +0200 Subject: [PATCH 0290/3013] package/lighttpd: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing lighttpd's libcrypt dependency this broke the lighttpd build using glibc version 2.39. To fix this select the libxcrypt dependency to lighttpd when using a glibc toolchain and add the dependency if selected. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/lighttpd/Config.in | 1 + package/lighttpd/lighttpd.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 5d9e6245067..66532d7dd52 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIGHTTPD bool "lighttpd" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_XXHASH help lighttpd a secure, fast, compliant and very flexible diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5109e3cebb1..be8eda6b8d9 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -30,6 +30,10 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +LIGHTTPD_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled From 9a5495b9160de730e43dd2a1b0fec0a974c7cae0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:39 +0200 Subject: [PATCH 0291/3013] package/pure-ftpd: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing pure-ftpd's libcrypt dependency this broke the pure-ftpd build using glibc version 2.39. To fix this select the libxcrypt dependency to pure-ftpd when using a glibc toolchain and add the dependency if selected. Fixes: http://autobuild.buildroot.net/results/2a62f48973b30873f4da842e75176633398bef86/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/pure-ftpd/Config.in | 1 + package/pure-ftpd/pure-ftpd.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/pure-ftpd/Config.in b/package/pure-ftpd/Config.in index c060102650b..edfe0159e32 100644 --- a/package/pure-ftpd/Config.in +++ b/package/pure-ftpd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PURE_FTPD bool "pure-ftpd" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Pure-FTPd is a free (BSD), secure, production-quality and standard- conformant FTP server. It doesn't provide useless diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index b918c709303..2c01bc8804f 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -30,6 +30,10 @@ ifeq ($(BR2_PACKAGE_LIBSODIUM),y) PURE_FTPD_DEPENDENCIES += libsodium endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +PURE_FTPD_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_MARIADB),y) PURE_FTPD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr PURE_FTPD_DEPENDENCIES += mariadb From 330cb457feb3e380184ceec4553c1286aa894947 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:40 +0200 Subject: [PATCH 0292/3013] package/squid: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing squid's libcrypt dependency this broke the squid build using glibc version 2.39. To fix this select the libxcrypt dependency to squid when using a glibc toolchain and add the dependency if selected. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/squid/Config.in | 1 + package/squid/squid.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/squid/Config.in b/package/squid/Config.in index 149884d8150..ab13e735e11 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_SQUID depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_LIBTOOL + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 help Caching proxy for the Web supporting HTTP, HTTPS, FTP, and diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 6a2b5223364..e325c63cb01 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -52,6 +52,10 @@ else SQUID_CONF_OPTS += --without-mit-krb5 endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +SQUID_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) SQUID_CONF_OPTS += --with-openssl SQUID_DEPENDENCIES += openssl From 3807f906c9c6d370586ef65503b54cb1f21d7b74 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:41 +0200 Subject: [PATCH 0293/3013] package/sysvinit: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing sysvinit's libcrypt dependency this broke the sysvinit build using glibc version 2.39. To fix this select the libxcrypt dependency to sysvinit when using a glibc toolchain and add the dependency if selected. Fixes: http://autobuild.buildroot.net/results/3a9/3a99389bd7b6db7f9467b34c7bead1d58ce5a18d/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/sysvinit/Config.in | 1 + package/sysvinit/sysvinit.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/sysvinit/Config.in b/package/sysvinit/Config.in index 7f27a70fcc3..e5ca1d7f2db 100644 --- a/package/sysvinit/Config.in +++ b/package/sysvinit/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SYSVINIT depends on BR2_USE_MMU # fork() depends on BR2_INIT_SYSV depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help System V style implementation of /sbin/init, parent of all processes diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index 49c92ec2ac4..7f37cea1318 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -18,6 +18,10 @@ SYSVINIT_DEPENDENCIES += libselinux SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes" endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +SYSVINIT_DEPENDENCIES += libxcrypt +endif + define SYSVINIT_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) $(SYSVINIT_MAKE_OPTS) -C $(@D)/src endef From 399deb6764d6c201547a54c5cad9fe54fbee995e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 11 Sep 2023 00:19:40 -0600 Subject: [PATCH 0294/3013] boot/uboot: add support for u-boot-initial-env install This file is needed by libubootenv for fw_printenv/fw_setenv and library API's to function when the environment is empty. See details: https://github.com/sbabic/libubootenv/tree/v0.3.4#replacement-old-tools Signed-off-by: James Hilliard Reviewed-by: Andreas Naumann Tested-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 7 +++++++ boot/uboot/uboot.mk | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930d..39b3f2c81b1 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -506,6 +506,13 @@ config BR2_TARGET_UBOOT_SPL_NAME and TPL name is tpl/u-boot-tpl.bin but not always. SPL name is MLO on OMAP and SPL on i.MX6 for example. +config BR2_TARGET_UBOOT_INITIAL_ENV + bool "Install u-boot-initial-env" + help + Install the U-Boot u-boot-initial-env on the target. + + This file is typically required by libubootenv. + config BR2_TARGET_UBOOT_ZYNQMP bool "Boot on the Xilinx ZynqMP SoCs" depends on BR2_aarch64 diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a8805..491f654cec7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -138,6 +138,14 @@ UBOOT_MAKE_TARGET += u-boot.stm32 endif endif +ifeq ($(BR2_TARGET_UBOOT_INITIAL_ENV),y) +UBOOT_MAKE_TARGET += u-boot-initial-env +define UBOOT_INSTALL_UBOOT_INITIAL_ENV + $(INSTALL) -D -m 0644 $(@D)/u-boot-initial-env $(TARGET_DIR)/etc/u-boot-initial-env +endef +UBOOT_POST_INSTALL_TARGET_HOOKS += UBOOT_INSTALL_UBOOT_INITIAL_ENV +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) endif From 796df3ff83b68b584ba1a30d621ba333a59dd1f7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 3 Apr 2024 13:21:50 -0600 Subject: [PATCH 0295/3013] package/scons: bump to verion 4.7.0 Drop no longer needed HOST_SCONS_INSTALL_OPTS. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/scons/scons.hash | 6 ++++-- package/scons/scons.mk | 7 ++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/scons/scons.hash b/package/scons/scons.hash index 48b5077b2e1..8dca99830ed 100644 --- a/package/scons/scons.hash +++ b/package/scons/scons.hash @@ -1,3 +1,5 @@ -# Locally computed: -sha256 ce26aac95d350a79a4192196b0beac3cb24f4ccabce0123eb28d3370f576f072 SCons-4.5.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/scons/json +md5 f5a740e94864408902c62bdb47687d9d SCons-4.7.0.tar.gz +sha256 d8b617f6610a73e46509de70dcf82f76861b79762ff602d546f4e80918ec81f3 SCons-4.7.0.tar.gz +# Locally computed sha256 checksums sha256 2f6ac9a1fc98394d18b80dba9bedb9d5626006d44db3fecf7cf3e21cff7e8b1c LICENSE diff --git a/package/scons/scons.mk b/package/scons/scons.mk index ffd6abf6093..b6bfaa02379 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -4,16 +4,13 @@ # ################################################################################ -SCONS_VERSION = 4.5.2 +SCONS_VERSION = 4.7.0 SCONS_SOURCE = SCons-$(SCONS_VERSION).tar.gz -SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION) +SCONS_SITE = https://files.pythonhosted.org/packages/7b/68/6895065c86c65a9388eb760a43ea695ec5b9b1c98a9675a3bcd682dbe9c0 SCONS_LICENSE = MIT SCONS_LICENSE_FILES = LICENSE SCONS_SETUP_TYPE = setuptools -HOST_SCONS_INSTALL_OPTS = \ - --install-lib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages - $(eval $(host-python-package)) # variables used by other packages From 1724b094209daed7bb400382ec22d647b8e61276 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:36:55 +0200 Subject: [PATCH 0296/3013] package/fakeroot: bump to version 1.34 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/fakeroot/fakeroot.hash | 5 +++-- package/fakeroot/fakeroot.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index 5e7b6af94b7..a148de6764a 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,4 +1,5 @@ -# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.32.1-1.dsc -sha256 c072b0f65bafc4cc5b6112f7c61185f5170ce4cb0c410d1681c1af4a183e94e6 fakeroot_1.32.1.orig.tar.gz +# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.34-1.dsc +sha1 aaa6bf0158d886e0093effc0e9422717d5c60eee fakeroot_1.34.orig.tar.gz +sha256 5727f16d8903792588efa7a9f8ef8ce71f8756e746b62e45162e7735662e56bb fakeroot_1.34.orig.tar.gz # License files, locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 1a0ad70c132..1a0996ca12f 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.32.1 +FAKEROOT_VERSION = 1.34 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz -FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20230724T160429Z/pool/main/f/fakeroot +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20240401T084438Z/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off From e5d0543292817341b0ca2e9d2f4486954f1f3dac Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:29 +0200 Subject: [PATCH 0297/3013] package/gnupg2: bump to version 2.4.5 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/gnupg2/gnupg2.hash | 4 ++-- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index c821afb55e3..8bb64c9edae 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2 -sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2 +sha1 ae0935ead29a2dfa34d6b48d70808652bc3ca73b gnupg-2.4.5.tar.bz2 +sha256 f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277 gnupg-2.4.5.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 986da4790c9..39b0a066f67 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.4 +GNUPG2_VERSION = 2.4.5 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 439525ced972299c8fa60d5e68e710075b9dce79 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:30 +0200 Subject: [PATCH 0298/3013] package/libassuan: bump to version 2.5.7 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libassuan/libassuan.hash | 4 ++-- package/libassuan/libassuan.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libassuan/libassuan.hash b/package/libassuan/libassuan.hash index 084a09848c3..6bb5022d133 100644 --- a/package/libassuan/libassuan.hash +++ b/package/libassuan/libassuan.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 b1e8754dbf89b3a3eb175f5df75048dbca1fce57 libassuan-2.5.6.tar.bz2 -sha256 e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 libassuan-2.5.6.tar.bz2 +sha1 b6ccd955085dac902a09871f94a3d41a7667d0c8 libassuan-2.5.7.tar.bz2 +sha256 0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76 libassuan-2.5.7.tar.bz2 # Locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk index fb95a6fd679..9553c630a23 100644 --- a/package/libassuan/libassuan.mk +++ b/package/libassuan/libassuan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASSUAN_VERSION = 2.5.6 +LIBASSUAN_VERSION = 2.5.7 LIBASSUAN_SITE = https://gnupg.org/ftp/gcrypt/libassuan LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc) From dd5d0240d241f8bf88af2c9799b9f13f0e99b515 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:31 +0200 Subject: [PATCH 0299/3013] package/libksba: bump to version 1.6.6 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libksba/libksba.hash | 4 ++-- package/libksba/libksba.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 3ac36e19ca5..e74cde2cc08 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 0ada15ac00baa7df677a05bcb517621708f9c2f2 libksba-1.6.5.tar.bz2 -sha256 a564628c574c99287998753f98d750babd91a4e9db451f46ad140466ef2a6d16 libksba-1.6.5.tar.bz2 +sha1 1db4222e052656700021a30d517f5aa2f882da4a libksba-1.6.6.tar.bz2 +sha256 5dec033d211559338838c0c4957c73dfdc3ee86f73977d6279640c9cd08ce6a4 libksba-1.6.6.tar.bz2 # Hash for license files: sha256 f9c59ea5a5e1dfdeebcd134e6a594c21eb088cc95f6653ee99ff2e187c105380 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 52ad5fbeeca..b87efda2263 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.5 +LIBKSBA_VERSION = 1.6.6 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) From 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:32 +0200 Subject: [PATCH 0300/3013] package/libnpth: bump to version 1.7 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libnpth/libnpth.hash | 7 +++---- package/libnpth/libnpth.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libnpth/libnpth.hash b/package/libnpth/libnpth.hash index b9f72e07707..a140a23f64d 100644 --- a/package/libnpth/libnpth.hash +++ b/package/libnpth/libnpth.hash @@ -1,7 +1,6 @@ -# Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1 npth-1.6.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 a9f7adc1b1f6707071d29bfb3338c28b995ca1ce npth-1.7.tar.bz2 +sha256 8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05 npth-1.7.tar.bz2 # Hash for license file: sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING.LIB diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index ecfef863f41..dc603b607fc 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNPTH_VERSION = 1.6 +LIBNPTH_VERSION = 1.7 LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2 LIBNPTH_SITE = https://www.gnupg.org/ftp/gcrypt/npth LIBNPTH_LICENSE = LGPL-2.0+ From 6f663219d0368f9367bdd133aad43987fff3b916 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:33 +0200 Subject: [PATCH 0301/3013] package/libgpg-error: bump to version 1.48 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libgpg-error/libgpg-error.hash | 5 +++-- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 5c445ba0b27..3b3464592a6 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,6 +1,7 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 94668233fd7bd8e7c0ec5e363134cd53c575da60 libgpg-error-1.47.tar.bz2 -sha256 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb libgpg-error-1.47.tar.bz2 +sha1 8bdb504750b4da9e7daffa164cf1ed9900671f32 libgpg-error-1.48.tar.bz2 +sha256 89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f libgpg-error-1.48.tar.bz2 + # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 60e3da9de14..3dd0ec94da7 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.47 +LIBGPG_ERROR_VERSION = 1.48 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From 9d8f9c73a2fd087dd2e8d8853a80da605fa64e4b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:42:03 +0200 Subject: [PATCH 0302/3013] package/libressl: bump to version 3.8.4 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 40b49dbb82b..5d3b54ea9ce 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954 libressl-3.8.2.tar.gz +sha256 c0cef9cfe174ac366ce482f542fddb07721e7fa0caface34b49a8720fa37fe7d libressl-3.8.4.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index b72f3b38ce6..1d90aa853d8 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.8.2 +LIBRESSL_VERSION = 3.8.4 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From 02e30af0d059aabb694daa54cbad4cae900af29a Mon Sep 17 00:00:00 2001 From: Francois Dugast Date: Wed, 15 Nov 2023 13:38:21 +0000 Subject: [PATCH 0303/3013] package/libdrm/intel: Remove dependency to x86 BR2_PACKAGE_LIBDRM_INTEL was dependent on BR2_i386 or BR2_x86_64, which made sense for integrated GPUs. This is no longer valid with discrete GPUs so remove this dependency to allow building on other CPU architectures. Signed-off-by: Francois Dugast Signed-off-by: Yann E. MORIN --- package/libdrm/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in index 3cb0e02a41c..fab8289be62 100644 --- a/package/libdrm/Config.in +++ b/package/libdrm/Config.in @@ -20,7 +20,6 @@ config BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC config BR2_PACKAGE_LIBDRM_INTEL bool "intel" - depends on BR2_i386 || BR2_x86_64 depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC select BR2_PACKAGE_LIBPCIACCESS From 4a1bcbe17e83c78de31a4cdf9161c1342d1021ae Mon Sep 17 00:00:00 2001 From: Wojciech Nizinski Date: Thu, 14 Sep 2023 18:50:46 +0200 Subject: [PATCH 0304/3013] board/freescale/common/imx/imx8-bootloader-prepare.sh: enable error checking Run script with 'errexit' bash option to detect any errors from subcommands. It will fix situation where 'ddr_fw.bin' was missing but successfull build created broken boot image. Post image script report this by: cat: /home/user/buildroot/output/images/ddr_fw.bin: No such file or directory and build finish with success. Signed-off-by: Wojciech Nizinski Signed-off-by: Thomas Petazzoni --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index 7ebf15b6ffe..a9ee154e9c4 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -73,4 +73,5 @@ main () exit $? } +set -e main $@ From 087115b96a6b053a333de2960aa75c6dd122f087 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Tue, 16 Jan 2024 12:00:02 +0100 Subject: [PATCH 0305/3013] package/psplash: fix systemd unit ordering and dependencies Fix a typo in the dependencies, and switch the type to 'exec'. This ensures that the psplash-systemd service will find the FIFO created by psplash. Change the psplash-systemd dependency to BindsTo, so stopping psplash itself will also end this service and free resources. psplash-start service need to start early, otherwise it might try to compete/take away the framebuffer from the final graphical stack. Order it before sysinit.target. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle --- package/psplash/psplash-start.service | 2 ++ package/psplash/psplash-systemd.service | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/psplash/psplash-start.service b/package/psplash/psplash-start.service index b97e883e547..74cbc33955a 100644 --- a/package/psplash/psplash-start.service +++ b/package/psplash/psplash-start.service @@ -2,8 +2,10 @@ Description=Starts Psplash Boot screen DefaultDependencies=no RequiresMountsFor=/run +Before=sysinit.target [Service] +Type=exec ExecStart=/usr/bin/psplash -n [Install] diff --git a/package/psplash/psplash-systemd.service b/package/psplash/psplash-systemd.service index 249aa540394..f89bc5f4fee 100644 --- a/package/psplash/psplash-systemd.service +++ b/package/psplash/psplash-systemd.service @@ -1,8 +1,8 @@ [Unit] Description=Start psplash-systemd progress communication helper DefaultDependencies=no -After=systemd-start.service -Requires=psplash-start.service +After=psplash-start.service +BindsTo=psplash-start.service RequiresMountsFor=/run [Service] From 57391fad2e619395340b81957ddceab1b1df2e20 Mon Sep 17 00:00:00 2001 From: Boerge Struempfel Date: Tue, 23 Jan 2024 16:58:24 +0100 Subject: [PATCH 0306/3013] package/libgpiod2: new package Due to a significant api change as well as more recent kernel version requirements, we introduce a separate package for version 2.0 and higher. The new package is incompatible to libgpiod 1.x. This allows for iteratively updating all dependent packages without breaking anything as a result. For now we will have libgpiod2 depend on !libgpiod. However, in the future, it might be preferable to have it the other way around, such that packages, which select libgpiod2 don't have to also add the the !libgpiod dependency. Python bindings fail to build, so they are unconditionally disabled. setup.py when called from Makefile tries to do native compilation instead of cross-compilation, which fails at link time with /usr/bin/ld: skipping incompatible ../../lib/.libs//libgpiod.so when searching for -lgpiod Note that this package does not correspond to the debian libgpiod2 package, which currently uses only version 1.6.3 Signed-off-by: Boerge Struempfel Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/libgpiod2/Config.in | 30 +++++++++++++++++++++++++++++ package/libgpiod2/libgpiod2.hash | 4 ++++ package/libgpiod2/libgpiod2.mk | 33 ++++++++++++++++++++++++++++++++ 5 files changed, 71 insertions(+) create mode 100644 package/libgpiod2/Config.in create mode 100644 package/libgpiod2/libgpiod2.hash create mode 100644 package/libgpiod2/libgpiod2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6b38db08575..7dca6a441a0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -531,6 +531,9 @@ N: Bilal Wasim F: board/chromebook/elm/ F: configs/chromebook_elm_defconfig +N: Boerge Struempfel +F: package/libgpiod2/ + N: Bogdan Radulescu F: package/iftop/ F: package/ncdu/ diff --git a/package/Config.in b/package/Config.in index 410fe0f4935..b1237e5d6d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1751,6 +1751,7 @@ menu "Hardware handling" source "package/libftdi1/Config.in" source "package/libgphoto2/Config.in" source "package/libgpiod/Config.in" + source "package/libgpiod2/Config.in" source "package/libgudev/Config.in" source "package/libhid/Config.in" source "package/libiio/Config.in" diff --git a/package/libgpiod2/Config.in b/package/libgpiod2/Config.in new file mode 100644 index 00000000000..5a13bfc3444 --- /dev/null +++ b/package/libgpiod2/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LIBGPIOD2 + bool "libgpiod2" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + depends on !BR2_PACKAGE_LIBGPIOD + help + This is a C library that abstracts the GPIO character + device operations on linux. + + This package is the continuation of the libgpiod package + for versions 2.0 and above. + + Note that a kernel of 5.10 or above is required for the + ioctls to work. + + https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/ + +if BR2_PACKAGE_LIBGPIOD2 + +config BR2_PACKAGE_LIBGPIOD2_TOOLS + bool "install tools" + help + Include a set of command-line tools for managing GPIOs. + +endif + +comment "libgpiod2 needs kernel headers >= 5.10" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + +comment "libgpiod2 is incompatible with libgpiod" + depends on BR2_PACKAGE_LIBGPIOD diff --git a/package/libgpiod2/libgpiod2.hash b/package/libgpiod2/libgpiod2.hash new file mode 100644 index 00000000000..b5488496b24 --- /dev/null +++ b/package/libgpiod2/libgpiod2.hash @@ -0,0 +1,4 @@ +# From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc +sha256 fa4024a080121c958502f9a46a5bda44bea85e7a4dd7fcb3dead463b6fc4261c libgpiod-2.1.tar.xz +# Hash for license file +sha256 eb17a56966db5d986bec449ee44ed61f01f9e3fafa952e527db67a8f9594fd11 COPYING diff --git a/package/libgpiod2/libgpiod2.mk b/package/libgpiod2/libgpiod2.mk new file mode 100644 index 00000000000..9c478f1ffb6 --- /dev/null +++ b/package/libgpiod2/libgpiod2.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libgpiod2 +# +################################################################################ + +# Be careful when bumping versions. +# Dependency on kernel header versions may change. +LIBGPIOD2_VERSION = 2.1 +LIBGPIOD2_SOURCE = libgpiod-$(LIBGPIOD2_VERSION).tar.xz +LIBGPIOD2_SITE = https://www.kernel.org/pub/software/libs/libgpiod +LIBGPIOD2_LICENSE = LGPL-2.1+ +LIBGPIOD2_LICENSE_FILES = COPYING +LIBGPIOD2_INSTALL_STAGING = YES +LIBGPIOD2_DEPENDENCIES = host-pkgconf host-autoconf-archive +LIBGPIOD2_CONF_OPTS = \ + --disable-bindings-python \ + --disable-examples \ + --disable-tests + +ifeq ($(BR2_PACKAGE_LIBGPIOD2_TOOLS),y) +LIBGPIOD2_CONF_OPTS += --enable-tools +else +LIBGPIOD2_CONF_OPTS += --disable-tools +endif + +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +LIBGPIOD2_CONF_OPTS += --enable-bindings-cxx +else +LIBGPIOD2_CONF_OPTS += --disable-bindings-cxx +endif + +$(eval $(autotools-package)) From a26701a0dbe2654f4a1e2a53c709ac12077e18f4 Mon Sep 17 00:00:00 2001 From: Boerge Struempfel Date: Tue, 23 Jan 2024 16:58:25 +0100 Subject: [PATCH 0307/3013] package/swupdate: Add compatibility to libgpiod2 swupdate supports both the old and the new API, so HAVE_LIBGPIOD is enabled if either is enabled. Signed-off-by: Boerge Struempfel Signed-off-by: Arnout Vandecappelle --- package/swupdate/Config.in | 4 ++-- package/swupdate/swupdate.mk | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index ba3f6a0c0f8..3708df0881f 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -37,8 +37,8 @@ config BR2_PACKAGE_SWUPDATE remote handler. * Select BR2_PACKAGE_LIBRSYNC to add support for using rdiff handler. - * Select BR2_PACKAGE_LIBGPIOD to add support for - microcontroller firmware update. + * Select BR2_PACKAGE_LIBGPIOD or BR2_PACKAGE_LIBGPIOD2 to add + support for microcontroller firmware update. * Select BR2_PACKAGE_EFIBOOTMGR to add support for EFI Boot Guard. * Select BR2_PACKAGE_LIBCURL, BR2_PACKAGE_LIBWEBSOCKETS, diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index ca8c140886e..a2b09952279 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -72,7 +72,10 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBFDISK=n endif -ifeq ($(BR2_PACKAGE_LIBGPIOD),y) +ifeq ($(BR2_PACKAGE_LIBGPIOD2),y) +SWUPDATE_DEPENDENCIES += libgpiod2 +SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=y +else ifeq ($(BR2_PACKAGE_LIBGPIOD),y) SWUPDATE_DEPENDENCIES += libgpiod SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=y else From 146498d13c487e8f43d6725e343eae4474147695 Mon Sep 17 00:00:00 2001 From: Jugurtha BELKALEM Date: Fri, 19 Jan 2024 17:17:58 -0800 Subject: [PATCH 0308/3013] package/bcc: new package bcc is a front-end tool for eBPF: https://github.com/iovisor/bcc/blob/master/README.md eBPF is the most powerful Linux tracer, and bcc allows writing eBPF scripts in C and PYTHON3. bcc can help to troubleshoot issues quickly on embedded systems (as long as Linux kernel version >= 4.1). bcc can also make it easy to create observabilty tools, SDN configuration, ddos mitigation, intrusion detection and secure containers. More information is available at: https://ebpf.io/ BCC can be tested on the target : $ mount -t debugfs none /sys/kernel/debug $ cd /usr/share/bcc/tools $ ./execsnoop Signed-off-by: Jugurtha BELKALEM Signed-off-by: Romain Naour Tested-by: Qais Yousef Reviewed-by: Qais Yousef Cc: Qais Yousef Signed-off-by: Mat Martineau [Arnout: order dependencies alphabetically, fix Config.in comment] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/bcc/Config.in | 45 +++++++++++++++++++++++++++++++++++++ package/bcc/bcc.hash | 3 +++ package/bcc/bcc.mk | 52 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 package/bcc/Config.in create mode 100644 package/bcc/bcc.hash create mode 100644 package/bcc/bcc.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7dca6a441a0..3a6b06bcbf0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1682,6 +1682,7 @@ N: Joshua Henderson F: package/qt5/qt5wayland/ N: Jugurtha BELKALEM +F: package/bcc/ F: package/python-aiofiles/ F: package/python-crayons/ F: package/python-cycler/ @@ -2683,6 +2684,7 @@ F: configs/qemu_* F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ +F: package/bcc/ F: package/binutils/ F: package/bullet/ F: package/clinfo/ diff --git a/package/Config.in b/package/Config.in index b1237e5d6d7..84c9aff51ff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -87,6 +87,7 @@ endmenu menu "Debugging, profiling and benchmark" source "package/babeltrace2/Config.in" + source "package/bcc/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" source "package/bpftool/Config.in" diff --git a/package/bcc/Config.in b/package/bcc/Config.in new file mode 100644 index 00000000000..b91e0e5ee3d --- /dev/null +++ b/package/bcc/Config.in @@ -0,0 +1,45 @@ +config BR2_PACKAGE_BCC + bool "bcc" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_USE_MMU # python3 + depends on BR2_TOOLCHAIN_USES_GLIBC # hardcode GNU tuple (x86_64-unknown-linux-gnu) + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # clang + depends on BR2_INSTALL_LIBSTDCPP # clang + depends on BR2_HOST_GCC_AT_LEAST_7 # clang + depends on BR2_USE_WCHAR # clang, python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # clang, python3 + depends on !BR2_STATIC_LIBS # clang, python3 + select BR2_PACKAGE_CLANG + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_FLEX # needs FlexLexer.h + select BR2_PACKAGE_HOST_ZIP + select BR2_PACKAGE_LLVM + select BR2_PACKAGE_LLVM_BPF + select BR2_PACKAGE_PYTHON3 + help + BPF Compiler Collection (BCC) + + BCC is a toolkit for creating efficient kernel tracing and + manipulation programs, and includes several useful tools and + examples. It makes use of extended BPF (Berkeley Packet + Filters), formally known as eBPF, a new feature that was + first added to Linux 3.15. Much of what BCC uses requires + Linux 4.1 and above. + + Note: Before using bcc, you need either need to : + - For kernel_ver = [4.1, 5.2) : Copy kernel source code + to target folder /lib/module//build. + - Or kernel_ver >= 5.2 : Compile kernel with CONFIG_IKHEADERS + and use generated headers under /sys/kernel/kheaders.tar.xz + to populate /lib/module//build. + + That's because the clang frontend build eBPF code at runtime. + + https://github.com/iovisor/bcc + http://www.ebpf.io + +comment "bcc needs a glibc toolchain, C++, gcc >= 7, host gcc >= 7" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/bcc/bcc.hash b/package/bcc/bcc.hash new file mode 100644 index 00000000000..b37e125b1ac --- /dev/null +++ b/package/bcc/bcc.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 321575fa94f3274040379dd2d4535217f45099f4240b58a4dfc171aa8c78402f bcc-src-with-submodule.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE.txt diff --git a/package/bcc/bcc.mk b/package/bcc/bcc.mk new file mode 100644 index 00000000000..e496c4b3444 --- /dev/null +++ b/package/bcc/bcc.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# bcc +# +################################################################################ + +BCC_VERSION = 0.29.1 +BCC_SITE = https://github.com/iovisor/bcc/releases/download/v$(BCC_VERSION) +BCC_SOURCE = bcc-src-with-submodule.tar.gz +BCC_LICENSE = Apache-2.0 +BCC_LICENSE_FILES = LICENSE.txt +BCC_INSTALL_STAGING = YES +BCC_DEPENDENCIES = \ + clang \ + elfutils \ + flex \ + host-bison \ + host-flex \ + host-python-setuptools \ + host-zip \ + llvm \ + python3 + +# ENABLE_LLVM_SHARED=ON to use llvm.so - we only support shared libs +# Force REVISION otherwise bcc will use git describe to generate a version number. +BCC_CONF_OPTS = \ + -DENABLE_LLVM_SHARED:BOOL=ON \ + -DREVISION:STRING=$(BCC_VERSION) \ + -DENABLE_CLANG_JIT:BOOL=ON \ + -DENABLE_MAN:BOOL=OFF \ + -DENABLE_EXAMPLES:BOOL=OFF \ + -DPY_SKIP_DEB_LAYOUT:BOOL=ON + +define BCC_LINUX_CONFIG_FIXUPS + # Enable kernel support for eBPF + $(call KCONFIG_ENABLE_OPT,CONFIG_BPF) + $(call KCONFIG_ENABLE_OPT,CONFIG_BPF_SYSCALL) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CLS_BPF) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_ACT_BPF) + $(call KCONFIG_ENABLE_OPT,CONFIG_BPF_JIT) + # [for Linux kernel versions 4.1 through 4.6] + $(call KCONFIG_ENABLE_OPT,CONFIG_HAVE_BPF_JIT) + # [for Linux kernel versions 4.7 and later] + $(call KCONFIG_ENABLE_OPT,CONFIG_HAVE_EBPF_JIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_BPF_EVENTS) + # [for Linux kernel versions 5.2 and later] + $(call KCONFIG_ENABLE_OPT,CONFIG_IKHEADERS) + # bcc needs debugfs at runtime + $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS) +endef + +$(eval $(cmake-package)) From 338acb27ff3e07560290085d7c6a2feab633c869 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Fri, 19 Jan 2024 17:17:59 -0800 Subject: [PATCH 0309/3013] package/bpftrace: new package bpftrace is a high-level tracing language for Linux enhanced Berkeley Packet Filter (eBPF) available in recent Linux kernels (4.1 and later). Only tested on x86_64. Signed-off-by: Qais Yousef Signed-off-by: Romain Naour Cc: Jugurtha BELKALEM Cc: Qais Yousef Signed-off-by: Mat Martineau [Arnout: - Remove duplicate 'depends on BR2_TOOLCHAIN_HAS_THREADS' - Fix Config.in comment text and dependencies - Order dependencies alphabetically ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 4 +++ package/Config.in | 1 + package/bpftrace/Config.in | 56 ++++++++++++++++++++++++++++++++++ package/bpftrace/bpftrace.hash | 3 ++ package/bpftrace/bpftrace.mk | 34 +++++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 package/bpftrace/Config.in create mode 100644 package/bpftrace/bpftrace.hash create mode 100644 package/bpftrace/bpftrace.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3a6b06bcbf0..8d7f8bcba5b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2583,6 +2583,9 @@ F: package/synergy/ N: Prabhu Sannachi F: package/redis-plus-plus/ +N: Qais Yousef +F: package/bpftrace/ + N: Rafal Susz F: board/avnet/s6lx9_microboard/ F: configs/s6lx9_microboard_defconfig @@ -2686,6 +2689,7 @@ F: package/alure/ F: package/aubio/ F: package/bcc/ F: package/binutils/ +F: package/bpftrace/ F: package/bullet/ F: package/clinfo/ F: package/efl/ diff --git a/package/Config.in b/package/Config.in index 84c9aff51ff..60d89477787 100644 --- a/package/Config.in +++ b/package/Config.in @@ -91,6 +91,7 @@ menu "Debugging, profiling and benchmark" source "package/blktrace/Config.in" source "package/bonnie/Config.in" source "package/bpftool/Config.in" + source "package/bpftrace/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/clpeak/Config.in" diff --git a/package/bpftrace/Config.in b/package/bpftrace/Config.in new file mode 100644 index 00000000000..8af94443abb --- /dev/null +++ b/package/bpftrace/Config.in @@ -0,0 +1,56 @@ +config BR2_PACKAGE_BPFTRACE_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_x86_64 + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + +config BR2_PACKAGE_BPFTRACE + bool "bpftrace" + depends on BR2_PACKAGE_BPFTRACE_ARCH_SUPPORTS + depends on BR2_USE_MMU # bcc -> python3 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libbpf + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # bcc + depends on BR2_TOOLCHAIN_USES_GLIBC # bcc + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # bcc -> clang + depends on BR2_INSTALL_LIBSTDCPP # bcc -> clang + depends on BR2_HOST_GCC_AT_LEAST_7 # bcc -> clang + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 # libbpf + depends on BR2_USE_WCHAR # bcc -> clang, bcc -> python3, libbpf + depends on BR2_TOOLCHAIN_HAS_THREADS # bcc -> clang, bcc -> python3, libbpf + depends on !BR2_STATIC_LIBS # bcc -> clang, bcc -> python3, libbpf + select BR2_PACKAGE_BCC + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_CEREAL + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_LIBBPF + select BR2_PACKAGE_LLVM + # LLVM RTTI mendatory: https://github.com/iovisor/bpftrace/issues/1156 + select BR2_PACKAGE_LLVM_RTTI + select BR2_PACKAGE_XZ + help + bpftrace is a high-level tracing language for Linux enhanced + Berkeley Packet Filter (eBPF) available in recent Linux + kernels (4.x). + + bpftrace uses LLVM as a backend to compile scripts to + BPF-bytecode and makes use of BCC for interacting with the + Linux BPF system, as well as existing Linux tracing + capabilities: kernel dynamic tracing (kprobes), user-level + dynamic tracing (uprobes), and tracepoints. The bpftrace + language is inspired by awk and C, and predecessor tracers + such as DTrace and SystemTap. + + It's highly recommended to NOT strip bpftrace binary. + To do so, add "bpftrace" to BR2_STRIP_EXCLUDE_FILES. + See: + https://bugzilla.redhat.com/show_bug.cgi?id=1865787 + + https://www.github.com/iovisor/bpftrace + +comment "bpftrace needs a glibc toolchain w/ C++, gcc >= 7, host gcc >= 7, kernel headers >= 4.13" + depends on BR2_PACKAGE_BPFTRACE_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_HOST_GCC_AT_LEAST_7 \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 diff --git a/package/bpftrace/bpftrace.hash b/package/bpftrace/bpftrace.hash new file mode 100644 index 00000000000..c2ecc927da3 --- /dev/null +++ b/package/bpftrace/bpftrace.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 b520340f28ce4d6f2fb2355f1675b6801ff8498ed9e8bff14abbbf6baff5a08e bpftrace-0.19.1.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/bpftrace/bpftrace.mk b/package/bpftrace/bpftrace.mk new file mode 100644 index 00000000000..dc4c9728cca --- /dev/null +++ b/package/bpftrace/bpftrace.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# bpftrace +# +################################################################################ + +BPFTRACE_VERSION = 0.19.1 +BPFTRACE_SITE = $(call github,iovisor,bpftrace,v$(BPFTRACE_VERSION)) +BPFTRACE_LICENSE = Apache-2.0 +BPFTRACE_LICENSE_FILES = LICENSE +BPFTRACE_DEPENDENCIES = \ + bcc \ + bzip2 \ + cereal \ + elfutils \ + host-bison \ + host-flex \ + libbpf \ + llvm \ + xz + +# libbfd, libopcodes +ifeq ($(BR2_PACKAGE_BINUTILS),y) +BPFTRACE_DEPENDENCIES += binutils +endif + +BPFTRACE_CONF_OPTS += \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DBUILD_TESTING:BOOL=OFF \ + -DENABLE_MAN:BOOL=OFF \ + -DINSTALL_TOOL_DOCS:BOOL=OFF \ + -DUSE_SYSTEM_BPF_BCC:BOOL=ON + +$(eval $(cmake-package)) From b31443e09cb7bb67b97ae6fb7614fe3a22889d50 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:54:24 +0200 Subject: [PATCH 0310/3013] package/lua-lgdbm: new package Signed-off-by: Francois Perrad [yann.morin.1998@free.fr: propagate gdbm deps, fix check-package] Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/lua-lgdbm/Config.in | 15 +++++++++++++++ package/lua-lgdbm/lua-lgdbm.hash | 2 ++ package/lua-lgdbm/lua-lgdbm.mk | 13 +++++++++++++ support/testing/tests/package/test_lua_lgdbm.py | 13 +++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/lua-lgdbm/Config.in create mode 100644 package/lua-lgdbm/lua-lgdbm.hash create mode 100644 package/lua-lgdbm/lua-lgdbm.mk create mode 100644 support/testing/tests/package/test_lua_lgdbm.py diff --git a/package/Config.in b/package/Config.in index 60d89477787..0d31faf3544 100644 --- a/package/Config.in +++ b/package/Config.in @@ -747,6 +747,7 @@ menu "Lua libraries/modules" source "package/lua-http/Config.in" source "package/lua-iconv/Config.in" source "package/lua-inotify/Config.in" + source "package/lua-lgdbm/Config.in" source "package/lua-livr/Config.in" source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" diff --git a/package/lua-lgdbm/Config.in b/package/lua-lgdbm/Config.in new file mode 100644 index 00000000000..5d8636aff49 --- /dev/null +++ b/package/lua-lgdbm/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LUA_LGDBM + bool "lua-lgdbm" + depends on BR2_USE_MMU # gdbm + depends on BR2_USE_WCHAR #gdbm + depends on BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4 + select BR2_PACKAGE_GDBM + help + A database library for Lua using GDBM. + + http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lgdbm + +comment "lua-lgdbm needs needs a toolchain with wchar, Lua >= 5.3" + depends on !BR2_USE_MMU + depends on !(BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4) \ + || !BR2_USE_WCHAR diff --git a/package/lua-lgdbm/lua-lgdbm.hash b/package/lua-lgdbm/lua-lgdbm.hash new file mode 100644 index 00000000000..06f22f15095 --- /dev/null +++ b/package/lua-lgdbm/lua-lgdbm.hash @@ -0,0 +1,2 @@ +# computed by luarocks/buildroot +sha256 8cb7e25254b1c9889894654f6cf26d09f2c2ee10fe966f45152eb5deb0a24f9b lgdbm-20211118.52-0.src.rock diff --git a/package/lua-lgdbm/lua-lgdbm.mk b/package/lua-lgdbm/lua-lgdbm.mk new file mode 100644 index 00000000000..35ca9c93f44 --- /dev/null +++ b/package/lua-lgdbm/lua-lgdbm.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# lua-lgdbm +# +################################################################################ + +LUA_LGDBM_VERSION = 20211118.52-0 +LUA_LGDBM_NAME_UPSTREAM = lgdbm +LUA_LGDBM_SUBDIR = gdbm +LUA_LGDBM_LICENSE = Public Domain +LUA_LGDBM_DEPENDENCIES = gdbm + +$(eval $(luarocks-package)) diff --git a/support/testing/tests/package/test_lua_lgdbm.py b/support/testing/tests/package/test_lua_lgdbm.py new file mode 100644 index 00000000000..4ccf7599927 --- /dev/null +++ b/support/testing/tests/package/test_lua_lgdbm.py @@ -0,0 +1,13 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLgdbm(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_LGDBM=y + """ + + def test_run(self): + self.login() + self.module_test("gdbm") From aef5490fab26427cc3795fb76b396e5ea667f3b2 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 Apr 2024 12:55:49 -0700 Subject: [PATCH 0311/3013] package/go: security bump to go1.22.2 CVE-2023-45288: http2: close connections when receiving too many headers https://go.dev/doc/devel/release#go1.22.2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 06d8776db27..81bd14baa8e 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321 go1.22.1.src.tar.gz +sha256 374ea82b289ec738e968267cac59c7d5ff180f9492250254784b2044e90df5a9 go1.22.2.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index a8ec5d95a0c..0e39ad9f8cb 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.22.1 +GO_VERSION = 1.22.2 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 1a015540278ba742b5a77e90e80e2f858af14f04 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 27 Mar 2024 16:36:02 +0100 Subject: [PATCH 0312/3013] DEVELOPERS: remove Thomas De Schampheleire No longer active in Buildroot. Keeping my name in the list sets the wrong expectation regarding package updates or support. Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- DEVELOPERS | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8d7f8bcba5b..d78661cd607 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2968,47 +2968,6 @@ F: package/openlayers/ F: package/vuejs/ F: package/vuejs-router/ -N: Thomas De Schampheleire -F: docs/manual/ -F: package/cereal/ -F: package/chartjs/ -F: package/datatables/ -F: package/datatables-buttons/ -F: package/datatables-fixedcolumns/ -F: package/datatables-responsive/ -F: package/jszip/ -F: package/libtelnet/ -F: package/opkg-utils/ -F: package/perl-convert-asn1/ -F: package/perl-crypt-blowfish/ -F: package/perl-crypt-cbc/ -F: package/perl-crypt-openssl-aes/ -F: package/perl-devel-cycle/ -F: package/perl-devel-size/ -F: package/perl-i18n/ -F: package/perl-locale-maketext-lexicon/ -F: package/perl-lwp-protocol-https/ -F: package/perl-math-int64/ -F: package/perl-math-prime-util/ -F: package/perl-mime-base64-urlsafe/ -F: package/perl-mojolicious-plugin-authentication/ -F: package/perl-mojolicious-plugin-authorization/ -F: package/perl-mojolicious-plugin-cspheader/ -F: package/perl-mojolicious-plugin-i18n/ -F: package/perl-mojolicious-plugin-securityheader/ -F: package/perl-mozilla-ca/ -F: package/perl-net-snmp/ -F: package/perl-net-ssh2/ -F: package/perl-net-telnet/ -F: package/perl-path-class/ -F: package/pigz/ -F: package/popperjs/ -F: package/xenomai/ -F: support/scripts/size-stats -F: support/testing/tests/package/test_perl_lwp_protocol_https.py -F: utils/size-stats-compare -F: toolchain/ - N: Thomas Devoogdt F: package/fluent-bit/ F: package/libsoup3/ From e0bbfaea0e983c1ce42a9c3085f3ca3dd796852f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 4 Apr 2024 17:11:15 +0200 Subject: [PATCH 0313/3013] package/apache: security bump version to 2.4.59 Changelog: https://dlcdn.apache.org/httpd/CHANGES_2.4.59 Fixes CVE-2023-38709, CVE-2024-27316 & CVE-2024-24795. Removed patch which is included in this release. Updated _SITE and hash file URLs according to https://httpd.apache.org/download.cgi#apache24 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...emove-dependency-on-xmlstring-header.patch | 47 ------------------- package/apache/apache.hash | 6 +-- package/apache/apache.mk | 4 +- 3 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch diff --git a/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch b/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch deleted file mode 100644 index 8ff7076589b..00000000000 --- a/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 27a68e54b7c6d2ae80dca396fd2727852897dab1 Mon Sep 17 00:00:00 2001 -From: Eric Covener -Date: Tue, 21 Nov 2023 12:58:47 +0000 -Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header - -Submitted by: ttachi - -Github: closes #393 - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914013 13f79535-47bb-0310-9956-ffa450edef68 - -Upstream: https://github.com/apache/httpd/commit/27a68e54b7c6d2ae80dca396fd2727852897dab1 - -Signed-off-by: Bernd Kuhls ---- - changes-entries/xmlchar.txt | 2 ++ - modules/filters/mod_xml2enc.c | 6 +++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - create mode 100644 changes-entries/xmlchar.txt - -diff --git a/changes-entries/xmlchar.txt b/changes-entries/xmlchar.txt -new file mode 100644 -index 00000000000..d0e06300411 ---- /dev/null -+++ b/changes-entries/xmlchar.txt -@@ -0,0 +1,2 @@ -+ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later. -+ [ttachi ] -diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c -index 34f8e8ee090..e8ee2647955 100644 ---- a/modules/filters/mod_xml2enc.c -+++ b/modules/filters/mod_xml2enc.c -@@ -206,11 +206,11 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx) - } - } - } -- -+ - /* to sniff, first we look for BOM */ - if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { -- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, -- ctx->bytes); -+ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf, -+ ctx->bytes); - if (HAVE_ENCODING(ctx->xml2enc)) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432) - "Got charset from XML rules.") ; diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 854bc85dcc5..84248761b97 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://archive.apache.org/dist/httpd/httpd-2.4.58.tar.bz2.{sha256,sha512} -sha256 fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5 httpd-2.4.58.tar.bz2 -sha512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1 httpd-2.4.58.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.59.tar.bz2.{sha256,sha512} +sha256 ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323 httpd-2.4.59.tar.bz2 +sha512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 httpd-2.4.59.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 3efa6b0ac19..1b095c5eb10 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,9 +4,9 @@ # ################################################################################ -APACHE_VERSION = 2.4.58 +APACHE_VERSION = 2.4.59 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 -APACHE_SITE = https://downloads.apache.org/httpd +APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 APACHE_LICENSE_FILES = LICENSE APACHE_CPE_ID_VENDOR = apache From a4011ec1e13baa1190a41d949ad2cd945a9ecbe2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 Apr 2024 17:34:36 +0200 Subject: [PATCH 0314/3013] package/tiff: explicitly disable lerc support for host and target We do not have liblerc in Buildroot and it may cause linking issues for host-tiff on build hosts with liblerc: libtool: link: /usr/bin/gcc -O2 -I/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/include -Wall -W -Wl,-rpath -Wl,/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/lib -o tiffcp tiffcp.o -L/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/lib ../libtiff/.libs/libtiff.so ../port/.libs/libport.a -lLerc -ljbig -lm -Wl,-rpath -Wl,/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/build/host-tiff-4.6.0/libtiff/.libs -Wl,-rpath -Wl,/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/lib /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `deflateInit_' /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `deflate' /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `deflateEnd' /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `inflate' Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index e384e8b8141..8ec53d4fe16 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -16,6 +16,7 @@ TIFF_INSTALL_STAGING = YES # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ --disable-contrib \ + --disable-lerc \ --disable-tests \ --disable-webp @@ -24,6 +25,7 @@ TIFF_DEPENDENCIES = host-pkgconf HOST_TIFF_CONF_OPTS = \ --disable-cxx \ --disable-zlib \ + --disable-lerc \ --disable-libdeflate \ --disable-lzma \ --disable-jpeg \ From a7d491b0ffc5c0876053cc94c4112e73096aa5c2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 Apr 2024 17:34:37 +0200 Subject: [PATCH 0315/3013] package/tiff: explicitly disable jbig support for host and target BR2_PACKAGE_TIFF_JBIG did actually not do anything, as no explicit --enable-jbig was passed to configure and there is no libjbig in Buildroot, so drop it and instead explicitly disable jbig support. Also add --disable-jbig for the host build, which was missed when host support was added in commit 91b16fbbf9db (tiff: add host variant). As the TIFF_JBIG option was a noop, do not add legacy handling for it. Signed-off-by: Peter Korsgaard --- package/tiff/Config.in | 4 ---- package/tiff/tiff.mk | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index d1004d6668d..d357d084065 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -63,10 +63,6 @@ config BR2_PACKAGE_TIFF_OLD_JPEG bool "Old JPEG decompression" default y -config BR2_PACKAGE_TIFF_JBIG - bool "JBIG compression" - default y - config BR2_PACKAGE_TIFF_UTILITIES bool "tiff utilities" help diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 8ec53d4fe16..0e5e0dd48a3 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -17,6 +17,7 @@ TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ --disable-contrib \ --disable-lerc \ + --disable-jbig \ --disable-tests \ --disable-webp @@ -28,6 +29,7 @@ HOST_TIFF_CONF_OPTS = \ --disable-lerc \ --disable-libdeflate \ --disable-lzma \ + --disable-jbig \ --disable-jpeg \ --disable-tests \ --disable-webp \ @@ -101,10 +103,6 @@ ifneq ($(BR2_PACKAGE_TIFF_OLD_JPEG),y) TIFF_CONF_OPTS += --disable-old-jpeg endif -ifneq ($(BR2_PACKAGE_TIFF_JBIG),y) -TIFF_CONF_OPTS += --disable-jbig -endif - ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) TIFF_CONF_OPTS += --enable-tools else From 0a59e72946561b3a4b11aa8e51ee893852048b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Sat, 6 Apr 2024 16:58:02 +0200 Subject: [PATCH 0316/3013] configs/bananapi_m2_zero: bump Linux to 6.8.4 and U-Boot to 2024.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Necessary adaptations: - The SD card is now called mmcblk1; adapt Linux boot command accordingly. - The DTB is now under the allwinner/ folder. - U-Boot needs OpenSSL to build. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6544501111 Signed-off-by: Vincent Stehlé Cc: Jagan Teki Signed-off-by: Thomas Petazzoni --- board/bananapi/bananapi-m2-zero/boot.cmd | 2 +- configs/bananapi_m2_zero_defconfig | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/bananapi/bananapi-m2-zero/boot.cmd b/board/bananapi/bananapi-m2-zero/boot.cmd index 081450935b8..70ccdf7045b 100644 --- a/board/bananapi/bananapi-m2-zero/boot.cmd +++ b/board/bananapi/bananapi-m2-zero/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait mmc dev 0 fatload mmc 0 $kernel_addr_r zImage diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig index e5c89fce40f..8a3e5cd8305 100644 --- a/configs/bananapi_m2_zero_defconfig +++ b/configs/bananapi_m2_zero_defconfig @@ -1,26 +1,26 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Bananapi M2 Zero" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-zero/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.4" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-bananapi-m2-zero" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-bananapi-m2-zero" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="bananapi_m2_zero" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 516d57dc9c8dbcd991a4f7888556e28f838ac0ce Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Apr 2024 12:25:41 +0200 Subject: [PATCH 0317/3013] package/dropbear: bump version to 2024.84 Drop patch which is included in this release. Changelog: https://matt.ucc.asn.au/dropbear/CHANGES Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Implement-Strict-KEX-mode.patch | 232 ------------------ package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 5 +- 3 files changed, 2 insertions(+), 237 deletions(-) delete mode 100644 package/dropbear/0001-Implement-Strict-KEX-mode.patch diff --git a/package/dropbear/0001-Implement-Strict-KEX-mode.patch b/package/dropbear/0001-Implement-Strict-KEX-mode.patch deleted file mode 100644 index ce7b84861ca..00000000000 --- a/package/dropbear/0001-Implement-Strict-KEX-mode.patch +++ /dev/null @@ -1,232 +0,0 @@ -From 6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 Mon Sep 17 00:00:00 2001 -From: Matt Johnston -Date: Mon, 20 Nov 2023 14:02:47 +0800 -Subject: [PATCH] Implement Strict KEX mode - -As specified by OpenSSH with kex-strict-c-v00@openssh.com and -kex-strict-s-v00@openssh.com. - -Upstream: https://github.com/mkj/dropbear/commit/6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 -Signed-off-by: Fabrice Fontaine ---- - src/cli-session.c | 11 +++++++++++ - src/common-algo.c | 6 ++++++ - src/common-kex.c | 26 +++++++++++++++++++++++++- - src/kex.h | 3 +++ - src/process-packet.c | 34 +++++++++++++++++++--------------- - src/ssh.h | 4 ++++ - src/svr-session.c | 3 +++ - 7 files changed, 71 insertions(+), 16 deletions(-) - -diff --git a/cli-session.c b/cli-session.c -index 5981b2470..d261c8f82 100644 ---- a/cli-session.c -+++ b/cli-session.c -@@ -46,6 +46,7 @@ static void cli_finished(void) ATTRIB_NORETURN; - static void recv_msg_service_accept(void); - static void cli_session_cleanup(void); - static void recv_msg_global_request_cli(void); -+static void cli_algos_initialise(void); - - struct clientsession cli_ses; /* GLOBAL */ - -@@ -117,6 +118,7 @@ void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection - } - - chaninitialise(cli_chantypes); -+ cli_algos_initialise(); - - /* Set up cli_ses vars */ - cli_session_init(proxy_cmd_pid); -@@ -487,3 +489,12 @@ void cli_dropbear_log(int priority, const char* format, va_list param) { - fflush(stderr); - } - -+static void cli_algos_initialise(void) { -+ algo_type *algo; -+ for (algo = sshkex; algo->name; algo++) { -+ if (strcmp(algo->name, SSH_STRICT_KEX_S) == 0) { -+ algo->usable = 0; -+ } -+ } -+} -+ -diff --git a/common-algo.c b/common-algo.c -index 378f0ca8e..f9d46ebb6 100644 ---- a/common-algo.c -+++ b/common-algo.c -@@ -307,6 +307,12 @@ algo_type sshkex[] = { - /* Set unusable by svr_algos_initialise() */ - {SSH_EXT_INFO_C, 0, NULL, 1, NULL}, - #endif -+#endif -+#if DROPBEAR_CLIENT -+ {SSH_STRICT_KEX_C, 0, NULL, 1, NULL}, -+#endif -+#if DROPBEAR_SERVER -+ {SSH_STRICT_KEX_S, 0, NULL, 1, NULL}, - #endif - {NULL, 0, NULL, 0, NULL} - }; -diff --git a/common-kex.c b/common-kex.c -index ac8844246..8e33b12a6 100644 ---- a/common-kex.c -+++ b/common-kex.c -@@ -183,6 +183,10 @@ void send_msg_newkeys() { - gen_new_keys(); - switch_keys(); - -+ if (ses.kexstate.strict_kex) { -+ ses.transseq = 0; -+ } -+ - TRACE(("leave send_msg_newkeys")) - } - -@@ -193,7 +197,11 @@ void recv_msg_newkeys() { - - ses.kexstate.recvnewkeys = 1; - switch_keys(); -- -+ -+ if (ses.kexstate.strict_kex) { -+ ses.recvseq = 0; -+ } -+ - TRACE(("leave recv_msg_newkeys")) - } - -@@ -550,6 +558,10 @@ void recv_msg_kexinit() { - - ses.kexstate.recvkexinit = 1; - -+ if (ses.kexstate.strict_kex && !ses.kexstate.donefirstkex && ses.recvseq != 1) { -+ dropbear_exit("First packet wasn't kexinit"); -+ } -+ - TRACE(("leave recv_msg_kexinit")) - } - -@@ -859,6 +871,18 @@ static void read_kex_algos() { - } - #endif - -+ if (!ses.kexstate.donefirstkex) { -+ const char* strict_name; -+ if (IS_DROPBEAR_CLIENT) { -+ strict_name = SSH_STRICT_KEX_S; -+ } else { -+ strict_name = SSH_STRICT_KEX_C; -+ } -+ if (buf_has_algo(ses.payload, strict_name) == DROPBEAR_SUCCESS) { -+ ses.kexstate.strict_kex = 1; -+ } -+ } -+ - algo = buf_match_algo(ses.payload, sshkex, kexguess2, &goodguess); - allgood &= goodguess; - if (algo == NULL || algo->data == NULL) { -diff --git a/kex.h b/kex.h -index 77cf21a37..7fcc3c252 100644 ---- a/kex.h -+++ b/kex.h -@@ -83,6 +83,9 @@ struct KEXState { - - unsigned our_first_follows_matches : 1; - -+ /* Boolean indicating that strict kex mode is in use */ -+ unsigned int strict_kex; -+ - time_t lastkextime; /* time of the last kex */ - unsigned int datatrans; /* data transmitted since last kex */ - unsigned int datarecv; /* data received since last kex */ -diff --git a/process-packet.c b/process-packet.c -index 945416023..133a152d0 100644 ---- a/process-packet.c -+++ b/process-packet.c -@@ -44,6 +44,7 @@ void process_packet() { - - unsigned char type; - unsigned int i; -+ unsigned int first_strict_kex = ses.kexstate.strict_kex && !ses.kexstate.donefirstkex; - time_t now; - - TRACE2(("enter process_packet")) -@@ -54,22 +55,24 @@ void process_packet() { - now = monotonic_now(); - ses.last_packet_time_keepalive_recv = now; - -- /* These packets we can receive at any time */ -- switch(type) { - -- case SSH_MSG_IGNORE: -- goto out; -- case SSH_MSG_DEBUG: -- goto out; -+ if (type == SSH_MSG_DISCONNECT) { -+ /* Allowed at any time */ -+ dropbear_close("Disconnect received"); -+ } - -- case SSH_MSG_UNIMPLEMENTED: -- /* debugging XXX */ -- TRACE(("SSH_MSG_UNIMPLEMENTED")) -- goto out; -- -- case SSH_MSG_DISCONNECT: -- /* TODO cleanup? */ -- dropbear_close("Disconnect received"); -+ /* These packets may be received at any time, -+ except during first kex with strict kex */ -+ if (!first_strict_kex) { -+ switch(type) { -+ case SSH_MSG_IGNORE: -+ goto out; -+ case SSH_MSG_DEBUG: -+ goto out; -+ case SSH_MSG_UNIMPLEMENTED: -+ TRACE(("SSH_MSG_UNIMPLEMENTED")) -+ goto out; -+ } - } - - /* Ignore these packet types so that keepalives don't interfere with -@@ -98,7 +101,8 @@ void process_packet() { - if (type >= 1 && type <= 49 - && type != SSH_MSG_SERVICE_REQUEST - && type != SSH_MSG_SERVICE_ACCEPT -- && type != SSH_MSG_KEXINIT) -+ && type != SSH_MSG_KEXINIT -+ && !first_strict_kex) - { - TRACE(("unknown allowed packet during kexinit")) - recv_unimplemented(); -diff --git a/ssh.h b/ssh.h -index 1b4fec65f..ef3efdca0 100644 ---- a/ssh.h -+++ b/ssh.h -@@ -100,6 +100,10 @@ - #define SSH_EXT_INFO_C "ext-info-c" - #define SSH_SERVER_SIG_ALGS "server-sig-algs" - -+/* OpenSSH strict KEX feature */ -+#define SSH_STRICT_KEX_S "kex-strict-s-v00@openssh.com" -+#define SSH_STRICT_KEX_C "kex-strict-c-v00@openssh.com" -+ - /* service types */ - #define SSH_SERVICE_USERAUTH "ssh-userauth" - #define SSH_SERVICE_USERAUTH_LEN 12 -diff --git a/svr-session.c b/svr-session.c -index 769f0731d..a538e2c5c 100644 ---- a/svr-session.c -+++ b/svr-session.c -@@ -370,6 +370,9 @@ static void svr_algos_initialise(void) { - algo->usable = 0; - } - #endif -+ if (strcmp(algo->name, SSH_STRICT_KEX_C) == 0) { -+ algo->usable = 0; -+ } - } - } - diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 8f6c49c62b8..675715ddec5 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b dropbear-2022.83.tar.bz2 +sha256 16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009 dropbear-2024.84.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 7ac8a385591..440ebd44a21 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2022.83 +DROPBEAR_VERSION = 2024.84 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain @@ -14,9 +14,6 @@ DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) DROPBEAR_CPE_ID_VENDOR = dropbear_ssh_project DROPBEAR_CPE_ID_PRODUCT = dropbear_ssh -# 0001-Implement-Strict-KEX-mode.patch -DROPBEAR_IGNORE_CVES += CVE-2023-48795 - # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This # prevents dropbear from using SSP support when not available. From 59b48b5cff057f2429b1143d6f50c39d93ca8ef3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 7 Apr 2024 01:03:36 +0200 Subject: [PATCH 0318/3013] package/openblas: bump to version v0.3.27 For change log since v0.3.26, see: https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.27 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openblas/openblas.hash | 6 +++--- package/openblas/openblas.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index a0f054dab78..cd594969080 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,5 +1,5 @@ -# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 -md5 bd496a1c81769ed19a161c1f8f904ccd openblas-0.3.26.tar.gz +# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.27 +md5 ef71c66ffeb1ab0f306a37de07d2667f openblas-0.3.27.tar.gz # Locally calculated -sha256 4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 openblas-0.3.26.tar.gz +sha256 aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897 openblas-0.3.27.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index a678153d7b6..a3c7a194cf2 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.26 +OPENBLAS_VERSION = 0.3.27 OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From 25ff4015b97b4bb0516a9d8d030dcf0e7cde2a50 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Fri, 5 Apr 2024 11:41:01 -0500 Subject: [PATCH 0319/3013] package/arm-gnu-toolchain: bump version to 13.2-rel1 The arm-gnu-toolchain is used by TI's K3 generation of devices to compile the first stage bootloader (tiboot3.bin) which will run on the 32bit R5 MCU. The 10.3-2021.10 version of this toolchain is no longer publicized as being downloadable (and it's fairly old) on ARM's website. Let's upgrade to the latest version of the toolchain ARM (13.2-rel1) Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- package/arm-gnu-toolchain/arm-gnu-toolchain.hash | 4 ++-- package/arm-gnu-toolchain/arm-gnu-toolchain.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash index dec23f7ba53..0800fa21689 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3 gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 +# taken from https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc +sha256 6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk index 87e12874ea4..03bb4dc5dae 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk @@ -4,9 +4,9 @@ # ################################################################################ -ARM_GNU_TOOLCHAIN_VERSION = 10.3-2021.10 -ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-rm/$(ARM_GNU_TOOLCHAIN_VERSION) -ARM_GNU_TOOLCHAIN_SOURCE = gcc-arm-none-eabi-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-linux.tar.bz2 +ARM_GNU_TOOLCHAIN_VERSION = 13.2.rel1 +ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_GNU_TOOLCHAIN_VERSION)/binrel +ARM_GNU_TOOLCHAIN_SOURCE = arm-gnu-toolchain-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz ARM_GNU_TOOLCHAIN_LICENSE = GPL-3.0+ HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi From a1858231b29661cb3a81d0f5c1569530e09da6a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 22:42:41 +0200 Subject: [PATCH 0320/3013] package/dante: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-5/output-1/per-package/dante/host/bin/../lib/gcc/sparc64-buildroot-linux-gnu/12.3.0/../../../../sparc64-buildroot-linux-gnu/bin/ld: auth_password.o: in function `passwordcheck': /home/autobuild/autobuild/instance-5/output-1/build/dante-1.4.3/sockd/auth_password.c:126:(.text+0xc4): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/c817caa1e9ad91a1c0f61d92f24d35612cc3a5d5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dante/Config.in | 1 + package/dante/dante.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/dante/Config.in b/package/dante/Config.in index 41a89990d22..bd0ddb236d7 100644 --- a/package/dante/Config.in +++ b/package/dante/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DANTE bool "dante" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Dante is a product developed by Inferno Nettverk A/S. It consists of a SOCKS server and a SOCKS client, implementing diff --git a/package/dante/dante.mk b/package/dante/dante.mk index ae60252bed2..bae46c5a71a 100644 --- a/package/dante/dante.mk +++ b/package/dante/dante.mk @@ -22,6 +22,10 @@ else DANTE_CONF_OPTS += --without-upnp endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +DANTE_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) DANTE_DEPENDENCIES += linux-pam DANTE_CONF_OPTS += --with-pam From a7d9080d6c6838305dbd8c3621bcde2b04ad8526 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 22:50:04 +0200 Subject: [PATCH 0321/3013] package/uhttpd: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/12.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: CMakeFiles/uhttpd.dir/main.c.o: in function `main': /home/autobuild/autobuild/instance-4/output-1/build/uhttpd-15346de8d3ba422002496526ee24c62a3601ab8c/main.c:437:(.text.startup+0x628): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/ccd789b301b6ddcca1b29e26d5cc48d54427a001 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/uhttpd/Config.in | 1 + package/uhttpd/uhttpd.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in index 8d5d8bee137..eeb169a96d4 100644 --- a/package/uhttpd/Config.in +++ b/package/uhttpd/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_UHTTPD depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua support. It is intended as a drop-in replacement for diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk index ba8e13ccb8a..f4fcccfa679 100644 --- a/package/uhttpd/uhttpd.mk +++ b/package/uhttpd/uhttpd.mk @@ -11,6 +11,10 @@ UHTTPD_LICENSE = ISC UHTTPD_LICENSE_FILES = uhttpd.h UHTTPD_DEPENDENCIES = libubox json-c +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +UHTTPD_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LUA_5_1),y) UHTTPD_DEPENDENCIES += lua UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON From ef833f926b43713f23944898d1d4e64ee26f046d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 22:55:48 +0200 Subject: [PATCH 0322/3013] package/linux-pam: select libxcrypt with glibc Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-6/output-1/per-package/linux-pam/host/bin/../lib/gcc/or1k-buildroot-linux-gnu/13.2.0/../../../../or1k-buildroot-linux-gnu/bin/ld: .libs/pam_pwhistory_la-opasswd.o: in function `compare_password': opasswd.c:(.text+0x26c): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/e17911978febb7b25112940a7c40037b3f98d491 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/linux-pam/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index b17716f2f75..c8aca97ac69 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LINUX_PAM depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h select BR2_PACKAGE_FLEX + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help A Security Framework that Provides Authentication for Applications From b0865e2a76cc5d51dc874ceb448572081f001f92 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 23:06:40 +0200 Subject: [PATCH 0323/3013] package/util-linux: add libxcrypt optional dependency Fix the following build failures raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: configure: error: newgrp selected, but required crypt function not available [...] configure: error: sulogin selected, but required crypt function not available Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/961cd1221adf9ef8bfaff25b212351d10769c369 - http://autobuild.buildroot.org/results/875a8d9ad76e844149d9a1c0c1983696e7313eff Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/util-linux/Config.in | 2 ++ package/util-linux/util-linux-libs/util-linux-libs.mk | 1 + package/util-linux/util-linux.mk | 1 + 3 files changed, 4 insertions(+) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 73fa11380e8..1f5dacec2fe 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -280,6 +280,7 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT config BR2_PACKAGE_UTIL_LINUX_NEWGRP bool "newgrp" + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Log in to a new group @@ -402,6 +403,7 @@ comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, config BR2_PACKAGE_UTIL_LINUX_SULOGIN bool "sulogin" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Single-user login diff --git a/package/util-linux/util-linux-libs/util-linux-libs.mk b/package/util-linux/util-linux-libs/util-linux-libs.mk index e1fe1ec1912..0337e7e13a2 100644 --- a/package/util-linux/util-linux-libs/util-linux-libs.mk +++ b/package/util-linux/util-linux-libs/util-linux-libs.mk @@ -24,6 +24,7 @@ UTIL_LINUX_LIBS_LICENSE_FILES = README.licensing \ UTIL_LINUX_LIBS_INSTALL_STAGING = YES UTIL_LINUX_LIBS_DEPENDENCIES = \ host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) UTIL_LINUX_LIBS_CONF_OPTS += \ --disable-rpath \ diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index a9e5b0bf685..f2821978c55 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -37,6 +37,7 @@ UTIL_LINUX_AUTORECONF = YES UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = \ host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \ $(TARGET_NLS_DEPENDENCIES) UTIL_LINUX_CONF_OPTS += \ From 938857ab3ba1c5cb01d8ce5f068dcf27de2fe253 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 23:12:28 +0200 Subject: [PATCH 0324/3013] package/exim: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: crypt16.c:45:10: fatal error: crypt.h: No such file or directory 45 | #include | ^~~~~~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/3c846c763a05f2569db7a019af8b91b0563c8f42 Signed-off-by: Fabrice Fontaine Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- package/exim/Config.in | 1 + package/exim/exim.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/exim/Config.in b/package/exim/Config.in index 2557251fd1d..0d2f5f49996 100644 --- a/package/exim/Config.in +++ b/package/exim/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_EXIM depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_BERKELEYDB + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Exim is a message transfer agent (MTA) developed at the University of Cambridge for use on Unix systems connected to diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 84fe96218c3..d78b95ad15b 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -75,6 +75,10 @@ define EXIM_USE_DEFAULT_CONFIG_FILE_CLAMAV endef endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +EXIM_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) EXIM_DEPENDENCIES += host-openssl openssl define EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL From 55c4e96c1bdca0ecff5daccb149d9717e10d081d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 23:18:21 +0200 Subject: [PATCH 0325/3013] package/hiawatha: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/mips-buildroot-linux-gnu/11.4.0/../../../../mips-buildroot-linux-gnu/bin/ld: CMakeFiles/hiawatha.dir/src/httpauth.c.o: in function `basic_http_authentication': /home/autobuild/autobuild/instance-13/output-1/build/hiawatha-11.2/src/httpauth.c:334:(.text+0x614): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/8054bd47edf613a12b09a9958f78abd5f355f17b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/hiawatha/Config.in | 1 + package/hiawatha/hiawatha.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 4b1a3ca86c7..0c35734c345 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_HIAWATHA depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_ZLIB help Hiawatha is a webserver for Unix and has been built with diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 2ba8efb2fed..3e9cf2571b9 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -47,6 +47,10 @@ else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +HIAWATHA_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LIBXSLT),y) HIAWATHA_CONF_OPTS += -DENABLE_XSLT=ON HIAWATHA_DEPENDENCIES += libxslt From 12ea11d86efa62af8f4b19cd871adf4c90981f52 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Apr 2024 17:36:22 +0200 Subject: [PATCH 0326/3013] package/dropbear: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. Due to this removal dropbear was unable to accept connections using password authentication. Signed-off-by: Bernd Kuhls Tested-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/dropbear/Config.in | 1 + package/dropbear/dropbear.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index e14a670c19e..6a9161d6591 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_DROPBEAR bool "dropbear" select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL select BR2_PACKAGE_LIBTOMCRYPT if !BR2_PACKAGE_DROPBEAR_SMALL + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help A small SSH 2 server designed for small memory environments. diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 440ebd44a21..1571c5d9571 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -36,6 +36,10 @@ ifeq ($(BR2_SHARED_STATIC_LIBS),y) DROPBEAR_CONF_OPTS += --disable-static endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +DROPBEAR_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define DROPBEAR_SVR_PAM_AUTH echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> $(@D)/localoptions.h From c7a1ee8f10728fcaab1ab85e93b584d4f3109354 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 11:22:47 +0200 Subject: [PATCH 0327/3013] package/android-tools: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/aarch64_be-buildroot-linux-gnu/12.3.0/../../../../aarch64_be-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/ab7c1ff0649bec21584654431e722efe2dc88c3d Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: coding style] Signed-off-by: Yann E. MORIN --- package/android-tools/Config.in | 1 + package/android-tools/android-tools.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in index bc76d545c11..a688182ed93 100644 --- a/package/android-tools/Config.in +++ b/package/android-tools/Config.in @@ -68,6 +68,7 @@ config BR2_PACKAGE_ANDROID_TOOLS_ADB config BR2_PACKAGE_ANDROID_TOOLS_ADBD bool "adbd" depends on BR2_USE_MMU # uses fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/android-tools/android-tools.mk b/package/android-tools/android-tools.mk index 3d5c76a322b..20e26839f97 100644 --- a/package/android-tools/android-tools.mk +++ b/package/android-tools/android-tools.mk @@ -63,7 +63,10 @@ endif ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_ADBD),y) ANDROID_TOOLS_TARGETS += adbd -ANDROID_TOOLS_DEPENDENCIES += zlib openssl +ANDROID_TOOLS_DEPENDENCIES += \ + openssl \ + zlib \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) endif # Build each tool in its own directory not to share object files From 0f708344c7108ad8b10e7525a13649a252b39330 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 11:49:35 +0200 Subject: [PATCH 0328/3013] package/libcli: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-10/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/12.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/3a5cc2a90d58f39a6c9f27ad87e0d54e705f0c84 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libcli/Config.in | 1 + package/libcli/libcli.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/libcli/Config.in b/package/libcli/Config.in index b2829cad3f9..a5a8872d419 100644 --- a/package/libcli/Config.in +++ b/package/libcli/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBCLI bool "libcli" + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Libcli provides a shared library for including a Cisco-like command-line interface into other software. It's a telnet diff --git a/package/libcli/libcli.mk b/package/libcli/libcli.mk index a18daa911c0..f3f68f780a8 100644 --- a/package/libcli/libcli.mk +++ b/package/libcli/libcli.mk @@ -26,6 +26,10 @@ ifeq ($(BR2_STATIC_LIBS),y) LIBCLI_MAKE_ARGS += DYNAMIC_LIB= endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +LIBCLI_DEPENDENCIES += libxcrypt +endif + define LIBCLI_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ $(LIBCLI_MAKE_ARGS) From 38209fb5d3a40735ec304622ee31f10f6176cfce Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 12:00:12 +0200 Subject: [PATCH 0329/3013] package/quagga: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/12.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ../lib/.libs/libzebra.so: undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/984572031cedd124f48b5a5bc5abe6096d22eaf3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/quagga/Config.in | 1 + package/quagga/quagga.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/quagga/Config.in b/package/quagga/Config.in index 9427475d03b..9361b6a212c 100644 --- a/package/quagga/Config.in +++ b/package/quagga/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QUAGGA bool "quagga" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Routing software suite, providing implementations of OSPFv2, OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+. diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 97297baff8a..5d8d52263ab 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -33,6 +33,10 @@ else QUAGGA_CONF_OPTS += --disable-capabilities endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +QUAGGA_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_PROTOBUF_C),y) QUAGGA_CONF_OPTS += --enable-protobuf QUAGGA_DEPENDENCIES += protobuf-c From d0653e3b2c4a6f6183ba5bf2c22542bc81b80467 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 14:13:42 +0200 Subject: [PATCH 0330/3013] package/whois: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-12/output-1/host/lib/gcc/riscv32-buildroot-linux-gnu/12.3.0/../../../../riscv32-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/b0aaffaf951725186ae078ce101edb24c963c6a3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/whois/Config.in | 1 + package/whois/whois.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/whois/Config.in b/package/whois/Config.in index d2a030282b7..19c22b5583a 100644 --- a/package/whois/Config.in +++ b/package/whois/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_WHOIS bool "whois" depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Improved whois client. diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 5a85bea358a..e98add4e6a8 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -10,6 +10,7 @@ WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBIDN2),libidn2) \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV) WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ From bfefed17a9e5a421b3217685003d3b22c99de4ab Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 7 Apr 2024 11:34:07 +0200 Subject: [PATCH 0331/3013] package/gdb: bump 14.x series from 14.1 to 14.2 According to https://www.sourceware.org/gdb/: This is a minor corrective release over GDB 14.1, fixing the following issues: PR symtab/31112 (DLL export forwarding is broken) PR c++/31128 (gdb crashes when trying to print a global variable stub without a running inferior) PR tdep/31254 ([gdb/tdep, arm] FAIL: gdb.threads/staticthreads.exp: up 10) PR gdb/31256 (Crash with basic 'list .') PR python/31366 (Frame.static_link() segfaults) Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 891e45948ef..53706cd3ee2 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -67,5 +67,5 @@ config BR2_GDB_VERSION default "13.2" if BR2_GDB_VERSION_13 || !BR2_PACKAGE_HOST_GDB # When making 14.x the default, or 14.x becomes the oldest version, # be sure to update the target variant to properly select mpfr. - default "14.1" if BR2_GDB_VERSION_14 + default "14.2" if BR2_GDB_VERSION_14 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index c62da28cbf6..144f6da2961 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -3,7 +3,7 @@ sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb748 sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz sha512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34 gdb-13.2.tar.xz -sha512 575e198105076fc4a88f68591aa114ab9c1196e84386a3f7b9b58fe5f30cdeed33f6a5f957b68f08c47284ec922bb60c964627e238471419673fd913575ce427 gdb-14.1.tar.xz +sha512 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede gdb-14.2.tar.xz # Locally calculated (fetched from Github) sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d gdb-arc-2023.09-release.tar.gz From cf838b5d6022f1d9f9b6aab2c1bea9b7aba3c414 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 4 Mar 2024 08:52:30 +0100 Subject: [PATCH 0332/3013] package/sdl2: bump version to 2.30.0 Update the license hash because of a change in copyright year: - Copyright (C) 1997-2023 Sam Lantinga + Copyright (C) 1997-2024 Sam Lantinga Signed-off-by: Michael Fischer Signed-off-by: Arnout Vandecappelle --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 7a28d5efc87..2ed3b9cc70c 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.28.5.tar.gz.sig -sha256 332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4 SDL2-2.28.5.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.0.tar.gz.sig +sha256 36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0 SDL2-2.30.0.tar.gz # Locally calculated -sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt +sha256 9b9e1764f06701bcf7ce21e942c682d5921ba0900c6fca760321b1c8837a9662 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index eb5042e3cdb..91f6585761e 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.28.5 +SDL2_VERSION = 2.30.0 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From b9370ae1d47b41925176a55d2ffb84f98faaa686 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Mon, 4 Mar 2024 13:26:02 +0100 Subject: [PATCH 0333/3013] package/mpd: update to version 0.23.15 Version 0.23.15 change log: * decoder - ffmpeg: fix build failure with FFmpeg 6.1 * output - alsa: limit buffer time to 2 seconds Tested on (w/ ffmpeg-6.1): i386 (build, run) x86_64 (build, run) Aarch64 (build, run) Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 4ee49675566..fe3d449cc5e 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 85b9a67426d528ae9fb849eb3b10faf52d4b18d22b1fd71088e6d9a388b509d2 mpd-0.23.14.tar.xz +sha256 550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a mpd-0.23.15.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 4dbd7a6d1dc..e320ad9decb 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).14 +MPD_VERSION = $(MPD_VERSION_MAJOR).15 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt From 529c47862e0dfc369605824716759cbbd1f0f87b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Feb 2024 12:59:22 +0100 Subject: [PATCH 0334/3013] package/cmake: bump version to 3.28.3 Release notes: https://www.kitware.com/cmake-3-28-3-available-for-download/ https://www.kitware.com/cmake-3-28-2-available-for-download/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 51fff6c3efc..74b4a0a3a80 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.28/cmake-3.28.1-SHA-256.txt -sha256 15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad cmake-3.28.1.tar.gz +# From https://cmake.org/files/v3.28/cmake-3.28.3-SHA-256.txt +sha256 72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1 cmake-3.28.3.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 23d00b95c58..49d1f9fea5a 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -6,7 +6,7 @@ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.28 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From 8dd4917d867a24a47810d5e2d104daf8fc043ccc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Feb 2024 13:10:07 +0100 Subject: [PATCH 0335/3013] package/ccache: bump version to 4.9.1 Removed patch which is included in this release. Updated license hash due to various version and copyright year bumps: https://github.com/ccache/ccache/commits/master/LICENSE.adoc Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1 Signed-off-by: Bernd Kuhls Tested-by: Marcus Hoffman Signed-off-by: Arnout Vandecappelle --- ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 ------------------- package/ccache/ccache.hash | 4 +-- package/ccache/ccache.mk | 2 +- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch deleted file mode 100644 index 42872597cd6..00000000000 --- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl -Date: Tue, 1 Aug 2023 12:30:12 +0200 -Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 - -See also #1289. - -Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 - -Signed-off-by: Bernd Kuhls ---- - src/storage/local/LocalStorage.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp -index 3e5abe5074..d0a904e553 100644 ---- a/src/storage/local/LocalStorage.cpp -+++ b/src/storage/local/LocalStorage.cpp -@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, - auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); - l2_content_lock.make_long_lived(lock_manager); - if (!l2_content_lock.acquire()) { -- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); -+ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 -+ LOG_RAW(fmt::format( -+ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); - return; - } - diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 736122e0abf..a2537077b61 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 ccache-4.8.2.tar.xz +sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e LICENSE.adoc +sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 96b1b65c5c3..4a45ea12e4e 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 4.8.2 +CCACHE_VERSION = 4.9.1 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others From d2f59ef0c4ae67827f62933a8db51eb0e2043b24 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Feb 2024 10:24:25 +0100 Subject: [PATCH 0336/3013] package/gdal: add openssl optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 247e13663cd..77ffb514c25 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -46,7 +46,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BRUNSLI=OFF \ -DGDAL_USE_CFITSIO=OFF \ - -DGDAL_USE_OPENSSL=OFF \ -DGDAL_USE_CRYPTOPP=OFF \ -DGDAL_USE_CRNLIB=OFF \ -DGDAL_USE_ECW=OFF \ @@ -130,6 +129,13 @@ else GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GDAL_DEPENDENCIES += openssl +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON From 9982e0b5a63ca7a6e225b2e41d2c6243fce2ddb5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 25 Feb 2024 12:44:14 +0100 Subject: [PATCH 0337/3013] configs/qemu: update defconfigs to Linux 6.6.18 Update all qemu defconfigs to the latest Kernel LTS version. Remove m68k kernel patches already in v6.6.x. Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- ...001-m68k-Fix-invalid-.section-syntax.patch | 97 ------------------- ...001-m68k-Fix-invalid-.section-syntax.patch | 97 ------------------- configs/qemu_aarch64_ebbr_defconfig | 2 +- configs/qemu_aarch64_sbsa_defconfig | 4 +- configs/qemu_aarch64_virt_defconfig | 4 +- configs/qemu_arm_ebbr_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 4 +- configs/qemu_arm_vexpress_defconfig | 4 +- configs/qemu_arm_vexpress_tz_defconfig | 4 +- configs/qemu_m68k_mcf5208_defconfig | 5 +- configs/qemu_m68k_q800_defconfig | 5 +- configs/qemu_microblazebe_mmu_defconfig | 4 +- configs/qemu_microblazeel_mmu_defconfig | 4 +- configs/qemu_mips32r2_malta_defconfig | 4 +- configs/qemu_mips32r2el_malta_defconfig | 4 +- configs/qemu_mips32r6_malta_defconfig | 4 +- configs/qemu_mips32r6el_malta_defconfig | 4 +- configs/qemu_mips64_malta_defconfig | 4 +- configs/qemu_mips64el_malta_defconfig | 4 +- configs/qemu_mips64r6_malta_defconfig | 4 +- configs/qemu_mips64r6el_malta_defconfig | 4 +- configs/qemu_nios2_10m50_defconfig | 4 +- configs/qemu_or1k_defconfig | 4 +- configs/qemu_ppc64_e5500_defconfig | 4 +- configs/qemu_ppc64_pseries_defconfig | 4 +- configs/qemu_ppc64le_powernv8_defconfig | 4 +- configs/qemu_ppc64le_pseries_defconfig | 4 +- configs/qemu_ppc_bamboo_defconfig | 4 +- configs/qemu_ppc_e500mc_defconfig | 4 +- configs/qemu_ppc_g3beige_defconfig | 4 +- configs/qemu_ppc_mac99_defconfig | 4 +- configs/qemu_ppc_mpc8544ds_defconfig | 4 +- configs/qemu_riscv32_virt_defconfig | 4 +- configs/qemu_riscv64_nommu_virt_defconfig | 4 +- configs/qemu_riscv64_virt_defconfig | 4 +- configs/qemu_riscv64_virt_efi_defconfig | 4 +- configs/qemu_s390x_defconfig | 4 +- configs/qemu_sh4_r2d_defconfig | 4 +- configs/qemu_sh4eb_r2d_defconfig | 4 +- configs/qemu_sparc64_sun4u_defconfig | 4 +- configs/qemu_x86_64_defconfig | 4 +- configs/qemu_x86_defconfig | 4 +- configs/qemu_xtensa_lx60_defconfig | 4 +- configs/qemu_xtensa_lx60_nommu_defconfig | 4 +- 44 files changed, 82 insertions(+), 278 deletions(-) delete mode 100644 board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch delete mode 100644 board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch diff --git a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch deleted file mode 100644 index 1f1ed75ae09..00000000000 --- a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Fri, 16 Jun 2023 17:36:10 +0200 -Subject: [PATCH] m68k: Fix invalid .section syntax - -gas supports several different forms for .section for ELF targets, -including: - .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] -and: - .section "NAME"[, #FLAGS...] - -In several places we use a mix of these two forms: - .section NAME, #FLAGS... - -A current development snapshot of binutils (2.40.50.20230611) treats -this mixed syntax as an error. - -Change to consistently use: - .section NAME, "FLAGS" -as is used elsewhere in the kernel. - -Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 -Signed-off-by: Ben Hutchings -Tested-by: Jan-Benedict Glaw -Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC@decadent.org.uk -Signed-off-by: Geert Uytterhoeven -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 -Signed-off-by: Thomas Petazzoni ---- - arch/m68k/fpsp040/skeleton.S | 4 ++-- - arch/m68k/ifpsp060/os.S | 4 ++-- - arch/m68k/kernel/relocate_kernel.S | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S -index 439395aa6fb4..081922c72daa 100644 ---- a/arch/m68k/fpsp040/skeleton.S -+++ b/arch/m68k/fpsp040/skeleton.S -@@ -499,13 +499,13 @@ in_ea: - dbf %d0,morein - rts - -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: - jbsr fpsp040_die - jbra .Lnotkern - -- .section __ex_table,#alloc -+ .section __ex_table,"a" - .align 4 - - .long in_ea,1b -diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S -index 7a0d6e428066..89e2ec224ab6 100644 ---- a/arch/m68k/ifpsp060/os.S -+++ b/arch/m68k/ifpsp060/os.S -@@ -379,11 +379,11 @@ _060_real_access: - - - | Execption handling for movs access to illegal memory -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: moveq #-1,%d1 - rts --.section __ex_table,#alloc -+.section __ex_table,"a" - .align 4 - .long dmrbuae,1b - .long dmrwuae,1b -diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S -index ab0f1e7d4653..f7667079e08e 100644 ---- a/arch/m68k/kernel/relocate_kernel.S -+++ b/arch/m68k/kernel/relocate_kernel.S -@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcopy),%a4 - 2: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 2b+2 - .previous - -@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcont040),%a4 - 5: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 5b+2 - .previous - --- -2.41.0 - diff --git a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch deleted file mode 100644 index 1f1ed75ae09..00000000000 --- a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Fri, 16 Jun 2023 17:36:10 +0200 -Subject: [PATCH] m68k: Fix invalid .section syntax - -gas supports several different forms for .section for ELF targets, -including: - .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] -and: - .section "NAME"[, #FLAGS...] - -In several places we use a mix of these two forms: - .section NAME, #FLAGS... - -A current development snapshot of binutils (2.40.50.20230611) treats -this mixed syntax as an error. - -Change to consistently use: - .section NAME, "FLAGS" -as is used elsewhere in the kernel. - -Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 -Signed-off-by: Ben Hutchings -Tested-by: Jan-Benedict Glaw -Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC@decadent.org.uk -Signed-off-by: Geert Uytterhoeven -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 -Signed-off-by: Thomas Petazzoni ---- - arch/m68k/fpsp040/skeleton.S | 4 ++-- - arch/m68k/ifpsp060/os.S | 4 ++-- - arch/m68k/kernel/relocate_kernel.S | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S -index 439395aa6fb4..081922c72daa 100644 ---- a/arch/m68k/fpsp040/skeleton.S -+++ b/arch/m68k/fpsp040/skeleton.S -@@ -499,13 +499,13 @@ in_ea: - dbf %d0,morein - rts - -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: - jbsr fpsp040_die - jbra .Lnotkern - -- .section __ex_table,#alloc -+ .section __ex_table,"a" - .align 4 - - .long in_ea,1b -diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S -index 7a0d6e428066..89e2ec224ab6 100644 ---- a/arch/m68k/ifpsp060/os.S -+++ b/arch/m68k/ifpsp060/os.S -@@ -379,11 +379,11 @@ _060_real_access: - - - | Execption handling for movs access to illegal memory -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: moveq #-1,%d1 - rts --.section __ex_table,#alloc -+.section __ex_table,"a" - .align 4 - .long dmrbuae,1b - .long dmrwuae,1b -diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S -index ab0f1e7d4653..f7667079e08e 100644 ---- a/arch/m68k/kernel/relocate_kernel.S -+++ b/arch/m68k/kernel/relocate_kernel.S -@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcopy),%a4 - 2: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 2b+2 - .previous - -@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcont040),%a4 - 5: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 5b+2 - .previous - --- -2.41.0 - diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 75a892f798f..84ab60a60b0 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 5acfaea7774..06cce72b6e8 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 11670603083..fedefd6d79f 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index a0520edcf46..ea732721ad6 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 7c93ae3e7ec..2c73090d5d5 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index ccbcc8ea4ef..12ec33ed7ae 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 11a5c981748..76e2431f288 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 0c95756a8e1..64b906b2e58 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -14,15 +14,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" -BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index a3a09ef775a..83f3d03c609 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -14,15 +14,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" -BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index a93ef3564d8..9266b3e4aaa 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 0b00b58b4ef..bef418fd51e 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 1fdc5889984..29ab7187481 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 35d071010db..9f963d26df3 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index a57347d2a68..b3fa5f5e111 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index 9fb82a76d2e..ef98362b5ba 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index f314b123a8e..d645f2ffdda 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 672c416a091..b64b577abe8 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 15dba14cc61..5f7bc13b848 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 39b9c73bcd9..500ec39658d 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 698ff68e5eb..327fd991968 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 4f1030b35f1..3cbe89ce5fd 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -13,12 +13,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 8e68fae3c25..1f34a50b745 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 4bc9534166a..8c58fec24f2 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index 4975a90bc6e..23ad5772c25 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 1cca03053b3..207e5f5b40c 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index 284982cf2c0..1ebd2be5dc4 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index e50484f5a3c..75833000e42 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 6c14a1ca902..02348270923 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 33b9ec0d63f..b03378b34f0 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_7400=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index efbc5fc81dd..9ae10a9577c 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 74a67400ea5..56341c768ea 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 9999bcf7f33..34dd1c88ba4 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -4,7 +4,7 @@ BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_GETTY=y @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 52ad87fa7c4..93c65b27274 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_efi_defconfig b/configs/qemu_riscv64_virt_efi_defconfig index 79aadf78ca7..0818b8f3aaf 100644 --- a/configs/qemu_riscv64_virt_efi_defconfig +++ b/configs/qemu_riscv64_virt_efi_defconfig @@ -1,11 +1,11 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-efi/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.69" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 39dae4be2a7..a768ca3053e 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -13,12 +13,12 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 038a9763c3b..e5570dcbab3 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index a8988d44462..468d6567aef 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 8a611554113..213083c142a 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 9e99d9d2b25..030818199bb 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 5c6bebd3e3c..92764c98528 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 8dcdced01be..d315f2604d9 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index d1d59b95254..16a323db94c 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From 9cd7d506b17da805a80db9339e554f9837596cae Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 26 Feb 2024 10:41:22 +0100 Subject: [PATCH 0338/3013] package/python-fastapi: bump to 0.110.0 Changelog: https://github.com/tiangolo/fastapi/releases/tag/0.110.0 Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index c16b7d22de3..224eccbccdc 100644 --- a/package/python-fastapi/python-fastapi.hash +++ b/package/python-fastapi/python-fastapi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fastapi/json -md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz -sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.tar.gz +md5 5e9226e70e1553a630599cf584ed53de fastapi-0.110.0.tar.gz +sha256 266775f0dcc95af9d3ef39bad55cff525329a931d5fd51930aadd4f428bf7ff3 fastapi-0.110.0.tar.gz # Locally computed sha256 checksums sha256 4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e LICENSE diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk index a2191c73b7f..c1844960b9e 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.109.2 +PYTHON_FASTAPI_VERSION = 0.110.0 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/61/53/326977db62bf34bbdfc64acb9414e1881af7ea14e8a062fd1c11a8697616 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE From ab2410053770b92ec1ee12d9da271b432053c38c Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Thu, 29 Feb 2024 10:52:36 +0530 Subject: [PATCH 0339/3013] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 The current version is more than 2 years old. Update to the latest. This fixes runtime issues with the newer kernel used in our defconfigs since commit 13ba668a2da3a0dcb386578ce15b00a444101dbe. License file changed name from LICENCE to LICENSE but is otherwise unchanged. There is a new directory "synaptics", install this one as well. A lot of the files are symlinks. "install" creates copies for these, which consumes a lot of unnecessary space. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Fixes: 13ba668a2da3a0dcb386578ce15b00a444101dbe Signed-off-by: Nisarg Jhaveri [Arnout: correct license file name] Signed-off-by: Arnout Vandecappelle --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac4..c20abfc26c8 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENSE diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index 5332bf53d73..95707487a9b 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif From 50d3a1f73a6c054b02a9ba535a696fbd5bd5714e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 2 Mar 2024 15:04:45 +0100 Subject: [PATCH 0340/3013] package/libjxl: bump to version 0.10.1 For release notes since v0.9.0, see: - https://github.com/libjxl/libjxl/releases/tag/v0.10.1 - https://github.com/libjxl/libjxl/releases/tag/v0.10.0 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index 0766c24a538..40ffd0f5b53 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f libjxl-0.9.0.tar.gz +sha256 91b9a83a230d608b5d35d2ab5068bd0ec7028797575e3013211be5928028c8cd libjxl-0.10.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 4072633ffe1..4cb71d5e71f 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.9.0 +LIBJXL_VERSION = 0.10.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS From 109362c90418d9595e3bab0c9ab6d1c8a24f01db Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 14:22:22 +0100 Subject: [PATCH 0341/3013] package/google-breakpad: needs C++17 Fix the following build failure raised since commit 32c1fbad554d4c2bfbe56a652333195c8ae67904: configure: error: *** A compiler with support for C++17 language features is required. Fixes: 32c1fbad554d4c2bfbe56a652333195c8ae67904 - http://autobuild.buildroot.org/results/451bae7151a74cbcb5d199b8516e9c255a0953fe Signed-off-by: Fabrice Fontaine [Arnout: also update BR2_GOOGLE_BREAKPAD_ENABLE] Signed-off-by: Arnout Vandecappelle --- Config.in | 2 +- package/google-breakpad/Config.in | 6 +++--- package/sentry-native/Config.in | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in b/Config.in index 113adf07557..e4f58f3f666 100644 --- a/Config.in +++ b/Config.in @@ -586,7 +586,7 @@ config BR2_ENABLE_LTO config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 5c7f4bb7baa..4e2d98eb049 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_USES_GLIBC @@ -45,10 +45,10 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS endif -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" +comment "google-breakpad requires a glibc toolchain w/ wchar, threads, C++, gcc >= 7" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/sentry-native/Config.in b/package/sentry-native/Config.in index 7a3cbd36ad1..88db2779f1e 100644 --- a/package/sentry-native/Config.in +++ b/package/sentry-native/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SENTRY_NATIVE bool "sentry-native" depends on BR2_INSTALL_LIBSTDCPP # google-breakpad - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # google-breakpad + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # google-breakpad depends on BR2_USE_WCHAR # google-breakpad depends on BR2_TOOLCHAIN_HAS_THREADS # google-breakpad # google-breakpad is restricted to glibc or uClibc, but @@ -19,10 +19,10 @@ config BR2_PACKAGE_SENTRY_NATIVE https://github.com/getsentry/sentry-native -comment "sentry-native needs a glibc toolchain with w/ wchar, thread, C++, gcc >= 4.8" +comment "sentry-native needs a glibc toolchain with w/ wchar, threads, C++, gcc >= 7" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 From 345ccb523e412b390d42073cd976a3288b0733c1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 16:12:38 +0100 Subject: [PATCH 0342/3013] toolchain/toolchain-external/toolchain-external-bootlin: bump to 2024.02 2024.02 Bootlin toolchains have been released, so let's update the support in Buildroot. Notable changes: - Bleeding edge toolchains now use binutils 2.42, and stable toolchains use binutils 2.41. This fixes binutils bug 27597 for both. - glibc has been updated to 2.39 - musl has been updated to 1.2.5, which brings 32-bit RISC-V support. Due to this, 2 new toolchain variants are added: 32-bit RISC-V stable, 32-bit RISC-V bleeding edge. - Bleeding edge toolchains now use 5.15 kernel headers, and stable toolchains now use 4.19 kernel headers - Fortran support has been disabled on Microblaze, as the libgfortran build at -O2 causes an internal compiler error. All runtime tests are passing, except the ones for the new RISC-V 32-bit musl toolchain, for which Busybox fails to build due to an interaction between musl-specific code in Busybox and musl. This issue has been reported: https://www.openwall.com/lists/musl/2024/03/03/2 The runtime tests are nevertheless included, with the hope that this issue will reasonably quickly be resolved. Signed-off-by: Thomas Petazzoni Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- .../tests/toolchain/test_external_bootlin.py | 34 + .../Config.in.options | 896 +++++++++--------- .../toolchain-external-bootlin.hash | 828 ++++++++-------- .../toolchain-external-bootlin.mk | 424 +++++---- 4 files changed, 1138 insertions(+), 1044 deletions(-) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index 02090755fde..2ed69b9ff81 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2262,6 +2262,40 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinRiscv32ilp32dMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_32=y + BR2_RISCV_ABI_ILP32D=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv32-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinRiscv32ilp32dMuslStable(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_32=y + BR2_RISCV_ABI_ILP32D=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv32-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinRiscv64lp64dGlibcBleedingEdge(TestExternalToolchain): config = """ BR2_riscv=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 37daa731f2b..7a9bffb5ae4 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -58,12 +58,12 @@ config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL choice prompt "Bootlin toolchain variant" config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE - bool "aarch64 glibc bleeding-edge 2023.11-1" + bool "aarch64 glibc bleeding-edge 2024.02-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -83,12 +83,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE - bool "aarch64 glibc stable 2023.11-1" + bool "aarch64 glibc stable 2024.02-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -108,12 +108,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE - bool "aarch64 musl bleeding-edge 2023.11-1" + bool "aarch64 musl bleeding-edge 2024.02-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -133,7 +133,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE - bool "aarch64 musl stable 2023.11-1" + bool "aarch64 musl stable 2024.02-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -157,11 +157,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE - bool "aarch64 uclibc bleeding-edge 2023.11-1" + bool "aarch64 uclibc bleeding-edge 2024.02-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -182,11 +182,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE - bool "aarch64 uclibc stable 2023.11-1" + bool "aarch64 uclibc stable 2024.02-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -207,12 +207,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE - bool "aarch64be glibc bleeding-edge 2023.11-1" + bool "aarch64be glibc bleeding-edge 2024.02-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -232,12 +232,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE - bool "aarch64be glibc stable 2023.11-1" + bool "aarch64be glibc stable 2024.02-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -257,12 +257,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE - bool "aarch64be musl bleeding-edge 2023.11-1" + bool "aarch64be musl bleeding-edge 2024.02-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -282,7 +282,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE - bool "aarch64be musl stable 2023.11-1" + bool "aarch64be musl stable 2024.02-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -306,11 +306,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE - bool "aarch64be uclibc bleeding-edge 2023.11-1" + bool "aarch64be uclibc bleeding-edge 2024.02-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -331,11 +331,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE - bool "aarch64be uclibc stable 2023.11-1" + bool "aarch64be uclibc stable 2024.02-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -356,12 +356,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE - bool "arcle-750d uclibc bleeding-edge 2023.11-1" + bool "arcle-750d uclibc bleeding-edge 2024.02-1" depends on BR2_arcle depends on BR2_arc750d depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -381,12 +381,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE - bool "arcle-750d uclibc stable 2023.11-1" + bool "arcle-750d uclibc stable 2024.02-1" depends on BR2_arcle depends on BR2_arc750d - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -406,13 +406,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE - bool "arcle-hs38 glibc bleeding-edge 2023.11-1" + bool "arcle-hs38 glibc bleeding-edge 2024.02-1" depends on BR2_arcle depends on BR2_archs38 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_SSP @@ -456,12 +456,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE - bool "arcle-hs38 uclibc bleeding-edge 2023.11-1" + bool "arcle-hs38 uclibc bleeding-edge 2024.02-1" depends on BR2_arcle depends on BR2_archs38 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -481,12 +481,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE - bool "arcle-hs38 uclibc stable 2023.11-1" + bool "arcle-hs38 uclibc stable 2024.02-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -506,14 +506,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE - bool "armv5-eabi glibc bleeding-edge 2023.11-1" + bool "armv5-eabi glibc bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -533,14 +533,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE - bool "armv5-eabi glibc stable 2023.11-1" + bool "armv5-eabi glibc stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -560,14 +560,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE - bool "armv5-eabi musl bleeding-edge 2023.11-1" + bool "armv5-eabi musl bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -587,14 +587,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE - bool "armv5-eabi musl stable 2023.11-1" + bool "armv5-eabi musl stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -614,13 +614,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE - bool "armv5-eabi uclibc bleeding-edge 2023.11-1" + bool "armv5-eabi uclibc bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -641,13 +641,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE - bool "armv5-eabi uclibc stable 2023.11-1" + bool "armv5-eabi uclibc stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -668,14 +668,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv6-eabihf glibc bleeding-edge 2023.11-1" + bool "armv6-eabihf glibc bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -695,14 +695,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE - bool "armv6-eabihf glibc stable 2023.11-1" + bool "armv6-eabihf glibc stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -722,14 +722,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE - bool "armv6-eabihf musl bleeding-edge 2023.11-1" + bool "armv6-eabihf musl bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -749,14 +749,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE - bool "armv6-eabihf musl stable 2023.11-1" + bool "armv6-eabihf musl stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -776,13 +776,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv6-eabihf uclibc bleeding-edge 2023.11-1" + bool "armv6-eabihf uclibc bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -803,13 +803,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE - bool "armv6-eabihf uclibc stable 2023.11-1" + bool "armv6-eabihf uclibc stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -830,14 +830,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv7-eabihf glibc bleeding-edge 2023.11-1" + bool "armv7-eabihf glibc bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -857,14 +857,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE - bool "armv7-eabihf glibc stable 2023.11-1" + bool "armv7-eabihf glibc stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -884,14 +884,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armv7-eabihf musl bleeding-edge 2023.11-1" + bool "armv7-eabihf musl bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -911,14 +911,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE - bool "armv7-eabihf musl stable 2023.11-1" + bool "armv7-eabihf musl stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -938,13 +938,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv7-eabihf uclibc bleeding-edge 2023.11-1" + bool "armv7-eabihf uclibc bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -965,13 +965,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE - bool "armv7-eabihf uclibc stable 2023.11-1" + bool "armv7-eabihf uclibc stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -992,14 +992,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armebv7-eabihf glibc bleeding-edge 2023.11-1" + bool "armebv7-eabihf glibc bleeding-edge 2024.02-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1019,14 +1019,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE - bool "armebv7-eabihf glibc stable 2023.11-1" + bool "armebv7-eabihf glibc stable 2024.02-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1046,14 +1046,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armebv7-eabihf musl bleeding-edge 2023.11-1" + bool "armebv7-eabihf musl bleeding-edge 2024.02-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1073,14 +1073,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE - bool "armebv7-eabihf musl stable 2023.11-1" + bool "armebv7-eabihf musl stable 2024.02-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1100,13 +1100,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armebv7-eabihf uclibc bleeding-edge 2023.11-1" + bool "armebv7-eabihf uclibc bleeding-edge 2024.02-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1127,13 +1127,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE - bool "armebv7-eabihf uclibc stable 2023.11-1" + bool "armebv7-eabihf uclibc stable 2024.02-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1154,12 +1154,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE - bool "armv7m uclibc bleeding-edge 2023.11-1" + bool "armv7m uclibc bleeding-edge 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1178,12 +1178,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE - bool "armv7m uclibc stable 2023.11-1" + bool "armv7m uclibc stable 2024.02-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1202,12 +1202,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE - bool "m68k-68xxx glibc bleeding-edge 2023.11-1" + bool "m68k-68xxx glibc bleeding-edge 2024.02-1" depends on BR2_m68k_m68k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1227,12 +1227,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE - bool "m68k-68xxx glibc stable 2023.11-1" + bool "m68k-68xxx glibc stable 2024.02-1" depends on BR2_m68k_m68k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1252,12 +1252,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE - bool "m68k-68xxx musl bleeding-edge 2023.11-1" + bool "m68k-68xxx musl bleeding-edge 2024.02-1" depends on BR2_m68k_m68k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1277,12 +1277,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE - bool "m68k-68xxx musl stable 2023.11-1" + bool "m68k-68xxx musl stable 2024.02-1" depends on BR2_m68k_m68k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1302,11 +1302,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE - bool "m68k-68xxx uclibc bleeding-edge 2023.11-1" + bool "m68k-68xxx uclibc bleeding-edge 2024.02-1" depends on BR2_m68k_m68k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1327,11 +1327,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE - bool "m68k-68xxx uclibc stable 2023.11-1" + bool "m68k-68xxx uclibc stable 2024.02-1" depends on BR2_m68k_m68k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1352,11 +1352,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE - bool "m68k-coldfire uclibc bleeding-edge 2023.11-1" + bool "m68k-coldfire uclibc bleeding-edge 2024.02-1" depends on BR2_m68k_cf depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1375,11 +1375,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE - bool "m68k-coldfire uclibc stable 2023.11-1" + bool "m68k-coldfire uclibc stable 2024.02-1" depends on BR2_m68k_cf depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1398,15 +1398,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE - bool "microblazebe glibc bleeding-edge 2023.11-1" + bool "microblazebe glibc bleeding-edge 2024.02-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1422,15 +1421,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE - bool "microblazebe glibc stable 2023.11-1" + bool "microblazebe glibc stable 2024.02-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1446,15 +1444,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE - bool "microblazebe musl bleeding-edge 2023.11-1" + bool "microblazebe musl bleeding-edge 2024.02-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1470,15 +1467,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE - bool "microblazebe musl stable 2023.11-1" + bool "microblazebe musl stable 2024.02-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1494,16 +1490,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE - bool "microblazebe uclibc bleeding-edge 2023.11-1" + bool "microblazebe uclibc bleeding-edge 2024.02-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1519,16 +1514,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE - bool "microblazebe uclibc stable 2023.11-1" + bool "microblazebe uclibc stable 2024.02-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1544,15 +1538,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE - bool "microblazeel glibc bleeding-edge 2023.11-1" + bool "microblazeel glibc bleeding-edge 2024.02-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1568,15 +1561,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE - bool "microblazeel glibc stable 2023.11-1" + bool "microblazeel glibc stable 2024.02-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1592,15 +1584,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE - bool "microblazeel musl bleeding-edge 2023.11-1" + bool "microblazeel musl bleeding-edge 2024.02-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1616,15 +1607,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE - bool "microblazeel musl stable 2023.11-1" + bool "microblazeel musl stable 2024.02-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1640,16 +1630,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE - bool "microblazeel uclibc bleeding-edge 2023.11-1" + bool "microblazeel uclibc bleeding-edge 2024.02-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1665,16 +1654,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE - bool "microblazeel uclibc stable 2023.11-1" + bool "microblazeel uclibc stable 2024.02-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1690,14 +1678,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE - bool "mips32 glibc bleeding-edge 2023.11-1" + bool "mips32 glibc bleeding-edge 2024.02-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1717,14 +1705,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE - bool "mips32 glibc stable 2023.11-1" + bool "mips32 glibc stable 2024.02-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1744,14 +1732,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE - bool "mips32 musl bleeding-edge 2023.11-1" + bool "mips32 musl bleeding-edge 2024.02-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1771,14 +1759,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE - bool "mips32 musl stable 2023.11-1" + bool "mips32 musl stable 2024.02-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1797,13 +1785,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE - bool "mips32 uclibc bleeding-edge 2023.11-1" + bool "mips32 uclibc bleeding-edge 2024.02-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1824,13 +1812,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE - bool "mips32 uclibc stable 2023.11-1" + bool "mips32 uclibc stable 2024.02-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1851,14 +1839,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE - bool "mips32el glibc bleeding-edge 2023.11-1" + bool "mips32el glibc bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1878,14 +1866,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE - bool "mips32el glibc stable 2023.11-1" + bool "mips32el glibc stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1905,14 +1893,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE - bool "mips32el musl bleeding-edge 2023.11-1" + bool "mips32el musl bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1932,14 +1920,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE - bool "mips32el musl stable 2023.11-1" + bool "mips32el musl stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -1958,13 +1946,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE - bool "mips32el uclibc bleeding-edge 2023.11-1" + bool "mips32el uclibc bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1985,13 +1973,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE - bool "mips32el uclibc stable 2023.11-1" + bool "mips32el uclibc stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2012,14 +2000,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE - bool "mips32r5el glibc bleeding-edge 2023.11-1" + bool "mips32r5el glibc bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2039,14 +2027,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE - bool "mips32r5el glibc stable 2023.11-1" + bool "mips32r5el glibc stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2066,14 +2054,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE - bool "mips32r5el musl bleeding-edge 2023.11-1" + bool "mips32r5el musl bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2093,14 +2081,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE - bool "mips32r5el musl stable 2023.11-1" + bool "mips32r5el musl stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2120,13 +2108,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE - bool "mips32r5el uclibc bleeding-edge 2023.11-1" + bool "mips32r5el uclibc bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2147,13 +2135,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE - bool "mips32r5el uclibc stable 2023.11-1" + bool "mips32r5el uclibc stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2174,14 +2162,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE - bool "mips32r6el glibc bleeding-edge 2023.11-1" + bool "mips32r6el glibc bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2201,14 +2189,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE - bool "mips32r6el glibc stable 2023.11-1" + bool "mips32r6el glibc stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2228,14 +2216,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE - bool "mips32r6el musl bleeding-edge 2023.11-1" + bool "mips32r6el musl bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2255,14 +2243,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE - bool "mips32r6el musl stable 2023.11-1" + bool "mips32r6el musl stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2282,13 +2270,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE - bool "mips32r6el uclibc bleeding-edge 2023.11-1" + bool "mips32r6el uclibc bleeding-edge 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2309,13 +2297,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE - bool "mips32r6el uclibc stable 2023.11-1" + bool "mips32r6el uclibc stable 2024.02-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2336,7 +2324,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE - bool "mips64-n32 glibc bleeding-edge 2023.11-1" + bool "mips64-n32 glibc bleeding-edge 2024.02-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2344,7 +2332,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2364,7 +2352,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE - bool "mips64-n32 glibc stable 2023.11-1" + bool "mips64-n32 glibc stable 2024.02-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2372,7 +2360,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2392,7 +2380,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE - bool "mips64-n32 musl bleeding-edge 2023.11-1" + bool "mips64-n32 musl bleeding-edge 2024.02-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2400,7 +2388,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2420,7 +2408,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE - bool "mips64-n32 musl stable 2023.11-1" + bool "mips64-n32 musl stable 2024.02-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2428,7 +2416,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2448,14 +2436,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE - bool "mips64-n32 uclibc bleeding-edge 2023.11-1" + bool "mips64-n32 uclibc bleeding-edge 2024.02-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2476,14 +2464,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE - bool "mips64-n32 uclibc stable 2023.11-1" + bool "mips64-n32 uclibc stable 2024.02-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2504,7 +2492,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64el-n32 glibc bleeding-edge 2023.11-1" + bool "mips64el-n32 glibc bleeding-edge 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2512,7 +2500,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2532,7 +2520,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE - bool "mips64el-n32 glibc stable 2023.11-1" + bool "mips64el-n32 glibc stable 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2540,7 +2528,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2560,7 +2548,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE - bool "mips64el-n32 musl bleeding-edge 2023.11-1" + bool "mips64el-n32 musl bleeding-edge 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2568,7 +2556,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2588,7 +2576,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE - bool "mips64el-n32 musl stable 2023.11-1" + bool "mips64el-n32 musl stable 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2596,7 +2584,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2616,14 +2604,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64el-n32 uclibc bleeding-edge 2023.11-1" + bool "mips64el-n32 uclibc bleeding-edge 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2644,14 +2632,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE - bool "mips64el-n32 uclibc stable 2023.11-1" + bool "mips64el-n32 uclibc stable 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2672,7 +2660,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 glibc bleeding-edge 2023.11-1" + bool "mips64r6el-n32 glibc bleeding-edge 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 @@ -2680,7 +2668,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2700,7 +2688,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE - bool "mips64r6el-n32 glibc stable 2023.11-1" + bool "mips64r6el-n32 glibc stable 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 @@ -2708,7 +2696,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2728,7 +2716,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE - bool "mips64r6el-n32 musl bleeding-edge 2023.11-1" + bool "mips64r6el-n32 musl bleeding-edge 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 @@ -2736,7 +2724,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2756,7 +2744,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE - bool "mips64r6el-n32 musl stable 2023.11-1" + bool "mips64r6el-n32 musl stable 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 @@ -2764,7 +2752,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2784,14 +2772,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 uclibc bleeding-edge 2023.11-1" + bool "mips64r6el-n32 uclibc bleeding-edge 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2812,14 +2800,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE - bool "mips64r6el-n32 uclibc stable 2023.11-1" + bool "mips64r6el-n32 uclibc stable 2024.02-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2840,12 +2828,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE - bool "nios2 glibc bleeding-edge 2023.11-1" + bool "nios2 glibc bleeding-edge 2024.02-1" depends on BR2_nios2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2865,12 +2853,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE - bool "nios2 glibc stable 2023.11-1" + bool "nios2 glibc stable 2024.02-1" depends on BR2_nios2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2890,13 +2878,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE - bool "openrisc glibc bleeding-edge 2023.11-1" + bool "openrisc glibc bleeding-edge 2024.02-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2942,13 +2930,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2023.11-1" + bool "openrisc musl bleeding-edge 2024.02-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2968,13 +2956,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2023.11-1" + bool "openrisc musl stable 2024.02-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -2993,12 +2981,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2023.11-1" + bool "openrisc uclibc bleeding-edge 2024.02-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3019,12 +3007,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2023.11-1" + bool "openrisc uclibc stable 2024.02-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3045,13 +3033,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE - bool "powerpc-440fp glibc bleeding-edge 2023.11-1" + bool "powerpc-440fp glibc bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3071,13 +3059,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE - bool "powerpc-440fp glibc stable 2023.11-1" + bool "powerpc-440fp glibc stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3097,13 +3085,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE - bool "powerpc-440fp musl bleeding-edge 2023.11-1" + bool "powerpc-440fp musl bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3122,13 +3110,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE - bool "powerpc-440fp musl stable 2023.11-1" + bool "powerpc-440fp musl stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3147,12 +3135,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE - bool "powerpc-440fp uclibc bleeding-edge 2023.11-1" + bool "powerpc-440fp uclibc bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3173,12 +3161,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE - bool "powerpc-440fp uclibc stable 2023.11-1" + bool "powerpc-440fp uclibc stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3199,13 +3187,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 glibc bleeding-edge 2023.11-1" + bool "powerpc-e300c3 glibc bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3225,13 +3213,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE - bool "powerpc-e300c3 glibc stable 2023.11-1" + bool "powerpc-e300c3 glibc stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3251,13 +3239,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE - bool "powerpc-e300c3 musl bleeding-edge 2023.11-1" + bool "powerpc-e300c3 musl bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3276,13 +3264,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE - bool "powerpc-e300c3 musl stable 2023.11-1" + bool "powerpc-e300c3 musl stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3301,12 +3289,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 uclibc bleeding-edge 2023.11-1" + bool "powerpc-e300c3 uclibc bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3327,12 +3315,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE - bool "powerpc-e300c3 uclibc stable 2023.11-1" + bool "powerpc-e300c3 uclibc stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3353,13 +3341,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE - bool "powerpc-e500mc glibc bleeding-edge 2023.11-1" + bool "powerpc-e500mc glibc bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3379,13 +3367,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE - bool "powerpc-e500mc glibc stable 2023.11-1" + bool "powerpc-e500mc glibc stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3405,13 +3393,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE - bool "powerpc-e500mc musl bleeding-edge 2023.11-1" + bool "powerpc-e500mc musl bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3430,13 +3418,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE - bool "powerpc-e500mc musl stable 2023.11-1" + bool "powerpc-e500mc musl stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3455,12 +3443,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE - bool "powerpc-e500mc uclibc bleeding-edge 2023.11-1" + bool "powerpc-e500mc uclibc bleeding-edge 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3481,12 +3469,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE - bool "powerpc-e500mc uclibc stable 2023.11-1" + bool "powerpc-e500mc uclibc stable 2024.02-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3507,13 +3495,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e5500 glibc bleeding-edge 2023.11-1" + bool "powerpc64-e5500 glibc bleeding-edge 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3533,13 +3521,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE - bool "powerpc64-e5500 glibc stable 2023.11-1" + bool "powerpc64-e5500 glibc stable 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3559,13 +3547,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e6500 glibc bleeding-edge 2023.11-1" + bool "powerpc64-e6500 glibc bleeding-edge 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3585,13 +3573,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE - bool "powerpc64-e6500 glibc stable 2023.11-1" + bool "powerpc64-e6500 glibc stable 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3611,13 +3599,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE - bool "powerpc64-e6500 musl bleeding-edge 2023.11-1" + bool "powerpc64-e6500 musl bleeding-edge 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3637,13 +3625,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE - bool "powerpc64-e6500 musl stable 2023.11-1" + bool "powerpc64-e6500 musl stable 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3663,13 +3651,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64-power8 glibc bleeding-edge 2023.11-1" + bool "powerpc64-power8 glibc bleeding-edge 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3689,13 +3677,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE - bool "powerpc64-power8 glibc stable 2023.11-1" + bool "powerpc64-power8 glibc stable 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3715,13 +3703,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64-power8 musl bleeding-edge 2023.11-1" + bool "powerpc64-power8 musl bleeding-edge 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3741,13 +3729,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE - bool "powerpc64-power8 musl stable 2023.11-1" + bool "powerpc64-power8 musl stable 2024.02-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3767,13 +3755,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64le-power8 glibc bleeding-edge 2023.11-1" + bool "powerpc64le-power8 glibc bleeding-edge 2024.02-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3793,13 +3781,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE - bool "powerpc64le-power8 glibc stable 2023.11-1" + bool "powerpc64le-power8 glibc stable 2024.02-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3819,13 +3807,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64le-power8 musl bleeding-edge 2023.11-1" + bool "powerpc64le-power8 musl bleeding-edge 2024.02-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3845,13 +3833,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE - bool "powerpc64le-power8 musl stable 2023.11-1" + bool "powerpc64le-power8 musl stable 2024.02-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3871,7 +3859,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE - bool "riscv32-ilp32d glibc bleeding-edge 2023.11-1" + bool "riscv32-ilp32d glibc bleeding-edge 2024.02-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 @@ -3879,7 +3867,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3898,8 +3886,64 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE + bool "riscv32-ilp32d musl bleeding-edge 2024.02-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_32 + depends on BR2_RISCV_ABI_ILP32D + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the riscv32-ilp32d architecture, + using the musl C library. This is a bleeding-edge version, + which means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE + bool "riscv32-ilp32d musl stable 2024.02-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_32 + depends on BR2_RISCV_ABI_ILP32D + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the riscv32-ilp32d architecture, + using the musl C library. This is a stable version, which + means it is using stable and proven versions of gcc, gdb + and binutils. + + https://toolchains.bootlin.com/ + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE - bool "riscv64-lp64d glibc bleeding-edge 2023.11-1" + bool "riscv64-lp64d glibc bleeding-edge 2024.02-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 @@ -3907,7 +3951,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE depends on BR2_USE_MMU depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -3955,7 +3999,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE - bool "riscv64-lp64d musl bleeding-edge 2023.11-1" + bool "riscv64-lp64d musl bleeding-edge 2024.02-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 @@ -3963,7 +4007,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE depends on BR2_USE_MMU depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4011,7 +4055,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE - bool "riscv64-lp64d uclibc bleeding-edge 2023.11-1" + bool "riscv64-lp64d uclibc bleeding-edge 2024.02-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 @@ -4019,7 +4063,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE depends on BR2_USE_MMU depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4069,13 +4113,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE - bool "s390x-z13 glibc bleeding-edge 2023.11-1" + bool "s390x-z13 glibc bleeding-edge 2024.02-1" depends on BR2_s390x depends on BR2_s390x_z13 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4095,13 +4139,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE - bool "s390x-z13 glibc stable 2023.11-1" + bool "s390x-z13 glibc stable 2024.02-1" depends on BR2_s390x depends on BR2_s390x_z13 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4121,13 +4165,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE - bool "sh-sh4 glibc bleeding-edge 2023.11-1" + bool "sh-sh4 glibc bleeding-edge 2024.02-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4147,13 +4191,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE - bool "sh-sh4 glibc stable 2023.11-1" + bool "sh-sh4 glibc stable 2024.02-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4173,13 +4217,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE - bool "sh-sh4 musl bleeding-edge 2023.11-1" + bool "sh-sh4 musl bleeding-edge 2024.02-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4199,13 +4243,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE - bool "sh-sh4 musl stable 2023.11-1" + bool "sh-sh4 musl stable 2024.02-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4224,12 +4268,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE - bool "sh-sh4 uclibc bleeding-edge 2023.11-1" + bool "sh-sh4 uclibc bleeding-edge 2024.02-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4250,12 +4294,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE - bool "sh-sh4 uclibc stable 2023.11-1" + bool "sh-sh4 uclibc stable 2024.02-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4276,13 +4320,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE - bool "sh-sh4aeb glibc bleeding-edge 2023.11-1" + bool "sh-sh4aeb glibc bleeding-edge 2024.02-1" depends on BR2_sh depends on BR2_sh4aeb depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4302,13 +4346,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE - bool "sh-sh4aeb glibc stable 2023.11-1" + bool "sh-sh4aeb glibc stable 2024.02-1" depends on BR2_sh depends on BR2_sh4aeb depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4328,13 +4372,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE - bool "sh-sh4aeb musl bleeding-edge 2023.11-1" + bool "sh-sh4aeb musl bleeding-edge 2024.02-1" depends on BR2_sh depends on BR2_sh4aeb depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4354,13 +4398,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE - bool "sh-sh4aeb musl stable 2023.11-1" + bool "sh-sh4aeb musl stable 2024.02-1" depends on BR2_sh depends on BR2_sh4aeb depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4379,13 +4423,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE - bool "sparc64 glibc bleeding-edge 2023.11-1" + bool "sparc64 glibc bleeding-edge 2024.02-1" depends on BR2_sparc64 depends on BR2_sparc_v9 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4405,13 +4449,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE - bool "sparc64 glibc stable 2023.11-1" + bool "sparc64 glibc stable 2024.02-1" depends on BR2_sparc64 depends on BR2_sparc_v9 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4483,7 +4527,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE - bool "x86-64 glibc bleeding-edge 2023.11-1" + bool "x86-64 glibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4491,7 +4535,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4511,7 +4555,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE - bool "x86-64 glibc stable 2023.11-1" + bool "x86-64 glibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4519,7 +4563,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4539,7 +4583,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE - bool "x86-64 musl bleeding-edge 2023.11-1" + bool "x86-64 musl bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4547,7 +4591,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4567,7 +4611,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE - bool "x86-64 musl stable 2023.11-1" + bool "x86-64 musl stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4575,7 +4619,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4594,14 +4638,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE - bool "x86-64 uclibc bleeding-edge 2023.11-1" + bool "x86-64 uclibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4622,14 +4666,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE - bool "x86-64 uclibc stable 2023.11-1" + bool "x86-64 uclibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4650,7 +4694,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE - bool "x86-64-v2 glibc bleeding-edge 2023.11-1" + bool "x86-64-v2 glibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4662,7 +4706,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4682,7 +4726,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE - bool "x86-64-v2 glibc stable 2023.11-1" + bool "x86-64-v2 glibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4694,7 +4738,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4714,7 +4758,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE - bool "x86-64-v2 musl bleeding-edge 2023.11-1" + bool "x86-64-v2 musl bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4726,7 +4770,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4746,7 +4790,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE - bool "x86-64-v2 musl stable 2023.11-1" + bool "x86-64-v2 musl stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4758,7 +4802,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4777,7 +4821,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE - bool "x86-64-v2 uclibc bleeding-edge 2023.11-1" + bool "x86-64-v2 uclibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4788,7 +4832,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4809,7 +4853,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE - bool "x86-64-v2 uclibc stable 2023.11-1" + bool "x86-64-v2 uclibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4820,7 +4864,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4841,7 +4885,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE - bool "x86-64-v3 glibc bleeding-edge 2023.11-1" + bool "x86-64-v3 glibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4855,7 +4899,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4875,7 +4919,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE - bool "x86-64-v3 glibc stable 2023.11-1" + bool "x86-64-v3 glibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4889,7 +4933,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4909,7 +4953,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE - bool "x86-64-v3 musl bleeding-edge 2023.11-1" + bool "x86-64-v3 musl bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4923,7 +4967,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4943,7 +4987,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE - bool "x86-64-v3 musl stable 2023.11-1" + bool "x86-64-v3 musl stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4957,7 +5001,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -4976,7 +5020,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE - bool "x86-64-v3 uclibc bleeding-edge 2023.11-1" + bool "x86-64-v3 uclibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4989,7 +5033,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5010,7 +5054,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE - bool "x86-64-v3 uclibc stable 2023.11-1" + bool "x86-64-v3 uclibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5023,7 +5067,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5044,7 +5088,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE - bool "x86-64-v4 glibc bleeding-edge 2023.11-1" + bool "x86-64-v4 glibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5059,7 +5103,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5079,7 +5123,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE - bool "x86-64-v4 glibc stable 2023.11-1" + bool "x86-64-v4 glibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5094,7 +5138,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5114,7 +5158,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE - bool "x86-64-v4 musl bleeding-edge 2023.11-1" + bool "x86-64-v4 musl bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5129,7 +5173,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5149,7 +5193,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE - bool "x86-64-v4 musl stable 2023.11-1" + bool "x86-64-v4 musl stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5164,7 +5208,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5183,7 +5227,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE - bool "x86-64-v4 uclibc bleeding-edge 2023.11-1" + bool "x86-64-v4 uclibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5197,7 +5241,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX512 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5218,7 +5262,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE - bool "x86-64-v4 uclibc stable 2023.11-1" + bool "x86-64-v4 uclibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5232,7 +5276,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX512 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5253,7 +5297,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 glibc bleeding-edge 2023.11-1" + bool "x86-64-core-i7 glibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5265,7 +5309,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5285,7 +5329,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE - bool "x86-64-core-i7 glibc stable 2023.11-1" + bool "x86-64-core-i7 glibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5297,7 +5341,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5317,7 +5361,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE - bool "x86-64-core-i7 musl bleeding-edge 2023.11-1" + bool "x86-64-core-i7 musl bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5329,7 +5373,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5349,7 +5393,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE - bool "x86-64-core-i7 musl stable 2023.11-1" + bool "x86-64-core-i7 musl stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5361,7 +5405,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5381,7 +5425,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 uclibc bleeding-edge 2023.11-1" + bool "x86-64-core-i7 uclibc bleeding-edge 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5392,7 +5436,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5413,7 +5457,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE - bool "x86-64-core-i7 uclibc stable 2023.11-1" + bool "x86-64-core-i7 uclibc stable 2024.02-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5424,7 +5468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5445,7 +5489,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE - bool "x86-core2 glibc bleeding-edge 2023.11-1" + bool "x86-core2 glibc bleeding-edge 2024.02-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5455,7 +5499,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5475,7 +5519,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE - bool "x86-core2 glibc stable 2023.11-1" + bool "x86-core2 glibc stable 2024.02-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5485,7 +5529,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5505,7 +5549,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE - bool "x86-core2 musl bleeding-edge 2023.11-1" + bool "x86-core2 musl bleeding-edge 2024.02-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5515,7 +5559,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5534,7 +5578,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE - bool "x86-core2 musl stable 2023.11-1" + bool "x86-core2 musl stable 2024.02-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5544,7 +5588,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5562,7 +5606,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE - bool "x86-core2 uclibc bleeding-edge 2023.11-1" + bool "x86-core2 uclibc bleeding-edge 2024.02-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5571,7 +5615,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5592,7 +5636,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE - bool "x86-core2 uclibc stable 2023.11-1" + bool "x86-core2 uclibc stable 2024.02-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5601,7 +5645,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5622,7 +5666,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE - bool "x86-i686 glibc bleeding-edge 2023.11-1" + bool "x86-i686 glibc bleeding-edge 2024.02-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5635,7 +5679,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5655,7 +5699,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE - bool "x86-i686 glibc stable 2023.11-1" + bool "x86-i686 glibc stable 2024.02-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5668,7 +5712,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5688,7 +5732,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE - bool "x86-i686 musl bleeding-edge 2023.11-1" + bool "x86-i686 musl bleeding-edge 2024.02-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5701,7 +5745,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5720,7 +5764,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE - bool "x86-i686 musl stable 2023.11-1" + bool "x86-i686 musl stable 2024.02-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5733,7 +5777,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP @@ -5751,7 +5795,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE - bool "x86-i686 uclibc bleeding-edge 2023.11-1" + bool "x86-i686 uclibc bleeding-edge 2024.02-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5763,7 +5807,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE depends on !BR2_x86_winchip2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5784,7 +5828,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE - bool "x86-i686 uclibc stable 2023.11-1" + bool "x86-i686 uclibc stable 2024.02-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5796,7 +5840,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE depends on !BR2_x86_winchip2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5817,13 +5861,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE - bool "xtensa-lx60 uclibc bleeding-edge 2023.11-1" + bool "xtensa-lx60 uclibc bleeding-edge 2024.02-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5844,13 +5888,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE - bool "xtensa-lx60 uclibc stable 2023.11-1" + bool "xtensa-lx60 uclibc stable 2024.02-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash index 38cdba5d7dc..547e87b070f 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -1,428 +1,432 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2023.11-1.sha256 -sha256 9d4c3a45e5f781060b81779ba116b2118805f214c3b1042ce8ecde5c4aeb12c3 aarch64--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2023.11-1.sha256 -sha256 5b1fde169c9ed678ee75a729286531a291c6ce5ee9d8a8b598b3abbef35c05f2 aarch64--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2023.11-1.sha256 -sha256 f63c27eabff2b3e733ad132866a5301d90a9068f2b83ff5d36e907bd958951dc aarch64--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2023.11-1.sha256 -sha256 3554391a9ae82cc1fe35a6ab0c9efa34a5bac5474b6d527474997256e148c297 aarch64--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 02100c2670b441bcd54481bf731215e0d7c9be671407fe15678a9ad03b5056d5 aarch64--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2023.11-1.sha256 -sha256 82fe36e1c02f9662bd3ad59267ba3ae850d67e9e09a1d229ec3f25b691da0065 aarch64--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2023.11-1.sha256 -sha256 0594958f0e4822adcd5dcdddc6feec3a23d37afd2dc86c80edd7cef5094c02cf aarch64be--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2023.11-1.sha256 -sha256 f622cacaed216dac40461653329dde6f4391f9339ea4b848118f7eff92018b5a aarch64be--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2023.11-1.sha256 -sha256 c495eb4bf875934502e36005499bc28a47b3762b199dcfff57516ce70fe1c0a6 aarch64be--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2023.11-1.sha256 -sha256 72016bafd0e0b70c05f5b3f71302b8cd6cd3fce54b4dd9acfb3fb6560af9f30f aarch64be--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 f956f0aec2e6e46cab1e92f0cd7b0fa691eb4202b087758e668d6bcfe773532e aarch64be--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2023.11-1.sha256 -sha256 39fb6f1d32ad9baa664832d5633d04e2991898a173a4133ed73a36ccbae33f9f aarch64be--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 b2a39fc18a3c2b3e10c61ce862fb1c90d53e38ccb21323a7f808ed4004c89d0c arcle-750d--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2023.11-1.sha256 -sha256 1be435efc78ee2ca8d97ba64e45c21f669a3d6f8bad7850f921fdac249e93472 arcle-750d--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2023.11-1.sha256 -sha256 ede78dd37096f3b13ef6797059c7be5d771ffb2361cfeb97be4ce46f90c69309 arcle-hs38--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2024.02-1.sha256 +sha256 09a5a8a59403e3df7a557014d0f9463e8e366c5431656252f0ce3fc00ecfc050 aarch64--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2024.02-1.sha256 +sha256 30a7a7e8f1c7165ca0c6ad6a11403e94ea65144a3c0181c2fa1f619ab972f26f aarch64--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2024.02-1.sha256 +sha256 d81e3517b69ebc49bec9e130952cd7c18fd0f84e992720e18e9cd02110c00296 aarch64--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2024.02-1.sha256 +sha256 aaa1a5c9212067de3618afbb8f3de4047d99fa1d23e5bc1452bab7fd3744df2e aarch64--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 225e3d9a1fd938e7779e357bc36d8639df8c413c4b31056292c83281677d184d aarch64--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2024.02-1.sha256 +sha256 de74a7fd974a5601418a60da645b433df6fd7773dda124a10d860c7f586e5a9d aarch64--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2024.02-1.sha256 +sha256 80cb37b022aa74c7329cef44336024fc5ca18c6193fdabfef01241153aba7f9d aarch64be--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2024.02-1.sha256 +sha256 aff4f324dd6318a66e94e512a0582c25f765b24e91e4e5576f7b917d585439e6 aarch64be--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2024.02-1.sha256 +sha256 c3ac7754efd3bf2968021ca7321edc8ea361ee3e071ed50b2d2d72c68d0a0de9 aarch64be--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2024.02-1.sha256 +sha256 143f57255fd8be375b3b16f4346a419968ba53fc839d6623752a4e9649809f21 aarch64be--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 0d25460ea796663839c0d023686fde91f248e19cbcc1c5eab1f6daa504bad019 aarch64be--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2024.02-1.sha256 +sha256 ea1f0195ce312417f7ef915a5c5c339893f48a20698f46b3ed183cf0f6b8faab aarch64be--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 a3a59cb25854ccb052035636e6d65c6ef3158182b69d23d2bd6c8a6e4284a052 arcle-750d--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2024.02-1.sha256 +sha256 315da85c124833e012565ec0c4cfdb8a334a302d21ab1f4b1289837035dcfa40 arcle-750d--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2024.02-1.sha256 +sha256 2bf7b934cf62035ebed6e999ecd0a9af815297151362e799472437bcca0498f9 arcle-hs38--glibc--bleeding-edge-2024.02-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2023.11-1.sha256 sha256 91c048fb79152969253a3bb96a9cd77c79c2ba5a3081d2da7cf103069661e303 arcle-hs38--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 970c5176001abac9746f21922b56f9628c8bb1bef8596a5badba1efb05decf33 arcle-hs38--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2023.11-1.sha256 -sha256 b6c98633c33fe0ce5d7ba03c0a9bb55ab9a0ded69f3ed3d3813a5c133aa4e3ca arcle-hs38--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2023.11-1.sha256 -sha256 80b67f939e5cbd1d2fa13fe063fd5d8aca1f5a702adf010547d8904864fe2209 armv5-eabi--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2023.11-1.sha256 -sha256 06837abc0a4bd7f163d2c1697d1e3d13f4d37f486c3a827f259fe7d3219c9a22 armv5-eabi--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2023.11-1.sha256 -sha256 10f67c422fc926c38824e3606e955a37373ca5f337aecd06998e65803379ac3c armv5-eabi--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2023.11-1.sha256 -sha256 c6bd48c4341bc496fdb37dbda2caef5d2bba69d764aab3c317eaf20554474a38 armv5-eabi--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 95f17ecd4de11130b818146fb236ca30d0a0e86eba55bd18b1264d16f45020ff armv5-eabi--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2023.11-1.sha256 -sha256 4ec295deb930584a3da8baab7b23438180195d8bddf03fe9a93ca08ce4bd4a22 armv5-eabi--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2023.11-1.sha256 -sha256 8f1ef62275d34c556e4cbe14af429fac250132d2191f4ff86c77f8395edf9e4a armv6-eabihf--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2023.11-1.sha256 -sha256 dc71ac978e3e9ec25832decf8490472b3a0998c8d2214468f20bf546ab833ee2 armv6-eabihf--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2023.11-1.sha256 -sha256 48cd51a76e8068c78312ed022d31d12831d9ae8da4d0f23f76429c8f9760663f armv6-eabihf--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2023.11-1.sha256 -sha256 3620458bb0fe685d78b0c6645aae547b16df0e7966f4d66d672500c96aafd787 armv6-eabihf--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 3aee5156a27adb30311a3878fa8028fa103dfad08dda4f417087c5b2f271aee9 armv6-eabihf--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2023.11-1.sha256 -sha256 07df70ed0812549bb4e8b8ff930e6a5ce0952e00a19b534223b469728412bf29 armv6-eabihf--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2023.11-1.sha256 -sha256 609ac558671aa69e1200dc27204136efbef4bbc6dd98f4b77f24717e38797a77 armv7-eabihf--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2023.11-1.sha256 -sha256 d0a575b156e5c481dbe079cd3e292fb8eefed39392a90cdde871e7b9e77fd420 armv7-eabihf--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2023.11-1.sha256 -sha256 fcc4421b04ede8996d350a3517890c48ba200a9102787ddd288f2c5037b3de4c armv7-eabihf--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2023.11-1.sha256 -sha256 c01a2b2a762b0e19a7847f4877ba5b35d90bd7e23704956dfe575e8113a1ad7a armv7-eabihf--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 ded310ccbe78d411f9e027d7b8e4029746b86aa0d66a7151dcf50f49ebcbf85b armv7-eabihf--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2023.11-1.sha256 -sha256 39fcb1928454392112f0a5168b2e284d3564a24dff116efdcb71c67b672682ca armv7-eabihf--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2023.11-1.sha256 -sha256 d16d65752cc6ea0f81661aac23322cd48fb3b5608bb30588667d8191fecf8fab armebv7-eabihf--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2023.11-1.sha256 -sha256 8294077f6be32fc4a3a76d8802d179e30a35bcf104ac90e6bdfe1d51827e11a9 armebv7-eabihf--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2023.11-1.sha256 -sha256 a6c478cf6916d82589628d35d1317415bcd6f86455facc1453f8cffdf524092d armebv7-eabihf--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2023.11-1.sha256 -sha256 cb316d86590f49c29fe1a99988d8a71001a6b76cf996a7c0c15b648b017899f8 armebv7-eabihf--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 f88e930fdb895aaf9edf5d168c57a8672e46900f326e9c3c2146b81c2a3807b6 armebv7-eabihf--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2023.11-1.sha256 -sha256 fc20f9c0e9551b2d5e0ffd1154aa8d282589503c8e239b049fc719974f338e76 armebv7-eabihf--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 ffacf7a1e9d376a487e5d2fb0788a3f2a37d9da3b8daab5cdecc0a502cc0cd37 armv7m--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2023.11-1.sha256 -sha256 3baeaa139d8263477baaa51da8ad2e5e8129c71bf0a7b956543b3c4f7a40b36a armv7m--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--bleeding-edge-2023.11-1.sha256 -sha256 f7a41da2a2765d67ee3184df876741a459c6f85024dcc7434bd10f27451f6ecd m68k-68xxx--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--stable-2023.11-1.sha256 -sha256 79b120e67b7f17a1f265f5a5685b602ee3755f32047c657d837e9fc5c9ac7afa m68k-68xxx--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--bleeding-edge-2023.11-1.sha256 -sha256 20c700a7c16b7fec587cd2b2269875ee53d33f1141e29900c53c5855f59acf9e m68k-68xxx--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--stable-2023.11-1.sha256 -sha256 83ce067a39a6c6e5b1771b6ccfc2e7028bb479b8bcb28694ad96b5595767ac4d m68k-68xxx--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 8c9d1628519b233c8377d9a6906c31ea08a2df73ec72f5b368b23318aeea8dbc m68k-68xxx--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2023.11-1.sha256 -sha256 17bec666be6c4d7d796055fa04c180dd41dc8f85898e1177c36585642fbb1496 m68k-68xxx--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 3bf997d9333430de431811c09b7b47551b134b70a6bce7f93aea86b39efd75fc m68k-coldfire--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2023.11-1.sha256 -sha256 87e6f40abe2a17eca8c60b3fa15dab7c2f6cbda34a2bc79f5228d71927337158 m68k-coldfire--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2023.11-1.sha256 -sha256 d05a6bdd547ca1b8f72a64989af3fa46db2ec054d319310dc3219a2414f11e67 microblazebe--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2023.11-1.sha256 -sha256 cdb5de2bd88c0ec95f24d56550b47eb256e74f10f7e579da4bcb486d0198d138 microblazebe--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2023.11-1.sha256 -sha256 55c14a3b40036029aedad93e64e7e33f590808608eb446cc641e6bf28b4bea58 microblazebe--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2023.11-1.sha256 -sha256 93fe4e169b35e84dbd55e1ac97722b0f685e88701171ee4af24e89f54aa647ff microblazebe--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 ebbafd02b80bbd65c79644aba48da3ef471fe43c89e7c257b57c881048f35033 microblazebe--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2023.11-1.sha256 -sha256 cee44f3c1f87dfaac941df61a27ab854e1e0898978d484214782369b5a324029 microblazebe--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2023.11-1.sha256 -sha256 04f90560bb9bf8905ac2f5ca7b3d9484fcb29b25e296612cc28a9d6551c3363c microblazeel--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2023.11-1.sha256 -sha256 d3ab9b6ef87c793c236b599e93e39df001faeb4f8f402fb496e4f456a4aa709a microblazeel--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2023.11-1.sha256 -sha256 bf539dda6f5793c8d5b64add457f72bac4aa41c27369e67c79079ef683c653d3 microblazeel--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2023.11-1.sha256 -sha256 2f2018e378a0f6c7075766239217b268fd45a0103ac5af5143869ca49db3cb56 microblazeel--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 24c1687ae24ad115129261ba34be831d65e5aae4f0f1536fd5df7ed9c1e53da6 microblazeel--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2023.11-1.sha256 -sha256 40c25f81998bf10e73f9a8f5934d8c8028adfb1ff8436abd8e8ecccdc25ad82d microblazeel--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2023.11-1.sha256 -sha256 fb7fb26666b9d8d2cac1aadb18f2cb7819b8b3a1ec26800b12594791bfa72604 mips32--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2023.11-1.sha256 -sha256 062d5df972b7b628337fdecba84cbe2b33f9c863e59c9702556ef252e7b44750 mips32--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2023.11-1.sha256 -sha256 91b6680324773afad77a211acf1357cd06526faa860943267fdb0ffa61a845f0 mips32--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2023.11-1.sha256 -sha256 c0053f5475d960a7a1a2872ebddaf7f054aa55337dd2d6c4e81c25758244a75f mips32--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 66edf00bd30bb1ac0885aeb891679f2e2ba33910d99e7cd85bab4400ffc014f3 mips32--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2023.11-1.sha256 -sha256 5f4f81dbc9b7faff25dc4e3223562d5f064cf31e628eec7902b3b00c66153ed1 mips32--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2023.11-1.sha256 -sha256 90afdb045301503974a7337822645c975766b1749472a4b98de8251737e97434 mips32el--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2023.11-1.sha256 -sha256 60fc28d1521dfeefbfedb20776eeadec5b9bade7a55d0ea0c901766f722da3bd mips32el--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2023.11-1.sha256 -sha256 b22b3eb247529eb320f2d5d1cec0b903c2509ef11b16ca77715f62bba0d687b0 mips32el--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2023.11-1.sha256 -sha256 a76bdda55776c0b1a546ef20652b78134b96bdefa4f8cc792eb46d913df9138b mips32el--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 4106d5a4c45b6200cfaccb78a61344120d2e4610cea5e14168a9ab7a50e869c3 mips32el--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2023.11-1.sha256 -sha256 9aa9b2d99778ae8848ba629690cda55a9fee4175016b551c7726995a57b80478 mips32el--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2023.11-1.sha256 -sha256 c50c257de4ed262fb2a82b3eaa973d927d3a36506214918e4b7a9c4b208f5622 mips32r5el--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2023.11-1.sha256 -sha256 58a7b63b8a957d99146218aaa28bdf5d01bd64cb6e97c50592f6bbe09b0d76a0 mips32r5el--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2023.11-1.sha256 -sha256 3ad2cef7e834c565a9cb9ccfb3576c87ecbc7f0a7d460b071cecfeb6b867704e mips32r5el--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2023.11-1.sha256 -sha256 571abc2312dae8b4e49effbd0e81bdf48523427512f5a24744c0c4d3d6a9af35 mips32r5el--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 047296dbb1a33a98ec7b4b7ef7e34fca97cb44d86f7f1e6832bb0490471263b4 mips32r5el--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2023.11-1.sha256 -sha256 7c92a47bd9e22445ec4bde739866f5ab75dfacac8a73d687165774c5a124b7cf mips32r5el--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2023.11-1.sha256 -sha256 114c1b6cfc6b0eae974fb1141b40ec4fc49f10c398fd345845afbcc34a345e22 mips32r6el--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2023.11-1.sha256 -sha256 6dd4457db666b58707f5e2d36d5c3045506f6f90d8f754d6321fa6758be3aa0e mips32r6el--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2023.11-1.sha256 -sha256 d1e03c69e1365582c2ab8962a4279c0f83753dc95b754d9deec96aa18eec54ce mips32r6el--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2023.11-1.sha256 -sha256 35d831a96647305ed674e5127e1f8dc6fc4b14d3f94aa867ef47eeef8c0becb6 mips32r6el--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 22e09f0d9c69a4dbe3bc0602579fff19dc3820d92aed73b202714a8728b4d0d6 mips32r6el--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2023.11-1.sha256 -sha256 383c82e3c0accba7b0b5b1c3bfd5e4ee4521932f525823a95724aa3ff796d0be mips32r6el--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2023.11-1.sha256 -sha256 dd43c76fa9d5b0894582912cf3c1a562e0b8f401910952aadcec856c209b055c mips64-n32--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2023.11-1.sha256 -sha256 e17670f46efcac70105bd360573fcee3b9e2410a688806ec90f6012a419b88d2 mips64-n32--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2023.11-1.sha256 -sha256 bf442bd32f0a7cb0fe0e2ea229f08bd65af6f471478599aa0b80ab484186a56f mips64-n32--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2023.11-1.sha256 -sha256 a7c733e4695d9851bb70d03b40e84ae75383bffd20894293718f24a6284bd071 mips64-n32--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 10b53c93acb9a8cb29137156dc859fd10ccb8a2edee12fbd70e11658fd0c3643 mips64-n32--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2023.11-1.sha256 -sha256 e6fe6d734c2c2044b48413d19b75af3dd8b9e8d470f29c98001ab1d833d7c5bf mips64-n32--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2023.11-1.sha256 -sha256 d3f022b9a550a4c132b7b569ffee1450ba9aa3821b937df9acb4a5a50e9c0404 mips64el-n32--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2023.11-1.sha256 -sha256 e2d1a56763c8680f458f66962749b14992985721fb63621dd3907096205fdf5b mips64el-n32--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2023.11-1.sha256 -sha256 688a5749fad712ca241f64be4b6e96cbfab98dbd528eb0e6c477f2d466215b2a mips64el-n32--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2023.11-1.sha256 -sha256 c108ccfd651d89af088777b5cc1aebb6a2be24107875c93c00af94da3edcec53 mips64el-n32--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 c0fe0e58eff17318fd7783b85d9b7586dfa67cea60d7ff0b245af07e55a8334a mips64el-n32--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2023.11-1.sha256 -sha256 66f8c87c8649a32c597863791cfec8c44c1edc0a3438dc6919fd164541318fc0 mips64el-n32--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2023.11-1.sha256 -sha256 10b1215c32c441d004c0020c3512ff23447da89fe0a24e86de35590fa8ea74d3 mips64r6el-n32--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2023.11-1.sha256 -sha256 30aa25c3bcbd085d8bd22a1055f083e9bf7d37dcf91847651dda802d1ee99295 mips64r6el-n32--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2023.11-1.sha256 -sha256 ba6a72fdb04b5b4741ad5562a7baf881b83bdad245cdc5cc7ba2b2f1fc481dae mips64r6el-n32--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2023.11-1.sha256 -sha256 7efe8e663f909e382bfa1035c231051757c3d66a79640864db3b2182b6d122ca mips64r6el-n32--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 d259f6b0b78da1296106b070630cc08f7d346af4b57d15f348b53a3a531e4e23 mips64r6el-n32--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2023.11-1.sha256 -sha256 f55e95fb54c7d71274f5050941925c11d180fe7e98c0f0d1b91e8b36672e235e mips64r6el-n32--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2023.11-1.sha256 -sha256 aef966d00fde3297115ac0ae52226b61f8d8f89efc46c15ebf796d8d9a64b951 nios2--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2023.11-1.sha256 -sha256 d9d6137443055c1e7ae086ab746ab1246d0772aec85db61b04e0fcc0acdf655e nios2--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2023.11-1.sha256 -sha256 cd9489ab73dbcf7a2f915b4c75021c22d43cb4bd3c8a2bd95f324040a2d548c1 openrisc--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 2729a47b36989dc95346d31934dcb358f240075dc838c35ccac075f67322ab64 arcle-hs38--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2024.02-1.sha256 +sha256 9d0ef6443c7192e5ae5301e9c1cc22437224e404ed3232dd17fc042dd2e6b5b5 arcle-hs38--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2024.02-1.sha256 +sha256 8f6c0bd14479ced3814917a12cc8c0809fa5161c87da39b362a1ec8bc348e95c armv5-eabi--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2024.02-1.sha256 +sha256 9c43357d0eb79ba3f1aab8f020bdc673d24af0a44e2825c19eee2917308bc47e armv5-eabi--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2024.02-1.sha256 +sha256 8dac4ea5697a42a88bd1d7d91c3d57a20a7db6239857def3d7518c8e2330b5a4 armv5-eabi--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2024.02-1.sha256 +sha256 be82371ce785f28be097887fa43e6e63644c9226f12ca4c3f23e54792dba18e8 armv5-eabi--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 6333e0b6e5e1b40c92eb276fe6ecc713932b159df01df6e58d48285e4a9076b7 armv5-eabi--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2024.02-1.sha256 +sha256 68fba0cfb5af4136fe88fb451db9005ed2a8576509a9b1daf140eca5575460d5 armv5-eabi--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2024.02-1.sha256 +sha256 45aabb8a3b31bb28518680eb9bc91a7f9228bdb71c6473f7d3ba03754f3f8769 armv6-eabihf--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2024.02-1.sha256 +sha256 e3d873f4be92438632da140c087bbd0025e406d138e7f5832d9481af1c9146ef armv6-eabihf--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2024.02-1.sha256 +sha256 04e7b5803f4f9984cab333570d537ce185d8a9892b95f2db7ba2e50c22e6b7bc armv6-eabihf--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2024.02-1.sha256 +sha256 2d91a0a9fb4cff3046943307c70054507ec12c43eedbeb95eb597cfee2d3b58d armv6-eabihf--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 3fcc8fdf8eaa94ac48f3d8a51484904829c665a018d8a8ef8ae9491382f944f9 armv6-eabihf--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2024.02-1.sha256 +sha256 cbd1de7ca4921e55c85a074ee2381996d07e2a5e378d3c3e6b86da587a0aa9fc armv6-eabihf--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2024.02-1.sha256 +sha256 db5178feac8a02f3dc6fab16448d0ca2835bc915ca0453f6aba6510b7dccfb5d armv7-eabihf--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2024.02-1.sha256 +sha256 ec079d95388d5313f73e67fd32859ccbe2369f280d74aa103c40323c8cc6bd57 armv7-eabihf--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2024.02-1.sha256 +sha256 9c1cd34a2f488c01315ce4943a4b1ba59f92608cf902dfe3606eb1d1b2503e45 armv7-eabihf--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2024.02-1.sha256 +sha256 88b5f04190e095969bd4fa5ffb4322181f2311b09e075d6ee13d74e88e7bff32 armv7-eabihf--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 900a2e383165cf6cc32c1e9271bce2d686702e6407058b7a196e49b812b8d05f armv7-eabihf--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2024.02-1.sha256 +sha256 bfbd81e15f771f4dbf0537677f4338731faaaa6fc250efd5027ccbe347b1f3f1 armv7-eabihf--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2024.02-1.sha256 +sha256 76d31189aa2b52320a35757cb45920ae91303681e7e72601ce858082d7ed5120 armebv7-eabihf--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2024.02-1.sha256 +sha256 0075aee77819c918cf54c1d2cda3ccbea2e59ac93cbbc42706736b741d6d625e armebv7-eabihf--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2024.02-1.sha256 +sha256 2c142234299301d3871c6ec878eaefc08dd14785cb96e691e605d23c0a7d1f2e armebv7-eabihf--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2024.02-1.sha256 +sha256 6ee263a880819cf629f3ace5c2da9174ab19d1bdf4be59d9ffc6cc52b7693bc8 armebv7-eabihf--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 1fbb9bcdcc82c1dbb226dfe47c568d7f1d46676974aecbe46f711ef4b5939298 armebv7-eabihf--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2024.02-1.sha256 +sha256 fab1646eca9a5bf1ccd5fd95f26a48b9fa4cc24b70051140710f95bd8c3899ba armebv7-eabihf--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 eebbdae08ba9ae84f0eccf2154b7c295fa60c787f6767015ac2b2df113809cec armv7m--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2024.02-1.sha256 +sha256 b421fb864bcd3d7ad5e964d344b5790724e05642380784cef547e9c1f99282cd armv7m--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--bleeding-edge-2024.02-1.sha256 +sha256 9943453b4afb89670c4de266a24d0406a2fb0c44cd030c50a86e2524c709ed01 m68k-68xxx--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--stable-2024.02-1.sha256 +sha256 bf6d5f67104787dedee69f565e180af91c9e2ee12b184eb29c4a91e1cfb41d13 m68k-68xxx--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--bleeding-edge-2024.02-1.sha256 +sha256 510677f9ab05f6d8ac726459897d936064c4adcc5c5d2b6e9f52f7bab9677eac m68k-68xxx--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--stable-2024.02-1.sha256 +sha256 a4701199b74e5d242c5b61b3d23a03b4958b8d2c438c9744f7b6198ad78d8b5c m68k-68xxx--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 2e0727f0ba9549ccb8abd7f7bd3f1be13b516e20665e1da4a8106a247a7fd334 m68k-68xxx--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2024.02-1.sha256 +sha256 35ec4229ef7ae582ece4709b5906a9423c6f2284831a9b84ca13a5a5d98710c7 m68k-68xxx--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 1b742f3fc3eb62c6c6cd7c3a0436ec92d647270e6acd8295b295399c58f3e224 m68k-coldfire--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2024.02-1.sha256 +sha256 b2acfb9d72156c6cf0da98f50487d4cd437fd9018e85e861bb1d506b85d52fd4 m68k-coldfire--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2024.02-1.sha256 +sha256 22f742453af1c315ca9376e0bff1e5fd04fee72b3b6c037b7ac99750ec96afd4 microblazebe--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2024.02-1.sha256 +sha256 826cdbb09adca7544cd8d09a38958423f52655a8ce17ea95e4880348ea5ec594 microblazebe--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2024.02-1.sha256 +sha256 112e3496aa3e5e7515fe8d06060cae5e6a794cd2c82f7b0cfed40ee75775138c microblazebe--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2024.02-1.sha256 +sha256 627ccc508f29a9e4f881af97e0faf46fd5a7926f88dfc594a38d9063cb74db59 microblazebe--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 1f0101f66f0d8e1ff316bcb24ca0082ce58bc69724a15aa0d9a2fee5e1e70f2b microblazebe--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2024.02-1.sha256 +sha256 7f26818820b3a04c6e3e2ca268efc4b733fcba5a1a6568d4f4f243b8482b88fa microblazebe--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2024.02-1.sha256 +sha256 102d68fd19e0bf2b14d49e2a29317196ec63baa1cbcffcb0ebc3ffc158b31750 microblazeel--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2024.02-1.sha256 +sha256 0795f6ccb2584d51b378974c36532b1c994672694b1bca63953a162811b9fdcb microblazeel--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2024.02-1.sha256 +sha256 c35b0cd70231e307dc2573d876fd0d0efc3c9f32cc32e21e577228cefdbe1c9a microblazeel--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2024.02-1.sha256 +sha256 b9791b921fdb8c001949eaaccfa0746f142902d5df297455e1b9c4f029c1db93 microblazeel--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 fbeabfc16b10e61a37c2924d60290fcaab40ddfcb8314e20ea1461a4fb588eb4 microblazeel--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2024.02-1.sha256 +sha256 ce20fcbed964958860b1883a80a48829b3331d6a10abc7cff0522768707211b6 microblazeel--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2024.02-1.sha256 +sha256 aa990348607011c16eef583ab564fa7bef49a24141f247edb96f62970b3108fc mips32--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2024.02-1.sha256 +sha256 595cedbc0e70d5c939529ecc8d09c3a8eff63f77c3d0772b7ae306e1b3b5aef9 mips32--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2024.02-1.sha256 +sha256 1df8d93bdaca510993b2f189fea08c5a153a18bc6c54f3a6a833a5c7a26349df mips32--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2024.02-1.sha256 +sha256 a0fde56bf905b9057aed8688b8e60a93fcdca1097bcc4748f24b23e26c12f462 mips32--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 ee7a1fa00cae9b6b190b436537ad9f7c8eb2c86f72327de7b583c786e5cb6780 mips32--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2024.02-1.sha256 +sha256 3dcaeb45fb690b2d47426bae75adaa0c7042cbe9f5c774faf2d70c0174c88196 mips32--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2024.02-1.sha256 +sha256 6f3875119a362c76119fc75d52d191b4b9a7c23615a19aaa85ffae97c360fe14 mips32el--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2024.02-1.sha256 +sha256 d92f8531fd703bc7b25f3d70ffac49ee7536171c8d854967312e3c98d8641c57 mips32el--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2024.02-1.sha256 +sha256 e315f917711fb99783572485b8adbabd4f19cc035356cd30a0d628823ed6fd32 mips32el--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2024.02-1.sha256 +sha256 25c0b3217df1bf1a7bae2cc4f56cdeab9fec98b172bbf0b336b2e8fe41d3ee4e mips32el--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 43618ec1849db61dd55cb34e3aba28d741a713642b335dcef79687358cbcdf38 mips32el--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2024.02-1.sha256 +sha256 1e5cfcfe9f9cc7ab7abd843b8ae22fe959aa9c929dc3d4f353653899bb9771a1 mips32el--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2024.02-1.sha256 +sha256 6c0eb902af46dbbf069080755c9e16ad5e7f725f055a3e2b47d552f54a733ab9 mips32r5el--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2024.02-1.sha256 +sha256 375f1f5f42b0d6559111ca12acbc2622057cf2be7b30b99cb32b823a76d7bdf7 mips32r5el--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2024.02-1.sha256 +sha256 fb440165ff535234f88cdfd99c37cc96a3c349d2487f52b62bf879261cb6b837 mips32r5el--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2024.02-1.sha256 +sha256 c6b03bfb2f00476cc38b38f910c8a3884b8b77d7aecb307fdb6f06b18ff3456a mips32r5el--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 744d98a6c6eda7fd0ae50771680c6661439906469de9df1d5f1ff758ce1ddb52 mips32r5el--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2024.02-1.sha256 +sha256 89bed915ce8f2a7f09a0ae154a7a5435288f15de381c0ba5af4eee37cef81be3 mips32r5el--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2024.02-1.sha256 +sha256 c345005e9fedc78ace9c5478882f094769d056979f85f432ee763837407bdd09 mips32r6el--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2024.02-1.sha256 +sha256 64321a05be857085ca1e138942456f7adf0d75188684955d404651e9a7792029 mips32r6el--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2024.02-1.sha256 +sha256 c44ce7050fdb0a729fa42bd6f15238c95f8c2e3540dd703db1861c273399206f mips32r6el--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2024.02-1.sha256 +sha256 d25a9efb1bf06a845995de0bc5d24e8417ad538b8b68f12c02bc1b9aadabc9d7 mips32r6el--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 2a4296e6517a8dc18cdcc304c20834987c29bf994819209a1f30abff29761394 mips32r6el--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2024.02-1.sha256 +sha256 16ec7dddcafb4c8834aaa79317f78a180907f3ca2f82fc0d37703d47424fe684 mips32r6el--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2024.02-1.sha256 +sha256 f556d8fb16eeb8c31cc8edbcc4855d4eac15de4b10cc694e82690132022c835a mips64-n32--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2024.02-1.sha256 +sha256 dae5bd6ff5a79b22b60a42834b98b1b81e5ed7445f477130fbfea9b081364b29 mips64-n32--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2024.02-1.sha256 +sha256 4e1bb50ff41b2e8f26c8c48217017abe16e251c3c9a453c1bbed3629939bb35a mips64-n32--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2024.02-1.sha256 +sha256 7c9400fec57e1d28ed59fb47e0f40bfb7c98781d8573a8fd5f98ea82cf88058f mips64-n32--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 a83df99f15d1507f39461ab6bcb09d3fc25c4df90fe4fa975bd23294dfed182d mips64-n32--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2024.02-1.sha256 +sha256 7f6731cd454f98a503579b94822316d95ed1dd3afc6e325ecc5bbfa76065ca05 mips64-n32--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2024.02-1.sha256 +sha256 4a2651f656e84649bca3686960c8b40eb8ce193a60a3942e2b98895dc584717e mips64el-n32--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2024.02-1.sha256 +sha256 138d29328daf5d08ced6b79214cbb3884f168ae90414022041e35dcd2bbb5943 mips64el-n32--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2024.02-1.sha256 +sha256 033ad6b1add333d9a7c969b987d51f7ebb3a0f819488ad287d5932afc0860825 mips64el-n32--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2024.02-1.sha256 +sha256 70c2a720c018bba0384e9aae147cfa706141b6918da11b09fbee16178473e769 mips64el-n32--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 dbb806a185f1770accdc54668435293966955f891b214c7ea33dfe2a836f5bf4 mips64el-n32--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2024.02-1.sha256 +sha256 b7ca42af6258fa7204716f4145478f1510c6ff4c093a9efa70a03fcf757b25a6 mips64el-n32--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2024.02-1.sha256 +sha256 ec8635038743dc95e181963096a13cd9aa806ee1fa41251e54ff57bb092f762e mips64r6el-n32--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2024.02-1.sha256 +sha256 064bca63fa00ccf1c6982eb9b1d1d71f61096f2826b9134322e16a38b1317937 mips64r6el-n32--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2024.02-1.sha256 +sha256 931f2bace4d0264321ad5434d960c7180a85f0d25192bf951cc8223b7b0c96ff mips64r6el-n32--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2024.02-1.sha256 +sha256 fff80653c6814bd87522fbdef6b89de386a60ed53fa7fcfb35603d055f55a071 mips64r6el-n32--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 1674501dde087ee3160ae77f7940960e43839e83443f225e6d9745d41d3df118 mips64r6el-n32--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2024.02-1.sha256 +sha256 ff6c4296a50913ccf9a20a4270ff74ae6a35878b66140216b349a89a72e2cef4 mips64r6el-n32--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2024.02-1.sha256 +sha256 72ef91ac2c7f00a41449b7e87845bcb6a944ce9ed94b62e19652830ecab42a03 nios2--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2024.02-1.sha256 +sha256 0fb3b7204a80466e56da5a63683437ed0934617e7d6979ab0d140e3ca5440144 nios2--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2024.02-1.sha256 +sha256 7af2336389d5d64c48722d257fa7ad10e83ce1c25ac49aaa5fdcc70bd09220bf openrisc--glibc--bleeding-edge-2024.02-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2023.11-1.sha256 sha256 35eb515b554a8dcb60cae731aba49b9588cfec379f434d106de9a971015d7cf1 openrisc--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2023.11-1.sha256 -sha256 7efab1b6d4ef49f0c4be87992567a510f7147a0e131bbfc7f88c06ac399048ff openrisc--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2023.11-1.sha256 -sha256 2ece0d83ae58072d8ca22043b19f1121ecefadd456ca4d33737696c667307a47 openrisc--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 04e0941036df0478c809c9bda56d2425ccaf48665c311de6605a8b050107665a openrisc--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2023.11-1.sha256 -sha256 a83587690bef62c3d45458db20efb101b41c55695da2f38fdb2998e4b3ccadc9 openrisc--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2023.11-1.sha256 -sha256 78aca713c2aaf75b176a5334cf3af8387037bcce5960d8638f728feb90c84d84 powerpc-440fp--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2023.11-1.sha256 -sha256 12760035aa457b31b58eefb1b4c0b76b87021b8fddee721c390a536adcc308aa powerpc-440fp--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2023.11-1.sha256 -sha256 49ae0f78dd343c5b40b2d732b58d34f1203e3e50f13b767d160c98efeda404f4 powerpc-440fp--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2023.11-1.sha256 -sha256 9bfd63773d1cd8e1cf6f83c12dbe0ecf9759df2858da46cc3dac2bfb4c8a7c67 powerpc-440fp--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 b7f5407567e636c6efc765f4a1e32cb64a166c6a863b9ac42589f8834e4ed6d8 powerpc-440fp--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2023.11-1.sha256 -sha256 e60268e6826db3574cf2bc74c53daa92db2dd48de2884f3c25be41656bd4e5ef powerpc-440fp--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2023.11-1.sha256 -sha256 0b5d51e7b5d991025d934a30711f07cfe482ad3ccccdb4608638eec0910f0d7b powerpc-e300c3--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2023.11-1.sha256 -sha256 cafdd55bd0f82aaef09203eeee1a7294f6cf8cf6b4cc669f8a5cdd01e897d4e7 powerpc-e300c3--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2023.11-1.sha256 -sha256 9ddec25bccd33ccbabdfa3140a7f1b7283ff2443e83ef5f3be12e95b9a256d7f powerpc-e300c3--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2023.11-1.sha256 -sha256 fcf15c1bb605abb906b7f6b7d2d5ba1a16de9b2eb03ae4d57d8b4480ce295371 powerpc-e300c3--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 db57a356f63111d7c615cb1f1095f6193c453709facd41c3d492a423f5ff5070 powerpc-e300c3--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2023.11-1.sha256 -sha256 e27984bbee08d4f1a794ce90e1b78e68ee8750403666452525e7360655d99f32 powerpc-e300c3--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2023.11-1.sha256 -sha256 07b26929d9f2a8d0225a1df4b4f01497e475478c4f5d5465a810585dd4b44a4a powerpc-e500mc--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2023.11-1.sha256 -sha256 e0b50deb4ffba15fcead9ecea75a6f4af6feca6012a60ddd76591874a47e5338 powerpc-e500mc--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2023.11-1.sha256 -sha256 89302d5660e58e68fdf75d238ead582c586d26c0aa717bb5cd3d1f024420c400 powerpc-e500mc--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2023.11-1.sha256 -sha256 59274e8641885915e226083f4474606f17600cc09e8a097129e9e04ee29a672a powerpc-e500mc--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 5f9db756eeb6d8c76574a578f823368a78e437204534d071fed63fe967156dd6 powerpc-e500mc--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2023.11-1.sha256 -sha256 7b6921f004698556681aa26ea0091931b5bd71bf0a785ff947d5b02c86d77f37 powerpc-e500mc--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2023.11-1.sha256 -sha256 814de1a235c805ec6a0035cf8633e5a31fdcec93a3aaaabf44cb0ca23eaa1d93 powerpc64-e5500--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2023.11-1.sha256 -sha256 3e55842372cfb4ac35ccfb4a1cf1ccc1a207eaa27fa0c8d32641cda07316b93b powerpc64-e5500--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2023.11-1.sha256 -sha256 1e4e9684763822079cc3df10b290510cb4241706f287835ec1a07ec309d2b8a7 powerpc64-e6500--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2023.11-1.sha256 -sha256 ef93463f56824079cc4cc849892004d9d06316011c51063d6c88838369065717 powerpc64-e6500--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2023.11-1.sha256 -sha256 facb722bb19e7bf837a65a3ff15d4d80918dc36fe3a3f87a760d759f616d1d91 powerpc64-e6500--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2023.11-1.sha256 -sha256 fff880e6fc09efe3d5aaaa6a561fb6af3885dbeae8a73b1981c072196c3abc4a powerpc64-e6500--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2023.11-1.sha256 -sha256 d8c135613d6d75d9974c3da437628bea05d93c7db3a86bc092979621621cb773 powerpc64-power8--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2023.11-1.sha256 -sha256 cd74cbce020c82966bdf2d4a1cb3de682043939c6dd3ad211d45ddfe56edcaaa powerpc64-power8--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2023.11-1.sha256 -sha256 6dbcdd017bbb21179f47e17298b3de78a44d6991f51f57b584f30bb76817c76f powerpc64-power8--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2023.11-1.sha256 -sha256 f8496ecc9019cabb3fc1515da26a051abae4cc60c530619f0bef5d82c56f8a7a powerpc64-power8--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2023.11-1.sha256 -sha256 04effeaf9d9e1961fe65f54015b92e329ce2cbe6c66af10b21519d0cd06a7236 powerpc64le-power8--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2023.11-1.sha256 -sha256 606f82f3b218791f4411082ff7f6c7ab6e8955b5a3537f0f61646b9594402458 powerpc64le-power8--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2023.11-1.sha256 -sha256 79ae7450434e969643018e4ddb249716c9c631a2a39937b5cd183393477d5410 powerpc64le-power8--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2023.11-1.sha256 -sha256 c9402692c883f5512b966fe517038d9b30b93de328dd5dd2e7af20d25e4509ca powerpc64le-power8--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2023.11-1.sha256 -sha256 19bd2ecfd1f7a56795ed1807ddadbbe3d0807fc19bb95625ca5a126810bd3fc4 riscv32-ilp32d--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2023.11-1.sha256 -sha256 7a53268f429109ee416df5ed6ef47b1a2d88d7760371aabaf8f4f24481dfb89e riscv64-lp64d--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2024.02-1.sha256 +sha256 02abf22a8620893cc974038ac9401c2c74eb39f2a549a20939f460d694bf984c openrisc--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2024.02-1.sha256 +sha256 34dfd1fd3977792754eb03c5ef877045a476a52ffcecf18418bca81514ae0308 openrisc--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 2d9c293c1123c30e813414610a4d060bcdef6461c82e258d405011be38fda6f6 openrisc--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2024.02-1.sha256 +sha256 e885e4bdcc73eeda5a18689abecadbf6686518c049e9c785c7485d80ea74d3dd openrisc--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2024.02-1.sha256 +sha256 9e5601beacf2b4d96f7ed12851c722b8f83beaa9da8f7ae7734816fca2d4da1e powerpc-440fp--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2024.02-1.sha256 +sha256 8961f117690f91afa8dcca7ab875dacf1674480c0bf53548fec2d53932823a8b powerpc-440fp--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2024.02-1.sha256 +sha256 5abd9ec89e402a9de7bdadd595d39de9181f0d351573751c8499aaef93c0d441 powerpc-440fp--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2024.02-1.sha256 +sha256 20647de8d019a15a92126b0be5c24e16b61b92730c620b156e11989579dc3ea8 powerpc-440fp--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 2108261d7785cc2c1f81c7b62da5c4874fe6ae3eae8b9c704df4a8bc8a4d7624 powerpc-440fp--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2024.02-1.sha256 +sha256 2d47170edf21a2377261cd6fd0fe0fe552aefc5f5204b6299bdbc2af4f96317b powerpc-440fp--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2024.02-1.sha256 +sha256 f6c6f5d741d7f7798d5d9e3e859b063907ec3653436f752a70f0789c5d7accd5 powerpc-e300c3--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2024.02-1.sha256 +sha256 f780144616fa6e04f9f237df5ae08b1871f087204e7cd41ad2df06ee4fc3ed2f powerpc-e300c3--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2024.02-1.sha256 +sha256 f8c2aaacc7dd5922c7c719b35b92186ca86ede97ae955f753d7387f92943be64 powerpc-e300c3--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2024.02-1.sha256 +sha256 f29603df78b64381bf9d7c6128a7a6798320cbeb1779680511b8181a02d30c3b powerpc-e300c3--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 090f5a4f83bca5473166375e09bf234e2ea14406761a959ac08b89b02c696363 powerpc-e300c3--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2024.02-1.sha256 +sha256 03a688e3f3fffae1c441abc540dc8be9cf8e524e36efc52aa5bcbe9deeb356b9 powerpc-e300c3--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2024.02-1.sha256 +sha256 90b2cd8c0be088049ed0859eaf4cd09367327c54a956e8a3956083bd99fc96df powerpc-e500mc--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2024.02-1.sha256 +sha256 f1d8d2518ec5401c0a5f489bdb4087f082bf97b6803af0dfc30b82b25d02d8cb powerpc-e500mc--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2024.02-1.sha256 +sha256 81d63ff9c17d0089c477c769c4dea466c5bcf49624334d86963ae9fd474c6dff powerpc-e500mc--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2024.02-1.sha256 +sha256 049afaa48adcf1ef21562c004e695aeb08a152cb2f4dff39c35d6ea62e57a35b powerpc-e500mc--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 a34b562df36f65841a594864260001f203ad2dbb4e910d2dc7427153d465b208 powerpc-e500mc--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2024.02-1.sha256 +sha256 6028c4014ea1a0fd21b18284c1d02fe28167165e8065d9901d0361c03a9c6075 powerpc-e500mc--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2024.02-1.sha256 +sha256 762eda55a9eac9b079b1b2ad676f74b3ca74bd90382b08763ce2926be29b5898 powerpc64-e5500--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2024.02-1.sha256 +sha256 7062230408225e330705f0b076c9bbb5adab644790f3d3a2386477bcc917ff69 powerpc64-e5500--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2024.02-1.sha256 +sha256 58c29657c99c57f781ee6e4de91e889826ed063a64c7dc162cecbc639a8837e0 powerpc64-e6500--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2024.02-1.sha256 +sha256 5f4f605b2f3e94652ec94cb2f9880e719e6e61451026dc51fcf9c913152b60e9 powerpc64-e6500--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2024.02-1.sha256 +sha256 834aa216bec987f5ef04d9179bfea2efa850685e74bd153839873683ad112c4b powerpc64-e6500--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2024.02-1.sha256 +sha256 358af0323bb08ecebd9ec6d383333c13086a650968ae9cea8fdd5118dcbc2dc8 powerpc64-e6500--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2024.02-1.sha256 +sha256 c37381eef32ee54e4bd7794306647a8df6258c686e70d3ef4a61e58b3e49407a powerpc64-power8--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2024.02-1.sha256 +sha256 d451dde868287a5454c39dfc1d1fb888d054191756de9da982c0fe015223157b powerpc64-power8--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2024.02-1.sha256 +sha256 405c7d69aa6538aac7020f53dc414b4dfadd48e95a670e5dd3e70e33402e0a4f powerpc64-power8--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2024.02-1.sha256 +sha256 d73cc758c021163ba9672e0d0de527d45868649bed76eefd1af63a035d40226a powerpc64-power8--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2024.02-1.sha256 +sha256 f619d173a359c30ba71fa0a6bae26a71647b4f0d00d063564e0deeaeebd10c2b powerpc64le-power8--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2024.02-1.sha256 +sha256 1224e21a64d551fa0e50aa4e1a2b684c2a3e2a395244c3771e82e7d92201359b powerpc64le-power8--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2024.02-1.sha256 +sha256 5884756550dca096903f3430802d5ccccb1232aa600f8bc2dcc2f8fb8a7cfcc1 powerpc64le-power8--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2024.02-1.sha256 +sha256 66c3325c8cd22c78e6377d594745ca881227fd9858cea57ce84daadf3b61de04 powerpc64le-power8--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2024.02-1.sha256 +sha256 ae046c9e6616f6b33d82c0d581efb41c4c6428fa1c1345417c82533cc27fb86e riscv32-ilp32d--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--bleeding-edge-2024.02-1.sha256 +sha256 828e3409f995cc15e7038ede150d6fa8bc50a3d69ef2b98b79db7c935bab336c riscv32-ilp32d--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--stable-2024.02-1.sha256 +sha256 b758a7576b5ffb62a6453264df53a0b28d417d66fb17add5f8858987f28c0eb3 riscv32-ilp32d--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2024.02-1.sha256 +sha256 f815ecf9dd9b8f633b914e178e633095241bbd18d97b9bca05a66a5ca3990524 riscv64-lp64d--glibc--bleeding-edge-2024.02-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2023.11-1.sha256 sha256 80e84af7ebed4e8e52fc2d17994f7bcb2e7bdc069e2d1f1c4656977cd73d9d5d riscv64-lp64d--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2023.11-1.sha256 -sha256 023dadabe58ff6079b27ebfde9495440180dc473b8c5da2c55e95ce68e095c15 riscv64-lp64d--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2024.02-1.sha256 +sha256 81d567e395637fbc5878d1ee38f99592563ad13df8a2e15d7b6ca5afa9d6a35e riscv64-lp64d--musl--bleeding-edge-2024.02-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2023.11-1.sha256 sha256 09522ec60b13766090acaa715402cb11edaa39217642fbd7315fbe37b6032275 riscv64-lp64d--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 fcfa3624eb6024b55c264ec87790265beab393cfc8f867afda8954e4c3b744c4 riscv64-lp64d--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 ea0a1e380a2e157e4541d4705a5ce744ee4109e732b185052a860ad5aabf509d riscv64-lp64d--uclibc--bleeding-edge-2024.02-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2023.11-1.sha256 sha256 aebb6034d3512e3c29337c368dcf4a1e58756c725032d814047a3635178cb5ad riscv64-lp64d--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2023.11-1.sha256 -sha256 716031aaa6b2d566b0c9abf3992f1b7dabc845eb81934ec97ce0ff37157c9269 s390x-z13--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2023.11-1.sha256 -sha256 4ff3c21eb060c9df2e795fab18fa267300a581ba3fa55e62084e9233c386515f s390x-z13--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2023.11-1.sha256 -sha256 96b9082e3ee2b7c7b8170fa8d93f50629d170f4dfc345978327ed562d0efe42b sh-sh4--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2023.11-1.sha256 -sha256 e957c0854780cb48b0fcb54eddf9ef40ed496b8fb3d0c905f9c36dd8263f3cf0 sh-sh4--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2023.11-1.sha256 -sha256 57e28d5a164fdcaed5a6cfd1225e346e873d4e48f8f1ced8153af0c8669bd081 sh-sh4--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2023.11-1.sha256 -sha256 b6847ac7355ad469d752799ffa08df4eef2a7ba49974242e1cefa9d9720bc894 sh-sh4--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 ee15660db075af19c7e768da73c6f57336b4201bd397e20fdd0357630fdf4e40 sh-sh4--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2023.11-1.sha256 -sha256 8d0e0f3a54cb5b601d7c9c093138ba537e11f400a3e44ee0b10d28b96f9704fb sh-sh4--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2023.11-1.sha256 -sha256 760b5970d4c9b82bd6d469a142713bc70564a83d86123b1c5ae1fb0ccf9711d7 sh-sh4aeb--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2023.11-1.sha256 -sha256 e734eeba730881e1135abb94797ece8865b924ff31c918df93fcfbf21dddba7d sh-sh4aeb--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2023.11-1.sha256 -sha256 d2a7024ca6869117118e136c8577d11c954acfd4aa71112f431be0c76fffea2f sh-sh4aeb--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2023.11-1.sha256 -sha256 3e48605bbf9407f9625cc367b55ab35f20a308cb44c69e85583b2fe10c9c604d sh-sh4aeb--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2023.11-1.sha256 -sha256 8ee180782f8094d90e28e4977ea018094363d0678c1d149838098bedcab4aa71 sparc64--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2023.11-1.sha256 -sha256 78eeafc8c9b28dbf5a90d2f8ebc4e1a0623147e5f4bdbcd29b32d6ee760c9d1b sparc64--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2024.02-1.sha256 +sha256 2fa0e05c3c5e219e5456a15c284482604ab11a0a00aba4dbb82350fc60151208 s390x-z13--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2024.02-1.sha256 +sha256 485d6abeb924810228a6d7c6c503e5f724a049a6e14b150c888b33bb9970e14e s390x-z13--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2024.02-1.sha256 +sha256 413176d97f73a372d6ace57649e51b6132f2479fe26b113278055c922bac3f44 sh-sh4--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2024.02-1.sha256 +sha256 1519bf392ca9d29494976f5904d6d683dd74e739eccc09b4e3c90ddd65adadfb sh-sh4--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2024.02-1.sha256 +sha256 ad71172f0339ea267243af40f047797aa1cac4afdcebf4de93d66b11ed64cd8f sh-sh4--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2024.02-1.sha256 +sha256 5ab53c70013fd8f5c5409145f4faa60fdb115c54cb10fe4da07acd7588b46d7d sh-sh4--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 07a3e55f36b7d7718d369408022bd4795c98e79adacad56839ce3805a560f73d sh-sh4--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2024.02-1.sha256 +sha256 de811fc1f294fda4bec6c84131f9320277b87687e04a50200a02d9af3d743ebb sh-sh4--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2024.02-1.sha256 +sha256 182333d197803146d36df9186cb583ff482efbcf4d5ca1db4791ef7cbe17fa8c sh-sh4aeb--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2024.02-1.sha256 +sha256 821a749fe873457740204146b3f70b061ddb572fee6ad63ebbf5e1c5ca1bd608 sh-sh4aeb--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2024.02-1.sha256 +sha256 d2d69a26ce5cd0b4e6ce88789a65a0cdcc9b5c877887703f9277aa93bbd7f82c sh-sh4aeb--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2024.02-1.sha256 +sha256 3689491d91cdcb3579fc3105cb2b9a16e95e4c92d881602f0e0f254caf50d1d6 sh-sh4aeb--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2024.02-1.sha256 +sha256 7371c311b20412732451f445f1e28c8b4c8bdc8e164630b23065ba4bf8d483cd sparc64--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2024.02-1.sha256 +sha256 b5b8056b85cf24e548de8b66919b1ddf59f3ba77446d23abd86f18f094a06eee sparc64--glibc--stable-2024.02-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2022.08-2.sha256 sha256 ccd4110fa574d2323f038394c0603245384002fbe906204db36fe200c9c8f886 sparcv8--uclibc--bleeding-edge-2022.08-2.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2022.08-1.sha256 sha256 da3b9f0a936401cbd3cc305b86d3611531391354cc0226a0eeb3ce4ddcc7b7dc sparcv8--uclibc--stable-2022.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2023.11-1.sha256 -sha256 c97b280a36ae4411ec97717b2c67622912ef436efa55a31f888187492d4e5e4b x86-64--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2023.11-1.sha256 -sha256 e3c0ef1618df3a3100a8a167066e7b19fdd25ee2c4285cf2cfe3ef34f0456867 x86-64--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2023.11-1.sha256 -sha256 b362a4b12a19e2baa3590386a531d8b65abad0d323aba317aea5146da13b8659 x86-64--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2023.11-1.sha256 -sha256 d1df97230234a52c60e53fa7d1a6f14721295b8b49f40801c0e3ca1017b5bee3 x86-64--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 e32b885a41257dd5809f99d6d165994da3d1ce9efe2051f5c223a8243aaa37d9 x86-64--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2023.11-1.sha256 -sha256 1b77c4238b3e1958472094f46f866cfe7eab6c25d728db8c3ece8121e2095035 x86-64--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2023.11-1.sha256 -sha256 6b8cc256ccc35777b4d5b6a2baaa2d9a4cbb48f4e111860d20b310f983cf00e0 x86-64-v2--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2023.11-1.sha256 -sha256 45b1749ac5473f4ef629a32dcc423419b608c9cb80840b49501afb8af008c381 x86-64-v2--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2023.11-1.sha256 -sha256 ef2e717b55f34ad320c532a21782c308fdff5a462b413af868f52543dee043cf x86-64-v2--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2023.11-1.sha256 -sha256 ae070e245dfc0bf882b6dcc4ad6c080b11f0b8d2f235f65c0cc1069a06f5e4a0 x86-64-v2--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 530f31ce5f8d002eb7e044f61b49e242d1e15a182e7e09ccf9f64080e6a28ac9 x86-64-v2--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2023.11-1.sha256 -sha256 a11189869ca3636abd12691758ab08dd41ef54c3cdcf936a141d48c4f2903237 x86-64-v2--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2023.11-1.sha256 -sha256 49031a3567c018a94d8158f8f5767d3438da21c8ad493c90c641d11e55f44d81 x86-64-v3--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2023.11-1.sha256 -sha256 19376ffd5187f2c96d99a9f12d15ae51c8bf351d25a7186e379fae815feedd22 x86-64-v3--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2023.11-1.sha256 -sha256 6817017e68cb3d8e09eb048ccd70ee66e5cd72e49fb77806825614802a62077e x86-64-v3--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2023.11-1.sha256 -sha256 05f73caedf28c257d66e4365b9e496069bdc1294bfa1b9697e64a380d63eaf99 x86-64-v3--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 45ee398da5195584062e573eed27a660d99a10e8f129c6fb27b2d6b418a05bae x86-64-v3--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2023.11-1.sha256 -sha256 9848d205bcbdba3fd2e1c61cdd5d33ed03f842639d4f4e0a0057c410811bed79 x86-64-v3--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2023.11-1.sha256 -sha256 d57fc66d8ae7e7aedf543bf4993fa36be68aeb1020c30d32d26d0fad8952db63 x86-64-v4--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2023.11-1.sha256 -sha256 095220c834fb1c1a796e6db7847c9dc191fedca6ae731708a9864f1c0ec0f752 x86-64-v4--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2023.11-1.sha256 -sha256 50757334efcabf2d35083498df04a945cb7e3730dd3893cc478832a02d21147b x86-64-v4--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2023.11-1.sha256 -sha256 437516c415eacd377946df6167196dd4337da030f304d8c81b5b6889317b136c x86-64-v4--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 f6e25121564440796a9cb196bf9de87e1ed51456d508deb8b061ab4727971ff6 x86-64-v4--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2023.11-1.sha256 -sha256 a35e650c422e64939c8d4578b39fce5c73995688420e51aa6c0f553ba97ba838 x86-64-v4--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2023.11-1.sha256 -sha256 00e1992817c73d2df99f188240e244442f3d50a2a9a994d95ade453916c16ac3 x86-64-core-i7--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2023.11-1.sha256 -sha256 a3cd2806008fd2bd75bee34d098003ef2cfb06665d15e92d305617d4e021b74e x86-64-core-i7--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2023.11-1.sha256 -sha256 cf084bdf1f62c35996dc922d9c794a08d53ff0d71e888a0bbc4717431aa7c2c6 x86-64-core-i7--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2023.11-1.sha256 -sha256 38a7be51cdeb738f7d724ba3efe207fddab523c8b128bbbb33f9b7a56d0e70f1 x86-64-core-i7--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 4f08c426b0ebb88a1e66831db780168c5716e319e905b8d41c5f5dba1e98d543 x86-64-core-i7--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2023.11-1.sha256 -sha256 92ee30927596669f133982681010edaaf63100fde41ffea6a778aae367b2ca86 x86-64-core-i7--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2023.11-1.sha256 -sha256 76135ed57c361ac9c3722ff8db64332cffa77669b7051469eb3ef169df790bb6 x86-core2--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2023.11-1.sha256 -sha256 adde0a7579bd8c7c6b4dd7af2997a6841a541d1e94426d2ad7ebdbb26105b536 x86-core2--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2023.11-1.sha256 -sha256 26206a934621b95ccf5380fe3f69e2218a9531a850dd05f9cdee5cc66e23963e x86-core2--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2023.11-1.sha256 -sha256 7202c3eb1f71ebbef5db2b042ba7e803574ccf66987c406f3711d98878dbbe24 x86-core2--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 4d73fbe36e86263679a4d5f7331977657cf793fe1ef337ffb6492aedf9d86e1b x86-core2--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2023.11-1.sha256 -sha256 825c95bf3f28a950f90f9f8827c3ee4536729285603ff53611ae260c4beb2ce8 x86-core2--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2023.11-1.sha256 -sha256 007266510779d041524cc1fce4eac2af1ffe38db50d2221cbe09a519c61190c3 x86-i686--glibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2023.11-1.sha256 -sha256 13afd0f9b7fd7e3c1c598b294494e23ddacb39df23e30a999fbadff31a97c514 x86-i686--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2023.11-1.sha256 -sha256 02c465b5612607931c9f0f7eec0239b0ecebab2af3cef79c28993c7ce7f5b079 x86-i686--musl--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2023.11-1.sha256 -sha256 5d0a0abd6f6227622b217183ab06bcdf63fd6834bcb2a2335666bbb734f3fb11 x86-i686--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 6a40f5bb22f1fb1de6cc6986f31afdfbef5c5c866f3a3a387e1dfc567ed98b8e x86-i686--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2023.11-1.sha256 -sha256 c23e32f9616df27a1b8f77700d7b988c55dce6443598907ceface720c6e960a3 x86-i686--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2023.11-1.sha256 -sha256 9434e3522601c9b494bd223fa04376b9b489db47e823266b124f5b7a3b97486c xtensa-lx60--uclibc--bleeding-edge-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2023.11-1.sha256 -sha256 aa28cb17b03d7fa29c8911a8f9c7b26c2d90c222b1b0a1c727ecc5533b14023e xtensa-lx60--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2024.02-1.sha256 +sha256 7aac949737ebfb3f4bccc6a75af79d50cf1fadd9ffbdf21e26c1508dff67f23d x86-64--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2024.02-1.sha256 +sha256 19c8e5bc1395636aef1ce82b1fa7a520f12c8b4ea1b66ac2c80ec30dcf32925e x86-64--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2024.02-1.sha256 +sha256 91bd25e7a649e2f2aae93bebf58b4e9f57fae8daf8bf7e573975348e0bc38890 x86-64--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2024.02-1.sha256 +sha256 f54778c2e50c4aa990c4b74545bb7018dec12324b89f879981430f5411fd27db x86-64--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 0ebf73f28a369120b0d33ee6800b9b10cf36851cbed3bcad7828c61a7da69588 x86-64--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2024.02-1.sha256 +sha256 458d9de771c7c35ecd26de1d473b913bdeb01a78b22107f998dd93bacee0bc96 x86-64--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2024.02-1.sha256 +sha256 cefbe65c027b8a785088f7d690fc1eacef2cd39bd60c8a95cb09d666d6b98bb8 x86-64-v2--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2024.02-1.sha256 +sha256 772a44754d393b012cf0f04fc3ec6acf29461a352bbc44cd255d926db7e9a0f6 x86-64-v2--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2024.02-1.sha256 +sha256 893453ba045a2035c3b87a3619c9fdf1bc641395bd7c9c56ed59e9f8f7a90d8d x86-64-v2--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2024.02-1.sha256 +sha256 b5ec30e722386ea98f0e3ca3d6b3e082e6996fefedcc1b607811eb8451c22de0 x86-64-v2--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 15ffb204fa40aa53dcbf1dcacaf23599d70f8778e21d57cadfb89b98c4a7587f x86-64-v2--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2024.02-1.sha256 +sha256 3ff823a12ad3f668f6b3d8d596fe2d44236f1a24563b30ce72f9299ba73e0b14 x86-64-v2--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2024.02-1.sha256 +sha256 27bb18f261a412fa752f1c019ef4a9250653f16229f2ffb41eb584396787c68d x86-64-v3--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2024.02-1.sha256 +sha256 5d515f6e4b311d7636a3cf600cd02fde7d0beb0a2f143df4921ff5a61cbaebcb x86-64-v3--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2024.02-1.sha256 +sha256 5b5d89737faf3998fbd1590a26dc9bd6a56e400b7fd7c2c2065ba4b98bf839eb x86-64-v3--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2024.02-1.sha256 +sha256 45b0db10e82fd28ac930446679f5fbd6ce373ce63e8e3d88e4df1b7455c1b100 x86-64-v3--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 08cc939858ef3e4fef17dd7544ea15b6b8af1bc823ab6453479919c7aa2d669f x86-64-v3--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2024.02-1.sha256 +sha256 830b80a76fee9d1c4eac1b5d0351c3543bf2ebcc8f47de2163cbe85dec83143d x86-64-v3--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2024.02-1.sha256 +sha256 dd645f770d95dc0becc6216f3f32f87f6ffcc713ba3b6c53e96e8a3fcfc24e08 x86-64-v4--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2024.02-1.sha256 +sha256 ed68f8d487f52beb95e5ff80da01b959222f53e089728b63ce38b99f80b597ca x86-64-v4--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2024.02-1.sha256 +sha256 19b7633ce87c46ca5483149ef5b9e202bf245d8f099d4cc2ec6a1d986fa97827 x86-64-v4--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2024.02-1.sha256 +sha256 99468cdd4a77c5b28bdaebf7ee09c5cef2e5dd34335929f8fd5c2e661980c838 x86-64-v4--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 d6d72b9150b7f59cf060b63fae73f7656f58043e61c4f3c68478d15947268398 x86-64-v4--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2024.02-1.sha256 +sha256 ab29371356518583742bb99d6490805d86a7bbdd84d0a6c00fca84afa34cae52 x86-64-v4--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2024.02-1.sha256 +sha256 45cb05f2d1ff7f62131d172f90fae321753396ef477b549ca79a50fba48edba7 x86-64-core-i7--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2024.02-1.sha256 +sha256 ecaa610ca27b5b65bcd198fa9d71635f6cfbbc90e45fc930b40a50860ee054b9 x86-64-core-i7--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2024.02-1.sha256 +sha256 b6eb510561931a7d1c66afabfc1206731473a64fde41093474d6819e085e9d15 x86-64-core-i7--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2024.02-1.sha256 +sha256 19799b79a953b3356409ab8e17b48804e20dd0452f36b5bf707ae3a82d007fca x86-64-core-i7--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 ba8c70414f46649e3ea7196c01c911e91a75ac06b7136c21522ae3606025d6af x86-64-core-i7--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2024.02-1.sha256 +sha256 7af3cb11a74bd85878be6a0c7922ae4e71d843b49d3874ef2a0821f0f1c08681 x86-64-core-i7--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2024.02-1.sha256 +sha256 f28e0f3035b9fc8f5bd98b584b8d45cb15ae265a084592afdef37639a05c6e08 x86-core2--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2024.02-1.sha256 +sha256 4278f1d84b1ccf077de319a9ec9ba2feae282a38a2caeca31d67a24c6021454c x86-core2--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2024.02-1.sha256 +sha256 9a7654eaef4bb646b2deae602ae607d8cb47f574a54f97050380a3bd6792aefc x86-core2--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2024.02-1.sha256 +sha256 16efa5faa30893ec1d4e575ee1b33e782288a261a52911686c56f82e7d5eca44 x86-core2--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 5258405863b3bb7cfafefb9107c152e2dbb3d0565384999f41d8b3ab0c96df39 x86-core2--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2024.02-1.sha256 +sha256 453e8fb81e07093f6c37aa00e8f54768f9ab4ce1bdd38f3d4269c7b7c509fb1a x86-core2--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2024.02-1.sha256 +sha256 52df822a10c09469ab6231753f306b668163bfdfe492db209b3a06e3a4e7aa05 x86-i686--glibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2024.02-1.sha256 +sha256 3341c76890fa04873e0cf56b921a54e046d63d8ea8ecf16e82fb66a1b81a9695 x86-i686--glibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2024.02-1.sha256 +sha256 ace16afe9d7728a5210cc9cadc4bf80754f0dc449855e10501d9669f203fc932 x86-i686--musl--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2024.02-1.sha256 +sha256 e9cfe8d65170dde92759e0e425c425c15439190711fdd66999cdb6f5551653a3 x86-i686--musl--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 510ca03d4d8952bdc91ebc5ac3c9ab5019f519d174071e88f566ae9746098d29 x86-i686--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2024.02-1.sha256 +sha256 6ffa7ea5d610bfd25d16769130559be1fc1c00dd5b81ebc4ec25d05e5dcd26c2 x86-i686--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2024.02-1.sha256 +sha256 a97be06a34db230c0022d544efcf85bcd0b0d4dda86f820f0abbcab1b59d184f xtensa-lx60--uclibc--bleeding-edge-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2024.02-1.sha256 +sha256 e871ce555353a025b86d905ea3f5131dfbf95340bcda706facad070d82b997c1 xtensa-lx60--uclibc--stable-2024.02-1.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk index 4a09fd8825c..07ae8304106 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -7,91 +7,91 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif @@ -103,559 +103,559 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif @@ -667,229 +667,241 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif @@ -901,7 +913,7 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif @@ -913,7 +925,7 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif @@ -925,85 +937,85 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif @@ -1021,265 +1033,265 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif From 6a1059850cd28b2bf25eabb5fa1c44d3ff92fd55 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 14:35:50 +0200 Subject: [PATCH 0343/3013] package/rtty: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-14/output-1/host/lib/gcc/i686-buildroot-linux-gnu/12.3.0/../../../../i686-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/0fd5a118f6173233fc3e9ebc9477948031355dd7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/rtty/Config.in | 1 + package/rtty/rtty.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/rtty/Config.in b/package/rtty/Config.in index 198d4657132..da5afb83640 100644 --- a/package/rtty/Config.in +++ b/package/rtty/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_RTTY bool "rtty" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Access your device's terminal from anywhere via the web. diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 8a40f584def..b2fac144322 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -10,6 +10,10 @@ RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE RTTY_DEPENDENCIES = libev +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +RTTY_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls RTTY_CONF_OPTS += \ From 8dd367b82cb4eb9f974c3fd683de79f01be85c80 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 14:55:55 +0200 Subject: [PATCH 0344/3013] package/policycoreutils: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-15/output-1/per-package/policycoreutils/host/bin/../lib/gcc/powerpc-buildroot-linux-gnu/12.3.0/../../../../powerpc-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/74c9775e5da7846b8dcff10e3966789458592450 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/policycoreutils/Config.in | 1 + package/policycoreutils/policycoreutils.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 3201c8fede1..499aaf531d9 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_POLICYCOREUTILS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBCAP_NG + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Policycoreutils is a collection of policy utilities (originally the "core" set of utilities needed to use diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 0e639760fa6..3152fb6b67d 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -13,6 +13,10 @@ POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) POLICYCOREUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) LDLIBS=$(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +POLICYCOREUTILS_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y From 0a9164adeecabf77a6a811dcc0e629d3d37a35f8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:00:14 +0200 Subject: [PATCH 0345/3013] package/freeradius-client: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/riscv32-buildroot-linux-gnu/12.3.0/../../../../riscv32-buildroot-linux-gnu/bin/ld: local.o: in function `auth_local': local.c:(.text+0xe8): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/207bba3df700108839382007020be56c4629ef75 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/freeradius-client/Config.in | 1 + package/freeradius-client/freeradius-client.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/freeradius-client/Config.in b/package/freeradius-client/Config.in index 773adb8a090..36a74c3a6d7 100644 --- a/package/freeradius-client/Config.in +++ b/package/freeradius-client/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_FREERADIUS_CLIENT bool "freeradius-client" + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help FreeRADIUS Client is a framework and library for writing RADIUS Clients. diff --git a/package/freeradius-client/freeradius-client.mk b/package/freeradius-client/freeradius-client.mk index 981ed163e00..b1136434154 100644 --- a/package/freeradius-client/freeradius-client.mk +++ b/package/freeradius-client/freeradius-client.mk @@ -12,6 +12,10 @@ FREERADIUS_CLIENT_INSTALL_STAGING = YES FREERADIUS_CLIENT_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +FREERADIUS_CLIENT_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_NETTLE),y) FREERADIUS_CLIENT_DEPENDENCIES += nettle FREERADIUS_CLIENT_CONF_OPTS += --with-nettle=yes From 90fc4d74ae70b2cbe50e4cfcc4a7dfcea636344c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:05:50 +0200 Subject: [PATCH 0346/3013] package/nginx: select libxcrypt with glibc Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: In file included from src/core/ngx_config.h:26, from src/core/nginx.c:8: src/os/unix/ngx_linux_config.h:55:10: fatal error: crypt.h: No such file or directory 55 | #include | ^~~~~~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/a186fffc468f9c901626c47c4ce216ae501085b8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nginx/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 8e888baa1c6..1c74f6e1167 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -2,6 +2,7 @@ menuconfig BR2_PACKAGE_NGINX bool "nginx" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBATOMIC_OPS if BR2_sparc_v8 || BR2_sparc_leon3 + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help nginx is an HTTP and reverse proxy server, as well as a mail proxy server. From 0c19ab7e1cfb2c266090cb8568b4953a6ac7cf87 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:25:16 +0200 Subject: [PATCH 0347/3013] package/proftpd: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-12/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/13.2.0/../../../../s390x-buildroot-linux-gnu/bin/ld: modules/mod_auth_file.o: in function `authfile_chkpass': mod_auth_file.c:(.text+0x3aa): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/4d39666854a0395e96c7b0c8339b6ac1b41c4348 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/proftpd/Config.in | 1 + package/proftpd/proftpd.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 7b9f74895a1..9d99ff70c48 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PROFTPD bool "proftpd" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help ProFTPD, a highly configurable FTP server. diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 0820822e178..242de38b0d9 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -31,6 +31,10 @@ ifeq ($(BR2_PACKAGE_LIBIDN2),y) PROFTPD_DEPENDENCIES += libidn2 endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +PROFTPD_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) PROFTPD_CONF_OPTS += --enable-pcre2 PROFTPD_DEPENDENCIES += pcre2 From 102b0ae459cc051bbf39ebe680e65167c5de6be7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:45:37 +0200 Subject: [PATCH 0348/3013] package/freeradius-server: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: src/lib/missing.c:31:7: error: conflicting types for 'crypt'; have 'char *(char *, char *)' 31 | char *crypt(UNUSED char *key, char *salt) | ^~~~~ In file included from src/freeradius-devel/missing.h:60, from src/freeradius-devel/libradius.h:71, from src/lib/missing.c:26: /home/buildroot/autobuild/instance-2/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/unistd.h:1162:14: note: previous declaration of 'crypt' with type 'char *(const char *, const char *)' 1162 | extern char *crypt (const char *__key, const char *__salt) | ^~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/dc45f1291245a0dadd382cea2ad41573ad976d60 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/freeradius-server/Config.in | 1 + package/freeradius-server/freeradius-server.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in index d51d92714d3..e99778ea49c 100644 --- a/package/freeradius-server/Config.in +++ b/package/freeradius-server/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_FREERADIUS_SERVER depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBTALLOC + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help FreeRADIUS is an open source server which implements a protocol for remote user Authorization, Authentication diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 1e8ada6bb93..c64ae799187 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -119,6 +119,10 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-pcap endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +FREERADIUS_SERVER_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_pam FREERADIUS_SERVER_DEPENDENCIES += linux-pam From 55f3df2dbedc7880bd949d722254cec7fc9af522 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:46:32 +0200 Subject: [PATCH 0349/3013] package/polkit: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: ../output-1/build/polkit-123/meson.build:267:18: ERROR: C shared or static library 'crypt' not found Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/59926191d274b25e32e6bbd708f5aadb346d3171 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/polkit/Config.in | 1 + package/polkit/polkit.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/polkit/Config.in b/package/polkit/Config.in index ca3323931c5..fda6c984d75 100644 --- a/package/polkit/Config.in +++ b/package/polkit/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_POLKIT select BR2_PACKAGE_DUKTAPE select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help PolicyKit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index e393672c1e0..cdbbf8f9b07 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -30,6 +30,10 @@ else POLKIT_CONF_OPTS += -Dintrospection=false endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +POLKIT_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLKIT_DEPENDENCIES += linux-pam POLKIT_CONF_OPTS += -Dauthfw=pam From c08c98c889ef3e7622717c5247000d4f505a24ce Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:48:01 +0200 Subject: [PATCH 0350/3013] package/frr: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-1/output-1/per-package/frr/host/bin/../lib/gcc/i686-buildroot-linux-gnu/12.3.0/../../../../i686-buildroot-linux-gnu/bin/ld: lib/.libs/libfrr.so: undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/668da3829cacbe883e6cf97ce6191a8180441db6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/frr/Config.in | 1 + package/frr/frr.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/frr/Config.in b/package/frr/Config.in index f6c058e6dfd..0afd8c61a2d 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_FRR depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libyang select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBYANG select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C diff --git a/package/frr/frr.mk b/package/frr/frr.mk index a4b4bccaf9c..1b7d66fc68a 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -13,7 +13,8 @@ FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES FRR_DEPENDENCIES = host-frr readline json-c libyang \ - $(if $(BR2_PACKAGE_C_ARES),c-ares) + $(if $(BR2_PACKAGE_C_ARES),c-ares) \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 From 02905fe54cb2136c15cc71d2840d60537f1513a8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 16:07:24 +0200 Subject: [PATCH 0351/3013] package/apache: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/buildroot/instance-0/output-1/host/lib/gcc/arc-buildroot-linux-gnu/13.1.1/../../../../arc-buildroot-linux-gnu/bin/ld: /home/buildroot/instance-0/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libaprutil-1.so: undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/f0f55d9d66b07cb3408086d2632f8cd1bebb670e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apache/Config.in | 1 + package/apache/apache.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/apache/Config.in b/package/apache/Config.in index 270296bce4e..bc3133ea002 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_APACHE depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 1b095c5eb10..619d13726e9 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -52,6 +52,10 @@ else APACHE_CONF_OPTS += --disable-brotli endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +APACHE_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) APACHE_DEPENDENCIES += libxml2 # Apache wants the path to the header file, where it can find From 21c2a8ef8f91e87e8e1eb2444c9b0ec9f0a84335 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 16:12:47 +0200 Subject: [PATCH 0352/3013] package/vsftpd: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/062dbadf1f2f8e25747f7689974a693163932113 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/vsftpd/Config.in | 1 + package/vsftpd/vsftpd.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/vsftpd/Config.in b/package/vsftpd/Config.in index 464d6f27e3c..fb74b145016 100644 --- a/package/vsftpd/Config.in +++ b/package/vsftpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_VSFTPD bool "vsftpd" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help vsftpd is an ftp daemon written with security in mind. http://vsftpd.beasts.org/ diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index 6742843c19e..14c1b6be13e 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -35,6 +35,10 @@ VSFTPD_DEPENDENCIES += libcap VSFTPD_LIBS += -lcap endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +VSFTPD_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) VSFTPD_DEPENDENCIES += linux-pam VSFTPD_LIBS += -lpam From d5e31164c9a58a9a252bef1153d9af876deaa702 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 16:16:08 +0200 Subject: [PATCH 0353/3013] package/openrc: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: ../output-1/build/openrc-0.52.1/meson.build:129:21: ERROR: C shared or static library 'crypt' not found Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/52187a593d3da39051e635a9cb5a19d5bfe2bef6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/openrc/Config.in | 1 + package/openrc/openrc.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/openrc/Config.in b/package/openrc/Config.in index adc61d2546f..42d7347b0ea 100644 --- a/package/openrc/Config.in +++ b/package/openrc/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_OPENRC select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools select BR2_PACKAGE_KMOD # runtime select BR2_PACKAGE_KMOD_TOOLS # runtime + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NCURSES help Init that works on top of pid 1 (for example diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index f8e51f67206..69f5b3a121b 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -33,6 +33,10 @@ else OPENRC_CONF_OPTS += -Dselinux=disabled endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +OPENRC_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) OPENRC_CONF_OPTS += -Dpam=true OPENRC_DEPENDENCIES += linux-pam From e4eda364a2f80e3d1883f85e997a89f0f1dd6365 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 16:19:20 +0200 Subject: [PATCH 0354/3013] package/thttpd: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-14/output-1/host/lib/gcc/arm-buildroot-linux-gnueabi/12.3.0/../../../../arm-buildroot-linux-gnueabi/bin/ld: libhttpd.o: in function `auth_check2': libhttpd.c:(.text+0x3d50): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/bfb8a115edf71b1852cc8585c00eb9f0e801a955 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/thttpd/Config.in | 1 + package/thttpd/thttpd.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/thttpd/Config.in b/package/thttpd/Config.in index 66537aa270a..bd97bc7a75a 100644 --- a/package/thttpd/Config.in +++ b/package/thttpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_THTTPD bool "thttpd" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help thttpd is a simple, small, portable, fast, and secure HTTP server diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index 3815705b58b..d9cb5c9071a 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -12,6 +12,10 @@ THTTPD_CPE_ID_VENDOR = acme THTTPD_MAKE = $(MAKE1) +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +THTTPD_DEPENDENCIES += libxcrypt +endif + define THTTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/thttpd $(TARGET_DIR)/usr/sbin/thttpd $(INSTALL) -D -m 0755 $(@D)/extras/htpasswd $(TARGET_DIR)/usr/bin/htpasswd From 8e7450b63d33dc059de0f5352d7b31afe32c17d3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 16:25:12 +0200 Subject: [PATCH 0355/3013] package/monit: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-gnu/13.2.0/../../../../powerpc-buildroot-linux-gnu/bin/ld: src/util.o: in function `Util_checkCredentials': util.c:(.text+0x32e8): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/12b2c6665280dcb813a58d9b025038bacc3b8d51 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/monit/Config.in | 1 + package/monit/monit.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/monit/Config.in b/package/monit/Config.in index 9f80858f8ab..d177fe183c5 100644 --- a/package/monit/Config.in +++ b/package/monit/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_MONIT bool "monit" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Monit is a free open source utility for managing and monitoring, processes, programs, files, directories and diff --git a/package/monit/monit.mk b/package/monit/monit.mk index c709f903e69..e3a4fac936b 100644 --- a/package/monit/monit.mk +++ b/package/monit/monit.mk @@ -25,6 +25,10 @@ MONIT_CONF_OPTS += \ --without-pam \ --with-largefiles +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +MONIT_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MONIT_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` ifeq ($(BR2_STATIC_LIBS),y) From 166b05b54585bd67ed7920152462f6fe7778f3c4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 16:29:59 +0200 Subject: [PATCH 0356/3013] package/shadow: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: configure: error: crypt() not found Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/cd97aa4ee49c3052b762deccb5aa28cd23c54f5f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/shadow/Config.in | 1 + package/shadow/shadow.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/shadow/Config.in b/package/shadow/Config.in index b08b06457ba..987605c7fa1 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SHADOW depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 depends on !BR2_TOOLCHAIN_USES_UCLIBC # reallocarray, explicit_bzero + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Utilities to deal with user accounts. diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 2092903b2d7..491f271330a 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -88,6 +88,10 @@ else SHADOW_CONF_OPTS += --without-selinux endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +SHADOW_DEPENDENCIES += libxcrypt +endif + # linux-pam is also used without account-tools-setuid enabled ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SHADOW_CONF_OPTS += --with-libpam From 740dffc6a81b5c99a15864885526d628d6b02efb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 17:21:55 +0200 Subject: [PATCH 0357/3013] package/cups: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/buildroot/autobuild/run/instance-1/output-1/host/lib/gcc/arc-buildroot-linux-gnu/13.1.1/../../../../arc-buildroot-linux-gnu/bin/ld: auth.o: in function `cupsdAuthorize': auth.c:(.text+0xdba): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/39b72d4e14895f901590d7e3404f69b4573d2cd2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/cups/Config.in | 1 + package/cups/cups.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/cups/Config.in b/package/cups/Config.in index 51cf10b073b..ad852c0998a 100644 --- a/package/cups/Config.in +++ b/package/cups/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_HAS_THREADS # needs fork() depends on BR2_USE_MMU + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help The Common Unix Printing System diff --git a/package/cups/cups.mk b/package/cups/cups.mk index a5098b50e9f..5d474d0fe59 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -33,6 +33,7 @@ CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ host-autoconf \ host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(if $(BR2_PACKAGE_ZLIB),zlib) ifeq ($(BR2_PACKAGE_SYSTEMD),y) From 0af98ea2d889dd63bc6934236a625732ce28b059 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:59:51 +0200 Subject: [PATCH 0358/3013] package/oatpp: disable tests Fix the following build failure raised since the addition of the package in commit d5bba26801b352f591451cf73e0b7509de0e6850: [100%] Linking CXX executable oatppAllTests /home/buildroot/instance-0/output-1/per-package/oatpp/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: cannot find -latomic: No such file or directory Fixes: d5bba26801b352f591451cf73e0b7509de0e6850 - http://autobuild.buildroot.org/results/1587b391baecdbb5a24a0c0b2c33d63cb71a2f7f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/oatpp/oatpp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oatpp/oatpp.mk b/package/oatpp/oatpp.mk index c8b0c9694ab..d3f6e1a9c26 100644 --- a/package/oatpp/oatpp.mk +++ b/package/oatpp/oatpp.mk @@ -8,7 +8,7 @@ OATPP_VERSION = 1.3.0 OATPP_SITE = $(call github,oatpp,oatpp,$(OATPP_VERSION)) OATPP_LICENSE = Apache-2.0 OATPP_LICENSE_FILES = LICENSE -OATPP_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF +OATPP_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF -DOATPP_BUILD_TESTS=OFF OATPP_INSTALL_STAGING = YES # Only builds a static lib and headers OATPP_INSTALL_TARGET = NO From dece32b6f3957320bcb689394164151dd8707f3b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 18:38:51 +0100 Subject: [PATCH 0359/3013] package/libtracefs: fix musl build Fix the following musl build failure raised since the addition of the package in commit b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: ../utest/tracefs-utest.c: In function 'test_uprobes_instance': ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) 2492 | char self[PATH_MAX] = { 0 }; | ^~~~~~~~ Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...ATH_MAX-if-it-is-not-already-defined.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch diff --git a/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch b/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch new file mode 100644 index 00000000000..121fee5adf2 --- /dev/null +++ b/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch @@ -0,0 +1,40 @@ +From ba750812f68f0f3314494558496c23f934f8faff Mon Sep 17 00:00:00 2001 +From: "Steven Rostedt (Google)" +Date: Thu, 22 Feb 2024 11:02:46 -0500 +Subject: libtracefs utest: Add PATH_MAX if it is not already defined + +In some setups PATH_MAX may not be defined (it is usually defined in +linux/limits.h), but we just use PATH_MAX as something to hold the paths +to the tracing files. In that case, just define it to 1024 if it's not +already defined. + +Link: https://lore.kernel.org/linux-trace-devel/20240222-utest-fixes-v2-1-7b8ee8dca0b7@gmail.com/ + +Fixes: 845f16976929 ("libtracefs: Add unit tests") +Reported-by: Miko Larsson +Signed-off-by: Steven Rostedt (Google) + +Upstream: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/commit/?id=ba750812f68f0f3314494558496c23f934f8faff +Signed-off-by: Fabrice Fontaine +--- + utest/tracefs-utest.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c +index 963fac7..07ecd32 100644 +--- a/utest/tracefs-utest.c ++++ b/utest/tracefs-utest.c +@@ -26,6 +26,10 @@ + + #define gettid() syscall(__NR_gettid) + ++#ifndef PATH_MAX ++#define PATH_MAX 1024 ++#endif ++ + #define TRACEFS_SUITE "tracefs library" + #define TEST_INSTANCE_NAME "cunit_test_iter" + #define TEST_TRACE_DIR "/tmp/trace_utest.XXXXXX" +-- +cgit 1.2.3-korg + From eb4adf179090bc9ffae8647b0bf2ce38b2f2438a Mon Sep 17 00:00:00 2001 From: Karthikeyan Krishnasamy Date: Tue, 5 Mar 2024 12:34:52 +0530 Subject: [PATCH 0360/3013] package/linux-firmware: RTL_88XX_BT: install all firmware Instead of enumerating each binary, which is cumbersome and may miss some of them, simply install all binaries starting with rtl88. Signed-off-by: Karthikeyan Krishnasamy Signed-off-by: Arnout Vandecappelle --- package/linux-firmware/linux-firmware.mk | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 60e8861abee..7e1e5cf6f26 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -90,16 +90,7 @@ endif # Realtek 88xx Bluetooth ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT),y) LINUX_FIRMWARE_FILES += \ - rtl_bt/rtl8812ae_fw.bin rtl_bt/rtl8821a_fw.bin \ - rtl_bt/rtl8821c_config.bin rtl_bt/rtl8821c_fw.bin \ - rtl_bt/rtl8822b_config.bin rtl_bt/rtl8822b_fw.bin \ - rtl_bt/rtl8822cs_config.bin rtl_bt/rtl8822cs_fw.bin \ - rtl_bt/rtl8822cu_config.bin rtl_bt/rtl8822cu_fw.bin \ - rtl_bt/rtl8851bu_fw.bin rtl_bt/rtl8851bu_config.bin \ - rtl_bt/rtl8852au_fw.bin rtl_bt/rtl8852au_config.bin \ - rtl_bt/rtl8852bu_fw.bin rtl_bt/rtl8852bu_config.bin \ - rtl_bt/rtl8852cu_fw.bin rtl_bt/rtl8852cu_config.bin \ - rtl_bt/rtl8852cu_fw_v2.bin + rtl_bt/rtl88*_fw.bin rtl_bt/rtl88*_config.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif From a3afff8d96ca1a042f195a59be3fc0633d3333f6 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Tue, 26 Mar 2024 19:56:53 +0100 Subject: [PATCH 0361/3013] package/eza: bump to version 0.18.8 Release notes: https://github.com/eza-community/eza/releases/tag/v0.18.8 Signed-off-by: Saeed Kazemi Signed-off-by: Arnout Vandecappelle --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 48c2fa8ffeb..d8d55e42ca1 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 995a77848e75737a267b64613acaa6096ba8943f048676d5722c3ff238fb29f9 eza-0.18.3.tar.gz +sha256 32621dea52695b75fe6f6d24ebd19812b0491a852cb2a970382838dd798cc46c eza-0.18.8.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index 7ec3f127b40..506e515566c 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.18.3 +EZA_VERSION = 0.18.8 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE From dd595d3b06a355f58efcc547ff1f001dd55c99c6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 22:37:22 +0100 Subject: [PATCH 0362/3013] package/tcf-agent: fix x86 build Fix the following x86 build failure raised since bump to version 1.8.0 in commit 81802e263a12e173e0e1028449d1e1e11b2e5974 and https://gitlab.eclipse.org/eclipse/tcf/tcf.agent/-/commit/8df5540c53b862d516ac25f908c2fff4a547b4a6: /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'unpack_elf_symbol_info': /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: error: 'STT_ARM_16BIT' undeclared (first use in this function) 2079 | if (info->type == STT_ARM_16BIT) { | ^~~~~~~~~~~~~ /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: note: each undeclared identifier is reported only once for each function it appears in /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'create_symbol_addr_search_index': /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2228:78: error: 'STT_ARM_16BIT' undeclared (first use in this function) 2228 | if (type == STT_FUNC || type == STT_ARM_TFUNC || type == STT_ARM_16BIT) { | ^~~~~~~~~~~~~ Fixes: 81802e263a12e173e0e1028449d1e1e11b2e5974 - http://autobuild.buildroot.org/results/8388acf59689ed7e621bdf158483e3df1cf9bef7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...tcf-services-tcf_elf.c-fix-x86-build.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch diff --git a/package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch b/package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch new file mode 100644 index 00000000000..5f08fa485e3 --- /dev/null +++ b/package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch @@ -0,0 +1,60 @@ +From 0a847ca035113540ee44d17f364bf4701fe78355 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 1 Mar 2024 22:31:05 +0100 +Subject: [PATCH] agent/tcf/services/tcf_elf.c: fix x86 build + +Fix the following x86 build failure raised since version 1.8.0 and +https://gitlab.eclipse.org/eclipse/tcf/tcf.agent/-/commit/8df5540c53b862d516ac25f908c2fff4a547b4a6: + +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'unpack_elf_symbol_info': +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: error: 'STT_ARM_16BIT' undeclared (first use in this function) + 2079 | if (info->type == STT_ARM_16BIT) { + | ^~~~~~~~~~~~~ +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: note: each undeclared identifier is reported only once for each function it appears in +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'create_symbol_addr_search_index': +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2228:78: error: 'STT_ARM_16BIT' undeclared (first use in this function) + 2228 | if (type == STT_FUNC || type == STT_ARM_TFUNC || type == STT_ARM_16BIT) { + | ^~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8388acf59689ed7e621bdf158483e3df1cf9bef7 + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.eclipse.org/eclipse/tcf/tcf.agent/-/merge_requests/1 +--- + agent/tcf/services/tcf_elf.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/agent/tcf/services/tcf_elf.c b/agent/tcf/services/tcf_elf.c +index 1b3900ec..b0b948e4 100644 +--- a/agent/tcf/services/tcf_elf.c ++++ b/agent/tcf/services/tcf_elf.c +@@ -2076,10 +2076,12 @@ void unpack_elf_symbol_info(ELF_Section * sym_sec, U4_T index, ELF_SymbolInfo * + } + + if (file->machine == EM_ARM) { ++#ifdef STT_ARM_16BIT + if (info->type == STT_ARM_16BIT) { + info->type = STT_OBJECT; + info->type16bit = 1; + } ++#endif + if (info->type == STT_ARM_TFUNC) { + info->type = STT_FUNC; + info->type16bit = 1; +@@ -2225,7 +2227,11 @@ static void create_symbol_addr_search_index(ELF_Section * sec) { + } + add = add && type != STT_GNU_IFUNC; + if (add && file->machine == EM_ARM) { +- if (type == STT_FUNC || type == STT_ARM_TFUNC || type == STT_ARM_16BIT) { ++ if (type == STT_FUNC || type == STT_ARM_TFUNC ++#ifdef STT_ARM_16BIT ++ || type == STT_ARM_16BIT ++#endif ++ ) { + addr = addr & ~(U8_T)1; + } + } +-- +2.43.0 + From 6e3d79f52ef0e1b2b6fe1e660820cabdca6179c2 Mon Sep 17 00:00:00 2001 From: Sen Hastings Date: Sun, 25 Feb 2024 14:05:44 -0800 Subject: [PATCH 0363/3013] support/scripts/pkg-stats: fix bug when sorting by hashfile Because the div_class variable was not reassigned a value, cells in the latest_version column were still being assigned hash_file classes and so were being picked up as elements in the hash_file sort. This lead to execessive grid gap elements stacking up and creating huge blank spaces at the top of the page. This is very noticable on pages with a large number of packages, like the ones the autobuilder creates. original behaviour(click the "Hash file" column label twice): http://autobuild.buildroot.org/stats/master.html demo of fixed behaviour: https://sen-h.codeberg.page/pkg-stats-demos/@pages/fix-bug-when-sorting-by-hash-file.html Signed-off-by: Sen Hastings Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 1 + 1 file changed, 1 insertion(+) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 53898a36f24..3295eb7a48e 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -977,6 +977,7 @@ def dump_html_pkg(f, pkg): # Latest version data_field_id = f'latest_version__{pkg_css_class}' + div_class = ["centered"] div_class.append(f'_{pkg_css_class}') div_class.append("latest_version data") if pkg.latest_version['status'] == RM_API_STATUS_ERROR: From ce7363524c172e65571e4b5d76ef65a36f7c3020 Mon Sep 17 00:00:00 2001 From: Sen Hastings Date: Tue, 5 Mar 2024 01:33:34 -0800 Subject: [PATCH 0364/3013] support/scripts/pkg-stats: fix/improve git hash sorting sortGrid()'s handling of git hashes and other large hex numbers has been inconsistent, they can be detected as strings or numbers depending on what type of character they start with. This patch fixes the behaviour by using a regex to capture everything that looks like a big hex number and treat it as a string. This means when you sort by current version ascending all the version strings with big hex numbers should show up first, sorted 0-9,a-f. First we check for a string length >= 39, and then apply a regex to return an array with every char from that string that matched the regex. If the length of this array is still >= 39 we can assume we are looking at something containing a git hash. The reason why the length is defined as ">= 39" and not "40" or "39 or 40" is twofold: Firstly, 39 was chosen as a minimum to match stuff with 39 char git hashes, like the rockchip-mali package. Secondly, there is no max because we actually want to catch not just explicitly git hashes, but any verson string with big gnarly hex numbers in it. Stuff like: "1.4.2-168-ged3039cdbeeb28fc0011c3585d8f7dfb91038292" Why? Well, the idea is less about git hashes and sorting and more about grouping similarly formatted version strings. It would be impossble (or at least annoyingly complicated) and of dubious utility to get a real sequential sort out of the current version column, so the attempt here is to at the very least collect all the similarly formatted things together. This isn't perfect, but it's a (arguably) more useful sorted output than before. A demo is available here: https://sen-h.codeberg.page/pkg-stats-demos/@pages/fix-improve-git-hash-sorting.html Signed-off-by: Sen Hastings Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 3295eb7a48e..4dc1857a9e6 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -741,6 +741,7 @@ addedCSSRules.forEach(rule => styleSheet.insertRule(rule)); function sortGrid(sortLabel){ let i = 0; let pkgSortArray = [], sortedPkgArray = [], pkgStringSortArray = [], pkgNumSortArray = []; + const git_hash_regex = /[a-f,0-9]/gi; const columnValues = Array.from(document.getElementsByClassName(sortLabel)); const columnName = document.getElementById(sortLabel); let lastStyle = document.getElementById("sort-css"); @@ -765,7 +766,9 @@ function sortGrid(sortLabel){ pkgSortArray.push(sortArr); }); pkgSortArray.forEach((listing) => { - if ( isNaN(parseInt(listing[1], 10)) ){ + if ( listing[1].length >= 39 && listing[1].match(git_hash_regex).length >= 39){ + pkgStringSortArray.push(listing); + } else if ( isNaN(parseInt(listing[1], 10)) ){ pkgStringSortArray.push(listing); } else { listing[1] = parseFloat(listing[1]); From 4922233cb0c8b0355acf8e96ac0eb59422405c17 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Apr 2024 17:49:58 +0200 Subject: [PATCH 0365/3013] Revert "package/apache: add libxcrypt optional dependency" This reverts commit 02905fe54cb2136c15cc71d2840d60537f1513a8. The build error http://autobuild.buildroot.org/results/f0f55d9d66b07cb3408086d2632f8cd1bebb670e/ resulted from the apr package and was fixed with commit https://git.buildroot.net/buildroot/commit/?id=2402e0f1d31327806422692db6523120227bc5b0 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/apache/Config.in | 1 - package/apache/apache.mk | 4 ---- 2 files changed, 5 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index bc3133ea002..270296bce4e 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_APACHE depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL select BR2_PACKAGE_PCRE2 - select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 619d13726e9..1b095c5eb10 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -52,10 +52,6 @@ else APACHE_CONF_OPTS += --disable-brotli endif -ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) -APACHE_DEPENDENCIES += libxcrypt -endif - ifeq ($(BR2_PACKAGE_LIBXML2),y) APACHE_DEPENDENCIES += libxml2 # Apache wants the path to the header file, where it can find From 46bb598f1a67ed2bf7acef8b17ea09ee0f425d8e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 12:11:34 +0100 Subject: [PATCH 0366/3013] package/dmenu-wayland: fix uclibc build Set -std=gnu99 to fix the following uclibc build failure raised since the addition of the package in commit 2f6b1b8e6893003efcc72185cd468dcb0b088b2d: ../draw.c:37:23: error: 'CLOCK_REALTIME' undeclared (first use in this function) 37 | clock_gettime(CLOCK_REALTIME, &ts); | ^~~~~~~~~~~~~~ Fixes: 2f6b1b8e6893003efcc72185cd468dcb0b088b2d - http://autobuild.buildroot.org/results/4b9db67fb444ec35d741e5d3e74263ac0c4d4a7d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/dmenu-wayland/dmenu-wayland.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dmenu-wayland/dmenu-wayland.mk b/package/dmenu-wayland/dmenu-wayland.mk index 33a73c01536..fec984194cd 100644 --- a/package/dmenu-wayland/dmenu-wayland.mk +++ b/package/dmenu-wayland/dmenu-wayland.mk @@ -8,6 +8,7 @@ DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9 DMENU_WAYLAND_SITE = $(call github,nyyManni,dmenu-wayland,$(DMENU_WAYLAND_VERSION)) DMENU_WAYLAND_LICENSE = MIT DMENU_WAYLAND_LICENSE_FILES = LICENSE +DMENU_WAYLAND_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 # host-wayland is for wayland-scanner DMENU_WAYLAND_DEPENDENCIES = \ From f23d183201f8dbd35acb62adf9a1c0a2addbb232 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 5 Mar 2024 21:37:39 +0100 Subject: [PATCH 0367/3013] package/rtl8723bu: bump to 2024-03-03 version This version allows to build with Linux 6.8 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 66efdaf771c..236b9a6726b 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a36511894a612a9a05254e5938dafcc32b5ca46b8912582ccca84708e0f82cf9 rtl8723bu-49cb04d796d44debe965c1597f397f34ae277dbc.tar.gz +sha256 357c78d6f86794d96530155f9ba102e56421efb6fa43eb33daa0fb57354e8215 rtl8723bu-af3a408d6399655b0db23c2c8720436ca725ca47.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 7796def113d..0ce8b1afade 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = 49cb04d796d44debe965c1597f397f34ae277dbc +RTL8723BU_VERSION = af3a408d6399655b0db23c2c8720436ca725ca47 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From de6415ad9c35b2013af1f1821bcac12ba3959674 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 10:19:30 +0100 Subject: [PATCH 0368/3013] package/dmraid: fix musl build dmraid is a very old package from 2010 with an awkward configure script which doesn't honor CFLAGS: ac_cv_env_CFLAGS_set=set ac_cv_env_CFLAGS_value='-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 ' [...] ## ----------------- ## ## Output variables. ## ## ----------------- ## AWK='gawk' CC='/home/autobuild/autobuild/instance-3/output-1/host/bin/sh4a-buildroot-linux-musl-gcc' CFLAGS='-O2' resulting in the following build failure with musl >= 1.2.4 and https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc because _LARGEFILE64_SOURCE is not set: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/sh4a-buildroot-linux-musl/12.3.0/../../../../sh4a-buildroot-linux-musl/bin/ld: misc/file.o: in function `rw_file': file.c:(.text+0x150): undefined reference to `lseek64' To fix this issue, pass TARGET_CONFIGURE_OPTS through DMRAID_MAKE_OPTS Fixes: - http://autobuild.buildroot.org/results/5c7c82959ce92db908d3ca20e2c1137509c2f981 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/dmraid/dmraid.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 0382cd4d990..9a78c2ae073 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -13,6 +13,7 @@ DMRAID_MAKE = $(MAKE1) DMRAID_INSTALL_STAGING = YES DMRAID_LICENSE = GPL-2.0 DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE +DMRAID_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DMRAID_DEPENDENCIES = lvm2 From 47a02a5afcdf5d6a72d203c31dabd5727547057c Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Wed, 6 Mar 2024 12:12:12 +0100 Subject: [PATCH 0369/3013] package/imx-gpu-viv: fix masking fb option Only the 32bit ARM blob provides the framebuffer backend. This is apparently independent of which imx8 derivate is used, so changed the condition for the config option accordingly. Signed-off-by: Andreas Naumann Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/imx-gpu-viv/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 3e095b730cf..b8dff8f9ab6 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -45,8 +45,8 @@ choice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" - # The i.MX8 blob doesn't support FB output - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + # The i.MX8 aarch64 blob doesn't support FB output + depends on BR2_arm config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL bool "Wayland" From 2656ca8912e151e874ceb366e6eef0bfe4228ac0 Mon Sep 17 00:00:00 2001 From: David Gouarin Date: Wed, 6 Mar 2024 12:37:24 +0100 Subject: [PATCH 0370/3013] package/fmc: enable also for aarch64 QorIQ processors QorIQ processors family also includes LS Series wich are based on aarch64 Signed-off-by: David Gouarin Signed-off-by: Arnout Vandecappelle --- package/fmc/Config.in | 6 +++--- package/fmlib/Config.in | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/fmc/Config.in b/package/fmc/Config.in index c89a87c99e6..1c6ae5e80a4 100644 --- a/package/fmc/Config.in +++ b/package/fmc/Config.in @@ -1,14 +1,14 @@ comment "fmc needs a toolchain w/ C++" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP comment "fmc needs a Linux kernel to be built" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_FMC bool "fmc" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_LINUX_KERNEL # fmlib select BR2_PACKAGE_TCLAP diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index 97d55d1250b..459d5bf1021 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -1,10 +1,10 @@ comment "fmlib needs a Linux kernel to be built" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_FMLIB bool "fmlib" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on BR2_LINUX_KERNEL help The Frame Manager library provides Freescale PowerPC platforms @@ -33,6 +33,10 @@ config BR2_FMLIB_QORIQ_FAMILY_T2080 bool "t208x" depends on BR2_powerpc_e6500 +config BR2_FMLIB_QORIQ_FAMILY_ARM + bool "arm" + depends on BR2_aarch64 + endchoice config BR2_PACKAGE_FMLIB_ARCHTYPE @@ -40,11 +44,13 @@ config BR2_PACKAGE_FMLIB_ARCHTYPE default "ppce500mc" if BR2_powerpc_e500mc default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64 default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc + default "arm" if BR2_aarch64 config BR2_PACKAGE_FMLIB_PLATFORM string default "P4080" if BR2_FMLIB_QORIQ_FAMILY_P4080 default "T4240" if BR2_FMLIB_QORIQ_FAMILY_T4240 default "FMAN_V3H" if BR2_FMLIB_QORIQ_FAMILY_T2080 + default "arm" if BR2_aarch64 endif From 624fb727f6c91e68c39a27e4f66e2bf8de298e89 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 14:06:52 +0200 Subject: [PATCH 0371/3013] package/libxcrypt: use official tarball Use official tarball and so drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libxcrypt/libxcrypt.hash | 4 +++- package/libxcrypt/libxcrypt.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index f021436b71a..9bcf1190772 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,6 @@ +# From https://github.com/besser82/libxcrypt/releases/download/v4.4.36/libxcrypt-4.4.36.tar.xz.sha256sum +sha256 e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943 libxcrypt-4.4.36.tar.xz + # Locally calculated -sha256 b979838d5f1f238869d467484793b72b8bca64c4eae696fdbba0a9e0b6c28453 libxcrypt-4.4.36.tar.gz sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 8cb6751442b..d39186eecb9 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -5,11 +5,11 @@ ################################################################################ LIBXCRYPT_VERSION = 4.4.36 -LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) +LIBXCRYPT_SITE = https://github.com/besser82/libxcrypt/releases/download/v$(LIBXCRYPT_VERSION) +LIBXCRYPT_SOURCE = libxcrypt-$(LIBXCRYPT_VERSION).tar.xz LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB LIBXCRYPT_INSTALL_STAGING = YES -LIBXCRYPT_AUTORECONF = YES # Some warnings turn into errors with some sensitive compilers LIBXCRYPT_CONF_OPTS = --disable-werror From 241b18b51e3219a06e19010ec874b3bb681ca110 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 14:45:50 +0200 Subject: [PATCH 0372/3013] package/perl-net-ssleay: bump to version 1.94 This bump will fix the following build failure with libressl raised since commit 9d8f9c73a2fd087dd2e8d8853a80da605fa64e4b: SSLeay.c: In function 'XS_Net__SSLeay_X509_policy_tree_free': SSLeay.c:17730:9: error: unknown type name 'X509_POLICY_TREE' 17730 | X509_POLICY_TREE * tree = INT2PTR(X509_POLICY_TREE *,SvIV(ST(0))) | ^~~~~~~~~~~~~~~~ https://metacpan.org/dist/Net-SSLeay/changes Fixes: 9d8f9c73a2fd087dd2e8d8853a80da605fa64e4b - http://autobuild.buildroot.org/results/974b7cdd275249c888fc6205f6ca31a3cf28b18f Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/perl-net-ssleay/perl-net-ssleay.hash | 4 ++-- package/perl-net-ssleay/perl-net-ssleay.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-ssleay/perl-net-ssleay.hash b/package/perl-net-ssleay/perl-net-ssleay.hash index 9caff68eddf..219edd4e0fb 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.hash +++ b/package/perl-net-ssleay/perl-net-ssleay.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c73821e9790b3bdb3471d9b8faf48bbb Net-SSLeay-1.93_01.tar.gz -sha256 876d022fbc719631b11d6bb4b6e78db3c19bbca578093c376c8f9900a4432aa3 Net-SSLeay-1.93_01.tar.gz +md5 1b22c764e5a094c6261e37a4b1f148ce Net-SSLeay-1.94.tar.gz +sha256 9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d Net-SSLeay-1.94.tar.gz # computed by scancpan sha256 685e534b60d4e2b4fbb1a259a83b5a86e877a919bbb9efc95994276f706a3a71 LICENSE diff --git a/package/perl-net-ssleay/perl-net-ssleay.mk b/package/perl-net-ssleay/perl-net-ssleay.mk index 8b7b2b973bf..7f58093082e 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.mk +++ b/package/perl-net-ssleay/perl-net-ssleay.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_SSLEAY_VERSION = 1.93_01 +PERL_NET_SSLEAY_VERSION = 1.94 PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CH/CHRISN PERL_NET_SSLEAY_DEPENDENCIES = openssl From bfa4dd299f1346d5e246a552c491b630c64a6a97 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:16:49 +0200 Subject: [PATCH 0373/3013] package/inih: bump to version 58 This bump will fix the following build failure with gcc 5 raised since bump to version 57 in commit 65c8a9b6626de83365865dea6fff1749466a36aa thanks to https://github.com/benhoyt/inih/commit/4e618f77d4bae216865c5abd972d99b1ba5031e2: In file included from /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/cstdint:35:0, from ../cpp/INIReader.h:17, from ../cpp/INIReader.cpp:16: /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. #error This file requires compiler and library support for the \ ^ https://github.com/benhoyt/inih/releases/tag/r58 Fixes: 65c8a9b6626de83365865dea6fff1749466a36aa - http://autobuild.buildroot.org/results/7a5ba516cde536e103669a0422d336dd8a3b1dbc Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/inih/inih.hash | 2 +- package/inih/inih.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/inih/inih.hash b/package/inih/inih.hash index 476b544ce66..f20d7ac0b68 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f03f98ca35c3adb56b2358573c8d3eda319ccd5287243d691e724b7eafa970b3 inih-57.tar.gz +sha256 e79216260d5dffe809bda840be48ab0eec7737b2bb9f02d2275c1b46344ea7b7 inih-58.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index 93032f1ed5a..80cde0942ba 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 57 +INIH_VERSION = 58 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause From ab6451ae660a5ec93afc212e224c92440c54dca7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 17:34:17 +0200 Subject: [PATCH 0374/3013] package/openblas: fix build Fix the following build failure raised since bump to version 0.3.27 in commit 59b48b5cff057f2429b1143d6f50c39d93ca8ef3: /bin/sh: ./xccblat3_3m: No such file or directory Fixes: 59b48b5cff057f2429b1143d6f50c39d93ca8ef3 - http://autobuild.buildroot.org/results/52acc2d95bbc07155b9d446ab8625f9c9eb81b52 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...-should-not-be-run-in-cross-compiles.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/openblas/0002-fix-position-of-endif-gemm3m-tests-should-not-be-run-in-cross-compiles.patch diff --git a/package/openblas/0002-fix-position-of-endif-gemm3m-tests-should-not-be-run-in-cross-compiles.patch b/package/openblas/0002-fix-position-of-endif-gemm3m-tests-should-not-be-run-in-cross-compiles.patch new file mode 100644 index 00000000000..44883b2c265 --- /dev/null +++ b/package/openblas/0002-fix-position-of-endif-gemm3m-tests-should-not-be-run-in-cross-compiles.patch @@ -0,0 +1,33 @@ +From 48e017de095018c60d83355804a3075658b4970c Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Fri, 5 Apr 2024 22:54:34 +0200 +Subject: [PATCH] fix position of endif - gemm3m tests should not be run in + cross-compiles + +Upstream: https://github.com/OpenMathLib/OpenBLAS/commit/48e017de095018c60d83355804a3075658b4970c +Signed-off-by: Fabrice Fontaine +--- + ctest/Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/ctest/Makefile b/ctest/Makefile +index bbaf96f8ed..6c7cc1ed56 100644 +--- a/ctest/Makefile ++++ b/ctest/Makefile +@@ -203,7 +203,6 @@ ifeq ($(BUILD_COMPLEX16),1) + OPENBLAS_NUM_THREADS=2 ./xzcblat3 < zin3 + endif + endif +-endif + + ifeq ($(SUPPORT_GEMM3M),1) + ifeq ($(USE_OPENMP), 1) +@@ -222,7 +221,7 @@ ifeq ($(BUILD_COMPLEX16),1) + endif + endif + endif +- ++endif + + + From b526b2aa1546c42384ba1af21afea1a0f08073d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 18:13:39 +0200 Subject: [PATCH 0375/3013] package/clamav: fix CLAMAV_LIBS The LIBS environment variable is ignored since bump to version 1.0.1 and switch to cmake build system in commit 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa resulting in the following build failure: /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: CMakeFiles/clamonacc.dir/inotif/hash.c.o: in function `onas_ht_add_hierarchy': hash.c:(.text+0xa84): undefined reference to `fts_open' Fixes: 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa - http://autobuild.buildroot.org/results/fe71ab29d02caeed609f1a181fccbd46b6feff65 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/clamav/clamav.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 7c6dfce6f22..c548897c372 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -45,9 +45,8 @@ CLAMAV_DEPENDENCIES += musl-fts CLAMAV_LIBS += -lfts endif -CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" - CLAMAV_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(CLAMAV_LIBS)" \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DENABLE_JSON_SHARED=ON \ -DENABLE_MAN_PAGES=OFF \ From c8df468c7b192dec02440436767eccd51f5a4c3f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 19:03:27 +0200 Subject: [PATCH 0376/3013] package/dahdi-linux: fix build with kernel >= 6.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure with kernel >= 6.8: /home/autobuild/autobuild/instance-8/output-1/build/dahdi-linux-3.3.0/drivers/dahdi/xpp/card_global.c: In function ‘parse_chip_command’: /home/autobuild/autobuild/instance-8/output-1/build/dahdi-linux-3.3.0/drivers/dahdi/xpp/card_global.c:345:9: error: implicit declaration of function ‘strlcpy’; did you mean ‘strscpy’? [-Werror=implicit-function-declaration] 345 | strlcpy(buf, cmdline, MAX_PROC_WRITE); /* Save a copy */ | ^~~~~~~ | strscpy Fixes: - http://autobuild.buildroot.org/results/a0d2dcd10af9bf465ded2da83eccf2d137187477 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...ilation-issue-for-6-8-y-6-9-y-kernel.patch | 230 ++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 package/dahdi-linux/0002-Fix-compilation-issue-for-6-8-y-6-9-y-kernel.patch diff --git a/package/dahdi-linux/0002-Fix-compilation-issue-for-6-8-y-6-9-y-kernel.patch b/package/dahdi-linux/0002-Fix-compilation-issue-for-6-8-y-6-9-y-kernel.patch new file mode 100644 index 00000000000..776d74218ee --- /dev/null +++ b/package/dahdi-linux/0002-Fix-compilation-issue-for-6-8-y-6-9-y-kernel.patch @@ -0,0 +1,230 @@ +From 497f11466688d9e76a7b68ffdd2c3859279f5fce Mon Sep 17 00:00:00 2001 +From: Pushkar Singh +Date: Thu, 4 Apr 2024 01:15:01 +0530 +Subject: [PATCH] Fix compilation issue for 6.8.y/6.9.y kernel + +Upstream: https://github.com/asterisk/dahdi-linux/commit/497f11466688d9e76a7b68ffdd2c3859279f5fce +Signed-off-by: Fabrice Fontaine +--- + drivers/dahdi/dahdi-base.c | 40 ++++++++++++++--------------- + drivers/dahdi/dahdi_dynamic.c | 4 +-- + drivers/dahdi/dahdi_dynamic_eth.c | 4 +-- + drivers/dahdi/dahdi_dynamic_ethmf.c | 2 +- + drivers/dahdi/dahdi_transcode.c | 2 +- + drivers/dahdi/xpp/card_global.c | 2 +- + 6 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c +index b96f72b1..87177a69 100644 +--- a/drivers/dahdi/dahdi-base.c ++++ b/drivers/dahdi/dahdi-base.c +@@ -4359,7 +4359,7 @@ static int dahdi_ioctl_getparams(struct file *file, unsigned long data) + param.pulsebreaktime = chan->pulsebreaktime; + param.pulseaftertime = chan->pulseaftertime; + param.spanno = (chan->span) ? chan->span->spanno : 0; +- strlcpy(param.name, chan->name, sizeof(param.name)); ++ strscpy(param.name, chan->name, sizeof(param.name)); + param.chanpos = chan->chanpos; + param.sigcap = chan->sigcap; + /* Return current law */ +@@ -4447,8 +4447,8 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data) + + spaninfo.spanno = s->spanno; /* put the span # in here */ + spaninfo.totalspans = span_count(); +- strlcpy(spaninfo.desc, s->desc, sizeof(spaninfo.desc)); +- strlcpy(spaninfo.name, s->name, sizeof(spaninfo.name)); ++ strscpy(spaninfo.desc, s->desc, sizeof(spaninfo.desc)); ++ strscpy(spaninfo.name, s->name, sizeof(spaninfo.name)); + spaninfo.alarms = s->alarms; /* get alarm status */ + spaninfo.rxlevel = s->rxlevel; /* get rx level */ + spaninfo.txlevel = s->txlevel; /* get tx level */ +@@ -4475,18 +4475,18 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data) + spaninfo.lineconfig = s->lineconfig; + spaninfo.irq = 0; + spaninfo.linecompat = s->linecompat; +- strlcpy(spaninfo.lboname, dahdi_lboname(s->lbo), ++ strscpy(spaninfo.lboname, dahdi_lboname(s->lbo), + sizeof(spaninfo.lboname)); + if (s->parent->manufacturer) { +- strlcpy(spaninfo.manufacturer, s->parent->manufacturer, ++ strscpy(spaninfo.manufacturer, s->parent->manufacturer, + sizeof(spaninfo.manufacturer)); + } + if (s->parent->devicetype) { +- strlcpy(spaninfo.devicetype, s->parent->devicetype, ++ strscpy(spaninfo.devicetype, s->parent->devicetype, + sizeof(spaninfo.devicetype)); + } + if (s->parent->location) { +- strlcpy(spaninfo.location, s->parent->location, ++ strscpy(spaninfo.location, s->parent->location, + sizeof(spaninfo.location)); + } + if (s->spantype) { +@@ -4505,11 +4505,11 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data) + const char *st = dahdi_spantype2str(s->spantype); + switch (s->spantype) { + case SPANTYPE_DIGITAL_BRI_NT: +- strlcpy(spaninfo.spantype, "NT", ++ strscpy(spaninfo.spantype, "NT", + sizeof(spaninfo.spantype)); + break; + case SPANTYPE_DIGITAL_BRI_TE: +- strlcpy(spaninfo.spantype, "TE", ++ strscpy(spaninfo.spantype, "TE", + sizeof(spaninfo.spantype)); + break; + default: +@@ -4519,7 +4519,7 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data) + * so no backward compatibility for this + * broken interface. + */ +- strlcpy(spaninfo.spantype, st, ++ strscpy(spaninfo.spantype, st, + sizeof(spaninfo.spantype)); + break; + } +@@ -4568,10 +4568,10 @@ static int dahdi_ioctl_spanstat_v1(struct file *file, unsigned long data) + spaninfo_v1.spanno = s->spanno; /* put the span # in here */ + spaninfo_v1.totalspans = 0; + spaninfo_v1.totalspans = span_count(); +- strlcpy(spaninfo_v1.desc, ++ strscpy(spaninfo_v1.desc, + s->desc, + sizeof(spaninfo_v1.desc)); +- strlcpy(spaninfo_v1.name, ++ strscpy(spaninfo_v1.name, + s->name, + sizeof(spaninfo_v1.name)); + spaninfo_v1.alarms = s->alarms; +@@ -4593,25 +4593,25 @@ static int dahdi_ioctl_spanstat_v1(struct file *file, unsigned long data) + spaninfo_v1.lineconfig = s->lineconfig; + spaninfo_v1.irq = 0; + spaninfo_v1.linecompat = s->linecompat; +- strlcpy(spaninfo_v1.lboname, ++ strscpy(spaninfo_v1.lboname, + dahdi_lboname(s->lbo), + sizeof(spaninfo_v1.lboname)); + + if (s->parent->manufacturer) { +- strlcpy(spaninfo_v1.manufacturer, s->parent->manufacturer, ++ strscpy(spaninfo_v1.manufacturer, s->parent->manufacturer, + sizeof(spaninfo_v1.manufacturer)); + } + + if (s->parent->devicetype) { +- strlcpy(spaninfo_v1.devicetype, s->parent->devicetype, ++ strscpy(spaninfo_v1.devicetype, s->parent->devicetype, + sizeof(spaninfo_v1.devicetype)); + } + +- strlcpy(spaninfo_v1.location, s->parent->location, ++ strscpy(spaninfo_v1.location, s->parent->location, + sizeof(spaninfo_v1.location)); + + if (s->spantype) { +- strlcpy(spaninfo_v1.spantype, ++ strscpy(spaninfo_v1.spantype, + dahdi_spantype2str(s->spantype), + sizeof(spaninfo_v1.spantype)); + } +@@ -5285,7 +5285,7 @@ static int dahdi_ioctl_attach_echocan(unsigned long data) + * always use it instead of any configured software + * echocan. This matches the behavior in dahdi 2.4.1.2 + * and earlier releases. */ +- strlcpy(ae.echocan, hwec_def_name, sizeof(ae.echocan)); ++ strscpy(ae.echocan, hwec_def_name, sizeof(ae.echocan)); + + } else if (strcasecmp(ae.echocan, hwec_def_name) != 0) { + chan_dbg(GENERAL, chan, +@@ -5384,7 +5384,7 @@ static int dahdi_ioctl_get_version(unsigned long data) + bool have_hwec = dahdi_any_hwec_available(); + + memset(&vi, 0, sizeof(vi)); +- strlcpy(vi.version, dahdi_version, sizeof(vi.version)); ++ strscpy(vi.version, dahdi_version, sizeof(vi.version)); + spin_lock(&ecfactory_list_lock); + list_for_each_entry(cur, &ecfactory_list, list) { + const char * const ec_name = cur->ec->get_name(NULL); +@@ -5640,7 +5640,7 @@ static int ioctl_dahdi_dial(struct dahdi_chan *chan, unsigned long data) + rv = -EBUSY; + break; + } +- strlcpy(chan->txdialbuf + strlen(chan->txdialbuf), tdo->dialstr, ++ strscpy(chan->txdialbuf + strlen(chan->txdialbuf), tdo->dialstr, + DAHDI_MAX_DTMF_BUF - strlen(chan->txdialbuf)); + if (!chan->dialing) { + chan->dialing = 1; +diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c +index b1df408d..be58aff8 100644 +--- a/drivers/dahdi/dahdi_dynamic.c ++++ b/drivers/dahdi/dahdi_dynamic.c +@@ -622,8 +622,8 @@ static int _create_dynamic(struct dahdi_dynamic_span *dds) + } + + /* Setup parameters properly assuming we're going to be okay. */ +- strlcpy(d->dname, dds->driver, sizeof(d->dname)); +- strlcpy(d->addr, dds->addr, sizeof(d->addr)); ++ strscpy(d->dname, dds->driver, sizeof(d->dname)); ++ strscpy(d->addr, dds->addr, sizeof(d->addr)); + d->timing = dds->timing; + snprintf(d->span.name, sizeof(d->span.name), "DYN/%s/%s", + dds->driver, dds->addr); +diff --git a/drivers/dahdi/dahdi_dynamic_eth.c b/drivers/dahdi/dahdi_dynamic_eth.c +index 0209489b..c7a293dd 100644 +--- a/drivers/dahdi/dahdi_dynamic_eth.c ++++ b/drivers/dahdi/dahdi_dynamic_eth.c +@@ -292,12 +292,12 @@ static int ztdeth_create(struct dahdi_dynamic *dyn, const char *addr) + memset(z, 0, sizeof(struct ztdeth)); + + /* Address should be /[/subaddr] */ +- strlcpy(tmp, addr, sizeof(tmp)); ++ strscpy(tmp, addr, sizeof(tmp)); + tmp2 = strchr(tmp, '/'); + if (tmp2) { + *tmp2 = '\0'; + tmp2++; +- strlcpy(z->ethdev, tmp, sizeof(z->ethdev)); ++ strscpy(z->ethdev, tmp, sizeof(z->ethdev)); + } else { + printk(KERN_NOTICE "Invalid TDMoE address (no device) '%s'\n", addr); + kfree(z); +diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c +index 73290d8d..f7c067fb 100644 +--- a/drivers/dahdi/dahdi_dynamic_ethmf.c ++++ b/drivers/dahdi/dahdi_dynamic_ethmf.c +@@ -573,7 +573,7 @@ static int ztdethmf_create(struct dahdi_dynamic *dyn, const char *addr) + z->rcvbuf = kmalloc(bufsize, GFP_KERNEL); + + /* Address should be //subaddr */ +- strlcpy(src, addr, sizeof(src)); ++ strscpy(src, addr, sizeof(src)); + /* replace all / with space; otherwise kernel sscanf does not work */ + src_ptr = src; + while (*src_ptr) { +diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c +index 6021aac2..7645e2f1 100644 +--- a/drivers/dahdi/dahdi_transcode.c ++++ b/drivers/dahdi/dahdi_transcode.c +@@ -329,7 +329,7 @@ static long dahdi_tc_getinfo(unsigned long data) + return -ENOSYS; + } + +- strlcpy(info.name, tc->name, sizeof(info.name)); ++ strscpy(info.name, tc->name, sizeof(info.name)); + info.numchannels = tc->numchannels; + info.srcfmts = tc->srcfmts; + info.dstfmts = tc->dstfmts; +diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c +index 9e679bbc..064edbb3 100644 +--- a/drivers/dahdi/xpp/card_global.c ++++ b/drivers/dahdi/xpp/card_global.c +@@ -342,7 +342,7 @@ int parse_chip_command(xpd_t *xpd, char *cmdline) + XBUS_DBG(GENERAL, xbus, "Dropped packet. Disconnected.\n"); + return -EBUSY; + } +- strlcpy(buf, cmdline, MAX_PROC_WRITE); /* Save a copy */ ++ strscpy(buf, cmdline, MAX_PROC_WRITE); /* Save a copy */ + if (buf[0] == '#' || buf[0] == ';') + XPD_DBG(REGS, xpd, "Note: '%s'\n", buf); + if ((p = strchr(buf, '#')) != NULL) /* Truncate comments */ From 3a2891621c35fea394b135256c7a0846ece442aa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 19:07:06 +0200 Subject: [PATCH 0377/3013] package/wolfssl: security bump to version 5.7.0 Vulnerabilities - [High] CVE-2024-0901 Potential denial of service and out of bounds read. Affects TLS 1.3 on the server side when accepting a connection from a malicious TLS 1.3 client. If using TLS 1.3 on the server side it is recommended to update the version of wolfSSL used. - [Med] CVE-2024-1545 Fault Injection vulnerability in RsaPrivateDecryption function that potentially allows an attacker that has access to the same system with a victims process to perform a Rowhammer fault injection. - [Med] Fault injection attack with EdDSA signature operations. This affects ed25519 sign operations where the system could be susceptible to Rowhammer attacks. No official tarball provided so switch to github and set autoreconf https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.0-stable Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 59e42e98b91..e705bba9fd7 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 75aaafe3b8c776d1ac417288116c8d444115f9fac5acb382a39a7d163dfd618d wolfssl-5.6.6.tar.gz +sha256 2de93e8af588ee856fe67a6d7fce23fc1b226b74d710b0e3946bc8061f6aa18f wolfssl-5.7.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 68c69afd59b..893408eca41 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,14 +4,16 @@ # ################################################################################ -WOLFSSL_VERSION = 5.6.6 -WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/releases/download/v$(WOLFSSL_VERSION)-stable +WOLFSSL_VERSION = 5.7.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ WOLFSSL_LICENSE_FILES = COPYING LICENSING WOLFSSL_CPE_ID_VENDOR = wolfssl WOLFSSL_CONFIG_SCRIPTS = wolfssl-config +# From git +WOLFSSL_AUTORECONF = YES WOLFSSL_DEPENDENCIES = host-pkgconf WOLFSSL_CONF_OPTS = --disable-examples --disable-crypttests From 2fcc74594c457bed7f0f2a4826ada265861be6bf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 19:09:36 +0200 Subject: [PATCH 0378/3013] package/botan: security bump to version 3.3.0 - Fix a potential denial of service caused by accepting arbitrary length primes as potential elliptic curve parameters in ASN.1 encodings. With very large inputs the primality verification can become computationally expensive. Now any prime field larger than 1024 bits is rejected immediately. https://botan.randombit.net/news.html#version-3-3-0-2024-02-20 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/botan/botan.hash | 2 +- package/botan/botan.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 840191aa4b5..37e00ea9cc5 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3 Botan-3.2.0.tar.xz +sha256 368f11f426f1205aedb9e9e32368a16535dc11bd60351066e6f6664ec36b85b9 Botan-3.3.0.tar.xz # Locally computed sha256 1833cde7c7cc03296b1ef2ddc178b1cd7fd1c476840f32cf6aedb09ab0bc9004 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 95352ea41b1..e0bd258f575 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 3.2.0 +BOTAN_VERSION = 3.3.0 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From 345c38ab11ac821bdaf4b250683fad366631c87b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 19:14:45 +0200 Subject: [PATCH 0379/3013] package/nasm: bump to version 2.16.02 https://nasm.us/doc/nasmdocc.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/nasm/nasm.hash | 2 +- package/nasm/nasm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index e9771c1d7f4..d6513ff9c65 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558 nasm-2.16.01.tar.xz +sha256 1e1b942ea88f22edae89659e15be26fa027eae0747f51413540f52d4eac4790d nasm-2.16.02.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index 043a84cf076..ec03b03977d 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.16.01 +NASM_VERSION = 2.16.02 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause From 066c3e67d7f117f7810597e1ab36e2346fe8f7c2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 20:41:52 +0200 Subject: [PATCH 0380/3013] package/systemd: fix build with gcc >= 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure with gcc >= 13: In file included from ../src/basic/macro.h:446, from ../src/basic/alloc-util.h:10, from ../src/shared/install.c:12: ../src/shared/install.c: In function ‘install_changes_dump’: ../src/shared/install.c:444:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 444 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e0d6b7d41fefec539a17a3ef5c89c192ce29fd04 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...rning-about-empty-directive-argument.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch diff --git a/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch b/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch new file mode 100644 index 00000000000..9408a6da0ed --- /dev/null +++ b/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch @@ -0,0 +1,45 @@ +From 8040fa55a1cbc34dede3205a902095ecd26c21e3 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Sat, 24 Feb 2024 12:05:44 +0000 +Subject: [PATCH] install: fix compiler warning about empty directive argument +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On ppc64el with gcc 13.2 on Ubuntu 24.04: + +3s In file included from ../src/basic/macro.h:386, +483s from ../src/basic/alloc-util.h:10, +483s from ../src/shared/install.c:12: +483s ../src/shared/install.c: In function ‘install_changes_dump’: +483s ../src/shared/install.c:432:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=] +483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", +483s | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +483s ../src/shared/install.c:432:75: note: format string is defined here +483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", + +Upstream: https://github.com/systemd/systemd/commit/8040fa55a1cbc34dede3205a902095ecd26c21e3 +Signed-off-by: Fabrice Fontaine +--- + src/shared/install.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/shared/install.c b/src/shared/install.c +index fabf5db7ed2e1..c3a94d1912165 100644 +--- a/src/shared/install.c ++++ b/src/shared/install.c +@@ -340,9 +340,12 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes, + assert(verb || r >= 0); + + for (size_t i = 0; i < n_changes; i++) { +- if (changes[i].type < 0) +- assert(verb); + assert(changes[i].path); ++ /* This tries to tell the compiler that it's safe to use 'verb' in a string format if there ++ * was an error, but the compiler doesn't care and fails anyway, so strna(verb) is used ++ * too. */ ++ assert(verb || changes[i].type >= 0); ++ verb = strna(verb); + + /* When making changes here, make sure to also change install_error() in dbus-manager.c. */ + From caf3f7fb5dc289c0c25254af78dc655687ad4bec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 20:49:07 +0200 Subject: [PATCH 0381/3013] package/oprofile: drop unrecognized option --enable-gui is unrecognized since bump to version 1.0.0 in commit 7f7dc71cc8545dacf23f9a25f33c184d15bed65c and https://github.com/wcohen/oprofile/commit/0c142c3a096d3e9ec42cc9b0ddad994fea60d135: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --disable-nls, --enable-gui Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/oprofile/oprofile.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 265d6ebd18d..512fbf9ea1e 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -11,7 +11,6 @@ OPROFILE_LICENSE_FILES = COPYING OPROFILE_CPE_ID_VENDOR = maynard_johnson OPROFILE_CONF_OPTS = \ --disable-account-check \ - --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr OPROFILE_DEPENDENCIES = popt binutils host-pkgconf From ae6579d345e0d9972447b919ffa9ef3c97f231e5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 21:14:48 +0200 Subject: [PATCH 0382/3013] package/links: bump to version 2.29 http://links.twibright.com/download/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/links/links.hash | 2 +- package/links/links.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/links/links.hash b/package/links/links.hash index 83b27aeb9dd..36a4b905922 100644 --- a/package/links/links.hash +++ b/package/links/links.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb links-2.26.tar.bz2 +sha256 22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998 links-2.29.tar.bz2 sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING diff --git a/package/links/links.mk b/package/links/links.mk index a861fd657a6..30a26b27409 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.26 +LINKS_VERSION = 2.29 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf From b097ed3a4b32c074130c4f4c6b97ce9983fa675a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 21:29:44 +0200 Subject: [PATCH 0383/3013] package/opensc: openssl is optional, not mandatory openssl is optional, not mandatory since the addition of the package in commit 8aaa7ecbce1d10cbcd880c3da5e429988f96176a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/opensc/Config.in | 1 - package/opensc/opensc.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/opensc/Config.in b/package/opensc/Config.in index 8c6a95a41d0..13b085f3894 100644 --- a/package/opensc/Config.in +++ b/package/opensc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPENSC depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite select BR2_PACKAGE_PCSC_LITE - select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index aa82bd18dad..f4dc2206ea6 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -9,8 +9,15 @@ OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSIO OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING OPENSC_CPE_ID_VALID = YES -OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_DEPENDENCIES = pcsc-lite OPENSC_INSTALL_STAGING = YES OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPENSC_DEPENDENCIES += openssl +OPENSC_CONF_OPTS += --enable-openssl +else +OPENSC_CONF_OPTS += --disable-openssl +endif + $(eval $(autotools-package)) From 2711a7c6d70c7e64e2eec20f87311126830b774a Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Apr 2024 12:34:54 +0200 Subject: [PATCH 0384/3013] boot/ti-k3-r5-loader: drop hash for version 2022.10 The patch removes the hash for version 2022.10 of ti-k3-r5-loader (i. e. U-Boot). Instead, it is added to a custom hash file in the global patch dir of the ti_am6{2,4]x_sk_defconfig configurations. Link: https://patchwork.ozlabs.org/project/buildroot/patch/20240304153253.732708-6-dario.binacchi@amarulasolutions.com Suggested-by: Yann E. Morin Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 ++ board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 ++ boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 - configs/ti_am62x_sk_defconfig | 1 + configs/ti_am64x_sk_defconfig | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash create mode 100644 board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 00000000000..2a5c99c459f --- /dev/null +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 00000000000..2a5c99c459f --- /dev/null +++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index 279cb7763af..fbe5d215409 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,4 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25..37df7a93f77 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,5 +1,6 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7d..1ebdec68ac0 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,5 +1,6 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y From ae1d482a3d1ebbae3f58fb6cf847d78a554d48a2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 7 Apr 2024 12:34:55 +0200 Subject: [PATCH 0385/3013] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash We are going to enable BR2_DOWNLOAD_FORCE_CHECK_HASHES by default to enforce downloads to have at least one valid hash including those that use a custom version. Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 100644 board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..74fe35c9bc7 --- /dev/null +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..74fe35c9bc7 --- /dev/null +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz From 182756a0328d677a215551bfb2b5b22849c2d85e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 7 Apr 2024 12:34:56 +0200 Subject: [PATCH 0386/3013] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option has been introduced initially to support certain TI K3 devices such as AM62x and AM62Ax that require a Device Manager (DM) firmware. This option needs to be renamed to use a more generic name in order to cover further TI K3 SoCs support along with the new u-boot binman tool that will be added in followup patch. With binman enabled in u-boot on TI K3 SoC, ti-k3-boot-firmware is needed at buildtime to provide ti-sysfw (System Firmware) for all TI K3 SoC along with Device Manager (DM) firmware for AM62x and AM62Ax devices. With binman support enabled, we don't need to provide the path of the Device Manager firmware anymore (see [2]). We can remove DM=".xer5f" from UBOOT_MAKE_OPTS. It also means that we can also remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME used to define DM path. DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f For now, keep BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME and DM only when ti-k3-image-gen is used. We need to update ti_am62x_sk_defconfig to use binman before removing them along with ti-k3-image-gen. [1] 52ce606c05ee3ac869f8087292bc3dbb0d25b79b [2] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 8 ++++++++ boot/uboot/Config.in | 23 ++++++++++++++--------- boot/uboot/uboot.mk | 4 +++- configs/ti_am62x_sk_defconfig | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d00196e08b0..4084ffa5164 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM + bool "u-boot TI K3 DM option has been renamed." + select BR2_LEGACY + select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE + help + The TI K3 Device Manager is already included in + ti-k3-boot-firmware. + config BR2_PACKAGE_FLUTTER_GALLERY bool "flutter-gallery removed" select BR2_LEGACY diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 39b3f2c81b1..e310c092171 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -240,18 +240,23 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE U-Boot, and that the TEE variable pointing to OPTEE's tee.elf, is passed during the Buildroot build. -config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - bool "U-Boot needs TI K3 Device Manager (DM)" - # We use the SoC selection defined for the ti-k3-image-gen - # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X +config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE + bool "U-Boot needs ti-k3-boot-firmware" + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE help - Some TI K3 devices need the Device Manager (DM) firmware to - be available for the U-Boot build. + TI K3 devices needs at least ti-sysfw (System Firmware) when + built with u-boot's binman tool. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM + Some TI K3 devices using a split firmware boot flow (AM62, + j721e) also need the Device Manager (DM) firmware to be + available for the U-Boot build. +if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE + +# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for +# TI K3 devices using the Device Manager (DM) firmware. +# We use the SoC selection defined for the ti-k3-image-gen +# package. config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME string default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 491f654cec7..47fb419e92b 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -194,11 +194,13 @@ UBOOT_DEPENDENCIES += optee-os UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y) UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware +ifneq ($(UBOOT_TI_K3_DM_SOCNAME),) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 37df7a93f77..b2814526bba 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -37,7 +37,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From 8a4c3c91e7af89397438bcf329954b1503b03a5e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Apr 2024 12:34:57 +0200 Subject: [PATCH 0387/3013] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. When BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is set, BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. Make sure that ti-k3-boot-firmware package has been installed before building ti-k3-r5-loader in order to provide such firmwares. The BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option is currently needed since we are in the middle of the process to switch TI AM62 and AM64 board defconfig to binman. Keep BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN disabled for them until the u-boot/ti-k3-r5-loader version bump to 2024.01. The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. Maybe in the future it will be necessary to add host-lzma and host-lz4 in the dependencies list. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- boot/ti-k3-r5-loader/Config.in | 9 +++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c99..5f4f33b2208 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -93,4 +93,13 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN + bool "ti-k3-r5-loader use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_TI_K3_BOOT_FIRMWARE + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2..cf18b43871d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -60,6 +60,21 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml \ + ti-k3-boot-firmware +# Make sure that all binman requirements are build before ti-k3-r5-loader. +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python3 \ + host-python-pyelftools \ + host-python-pylibfdt \ + host-python-setuptools +TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef From 1aec48341274edfc1bf1ccc3a208f4be07458c6a Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Apr 2024 12:34:58 +0200 Subject: [PATCH 0388/3013] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Co-developed-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e310c092171..39e49d681b0 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -295,6 +295,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 47fb419e92b..398485195e6 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -279,6 +279,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE From 3c9d06759051b3c23e3794f443af96d824aae239 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 3 Apr 2024 19:03:51 +0200 Subject: [PATCH 0389/3013] toolchain/helpers.mk: use int as main() return type in checks Although -Wmain-return-type is not considered as error (unlike -Wimplicit-int), but just a warning, let's fix it for the future. :1:1: warning: return type of 'main' is not 'int' [-Wmain-return-type] Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index e5c838c0afc..839ee278d03 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -483,7 +483,7 @@ check_unusable_toolchain = \ # check_toolchain_ssp = \ __CROSS_CC=$(strip $1) ; \ - __HAS_SSP=`echo 'void main(){}' | $${__CROSS_CC} -Werror -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \ + __HAS_SSP=`echo 'int main(){}' | $${__CROSS_CC} -Werror -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \ if [ "$(BR2_TOOLCHAIN_HAS_SSP)" != "y" -a "$${__HAS_SSP}" = "y" ] ; then \ echo "SSP support available in this toolchain, please enable BR2_TOOLCHAIN_EXTERNAL_HAS_SSP" ; \ exit 1 ; \ @@ -494,7 +494,7 @@ check_toolchain_ssp = \ fi ; \ __SSP_OPTION=$(2); \ if [ -n "$${__SSP_OPTION}" ] ; then \ - if ! echo 'void main(){}' | $${__CROSS_CC} -Werror $${__SSP_OPTION} -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 ; then \ + if ! echo 'int main(){}' | $${__CROSS_CC} -Werror $${__SSP_OPTION} -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 ; then \ echo "SSP option $${__SSP_OPTION} not available in this toolchain, please select another SSP level" ; \ exit 1 ; \ fi; \ From 39038a1c14250f3ca8deae9b16911c23b2d3f69f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 11:40:11 +0200 Subject: [PATCH 0390/3013] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index bf44207393c..04e191b449f 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.23" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 5e26eaf857a..05666fa9856 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.23" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From ea2f45148e1f83f6edfa512f5922e2f3ac38666c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:05 +0200 Subject: [PATCH 0391/3013] package/pango: bump to version 1.52.2 remove merged patch Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .../pango/0001-Drop-Werror-array-bounds.patch | 40 ------------------- package/pango/pango.hash | 4 +- package/pango/pango.mk | 4 +- 3 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 package/pango/0001-Drop-Werror-array-bounds.patch diff --git a/package/pango/0001-Drop-Werror-array-bounds.patch b/package/pango/0001-Drop-Werror-array-bounds.patch deleted file mode 100644 index 45821e85335..00000000000 --- a/package/pango/0001-Drop-Werror-array-bounds.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e93dbd66973040f1e0afcba0dc7c712c27d75d59 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Mon, 1 May 2023 23:27:52 -0400 -Subject: [PATCH] Drop -Werror=array-bounds - -gcc has strange issues with this and produces false -positives that recently started breaking the build of -pango as a subproject in gtk. - -See e.g. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 - -Upstream: https://gitlab.gnome.org/GNOME/pango/-/commit/e93dbd66973040f1e0afcba0dc7c712c27d75d59 -Signed-off-by: Fabrice Fontaine ---- - meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 930f41082..2d30c0141 100644 ---- a/meson.build -+++ b/meson.build -@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' - '-Wuninitialized', - '-Wunused', - '-Werror=address', -- '-Werror=array-bounds', - '-Werror=empty-body', - '-Werror=implicit', - '-Werror=implicit-fallthrough', -@@ -132,7 +131,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' - '-Werror=sequence-point', - '-Werror=return-type', - '-Werror=trigraphs', -- '-Werror=array-bounds', - '-Werror=write-strings', - '-Werror=address', - '-Werror=int-to-pointer-cast', --- -GitLab - diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 3e609e6e048..69b6b0adf68 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pango/1.50/pango-1.50.14.sha256sum -sha256 1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8 pango-1.50.14.tar.xz +# From https://download.gnome.org/sources/pango/1.52/pango-1.52.2.sha256sum +sha256 d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b pango-1.52.2.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 723e6d22889..ec0f5127e74 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -4,8 +4,8 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).14 +PANGO_VERSION_MAJOR = 1.52 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).2 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From 1a40adf355c1d03d643d7781d68009e7f67a60a2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:43:16 +0200 Subject: [PATCH 0392/3013] package/libtommath: bump to version 1.3.0 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libtommath/Config.in | 2 +- package/libtommath/libtommath.hash | 2 +- package/libtommath/libtommath.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtommath/Config.in b/package/libtommath/Config.in index b2ffc722ac5..7447fb9eb21 100644 --- a/package/libtommath/Config.in +++ b/package/libtommath/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBTOMMATH LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C. - http://www.libtom.net + https://www.libtom.net diff --git a/package/libtommath/libtommath.hash b/package/libtommath/libtommath.hash index 4f5dd40231a..4ce6057e0b7 100644 --- a/package/libtommath/libtommath.hash +++ b/package/libtommath/libtommath.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f ltm-1.2.1.tar.xz +sha256 296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08 ltm-1.3.0.tar.xz # Hashes for license files: sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a LICENSE diff --git a/package/libtommath/libtommath.mk b/package/libtommath/libtommath.mk index 7b5305faf62..66b258641c6 100644 --- a/package/libtommath/libtommath.mk +++ b/package/libtommath/libtommath.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTOMMATH_VERSION = 1.2.1 +LIBTOMMATH_VERSION = 1.3.0 LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION) LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz LIBTOMMATH_LICENSE = Unlicense From 8c456a564643c49915a8c9ab5a9f0583d3a64ad9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 11:21:04 +0200 Subject: [PATCH 0393/3013] package/libnpth: fix musl build Fix the following musl build failure raised since bump to version 1.7 in commit 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91 and https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=575573b5b63e147b1906240f192dbe37a26ca4b9: npth.c:392:21: error: unknown type name 'npth_rwlock_t'; did you mean 'npth_cond_t'? 392 | npth_rwlock_rdlock (npth_rwlock_t *rwlock) | ^~~~~~~~~~~~~ | npth_cond_t Fixes: 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91 - http://autobuild.buildroot.org/results/d986ba27b734679fd70b4e0f23278ebd38e13c5d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...EXPOSE_RWLOCK_API-for-musl-C-library.patch | 37 +++++++++++++++++++ package/libnpth/libnpth.mk | 2 + 2 files changed, 39 insertions(+) create mode 100644 package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch diff --git a/package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch b/package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch new file mode 100644 index 00000000000..bc5ed70a9c3 --- /dev/null +++ b/package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch @@ -0,0 +1,37 @@ +From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Fri, 1 Mar 2024 13:53:52 +0900 +Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library. + +* configure.ac: Add a case for musl system. + +-- + +GnuPG-bug-id: 5664 +Signed-off-by: NIIBE Yutaka + +Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134 +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c1091b1..576a26e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -381,7 +381,10 @@ fi + AC_SUBST(INSERT_NO_RWLOCK) + + case "${host}" in +- *-*-linux*|*-*-gnu*) ++ *-*-linux-musl*) ++ INSERT_EXPOSE_RWLOCK_API="1" ++ ;; ++ *-*-linux-gnu*|*-*-gnu*) + INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)" + ;; + *) +-- +2.30.2 + diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index dc603b607fc..46c81540211 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -10,5 +10,7 @@ LIBNPTH_SITE = https://www.gnupg.org/ftp/gcrypt/npth LIBNPTH_LICENSE = LGPL-2.0+ LIBNPTH_LICENSE_FILES = COPYING.LIB LIBNPTH_INSTALL_STAGING = YES +# 0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch +LIBNPTH_AUTORECONF = YES $(eval $(autotools-package)) From e9e3579555d3cccac1b5ecda0c9de375b8056d11 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 11:21:05 +0200 Subject: [PATCH 0394/3013] package/libnpth: disable tests tests are enabled by default since the addition of the package in commit 5d74d39cb421611e7be8ee73a308d608c47cfa28 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnpth/libnpth.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index 46c81540211..3fa5e1f9055 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -12,5 +12,6 @@ LIBNPTH_LICENSE_FILES = COPYING.LIB LIBNPTH_INSTALL_STAGING = YES # 0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch LIBNPTH_AUTORECONF = YES +LIBNPTH_CONF_OPTS = --disable-tests $(eval $(autotools-package)) From 0f2d16b277e038c63e6cbbf65296c94dd88db4d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 12:34:35 +0200 Subject: [PATCH 0395/3013] package/python-urwid: bump to version 2.6.10 https://urwid.org/changelog.html#release-2-6-10 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-urwid/python-urwid.hash | 4 ++-- package/python-urwid/python-urwid.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-urwid/python-urwid.hash b/package/python-urwid/python-urwid.hash index 3d7be017a77..aad6f6f672e 100644 --- a/package/python-urwid/python-urwid.hash +++ b/package/python-urwid/python-urwid.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urwid/json -md5 f7f4e6bed9ba38965dbd619520f39287 urwid-2.1.2.tar.gz -sha256 588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae urwid-2.1.2.tar.gz +md5 324cf0f877a5bc7b7d2de7d7f36b13ee urwid-2.6.10.tar.gz +sha256 ae33355c414c13214e541d3634f3c8a0bfb373914e62ffbcf2fa863527706321 urwid-2.6.10.tar.gz # Locally computed sha256 checksums sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/python-urwid/python-urwid.mk b/package/python-urwid/python-urwid.mk index 78b369ef863..d7943a8b5ca 100644 --- a/package/python-urwid/python-urwid.mk +++ b/package/python-urwid/python-urwid.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_URWID_VERSION = 2.1.2 +PYTHON_URWID_VERSION = 2.6.10 PYTHON_URWID_SOURCE = urwid-$(PYTHON_URWID_VERSION).tar.gz -PYTHON_URWID_SITE = https://files.pythonhosted.org/packages/94/3f/e3010f4a11c08a5690540f7ebd0b0d251cc8a456895b7e49be201f73540c +PYTHON_URWID_SITE = https://files.pythonhosted.org/packages/8e/74/8c2082f2b07a72ff5d2438447c13a70f0cbede73584e0a262c166a30785c PYTHON_URWID_LICENSE = LGPL-2.1+ PYTHON_URWID_LICENSE_FILES = COPYING PYTHON_URWID_SETUP_TYPE = setuptools +PYTHON_URWID_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From fcfad666dafe66ab4f4f8b63f7ecc0c522894372 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 12:34:36 +0200 Subject: [PATCH 0396/3013] package/python-pudb: bump to version 2024.1 This bump will fix the following build failure raised since commit 8937db8dd595e0988751e5dbb568e870b07b39cc thanks to https://github.com/inducer/pudb/commit/8c8f9d4a25e226e77a18d4d938eecf2f969e9b32: FileExistsError: File already exists: /home/buildroot/instance-0/output-1/target/usr/lib/python3.11/site-packages/test/__init__.py https://github.com/inducer/pudb/compare/v2023.1...v2024.1 Fixes: 8937db8dd595e0988751e5dbb568e870b07b39cc - http://autobuild.buildroot.org/results/0e3b15b9d02dda231f768595cdcff4e75ad71afd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-pudb/python-pudb.hash | 4 ++-- package/python-pudb/python-pudb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pudb/python-pudb.hash b/package/python-pudb/python-pudb.hash index 08afc67b764..a6d6b9dbae1 100644 --- a/package/python-pudb/python-pudb.hash +++ b/package/python-pudb/python-pudb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pudb/json -md5 81178e875fd7e15237267c3055e447a3 pudb-2023.1.tar.gz -sha256 15df3c603aba87a918a666ef8e1bf63f764238cc3589db3c5b7a5f1b01ea2f03 pudb-2023.1.tar.gz +md5 65639ff646f9e1f452446f4364b2e47f pudb-2024.1.tar.gz +sha256 fc9d6a976a59b590764c8379ec200fecd47faa84259b64efd8cd86066a0af338 pudb-2024.1.tar.gz # Locally computed sha256 checksums sha256 a95343fffff49cde3d9bf33cf6bb71cb3bf0ed83f47d98a7ba04b175d29c79ab LICENSE diff --git a/package/python-pudb/python-pudb.mk b/package/python-pudb/python-pudb.mk index ff13efb7737..68fe3850aca 100644 --- a/package/python-pudb/python-pudb.mk +++ b/package/python-pudb/python-pudb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2023.1 +PYTHON_PUDB_VERSION = 2024.1 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/96/d3/a471fe68788178f2a5024031a153673df72b9287530f32b0cd469d64a68a +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/b3/a1/db467e7c828e2ced173d9dbb47abc17ca0e0b3225cb1f4066293e63a2ed9 PYTHON_PUDB_SETUP_TYPE = setuptools PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE From c8800c34feef5f6df2220a6e704517d6fe4baa91 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 4 Apr 2024 20:37:07 +0200 Subject: [PATCH 0397/3013] package/xmrig: bump version to 6.21.2 Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 9d84ab7957b..116855fdbaa 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c45baea5a210143b647349b5234a2192164d3473a39d2b1cab7fb35b1a2a8ba9 xmrig-6.21.1.tar.gz +sha256 68b4be51e99687bad15d5bf4ac9eed79a080ba89141f7363457a957ce9304e4d xmrig-6.21.2.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 37a613820d7..45538fa77e1 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.1 +XMRIG_VERSION = 6.21.2 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 4edd837ac0193db83202030ee2997ac811e6bc45 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 21:53:46 +0200 Subject: [PATCH 0398/3013] package/nut: bump to version 2.8.2 Drop patches (already in version) and so also drop autoreconf https://github.com/networkupstools/nut/releases/tag/v2.8.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...iler_family.m4-fix-cross-compilation.patch | 55 --------- ...hon.m4-allow-overriding-of-PYTHON-2-.patch | 106 ------------------ package/nut/nut.hash | 4 +- package/nut/nut.mk | 5 +- 4 files changed, 4 insertions(+), 166 deletions(-) delete mode 100644 package/nut/0001-m4-nut_compiler_family.m4-fix-cross-compilation.patch delete mode 100644 package/nut/0002-m4-nut_check_python.m4-allow-overriding-of-PYTHON-2-.patch diff --git a/package/nut/0001-m4-nut_compiler_family.m4-fix-cross-compilation.patch b/package/nut/0001-m4-nut_compiler_family.m4-fix-cross-compilation.patch deleted file mode 100644 index 6356990749c..00000000000 --- a/package/nut/0001-m4-nut_compiler_family.m4-fix-cross-compilation.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a743617099ea50fcce333a8a074751434d25b7ac Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 3 Nov 2023 18:29:29 +0100 -Subject: [PATCH] m4/nut_compiler_family.m4: fix cross-compilation - -Do not use isystem with host paths when cross-compiling - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/networkupstools/nut/pull/2146 ---- - m4/nut_compiler_family.m4 | 28 +++++++++++++++------------- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/m4/nut_compiler_family.m4 b/m4/nut_compiler_family.m4 -index f47b1ae9..99608bab 100644 ---- a/m4/nut_compiler_family.m4 -+++ b/m4/nut_compiler_family.m4 -@@ -178,19 +178,21 @@ dnl # confuse the compiler assumptions - along with its provided headers)... - dnl # ideally; in practice however cppunit, net-snmp and some system include - dnl # files do cause grief to picky compiler settings (more so from third - dnl # party packages shipped via /usr/local/... namespace): -- AS_IF([test "x$CLANGCC" = xyes -o "x$GCC" = xyes], [ --dnl # CFLAGS="-isystem /usr/include $CFLAGS" -- AS_IF([test -d /usr/local/include], -- [CFLAGS="-isystem /usr/local/include $CFLAGS"]) -- AS_IF([test -d /usr/pkg/include], -- [CFLAGS="-isystem /usr/pkg/include $CFLAGS"]) -- ]) -- AS_IF([test "x$CLANGXX" = xyes -o "x$GXX" = xyes], [ --dnl # CXXFLAGS="-isystem /usr/include $CXXFLAGS" -- AS_IF([test -d /usr/local/include], -- [CXXFLAGS="-isystem /usr/local/include $CXXFLAGS"]) -- AS_IF([test -d /usr/pkg/include], -- [CXXFLAGS="-isystem /usr/pkg/include $CXXFLAGS"]) -+ AS_IF([test "x$cross_compiling" != xyes], [ -+ AS_IF([test "x$CLANGCC" = xyes -o "x$GCC" = xyes], [ -+dnl # CFLAGS="-isystem /usr/include $CFLAGS" -+ AS_IF([test -d /usr/local/include], -+ [CFLAGS="-isystem /usr/local/include $CFLAGS"]) -+ AS_IF([test -d /usr/pkg/include], -+ [CFLAGS="-isystem /usr/pkg/include $CFLAGS"]) -+ ]) -+ AS_IF([test "x$CLANGXX" = xyes -o "x$GXX" = xyes], [ -+dnl # CXXFLAGS="-isystem /usr/include $CXXFLAGS" -+ AS_IF([test -d /usr/local/include], -+ [CXXFLAGS="-isystem /usr/local/include $CXXFLAGS"]) -+ AS_IF([test -d /usr/pkg/include], -+ [CXXFLAGS="-isystem /usr/pkg/include $CXXFLAGS"]) -+ ]) - ]) - - dnl # Default to avoid noisy warnings on older compilers --- -2.42.0 - diff --git a/package/nut/0002-m4-nut_check_python.m4-allow-overriding-of-PYTHON-2-.patch b/package/nut/0002-m4-nut_check_python.m4-allow-overriding-of-PYTHON-2-.patch deleted file mode 100644 index d2571cf438f..00000000000 --- a/package/nut/0002-m4-nut_check_python.m4-allow-overriding-of-PYTHON-2-.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 511ee899ee687216fa8fcf2231a60941b9e4cf81 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 3 Nov 2023 14:34:54 +0100 -Subject: [PATCH] m4/nut_check_python.m4: allow overriding of - PYTHON{2,3}_SITE_PACKAGES - -Allow the end-user to override PYTHON{2,3}_SITE_PACKAGES as this can be -useful when cross-compiling - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/networkupstools/nut/pull/2147 ---- - m4/nut_check_python.m4 | 60 +++++++++++++++++++++--------------------- - 1 file changed, 30 insertions(+), 30 deletions(-) - -diff --git a/m4/nut_check_python.m4 b/m4/nut_check_python.m4 -index 995a3e7c..7f29558e 100644 ---- a/m4/nut_check_python.m4 -+++ b/m4/nut_check_python.m4 -@@ -116,17 +116,17 @@ AC_DEFUN([NUT_CHECK_PYTHON], - AM_CONDITIONAL([HAVE_PYTHON], [test -n "${PYTHON}" && test "${PYTHON}" != "no"]) - AS_IF([test -n "${PYTHON}" && test "${PYTHON}" != "no"], [ - export PYTHON -- AC_MSG_CHECKING([python site-packages location]) -- PYTHON_SITE_PACKAGES="`${PYTHON} -c 'import site; print(site.getsitepackages().pop(0))'`" -- AS_CASE(["$PYTHON_SITE_PACKAGES"], -- [*:*], [ -- dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584] -- PYTHON_SITE_PACKAGES="`cd "$PYTHON_SITE_PACKAGES" && pwd`" -- ] -- ) -- AC_MSG_RESULT([${PYTHON_SITE_PACKAGES}]) -+ AC_CACHE_CHECK([python site-packages location], [nut_cv_PYTHON_SITE_PACKAGES], [ -+ nut_cv_PYTHON_SITE_PACKAGES="`${PYTHON} -c 'import site; print(site.getsitepackages().pop(0))'`" -+ AS_CASE(["$nut_cv_PYTHON_SITE_PACKAGES"], -+ [*:*], [ -+ dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584] -+ nut_cv_PYTHON_SITE_PACKAGES="`cd "$nut_cv_PYTHON_SITE_PACKAGES" && pwd`" -+ ] -+ ) -+ ]) - ]) -- AC_SUBST([PYTHON_SITE_PACKAGES], [${PYTHON_SITE_PACKAGES}]) -+ AC_SUBST([PYTHON_SITE_PACKAGES], [${nut_cv_PYTHON_SITE_PACKAGES}]) - AM_CONDITIONAL([HAVE_PYTHON_SITE_PACKAGES], [test x"${PYTHON_SITE_PACKAGES}" != "x"]) - ]) - ]) -@@ -228,17 +228,17 @@ AC_DEFUN([NUT_CHECK_PYTHON2], - AM_CONDITIONAL([HAVE_PYTHON2], [test -n "${PYTHON2}" && test "${PYTHON2}" != "no"]) - AS_IF([test -n "${PYTHON2}" && test "${PYTHON2}" != "no"], [ - export PYTHON2 -- AC_MSG_CHECKING([python2 site-packages location]) -- PYTHON2_SITE_PACKAGES="`${PYTHON2} -c 'import site; print(site.getsitepackages().pop(0))'`" -- AS_CASE(["$PYTHON2_SITE_PACKAGES"], -- [*:*], [ -- dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584] -- PYTHON2_SITE_PACKAGES="`cd "$PYTHON2_SITE_PACKAGES" && pwd`" -- ] -- ) -- AC_MSG_RESULT([${PYTHON2_SITE_PACKAGES}]) -+ AC_CACHE_CHECK([python2 site-packages location], [nut_cv_PYTHON2_SITE_PACKAGES], [ -+ nut_cv_PYTHON2_SITE_PACKAGES="`${PYTHON2} -c 'import site; print(site.getsitepackages().pop(0))'`" -+ AS_CASE(["$nut_cv_PYTHON2_SITE_PACKAGES"], -+ [*:*], [ -+ dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584] -+ nut_cv_PYTHON2_SITE_PACKAGES="`cd "$nut_cv_PYTHON2_SITE_PACKAGES" && pwd`" -+ ] -+ ) -+ ]) - ]) -- AC_SUBST([PYTHON2_SITE_PACKAGES], [${PYTHON2_SITE_PACKAGES}]) -+ AC_SUBST([PYTHON2_SITE_PACKAGES], [${nut_cv_PYTHON2_SITE_PACKAGES}]) - AM_CONDITIONAL([HAVE_PYTHON2_SITE_PACKAGES], [test x"${PYTHON2_SITE_PACKAGES}" != "x"]) - ]) - ]) -@@ -340,17 +340,17 @@ AC_DEFUN([NUT_CHECK_PYTHON3], - AM_CONDITIONAL([HAVE_PYTHON3], [test -n "${PYTHON3}" && test "${PYTHON3}" != "no"]) - AS_IF([test -n "${PYTHON3}" && test "${PYTHON3}" != "no"], [ - export PYTHON3 -- AC_MSG_CHECKING([python3 site-packages location]) -- PYTHON3_SITE_PACKAGES="`${PYTHON3} -c 'import site; print(site.getsitepackages().pop(0))'`" -- AS_CASE(["$PYTHON3_SITE_PACKAGES"], -- [*:*], [ -- dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584] -- PYTHON3_SITE_PACKAGES="`cd "$PYTHON3_SITE_PACKAGES" && pwd`" -- ] -- ) -- AC_MSG_RESULT([${PYTHON3_SITE_PACKAGES}]) -+ AC_CACHE_CHECK([python3 site-packages location], [nut_cv_PYTHON3_SITE_PACKAGES], [ -+ nut_cv_PYTHON3_SITE_PACKAGES="`${PYTHON3} -c 'import site; print(site.getsitepackages().pop(0))'`" -+ AS_CASE(["$nut_cv_PYTHON3_SITE_PACKAGES"], -+ [*:*], [ -+ dnl Note: on Windows MSYS2 this embeds "C:/msys64/mingw..." into the string [nut#1584] -+ nut_cv_PYTHON3_SITE_PACKAGES="`cd "$nut_cv_PYTHON3_SITE_PACKAGES" && pwd`" -+ ] -+ ) -+ ]) - ]) -- AC_SUBST([PYTHON3_SITE_PACKAGES], [${PYTHON3_SITE_PACKAGES}]) -+ AC_SUBST([PYTHON3_SITE_PACKAGES], [${nut_cv_PYTHON3_SITE_PACKAGES}]) - AM_CONDITIONAL([HAVE_PYTHON3_SITE_PACKAGES], [test x"${PYTHON3_SITE_PACKAGES}" != "x"]) - ]) - ]) --- -2.42.0 - diff --git a/package/nut/nut.hash b/package/nut/nut.hash index 9cd5fcc8dec..4c962ee9d8f 100644 --- a/package/nut/nut.hash +++ b/package/nut/nut.hash @@ -1,5 +1,7 @@ +# From https://github.com/networkupstools/nut/releases/download/v2.8.2/nut-2.8.2.tar.gz.sha256 +sha256 e4b4b0cbe7dd39ba9097be7f7d787bb2fffbe35df64dff53b5fe393d659c597d nut-2.8.2.tar.gz + # Locally computed -sha256 7da48ee23b1f0d8d72560bb0af84f5c5ae4dbe35452b84cb49840132e47f099c nut-2.8.1.tar.gz sha256 8a3de48b86daffcbe822dd94e514c8a77fe70f77c9005ffd9dcf1709dbdc80c7 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE-GPL2 sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 LICENSE-GPL3 diff --git a/package/nut/nut.mk b/package/nut/nut.mk index 371c7837830..93522d017ef 100644 --- a/package/nut/nut.mk +++ b/package/nut/nut.mk @@ -4,16 +4,13 @@ # ################################################################################ -NUT_VERSION = 2.8.1 +NUT_VERSION = 2.8.2 NUT_SITE = https://github.com/networkupstools/nut/releases/download/v$(NUT_VERSION) NUT_LICENSE = GPL-2.0+, GPL-3.0+ (python scripts), GPL/Artistic (perl client) NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3 NUT_SELINUX_MODULES = apache nut NUT_INSTALL_STAGING = YES NUT_DEPENDENCIES = host-pkgconf -# We're patching m4/nut_compiler_family.m4 -# We're patching m4/nut_check_python.m4 -NUT_AUTORECONF = YES # Put the PID files in a read-write place (/var/run is a tmpfs) # since the default location (/var/state/ups) maybe readonly. From dfe02734bfbbab680cd9ceb98e10d0344abbe058 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 5 Apr 2024 09:52:30 +0200 Subject: [PATCH 0399/3013] package/uuu: bump to version 1.5.177 - Support i.MX91 - Fix a crash with -d option when change back file. Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.177 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index e45cbb86807..0f746a76338 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,3 +1,3 @@ # locally computed -sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz +sha256 fac38e93714181fbfb0ff52b9cd29395c7eb342def5c3857da87e5429beb3927 uuu_source-uuu_1.5.177.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 5800277b10d..b6611dc3d40 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.165 +UUU_VERSION = 1.5.177 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From 9f4cae383a061b52424bf37900aaa221e3a2f3c5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 4 Apr 2024 14:55:52 -0300 Subject: [PATCH 0400/3013] package/crucible: update LICENSE information Since crucible commit 7fe0bb96da65 ("move to BSD style license") the license has been changed to BSD-3. This changed happened for the 2023.11.02 release of crucible, to which the Buildroot package was bumped in Buildroot commit be3f95ed14559f8a9739a12cff604add622b0416. Change the license type and hash accordingly. Fixes: - http://autobuild.buildroot.net/results/14dfa0a47be54929c527c12fe9b95f34c1d8c7f5/ Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/crucible/crucible.hash | 2 +- package/crucible/crucible.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/crucible/crucible.hash b/package/crucible/crucible.hash index d5fee0068d8..3a9a7167323 100644 --- a/package/crucible/crucible.hash +++ b/package/crucible/crucible.hash @@ -1,2 +1,2 @@ sha256 d21842f050163765269290d72fe79d3f95005038e865138d94e247cb455098da crucible-2023.11.02.tar.gz -sha256 d88514630470aec9fa7abdc990a1e0a8751a752321bffa868188c49009d64d59 LICENSE +sha256 a89c50d83be30fe7ec75be69a07f6c1b5dfaae0a6b94a678d2394fff34acb69c LICENSE diff --git a/package/crucible/crucible.mk b/package/crucible/crucible.mk index 2206663e248..5eedbca8eea 100644 --- a/package/crucible/crucible.mk +++ b/package/crucible/crucible.mk @@ -6,7 +6,7 @@ CRUCIBLE_VERSION = 2023.11.02 CRUCIBLE_SITE = $(call github,usbarmory,crucible,v$(CRUCIBLE_VERSION)) -CRUCIBLE_LICENSE = GPL-3.0 +CRUCIBLE_LICENSE = BSD-3-Clause CRUCIBLE_LICENSE_FILES = LICENSE CRUCIBLE_GOMOD = ./cmd/crucible From ea49ed995e6256ff707854658a5624108ba3fea7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 07:51:56 +0200 Subject: [PATCH 0401/3013] package/onevpl-intel-gpu: bump version to 24.2.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index 680ada76ea0..e2b1eaf0329 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e006d59399dbd0c3b3ecd91610822d655e9303b25a385a9a3ac94a42bf34b284 onevpl-intel-gpu-24.1.5.tar.gz +sha256 34438637670b13140153c8a6be6b32d755ba72f68b2bbb01a8ec630c3e453900 onevpl-intel-gpu-24.2.0.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 440d73efa25..a9dcda80143 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.5 +ONEVPL_INTEL_GPU_VERSION = 24.2.0 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From 9cab57f1b449b412e6c0105ff45e72020ef87a8a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 07:51:57 +0200 Subject: [PATCH 0402/3013] package/intel-mediadriver: bump version to 24.2.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 6bc9549c11e..d597d3f32d8 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e23ea37c98d8d4b9d1a3a134b6489256d8f5a7a4ee71967b1db8ade70052654f intel-media-24.1.5.tar.gz +sha256 5c03bbb9d7ae12b9c7fe2cb3f4c76f8ac796eccfb998422802e40464264de37c intel-media-24.2.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 875e7e7c785..5ccb7d9174f 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.5 +INTEL_MEDIADRIVER_VERSION = 24.2.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 6439a10e98523281c0f9be670bf9dd605a367025 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 6 Apr 2024 16:54:29 +0200 Subject: [PATCH 0403/3013] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR With binman support enabled, u-boot for k3 r5 core (ti-k3-r5-loader) install different target image (tiboot3*.bin) depending on the K3 SoC boot ROM: - General Purpose devices (gp) - High Security - Field Securable devices (hs-fs) - High Security - Security Enforcing devices (hs) An additional firmware binary is required on certain TI K3 devices such as AM65 and J721e due to the "Split binary" boot flow [1]: - Split binary with a combined firmware: (eg: AM65) - Combined binary with a combined firmware: (eg: AM64) - Split binary with a split firmware: (eg: J721E) - Combined binary with a split firmware: (eg: AM62) K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other boot flow. From [1]: "It's important to rename the generated tiboot3.bin and sysfw.itb to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup UBoot SPL will only look for and load the files with these names." See the (not exhaustive) list of all tiboot3*.bin and sysfw*.itb file variant found in meta-ti: meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" meta-ti-bsp/conf/machine/include/am62pxx.inc:IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j722s.inc:IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/k3r5.inc:SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" This firmware list can also be verified with the firmware name used in the u-boot devicetree k3-*-binman.dtsi files. On the SK-AM62B-P1, three tiboot3 binaries are built, one for each boot ROM variant: tiboot3-am62x-gp-evm.bin tiboot3-am62x-hs-evm.bin tiboot3-am62x-hs-fs-evm.bin A tiboot3.bin symlink is provided as default choice: tiboot3.bin -> tiboot3-am62x-hs-fs-evm.bin On this board, the tiboot3.bin symlink links to the hs-fs variant but it not always de case for all TI K3 devices. (ex: J721e use gp variant by default). The tiboot3.bin symlink links the -gp, -hs-fs, -hs tiboot3 binary according to where "symlink = "tiboot3.bin";" line is located in k3-*binman.dtsi. As reported by Michael Walle [2], such firmware name can also be customized by a SBC vendor [3], so we can't always be sure which firmware to use. If required, let the user provide a custom tiboot3 or sysfw firmware name from the defconfig. Otherwise use the default firmware choice by copying tiboot3.bin and sysfw.itb symlinks. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst [2] http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html [3] https://elixir.bootlin.com/u-boot/v2024.04/source/arch/arm/dts/k3-am625-phycore-som-binman.dtsi#L14 Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/Config.in | 40 +++++++++++++++++++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 35 +++++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f4f33b2208..707f22ab4eb 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -102,4 +102,44 @@ config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN https://docs.u-boot.org/en/v2024.01/develop/package/binman.html +config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN + string "tiboot3.bin binary name" + default "tiboot3.bin" + help + Name of the TI K3 tiboot3.bin binary to use. + + The tiboot3 binary name must match with the TI K3 SoC boot + ROM: + + - General Purpose devices (gp) + - High Security - Field Securable devices (hs-fs) + - High Security - Security Enforcing devices (hs) + + Or if the tiboot3 binary generated use a custom name. + + If unsure, use the default tiboot3.bin (symlink) generated by + binman. + +config BR2_TARGET_TI_K3_R5_LOADER_SYSFW_ITB + string "sysfw.itb binary name" + default "sysfw.itb" + help + Name of the TI K3 sysfw.itb binary to use (if any required). + + sysfw*.itb are only generated for Split binary based Boot + Flow (eg: am65, j721e). This option is not used on other + TI K3 devices. + + The sysfw binary name must match with the TI K3 SoC boot + ROM: + + - General Purpose devices (gp) + - High Security - Field Securable devices (hs-fs) + - High Security - Security Enforcing devices (hs) + + Or if the sysfw binary generated use a custom name. + + If unsure, use the default sysfw.itb (symlink) generated by + binman. + endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index cf18b43871d..36f87e577ef 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -73,7 +73,24 @@ TI_K3_R5_LOADER_DEPENDENCIES += \ host-python-pylibfdt \ host-python-setuptools TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) -endif + +TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) + +define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN + cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin +endef + +TI_K3_R5_LOADER_SYSFW_ITB = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_SYSFW_ITB)) + +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e). +# So, if sysfw.itb symlink exist we must copy it or the custom sysfw.itb. +define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB + if test -e $(@D)/sysfw.itb ; then \ + cp $(@D)/$(TI_K3_R5_LOADER_SYSFW_ITB) $(BINARIES_DIR)/sysfw.itb ; \ + fi +endef + +endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) @@ -81,6 +98,22 @@ endef define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + $(TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN) + $(TI_K3_R5_LOADER_INSTALL_SWSFW_ITB) endef +# Checks to give errors that the user can understand +# Must be before we call to kconfig-package +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR_BUILDING),yy) + +ifeq ($(TI_K3_R5_LOADER_TIBOOT3_BIN),) +$(error No custom tiboot3 name specified, check your BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN setting) +endif + +ifeq ($(TI_K3_R5_LOADER_SYSFW_ITB),) +$(error No custom sysfw name specified, check your BR2_TARGET_TI_K3_R5_LOADER_SYSFW_ITB setting) +endif + +endif # BR_BUILDING + $(eval $(kconfig-package)) From 0059e3c5556d3deeef6387e2192476160d551bc7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 1 Mar 2024 14:36:13 +0100 Subject: [PATCH 0404/3013] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. - Use a custom tiboot3.bin since the default is "hs-fs", but the ti_am62x_sk_defconfig expect the "gp" one Tested on SK-AM62B-P1. Tested-by: Alexander Sverdlin Tested-by: Michael Trimarchi Tested-by: Andreas Dannenberg Tested-by: Gero Schwäricke Tested-by: Bryan Brattlof Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- board/ti/am62x-sk/genimage.cfg | 7 ++- .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- board/ti/am62x-sk/post-build.sh | 54 +++++++++++++++++++ configs/ti_am62x_sk_defconfig | 14 ++--- 4 files changed, 69 insertions(+), 8 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f9..398209f4d83 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index 2a5c99c459f..0e171c56f59 100644 --- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 00000000000..4f19f4d6cf9 --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,54 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:d:r:x:' +O='console:,devicetree:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-d|--devicetree) + DEVICETREE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing \`console' argument" +[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument" +[ -n "${ROOT}" ] || die "Missing \`root' argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + devicetree /${DEVICETREE} + append ${append} + __HEADER_EOF diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index b2814526bba..7a411ed423d 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_TARGET_ROOTFS_EXT2=y @@ -23,21 +24,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From 2915879c15c91cb9eea274ea6224b2c75775144f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 1 Mar 2024 14:36:14 +0100 Subject: [PATCH 0405/3013] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tested on SK-AM62B-P1. Tested-by: Alexander Sverdlin Tested-by: Michael Trimarchi Tested-by: Andreas Dannenberg Tested-by: Gero Schwäricke Tested-by: Bryan Brattlof Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- board/ti/am62x-sk/patches/linux-headers/linux-headers.hash | 1 + board/ti/am62x-sk/patches/linux/linux.hash | 2 ++ configs/ti_am62x_sk_defconfig | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash diff --git a/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash b/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash new file mode 100644 index 00000000000..cedae67f33f --- /dev/null +++ b/board/ti/am62x-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 7a411ed423d..d4b19e5039b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From c8b33d22d8dee8c0fe0fbd00f45f290d29a5229f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 1 Mar 2024 14:36:15 +0100 Subject: [PATCH 0406/3013] board/ti/am62x-sk: generalize post-build.sh Removing any explicit reference to the ti_am62x_sk_defconfig configuration, the script can also be used by other configurations or at least by ti_am64x_sk_defconfig. Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- board/ti/am62x-sk/post-build.sh | 10 +++++++--- configs/ti_am62x_sk_defconfig | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh index 4f19f4d6cf9..d066e28fd0d 100755 --- a/board/ti/am62x-sk/post-build.sh +++ b/board/ti/am62x-sk/post-build.sh @@ -12,8 +12,8 @@ EOF exit 1 } -o='c:d:r:x:' -O='console:,devicetree:,root:,extra-args:' +o='c:d:l:r:x:' +O='console:,devicetree:,label:,root:,extra-args:' opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" eval set -- "${opts}" while [ ${#} -gt 0 ]; do @@ -24,6 +24,9 @@ while [ ${#} -gt 0 ]; do (-d|--devicetree) DEVICETREE="${2}"; shift 2 ;; + (-l|--label) + LABEL="${2}"; shift 2 + ;; (-r|--root) ROOT="${2}"; shift 2 ;; @@ -38,6 +41,7 @@ done [ -n "${CONSOLE}" ] || die "Missing \`console' argument" [ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument" +[ -n "${LABEL}" ] || die "Missing \`label' argument" [ -n "${ROOT}" ] || die "Missing \`root' argument" append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" if [ -n "${EXTRA_ARGS}" ]; then @@ -46,7 +50,7 @@ fi mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" - label am62x-sk-buildroot + label ${LABEL} kernel /Image fdtdir / devicetree /${DEVICETREE} diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index d4b19e5039b..1c7085d04d4 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" -BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y From 415835567bd2bc7aa29aa73841354a086654f13c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 1 Mar 2024 14:36:16 +0100 Subject: [PATCH 0407/3013] board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx The patch makes it clear that the moved script can be used by the am6{2,4}x platforms. Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- board/ti/{am62x-sk => common/am6xx}/post-build.sh | 0 configs/ti_am62x_sk_defconfig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename board/ti/{am62x-sk => common/am6xx}/post-build.sh (100%) diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/common/am6xx/post-build.sh similarity index 100% rename from board/ti/am62x-sk/post-build.sh rename to board/ti/common/am6xx/post-build.sh diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 1c7085d04d4..b62f624d827 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" From c8259f935740322b0a3834eaa1071ec6bd3f1bc2 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 1 Mar 2024 14:36:18 +0100 Subject: [PATCH 0408/3013] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 2024.01 version of U-Boot for the am64x-sk board has introduced two major changes: - The device tree k3-am642-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. - Use a custom tiboot3.bin since the default is "hs-fs", but the ti_am64x_sk_defconfig expect the "gp" one. Tested-by: Alexander Sverdlin Tested-by: Michael Trimarchi Tested-by: Andreas Dannenberg Tested-by: Gero Schwäricke Tested-by: Bryan Brattlof Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- board/ti/am64x-sk/genimage.cfg | 7 ++++++- .../patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 +-- configs/ti_am64x_sk_defconfig | 15 +++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/board/ti/am64x-sk/genimage.cfg b/board/ti/am64x-sk/genimage.cfg index 26304fe98f9..88dff8fe23d 100644 --- a/board/ti/am64x-sk/genimage.cfg +++ b/board/ti/am64x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am642-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index 2a5c99c459f..dbb44287388 100644 --- a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,2 +1 @@ -# Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 1ebdec68ac0..eaeccde3163 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_TARGET_ROOTFS_EXT2=y @@ -23,20 +24,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From b460c7258797e4b335bd60d03c823489c7c4a9cb Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 1 Mar 2024 14:36:19 +0100 Subject: [PATCH 0409/3013] configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tested-by: Alexander Sverdlin Tested-by: Michael Trimarchi Tested-by: Andreas Dannenberg Tested-by: Gero Schwäricke Tested-by: Bryan Brattlof Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- board/ti/am64x-sk/patches/linux-headers/linux-headers.hash | 1 + board/ti/am64x-sk/patches/linux/linux.hash | 2 ++ configs/ti_am64x_sk_defconfig | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash diff --git a/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash b/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/ti/am64x-sk/patches/linux/linux.hash b/board/ti/am64x-sk/patches/linux/linux.hash new file mode 100644 index 00000000000..cedae67f33f --- /dev/null +++ b/board/ti/am64x-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index eaeccde3163..56e1b23335e 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" From 364e153e6a25ff8c0de348b0c5244ef17b3a1b57 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 6 Apr 2024 17:05:15 +0200 Subject: [PATCH 0410/3013] boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME Previoulsy (without binman), when a TI K3 SoC using Combined binary with a split firmware boot method was used (am62ax or am62x) [1], the user had to select BR2_TARGET_UBOOT_NEEDS_TI_K3_DM in the defconfig to provide Device Manager firmware provided by ti-k3-boot-firmware. With binman, this option is no longer necessary since ti-k3-boot-firmware package is already in the u-boot dependency and the path to DM and SYSFW binaries are provided by BINMAN_INDIRS. We are going to remove ti-k3-image-gen, so binman is now mandatory on all TI K3 SoCs. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/52ce606c05ee3ac869f8087292bc3dbb0d25b79b Reviewed-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- boot/uboot/Config.in | 13 ------------- boot/uboot/uboot.mk | 4 ---- 2 files changed, 17 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 39e49d681b0..8d2228dc7dd 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -251,19 +251,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE j721e) also need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE - -# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for -# TI K3 devices using the Device Manager (DM) firmware. -# We use the SoC selection defined for the ti-k3-image-gen -# package. -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 398485195e6..a894654698b 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -195,11 +195,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware -ifneq ($(UBOOT_TI_K3_DM_SOCNAME),) -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f -endif endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From 1e6f6252fd260626273dbf68a65a1b553f3ffdde Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 1 Mar 2024 14:36:20 +0100 Subject: [PATCH 0411/3013] boot/ti-k3-image-gen: remove package ti-k3-image-gen tool is deprecated an replaced by binman [1]. All defconfig that was using it have been updated to use U-boot binman tool instead. So, we can safely remove ti-k3-image-gen package. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Cc: Anand Gadiyar Cc: Xuanhao Shi Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin Reviewed-by: Arnout Vandecappelle Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Config.in.legacy | 7 +++ DEVELOPERS | 2 - boot/Config.in | 1 - boot/ti-k3-image-gen/Config.in | 77 ----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ---------------- 6 files changed, 7 insertions(+), 137 deletions(-) delete mode 100644 boot/ti-k3-image-gen/Config.in delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk diff --git a/Config.in.legacy b/Config.in.legacy index 4084ffa5164..76af1da3488 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TARGET_TI_K3_IMAGE_GEN + bool "ti-k3-image-gen removed" + select BR2_LEGACY + help + ti-k3-image-gen tool has been removed and replaced by + U-Boot binman tool (requires U-boot >= 2023.10). + config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "u-boot TI K3 DM option has been renamed." select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d78661cd607..399b2931ff3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -158,7 +158,6 @@ N: Anand Gadiyar F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig @@ -3193,7 +3192,6 @@ N: Xuanhao Shi F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad439..87e1b7c00e3 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" -source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in deleted file mode 100644 index d76cef82e91..00000000000 --- a/boot/ti-k3-image-gen/Config.in +++ /dev/null @@ -1,77 +0,0 @@ -config BR2_TARGET_TI_K3_IMAGE_GEN - bool "ti-k3-image-gen" - depends on BR2_TARGET_TI_K3_R5_LOADER - select BR2_TARGET_TI_K3_BOOT_FIRMWARE - # We need FIT support in uboot-tools, which is why we select a - # host package - select BR2_PACKAGE_HOST_UBOOT_TOOLS - select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT - help - Use TI's k3-image-gen to build a separate bare metal boot - binary from a separate SPL that is running on the R5 core. - - https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ - -if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE - string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - -endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3-image-gen/ti-k3-image-gen.hash deleted file mode 100644 index c968c5648f7..00000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4 k3-image-gen-08.06.00.007.tar.gz -sha256 f012e8d000d711d0539e5b4c812fc1d3a59c10fc1e3d6ea155556f5b78286845 LICENSE diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk deleted file mode 100644 index 64be9a18f2c..00000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# ti-k3-image-gen -# -################################################################################ - -TI_K3_IMAGE_GEN_VERSION = 08.06.00.007 -TI_K3_IMAGE_GEN_SITE = https://git.ti.com/cgit/k3-image-gen/k3-image-gen/snapshot -TI_K3_IMAGE_GEN_SOURCE = k3-image-gen-$(TI_K3_IMAGE_GEN_VERSION).tar.gz -TI_K3_IMAGE_GEN_LICENSE = BSD-3-Clause -TI_K3_IMAGE_GEN_LICENSE_FILES = LICENSE -TI_K3_IMAGE_GEN_INSTALL_IMAGES = YES - -# - ti-k3-image-gen is used to build tiboot3.bin, using the -# r5-u-boot-spl.bin file from the ti-k3-r5-loader package. Hence the -# dependency on ti-k3-r5-loader. -# - the ti-k3-image-gen makefiles seem to need some feature from Make -# v4.0, similar to u-boot. -TI_K3_IMAGE_GEN_DEPENDENCIES = \ - host-arm-gnu-toolchain \ - host-python3 \ - host-openssl \ - host-uboot-tools \ - ti-k3-r5-loader \ - ti-k3-boot-firmware \ - $(BR2_MAKE_HOST_DEPENDENCY) - -TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) - -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin - -define TI_K3_IMAGE_GEN_CONFIGURE_CMDS - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) -endef - -define TI_K3_IMAGE_GEN_BUILD_CMDS - $(TARGET_MAKE_ENV) \ - $(BR2_MAKE) -C $(@D) \ - SOC=$(TI_K3_IMAGE_GEN_SOC) \ - SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ - CONFIG=evm \ - CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ - SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ - O=$(@D)/tmp \ - BIN_DIR=$(@D) -endef - -define TI_K3_IMAGE_GEN_INSTALL_IMAGES_CMDS - cp $(@D)/tiboot3.bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) From e5d8cd5173f5a703ab1a34cd13b66a9fada8408e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 3 Mar 2024 22:20:46 +0100 Subject: [PATCH 0412/3013] boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN Since all AM62 and AM64 defconfig has been updated to use binman and ti-k3-image-gen has been removed, binman is now mandatory for all TI K3 SoC. So remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option since since it can't be disabled anymore. We can remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN without legacy handling since this option is not part of any Buildroot release. While at it, add one more like to binman dependencies in comments. Reviewed-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/Config.in | 11 ++------- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 31 +++++++++++-------------- configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 707f22ab4eb..6d1adbeac3e 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. @@ -93,15 +95,6 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. -config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN - bool "ti-k3-r5-loader use binman" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema - select BR2_TARGET_TI_K3_BOOT_FIRMWARE - help - Use binman tool for generation and signing of boot images. - - https://docs.u-boot.org/en/v2024.01/develop/package/binman.html - config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN string "tiboot3.bin binary name" default "tiboot3.bin" diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 36f87e577ef..0fb07f2d655 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -35,11 +35,21 @@ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt TI_K3_R5_LOADER_CPE_ID_VENDOR = denx TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot TI_K3_R5_LOADER_INSTALL_IMAGES = YES +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +# Make sure that all binman requirements are built before ti-k3-r5-loader. TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python3 \ + host-python-jsonschema \ + host-python-pyelftools \ + host-python-pylibfdt \ + host-python-pyyaml \ + host-python-setuptools \ + ti-k3-boot-firmware TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,21 +68,8 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ - HOSTLDFLAGS="$(HOST_LDFLAGS)" - -ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt -TI_K3_R5_LOADER_DEPENDENCIES += \ - host-python-jsonschema \ - host-python-pyyaml \ - ti-k3-boot-firmware -# Make sure that all binman requirements are build before ti-k3-r5-loader. -TI_K3_R5_LOADER_DEPENDENCIES += \ - host-python3 \ - host-python-pyelftools \ - host-python-pylibfdt \ - host-python-setuptools -TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + BINMAN_INDIRS=$(BINARIES_DIR) TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) @@ -90,8 +87,6 @@ define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB fi endef -endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN - define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index b62f624d827..fa2c008d4c8 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 56e1b23335e..f7c6d16b356 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From 700ba1df1e4320bd02fcd99b47c2e2c71b1b4b9c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 4 Mar 2024 00:03:55 +0100 Subject: [PATCH 0413/3013] package/ti-k3: switch ti_am6{2,4}x_sk_defconfig to HS-FS by default From Andreas Dannenberg (TI K3 architect) [1]: "HS-FS should be the default for all TI AM6x devices. This is our "production silicon" and what's used for (almost) all projects, especially new projects. This being said having support for GP device variants still is desirable for existing boards/projects, such as the current BeaglePlay boards (amongst earlier version of TI starter kit EVMs for AM6x)." See further details on e2e Forum [2]: "Unfortunately with this transition any existing GP device based AM62x (and AM64x) boards will no longer boot with MMC/SD card images generated" For such existing GP device based AM62x (and AM64x) boards, users have to provide the tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN. [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685821.html [2] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto Reviewed-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- board/ti/am62x-sk/readme.txt | 16 ++++++++++++++++ board/ti/am64x-sk/readme.txt | 16 ++++++++++++++++ configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/board/ti/am62x-sk/readme.txt b/board/ti/am62x-sk/readme.txt index 5af1c59c2d7..a8d0c08dc0e 100644 --- a/board/ti/am62x-sk/readme.txt +++ b/board/ti/am62x-sk/readme.txt @@ -17,6 +17,22 @@ Optional: modify the configuration: $ make menuconfig +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am62x-{gp/hs-fs/hs}-*.bin) used on the board. + +HS-FS should be the default for all TI AM6x devices but earlier version +of TI starter kit EVMs for AM6x was produced with a GP device. + +See further details on e2e Forum [1] : + + "Unfortunately with this transition any existing GP device based AM62x + (and AM64x) boards will no longer boot with MMC/SD card images generated" + +For such existing GP device based AM62x boards, users have to provide the +tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN. + +[1]: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto + Build: $ make diff --git a/board/ti/am64x-sk/readme.txt b/board/ti/am64x-sk/readme.txt index 5ddbb836ed7..73215cb5913 100644 --- a/board/ti/am64x-sk/readme.txt +++ b/board/ti/am64x-sk/readme.txt @@ -17,6 +17,22 @@ Optional: modify the configuration: $ make menuconfig +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am64x-{gp/hs-fs/hs}-*.bin) used on the board. + +HS-FS should be the default for all TI AM6x devices but earlier version +of TI starter kit EVMs for AM6x was produced with a GP device. + +See further details on e2e Forum [1] : + + "Unfortunately with this transition any existing GP device based AM62x + (and AM64x) boards will no longer boot with MMC/SD card images generated" + +For such existing GP device based AM64x boards, users have to provide the +tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN. + +[1]: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto + Build: $ make diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index fa2c008d4c8..5c7b97b3b0b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index f7c6d16b356..28e97f94e2f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From df2540adeac1a924dfa4fe1da7d654db49151420 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 8 Apr 2024 22:24:06 +0200 Subject: [PATCH 0414/3013] toolchain/external: remove libcrypt from glibc Note: this commit only deals with glibc and its internal libcrypt (or lack thereof); other C libraries, musl and uClibc-NG, are not considered. libcrypt from glibc has been deprecated for a long time, and it has now been entirely dropped with glibc 2.39. Now, packages that need crypt(3) features need to explicitly depend on the libxcrypt pacakge. However, the set of files installed both by glibc and libxcrypt is not empty: glibc libxcrypt /usr/include/crypt.h /usr/include/crypt.h /usr/lib/libcrypt.a /usr/lib/libcrypt.a /usr/lib/libcrypt.so /usr/lib/libcrypt.so /lib/libcrypt.so.1 /lib/libcrypt-2.23.so /usr/lib/libcrypt.so.2 The two libraries have different SO_NAME, so they do not conflict on the library filename. However, the .so synlink is present in both, and thus conflicts. The header and the static library also conflict. So, the situation is that, with a glibc 2.39 or later, packages have to use libxcrypt, which is a drop-in replacement. With glibc 2.38 or earlier, they can use either. Since we already bumped to glibc 2.39 for the internal toolchain, we have already converted quite a few packages to use libxcrypt. That works well with an internl toolchain, because glibc does not install the conflicting files. However, for external toolchains, we may very well end up in three situations: - a glibc 2.39 or later, without libcrypt - a glibc 2.39 or later, without libcrypt, but with libxcrypt [0] - a glibc 2.38 or earlier with libcrypt In the first case, all is OK and we are in a situation similar to the internal toolchain, but in the latter two cases, we end up with a conflict. We could introduce BR2_TOOLCHAIN_EXTERNAL_HAS_LIBCRYPT os something along those lines, but this is going to be a bit complex on packages, which would have to select LIBXCRYPT if GLIBC && !_HAS_LIBCRYPT. So, to simplify things, we want to get the external toolchains into a situation similar to the internal one, where libcrypt is not provided by the toolchain; packages have to select libxcrypt for glibc toolchains, without having to care whether this is an internal or external toolchain or some more complex conditions. So, we remove from staging whatever could be used to compile and link with libcrypt. We however keep the SO_NAME file, if it exists, and we also install it in target/, for those pre-built binaries that may be linked with it [1]. The glibc SO_NAME has always been libcrypt.so.1, so this is what we copy exactly, to avoid copying the libxcrypt one, which is libcrypt.so.2. [0] that could happen if a toolchain provider tried to be helpful and suplies a toolchain with libxcrypt to be trasnparent to users, in which case that would conflict with ours... [1] if such a prebuilt binary (executable or library) is used with a glibc 2.39 or later toolchain, it will obviously not work at all. libxcrypt is supposed to be a drop-in replacement for glibc's libcrypt, so we could look into symlinking libcrypt.so.1 to libcrypt.so.2. In a later patch, maybe... Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Fabrice Fontaine Reviewed-by: Thomas Petazzoni --- .../pkg-toolchain-external.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index ddf1d70ab42..5343f257e05 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -120,7 +120,7 @@ TOOLCHAIN_EXTERNAL_LIBS += libssp.so.* endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) -TOOLCHAIN_EXTERNAL_LIBS += libc.so.* libcrypt.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* +TOOLCHAIN_EXTERNAL_LIBS += libc.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.* ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) @@ -129,8 +129,24 @@ endif # gdbserver endif # ! no threads endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +# uClibc, though mono-lib, still has a separate libcrypt as a stub +TOOLCHAIN_EXTERNAL_LIBS += libcrypt.so.* +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* libanl.so.* +# Note: explicitly do copy libcrypt.so.1: it is not the same SONAME as the +# one from libxcrypt, so no conflict, but some prebuilt binaries may have +# it in their DT_NEEDED. However, do remove the headers, static lib, and +# symlink to avoid conflict with libxcrypt (the prebuilt binaries do not +# need those either). +TOOLCHAIN_EXTERNAL_LIBS += libcrypt.so.1 +define TOOLCHAIN_EXTERNAL_GLIBC_NO_LIBCRYPT + rm -f $(STAGING_DIR)/usr/include/crypt.h \ + $(STAGING_DIR)/usr/lib/libcrypt.so \ + $(STAGING_DIR)/usr/lib/libcrypt.a +endef endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) @@ -599,6 +615,7 @@ define $(2)_INSTALL_STAGING_CMDS $$(TOOLCHAIN_WRAPPER_INSTALL) $$(TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK) $$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS) + $$(TOOLCHAIN_EXTERNAL_GLIBC_NO_LIBCRYPT) $$(TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER) $$(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT) $$(TOOLCHAIN_EXTERNAL_FIXUP_PRETTY_PRINTER_LOADER) From d01e13c4d419ca2fc31d6300033eacb1d19cb615 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Wed, 3 Apr 2024 16:18:05 -0500 Subject: [PATCH 0415/3013] package/python3: fix cross builds when host and target use the same SOABI When python performs a cross compile, it uses a host interpreter to run steps on behalf of the foreign architecture to finalize the build. When performing these steps, foreign modules may be loaded if the SOABI matches that of the host. This can lead to issues if the modules are linked against a libc not available on the host or if the binaries include instructions unsupported by the host. For now, patch the foreign libraries out of PYTHONPATH and explicitly define the path to sysconfigdata so builds can complete without error. This method currently passes all upstream CI pipelines [0] and should also work (with some modifications) for the migration to 3.12 [1]. Fixes: http://autobuild.buildroot.net/results/c854080e003e9a7d525325073190b472a8f982aa/ [0]: https://github.com/python/cpython/pull/116294 [1]: https://lists.buildroot.org/pipermail/buildroot/2024-February/685369.html Signed-off-by: Vincent Fazio Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- ...oss-compiles-when-host-and-target-us.patch | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch diff --git a/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch b/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch new file mode 100644 index 00000000000..4d5afeb3cb7 --- /dev/null +++ b/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch @@ -0,0 +1,140 @@ +From 8d8cc9087fd44c097775ca0a9ebb6c877605baec Mon Sep 17 00:00:00 2001 +From: Vincent Fazio <5265893+vfazio@users.noreply.github.com> +Date: Wed, 28 Feb 2024 13:55:04 -0600 +Subject: [PATCH] gh-115382: Fix cross compiles when host and target use same + SOABI + +Previously, when a build was configured to use a host interpreter via +--with-build-python, the PYTHON_FOR_BUILD config value included a path +in PYTHONPATH that pointed to the target's built external modules. + +For "normal" foreign architecture cross compiles, when loading compiled +external libraries, the target libraries were processed first due to +their precedence in sys.path. These libraries were then ruled out due to +a mismatch in the SOABI so the import mechanism continued searching +until it found the host's native modules. + +However, if the host interpreter and the target python were on the same +version + SOABI combination, the host interpreter would attempt to load +the target's external modules due to their precedence in sys.path. + +Despite the "match", the target build may have been linked against a +different libc or may include unsupported instructions so loading or +executing the target's external modules can lead to crashes. + +Now, the path to the target's external modules is no longer defined in +PYTHONPATH to prevent accidentally loading these foreign modules. + +One caveat is that during certain build stages, the target's sysconfig +module requires higher precedence than the host's version in order to +accurately query the target build's configuration. + +This worked previously due to the target's sysconfig data module having +precedence over the host's (see above). In order to keep this desired +behavior, a new environment variable, _PYTHON_SYSCONFIGDATA_PATH, has +been defined so sysconfig can search this directory for the target's +sysconfig data. + +Signed-off-by: Vincent Fazio +Upstream-issue: https://github.com/python/cpython/issues/115382 +Upstream: https://github.com/python/cpython/pull/116294 +--- + Lib/sysconfig.py | 15 ++++++++++++++- + Lib/test/libregrtest/main.py | 1 + + Lib/test/pythoninfo.py | 1 + + Tools/scripts/run_tests.py | 1 + + configure | 2 +- + configure.ac | 2 +- + 6 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index 6328ec41af..744f715fe2 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -535,7 +535,20 @@ def _init_posix(vars): + """Initialize the module as appropriate for POSIX systems.""" + # _sysconfigdata is generated at build time, see _generate_posix_vars() + name = _get_sysconfigdata_name() +- _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ++ ++ # For cross builds, the path to the target's sysconfigdata must be specified ++ # so it can be imported. It cannot be in PYTHONPATH, as foreign modules in ++ # sys.path can cause crashes when loaded by the host interpreter. ++ # Rely on truthiness as a valueless env variable is still an empty string. ++ # See OS X note in _generate_posix_vars re _sysconfigdata. ++ if (path := os.environ.get('_PYTHON_SYSCONFIGDATA_PATH')): ++ from importlib.machinery import FileFinder, SourceFileLoader, SOURCE_SUFFIXES ++ from importlib.util import module_from_spec ++ spec = FileFinder(path, (SourceFileLoader, SOURCE_SUFFIXES)).find_spec(name) ++ _temp = module_from_spec(spec) ++ spec.loader.exec_module(_temp) ++ else: ++ _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) + build_time_vars = _temp.build_time_vars + vars.update(build_time_vars) + +diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py +index a9725fa967..121e2e7393 100644 +--- a/Lib/test/libregrtest/main.py ++++ b/Lib/test/libregrtest/main.py +@@ -519,6 +519,7 @@ def _add_cross_compile_opts(self, regrtest_opts): + '_PYTHON_PROJECT_BASE', + '_PYTHON_HOST_PLATFORM', + '_PYTHON_SYSCONFIGDATA_NAME', ++ "_PYTHON_SYSCONFIGDATA_PATH", + 'PYTHONPATH' + } + old_environ = os.environ +diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py +index 74ebb5e5b8..fa7fbca34e 100644 +--- a/Lib/test/pythoninfo.py ++++ b/Lib/test/pythoninfo.py +@@ -326,6 +326,7 @@ def format_groups(groups): + "_PYTHON_HOST_PLATFORM", + "_PYTHON_PROJECT_BASE", + "_PYTHON_SYSCONFIGDATA_NAME", ++ "_PYTHON_SYSCONFIGDATA_PATH", + "__PYVENV_LAUNCHER__", + + # Sanitizer options +diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py +index 445a34ae3e..4077a83424 100644 +--- a/Tools/scripts/run_tests.py ++++ b/Tools/scripts/run_tests.py +@@ -42,6 +42,7 @@ def main(regrtest_args): + '_PYTHON_PROJECT_BASE', + '_PYTHON_HOST_PLATFORM', + '_PYTHON_SYSCONFIGDATA_NAME', ++ "_PYTHON_SYSCONFIGDATA_PATH", + 'PYTHONPATH' + } + environ = { +diff --git a/configure b/configure +index a1ad0ae251..0657162d1a 100755 +--- a/configure ++++ b/configure +@@ -3262,7 +3262,7 @@ fi + fi + ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python + PYTHON_FOR_FREEZE="$with_build_python" +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python ++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5 + $as_echo "$with_build_python" >&6; } + +diff --git a/configure.ac b/configure.ac +index e5fb8bd99e..d444f5ec09 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -162,7 +162,7 @@ AC_ARG_WITH( + dnl Build Python interpreter is used for regeneration and freezing. + ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python + PYTHON_FOR_FREEZE="$with_build_python" +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python ++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + AC_MSG_RESULT([$with_build_python]) + ], [ + AS_VAR_IF([cross_compiling], [yes], +-- +2.34.1 + From 3b7f8f8d226c8f5b08edb5a7a8ad746ba04c34c5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 27 Mar 2024 14:17:09 +0100 Subject: [PATCH 0416/3013] package/uclibc: bump to 1.0.47 Fixes riscv port. NPTL/TLS fixed. C++ applications now working. Added explicit_bzero and reallocarray. Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle --- package/uclibc/uclibc.hash | 4 ++-- package/uclibc/uclibc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index ae1f3178d96..a10ceab54cb 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.44/uClibc-ng-1.0.45.tar.xz.sha256 -sha256 c2f4c6b6e19d7c9c226992a3746efd7ab932040463c15ee0bc8f4132b5777ac4 uClibc-ng-1.0.45.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.47/uClibc-ng-1.0.47.tar.xz.sha256 +sha256 29a4d684a06da344ee3ee09acc2ca7649d592ae3ff848f698145c46def05efcb uClibc-ng-1.0.47.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 88623840bf6..a7b18133ff0 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.45 +UCLIBC_VERSION = 1.0.47 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From 05f5e5b6f8e8363043b6136e9d622023ccf9eb52 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 21:56:24 +0200 Subject: [PATCH 0417/3013] package/opensc: add zlib optional dependency zlib is an optional dependency dependency (enabled by default) since the addition of the package in commit 8aaa7ecbce1d10cbcd880c3da5e429988f96176a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/opensc/opensc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index f4dc2206ea6..008de9d4c28 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -20,4 +20,11 @@ else OPENSC_CONF_OPTS += --disable-openssl endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +OPENSC_DEPENDENCIES += zlib +OPENSC_CONF_OPTS += --enable-zlib +else +OPENSC_CONF_OPTS += --disable-zlib +endif + $(eval $(autotools-package)) From f42cfdd28530c10256e73b4f6b9340767c2a3e05 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 8 Apr 2024 09:52:34 +0200 Subject: [PATCH 0418/3013] package/sdl2: bump version to 2.30.2 Signed-off-by: Michael Fischer Signed-off-by: Arnout Vandecappelle --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 2ed3b9cc70c..3c4b06cf3eb 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.0.tar.gz.sig -sha256 36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0 SDL2-2.30.0.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.2.tar.gz.sig +sha256 891d66ac8cae51361d3229e3336ebec1c407a8a2a063b61df14f5fdf3ab5ac31 SDL2-2.30.2.tar.gz # Locally calculated sha256 9b9e1764f06701bcf7ce21e942c682d5921ba0900c6fca760321b1c8837a9662 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 91f6585761e..70f765f0eac 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.30.0 +SDL2_VERSION = 2.30.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From a35a8012747cdbc2d11cb055cc84a115a614bf40 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 Apr 2024 19:08:11 +0200 Subject: [PATCH 0419/3013] package/opencsd: bump to version 1.5.2 For change log, see: https://github.com/Linaro/OpenCSD/blob/v1.5.2/README.md?plain=1#L323 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/opencsd/opencsd.hash | 2 +- package/opencsd/opencsd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opencsd/opencsd.hash b/package/opencsd/opencsd.hash index 6295f32051a..43a5a38683e 100644 --- a/package/opencsd/opencsd.hash +++ b/package/opencsd/opencsd.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 11ef93c0ee57203e620cf7c58b7b7cae00b267a2b57948a511da01c4161775e3 opencsd-1.5.1.tar.gz +sha256 ef27fe6afa6402b051aeae5c2827fa6d8c2d174170a5dc244f7f721db6908219 opencsd-1.5.2.tar.gz sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk index cc3538ef281..8aafeeaad57 100644 --- a/package/opencsd/opencsd.mk +++ b/package/opencsd/opencsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCSD_VERSION = 1.5.1 +OPENCSD_VERSION = 1.5.2 OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) OPENCSD_LICENSE = BSD-3-Clause OPENCSD_LICENSE_FILES = LICENSE From e6fd72719537989212a7c1e9faef697d76298b0f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 8 Apr 2024 19:10:50 +0200 Subject: [PATCH 0420/3013] package/rtl8821au: bump to version 2024-04-08 branch v5.2.6 This version allows to build up to Linux version 6.9 Fixes: http://autobuild.buildroot.net/results/3b451b427a8dbe39ed275f91e38e76c2cae9a43a Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8821au/rtl8821au.hash | 2 +- package/rtl8821au/rtl8821au.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index b19cb93bf6c..56e5609ebda 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9dfb2b12c52fe759e4978cbd7a0fb90f0605ae9146a6d0186f2869bbfb6d13fd rtl8821au-0cab870ff635ba038705ab29363b0cbbedd5c258.tar.gz +sha256 fde8ca9735a6c9c4c907fb6f565185a59b04bcfa78feb2309941cc09d49c4ac7 rtl8821au-8ea0ed9da764448c7310a27744ab5814289f35a8.tar.gz sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 6bb77de81f2..9a92696437d 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821AU_VERSION = 0cab870ff635ba038705ab29363b0cbbedd5c258 +RTL8821AU_VERSION = 8ea0ed9da764448c7310a27744ab5814289f35a8 RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE From 94b8a6ed7777905d93195ee86696a1cb52442a52 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 10 Apr 2024 21:37:12 +0200 Subject: [PATCH 0421/3013] package/rdma-core: bump to version v51.0 For change log since v49.0, see: https://github.com/linux-rdma/rdma-core/releases/tag/v50.0 https://github.com/linux-rdma/rdma-core/releases/tag/v51.0 This commit drops the package patch, which is included v50.0. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- ...-util-udma_barrier.h-fix-mips4-build.patch | 56 ------------------- package/rdma-core/rdma-core.hash | 2 +- package/rdma-core/rdma-core.mk | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch deleted file mode 100644 index 6dfb476faaa..00000000000 --- a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Jan 2024 18:55:34 +0100 -Subject: [PATCH] util/udma_barrier.h: fix mips4 build - -The 'sync' instruction for MIPS was defined in MIPS-II as taking no -operands. MIPS32 extended the define of 'sync' as taking an optional -unsigned 5 bit immediate. - -As a result, replace "sync 0" by "sync" to fix the following build -failure on mips4 raised since version 43.0 and -https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: - -/tmp/ccrBy9fV.s: Assembler messages: -/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' - -Fixes: - - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 ---- - util/udma_barrier.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/util/udma_barrier.h b/util/udma_barrier.h -index 0a1f8a45b..3793d2f18 100644 ---- a/util/udma_barrier.h -+++ b/util/udma_barrier.h -@@ -101,7 +101,7 @@ - #elif defined(__riscv) - #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") - #elif defined(__mips__) --#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_to_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -139,7 +139,7 @@ - #elif defined(__riscv) - #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") - #elif defined(__mips__) --#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_from_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -212,7 +212,7 @@ - #include "s390_mmio_insn.h" - #define mmio_flush_writes() s390_pciwb() - #elif defined(__mips__) --#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") -+#define mmio_flush_writes() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index fc1d319123d..f8b01e882dc 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1ea2c2678d48be0b179871e9ae8c58ceab11a0c5b69315a332ff51dd607180b7 rdma-core-49.0.tar.gz +sha256 a4065b0454249839dc75b61c6ee428e917d9cddf964ff7a33d479f00d1264ba0 rdma-core-51.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 5f8989b3bd4..834d9ea3efe 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 49.0 +RDMA_CORE_VERSION = 51.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md From 6406ee805f1a94646a0d05979161fa53164520e0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Mar 2024 19:01:26 +0100 Subject: [PATCH 0422/3013] configs/nezha_defconfig: use OpenSBI 1.4 Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index dd947079051..2ab278318fd 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From 07d3c7e263673864274d81071d71543cea06847c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Mar 2024 19:01:27 +0100 Subject: [PATCH 0423/3013] configs/nezha_defconfig: bump u-boot to current top of d1-wip This is now based on U-Boot 2024.01-rc1. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 2ab278318fd..7f3070f4198 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,2e89b706f5c956a70c989cd31665f1429e9a0b48)/uboot-2e89b706f5c956a70c989cd31665f1429e9a0b48.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 84577b53da631e38411d91affc13feca5caccfa9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Mar 2024 19:01:28 +0100 Subject: [PATCH 0424/3013] configs/nezha_defconfig: use mainline Linux 6.6.22 The D1 support is now in mainline, so use that instead. There is no dedicated nezha defconfig, so use the riscv defconfig. This defconfig has most drivers as modules, so add mdev to ensure they get correctly loaded. The defconfig does not have USB gadget/OTG support, so enable that using a config fragment to make the USB-C connector work and get rid of the following warning: [ 7.233418] musb-sunxi 4100000.usb: Invalid or missing 'dr_mode' property [ 7.240330] musb-sunxi: probe of 4100000.usb failed with error -22 Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- board/nezha/linux.fragment | 2 ++ configs/nezha_defconfig | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 board/nezha/linux.fragment diff --git a/board/nezha/linux.fragment b/board/nezha/linux.fragment new file mode 100644 index 00000000000..4b101eaacb0 --- /dev/null +++ b/board/nezha/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_USB_GADGET=y +CONFIG_USB_MUSB_DUAL_ROLE=y diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 7f3070f4198..e717c8a08d4 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,13 +1,15 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/nezha/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha" BR2_LINUX_KERNEL_INSTALL_TARGET=y From 99a3698729dad14ff75f9914dd8555bb73d2da02 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Mar 2024 19:01:29 +0100 Subject: [PATCH 0425/3013] configs/nezha_defconfig: add hashes for Linux/opensbi/u-boot And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- board/nezha/patches/linux-headers/linux-headers.hash | 1 + board/nezha/patches/linux/linux.hash | 2 ++ board/nezha/patches/opensbi/opensbi.hash | 2 ++ board/nezha/patches/uboot/uboot.hash | 2 ++ configs/nezha_defconfig | 2 ++ 5 files changed, 9 insertions(+) create mode 120000 board/nezha/patches/linux-headers/linux-headers.hash create mode 100644 board/nezha/patches/linux/linux.hash create mode 100644 board/nezha/patches/opensbi/opensbi.hash create mode 100644 board/nezha/patches/uboot/uboot.hash diff --git a/board/nezha/patches/linux-headers/linux-headers.hash b/board/nezha/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/nezha/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/nezha/patches/linux/linux.hash b/board/nezha/patches/linux/linux.hash new file mode 100644 index 00000000000..899adefd079 --- /dev/null +++ b/board/nezha/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz diff --git a/board/nezha/patches/opensbi/opensbi.hash b/board/nezha/patches/opensbi/opensbi.hash new file mode 100644 index 00000000000..bc4058abe62 --- /dev/null +++ b/board/nezha/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/board/nezha/patches/uboot/uboot.hash b/board/nezha/patches/uboot/uboot.hash new file mode 100644 index 00000000000..7d051859386 --- /dev/null +++ b/board/nezha/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 36db7c20b179f03aa29009565c6b34380d5629fd5c57ed110244594d9930dfed uboot-2e89b706f5c956a70c989cd31665f1429e9a0b48.tar.gz diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index e717c8a08d4..c234b3e2433 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,5 +1,7 @@ BR2_riscv=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/nezha/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" From 44046b393afde10568673a256e9264fcfb91051c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 Apr 2024 19:12:50 +0200 Subject: [PATCH 0426/3013] package/z3: bump to version 4.13.0 For change log since 4.12.5, see: https://github.com/Z3Prover/z3/blob/z3-4.13.0/RELEASE_NOTES.md#version-4130 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index e8110991fa1..df78fd8b7da 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 70e211e0a8e77febccc51865e45111066f623356a4ef0b527c3597362bc6db72 z3-4.12.5.tar.gz +sha256 01bcc61c8362e37bb89fd2430f7e3385e86df7915019bd2ce45de9d9bd934502 z3-4.13.0.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index facbdec486f..e436d48f270 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.5 +Z3_VERSION = 4.13.0 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From 018464b00d842d4e5faf6e1a3c168b3ad5481b12 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 Apr 2024 19:29:28 +0200 Subject: [PATCH 0427/3013] package/libjxl: bump to version 0.10.2 For release notes since v0.10.1, see: - https://github.com/libjxl/libjxl/releases/tag/v0.10.2 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index 40ffd0f5b53..ccd0d4e954d 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 91b9a83a230d608b5d35d2ab5068bd0ec7028797575e3013211be5928028c8cd libjxl-0.10.1.tar.gz +sha256 95e807f63143856dc4d161c071cca01115d2c6405b3d3209854ac6989dc6bb91 libjxl-0.10.2.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 4cb71d5e71f..51b69109d9e 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.10.1 +LIBJXL_VERSION = 0.10.2 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS From f9630bbe3b04a57e6ed2539fef7cff5e4d0dd817 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 Apr 2024 20:13:22 +0200 Subject: [PATCH 0428/3013] package/octave: bump package to version 9.1.0 See release note: https://octave.org/NEWS-9.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/octave/octave.hash | 4 ++-- package/octave/octave.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/octave/octave.hash b/package/octave/octave.hash index 20ee4ddb64c..3ea5a1cd8d7 100644 --- a/package/octave/octave.hash +++ b/package/octave/octave.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -# https://ftp.gnu.org/gnu/octave/octave-8.4.0.tar.lz.sig +# https://ftp.gnu.org/gnu/octave/octave-9.1.0.tar.lz.sig # using key DBD9C84E39FE1AAE99F04446B05F05B75D36644B -sha256 d5a7e89928528dce8cab7eead700be8a8319a98ec5334cc2ce83d29ac60264c1 octave-8.4.0.tar.lz +sha256 f1769f61bd10c8ade6aee352b1bbb016e5fd8fc8394896a64dc26ef675ba3cea octave-9.1.0.tar.lz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk index f240a5057c0..b84e043679b 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCTAVE_VERSION = 8.4.0 +OCTAVE_VERSION = 9.1.0 OCTAVE_SITE = https://ftp.gnu.org/gnu/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ From 6fb179b906a1755d77bda9e501c5335ac163f3cb Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 8 Apr 2024 20:33:44 +0200 Subject: [PATCH 0429/3013] package/stress-ng: bump to version V0.17.07 For change log, see: https://github.com/ColinIanKing/stress-ng/blob/V0.17.07/debian/changelog Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index a02b65c9920..1f704809de8 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7ad1f30237011149e7f83451ea7cb49e88c0a79bed55e29b556c6a72b9f1d79d stress-ng-0.15.07.tar.gz +sha256 b0bc1495adce6c7a1f82d53f363682b243d6d7e93a06be7f94c9559c0a311a6f stress-ng-0.17.07.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 24ec4cb5157..04427f70ecf 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRESS_NG_VERSION = 0.15.07 +STRESS_NG_VERSION = 0.17.07 STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING From f09010ecb8cd97ad91e886cafcfaa607344f5625 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 10 Apr 2024 20:13:17 +0200 Subject: [PATCH 0430/3013] configs/imx28evk: bump U-Boot and kernel versions Bump U-Boot to 2024.04 and kernel to 6.6.26 versions. The Kernel DTS name is also updated, to follow the reorganization in [1], first included in v6.5. Fixes: [2] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/6544501164 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- configs/freescale_imx28evk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index bd5b007ed11..24b95eefe53 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,16 +11,16 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.26" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx28-evk" # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem From d8964c003a8b6e650126f02df764c60487e013a2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 30 Mar 2024 15:16:25 +0100 Subject: [PATCH 0431/3013] package/harfbuzz: bump to version 8.4.0 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index f107aee8c2b..1ea54e8ee99 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c harfbuzz-8.3.1.tar.xz +sha256 af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e harfbuzz-8.4.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index e3da4add43f..848fac4dd6e 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.3.1 +HARFBUZZ_VERSION = 8.4.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 4990bccd4e24e9b01b8e1f980dda4062770dfb5c Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 30 Mar 2024 15:30:05 +0100 Subject: [PATCH 0432/3013] package/swugenerator: bump to version 0.3 Upstream github tarball dropped prefix "v" while releasing version 0.3 so let's drop it in swugenerator.mk as well. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/swugenerator/swugenerator.hash | 2 +- package/swugenerator/swugenerator.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/swugenerator/swugenerator.hash b/package/swugenerator/swugenerator.hash index 2125be3d1cf..301f1686817 100644 --- a/package/swugenerator/swugenerator.hash +++ b/package/swugenerator/swugenerator.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b5c47c47be0df4df476d2bf596f58a7296a4b0cebe6c8de42251605475b37d25 swugenerator-0.2.tar.gz +sha256 3f4885242bce9523d26567578793c828e2f07122c6b7e44cce8ede33e5618a01 swugenerator-0.3.tar.gz # Locally computed sha256 checksums sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE diff --git a/package/swugenerator/swugenerator.mk b/package/swugenerator/swugenerator.mk index 466fe1f046e..22ed799e995 100644 --- a/package/swugenerator/swugenerator.mk +++ b/package/swugenerator/swugenerator.mk @@ -4,8 +4,8 @@ # ################################################################################ -SWUGENERATOR_VERSION = 0.2 -SWUGENERATOR_SITE = $(call github,sbabic,swugenerator,v$(SWUGENERATOR_VERSION)) +SWUGENERATOR_VERSION = 0.3 +SWUGENERATOR_SITE = $(call github,sbabic,swugenerator,$(SWUGENERATOR_VERSION)) SWUGENERATOR_LICENSE = GPL-3.0 SWUGENERATOR_LICENSE_FILES = LICENSE HOST_SWUGENERATOR_SETUP_TYPE = setuptools From 70031dd7fa09191566f2d1e895399ae578c62d1b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 19:00:23 +0100 Subject: [PATCH 0433/3013] package/php: fix build without threads Fix the following build failure without threads raised since bump to version 8.3.4 in commit e50460f9f12a8c5f82f2166733afe9cca3c8cd19 and https://github.com/php/php-src/commit/a11c8a30399e90c17c287b9656c0077bc5131c9c: /home/buildroot/instance-0/output-1/build/php-8.3.4/Zend/zend_call_stack.c:39:11: fatal error: pthread.h: No such file or directory 39 | # include | ^~~~~~~~~~~ Fixes: e50460f9f12a8c5f82f2166733afe9cca3c8cd19 - http://autobuild.buildroot.org/results/a4ef648a9da50b26ed56d5d490e4cf5a1bfff970 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ll_stack.c-fix-build-without-pthread.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/php/0006-Zend-zend_call_stack.c-fix-build-without-pthread.patch diff --git a/package/php/0006-Zend-zend_call_stack.c-fix-build-without-pthread.patch b/package/php/0006-Zend-zend_call_stack.c-fix-build-without-pthread.patch new file mode 100644 index 00000000000..10b00836559 --- /dev/null +++ b/package/php/0006-Zend-zend_call_stack.c-fix-build-without-pthread.patch @@ -0,0 +1,39 @@ +From c3e37c438a11d59d858fcc7b46eac00a8074972b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 30 Mar 2024 17:51:55 +0100 +Subject: [PATCH] Zend/zend_call_stack.c: fix build without pthread + +Fix the following build failure without pthread raised since version +8.3.0 and +https://github.com/php/php-src/commit/a11c8a30399e90c17c287b9656c0077bc5131c9c: + +/home/buildroot/instance-0/output-1/build/php-8.3.4/Zend/zend_call_stack.c:39:11: fatal error: pthread.h: No such file or directory + 39 | # include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a4ef648a9da50b26ed56d5d490e4cf5a1bfff970 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/php/php-src/pull/13843 +--- + Zend/zend_call_stack.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Zend/zend_call_stack.c b/Zend/zend_call_stack.c +index 97cbed9041..97de938a0f 100644 +--- a/Zend/zend_call_stack.c ++++ b/Zend/zend_call_stack.c +@@ -35,7 +35,8 @@ + # include + # endif + #endif /* ZEND_WIN32 */ +-#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) ++#if (defined(HAVE_PTHREAD_GETATTR_NP) && defined(HAVE_PTHREAD_ATTR_GETSTACK)) || \ ++ defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) + # include + #endif + #ifdef __FreeBSD__ +-- +2.43.0 + From 99e9ff08d0705279532ca0cf3de22ea54660cbdc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 10:59:33 +0100 Subject: [PATCH 0434/3013] package/mdadm: bump to version 4.3 https://lore.kernel.org/all/20240215183844.00003735@linux.intel.com Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...not-require-libudev-h-if-DNO_LIBUDEV.patch | 34 +++++++++++++++++++ package/mdadm/mdadm.hash | 2 +- package/mdadm/mdadm.mk | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch diff --git a/package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch b/package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch new file mode 100644 index 00000000000..5c3d6e03b43 --- /dev/null +++ b/package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch @@ -0,0 +1,34 @@ +From 1750758c7ff526e3560433f6235e5cfa35cf646a Mon Sep 17 00:00:00 2001 +From: Mariusz Tkaczyk +Date: Wed, 6 Mar 2024 15:50:55 +0100 +Subject: udev.c: Do not require libudev.h if DNO_LIBUDEV + +libudev may not be presented at all, do not require it. + +Reported-by: Boian Bonev +Signed-off-by: Mariusz Tkaczyk + +Upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=1750758c7ff526e3560433f6235e5cfa35cf646a +Signed-off-by: Fabrice Fontaine +--- + udev.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/udev.c b/udev.c +index bc4722b0..066e6ab1 100644 +--- a/udev.c ++++ b/udev.c +@@ -26,7 +26,10 @@ + #include + #include + #include ++ ++#ifndef NO_LIBUDEV + #include ++#endif + + static char *unblock_path; + +-- +cgit 1.2.3-korg + diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash index b9631a2aaa1..84bae1aebfd 100644 --- a/package/mdadm/mdadm.hash +++ b/package/mdadm/mdadm.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz +sha256 416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f mdadm-4.3.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index b54e34b2304..c6178700ef2 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDADM_VERSION = 4.2 +MDADM_VERSION = 4.3 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ From c245b37190f18d1f0551dd95027b2b65fa63e704 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 30 Mar 2024 10:29:02 +0100 Subject: [PATCH 0435/3013] configs/mangopi_mq1rdw1_defconfig: fix build failure due to undefined linux headers Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to prevent error: Incorrect selection of kernel headers: expected 6.8.x, got 6.6.x Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6498278078 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/mangopi_mq1rdw2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mangopi_mq1rdw2_defconfig b/configs/mangopi_mq1rdw2_defconfig index a2f8a1299b8..2249fa4be5e 100644 --- a/configs/mangopi_mq1rdw2_defconfig +++ b/configs/mangopi_mq1rdw2_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="mangopi-mq1rdw2" BR2_TARGET_GENERIC_ISSUE="Welcome to MangoPI MQ1RDW2" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y From 98ee9f8b49ebd7aa6d9dc2c726030ec396910f6c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 10:03:34 +0100 Subject: [PATCH 0436/3013] package/php-xdebug: drop unrecognized variable --with-xdebug is not recognized since the addition of the package in commit 7b7dffd0984e1b274273f5638a975165606384f9: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --disable-dependency-tracking, --enable-ipv6, --disable-nls, --with-xdebug Fixes: 7b7dffd0984e1b274273f5638a975165606384f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/php-xdebug/php-xdebug.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index c5a1e10ebc5..62ef3fa9970 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -14,8 +14,7 @@ PHP_XDEBUG_LICENSE_FILES = LICENSE PHP_XDEBUG_DEPENDENCIES = php host-autoconf PHP_XDEBUG_CONF_OPTS = \ --enable-xdebug \ - --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-xdebug=$(STAGING_DIR)/usr + --with-php-config=$(STAGING_DIR)/usr/bin/php-config define PHP_XDEBUG_PHPIZE (cd $(@D); \ From 4b7aeee28ed2f62370084dac4a92bdef89046b41 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 10:03:35 +0100 Subject: [PATCH 0437/3013] package/php-xdebug: add zlib optional dependency zlib is an optional dependency (enabled by default) since bump to version 3.2.0 in commit 8280400fbadde09e51ccff312d7a4ef6a386f589 and https://github.com/xdebug/xdebug/commit/3954e5cd9e48eec0a8a2a0c6a2fc120bbe562656 Fixes: 8280400fbadde09e51ccff312d7a4ef6a386f589 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/php-xdebug/php-xdebug.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 62ef3fa9970..3bc197e5562 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -25,4 +25,11 @@ endef PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE +ifeq ($(BR2_PACKAGE_ZLIB),y) +PHP_XDEBUG_CONF_OPTS += --with-xdebug-compression +PHP_XDEBUG_DEPENDENCIES += zlib +else +PHP_XDEBUG_CONF_OPTS += --without-xdebug-compression +endif + $(eval $(autotools-package)) From 0f5bbd4458c1307eba7acba2c7f4990973cff115 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 10:03:36 +0100 Subject: [PATCH 0438/3013] package/php-xdebug: bump to version 3.3.1 - License updated to match the PHP 3.01 license: https://github.com/xdebug/xdebug/commit/5fc2d818067d05503226ee8c6442985cb2fe069d - This bump will fix the following build failure raised since bump of php to version 8.3.4 in commit e50460f9f12a8c5f82f2166733afe9cca3c8cd19: checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 8.0.0 and < 8.3.0 (found 8.3.4) https://xdebug.org/updates#x_3_3_1 Fixes: e50460f9f12a8c5f82f2166733afe9cca3c8cd19 - http://autobuild.buildroot.org/results/0209b522baec3c88a2060e79f805552db79b2c70 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/php-xdebug/php-xdebug.hash | 4 ++-- package/php-xdebug/php-xdebug.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 2509e6e2eee..251b79ab774 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157 xdebug-3.2.2.tgz -sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE +sha256 4eb4ee270bbcc5f14195c38f6ee58580e007cf4886ce32e11430318ab5bc2315 xdebug-3.3.1.tgz +sha256 bc2aee27f3f0806be39e329d284ddbbfb14602a49af261df305dd6122d988eb0 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 3bc197e5562..771b96534ac 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,11 +4,11 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.2.2 +PHP_XDEBUG_VERSION = 3.3.1 PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES -PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) +PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.01-like) PHP_XDEBUG_LICENSE_FILES = LICENSE # phpize does the autoconf magic PHP_XDEBUG_DEPENDENCIES = php host-autoconf From f7589fa7add9f88be91b88e59b46754b70506be3 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Thu, 28 Mar 2024 17:49:56 +0100 Subject: [PATCH 0439/3013] package/libgit2: bump to version 1.8.0 The license file was updated for two reasons: * This version now bundles ntlmclient. NTLM support is disabled by the buildroot package. * The bundled zlib version (that buildroot does not use) was updated and its copyright years changed. This version also adds support for using the SSH binary (at an hardcoded /usr/bin/ssh path) instead of using libssh2. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 022fb35a9c9..20e69292653 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f libgit2-1.7.2.tar.gz -sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING +sha256 9e1d6a880d59026b675456fbb1593c724c68d73c34c0d214d6eb848e9bbd8ae4 libgit2-1.8.0.tar.gz +sha256 08041a7e9c4d0e5e84f9711c824a0bd0366ee782ec29c6d7275fdab73e2ca115 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 498b6658088..3364841e8f2 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.7.2 +LIBGIT2_VERSION = 1.8.0 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ @@ -42,7 +42,9 @@ endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBGIT2_DEPENDENCIES += libssh2 -LIBGIT2_CONF_OPTS += -DUSE_SSH=ON +LIBGIT2_CONF_OPTS += -DUSE_SSH=libssh2 +else ifeq ($(BR2_PACKAGE_OPENSSH_CLIENT),y) +LIBGIT2_CONF_OPTS += -DUSE_SSH=exec else LIBGIT2_CONF_OPTS += -DUSE_SSH=OFF endif From ad8af5a2c75caa39eab911c775e9ce775497b57b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 29 Mar 2024 12:52:45 -0600 Subject: [PATCH 0440/3013] package/flutter-sdk-bin: bump version to 3.19.5 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index 1102c50cc6a..b697b9cc900 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 66adfe6b6559a2e2f1fdbf89c938d0af53add3860c854c79dbbd5452f5d2290a flutter_linux_3.19.4-stable.tar.xz +sha256 6590607e7f2fb23bcc7e0a2d6aac292f9208cbf12a40862c281058c758604fb3 flutter_linux_3.19.5-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index f8453c3090c..321c08680fd 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.19.4 +FLUTTER_SDK_BIN_VERSION = 3.19.5 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause From b53a5425569d2176b951a18ad04c179cf3fff5ce Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 29 Mar 2024 12:52:46 -0600 Subject: [PATCH 0441/3013] package/flutter-engine: bump version to 3.19.5 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/flutter-engine/flutter-engine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index ff21e0949d6..d9c2b3dee59 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.19.4 +FLUTTER_ENGINE_VERSION = 3.19.5 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = From aa4c77b4a886e0d85ee38f2edc99eb3f33fed663 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Tue, 26 Mar 2024 20:05:38 +0100 Subject: [PATCH 0442/3013] package/procs: bump to version 0.14.5 Release notes: https://github.com/dalance/procs/releases/tag/v0.14.5 Signed-off-by: Saeed Kazemi Signed-off-by: Thomas Petazzoni --- package/procs/procs.hash | 2 +- package/procs/procs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index a3ec5d2b75d..93be601c6d2 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 22d9ef44bf06bbd6d0d463a40678a1560a9125fdc6e6fbb5db294e05a174ea01 procs-0.14.4.tar.gz +sha256 d90d350ebac64b6a5b2c89881421c27d266653ec1f4a6ed10e32892fe38d3c60 procs-0.14.5.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index 34e874a4f20..019e69a1dec 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.4 +PROCS_VERSION = 0.14.5 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE From 1b6e6b563305a0469d6e3216cafa82c1b81ce82d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 26 Mar 2024 23:50:29 +0100 Subject: [PATCH 0443/3013] package/rtl8821cu: bump to version 2024-03-25 With this version we can build with Linux 6.9. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/rtl8821cu.hash | 2 +- package/rtl8821cu/rtl8821cu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash index b3d6d2c569d..fba2f7a1090 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3ccec54462a8668142a9c2b2ddfffe4e0434feebe6caf6a7de6812dc8713c37f rtl8821cu-5b39398e2de146edeb76716420f3288f508bea61.tar.gz +sha256 c04741129e815c30c51e509012d1a21e4f6d568c211921e6bc46e1adc3d4d4e1 rtl8821cu-0b505f382ea67bd8bdc9288ba5dbe7f4c9de33c0.tar.gz sha256 22cdb0a9cf492dbf05c5b27381a5c0e73ae0d4622427b522b0ba92b7495e5fb0 LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 8cb8ea710b4..39aea1d7a4c 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821CU_VERSION = 5b39398e2de146edeb76716420f3288f508bea61 +RTL8821CU_VERSION = 0b505f382ea67bd8bdc9288ba5dbe7f4c9de33c0 RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE From 949232218a73dac849e5589caf803ea3f8b2ea4b Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 26 Mar 2024 23:50:30 +0100 Subject: [PATCH 0444/3013] package/rtl8192eu: bump to 2024-03-25 version This version allows to build with Linux 6.9. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index a08ed040103..a8b7cb9358e 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b5d3b8de0b4f05aa2b452dd01f4386e9b671e03c2bbf8e032f1c593befc5a153 rtl8192eu-e90a6043be141bde8847e84223e106eff38ecdfd.tar.gz +sha256 8da0f54bd9ae094b5f61fe3c4dd207b2df62b4286970e2828f7c5ce1146447fb rtl8192eu-56f672a8b9572c743148f2e60068fd341d52d5a3.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 3d24b0caf86..0f00d301a80 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = e90a6043be141bde8847e84223e106eff38ecdfd +RTL8192EU_VERSION = 56f672a8b9572c743148f2e60068fd341d52d5a3 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From dd79b8dd60ab6817f2d3a0db9eedc1526005c9be Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 26 Mar 2024 23:50:31 +0100 Subject: [PATCH 0445/3013] package/libblockdev: bump to version 3.1.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 79700a4996f..1438fad7417 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb libblockdev-3.1.0.tar.gz +sha256 a5cb33a53ff5969067982704f45399d02555fdb2313ed0c56eac9555397dc2db libblockdev-3.1.1.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index ebf01acfb5c..9ffa15a7a9d 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 3.1.0 +LIBBLOCKDEV_VERSION = 3.1.1 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE From 07ef00df9bdff1486622fe8248168137aa531c9d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 27 Mar 2024 17:23:19 +0100 Subject: [PATCH 0446/3013] support/testing: TestFileCapabilities: update kernel to 4.19.310 Since the toolchain Bootlin update to 2023.11-1 [1], the arm Linux kernel build is broken with binutils >= 2.41 with: arch/arm/mm/proc-v7.S: Assembler messages: arch/arm/mm/proc-v7.S:640: Error: junk at end of line, first unrecognized character is `#' A similar issue has already be fixed for qemu m68k [2]. Bump to the latest kernel 4.19 that already include the backport of 790756c7e022 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 [2] a1ce9474e40f731f327035d8c0962abb16f00ff7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6414160106 (TestFileCapabilities) Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/core/test_file_capabilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/core/test_file_capabilities.py b/support/testing/tests/core/test_file_capabilities.py index fe21d76c94a..e2600ae7945 100644 --- a/support/testing/tests/core/test_file_capabilities.py +++ b/support/testing/tests/core/test_file_capabilities.py @@ -13,7 +13,7 @@ class TestFileCapabilities(infra.basetest.BRTest): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.310" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y From d4833cc14df8496bb98e5ccbf0c020fdd502edc9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 27 Mar 2024 18:23:51 +0100 Subject: [PATCH 0447/3013] package/python-segno: add missing python3-{pyexpat, zlib} dependencies The last version bump removed python-setuptools runtime dependency but doing so also removed the python3-pyexpat and python3-zlib runtime depdencies [1] that are actually direct runtime dependencies. [1] 081162580f99d1a68133f7f513bf2cd6d1b8b6b6 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656982 (TestPythonPy3Segno) Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/python-segno/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-segno/Config.in b/package/python-segno/Config.in index 7107e674436..e6080fd4173 100644 --- a/package/python-segno/Config.in +++ b/package/python-segno/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_SEGNO bool "python-segno" + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help QR Code and Micro QR Code generator for Python. From ee074ddf6f0d00a97a1cae4ba62c1cffc77bb6e4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 27 Mar 2024 17:22:07 +0100 Subject: [PATCH 0448/3013] package/python-service-identity: add missing python-cryptography dependency The last version bump removed python-pyopenssl runtime dependency but doing so also removed the python-cryptography runtime depdency [1] that is actually a direct runtime dependency. While at it, update BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS dependency comment. [1] 6008f2b1b901be1374ac201b5e560cca61b4b61e Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656983 (TestPythonPy3ServiceIdentity) Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/python-service-identity/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index dccd8f37c0e..3bb5c08c6f0 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - # python-pyopenssl -> python-cryptography - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime help From 5652306f7e72792655f0b2b2ea978734fc2e5938 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 26 Mar 2024 13:16:34 +0100 Subject: [PATCH 0449/3013] package/petitboot: bump to version 1.15 Signed-off-by: Laurent Vivier Signed-off-by: Thomas Petazzoni --- package/petitboot/petitboot.hash | 2 +- package/petitboot/petitboot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash index a9a21f2c1b6..3a90bc52967 100644 --- a/package/petitboot/petitboot.hash +++ b/package/petitboot/petitboot.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fa2367370d3ce5dd9910ab08a0832071e2508c8bf75cfec6d3b9807fbefc507a petitboot-v1.14.tar.gz +sha256 eed29ec841c2bcd5ecc65347f5b95a0087a541bd9c04ca3c17c55d1f7357d189 petitboot-v1.15.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 4c8bc35adb3..cd7631fa5ca 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -PETITBOOT_VERSION = 1.14 +PETITBOOT_VERSION = 1.15 PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) PETITBOOT_DEPENDENCIES = \ From 63a673c7e38154bb14cb1f87ee5d2a1b05fc956b Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Tue, 26 Mar 2024 11:13:07 +0100 Subject: [PATCH 0450/3013] package/openlayers: bump version to 9.1.0 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index af9087ede26..31496bbfcaf 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 867778afdd66cd29fe0f14ac4ed316a0ab393f5dccfd2219450848cd0347f1d6 v8.1.0-package.zip +sha256 73acb923c0ef53c6b6bb34b6dba782e03e1d24279f5aadbec5e787269456a6d8 v9.1.0-package.zip sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index fde83d6e844..df29e04e65c 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 8.1.0 +OPENLAYERS_VERSION = 9.1.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From 4adee4fa6a3471426b1a7fb1688818edaf899344 Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Tue, 26 Mar 2024 11:26:34 +0100 Subject: [PATCH 0451/3013] package/vuejs: bump to version 3.4.21 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs/vuejs.hash | 2 +- package/vuejs/vuejs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index d3bca468034..2785a24eca4 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5d3ab0144d5b8eaf28ccfbf27500669a91463226c4767041c7293ce76065171a vue-3.3.4.tgz +sha256 5772054f07ee4d86b831b963a889b9b3e60764f4fe909c1ccddd00fd628bc6c7 vue-3.4.21.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index 29bf3bc66bc..3ab71820839 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.3.4 +VUEJS_VERSION = 3.4.21 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT From cd960ddd3765ec5b883ba9c6f9d921453c3e327a Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Tue, 26 Mar 2024 11:26:35 +0100 Subject: [PATCH 0452/3013] package/vuejs-router: bump to version 4.3.0 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs-router/vuejs-router.hash | 2 +- package/vuejs-router/vuejs-router.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index f87d18f7ed9..38f0bb5b8bd 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 61dc033860c42a2f3af046d461ef14348b1fe9094b27d107f7be6d1420d39b11 vue-router-4.2.5.tgz +sha256 466a762bd6e9fb0e1ec33dca0b0ed3ecf31f25186e7ef03906716d69e9ecf3c7 vue-router-4.3.0.tgz sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index 7f73fed5d52..1aa13726381 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.2.5 +VUEJS_ROUTER_VERSION = 4.3.0 VUEJS_ROUTER_SOURCE = vue-router-$(VUEJS_ROUTER_VERSION).tgz VUEJS_ROUTER_SITE = https://registry.npmjs.org/vue-router/- VUEJS_ROUTER_LICENSE = MIT From 9abe9f518c68c021057fa5f411af37f691dbbbd9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 11 Apr 2024 00:14:48 +0200 Subject: [PATCH 0453/3013] support/testing: regenerate .checkpackageignore used in TestCheckPackage Commit ccb4e5db5c ("utils/check-package: emit library name along with check function name") updated the .checkpackageignore format but forgot to update .checkpackageignore files used in TestCheckPackage. Keep .checkpackageignore_outdated as is since it must be outdated. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6568786785 Cc: Yann E. MORIN Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/utils/br2-external/.checkpackageignore | 2 +- .../tests/utils/br2-external/package/.checkpackageignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/br2-external/.checkpackageignore b/support/testing/tests/utils/br2-external/.checkpackageignore index efb76801738..2a29916d08d 100644 --- a/support/testing/tests/utils/br2-external/.checkpackageignore +++ b/support/testing/tests/utils/br2-external/.checkpackageignore @@ -1 +1 @@ -package/external/external.mk PackageHeader +package/external/external.mk lib_mk.PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore b/support/testing/tests/utils/br2-external/package/.checkpackageignore index 5f4a5e11876..a9368d1c1c3 100644 --- a/support/testing/tests/utils/br2-external/package/.checkpackageignore +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore @@ -1 +1 @@ -external/external.mk PackageHeader +external/external.mk lib_mk.PackageHeader From eb16148dddc6be39b0d850181c2461fdaba1ee6f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 11 Apr 2024 00:18:04 +0200 Subject: [PATCH 0454/3013] support/testing: sync TestATFAllwinner with orangepi_zero_plus2_defconfig u-boot-2021.04 seems to be broken when pylibfdt support is enabled and the latest python3/setuptools are used. Since the TestATFAllwinner is using bananapi_m64 as u-boot defconfig but the Buildroot defconfig of this board was removed in 2022.11 [1] update TestATFAllwinner to use a newer BSP. Use the one provided by orangepi_zero_plus2_defconfig. [1] daf3c6661f823e566b6310042884c36c1d73f1de Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656317 (TestATFAllwinner) Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/boot/test_atf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 4fcb9b241c1..1995f83a54c 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -34,15 +34,15 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" # BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" - BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" + BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 107bcd536dae1bc26e4f34ed510484d3abcc6b5f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 11 Apr 2024 00:18:05 +0200 Subject: [PATCH 0455/3013] support/testing: remove TestATFVexpress TestATFVexpress is using vexpress_aemv8a_juno as as u-boot defconfig but the Buildroot defconfig of this board was removed in 2022.11 [1] Since both TestATFVexpress and TestATFAllwinner are now using mainline ATF, we don't really need several ATF test anymore. Initially [2], several runtime test were added to test ATF/U-Boot combinations when ATF was provided by a vendor: vexpress (mainline), Allwinner and Marvell. Keep TestATFAllwinner as ATF mainline test. [1] 347c1087388d7782e6865f112f195e6780d473a7 [2] 8cf3ce04e9c4a4c4685b80edd9e8e873fe44d8e8 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/boot/test_atf.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 1995f83a54c..352725e721c 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -1,31 +1,6 @@ import infra.basetest -class TestATFVexpress(infra.basetest.BRTest): - config = \ - """ - BR2_aarch64=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.5" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y - BR2_TARGET_UBOOT=y - BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" - BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" - BR2_TARGET_VEXPRESS_FIRMWARE=y - """ - - def test_run(self): - pass - - class TestATFAllwinner(infra.basetest.BRTest): config = \ """ From 15381b57559182693f6d5530544937f8fcf3b471 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 11 Apr 2024 00:18:03 +0200 Subject: [PATCH 0456/3013] package/python-pypng: add missing python3-zlib dependency png.py import zlib [1] so python3-zlib needs to be installed at runtime. [1] https://gitlab.com/drj11/pypng/-/blob/pypng-0.20220715.0/code/png.py?ref_type=tags#L185 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656971 (TestPythonPy3Qrcode) Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/python-pypng/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pypng/Config.in b/package/python-pypng/Config.in index c1ed4056157..952b46c2c5d 100644 --- a/package/python-pypng/Config.in +++ b/package/python-pypng/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYPNG bool "python-pypng" + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Pure Python library for saving and loading PNG images. From 0b2967e15800421efbdfe3a7a6061cf6bd84134d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 11 Apr 2024 17:20:16 +0200 Subject: [PATCH 0457/3013] package/skeleton-init-sysv: Set sticky bit on /dev/shm /dev/shm is a world-writable directory, like /tmp, and should also have the sticky bit set. Without this, any user can delete and replace another user's files in /dev/shm. This bug has been present since /dev/shm was added to the skeleton /etc/fstab, but appears to have been fixed for systems using systemd by commit 76fc9275f14e "system: separate sysv and systemd parts of the skeleton" which went into Buildroot 2017.08. Signed-off-by: Ben Hutchings Fixes: 22fde22e35f98f7830c2f8955465532328348cd1 Signed-off-by: Yann E. MORIN --- package/skeleton-init-sysv/skeleton/etc/fstab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/skeleton-init-sysv/skeleton/etc/fstab b/package/skeleton-init-sysv/skeleton/etc/fstab index 169054b74f2..06c20fe9d52 100644 --- a/package/skeleton-init-sysv/skeleton/etc/fstab +++ b/package/skeleton-init-sysv/skeleton/etc/fstab @@ -2,7 +2,7 @@ /dev/root / ext2 rw,noauto 0 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /dev/shm tmpfs mode=1777 0 0 tmpfs /tmp tmpfs mode=1777 0 0 tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0 sysfs /sys sysfs defaults 0 0 From 7fa769dae39ea23a14c02606a23db8978a496e19 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Fri, 12 Apr 2024 07:44:22 +0200 Subject: [PATCH 0458/3013] package/python-pathspec: enable target variant Also a runtime testcase is added. Signed-off-by: Heiko Thiery [yann.morin.1998@free.fr: - fix check-package - small codign style in test sample ] Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-pathspec/Config.in | 7 ++++ package/python-pathspec/python-pathspec.mk | 1 + .../tests/package/sample_python_pathspec.py | 36 +++++++++++++++++++ .../tests/package/test_python_pathspec.py | 11 ++++++ 5 files changed, 56 insertions(+) create mode 100644 package/python-pathspec/Config.in create mode 100644 support/testing/tests/package/sample_python_pathspec.py create mode 100644 support/testing/tests/package/test_python_pathspec.py diff --git a/package/Config.in b/package/Config.in index 0d31faf3544..d9bbf64c951 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1223,6 +1223,7 @@ menu "External python modules" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" source "package/python-pathpy/Config.in" + source "package/python-pathspec/Config.in" source "package/python-pathtools/Config.in" source "package/python-pathvalidate/Config.in" source "package/python-periphery/Config.in" diff --git a/package/python-pathspec/Config.in b/package/python-pathspec/Config.in new file mode 100644 index 00000000000..0453e704196 --- /dev/null +++ b/package/python-pathspec/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PATHSPEC + bool "python-pathspec" + help + pathspec is a utility library for pattern matching of file + paths. + + https://github.com/cpburnz/python-pathspec diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk index c4cb34b4c36..b46dbef7eac 100644 --- a/package/python-pathspec/python-pathspec.mk +++ b/package/python-pathspec/python-pathspec.mk @@ -11,4 +11,5 @@ PYTHON_PATHSPEC_LICENSE = MPL-2.0 PYTHON_PATHSPEC_LICENSE_FILES = LICENSE PYTHON_PATHSPEC_SETUP_TYPE = flit +$(eval $(python-package)) $(eval $(host-python-package)) diff --git a/support/testing/tests/package/sample_python_pathspec.py b/support/testing/tests/package/sample_python_pathspec.py new file mode 100644 index 00000000000..1b5bf62ba2a --- /dev/null +++ b/support/testing/tests/package/sample_python_pathspec.py @@ -0,0 +1,36 @@ +# example from https://pypi.org/project/pathspec/ + +import pathspec + +# The gitignore-style patterns for files to select, but we're including +# instead of ignoring. +spec_text = """ + +# This is a comment because the line begins with a hash: "#" + +# Include several project directories (and all descendants) relative to +# the current directory. To reference a directory you must end with a +# slash: "/" +/project-a/ +/project-b/ +/project-c/ + +# Patterns can be negated by prefixing with exclamation mark: "!" + +# Ignore temporary files beginning or ending with "~" and ending with +# ".swp". +!~* +!*~ +!*.swp + +# These are python projects so ignore compiled python files from +# testing. +!*.pyc + +# Ignore the build directories but only directly under the project +# directories. +!/*/build/ + +""" + +spec = pathspec.PathSpec.from_lines('gitwildmatch', spec_text.splitlines()) diff --git a/support/testing/tests/package/test_python_pathspec.py b/support/testing/tests/package/test_python_pathspec.py new file mode 100644 index 00000000000..4e4a992bb30 --- /dev/null +++ b/support/testing/tests/package/test_python_pathspec.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPathSpec(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PATHSPEC=y + """ + sample_scripts = ["tests/package/sample_python_pathspec.py"] From 2258fc413a3566722e84def281503e49172c117b Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Fri, 12 Apr 2024 07:53:57 +0200 Subject: [PATCH 0459/3013] package/python-yamllint: new package This host package is needed since u-boot 2024.04 for building ti defconfigs. This is an requirement for using buildman/binman [1]. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/buildman/requirements.txt?ref_type=tags#L3 Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-yamllint/Config.in | 8 ++++++++ package/python-yamllint/python-yamllint.hash | 3 +++ package/python-yamllint/python-yamllint.mk | 15 +++++++++++++++ .../tests/package/sample_python_yamllint.py | 13 +++++++++++++ .../testing/tests/package/test_python_yamllint.py | 11 +++++++++++ 6 files changed, 51 insertions(+) create mode 100644 package/python-yamllint/Config.in create mode 100644 package/python-yamllint/python-yamllint.hash create mode 100644 package/python-yamllint/python-yamllint.mk create mode 100644 support/testing/tests/package/sample_python_yamllint.py create mode 100644 support/testing/tests/package/test_python_yamllint.py diff --git a/package/Config.in b/package/Config.in index d9bbf64c951..1935077f0f4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1437,6 +1437,7 @@ menu "External python modules" source "package/python-xmljson/Config.in" source "package/python-xmltodict/Config.in" source "package/python-xmodem/Config.in" + source "package/python-yamllint/Config.in" source "package/python-yarl/Config.in" source "package/python-yatl/Config.in" source "package/python-zc-lockfile/Config.in" diff --git a/package/python-yamllint/Config.in b/package/python-yamllint/Config.in new file mode 100644 index 00000000000..5c0962f09f8 --- /dev/null +++ b/package/python-yamllint/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_YAMLLINT + bool "python-yamllint" + select BR2_PACKAGE_PYTHON_PATHSPEC # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime + help + A linter for YAML files. + + https://github.com/adrienverge/yamllint diff --git a/package/python-yamllint/python-yamllint.hash b/package/python-yamllint/python-yamllint.hash new file mode 100644 index 00000000000..d80e0fdf422 --- /dev/null +++ b/package/python-yamllint/python-yamllint.hash @@ -0,0 +1,3 @@ +# Locally computed sha256 checksums +sha256 7a003809f88324fd2c877734f2d575ee7881dd9043360657cc8049c809eba6cd yamllint-1.35.1.tar.gz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE diff --git a/package/python-yamllint/python-yamllint.mk b/package/python-yamllint/python-yamllint.mk new file mode 100644 index 00000000000..ceaca3b0b8b --- /dev/null +++ b/package/python-yamllint/python-yamllint.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-yamllint +# +################################################################################ + +PYTHON_YAMLLINT_VERSION = 1.35.1 +PYTHON_YAMLLINT_SOURCE = yamllint-$(PYTHON_YAMLLINT_VERSION).tar.gz +PYTHON_YAMLLINT_SITE = https://files.pythonhosted.org/packages/da/06/d8cee5c3dfd550cc0a466ead8b321138198485d1034130ac1393cc49d63e +PYTHON_YAMLLINT_SETUP_TYPE = pep517 +PYTHON_YAMLLINT_LICENSE = GPL-3.0 +PYTHON_YAMLLINT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/support/testing/tests/package/sample_python_yamllint.py b/support/testing/tests/package/sample_python_yamllint.py new file mode 100644 index 00000000000..369a3b8d7d8 --- /dev/null +++ b/support/testing/tests/package/sample_python_yamllint.py @@ -0,0 +1,13 @@ +# example form https://yamllint.readthedocs.io/en/stable/development.html + +from yamllint import (config, linter) + +data = '''--- +- &anchor + foo: bar +- *anchor +''' + +yaml_config = config.YamlLintConfig("extends: default") +for p in linter.run(data, yaml_config): + print(p.desc, p.line, p.rule) diff --git a/support/testing/tests/package/test_python_yamllint.py b/support/testing/tests/package/test_python_yamllint.py new file mode 100644 index 00000000000..226048ae87e --- /dev/null +++ b/support/testing/tests/package/test_python_yamllint.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonYamllint(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_YAMLLINT=y + """ + sample_scripts = ["tests/package/sample_python_yamllint.py"] From 9cda68a7ee95b5d298130c35339c041458c7186f Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Fri, 12 Apr 2024 07:53:59 +0200 Subject: [PATCH 0460/3013] boot/ti-k3-r5-loader: add dependency to yamllint Since U-Boot 2024.04 [1] binman also uses yamllint as dependency [2]. [1] https://source.denx.de/u-boot/u-boot/-/commit/10fee88d42f [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/buildman/requirements.txt?ref_type=tags#L3 Signed-off-by: Heiko Thiery Reviewed-by: Bryan Brattlof Signed-off-by: Yann E. MORIN --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0fb07f2d655..891783e40f5 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -35,8 +35,8 @@ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt TI_K3_R5_LOADER_CPE_ID_VENDOR = denx TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot TI_K3_R5_LOADER_INSTALL_IMAGES = YES -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/binman/binman.rst?plain=1#L377 +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/buildman/requirements.txt # Make sure that all binman requirements are built before ti-k3-r5-loader. TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ @@ -49,6 +49,7 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-python-pylibfdt \ host-python-pyyaml \ host-python-setuptools \ + host-python-yamllint \ ti-k3-boot-firmware TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) From 3dbbc0ae9ff962c4a99aef3cca884428ef3f5fb8 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Fri, 12 Apr 2024 07:54:01 +0200 Subject: [PATCH 0461/3013] uboot/uboot: add new dependency to yamllint Since U-Boot 2024.04 [1] binman also uses yamllint as dependency [2]. [1] https://source.denx.de/u-boot/u-boot/-/commit/10fee88d42f [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/buildman/requirements.txt?ref_type=tags#L3 Signed-off-by: Heiko Thiery Reviewed-by: Bryan Brattlof Signed-off-by: Yann E. MORIN --- boot/uboot/uboot.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index a894654698b..0ee63cabdb5 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -276,10 +276,12 @@ UBOOT_DEPENDENCIES += host-vim endif ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/binman/binman.rst?plain=1#L377 +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.04/tools/buildman/requirements.txt UBOOT_DEPENDENCIES += \ host-python-jsonschema \ - host-python-pyyaml + host-python-pyyaml \ + host-python-yamllint UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) endif From 7d4ba7eaf9ef352edbb120e256a270bbe0e2115d Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Fri, 12 Apr 2024 20:39:57 +0200 Subject: [PATCH 0462/3013] package/ttyd: set CPE_ID_VALID cpe:2.3:a:ttyd_project:ttyd is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DBEDA75E-4E19-48C1-92D7-43E4035BC048 Signed-off-by: TIAN Yuanhao [yann.morin.1998@free.fr: Move to its own patch] Signed-off-by: Yann E. MORIN --- package/ttyd/ttyd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index d0e144b2522..4353251b30a 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -9,5 +9,6 @@ TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE TTYD_DEPENDENCIES = json-c libuv libwebsockets openssl zlib +TTYD_CPE_ID_VALID = YES $(eval $(cmake-package)) From 87943b75310190db05342232046790db0f8e4232 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Fri, 12 Apr 2024 13:58:20 +0000 Subject: [PATCH 0463/3013] package/ttyd: bump to version 1.7.7 Notable changes: - The web terminal is readonly by default now, to make it writable, use -W option. Also set TTYD_CPE_ID_VALID. cpe:2.3:a:ttyd_project:ttyd is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DBEDA75E-4E19-48C1-92D7-43E4035BC048 Signed-off-by: TIAN Yuanhao [yann.morin.1998@free.fr: move CPE_ID_VALID to its own commit] Signed-off-by: Yann E. MORIN --- package/ttyd/ttyd.hash | 2 +- package/ttyd/ttyd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ttyd/ttyd.hash b/package/ttyd/ttyd.hash index b11327c4655..9a407a68fd1 100644 --- a/package/ttyd/ttyd.hash +++ b/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b ttyd-1.7.4.tar.gz +sha256 039dd995229377caee919898b7bd54484accec3bba49c118e2d5cd6ec51e3650 ttyd-1.7.7.tar.gz sha256 8b7e100f8311cb428c57609164d93099bada2599f948359045d1ac876a7a625b LICENSE diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index 4353251b30a..e6cf7919887 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.7.4 +TTYD_VERSION = 1.7.7 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE From 47027fefa4a0c79b03dee381a75647d735a41f9f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 14 Apr 2024 15:05:18 +0200 Subject: [PATCH 0464/3013] package/bmap-tools: update GitHub URL As reported in the README file of the old GitHub URL (i.e. https://github.com/intel/bmap-tools), "The code at this location is no longer maintained and will likely be removed in the future. This project has moved to https://github.com/yoctoproject/bmaptool". Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/bmap-tools/Config.in | 2 +- package/bmap-tools/Config.in.host | 2 +- package/bmap-tools/bmap-tools.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in index 91081069c73..425b7dfb9e0 100644 --- a/package/bmap-tools/Config.in +++ b/package/bmap-tools/Config.in @@ -40,4 +40,4 @@ config BR2_PACKAGE_BMAP_TOOLS python-gpgme is not available. Optimized bzip2 decompression is not supported as pbzip2 is not available. - https://github.com/intel/bmap-tools + https://github.com/yoctoproject/bmaptool diff --git a/package/bmap-tools/Config.in.host b/package/bmap-tools/Config.in.host index a20829030d6..cb4d35a437f 100644 --- a/package/bmap-tools/Config.in.host +++ b/package/bmap-tools/Config.in.host @@ -9,4 +9,4 @@ config BR2_PACKAGE_HOST_BMAP_TOOLS image files, can be copied or flashed a lot faster with bmaptool than with traditional tools like "dd" or "cp". - https://github.com/intel/bmap-tools + https://github.com/yoctoproject/bmaptool diff --git a/package/bmap-tools/bmap-tools.mk b/package/bmap-tools/bmap-tools.mk index 32399ca151c..69a22c4745a 100644 --- a/package/bmap-tools/bmap-tools.mk +++ b/package/bmap-tools/bmap-tools.mk @@ -5,7 +5,7 @@ ################################################################################ BMAP_TOOLS_VERSION = 3.6 -BMAP_TOOLS_SITE = $(call github,intel,bmap-tools,v$(BMAP_TOOLS_VERSION)) +BMAP_TOOLS_SITE = $(call github,yoctoproject,bmaptool,v$(BMAP_TOOLS_VERSION)) BMAP_TOOLS_LICENSE = GPL-2.0 BMAP_TOOLS_LICENSE_FILES = COPYING BMAP_TOOLS_SETUP_TYPE = setuptools From 6e019fed31257a156965c95561ca7c83333a7565 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 14 Apr 2024 15:05:19 +0200 Subject: [PATCH 0465/3013] package/bmap-tools: rename Kconfig prompt to bmaptool Historically, the package was named bmap-tools, and that's the name under which it was introduced in Buildroot. Since then, it has moved to a new home (i. e. to https://github.com/yoctoproject/bmaptool) under the Yocto Project umbrella, and got renamed to bmaptool. To avoid useless churn, we keep the old symbols, and just refer to bmaptool in the prompt. Link: https://patchwork.ozlabs.org/project/buildroot/patch/20240413131757.3627575-2-dario.binacchi@amarulasolutions.com Suggested-by: Yann E. Morin Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/bmap-tools/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in index 425b7dfb9e0..b5ccce786e5 100644 --- a/package/bmap-tools/Config.in +++ b/package/bmap-tools/Config.in @@ -1,5 +1,9 @@ +# Historically, the package was named bmap-tools, and that's the name +# under which it was introduced in Buildroot. Since then, it has moved +# to a new home, and got renamed to bmaptool. To avoid useless churn, +# we keep the old symbols, and just refer to bmaptool in the prompt. config BR2_PACKAGE_BMAP_TOOLS - bool "bmap-tools" + bool "bmaptool (formerly bmap-tools)" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources From 256aa8ed85f8fd65ea0f0f242adb55f95a13eb2b Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 14 Apr 2024 15:05:20 +0200 Subject: [PATCH 0466/3013] package/bmap-tools: bump to version 3.8.0 Note that, although not explicitly specified in the changelog, version 3.7 renamed the file COPYING to LICENSE, requiring corresponding changes in Bildroot related to the license file (specifically, the name and hash). Release notes: - bmap-tools 3.7: * Use GitHub Actions for CI (#109) * Add `poetry` for dependency management and `black` for code formatting (#104) * Add functionality for copying from standard input (#99) * Switch from gpg to gpgme module (#103) - bmaptool 3.8.0: * use 'df -P' for POSIX portable output * bmaptool has new maintainers * bmaptool has a new home * bmaptool is now only called 'bmaptool' and not one of a dozen such variations * switch to use an X.Y.Z versioning number scheme Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/bmap-tools/bmap-tools.hash | 4 ++-- package/bmap-tools/bmap-tools.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/bmap-tools/bmap-tools.hash b/package/bmap-tools/bmap-tools.hash index 82a570ecacd..28a68e8b8eb 100644 --- a/package/bmap-tools/bmap-tools.hash +++ b/package/bmap-tools/bmap-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0658afb972e7221aa16fece3f84e29e5102e901c929253d7fb6040bde28243f7 bmap-tools-3.6.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 3c741ccdd5049b5cb6983bc186f7be8040a132ed7e9c2afda4d9e7390888163c bmap-tools-3.8.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/bmap-tools/bmap-tools.mk b/package/bmap-tools/bmap-tools.mk index 69a22c4745a..3455063e218 100644 --- a/package/bmap-tools/bmap-tools.mk +++ b/package/bmap-tools/bmap-tools.mk @@ -4,11 +4,13 @@ # ################################################################################ -BMAP_TOOLS_VERSION = 3.6 +BMAP_TOOLS_VERSION = 3.8.0 BMAP_TOOLS_SITE = $(call github,yoctoproject,bmaptool,v$(BMAP_TOOLS_VERSION)) BMAP_TOOLS_LICENSE = GPL-2.0 -BMAP_TOOLS_LICENSE_FILES = COPYING +BMAP_TOOLS_LICENSE_FILES = LICENSE BMAP_TOOLS_SETUP_TYPE = setuptools +BMAP_TOOLS_DEPENDENCIES = host-python-poetry-core +HOST_BMAP_TOOLS_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) $(eval $(host-python-package)) From 8d366dbf562a959a3dca3ee6972d5a67f67aa885 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 24 Apr 2024 18:11:36 +0200 Subject: [PATCH 0467/3013] package/elf2flt: fix riscv64 noMMU build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119961 Signed-off-by: Waldemar Brodkorb Signed-off-by: Romain Naour --- ...r-new-style-ctors-when-using-riscv64.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch diff --git a/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch b/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch new file mode 100644 index 00000000000..fea726dab2c --- /dev/null +++ b/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch @@ -0,0 +1,34 @@ +From eead8d5e9f3911243182311f16178c25c6ea03c4 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 23 Mar 2024 07:23:45 +0100 +Subject: [PATCH] fix alignment for new-style ctors when using riscv64 + +Recently uClibc-ng enabled UCLIBC_CTOR_DTOR for riscv64, so +that f.e. C++ applications are running fine. As a side effect +this breaks noMMU support. The problem is the alignment for +the ctors in elf2flt. This patch fixes it. + +Tested with Qemu for ARM, M68k and Xtensa with no regressions. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/uclinux-dev/elf2flt/commit/eead8d5e9f3911243182311f16178c25c6ea03c4 +--- + elf2flt.ld.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/elf2flt.ld.in b/elf2flt.ld.in +index a99c69e..230c382 100644 +--- a/elf2flt.ld.in ++++ b/elf2flt.ld.in +@@ -139,7 +139,7 @@ R_RODAT: *(.gnu.linkonce.r*) + @SYMBOL_PREFIX@_ssro_size = @SYMBOL_PREFIX@_essro - @SYMBOL_PREFIX@_ssro; + PROVIDE(@SYMBOL_PREFIX@_SDA2_BASE_ = @SYMBOL_PREFIX@_ssro + (@SYMBOL_PREFIX@_ssro_size / 2)); + +- . = ALIGN(4) ; ++ . = ALIGN(8) ; + TOR: @SYMBOL_PREFIX@__CTOR_LIST__ = .; + TOR: LONG((@SYMBOL_PREFIX@__CTOR_END__ - @SYMBOL_PREFIX@__CTOR_LIST__) / 4 - 2) + SINGLE_LINK: /* gcc uses crtbegin.o to find the start of +-- +2.30.2 + From 32753c6f9d7c61e1c5b79925b00ad03fa76b5b22 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 24 Apr 2024 19:53:59 +0200 Subject: [PATCH 0468/3013] .github: add a pull request warning that explains the mailing list workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Devoogdt Reviewed-by: J. Neuschäfer Signed-off-by: Yann E. MORIN --- .github/pull_request_template.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000000..319e67d8613 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,6 @@ +Please do not submit a Pull Request via GitHub. Buildroot makes use of a +[mailing list](http://lists.buildroot.org/mailman/listinfo/buildroot) for patch submission and review. +See [submitting your own patches](http://buildroot.org/manual.html#submitting-patches) for more info. + +Thanks for your help! + From dfaa34ddd3398f22718f7361d617d98d53b51630 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 25 Apr 2024 18:07:32 +0200 Subject: [PATCH 0469/3013] package/python-pillow: security bumo to version 10.3.0 In _imagingcms.c in Pillow before 10.3.0, a buffer overflow exists because strcpy is used instead of strncpy. Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 001fb62676f..073b758dfe9 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ -# md5, sha256 from https://pypi.org/pypi/pillow/json -md5 13de96f9f98bc1c26439d64576a48ac6 pillow-10.2.0.tar.gz -sha256 e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e pillow-10.2.0.tar.gz +# md5, sha256 https://pypi.org/project/pillow/10.3.0/#copy-hash-modal-125abe0d-59be-40cd-89a3-3e2f78136be0 +md5 6c21a12849ae42f93881f614d8f6f651 pillow-10.3.0.tar.gz +sha256 9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d pillow-10.3.0.tar.gz # Locally computed sha256 checksums sha256 e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 7f5b4dd0f96..38214376ce0 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.2.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/f8/3e/32cbd0129a28686621434cbf17bb64bf1458bfb838f1f668262fefce145c +PYTHON_PILLOW_VERSION = 10.3.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ef/43/c50c17c5f7d438e836c169e343695534c38c77f60e7c90389bd77981bc21 PYTHON_PILLOW_SOURCE = pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From b5b927881daf3023ad38b4e910ab79ad081f7ee4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 19:33:50 +0200 Subject: [PATCH 0470/3013] package/php: security bump version to 8.3.6 Fixes CVE-2024-1874, CVE-2024-2756, CVE-2024-2757 & CVE-2024-3096. Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/424 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 96f16ff2a76..4378d7ed072 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63 php-8.3.4.tar.xz +sha256 53c8386b2123af97626d3438b3e4058e0c5914cb74b048a6676c57ac647f5eae php-8.3.6.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 99dbec9de79..5b26ec90e2f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.4 +PHP_VERSION = 8.3.6 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From b059e084201108255db61a27824d4bb8159d1054 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 Apr 2024 18:19:14 +0200 Subject: [PATCH 0471/3013] package/tinycbor: override prefix at build time as well To ensure the correct prefix is used in the generated tinycbor.pc instead of /usr/local: >>> tinycbor 0.6.0 Building .. sed > tinycbor.pc < tinycbor.pc.in \ -e 's,@prefix@,/usr/local,' \ -e 's,@exec_prefix@,/usr/local,' \ -e 's,@libdir@,/usr/local/lib,' \ -e 's,@includedir@,/usr/local/include,' \ -e 's,@version@,0.6.0,' >>> tinycbor 0.6.0 Installing to staging directory .. install -m 644 tinycbor.pc /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/tinycbor.pc Signed-off-by: Peter Korsgaard --- package/tinycbor/tinycbor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index cad50e633b4..d2fb583e675 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) TINYCBOR_DEPENDENCIES += cjson endif -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 prefix=/usr ifeq ($(BR2_STATIC_LIBS),y) TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 @@ -34,12 +34,12 @@ endef define TINYCBOR_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TINYCBOR_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(STAGING_DIR) prefix=/usr install + DESTDIR=$(STAGING_DIR) install endef define TINYCBOR_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TINYCBOR_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(TARGET_DIR) prefix=/usr install + DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 1126be70ffb5c2b3255ceb9219362a8a45dd68d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 18 Apr 2024 19:09:34 +0200 Subject: [PATCH 0472/3013] package/freerdp: security bump to version 2.11.6 Fix the following CVEs: - CVE-2024-32041 [Low[ OutOfBound Read in zgfx_decompress_segment - CVE-2024-32039 [Moderate] Integer overflow & OutOfBound Write in clear_decompress_residual_data - CVE-2024-32040 [Low] integer underflow in nsc_rle_decode - CVE-2024-32458 [Low] OutOfBound Read in planar_skip_plane_rle - CVE-2024-32459 [Low] OutOfBound Read in ncrush_decompress - CVE-2024-32460 [Low] OutOfBound Read in interleaved_decompress https://github.com/FreeRDP/FreeRDP/releases/tag/2.11.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index daf933e0afe..9ac9b25066a 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 -sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.6.tar.gz.sha256 +sha256 ad5a0c7761b18af914041ed50902d6c9fd553e65eeba8a1bea41c4149980b84c freerdp-2.11.6.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 29b33f61c32..8e359cbb4f7 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.5 +FREERDP_VERSION = 2.11.6 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From ff36bc68cdba30f2a76da2b9f2047aa9a514e07e Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 25 Apr 2024 17:55:42 +0200 Subject: [PATCH 0473/3013] package/openjpeg: security bump to version 2.5.2 Fixes the following security issues: CVE-2021-3575: A heap-based buffer overflow was found in openjpeg in color.c:379:42 in sycc420_to_rgb when decompressing a crafted .j2k file. An attacker could use this to execute arbitrary code with the permissions of the application compiled against openjpeg. Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- package/openjpeg/openjpeg.hash | 2 +- package/openjpeg/openjpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index cfa0e01b7d7..1e720547242 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a openjpeg-2.5.0.tar.gz +sha256 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a openjpeg-2.5.2.tar.gz sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index 5b03a6cf587..e7cb7505e92 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENJPEG_VERSION = 2.5.0 +OPENJPEG_VERSION = 2.5.2 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE From 1989b1a0ab0c867dfc95cf9e1ce55c19ccd02e31 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 25 Apr 2024 10:09:21 +0300 Subject: [PATCH 0474/3013] configs/solidrun_clearfog: bump kernel to 6.6.28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust DTS_NAME to current kernel source tree location of DTs in per-vendor directories. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6665749909 Cc: Jan Kundrát Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- configs/solidrun_clearfog_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/solidrun_clearfog_defconfig b/configs/solidrun_clearfog_defconfig index b73b9e8ecbb..7f633d30d52 100644 --- a/configs/solidrun_clearfog_defconfig +++ b/configs/solidrun_clearfog_defconfig @@ -5,8 +5,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_NEON=y -# Linux headers same as kernel, a 4.20 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog/post-build.sh" @@ -16,11 +16,11 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="armada-388-clearfog-base" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-388-clearfog-base" BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem From 086035d4f953d07467f5982fc0b8a686e20026d6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 24 Apr 2024 10:31:18 +0200 Subject: [PATCH 0475/3013] package/lua-mqtt: bump to version 0.3.2 diff COPYRIGHT: -Copyright (C) 2022-2023 Francois Perrad. +Copyright (C) 2022-2024 Francois Perrad. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lua-mqtt/lua-mqtt.hash | 4 ++-- package/lua-mqtt/lua-mqtt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-mqtt/lua-mqtt.hash b/package/lua-mqtt/lua-mqtt.hash index fecd4dbbdd2..287a583f2c3 100644 --- a/package/lua-mqtt/lua-mqtt.hash +++ b/package/lua-mqtt/lua-mqtt.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 0444119ab5a1230e38e35f3948db19e8dc6310991b419ca75e6660588f2d95f7 lua-mqtt-0.3.1-1.src.rock -sha256 c8d12c868b979f5b9592eec503fc3de54e9feb92163f3cfc50a141ee2bcccc25 lua-mqtt-0.3.1/COPYRIGHT +sha256 fe2dba2c6d99c0099f5dceeb8063e06348c3fc492e8d2f8f35d49197e8a36985 lua-mqtt-0.3.2-1.src.rock +sha256 3db678c27de7ac8811e5e926b1d67923a07c2abe85a28387e6af96d0f654d0b5 lua-mqtt-0.3.2/COPYRIGHT diff --git a/package/lua-mqtt/lua-mqtt.mk b/package/lua-mqtt/lua-mqtt.mk index a000ffdb16b..03d28853b95 100644 --- a/package/lua-mqtt/lua-mqtt.mk +++ b/package/lua-mqtt/lua-mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_MQTT_VERSION = 0.3.1-1 +LUA_MQTT_VERSION = 0.3.2-1 LUA_MQTT_LICENSE = MIT LUA_MQTT_LICENSE_FILES = $(LUA_MQTT_SUBDIR)/COPYRIGHT From 75c73c31ac881f095966dbeae8dcc3668b13939b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 24 Apr 2024 10:31:19 +0200 Subject: [PATCH 0476/3013] package/lua-silva: bump to version 0.2.1 diff COPYRIGHT: -Copyright (C) 2017-2023 Francois Perrad. +Copyright (C) 2017-2024 Francois Perrad. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lua-silva/lua-silva.hash | 4 ++-- package/lua-silva/lua-silva.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-silva/lua-silva.hash b/package/lua-silva/lua-silva.hash index 3ceab6572bf..aa63d6ef30e 100644 --- a/package/lua-silva/lua-silva.hash +++ b/package/lua-silva/lua-silva.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 fa838ed10b2e2c16f76fff9e47d52cde1f250efd73994865090d85218c2e5368 lua-silva-0.2.0-1.src.rock -sha256 638206532ac117ec92a04791045e274e6aa55c3d7f408cd2be993a00424c2f96 lua-Silva-0.2.0/COPYRIGHT +sha256 f06ceb2bfbd73b192459455fb8983c4a4ad6f1b895fe5513651a3308865c389c lua-silva-0.2.1-1.src.rock +sha256 e0c12da9671784c2f51e7db81bf98014365da94bfde81de3e88f2addd683c4be lua-Silva-0.2.1/COPYRIGHT diff --git a/package/lua-silva/lua-silva.mk b/package/lua-silva/lua-silva.mk index 809ac3dd2d7..4cbd53d4ca0 100644 --- a/package/lua-silva/lua-silva.mk +++ b/package/lua-silva/lua-silva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_SILVA_VERSION = 0.2.0-1 +LUA_SILVA_VERSION = 0.2.1-1 LUA_SILVA_NAME_UPSTREAM = lua-Silva LUA_SILVA_LICENSE = MIT LUA_SILVA_LICENSE_FILES = $(LUA_SILVA_SUBDIR)/COPYRIGHT From c7ec640ec22dc19e76631ab8ca7446cc69653241 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 24 Apr 2024 10:31:20 +0200 Subject: [PATCH 0477/3013] package/lpeg: bump to version 1.1.0 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lpeg/lpeg.hash | 4 ++-- package/lpeg/lpeg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lpeg/lpeg.hash b/package/lpeg/lpeg.hash index cb995bde2c5..1dbd522b2ec 100644 --- a/package/lpeg/lpeg.hash +++ b/package/lpeg/lpeg.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock +sha256 6637fcf4d3ddef7be490a2f0155bd2dcd053272d1bb78c015498709ef9fa75dd lpeg-1.1.0-1.src.rock # computed locally -sha256 2b80a8cce793e008ba433e5e0184f20aca4a67ec741439fafd86a874a6a91c49 lpeg-1.0.2/lpeg.html +sha256 3f4f8a7997d9e0d9d0fca6d2b9877a5714251fff056783dd71288413b0abcf36 lpeg-1.1.0/lpeg.html diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk index 7326e59e010..35fadb5791a 100644 --- a/package/lpeg/lpeg.mk +++ b/package/lpeg/lpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LPEG_VERSION = 1.0.2-1 +LPEG_VERSION = 1.1.0-1 LPEG_LICENSE = MIT LPEG_LICENSE_FILES = $(LPEG_SUBDIR)/lpeg.html From db37b0e27d3c54d27b854edbc3253d29f512a6ee Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 24 Apr 2024 10:31:21 +0200 Subject: [PATCH 0478/3013] package/lua-dkjson: bump to version 2.7 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lua-dkjson/lua-dkjson.hash | 4 ++-- package/lua-dkjson/lua-dkjson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-dkjson/lua-dkjson.hash b/package/lua-dkjson/lua-dkjson.hash index 8f1a6f6a2f5..2f210e497dc 100644 --- a/package/lua-dkjson/lua-dkjson.hash +++ b/package/lua-dkjson/lua-dkjson.hash @@ -1,5 +1,5 @@ # computed by luarocks/buildroot -sha256 e4ba15f2a85f84ffc7f628157a4ad16b2b04ba05eb44a2e5956fa46bd104125e dkjson-2.6-1.src.rock +sha256 f6101a0e77ca857ec20799f6b998a600b04c8dd09b27c445ea09f29695bfffb0 dkjson-2.7-1.src.rock # locally computed -sha256 7fd6585e9776c1cf2930e8ce660b3116c8a9b4b676929d45078870a42f16aa65 dkjson-2.6/readme.txt +sha256 9d46e06db7feb8fd68f73bd024c8a2c04807629e16f396880860d151b60a3ed1 dkjson-2.7/readme.txt diff --git a/package/lua-dkjson/lua-dkjson.mk b/package/lua-dkjson/lua-dkjson.mk index 718c47f50e9..2b110f8f1e1 100644 --- a/package/lua-dkjson/lua-dkjson.mk +++ b/package/lua-dkjson/lua-dkjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_DKJSON_VERSION = 2.6-1 +LUA_DKJSON_VERSION = 2.7-1 LUA_DKJSON_NAME_UPSTREAM = dkjson LUA_DKJSON_LICENSE = MIT LUA_DKJSON_LICENSE_FILES = $(LUA_DKJSON_SUBDIR)/readme.txt From 544684291a6174130575ac6e7ecc978aacb78a92 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Sat, 13 Apr 2024 06:25:27 +0200 Subject: [PATCH 0479/3013] package/axel: bump version to 2.17.14 Remove ac_cv_prog_cc_c99; axel has been updated to autoconf 2.72, whose C99 test is compatible with BR2_USE_WCHAR=n. Signed-off-by: Ismael Luceno Signed-off-by: Arnout Vandecappelle --- package/axel/axel.hash | 2 +- package/axel/axel.mk | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/axel/axel.hash b/package/axel/axel.hash index b2ff52876b4..4902dd7946c 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 6af9c0238ca4fb850baa17878de0361868e3ff6d9302298d83c6d26931c28723 axel-2.17.13.tar.xz +sha256 938ee7c8c478bf6fcc82359bbf9576f298033e8b13908e53e3ea9c45c1443693 axel-2.17.14.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/axel/axel.mk b/package/axel/axel.mk index 90e5156e064..ff96ea94b67 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,7 +4,7 @@ # ################################################################################ -AXEL_VERSION = 2.17.13 +AXEL_VERSION = 2.17.14 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ @@ -12,10 +12,7 @@ AXEL_LICENSE_FILES = COPYING AXEL_CPE_ID_VALID = YES AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) -# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test -# provided by autoconf relies on wchar_t. AXEL_CONF_OPTS = \ - ac_cv_prog_cc_c99=-std=c99 \ CFLAGS="$(TARGET_CFLAGS)" ifeq ($(BR2_PACKAGE_OPENSSL),y) From 108175922b9d1c412e6fa71d1a1e96fd4fdca62d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 13 Apr 2024 21:56:12 +0200 Subject: [PATCH 0480/3013] configs/warpboard: remove defconfig As suggested by Fabio in [1], this commit removes the defconfig and all other associated files. The U-Boot support for the Warpboard has been removed upstream in commit [2], first included in version 2022.10. For reference, at the time of this commit, the latest Kernel is 6.8.6 and still has support for this board. See [3]. The reason of this removal is because this defconfig fail to build with recent toolchains. See [4]. Fixes: [4] [1] https://lists.buildroot.org/pipermail/buildroot/2024-April/689596.html [2] https://source.denx.de/u-boot/u-boot/-/commit/c50ff4a933d5617415221bbb85b0bfa5247b697a [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/arm/boot/dts/nxp/imx/imx6sl-warp.dts?h=v6.8.6 [4] https://gitlab.com/buildroot.org/buildroot/-/jobs/6609466749 Suggested-by: Fabio Estevam Signed-off-by: Julien Olivain Reviewed-by: Fabio Estevam Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 - board/freescale/warpboard/README | 77 ------------------- board/freescale/warpboard/linux.fragment | 1 - .../lib/firmware/brcm/brcmfmac4330-sdio.txt | 40 ---------- configs/warpboard_defconfig | 58 -------------- 5 files changed, 178 deletions(-) delete mode 100644 board/freescale/warpboard/README delete mode 100644 board/freescale/warpboard/linux.fragment delete mode 100644 board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt delete mode 100644 configs/warpboard_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 399b2931ff3..4d10e3dbacd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -942,7 +942,6 @@ F: package/openbox/ F: package/supertuxkart/ N: Fabio Estevam -F: board/freescale/warpboard/ F: board/warp7/ F: configs/freescale_imx* F: configs/imx23evk_defconfig @@ -963,7 +962,6 @@ F: configs/mx6sx_udoo_neo_defconfig F: configs/mx6udoo_defconfig F: configs/wandboard_defconfig F: configs/warp7_defconfig -F: configs/warpboard_defconfig F: package/atest/ F: package/crucible/ F: package/kmscube/ diff --git a/board/freescale/warpboard/README b/board/freescale/warpboard/README deleted file mode 100644 index 67d4e044e98..00000000000 --- a/board/freescale/warpboard/README +++ /dev/null @@ -1,77 +0,0 @@ -Build -===== - -First, configure Buildroot for your WarpBoard. - make warpboard_defconfig - -Build all components: - make - -You will find in ./output/images/ the following files: - - imx6sl-warp.dtb - - rootfs.ext4 - - rootfs.tar - - sdcard.img - - u-boot.imx - - zImage - -Update uboot -============ - -- Put warpboard in USB download mode by closing the j2 jumper on the - daugther board - -- Load u-boot.imx in the WarpBoard by using the imx-usb-loader host utility: - - $ ./output/host/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx - -- U-Boot will appear in minicom - -- Reset the U-Boot environment to its default: - => env default -f -a - => saveenv - -- Run the DFU command in U-Boot: - => dfu 0 mmc 0 - -- Transfer U-Boot into flash by running this command in host side: - - $ sudo ./output/host/bin/dfu-util -D output/images/u-boot.imx -a boot - -- remove power and put the WarpBoard back into normal boot mode by - opening the j2 jumper. - -Update linux & rootfs -===================== - -Run the 'ums' command from the U-Boot prompt to mount the eMMC as USB mass -storage: - -=> ums 0 mmc 0 - -And then flash the sdcard.img into the eMMC: - - dd if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the eMMC content. Use it with care! *** - -Using bluetooth -================ - -Enable the bluez_utils or bluez5_utils package, and then run: - -$ hciattach /dev/ttymxc4 any -$ hciconfig hci0 up - -Using Wifi -========== - -# modprobe brcmfmac -# iwconfig wlan0 essid ACCESSPOINTNAME -# wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf -(enter the wifi password and press enter) -# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf & -# udhcpc -i wlan0 -# ping buildroot.org - -Enjoy! diff --git a/board/freescale/warpboard/linux.fragment b/board/freescale/warpboard/linux.fragment deleted file mode 100644 index 892d0cb7b99..00000000000 --- a/board/freescale/warpboard/linux.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CFG80211_WEXT=y diff --git a/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt deleted file mode 100644 index 9546246b918..00000000000 --- a/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt +++ /dev/null @@ -1,40 +0,0 @@ -# bcm94330wlsdgb.txt -manfid=0x2d0 -prodid=0x0552 -vendid=0x14e4 -devid=0x4360 -boardtype=0x0552 -boardrev=0x11 -# this design has 2.4GHz SP3T switch -boardflags=0x00080200 -nocrc=1 -xtalfreq=37400 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=255 -aa2g=1 -ccode=CN -pa0b0=0x14d0 -pa0b1=0xfd98 -pa0b2=0xff78 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -maxp2ga0=0x50 -sromrev=3 -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b -cckPwrOffset=5 -ofdm2gpo=0x66666666 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -swctrlmap_2g=0x04040404,0x02020202,0x02020404,0x10202,0x1ff -swctrlmap_5g=0x00100010,0x00280020,0x00200010,0x14202,0x2f8 -rfreg033=0x19 -rfreg033_cck=0x1f -dacrate2g=160 -txalpfbyp2g=1 -bphyscale=17 -cckPwrIdxCorr=-15 -pacalidx2g=45 -txgaintbl=1 diff --git a/configs/warpboard_defconfig b/configs/warpboard_defconfig deleted file mode 100644 index 1655381aa63..00000000000 --- a/configs/warpboard_defconfig +++ /dev/null @@ -1,58 +0,0 @@ -# architecture -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y - -# system -BR2_TARGET_GENERIC_HOSTNAME="warpboard" -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# rootfs overlay -BR2_ROOTFS_OVERLAY="board/freescale/warpboard/rootfs_overlay" - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/warpboard/linux.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-warp" - -# wifi firmware for brcm4330 -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# wireless packages -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# uboot -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="warp" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" -BR2_TARGET_UBOOT_FORMAT_IMX=y - -# host utility -BR2_PACKAGE_HOST_DFU_UTIL=y -BR2_PACKAGE_HOST_IMX_USB_LOADER=y - -# Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the eMMC image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From 0e6d4d2171ce70d3aa6693f860a36ff08fc4d2b3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Apr 2024 09:48:40 +0200 Subject: [PATCH 0481/3013] package/asterisk: bump to 20.7.0 See here for changes: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md There is still an open issue reported upstream: https://github.com/asterisk/asterisk/issues/671 But it seems it is not reproducible by the asterisk developers, so update the package so others can make use of it. Use the external pjsip package, instead of the bundled one. Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle --- package/asterisk/Config.in | 2 ++ package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 11 +++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index c52456f8fc9..ba5a5740420 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -10,6 +10,8 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBILBC + select BR2_PACKAGE_LIBJWT + select BR2_PACKAGE_LIBPJSIP select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 246f4219aa3..8cb54682493 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz +sha256 62adff44f5bc415627e16957e6bd528e1782a892e116ff261c46f96ca87c342b asterisk-20.7.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index d1f3ea82d31..33d2e78bcf9 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.5.2 +ASTERISK_VERSION = 20.7.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk # For patches 0002 and 0003 ASTERISK_AUTORECONF = YES -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt ASTERISK_DEPENDENCIES = \ host-asterisk \ @@ -35,6 +35,8 @@ ASTERISK_DEPENDENCIES = \ jansson \ libcurl \ libedit \ + libjwt \ + libpjsip \ libxml2 \ sqlite \ util-linux @@ -89,10 +91,11 @@ ASTERISK_CONF_OPTS = \ --with-jansson \ --with-libcurl \ --with-ilbc \ + --with-libjwt="$(STAGING_DIR)/usr" \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ - --with-pjproject \ - --with-pjproject-bundled \ + --without-pjproject-bundled \ + --with-pjproject="$(STAGING_DIR)/usr" \ --with-sqlite3="$(STAGING_DIR)/usr" \ --with-sounds-cache=$(ASTERISK_DL_DIR) From 2a2a1c3831fc8b6224097e2e1ecc299da3516c34 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Apr 2024 16:16:52 +0200 Subject: [PATCH 0482/3013] package/linux-headers: drop 6.7.x option The 6.7.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 76af1da3488..98a4125f4b1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.05" +config BR2_KERNEL_HEADERS_6_7 + bool "kernel headers version 6.7.x are no longer supported" + select BR2_LEGACY + help + Version 6.7.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_TARGET_TI_K3_IMAGE_GEN bool "ti-k3-image-gen removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 4fa9f701cd5..d66bb54b5ee 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 8d0c8936e3140a0fbdf511ad7a9f21121598f3656743898f47bb9052d37cff68 linux-6.8.1.tar.xz -sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4c3651450ea..78ba644c956 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -48,10 +48,6 @@ config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 -config BR2_KERNEL_HEADERS_6_7 - bool "Linux 6.7.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 - config BR2_KERNEL_HEADERS_6_8 bool "Linux 6.8.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 @@ -425,7 +421,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.152" if BR2_KERNEL_HEADERS_5_15 default "6.1.82" if BR2_KERNEL_HEADERS_6_1 default "6.6.22" if BR2_KERNEL_HEADERS_6_6 - default "6.7.10" if BR2_KERNEL_HEADERS_6_7 default "6.8.1" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 9c592ecd3e599598856668736468b3ee54d8ceee Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Apr 2024 16:16:53 +0200 Subject: [PATCH 0483/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 8}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 2767b709d46..e8dc79c822d 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.8.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.8.6" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d66bb54b5ee..7154fc75bfc 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 8d0c8936e3140a0fbdf511ad7a9f21121598f3656743898f47bb9052d37cff68 linux-6.8.1.tar.xz -sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz -sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz +sha256 9e723232d603ab45ebf043c34714c48f277ab195c29abcb8472f2a4c3a5a1995 linux-6.8.6.tar.xz +sha256 639e50060e3c8f23ed017cb10cfeacc6ba88ff5583812bb76859b4cc6a128291 linux-6.6.27.tar.xz +sha256 d3d3c8c44f0f0a870a95bd2823f9d91979d1aa6f266da5d8cccd0c4b15e3115b linux-6.1.86.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e linux-5.15.152.tar.xz -sha256 84cf30223239ec3333a5f7b2a7fba2042bba70d1582a139f7543956af871ad80 linux-5.10.213.tar.xz -sha256 3599d5959a403e64be407d7f05e56cb270d6ddd154e89a596609919ab1e2e366 linux-5.4.272.tar.xz +sha256 c85859b86d2e6d1fc91ca1be8b44f24a9b5bb9f86869b04a8665a3a6559126e4 linux-5.15.155.tar.xz +sha256 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9 linux-5.10.215.tar.xz +sha256 eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4 linux-5.4.274.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 95ec94c4ab8f46d8a54430893f9bd653c46b0f1587d216818aa8f52fd313de69 linux-4.19.310.tar.xz +sha256 a394fa5ffe321ee43dae9cccc724572f49fbb289875d39ea695adf712e51f74a linux-4.19.312.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 78ba644c956..5fe34456de7 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -415,13 +415,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.310" if BR2_KERNEL_HEADERS_4_19 - default "5.4.272" if BR2_KERNEL_HEADERS_5_4 - default "5.10.213" if BR2_KERNEL_HEADERS_5_10 - default "5.15.152" if BR2_KERNEL_HEADERS_5_15 - default "6.1.82" if BR2_KERNEL_HEADERS_6_1 - default "6.6.22" if BR2_KERNEL_HEADERS_6_6 - default "6.8.1" if BR2_KERNEL_HEADERS_6_8 + default "4.19.312" if BR2_KERNEL_HEADERS_4_19 + default "5.4.274" if BR2_KERNEL_HEADERS_5_4 + default "5.10.215" if BR2_KERNEL_HEADERS_5_10 + default "5.15.155" if BR2_KERNEL_HEADERS_5_15 + default "6.1.86" if BR2_KERNEL_HEADERS_6_1 + default "6.6.27" if BR2_KERNEL_HEADERS_6_6 + default "6.8.6" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From d9e6d2d0813317427e0a83e8635c277aaf1d8cdd Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Sun, 14 Apr 2024 20:00:34 +0200 Subject: [PATCH 0484/3013] configs/visionfive2: update kernel to upstream 6.8.2 The configuration is based on defconfig from starfive's kernel fork [1]. [1] https://github.com/starfive-tech/linux/blob/076ede06c00a4069cd9f90d609eaf35bf1bdc68a/arch/riscv/configs/starfive_visionfive2_defconfig Signed-off-by: Lukasz Tekieli Signed-off-by: Arnout Vandecappelle --- board/visionfive2/linux_defconfig | 234 ++++++++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 2 +- configs/visionfive2_defconfig | 10 +- 3 files changed, 240 insertions(+), 6 deletions(-) create mode 100644 board/visionfive2/linux_defconfig diff --git a/board/visionfive2/linux_defconfig b/board/visionfive2/linux_defconfig new file mode 100644 index 00000000000..d6d1a652470 --- /dev/null +++ b/board/visionfive2/linux_defconfig @@ -0,0 +1,234 @@ +CONFIG_SYSVIPC=y +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PSI=y +# CONFIG_CPU_ISOLATION is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_CGROUPS=y +CONFIG_CGROUP_SCHED=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_NAMESPACES=y +CONFIG_BLK_DEV_INITRD=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +CONFIG_EXPERT=y +# CONFIG_SYSFS_SYSCALL is not set +CONFIG_PERF_EVENTS=y +CONFIG_SOC_STARFIVE=y +CONFIG_ERRATA_SIFIVE=y +CONFIG_NONPORTABLE=y +CONFIG_SMP=y +# CONFIG_RISCV_ISA_SVPBMT is not set +# CONFIG_COMPAT is not set +CONFIG_HIBERNATION=y +CONFIG_CPU_IDLE=y +CONFIG_RISCV_SBI_CPUIDLE=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_CPUFREQ_DT=y +CONFIG_JUMP_LABEL=y +# CONFIG_STACKPROTECTOR is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_COMPRESS_ZSTD=y +# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set +CONFIG_BLK_WBT=y +# CONFIG_BLK_DEBUG_FS is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_MQ_IOSCHED_DEADLINE is not set +# CONFIG_MQ_IOSCHED_KYBER is not set +CONFIG_KSM=y +# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_PNP=y +CONFIG_INET_DIAG=m +# CONFIG_IPV6_SIT is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_WIRELESS is not set +# CONFIG_ETHTOOL_NETLINK is not set +CONFIG_PCI=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER=m +CONFIG_SIFIVE_CCACHE=y +CONFIG_EFI_DISABLE_RUNTIME=y +CONFIG_MTD=y +CONFIG_MTD_SPI_NOR=y +CONFIG_ZRAM=y +CONFIG_ZRAM_MEMORY_TRACKING=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=1 +CONFIG_BLK_DEV_NVME=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y +CONFIG_NETDEVICES=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +# CONFIG_DWMAC_GENERIC is not set +CONFIG_DWMAC_STARFIVE=y +CONFIG_MICROCHIP_PHY=y +CONFIG_MOTORCOMM_PHY=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_LDISC_AUTOLOAD is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +# CONFIG_SERIAL_8250_16550A_VARIANTS is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=6 +CONFIG_SERIAL_8250_RUNTIME_UARTS=6 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_JH7110=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_HELPER_AUTO is not set +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_SPI=y +CONFIG_SPI_CADENCE_QUADSPI=y +CONFIG_SPI_PL022=y +CONFIG_SPI_SPIDEV=y +# CONFIG_PTP_1588_CLOCK is not set +CONFIG_GPIOLIB_FASTPATH_LIMIT=128 +CONFIG_GPIO_SYSFS=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_SENSORS_SFCTEMP=y +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_THERMAL_EMULATION=y +CONFIG_WATCHDOG=y +CONFIG_MFD_AXP20X_I2C=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_AXP20X=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CADENCE_CSI2RX=y +CONFIG_VIDEO_IMX219=y +CONFIG_DRM=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_DESIGNWARE_I2S=y +CONFIG_SND_SOC_STARFIVE=y +CONFIG_SND_SOC_JH7110_PWMDAC=y +CONFIG_SND_SOC_JH7110_TDM=y +CONFIG_SND_SOC_WM8960=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_UAS=y +CONFIG_USB_CDNS_SUPPORT=y +CONFIG_USB_CDNS3=y +CONFIG_USB_CDNS3_GADGET=y +CONFIG_USB_CDNS3_HOST=y +CONFIG_USB_CDNS3_STARFIVE=y +CONFIG_USB_GADGET=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_MMC=y +# CONFIG_PWRSEQ_EMMC is not set +# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_DWCMSHC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_STARFIVE=y +CONFIG_DMADEVICES=y +CONFIG_AMBA_PL08X=y +CONFIG_DW_AXI_DMAC=y +CONFIG_DMATEST=y +# CONFIG_VIRTIO_MENU is not set +# CONFIG_VHOST_MENU is not set +CONFIG_STAGING=y +CONFIG_STAGING_MEDIA=y +CONFIG_VIDEO_STARFIVE_CAMSS=y +CONFIG_CLK_STARFIVE_JH7110_AON=y +CONFIG_CLK_STARFIVE_JH7110_STG=y +CONFIG_CLK_STARFIVE_JH7110_ISP=y +CONFIG_CLK_STARFIVE_JH7110_VOUT=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_PWM=y +CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=y +CONFIG_PHY_STARFIVE_JH7110_PCIE=y +CONFIG_PHY_STARFIVE_JH7110_USB=y +CONFIG_EXT4_FS=y +CONFIG_BTRFS_FS=y +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_DNOTIFY is not set +CONFIG_FANOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_UTF8=y +CONFIG_EXFAT_FS=y +CONFIG_NTFS_FS=y +CONFIG_NTFS_RW=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_CHILDREN=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_EFIVAR_FS=y +CONFIG_JFFS2_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_DEFAULT="iso8859-15" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_15=y +CONFIG_LSM="" +CONFIG_CRYPTO_ZSTD=y +# CONFIG_RAID6_PQ_BENCHMARK is not set +# CONFIG_DEBUG_MISC is not set +CONFIG_STRIP_ASM_SYMS=y +CONFIG_DEBUG_SECTION_MISMATCH=y +# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set +CONFIG_DEBUG_FS=y +# CONFIG_SLUB_DEBUG is not set +CONFIG_DEBUG_RODATA_TEST=y +CONFIG_DEBUG_WX=y +CONFIG_SOFTLOCKUP_DETECTOR=y +CONFIG_WQ_WATCHDOG=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_STACKTRACE=y +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_FTRACE is not set +# CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf index 6e2c5660d6c..fd772f3675b 100644 --- a/board/visionfive2/overlay/boot/extlinux/extlinux.conf +++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label linux kernel /boot/Image - devicetree /boot/jh7110-visionfive-v2.dtb + devicetree /boot/jh7110-starfive-visionfive-2-v1.3b.dtb append console=ttyS0,115200 root=/dev/mmcblk1p3 diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index c8576a35a7f..247854d4d1d 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -1,15 +1,15 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="starfive_visionfive2" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.2" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/visionfive2/linux_defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-visionfive-v2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-starfive-visionfive-2-v1.3b" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y From 917078b57af0bca879bfa34be0f86cd9a0629534 Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Sun, 14 Apr 2024 20:14:08 +0200 Subject: [PATCH 0485/3013] configs/visionfive2: update u-boot to 2024.04 Signed-off-by: Lukasz Tekieli Signed-off-by: Arnout Vandecappelle --- configs/visionfive2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 247854d4d1d..ff738cc3a38 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 517f032992158d8f3aaee7d68cb417adf3d8fac7 Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Sun, 14 Apr 2024 21:06:44 +0200 Subject: [PATCH 0486/3013] board/visionfive2: add spi-nor image Builds the spi-nor.img together with the sdcard.img. Readme is extended with SPI NOR flash writing instructions and recovery. The spi-nor.img layout is based on the following document: https://doc-en.rvspace.org/VisionFive2/Boot_UG/JH7110_SDK/boot_address_allocation.html Signed-off-by: Lukasz Tekieli [Arnout: extend readme.txt with paragraph that either boot mode works.] Signed-off-by: Arnout Vandecappelle --- board/visionfive2/genimage_spi-nor.cfg | 36 ++++++++++++++++++++++++++ board/visionfive2/post-image.sh | 4 +++ board/visionfive2/readme.txt | 28 +++++++++++++++++--- configs/visionfive2_defconfig | 3 +-- 4 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 board/visionfive2/genimage_spi-nor.cfg create mode 100755 board/visionfive2/post-image.sh diff --git a/board/visionfive2/genimage_spi-nor.cfg b/board/visionfive2/genimage_spi-nor.cfg new file mode 100644 index 00000000000..8b1d13989ac --- /dev/null +++ b/board/visionfive2/genimage_spi-nor.cfg @@ -0,0 +1,36 @@ +flash nor-16M-256 { + pebsize = 4K + minimum-io-unit-size = 256 + numpebs = 4096 +} + +image spi-nor.img { + size = 16M + + flash { + } + + flashtype = "nor-16M-256" + + partition spl { + image = "u-boot-spl.bin.normal.out" + offset = 0K + size = 512K + } + + partition uboot-env { + offset = 960K + size = 64K + } + + partition uboot { + image = "u-boot.itb" + offset = 1M + size = 4M + } + + partition reserved-data { + offset = 6M + size = 10M + } +} diff --git a/board/visionfive2/post-image.sh b/board/visionfive2/post-image.sh new file mode 100755 index 00000000000..3da106dc269 --- /dev/null +++ b/board/visionfive2/post-image.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +support/scripts/genimage.sh -c board/visionfive2/genimage.cfg +support/scripts/genimage.sh -c board/visionfive2/genimage_spi-nor.cfg diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 85be1d5dfc4..cc4fece6e92 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -12,12 +12,27 @@ How to build $ make visionfive2_defconfig $ make +Once the build process is finished you will have two images +in the output/images/ directory: +- sdcard.img +- spi-nor.img + +How to write the SPI NOR flash +============================= + +If you have a booting device use u-boot and tftp: + + # tftpboot 0x82000000 spi-nor.img + # sf probe + # sf update 0x82000000 0x0 {filesize} + +Otherwise, follow the recovery instruction: + +https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/recovering_bootloader%20-%20vf2.html + How to write the SD card ======================== -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - Copy the bootable "sdcard.img" onto an SD card with "dd": $ sudo dd if=output/images/sdcard.img of=/dev/sdX @@ -27,7 +42,12 @@ Preparing the board Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). -Change the boot mode pins to SD card booting (RGPIO_0=1, GRPIO_1=0): +Use the correct mode for booting: +- SD card RGPIO_0=1, GRPIO_1=0 +- SPI NOR flash RGPIO_0=1, GRPIO_1=1 + +Note that Buildroot puts the bootloader both in SPI NOR and on the SD card, +so after flashing as instructed above, either boot mode should work. https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/boot_mode_settings.html diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index ff738cc3a38..69c44dfbdd9 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -1,8 +1,7 @@ BR2_riscv=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/visionfive2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.2" From 4cc800617270b3f047fde5135c4dd0efb11ce6cb Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 14 Apr 2024 23:42:04 +0200 Subject: [PATCH 0487/3013] support/testing: add wine runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + support/testing/tests/package/test_wine.py | 88 ++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 support/testing/tests/package/test_wine.py diff --git a/DEVELOPERS b/DEVELOPERS index 4d10e3dbacd..51a5cad167a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1870,6 +1870,7 @@ F: support/testing/tests/package/test_usbutils.py F: support/testing/tests/package/test_usbutils/ F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ +F: support/testing/tests/package/test_wine.py F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/support/testing/tests/package/test_wine.py b/support/testing/tests/package/test_wine.py new file mode 100644 index 00000000000..4e5b4a8b111 --- /dev/null +++ b/support/testing/tests/package/test_wine.py @@ -0,0 +1,88 @@ +import os + +import infra.basetest + + +class TestWine(infra.basetest.BRTest): + # Wine depends on i386 architecture. The pre-build runtime test + # Kernel (for armv5) cannot be used. The config also uses a ext4 + # rootfs due to the larger Wine footprint. We also enable NLS, + # which is required for cmd.exe shell to work. + config = \ + """ + BR2_i386=y + BR2_x86_pentium4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.27" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_WINE=y + BR2_SYSTEM_ENABLE_NLS=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "bzImage") + self.emulator.boot(arch="i386", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyS0"], + options=["-M", "pc", "-m", "256M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the program can run. + self.assertRunOk("wine --version") + + # Remove the Wine directory to make this test idempotent. This + # is because we use a persistent storage. This is useful only + # when the run-tests script is used with the "-k" option. + self.assertRunOk("rm -rf ~/.wine") + + # Wine usually prints lots of debug messages. We disable all + # logs for this test. For debugging, this line can be + # commented, or extra log can also be added. "WINEDEBUG=+all" + # enable all logs and generates a lot of messages. + # See: https://wiki.winehq.org/Debug_Channels + self.assertRunOk("export WINEDEBUG=-all") + + # We force the initialization of the WINEPREFIX + # directory. This operation can take some time. This will make + # subsequent wine invocation execution time more stable. + self.assertRunOk("wineboot --init", timeout=45) + + # We check we can list files in the Windows OS directory. + cmd = "wine cmd.exe /C 'DIR C:\\WINDOWS\\'" + self.assertRunOk(cmd, timeout=10) + + # We check we can read a Windows OS specific environment + # variable. We use "assertIn" rather than "assertEqual" + # because the cmd.exe shell write extra control characters. + cmd = "wine cmd.exe /C 'ECHO %OS%'" + out, ret = self.emulator.run(cmd, timeout=10) + self.assertEqual(ret, 0) + self.assertIn("Windows_NT", out[0]) + + # We check we can print an arbitrary string with the + # cmd.exe shell. + string = "Hello Buildroot !" + cmd = f"wine cmd.exe /C 'ECHO {string}'" + out, ret = self.emulator.run(cmd, timeout=10) + self.assertEqual(ret, 0) + self.assertIn(string, out[0]) + + # We check the VER command reports a Windows OS version. + cmd = "wine cmd.exe /C 'VER'" + out, ret = self.emulator.run(cmd, timeout=10) + self.assertEqual(ret, 0) + self.assertIn("Microsoft Windows", "\n".join(out)) + + # We run the ping.exe command. + self.assertRunOk("wine ping.exe 127.0.0.1", timeout=10) From 8e37a887e6c65ba5ef685e4ffb5b11a5d364592f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 28 Apr 2024 19:01:00 +0200 Subject: [PATCH 0488/3013] package/docker-engine: security bump to version 26.0.2 Fixes the following security issues: CVE-2024-32473: Ensure IPv6 is disabled on interfaces only allocated an IPv4 address by the engine https://github.com/moby/moby/security/advisories/GHSA-x84c-p2g9-rqv9 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 5c76b99af33..91bc3d8df29 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fae1aabb63ed5cf6d302a5f4266ed092716b1cea9a974a9d61154ef31b03c302 docker-engine-26.0.0.tar.gz +sha256 f1cf6a2e69607daa0e2ae9b5be752dc269ab30dee16f5f2180f7ff7f29270606 docker-engine-26.0.2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 86106d3ccb5..f8dc87050f1 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 26.0.0 +DOCKER_ENGINE_VERSION = 26.0.2 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 49c8154ee7bb2b6e720652af77961b230106ffa6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 28 Apr 2024 19:01:01 +0200 Subject: [PATCH 0489/3013] package/docker-cli: bump version to 26.0.2 https://github.com/moby/moby/releases/tag/v26.0.2 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 26558814c15..d8bfb1d824c 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 96ed5d7c33a12f505d13fa03fa48f94cb41cf871178df0df84aa0b76839ad321 docker-cli-26.0.0.tar.gz +sha256 b047e180c94452b4375f7e43997286e5a5712e66b1280574974b2e117b4e43bd docker-cli-26.0.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 5f9242329a5..69c6f12f3c1 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 26.0.0 +DOCKER_CLI_VERSION = 26.0.2 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From 206527347c1f63d24d871bf5dcb065861bd1c2a4 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 22 Apr 2024 09:38:39 +0200 Subject: [PATCH 0490/3013] package/speechd: set CPE_ID_VENDOR (to silence mismatched CVE warning) - set CPE_ID_VENDOR to silence mismatched CVE-2001-0956 ([1], [2]) warning clearly aiming some other product/version ("speechd 0.54 with Festival or rsynth speech synthesis package") [1] https://security-tracker.debian.org/tracker/CVE-2001-0956 [2] https://github.com/advisories/GHSA-67cw-4jhh-3jm7 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 7d50f88c1db..669bec06345 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -8,6 +8,7 @@ SPEECHD_VERSION = 0.11.5 SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL +SPEECHD_CPE_ID_VENDOR = brailcom SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES From a6210d28dbf66b2f0a42d945711dfd93c7329feb Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 8 Apr 2024 23:16:09 +0200 Subject: [PATCH 0491/3013] kconfig/lxdialog: fix check() with GCC14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC14 now treats implicit int types as error so when check() from check-lxdialog.sh is called to check whether we can link against ncurses it will fail silently and the help text indicating to install ncurses is printed. However, this is not due to missing ncurses but once the stderr redirect to /dev/null is removed we can see the root cause: :2:1: error: return type defaults to ‘int’ [-Wimplicit-int] So, in order for menuconfig to work with GCC14 lets just specify the return type of main() as int. Npte that the upstream kconfig in the linux kernel source tree no longer carries or uses the check-lxdialog.sh script since commit 1c5af5cf9308 (kconfig: refactor ncurses package checks for building mconf and nconf), so there is no commit we can backport to our kconfig copy. Signed-off-by: Robert Marko Reviewed-by: Petr Vorel Tested-by: Petr Vorel [yann.morin.1998@free.fr: add note about upstream kernel] Signed-off-by: Yann E. MORIN --- support/kconfig/lxdialog/check-lxdialog.sh | 2 +- ...config-lxdialog-fix-check-with-GCC14.patch | 43 +++++++++++++++++++ support/kconfig/patches/series | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch diff --git a/support/kconfig/lxdialog/check-lxdialog.sh b/support/kconfig/lxdialog/check-lxdialog.sh index 16cd9a31862..27d6c30a570 100755 --- a/support/kconfig/lxdialog/check-lxdialog.sh +++ b/support/kconfig/lxdialog/check-lxdialog.sh @@ -48,7 +48,7 @@ trap "rm -f $tmp" 0 1 2 3 15 check() { $cc -x c - -o $tmp 2>/dev/null <<'EOF' #include CURSES_LOC -main() {} +int main() {} EOF if [ $? != 0 ]; then echo " *** Unable to find the ncurses libraries or the" 1>&2 diff --git a/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch b/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch new file mode 100644 index 00000000000..41081bb45d8 --- /dev/null +++ b/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch @@ -0,0 +1,43 @@ +From 3ae91337b53fa3ccf0bad7f181fcaf483fab22ee Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Wed, 3 Apr 2024 14:18:07 +0200 +Subject: [PATCH] kconfig/lxdialog: fix check() with GCC14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC14 now treats implicit int types as error so when check() from +check-lxdialog.sh is called to check whether we can link against ncurses +it will fail silently and the help text indicating to install ncurses is +printed. + +However, this is not due to missing ncurses but once the stderr redirect +to /dev/null is removed we can see the root cause: +:2:1: error: return type defaults to ‘int’ [-Wimplicit-int] + +So, in order for menuconfig to work with GCC14 lets just specify the +return type of main() as int. + +Signed-off-by: Robert Marko +Reviewed-by: Petr Vorel +Tested-by: Petr Vorel +--- + kconfig/lxdialog/check-lxdialog.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kconfig/lxdialog/check-lxdialog.sh b/kconfig/lxdialog/check-lxdialog.sh +index 16cd9a3186..27d6c30a57 100755 +--- a/kconfig/lxdialog/check-lxdialog.sh ++++ b/kconfig/lxdialog/check-lxdialog.sh +@@ -48,7 +48,7 @@ trap "rm -f $tmp" 0 1 2 3 15 + check() { + $cc -x c - -o $tmp 2>/dev/null <<'EOF' + #include CURSES_LOC +-main() {} ++int main() {} + EOF + if [ $? != 0 ]; then + echo " *** Unable to find the ncurses libraries or the" 1>&2 +-- +2.44.0 + diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series index e5a6f69d8ff..f120e323b7a 100644 --- a/support/kconfig/patches/series +++ b/support/kconfig/patches/series @@ -10,3 +10,4 @@ 19-merge_config.sh-add-br2-external-support.patch 20-merge_config.sh-Allow-to-define-config-prefix.patch 21-Avoid-false-positive-matches-from-comment-lines.patch +22-kconfig-lxdialog-fix-check-with-GCC14.patch From 8b4551d7117f9cec1a3accd712d58ded5a9f9dcc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Apr 2024 18:06:07 +0200 Subject: [PATCH 0492/3013] package/libiscsi: bump to version 1.20.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libiscsi/libiscsi.hash | 2 +- package/libiscsi/libiscsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libiscsi/libiscsi.hash b/package/libiscsi/libiscsi.hash index 769035837c5..5caecbc5d97 100644 --- a/package/libiscsi/libiscsi.hash +++ b/package/libiscsi/libiscsi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 c7848ac722c8361d5064654bc6e926c2be61ef11dd3875020a63931836d806df libiscsi-1.19.0.tar.gz +sha256 6321d802103f2a363d3afd9a5ae772de0b4052c84fe6a301ecb576b34e853caa libiscsi-1.20.0.tar.gz sha256 88e3eccc48722b2a0eaff456dda94b8e8e123848d01f631969bec8e3c6c6eb85 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENCE-GPL-2.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk index c8b6ddd123c..ccee77bf645 100644 --- a/package/libiscsi/libiscsi.mk +++ b/package/libiscsi/libiscsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBISCSI_VERSION = 1.19.0 +LIBISCSI_VERSION = 1.20.0 LIBISCSI_SITE = $(call github,sahlberg,libiscsi,$(LIBISCSI_VERSION)) LIBISCSI_LICENSE = GPL-2.0+, LGPL-2.1+ LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt From 85c25d1a057ef510dd0fd4be6424abcf4d8f6dcb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Apr 2024 18:12:56 +0200 Subject: [PATCH 0493/3013] package/libsrtp: bump to version 2.6.0 https://github.com/cisco/libsrtp/releases/tag/v2.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index f95dc2e7b0b..95daf0d7922 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a43ef8e9ae2b665292591af62aa1a4ae41e468b6d98d8258f91478735da4e09 libsrtp-2.5.0.tar.gz +sha256 bf641aa654861be10570bfc137d1441283822418e9757dc71ebb69a6cf84ea6b libsrtp-2.6.0.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 0ffdd982837..269c1ae3f83 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.5.0 +LIBSRTP_VERSION = 2.6.0 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause From 0b3662e49218effe0a6bc9b814bb4647869cb5f6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Apr 2024 18:18:50 +0200 Subject: [PATCH 0494/3013] package/libunistring: bump to version 1.2 https://savannah.gnu.org/news/?id=10599 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libunistring/libunistring.hash | 4 ++-- package/libunistring/libunistring.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 8267d56327b..256fb651d5c 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz.sig -sha256 827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98 libunistring-1.1.tar.xz +# https://ftp.gnu.org/gnu/libunistring/libunistring-1.2.tar.xz.sig +sha256 632bd65ed74a881ca8a0309a1001c428bd1cbd5cd7ddbf8cedcd2e65f4dcdc44 libunistring-1.2.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 8d5b6f54ec1..05bdec71b55 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 1.1 +LIBUNISTRING_VERSION = 1.2 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES From bc75b09b1c18541abaa47fc34eab44e91e2018ca Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Apr 2024 21:59:43 +0200 Subject: [PATCH 0495/3013] support/testing: TestATFAllwinner: add missing openssl dependency The commit [1] updated the u-boot version with the one used by orangepi_zero_plus2_defconfig but the dependency on openssl was forgotten. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6703221868 [1] eb16148dddc6be39b0d850181c2461fdaba1ee6f Signed-off-by: Romain Naour --- support/testing/tests/boot/test_atf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 352725e721c..b0e7696e867 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -19,6 +19,7 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y + BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From 7e126bd38d5eedb49cd29699c1afe8b53edd71e0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Apr 2024 22:10:33 +0200 Subject: [PATCH 0496/3013] support/testing: TestF2FS: update kernel to 4.19.310 Since the toolchain Bootlin update to 2023.11-1 [1], the arm Linux kernel build is broken with binutils >= 2.41 with: arch/arm/mm/proc-v7.S: Assembler messages: arch/arm/mm/proc-v7.S:640: Error: junk at end of line, first unrecognized character is `#' A similar issue has already be fixed for qemu m68k [2]. Bump to the latest kernel 4.19 that already include the backport of 790756c7e022 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 [2] a1ce9474e40f731f327035d8c0962abb16f00ff7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6703222383 Signed-off-by: Romain Naour --- support/testing/tests/fs/test_f2fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/fs/test_f2fs.py b/support/testing/tests/fs/test_f2fs.py index 425fbe31cac..826077ac942 100644 --- a/support/testing/tests/fs/test_f2fs.py +++ b/support/testing/tests/fs/test_f2fs.py @@ -20,7 +20,7 @@ class TestF2FS(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.310" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" From 23bbec827db6a0d9c8f8720891601857c14d3d77 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Apr 2024 23:20:56 +0200 Subject: [PATCH 0497/3013] package/llvm-project/compiler-rt: add libxcrypt dependency When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. But compiler-rt package still use crypt.h header and crypt() function in the sanitizer code. Use libxcrypt unconditionally since compiler-rt itself already depends on glibc based toolchain. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6703222513 Signed-off-by: Romain Naour --- package/llvm-project/compiler-rt/Config.in | 1 + package/llvm-project/compiler-rt/compiler-rt.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/llvm-project/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in index e8f2ac42014..10f5d796b30 100644 --- a/package/llvm-project/compiler-rt/Config.in +++ b/package/llvm-project/compiler-rt/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_COMPILER_RT depends on BR2_PACKAGE_LLVM depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires depends on BR2_HOST_GCC_AT_LEAST_7 # host-clang + select BR2_PACKAGE_LIBXCRYPT help A collection of runtime libraries primarily used by clang and llvm to provide builtins, sanitizer runtimes, and profiling diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk index 5d9c3d8fa88..d4bc4d305b5 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -10,7 +10,7 @@ COMPILER_RT_SITE = $(LLVM_PROJECT_SITE) COMPILER_RT_LICENSE = NCSA MIT COMPILER_RT_LICENSE_FILES = LICENSE.TXT COMPILER_RT_CPE_ID_VENDOR = llvm -COMPILER_RT_DEPENDENCIES = host-clang llvm +COMPILER_RT_DEPENDENCIES = host-clang libxcrypt llvm COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO COMPILER_RT_INSTALL_STAGING = YES From 0a9fcd69510a5947092f2789a146ad284ce24d1c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Apr 2024 14:38:08 +0200 Subject: [PATCH 0498/3013] configs/qemu_arm_{versatile, vexpress}_defconfig: update devicetree path The last kernel version bump broke qemu ARM defconfigs [1] since all devicetree where moved to to vendor sub-directories in 6.5 [2]. [1] 9982e0b5a6 ("configs/qemu: update defconfigs to Linux 6.6.18") [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119888 (qemu_arm_versatile_defconfig) https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119890 (qemu_arm_vexpress_defconfig) Reported-by: Waldemar Brodkorb on IRC Cc: Waldemar Brodkorb Signed-off-by: Romain Naour --- configs/qemu_arm_versatile_defconfig | 2 +- configs/qemu_arm_vexpress_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 2c73090d5d5..a48e4372788 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/versatile-pb" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 12ec33ed7ae..439c299752e 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -28,7 +28,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/vexpress-v2p-ca9" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y From f8d068929b3b5ef5ae28691a3d0d7e1948435d7b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Apr 2024 14:38:09 +0200 Subject: [PATCH 0499/3013] configs/qemu_ppc64*defconfig: add missing libelf dependency While building the kernel tools, libelf header is missing: [...]tools/objtool/include/objtool/elf.h:10:10: fatal error: gelf.h: No such file or directory 10 | #include Select BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF to build host-libelf. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6664587290 (qemu_ppc64le_powernv8_defconfig) https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119951 (qemu_ppc64le_pseries_defconfig) https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119946 (qemu_ppc64_pseries_defconfig) Signed-off-by: Romain Naour --- configs/qemu_ppc64_pseries_defconfig | 1 + configs/qemu_ppc64le_powernv8_defconfig | 1 + configs/qemu_ppc64le_pseries_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 8c58fec24f2..350380578a2 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -23,6 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index 23ad5772c25..fd8936a1fa6 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -23,6 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 207e5f5b40c..ebc3b7a6fd1 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -23,6 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y From dd244feb37fff29620a09ee96b4006cf7d558380 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 18 Apr 2024 12:15:29 +0200 Subject: [PATCH 0500/3013] package/openssh: add libxcrypt optional dependency for sshd When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing sshd's libcrypt dependency this broke the sshd password authentification at runtime using glibc version 2.39. # sshpass -p testpwd ssh -oStrictHostKeyChecking=no localhost /bin/true Permission denied, please try again. Without libcrypt, OpenSSH >= 6.2 fall back to using openssl's DES_crypt function on platorms that don't have a native crypt() function [1]. Note that DES_crypt is deprecated since openssl 3.0 [2] [3]. "Use of the low level DES functions has been informally discouraged for a long time. We now formally deprecate them. Applications should instead use the EVP APIs, e.g. EVP_EncryptInit_ex, EVP_EncryptUpdate, EVP_EncryptFinal_ex, and the equivalently named decrypt functions." Also DES_crypt is provided by openssl only if BR2_PACKAGE_LIBOPENSSL_ENABLE_DES is enabled. Otherwise crypt() is never defined: sd-compat.a(xcrypt.o): in function `xcrypt': xcrypt.c:(.text+0x48): undefined reference to `crypt' It's not clear why the password authentification fail with openssl's DES_crypt but since it's deprecated we use libxcrypt to provide a working crypt() function for glibc based toolchains. [1] https://github.com/openssh/openssh-portable/blob/V_9_7/openbsd-compat/xcrypt.c#L57 [2] https://github.com/openssl/openssl/commit/c6fec81b88131d08c1022504ccf6effa95497afb [3] https://www.openssl.org/docs/man3.2/man3/DES_crypt.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6623402147 Signed-off-by: Romain Naour --- package/openssh/Config.in | 1 + package/openssh/openssh.mk | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index 08d3c7d391e..25843447a79 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -22,6 +22,7 @@ config BR2_PACKAGE_OPENSSH_CLIENT config BR2_PACKAGE_OPENSSH_SERVER bool "server" default y + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Server programs: sshd, sftp-server diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index f0b499590a5..d7f4db59ca3 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -45,6 +45,11 @@ endif OPENSSH_DEPENDENCIES = host-pkgconf zlib openssl +# crypt() in libcrypt only required for sshd. +ifeq ($(BR2_PACKAGE_OPENSSH_SERVER)$(BR2_PACKAGE_LIBXCRYPT),yy) +OPENSSH_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) OPENSSH_DEPENDENCIES += cryptodev-linux OPENSSH_CONF_OPTS += --with-ssl-engine From bbd579315aa17b11caf0ea69693403b90f928324 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Thu, 25 Apr 2024 15:02:10 +0200 Subject: [PATCH 0501/3013] configs/armadeus_apf27: bump Linux version to 5.10.215 Since the switch to binutils 2.41 as default version [1], the arm Linux kernel build is broken with: arch/arm/mm/proc-v7.S: Assembler messages: arch/arm/mm/proc-v7.S:640: Error: junk at end of line, first unrecognized character is `#' A similar issue has already be fixed for qemu m68k [2]. Bump to the latest kernel 5.10 that already include the backport of 790756c7e022 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y to fix the following build error: scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory #include [1] e88225ed8820881970ec33de7a15a1e0d50443da [2] a1ce9474e40f731f327035d8c0962abb16f00ff7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119384 Signed-off-by: Julien BOIBESSOT [Romain: - improve commit log - Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL ] Signed-off-by: Romain Naour --- .../{linux-4.12.config => linux-5.10.config} | 45 ++++++++++++------- configs/armadeus_apf27_defconfig | 9 ++-- 2 files changed, 33 insertions(+), 21 deletions(-) rename board/armadeus/apf27/{linux-4.12.config => linux-5.10.config} (89%) diff --git a/board/armadeus/apf27/linux-4.12.config b/board/armadeus/apf27/linux-5.10.config similarity index 89% rename from board/armadeus/apf27/linux-4.12.config rename to board/armadeus/apf27/linux-5.10.config index d0fb5d35dd7..5f5776f8a6f 100644 --- a/board/armadeus/apf27/linux-4.12.config +++ b/board/armadeus/apf27/linux-5.10.config @@ -3,26 +3,26 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y CONFIG_PROFILING=y +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_MXC=y +CONFIG_AEABI=y +CONFIG_PM_DEBUG=y CONFIG_OPROFILE=m CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_MXC=y CONFIG_MACH_IMX27_DT=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_PM_DEBUG=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -30,10 +30,8 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set +CONFIG_IPV6=y CONFIG_CAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_MCP251X=m @@ -68,6 +66,11 @@ CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CIRRUS is not set @@ -98,6 +101,7 @@ CONFIG_KEYBOARD_IMX=m # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_TSC2102=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y @@ -123,16 +127,20 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_PWC=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_SOC_CAMERA=m +CONFIG_VIDEO_MX2=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_CODA=m +CONFIG_VIDEO_MX2_EMMAPRP=m # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set +CONFIG_SOC_CAMERA_MT9M111=m +# CONFIG_DVB_AU8522_V4L is not set +# CONFIG_DVB_TUNER_DIB0070 is not set +# CONFIG_DVB_TUNER_DIB0090 is not set CONFIG_FB=y -# CONFIG_FB_MX3 is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_FB_IMX=y +CONFIG_LCD_L4F00242T03=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_MIXER_OSS=m @@ -150,12 +158,16 @@ CONFIG_USB_ACM=y CONFIG_USB_PRINTER=y CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_DEBUG=y CONFIG_USB_SERIAL=y CONFIG_USB_SERIAL_FTDI_SIO=y CONFIG_USB_SERIAL_PL2303=y +CONFIG_NOP_USB_XCEIV=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y +CONFIG_USB_FSL_USB2=y CONFIG_USB_ETH=m CONFIG_USB_GADGETFS=m CONFIG_USB_MASS_STORAGE=m @@ -183,7 +195,6 @@ CONFIG_IMX_SDMA=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_MAX1027=y -CONFIG_MAX5821=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT2_FS=y @@ -204,6 +215,8 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=m +CONFIG_FONTS=y +CONFIG_FONT_8x8=y CONFIG_PRINTK_TIME=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y @@ -212,5 +225,3 @@ CONFIG_DEBUG_FS=y # CONFIG_FTRACE is not set CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig index 457a14b02dd..a87d319729b 100644 --- a/configs/armadeus_apf27_defconfig +++ b/configs/armadeus_apf27_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_HOSTNAME="apf27" @@ -18,13 +18,14 @@ BR2_TARGET_ROOTFS_UBI=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-4.12.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-5.10.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # U-boot BR2_TARGET_UBOOT=y From 612a349c0658695685f6aae483e1b4371308fd3f Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Thu, 25 Apr 2024 15:02:11 +0200 Subject: [PATCH 0502/3013] configs/armadeus_apf51: bump Linux version to 5.10.215 Since the switch to binutils 2.41 as default version [1], the arm Linux kernel build is broken with: arch/arm/mm/proc-v7.S: Assembler messages: arch/arm/mm/proc-v7.S:640: Error: junk at end of line, first unrecognized character is `#' A similar issue has already be fixed for qemu m68k [2]. Bump to the latest kernel 5.10 that already include the backport of 790756c7e022 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y to fix the following build error: scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory #include [1] e88225ed8820881970ec33de7a15a1e0d50443da [2] a1ce9474e40f731f327035d8c0962abb16f00ff7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119389 Signed-off-by: Julien BOIBESSOT [Romain: - improve commit log - Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL ] Signed-off-by: Romain Naour --- .../apf51/{linux-4.4.config => linux-5.10.config} | 0 configs/armadeus_apf51_defconfig | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) rename board/armadeus/apf51/{linux-4.4.config => linux-5.10.config} (100%) diff --git a/board/armadeus/apf51/linux-4.4.config b/board/armadeus/apf51/linux-5.10.config similarity index 100% rename from board/armadeus/apf51/linux-4.4.config rename to board/armadeus/apf51/linux-5.10.config diff --git a/configs/armadeus_apf51_defconfig b/configs/armadeus_apf51_defconfig index aa7c2f84aef..af4562ce0f5 100644 --- a/configs/armadeus_apf51_defconfig +++ b/configs/armadeus_apf51_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_HOSTNAME="apf51" @@ -13,13 +13,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.291" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-4.4.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-5.10.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_UBIFS=y From 5ae2b84042bee3ad678bb931e79e3316b1782148 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Thu, 25 Apr 2024 15:02:12 +0200 Subject: [PATCH 0503/3013] configs/armadeus_apf28: bump Linux version to 5.10.215 Since the switch to binutils 2.41 as default version [1], the arm Linux kernel build is broken with: arch/arm/mm/proc-v7.S: Assembler messages: arch/arm/mm/proc-v7.S:640: Error: junk at end of line, first unrecognized character is `#' A similar issue has already be fixed for qemu m68k [2]. Bump to the latest kernel 5.10 that already include the backport of 790756c7e022 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y to fix the following build error: scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory #include [1] e88225ed8820881970ec33de7a15a1e0d50443da [2] a1ce9474e40f731f327035d8c0962abb16f00ff7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119386 Signed-off-by: Julien BOIBESSOT [Romain: - improve commit log - Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL ] Signed-off-by: Romain Naour --- configs/armadeus_apf28_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/armadeus_apf28_defconfig b/configs/armadeus_apf28_defconfig index 01e14e66188..5207cf674c7 100644 --- a/configs/armadeus_apf28_defconfig +++ b/configs/armadeus_apf28_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_HOSTNAME="apf28" @@ -13,12 +13,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.289" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_UBIFS=y From ffe920b6447a9138cd679f98ecffccbcae0d107c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 12 Apr 2024 21:53:46 +0200 Subject: [PATCH 0504/3013] configs/wandboard: uboot needs openssl Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6609466641 Signed-off-by: Julien Olivain Reviewed-by: Fabio Estevam Signed-off-by: Romain Naour --- configs/wandboard_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 522173b8ed9..b110c292dd6 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -26,6 +26,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" From f5aac04c362b593011ce245549d4bfc3311dbe9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Tue, 2 Apr 2024 21:08:52 +0000 Subject: [PATCH 0505/3013] configs/sipeed_licheepi_nano_defconfig: fix missing linux headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build failed with: Incorrect selection of kernel headers: expected 6.8.x, got 6.5.x Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6498278078 Signed-off-by: Gero Schwäricke Signed-off-by: Romain Naour --- configs/sipeed_licheepi_nano_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sipeed_licheepi_nano_defconfig b/configs/sipeed_licheepi_nano_defconfig index 8be26165d96..6eb4a3069db 100644 --- a/configs/sipeed_licheepi_nano_defconfig +++ b/configs/sipeed_licheepi_nano_defconfig @@ -9,6 +9,9 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/licheepi_nano/genimage.cfg" +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y + # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From a856e6dffd4238915c3f3807222ad42e918caa92 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 19 Apr 2024 20:20:11 -0300 Subject: [PATCH 0506/3013] configs/imx6-sabresd: update U-Boot and kernel Update to U-Boot 2024.04 and kernel 6.6.28 versions. Signed-off-by: Fabio Estevam Signed-off-by: Romain Naour --- configs/imx6-sabresd_defconfig | 10 +++++----- configs/imx6-sabresd_qt5_defconfig | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index c237c2dc7c5..d38478a6df0 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -33,8 +33,8 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.41" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd nxp/imx/imx6dl-sabresd nxp/imx/imx6qp-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index e385e86b81b..56470e27a9c 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -29,7 +29,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,10 +38,10 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.41" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd nxp/imx/imx6dl-sabresd nxp/imx/imx6qp-sabresd" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From dc18b639c93f972246fce345b43dc091d07d35ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Wed, 3 Apr 2024 22:24:44 +0000 Subject: [PATCH 0507/3013] configs/raspberrypizero2w_defconfig: fix typo in headers series option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build for this defconfig fails with: Incorrect selection of kernel headers: expected 6.8.x, got 6.1.x Found with the following command while trying to find boards that have missing custom headers series: grep --null --recursive --files-without-match "BR2_TOOLCHAIN_EXTERNAL=y" ./configs \ | xargs --null grep --null --files-with-matches "BR2_LINUX_KERNEL_CUSTOM_.*=y" \ | xargs --null grep --null --files-without-match "BR2_KERNEL_HEADERS_[0-9]\+_[0-9]\+=y"\ | xargs --null grep --files-without-match "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_[0-9]\+_[0-9]\+=y" ./configs/mangopi_mq1rdw2_defconfig # patch pending ./configs/raspberrypizero2w_defconfig ./configs/sipeed_licheepi_nano_defconfig # patch pending Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6712162631 Signed-off-by: Gero Schwäricke [Romain: add gitlab-ci link] Signed-off-by: Romain Naour --- configs/raspberrypizero2w_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 1bf335c0763..e152889f2d4 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6.1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From 39ed602169ecf7677328d1387d30869baeb28cea Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 9 Mar 2024 22:23:46 +0100 Subject: [PATCH 0508/3013] configs/imx23evk: bump Linux and U-Boot The imx23evk_defconfig fail to build the Kernel with message: arch/arm/mm/proc-arm926.S: Assembler messages: arch/arm/mm/proc-arm926.S:477: Error: junk at end of line, first unrecognized character is '#' The upstream fix is [1] introduced in Kernel v5.5. This commit fixes this issue by updating the Kernel. While at it, U-Boot is also updated. The Kernel DTS name is also updated, to follow the reorganization in [2], first included in v6.5. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6338079204 [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=790756c7e0229dedc83bf058ac69633045b1000e [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- configs/imx23evk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/imx23evk_defconfig b/configs/imx23evk_defconfig index 94d159cf9e5..b54af418eb1 100644 --- a/configs/imx23evk_defconfig +++ b/configs/imx23evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,16 +11,16 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx23-evk" # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx23evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem From 07b7d8708d0c8302ad5407acf81df974050f0f5c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 1 May 2024 14:41:14 +0200 Subject: [PATCH 0509/3013] package/asterisk: fix compile issue Fix a compile issue when libyuv and libjpeg is enabled. Detection of following function fails: checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip... no In config.log you see that libjpeg is missing. Fixes: http://autobuild.buildroot.net/results/7bed9fc68fc9331ad12942c3eab9742ee8a7a4c4 Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 33d2e78bcf9..c37aa5ec9d0 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -113,9 +113,15 @@ ASTERISK_CONF_ENV = \ # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ASTERISK_CONF_ENV += LIBS="-latomic" +ASTERISK_LIBS += -latomic endif +ifeq ($(BR2_PACKAGE_LIBYUV)$(BR2_PACKAGE_JPEG),yy) +ASTERISK_LIBS += -ljpeg +endif + +ASTERISK_CONF_ENV += LIBS="$(ASTERISK_LIBS)" + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) ASTERISK_CONF_OPTS += --with-execinfo else From ebd44d7c5b8b4e24e401863bb779adea2ff3a226 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 May 2024 17:00:42 +0200 Subject: [PATCH 0510/3013] package/asterisk: fix uclibc-ng build Fix the following uclibc-ng build failure raised since bump to version 20.7.0 in commit 0e6d4d2171ce70d3aa6693f860a36ff08fc4d2b3 and https://github.com/asterisk/asterisk/commit/2694792e13c7f3ab1911c4a69fba0df32c544177: stasis/control.c: In function 'exec_command_on_condition': stasis/control.c:313:3: warning: implicit declaration of function 'pthread_kill'; did you mean 'pthread_yield'? [-Wimplicit-function-declaration] 313 | pthread_kill(control->control_thread, SIGURG); | ^~~~~~~~~~~~ | pthread_yield stasis/control.c:313:41: error: 'SIGURG' undeclared (first use in this function) 313 | pthread_kill(control->control_thread, SIGURG); | ^~~~~~ Fixes: 0e6d4d2171ce70d3aa6693f860a36ff08fc4d2b3 - http://autobuild.buildroot.org/results/d16e4ca4bd26234f84d17da24c04a8c19faba6c5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...es-stasis-control.c-include-signal.h.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/asterisk/0005-res-stasis-control.c-include-signal.h.patch diff --git a/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch b/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch new file mode 100644 index 00000000000..fc615c4a191 --- /dev/null +++ b/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch @@ -0,0 +1,43 @@ +From 8391dc3891337ecff8becefe1927a30d3922b848 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 1 May 2024 16:50:50 +0200 +Subject: [PATCH] res/stasis/control.c: include signal.h + +Include signal.h to avoid the following build failure with uclibc-ng +raised since +https://github.com/asterisk/asterisk/commit/2694792e13c7f3ab1911c4a69fba0df32c544177: + +stasis/control.c: In function 'exec_command_on_condition': +stasis/control.c:313:3: warning: implicit declaration of function 'pthread_kill'; did you mean 'pthread_yield'? [-Wimplicit-function-declaration] + 313 | pthread_kill(control->control_thread, SIGURG); + | ^~~~~~~~~~~~ + | pthread_yield +stasis/control.c:313:41: error: 'SIGURG' undeclared (first use in this function) + 313 | pthread_kill(control->control_thread, SIGURG); + | ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/d16e4ca4bd26234f84d17da24c04a8c19faba6c5 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/asterisk/asterisk/pull/728 +--- + res/stasis/control.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/res/stasis/control.c b/res/stasis/control.c +index 360f20790..4ed0e2af1 100644 +--- a/res/stasis/control.c ++++ b/res/stasis/control.c +@@ -41,6 +41,8 @@ + #include "asterisk/musiconhold.h" + #include "asterisk/app.h" + ++#include ++ + AST_LIST_HEAD(app_control_rules, stasis_app_control_rule); + + /*! +-- +2.43.0 + From 8996fedefbba7e5dfded9b7389062aba4469deaa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 1 May 2024 18:34:02 +0200 Subject: [PATCH 0511/3013] package/asterisk: needs libxcrypt with glibc We unconditionally configure asterisk with --with-crypt, so the build currently fails under glibc since it removed crypt in 2.39, and we explicitly remove it from external toolchains as well, whatever the version, causing build failures such as: checking for mandatory modules: OPENSSL BKTR CRYPT ILBC JANSSON LIBEDIT LIBJWT LIBXML2 PJPROJECT SQLITE3 ZLIB... fail configure: *** configure: *** The CRYPT installation appears to be missing or broken. configure: *** Either correct the installation, or run configure configure: *** including --without-crypt. Fixing this could be done in two ways: either make libxcrypt a mandatory dependency under glibc, and continue unconditionally enabling crypt support, or only enable crypt support when libxcrypt is available or this was a non-glibc toolchain. We chose the first option, to keep the existing behaviour (crypt support is always enabled), to be aligned with other packages (libxcrypt is selected under glibc toolchains), and because it is also the simplest. Signed-off-by: Yann E. MORIN --- package/asterisk/Config.in | 1 + package/asterisk/asterisk.mk | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index ba5a5740420..71c741acfd8 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBILBC select BR2_PACKAGE_LIBJWT select BR2_PACKAGE_LIBPJSIP + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index c37aa5ec9d0..be275094411 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -238,6 +238,11 @@ else ASTERISK_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +# --with-crypt is unconditional, relies on the C library if present +ASTERISK_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) ASTERISK_DEPENDENCIES += speex ASTERISK_CONF_OPTS += --with-speex --with-speexdsp From 6c4a99205094dea87986c0e12e955e9ef0676771 Mon Sep 17 00:00:00 2001 From: Thomas Bonnefille Date: Wed, 3 Apr 2024 11:14:39 +0200 Subject: [PATCH 0512/3013] package/starfive-spltool: new package This patch adds a new package for the Starfive SPL tool. It is used to add a header to the Secondary Program Loader for platforms based on the Starfive JH7110 SoC. Signed-off-by: Thomas Bonnefille Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in.host | 1 + package/starfive-spltool/Config.in.host | 8 ++++++++ .../starfive-spltool/starfive-spltool.hash | 2 ++ package/starfive-spltool/starfive-spltool.mk | 20 +++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/starfive-spltool/Config.in.host create mode 100644 package/starfive-spltool/starfive-spltool.hash create mode 100644 package/starfive-spltool/starfive-spltool.mk diff --git a/DEVELOPERS b/DEVELOPERS index 51a5cad167a..6180d238f0f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2960,6 +2960,9 @@ N: Thijs Vermeir F: package/ranger/ F: package/x265/ +N: Thomas Bonnefille +F: package/starfive-spltool/ + N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ diff --git a/package/Config.in.host b/package/Config.in.host index 9543a22ffc6..986b2854d0f 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -107,6 +107,7 @@ menu "Host utilities" source "package/sentry-cli/Config.in.host" source "package/sloci-image/Config.in.host" source "package/squashfs/Config.in.host" + source "package/starfive-spltool/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" source "package/swugenerator/Config.in.host" diff --git a/package/starfive-spltool/Config.in.host b/package/starfive-spltool/Config.in.host new file mode 100644 index 00000000000..afb2777ca6b --- /dev/null +++ b/package/starfive-spltool/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_STARFIVE_SPLTOOL + bool "host starfive-spltool" + depends on BR2_riscv + help + Add header to the Secondary Program Loader with the 3rd party + software given by Starfive-Tech for their SoCs. + + https://github.com/starfive-tech/soft_3rdpart/tree/JH7110_VisionFive2_devel/spl_tool diff --git a/package/starfive-spltool/starfive-spltool.hash b/package/starfive-spltool/starfive-spltool.hash new file mode 100644 index 00000000000..55835de3108 --- /dev/null +++ b/package/starfive-spltool/starfive-spltool.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 f5466225021fbe4e983cc85f32ce11d92ad30689b18e0d1390d16f6bfab74477 starfive-spltool-JH7110_VF2_515_v5.11.3.tar.gz diff --git a/package/starfive-spltool/starfive-spltool.mk b/package/starfive-spltool/starfive-spltool.mk new file mode 100644 index 00000000000..559df35074d --- /dev/null +++ b/package/starfive-spltool/starfive-spltool.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# starfive-spltool +# +################################################################################ + +STARFIVE_SPLTOOL_VERSION = JH7110_VF2_515_v5.11.3 +STARFIVE_SPLTOOL_SITE = $(call github,starfive-tech,soft_3rdpart,$(STARFIVE_SPLTOOL_VERSION)) +STARFIVE_SPLTOOL_LICENSE = GPL-2.0+ +STARFIVE_SPLTOOL_FILES = spl_tool/LICENSE + +define HOST_STARFIVE_SPLTOOL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/spl_tool +endef + +define HOST_STARFIVE_SPLTOOL_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/spl_tool/spl_tool $(HOST_DIR)/bin/spl_tool +endef + +$(eval $(host-generic-package)) From 35635cdc5b59a146928b82812d1c3c6db40b09f1 Mon Sep 17 00:00:00 2001 From: Thomas Bonnefille Date: Wed, 3 Apr 2024 11:14:40 +0200 Subject: [PATCH 0513/3013] configs/pine64_star64: new defconfig This patch adds a new defconfig for the Star64 board made by Pine64. This board is based on the Starfive JH7110 RISC-V 64 bits SoC. See: https://wiki.pine64.org/wiki/STAR64. This patch uses a custom Kernel and U-Boot made for this board. The SPL has to be signed with the Starfive SPL-Tool which is a software provided by the vendor to get the necessary headers on the SPL. The image configuration is based on the work done by Ivan Velickovic . Signed-off-by: Thomas Bonnefille Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/pine64/star64/genimage.cfg | 24 +++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 ++ board/pine64/star64/post-build.sh | 9 +++++ board/pine64/star64/readme.txt | 32 +++++++++++++++ .../pine64/star64/star64-uboot-fit-image.its | 29 ++++++++++++++ configs/pine64_star64_defconfig | 40 +++++++++++++++++++ 7 files changed, 140 insertions(+) create mode 100644 board/pine64/star64/genimage.cfg create mode 100644 board/pine64/star64/overlay/boot/extlinux/extlinux.conf create mode 100755 board/pine64/star64/post-build.sh create mode 100644 board/pine64/star64/readme.txt create mode 100644 board/pine64/star64/star64-uboot-fit-image.its create mode 100644 configs/pine64_star64_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 6180d238f0f..c132b61f2a2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2961,6 +2961,8 @@ F: package/ranger/ F: package/x265/ N: Thomas Bonnefille +F: board/pine64/star64 +F: configs/pine64_star64_defconfig F: package/starfive-spltool/ N: Thomas Claveirole diff --git a/board/pine64/star64/genimage.cfg b/board/pine64/star64/genimage.cfg new file mode 100644 index 00000000000..74940016f4c --- /dev/null +++ b/board/pine64/star64/genimage.cfg @@ -0,0 +1,24 @@ +# SD card image for the Pine64 Star64 board + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition spl { + image = "u-boot-spl.bin.normal.out" + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + offset = 2M + } + + partition uboot { + image = "opensbi_uboot_payload.img" + partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + offset = 4M + } + + partition rootfs { + image = "rootfs.ext4" + bootable = true + } +} diff --git a/board/pine64/star64/overlay/boot/extlinux/extlinux.conf b/board/pine64/star64/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..db7cfb7b8b2 --- /dev/null +++ b/board/pine64/star64/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label star64 + kernel /boot/Image + devicetree /boot/jh7110-pine64-star64.dtb + append root=/dev/mmcblk1p3 earlycon=sbi diff --git a/board/pine64/star64/post-build.sh b/board/pine64/star64/post-build.sh new file mode 100755 index 00000000000..ed0a6ebd520 --- /dev/null +++ b/board/pine64/star64/post-build.sh @@ -0,0 +1,9 @@ +#!/bin/bash +BOARD_DIR="$CONFIG_DIR"/board/pine64/star64 + +# Add header to the SPL +"$HOST_DIR"/bin/spl_tool -c -f "$BINARIES_DIR"/u-boot-spl.bin + +# Create the u-boot FIT image +cp "$BOARD_DIR"/star64-uboot-fit-image.its "$BINARIES_DIR" +mkimage -f "$BINARIES_DIR"/star64-uboot-fit-image.its -A riscv -O u-boot -T firmware "$BINARIES_DIR"/opensbi_uboot_payload.img diff --git a/board/pine64/star64/readme.txt b/board/pine64/star64/readme.txt new file mode 100644 index 00000000000..5e6ce251081 --- /dev/null +++ b/board/pine64/star64/readme.txt @@ -0,0 +1,32 @@ +Pine64 Star64 +============= + +The Star64 is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7110 processor. + +https://wiki.pine64.org/wiki/STAR64 + +How to build +============ + +$ make pine64_star64_defconfig +$ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX conv=fdatasync + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using a 12V power supply. diff --git a/board/pine64/star64/star64-uboot-fit-image.its b/board/pine64/star64/star64-uboot-fit-image.its new file mode 100644 index 00000000000..08f603163a9 --- /dev/null +++ b/board/pine64/star64/star64-uboot-fit-image.its @@ -0,0 +1,29 @@ +/dts-v1/; + +/ { + description = "U-boot-spl FIT image for JH7110 Pine64 Star64"; + #address-cells = <2>; + + images { + firmware { + description = "u-boot"; + data = /incbin/("fw_payload.bin"); + type = "firmware"; + arch = "riscv"; + os = "u-boot"; + load = <0x0 0x40000000>; + entry = <0x0 0x40000000>; + compression = "none"; + }; + }; + + configurations { + default = "config-1"; + + config-1 { + description = "U-boot-spl FIT config for JH7110 Pine64 Star64"; + firmware = "firmware"; + }; + }; +}; + diff --git a/configs/pine64_star64_defconfig b/configs/pine64_star64_defconfig new file mode 100644 index 00000000000..2c0c17ad62b --- /dev/null +++ b/configs/pine64_star64_defconfig @@ -0,0 +1,40 @@ +BR2_riscv=y + +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel configuration +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,Star64_linux,1456c984f15e21e28fb8a9ce96d0ca10e61a71c4)/linux-1456c984f15e21e28fb8a9ce96d0ca10e61a71c4.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="pine64_star64" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-pine64-star64" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# OpenSBI configuration +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_PLAT="generic" + +# U-Boot configuration +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,u-boot,172b47f62039605d6806fa96bd403c21cda28996)/u-boot-172b47f62039605d6806fa96bd403c21cda28996.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_star64" +BR2_TARGET_UBOOT_SPL=y + +# Misc +BR2_ROOTFS_OVERLAY="board/pine64/star64/overlay/" +BR2_PACKAGE_HOST_STARFIVE_SPLTOOL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="100M" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/star64/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/star64/post-build.sh" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From 119cfd836ed11c2fcdf9d7de32ad5803402b79b1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:55:24 +0200 Subject: [PATCH 0514/3013] package/lua-lsdbus: new package Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/lua-lsdbus/Config.in | 12 ++++++++++++ package/lua-lsdbus/lua-lsdbus.hash | 3 +++ package/lua-lsdbus/lua-lsdbus.mk | 17 +++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/lua-lsdbus/Config.in create mode 100644 package/lua-lsdbus/lua-lsdbus.hash create mode 100644 package/lua-lsdbus/lua-lsdbus.mk diff --git a/package/Config.in b/package/Config.in index 1935077f0f4..38e9c94198b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -751,6 +751,7 @@ menu "Lua libraries/modules" source "package/lua-livr/Config.in" source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" + source "package/lua-lsdbus/Config.in" source "package/lua-lunitx/Config.in" source "package/lua-lunix/Config.in" source "package/lua-lyaml/Config.in" diff --git a/package/lua-lsdbus/Config.in b/package/lua-lsdbus/Config.in new file mode 100644 index 00000000000..f4eda20d6e7 --- /dev/null +++ b/package/lua-lsdbus/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LUA_LSDBUS + bool "lua-lsdbus" + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_MXML + select BR2_PACKAGE_LUA_COMPAT53 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + help + Lua D-Bus bindings based on sd-bus and sd-event + + https://github.com/kmarkus/lsdbus + +comment "lua-lsdbus needs systemd" + depends on !BR2_PACKAGE_SYSTEMD diff --git a/package/lua-lsdbus/lua-lsdbus.hash b/package/lua-lsdbus/lua-lsdbus.hash new file mode 100644 index 00000000000..369370d63ad --- /dev/null +++ b/package/lua-lsdbus/lua-lsdbus.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b515cd00c844abc80993e9552d884c71a80a680e47b90a628f1f7bd18b9b821a lua-lsdbus-d132f8b2bd390d0b1c7d17b300190279f92bd494.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/lua-lsdbus/lua-lsdbus.mk b/package/lua-lsdbus/lua-lsdbus.mk new file mode 100644 index 00000000000..cbd7ee9d4bf --- /dev/null +++ b/package/lua-lsdbus/lua-lsdbus.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# lua-lsdbus +# +################################################################################ + +LUA_LSDBUS_VERSION = d132f8b2bd390d0b1c7d17b300190279f92bd494 +LUA_LSDBUS_SITE = $(call github,kmarkus,lsdbus,$(LUA_LSDBUS_VERSION)) +LUA_LSDBUS_DEPENDENCIES = luainterpreter mxml systemd +LUA_LSDBUS_LICENSE = LGPL-2.1 +LUA_LSDBUS_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_LUA_COMPAT53),y) +LUA_LSDBUS_DEPENDENCIES += lua-compat53 +endif + +$(eval $(cmake-package)) From 16e9f514905a12caab1d1b308dd95f8b79977828 Mon Sep 17 00:00:00 2001 From: Konstantin Aladyshev Date: Sun, 31 Mar 2024 00:22:00 +0300 Subject: [PATCH 0515/3013] configs/pc_x86_64_{bios, efi}_defconfig: add wireless regdb Wireless regulatory database lists the allowed radio frequencies for each local jurisdiction. Since linux-4.15 the kernel supports loading the files regulatory.db/regulatory.db.p7s directly from the /lib/firmware directory. Currently this package is not enabled and kernel complains with the following message on every boot: """ platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 cfg80211: failed to load regulatory.db """ Add wireless regulatory database package to fix the issue. Signed-off-by: Konstantin Aladyshev Signed-off-by: Thomas Petazzoni --- configs/pc_x86_64_bios_defconfig | 1 + configs/pc_x86_64_efi_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index 6032544d2d4..cba92ad93d7 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -62,3 +62,4 @@ BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_WIRELESS_REGDB=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index afb652f3fc1..fe6686b4a21 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -63,3 +63,4 @@ BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_WIRELESS_REGDB=y From 9fb4ed3a041eceffdc40139b33de697ca9afa30e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 1 Apr 2024 17:23:12 +0200 Subject: [PATCH 0516/3013] package/esp-hosted: bump version to 2024-04-01 Add support for Linux 6.9 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ..._ng-fix-build-failure-on-Linux-6.9.0.patch | 37 +++++++++++++++++++ package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch diff --git a/package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch b/package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch new file mode 100644 index 00000000000..21e8730d37f --- /dev/null +++ b/package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch @@ -0,0 +1,37 @@ +From 1cd8671eb64a1278466e7a9c90ceca1be0f8c0d5 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 1 Apr 2024 17:15:19 +0200 +Subject: [PATCH] esp_hosted_ng: fix build failure on Linux 6.9.0 + +With Linux commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=620d269f29a569ba37419cc03cf1da2d55f6252a +spi_master compatibility has gone, so let's redefine missing needed +macros spi_master and spi_master_put() locally if Linux version is >= +6.9.0. + +Upstream: https://github.com/espressif/esp-hosted/pull/358 + +Signed-off-by: Giulio Benetti +--- + esp_hosted_ng/host/spi/esp_spi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/esp_hosted_ng/host/spi/esp_spi.c b/esp_hosted_ng/host/spi/esp_spi.c +index d0bd513bd6..9817056b2d 100644 +--- a/esp_hosted_ng/host/spi/esp_spi.c ++++ b/esp_hosted_ng/host/spi/esp_spi.c +@@ -378,6 +378,11 @@ static int __spi_controller_match(struct device *dev, const void *data) + return ctlr->bus_num == *bus_num; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)) ++#define spi_master spi_controller ++#define spi_master_put(_ctlr) spi_controller_put(_ctlr) ++#endif ++ + static struct spi_controller *spi_busnum_to_master(u16 bus_num) + { + struct platform_device *pdev = NULL; +-- +2.34.1 + diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index ff0839076e7..d449f5030ee 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1c4df08132d5204a01adc2797e8f6f6d7ff945609b288cfe2dc2ea50789e8af4 esp-hosted-6a25417fc880fd744b3b0d93c11659c3e7d86384.tar.gz +sha256 8f25c01522fdcb2003ffbfcc0ccf4981f27bddc8080ba978e33590d56f5ae20b esp-hosted-669fd9cd1892bb8b364701968d5f06225346eea9.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index cc61e39b368..520ad5dc8c7 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = 6a25417fc880fd744b3b0d93c11659c3e7d86384 +ESP_HOSTED_VERSION = 669fd9cd1892bb8b364701968d5f06225346eea9 ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 From 0215a6d6f68e03909f54f4bbb160161b8d80503d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Apr 2024 21:17:20 +0200 Subject: [PATCH 0517/3013] package/fluidsynth: bump to version 2.3.5 For change log since v2.3.4, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.5 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 824f246a2c9..91d8778cbfd 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1529ef5bc3b9ef3adc2a7964505912f7305103e269e50cc0316f500b22053ac9 fluidsynth-2.3.4.tar.gz +sha256 f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d fluidsynth-2.3.5.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 4317c6e4607..ef05b6a5699 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.4 +FLUIDSYNTH_VERSION = 2.3.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From 653bd0d28b39aee415d38494accc1dc64aea432c Mon Sep 17 00:00:00 2001 From: Nasser Afshin Date: Mon, 1 Apr 2024 22:56:29 +0330 Subject: [PATCH 0518/3013] package/python-pycrate: bump to version 0.7.2 The license.txt file is now part of the release tarball, so it is no longer needed to download it separately, and re-add it to the source tree. The https://github.com/P1sec/pycrate/ repository has been archived, so use the new official location, as referenced by https://pypi.org/project/pycrate/. Signed-off-by: Nasser Afshin Signed-off-by: Thomas Petazzoni --- package/python-pycrate/Config.in | 2 +- package/python-pycrate/python-pycrate.hash | 4 ++-- package/python-pycrate/python-pycrate.mk | 10 ++-------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/package/python-pycrate/Config.in b/package/python-pycrate/Config.in index bbd68739387..e78df43fcd7 100644 --- a/package/python-pycrate/Config.in +++ b/package/python-pycrate/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_PYCRATE A software suite to handle various data and protocol formats. - https://github.com/P1sec/pycrate/ + https://github.com/pycrate-org/pycrate/ diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash index 94ec99b7389..5489f9290f1 100644 --- a/package/python-pycrate/python-pycrate.hash +++ b/package/python-pycrate/python-pycrate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycrate/json -md5 bd21fa697ecff7ad93bec4943230d281 pycrate-0.7.0.tar.gz -sha256 c83232f522b5bbc3b3eeaca2cf38ee63cd3c25d0c15f3ba221e6dafa89b9a763 pycrate-0.7.0.tar.gz +md5 37e1bda10f41fe947512e9d5f8289518 pycrate-0.7.2.tar.gz +sha256 8abd3fb9f3e7a2dc62061490f01e99b2a6185e88b1c9bf30db68853b748b8f61 pycrate-0.7.2.tar.gz # Locally computed sha256 checksums sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk index 1645eaf52cf..41ad30fcc8d 100644 --- a/package/python-pycrate/python-pycrate.mk +++ b/package/python-pycrate/python-pycrate.mk @@ -4,17 +4,11 @@ # ################################################################################ -PYTHON_PYCRATE_VERSION = 0.7.0 +PYTHON_PYCRATE_VERSION = 0.7.2 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz -PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/a6/a5/aab94e6bb8b3281cc450dde3961b417bd56abde2401955a9a4904df44c68 +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/f4/01/09aac6ea758ca7b7b1b4832c0c39003752ef7b6c1478e6db2f34171db3fe PYTHON_PYCRATE_SETUP_TYPE = setuptools -PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt PYTHON_PYCRATE_LICENSE = LGPL-2.1+ PYTHON_PYCRATE_LICENSE_FILES = license.txt -define PYTHON_PYCRATE_ADD_LICENSE_FILE - cp $(PYTHON_PYCRATE_DL_DIR)/license.txt $(@D) -endef -PYTHON_PYCRATE_POST_EXTRACT_HOOKS += PYTHON_PYCRATE_ADD_LICENSE_FILE - $(eval $(python-package)) From 640a79000b028eef3f54ba18e450c27bbeea9f56 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 23:11:22 +0100 Subject: [PATCH 0519/3013] package/apcupsd: set ac_cv_path_SHUTDOWN Set ac_cv_path_SHUTDOWN to /sbin/shutdown to avoid the following build failure when shutdown is not available on host raised since the addition of the package in commit d12b63b741586b89c4017551308c43512a617287: configure: error: Missing required tool; need any one of: shutdown shutdown.bsd Fixes: d12b63b741586b89c4017551308c43512a617287 - http://autobuild.buildroot.org/results/a8bbb5ced8343e08070361f260050de422144710 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/apcupsd/apcupsd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apcupsd/apcupsd.mk b/package/apcupsd/apcupsd.mk index 97e6d6a5581..43a016678d1 100644 --- a/package/apcupsd/apcupsd.mk +++ b/package/apcupsd/apcupsd.mk @@ -11,6 +11,7 @@ APCUPSD_LICENSE_FILES = COPYING APCUPSD_CPE_ID_VENDOR = apcupsd APCUPSD_SELINUX_MODULES = apache apcupsd APCUPSD_CONF_OPTS = --disable-test +APCUPSD_CONF_ENV = ac_cv_path_SHUTDOWN=/sbin/shutdown ifneq ($(BR2_PACKAGE_APCUPSD_MODBUS_USB)$(BR2_PACKAGE_APCUPSD_USB),) APCUPSD_CONF_ENV += ac_cv_path_usbcfg=$(STAGING_DIR)/usr/bin/libusb-config From 7931f78c16f08f7a850181ce4b316e2be7522f26 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 31 Mar 2024 22:34:03 +0200 Subject: [PATCH 0520/3013] utils/check-package: new check for Buildroot's defconfig files Now that we do have support for checking hashes for custom versions (for the few packages for which we do support custom versions, like the kernel, some bootloaders...), we want to ensure that our defconfig files, when they enable one or more such custom version, do enable checking the hashes for those versions, and thus we want to require all our defconfigs do enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Add a check for that condition. We need to be careful that we only check Buildroot's defconfig, whether in-tree or in a br2-external, and not kernel or other kconfig-based defconfig files, like those in board/ sub-directories. So we only match defconfig files that are in a configs/ directory, whether at the toplevel (for in-tree defconfigs), or not (for br2-external defconfigs). Since we only have two defconfigs that check hashes for custom versions, regnerate .checkpackageignore to ignore all so-far broken defconfigs. Suggested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 288 +++++++++++++++++++++++++ utils/check-package | 9 + utils/checkpackagelib/lib_defconfig.py | 20 ++ 3 files changed, 317 insertions(+) create mode 100644 utils/checkpackagelib/lib_defconfig.py diff --git a/.checkpackageignore b/.checkpackageignore index 1b336ce7a3e..0b169ea2f18 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -116,6 +116,294 @@ boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch lib_patch.Upstream boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch lib_patch.Upstream boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch lib_patch.Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch lib_patch.Upstream +configs/aarch64_efi_defconfig lib_defconfig.ForceCheckHash +configs/acmesystems_acqua_a5_256mb_defconfig lib_defconfig.ForceCheckHash +configs/acmesystems_acqua_a5_512mb_defconfig lib_defconfig.ForceCheckHash +configs/acmesystems_aria_g25_128mb_defconfig lib_defconfig.ForceCheckHash +configs/acmesystems_aria_g25_256mb_defconfig lib_defconfig.ForceCheckHash +configs/acmesystems_arietta_g25_128mb_defconfig lib_defconfig.ForceCheckHash +configs/acmesystems_arietta_g25_256mb_defconfig lib_defconfig.ForceCheckHash +configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash +configs/amarula_vyasa_rk3288_defconfig lib_defconfig.ForceCheckHash +configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash +configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash +configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash +configs/arm_foundationv8_defconfig lib_defconfig.ForceCheckHash +configs/armadeus_apf27_defconfig lib_defconfig.ForceCheckHash +configs/armadeus_apf28_defconfig lib_defconfig.ForceCheckHash +configs/armadeus_apf51_defconfig lib_defconfig.ForceCheckHash +configs/aspeed_ast2500evb_defconfig lib_defconfig.ForceCheckHash +configs/aspeed_ast2600evb_defconfig lib_defconfig.ForceCheckHash +configs/asus_tinker-s_rk3288_defconfig lib_defconfig.ForceCheckHash +configs/asus_tinker_rk3288_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9260eknf_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9g20dfc_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9g45m10ek_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9rlek_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9x5ek_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9x5ek_dev_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9x5ek_mmc_defconfig lib_defconfig.ForceCheckHash +configs/at91sam9x5ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d2_xplained_mmc_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d2_xplained_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d3_xplained_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d3_xplained_dev_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d3_xplained_mmc_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d3_xplained_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d3xek_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d4_xplained_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d4_xplained_dev_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d4_xplained_mmc_defconfig lib_defconfig.ForceCheckHash +configs/atmel_sama5d4_xplained_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/avenger96_defconfig lib_defconfig.ForceCheckHash +configs/avnet_rzboard_v2l_defconfig lib_defconfig.ForceCheckHash +configs/bananapi_m2_berry_defconfig lib_defconfig.ForceCheckHash +configs/bananapi_m2_ultra_defconfig lib_defconfig.ForceCheckHash +configs/bananapi_m2_zero_defconfig lib_defconfig.ForceCheckHash +configs/bananapro_defconfig lib_defconfig.ForceCheckHash +configs/beagleboardx15_defconfig lib_defconfig.ForceCheckHash +configs/beaglebone_defconfig lib_defconfig.ForceCheckHash +configs/beaglebone_qt5_defconfig lib_defconfig.ForceCheckHash +configs/beagleboneai_defconfig lib_defconfig.ForceCheckHash +configs/beaglev_defconfig lib_defconfig.ForceCheckHash +configs/beelink_gs1_defconfig lib_defconfig.ForceCheckHash +configs/broadcom_northstar_defconfig lib_defconfig.ForceCheckHash +configs/canaan_kd233_defconfig lib_defconfig.ForceCheckHash +configs/chromebook_elm_defconfig lib_defconfig.ForceCheckHash +configs/chromebook_snow_defconfig lib_defconfig.ForceCheckHash +configs/ci20_defconfig lib_defconfig.ForceCheckHash +configs/cubieboard2_defconfig lib_defconfig.ForceCheckHash +configs/engicam_imx6qdl_icore_defconfig lib_defconfig.ForceCheckHash +configs/engicam_imx6qdl_icore_qt5_defconfig lib_defconfig.ForceCheckHash +configs/engicam_imx6qdl_icore_rqs_defconfig lib_defconfig.ForceCheckHash +configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash +configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx6dlsabreauto_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx6dlsabresd_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx6qsabreauto_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx6qsabresd_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx6sxsabresd_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx7dsabresd_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx8mnevk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx8mpevk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx8qmmek_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx8qxpmek_defconfig lib_defconfig.ForceCheckHash +configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash +configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash +configs/freescale_t1040d4rdb_defconfig lib_defconfig.ForceCheckHash +configs/freescale_t2080_qds_rdb_defconfig lib_defconfig.ForceCheckHash +configs/friendlyarm_nanopi_r2s_defconfig lib_defconfig.ForceCheckHash +configs/galileo_defconfig lib_defconfig.ForceCheckHash +configs/globalscale_espressobin_defconfig lib_defconfig.ForceCheckHash +configs/grinn_chiliboard_defconfig lib_defconfig.ForceCheckHash +configs/grinn_liteboard_defconfig lib_defconfig.ForceCheckHash +configs/hifive_unleashed_defconfig lib_defconfig.ForceCheckHash +configs/icnova-a20-adb4006_defconfig lib_defconfig.ForceCheckHash +configs/imx23evk_defconfig lib_defconfig.ForceCheckHash +configs/imx6-sabreauto_defconfig lib_defconfig.ForceCheckHash +configs/imx6-sabresd_defconfig lib_defconfig.ForceCheckHash +configs/imx6-sabresd_qt5_defconfig lib_defconfig.ForceCheckHash +configs/imx6slevk_defconfig lib_defconfig.ForceCheckHash +configs/imx6sx-sdb_defconfig lib_defconfig.ForceCheckHash +configs/imx6ulevk_defconfig lib_defconfig.ForceCheckHash +configs/imx6ullevk_defconfig lib_defconfig.ForceCheckHash +configs/imx6ulpico_defconfig lib_defconfig.ForceCheckHash +configs/imx7d-sdb_defconfig lib_defconfig.ForceCheckHash +configs/imx7dpico_defconfig lib_defconfig.ForceCheckHash +configs/imx8mmpico_defconfig lib_defconfig.ForceCheckHash +configs/imx8mn_bsh_smm_s2_defconfig lib_defconfig.ForceCheckHash +configs/imx8mn_bsh_smm_s2_pro_defconfig lib_defconfig.ForceCheckHash +configs/imx8mpico_defconfig lib_defconfig.ForceCheckHash +configs/imx8mqevk_defconfig lib_defconfig.ForceCheckHash +configs/imxrt1050-evk_defconfig lib_defconfig.ForceCheckHash +configs/khadas_vim3_defconfig lib_defconfig.ForceCheckHash +configs/kontron_bl_imx8mm_defconfig lib_defconfig.ForceCheckHash +configs/kontron_pitx_imx8m_defconfig lib_defconfig.ForceCheckHash +configs/kontron_smarc_sal28_defconfig lib_defconfig.ForceCheckHash +configs/lego_ev3_defconfig lib_defconfig.ForceCheckHash +configs/linksprite_pcduino_defconfig lib_defconfig.ForceCheckHash +configs/ls1028ardb_defconfig lib_defconfig.ForceCheckHash +configs/ls1046a-frwy_defconfig lib_defconfig.ForceCheckHash +configs/mangopi_mq1rdw2_defconfig lib_defconfig.ForceCheckHash +configs/mender_x86_64_efi_defconfig lib_defconfig.ForceCheckHash +configs/microchip_mpfs_icicle_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sam9x60ek_mmc_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sam9x60ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sama5d2_icp_mmc_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sama5d2_icp_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sama7g5ek_mmc_defconfig lib_defconfig.ForceCheckHash +configs/microchip_sama7g5ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash +configs/minnowboard_max_defconfig lib_defconfig.ForceCheckHash +configs/mx25pdk_defconfig lib_defconfig.ForceCheckHash +configs/mx51evk_defconfig lib_defconfig.ForceCheckHash +configs/mx53loco_defconfig lib_defconfig.ForceCheckHash +configs/mx6cubox_defconfig lib_defconfig.ForceCheckHash +configs/mx6sx_udoo_neo_defconfig lib_defconfig.ForceCheckHash +configs/mx6udoo_defconfig lib_defconfig.ForceCheckHash +configs/nexbox_a95x_defconfig lib_defconfig.ForceCheckHash +configs/nitrogen6sx_defconfig lib_defconfig.ForceCheckHash +configs/nitrogen6x_defconfig lib_defconfig.ForceCheckHash +configs/nitrogen7_defconfig lib_defconfig.ForceCheckHash +configs/nitrogen8m_defconfig lib_defconfig.ForceCheckHash +configs/nitrogen8mm_defconfig lib_defconfig.ForceCheckHash +configs/nitrogen8mn_defconfig lib_defconfig.ForceCheckHash +configs/nitrogen8mp_defconfig lib_defconfig.ForceCheckHash +configs/octavo_osd32mp1_brk_defconfig lib_defconfig.ForceCheckHash +configs/octavo_osd32mp1_red_defconfig lib_defconfig.ForceCheckHash +configs/odroidc2_defconfig lib_defconfig.ForceCheckHash +configs/odroidxu4_defconfig lib_defconfig.ForceCheckHash +configs/olimex_a10_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash +configs/olimex_a13_olinuxino_defconfig lib_defconfig.ForceCheckHash +configs/olimex_a20_olinuxino_lime2_defconfig lib_defconfig.ForceCheckHash +configs/olimex_a20_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash +configs/olimex_a20_olinuxino_micro_defconfig lib_defconfig.ForceCheckHash +configs/olimex_a33_olinuxino_defconfig lib_defconfig.ForceCheckHash +configs/olimex_a64_olinuxino_defconfig lib_defconfig.ForceCheckHash +configs/olimex_imx233_olinuxino_defconfig lib_defconfig.ForceCheckHash +configs/olimex_stmp157_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash +configs/olpc_xo175_defconfig lib_defconfig.ForceCheckHash +configs/olpc_xo1_defconfig lib_defconfig.ForceCheckHash +configs/openblocks_a6_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_lite2_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_lite_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_one_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_one_plus_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_pc2_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_pc_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_pc_plus_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_r1_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_zero3_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_zero_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_zero_plus2_defconfig lib_defconfig.ForceCheckHash +configs/orangepi_zero_plus_defconfig lib_defconfig.ForceCheckHash +configs/pandaboard_defconfig lib_defconfig.ForceCheckHash +configs/pc_x86_64_bios_defconfig lib_defconfig.ForceCheckHash +configs/pc_x86_64_efi_defconfig lib_defconfig.ForceCheckHash +configs/pcengines_apu2_defconfig lib_defconfig.ForceCheckHash +configs/pine64_defconfig lib_defconfig.ForceCheckHash +configs/pine64_pinecube_defconfig lib_defconfig.ForceCheckHash +configs/pine64_sopine_defconfig lib_defconfig.ForceCheckHash +configs/pine64_star64_defconfig lib_defconfig.ForceCheckHash +configs/qemu_aarch64_ebbr_defconfig lib_defconfig.ForceCheckHash +configs/qemu_aarch64_sbsa_defconfig lib_defconfig.ForceCheckHash +configs/qemu_aarch64_virt_defconfig lib_defconfig.ForceCheckHash +configs/qemu_arm_ebbr_defconfig lib_defconfig.ForceCheckHash +configs/qemu_arm_versatile_defconfig lib_defconfig.ForceCheckHash +configs/qemu_arm_vexpress_defconfig lib_defconfig.ForceCheckHash +configs/qemu_arm_vexpress_tz_defconfig lib_defconfig.ForceCheckHash +configs/qemu_m68k_mcf5208_defconfig lib_defconfig.ForceCheckHash +configs/qemu_m68k_q800_defconfig lib_defconfig.ForceCheckHash +configs/qemu_microblazebe_mmu_defconfig lib_defconfig.ForceCheckHash +configs/qemu_microblazeel_mmu_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips32r2_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips32r2el_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips32r6_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips32r6el_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips64_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips64el_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips64r6_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_mips64r6el_malta_defconfig lib_defconfig.ForceCheckHash +configs/qemu_nios2_10m50_defconfig lib_defconfig.ForceCheckHash +configs/qemu_or1k_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc64_e5500_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc64_pseries_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc64le_powernv8_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc64le_pseries_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc_bamboo_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc_e500mc_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc_g3beige_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc_mac99_defconfig lib_defconfig.ForceCheckHash +configs/qemu_ppc_mpc8544ds_defconfig lib_defconfig.ForceCheckHash +configs/qemu_riscv32_virt_defconfig lib_defconfig.ForceCheckHash +configs/qemu_riscv64_nommu_virt_defconfig lib_defconfig.ForceCheckHash +configs/qemu_riscv64_virt_defconfig lib_defconfig.ForceCheckHash +configs/qemu_riscv64_virt_efi_defconfig lib_defconfig.ForceCheckHash +configs/qemu_s390x_defconfig lib_defconfig.ForceCheckHash +configs/qemu_sh4_r2d_defconfig lib_defconfig.ForceCheckHash +configs/qemu_sh4eb_r2d_defconfig lib_defconfig.ForceCheckHash +configs/qemu_sparc64_sun4u_defconfig lib_defconfig.ForceCheckHash +configs/qemu_x86_64_defconfig lib_defconfig.ForceCheckHash +configs/qemu_x86_defconfig lib_defconfig.ForceCheckHash +configs/qemu_xtensa_lx60_defconfig lib_defconfig.ForceCheckHash +configs/qemu_xtensa_lx60_nommu_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi0_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi0w_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi2_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi3_64_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi3_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi3_qt5we_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi4_64_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi4_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypi_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypicm4io_64_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypicm4io_defconfig lib_defconfig.ForceCheckHash +configs/raspberrypizero2w_defconfig lib_defconfig.ForceCheckHash +configs/riotboard_defconfig lib_defconfig.ForceCheckHash +configs/roc_pc_rk3399_defconfig lib_defconfig.ForceCheckHash +configs/rock64_defconfig lib_defconfig.ForceCheckHash +configs/rock_pi_n8_defconfig lib_defconfig.ForceCheckHash +configs/rockpro64_defconfig lib_defconfig.ForceCheckHash +configs/roseapplepi_defconfig lib_defconfig.ForceCheckHash +configs/s6lx9_microboard_defconfig lib_defconfig.ForceCheckHash +configs/sheevaplug_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_lichee_rv_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_lichee_rv_dock_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_licheepi_nano_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_licheepi_zero_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maix_bit_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maix_bit_sdcard_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maix_dock_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maix_dock_sdcard_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maix_go_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maix_go_sdcard_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maixduino_defconfig lib_defconfig.ForceCheckHash +configs/sipeed_maixduino_sdcard_defconfig lib_defconfig.ForceCheckHash +configs/snps_arc700_axs101_defconfig lib_defconfig.ForceCheckHash +configs/snps_arc700_nsim_defconfig lib_defconfig.ForceCheckHash +configs/snps_archs38_axs103_defconfig lib_defconfig.ForceCheckHash +configs/snps_archs38_haps_defconfig lib_defconfig.ForceCheckHash +configs/snps_archs38_hsdk_defconfig lib_defconfig.ForceCheckHash +configs/socrates_cyclone5_defconfig lib_defconfig.ForceCheckHash +configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash +configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash +configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash +configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash +configs/stm32f429_disco_xip_defconfig lib_defconfig.ForceCheckHash +configs/stm32f469_disco_sd_defconfig lib_defconfig.ForceCheckHash +configs/stm32f469_disco_xip_defconfig lib_defconfig.ForceCheckHash +configs/stm32f769_disco_sd_defconfig lib_defconfig.ForceCheckHash +configs/stm32mp157a_dk1_defconfig lib_defconfig.ForceCheckHash +configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash +configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash +configs/terasic_de10nano_cyclone5_defconfig lib_defconfig.ForceCheckHash +configs/toradex_apalis_imx6_defconfig lib_defconfig.ForceCheckHash +configs/ts4900_defconfig lib_defconfig.ForceCheckHash +configs/ts5500_defconfig lib_defconfig.ForceCheckHash +configs/ts7680_defconfig lib_defconfig.ForceCheckHash +configs/uevm5432_defconfig lib_defconfig.ForceCheckHash +configs/versal_vck190_defconfig lib_defconfig.ForceCheckHash +configs/visionfive2_defconfig lib_defconfig.ForceCheckHash +configs/visionfive_defconfig lib_defconfig.ForceCheckHash +configs/wandboard_defconfig lib_defconfig.ForceCheckHash +configs/warp7_defconfig lib_defconfig.ForceCheckHash +configs/zynq_microzed_defconfig lib_defconfig.ForceCheckHash +configs/zynq_zc702_defconfig lib_defconfig.ForceCheckHash +configs/zynq_zc706_defconfig lib_defconfig.ForceCheckHash +configs/zynq_zed_defconfig lib_defconfig.ForceCheckHash +configs/zynqmp_kria_kd240_defconfig lib_defconfig.ForceCheckHash +configs/zynqmp_kria_kr260_defconfig lib_defconfig.ForceCheckHash +configs/zynqmp_kria_kv260_defconfig lib_defconfig.ForceCheckHash +configs/zynqmp_zcu102_defconfig lib_defconfig.ForceCheckHash +configs/zynqmp_zcu104_defconfig lib_defconfig.ForceCheckHash +configs/zynqmp_zcu106_defconfig lib_defconfig.ForceCheckHash linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch lib_patch.Upstream package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/4th/0001-avoid-regen-during-install.patch lib_patch.Upstream diff --git a/utils/check-package b/utils/check-package index 61b66a8a67b..cbb3613e190 100755 --- a/utils/check-package +++ b/utils/check-package @@ -10,6 +10,7 @@ import sys import checkpackagelib.base import checkpackagelib.lib_config +import checkpackagelib.lib_defconfig import checkpackagelib.lib_hash import checkpackagelib.lib_ignore import checkpackagelib.lib_mk @@ -113,6 +114,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"arch/", r"board/", r"boot/", + r"configs/", r"fs/", r"linux/", r"package/", @@ -137,6 +139,11 @@ DO_NOT_CHECK_INTREE = re.compile(r"|".join([ SYSV_INIT_SCRIPT_FILENAME = re.compile(r"/S\d\d[^/]+$") +# For defconfigs: avoid matching kernel, uboot... defconfig files, so +# limit to defconfig files in a configs/ directory, either in-tree or +# in a br2-external tree. +BR_DEFCONFIG_FILENAME = re.compile(r"^(.+/)?configs/[^/]+_defconfig$") + def get_lib_from_filename(fname): if flags.intree_only: @@ -152,6 +159,8 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_ignore if CONFIG_IN_FILENAME.search(fname): return checkpackagelib.lib_config + if BR_DEFCONFIG_FILENAME.search(fname): + return checkpackagelib.lib_defconfig if fname.endswith(".hash"): return checkpackagelib.lib_hash if fname.endswith(".mk"): diff --git a/utils/checkpackagelib/lib_defconfig.py b/utils/checkpackagelib/lib_defconfig.py new file mode 100644 index 00000000000..ab0e361b57d --- /dev/null +++ b/utils/checkpackagelib/lib_defconfig.py @@ -0,0 +1,20 @@ +# See utils/checkpackagelib/readme.txt before editing this file. + +from checkpackagelib.base import _CheckFunction + + +class ForceCheckHash(_CheckFunction): + """Checks that a defconfig does force checking all hashes""" + + def before(self): + self.forces = False + + def check_line(self, lineno, text): + if self.forces: + return + if text == "BR2_DOWNLOAD_FORCE_CHECK_HASHES=y\n": + self.forces = True + + def after(self): + if not self.forces: + return [f"{self.filename}:0: missing BR2_DOWNLOAD_FORCE_CHECK_HASHES"] From 16463a00affa0ba4814e583bcd544174528f371e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 19:56:20 +0100 Subject: [PATCH 0521/3013] package/coreutils: drop gmp optional dependency libgmp is included in coreutils (through bootstrap.conf) since bump to version 9.0 in commit 2ee43bad85693d1c96e14f5b39ccb13a8982f50a and https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=13046444888a7e96f48d28fdd5a6ffe03d4ab036: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --enable-shared, --without-gmp Fixes: 2ee43bad85693d1c96e14f5b39ccb13a8982f50a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/coreutils/coreutils.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index e9cb7b67cbf..846d4fa5672 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -75,12 +75,6 @@ ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) COREUTILS_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr endif -ifeq ($(BR2_PACKAGE_GMP),y) -COREUTILS_DEPENDENCIES += gmp -else -COREUTILS_CONF_OPTS += --without-gmp -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) COREUTILS_DEPENDENCIES += libcap else From 65fe2a8f02c694975065c890c0e6038619c025ff Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 1 May 2024 21:37:10 +0200 Subject: [PATCH 0522/3013] support/config-fragments: remove sourcery-nios2.config The Sourcery CodeBench Nios-II 2018.05 external toolchain will be removed, first remove it from toolchain-configs.csv used by test-pkg and genrandconfig scripts. Signed-off-by: Romain Naour --- support/config-fragments/autobuild/sourcery-nios2.config | 3 --- support/config-fragments/autobuild/toolchain-configs.csv | 1 - 2 files changed, 4 deletions(-) delete mode 100644 support/config-fragments/autobuild/sourcery-nios2.config diff --git a/support/config-fragments/autobuild/sourcery-nios2.config b/support/config-fragments/autobuild/sourcery-nios2.config deleted file mode 100644 index d58407d5135..00000000000 --- a/support/config-fragments/autobuild/sourcery-nios2.config +++ /dev/null @@ -1,3 +0,0 @@ -BR2_nios2=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 2c4fa45fe7d..47d5fddfbdf 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -65,4 +65,3 @@ support/config-fragments/autobuild/linaro-aarch64-be.config,x86 support/config-fragments/autobuild/linaro-arm.config,x86 support/config-fragments/autobuild/sourcery-mips64.config,x86 support/config-fragments/autobuild/sourcery-mips.config,x86 -support/config-fragments/autobuild/sourcery-nios2.config,x86 From 7fa0159a5055363d002089f0c451a84594732cf2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:35:58 +0100 Subject: [PATCH 0523/3013] toolchain/toolchain-external: drop external codesourcery niosII toolchain This toolchain is pretty old and unlikely used. It's also affected by binutils bug 27597, so let's remove it. Remove BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII from pixman package. Signed-off-by: Giulio Benetti [Romain: remove BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII] Signed-off-by: Romain Naour --- package/pixman/pixman.mk | 7 ------- toolchain/toolchain-external/Config.in | 6 ------ .../toolchain-external/pkg-toolchain-external.mk | 2 +- .../Config.in | 16 ---------------- .../Config.in.options | 9 --------- .../toolchain-external-codesourcery-niosII.hash | 6 ------ .../toolchain-external-codesourcery-niosII.mk | 13 ------------- 7 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 37eb974c46c..8a4f16318f8 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -50,13 +50,6 @@ endif PIXMAN_CFLAGS = $(TARGET_CFLAGS) -# toolchain gets confused about TLS access through GOT (PIC), so disable TLS -# movhi r4, %got_hiadj(%tls_ldo(fast_path_cache)) -# {standard input}:172: Error: bad expression -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII),y) -PIXMAN_CFLAGS += -DPIXMAN_NO_TLS -endif - ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) PIXMAN_CFLAGS += -O0 endif diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index af9082cf6eb..e91aa163260 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -29,9 +29,6 @@ source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" -# NIOSII -source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" - # Bootlin toolchains, available for virtually all architectures source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in" @@ -129,9 +126,6 @@ source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.o # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" -# NIOSII -source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" - # Bootlin toolchains source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options" diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 5343f257e05..c08bf0a6539 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -13,7 +13,7 @@ # * Toolchains provided by Linaro for the ARM and AArch64 # architectures # * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM, -# MIPS, PowerPC, x86_64 and NIOS 2 architectures. For the MIPS +# MIPS, PowerPC, and x86_64 architectures. For the MIPS # toolchain, the -muclibc variant isn't supported yet, only the # default glibc-based variant is. # * Synopsys DesignWare toolchains for ARC cores diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in deleted file mode 100644 index cf3ce69a68b..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - bool "Sourcery CodeBench Nios-II 2018.05" - depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_7 - help - Sourcery CodeBench toolchain for the Nios-II architecture, - from Mentor Graphics. It uses gcc 7.3, binutils 2.28, - glibc 2.27, gdb 8.0.1 and kernel headers 4.15.5. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options deleted file mode 100644 index 07cc5ede94f..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "nios2-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-niosII" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash deleted file mode 100644 index 47893ab7e2b..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From https://sourcery.mentor.com/GNUToolchain/release3374 -md5 4f536b3b9b4e00f483e82e304c0a27ae sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -md5 be42ab83da2e8db7b73dc890c2549570 sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 -# Locally calculated -sha256 c19afb432b5b23f8d5d639831d3a423a3ea3c9cc62e0015020d20ea2eb36dd1b sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 d73a6364106dd62352711f932d3be8e97fdaaa548995678b5d38d9f21e22437a sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk deleted file mode 100644 index cb0fe760ff0..00000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-niosII -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2018.05-5 - -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_ACTUAL_SOURCE_TARBALL = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) From 83339a69e4ce03fccbd4d6bebd6a606f3e330085 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:35:59 +0100 Subject: [PATCH 0524/3013] package/binutils: add local patches to fix Nios2 bug 27597 These backported patches fix Nios2 linker bug 27597 that affects packages gdal, kf5-kcoreaddons, libgeos, libcamera, pistache. Signed-off-by: Giulio Benetti Signed-off-by: Romain Naour --- ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ 3 files changed, 375 insertions(+) create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.42/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch diff --git a/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 00000000000..4753ae13c49 --- /dev/null +++ b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 00000000000..4753ae13c49 --- /dev/null +++ b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.42/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.42/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 00000000000..4753ae13c49 --- /dev/null +++ b/package/binutils/2.42/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + From e983a6404814292092ab797d3983fa97aea76741 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:36:00 +0100 Subject: [PATCH 0525/3013] package/gdal: drop nios2 binutils bug 27597 dependency Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov Signed-off-by: Romain Naour --- package/gdal/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 24a1f06af23..839a1bd7eaf 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GDAL # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB @@ -26,9 +25,8 @@ config BR2_PACKAGE_GDAL https://gdal.org/ -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR From f9e4c41c19707d0cdb30c5607350ad80cd53e8e8 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:36:01 +0100 Subject: [PATCH 0526/3013] package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Signed-off-by: Romain Naour --- package/kf5/kf5-kcoreaddons/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 02bd38e3954..88fda03ee0a 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KF5_KCOREADDONS bool "kf5-kcoreaddons" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS From 138b06cd22b67e48ea801689b269757d4b296c44 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:36:02 +0100 Subject: [PATCH 0527/3013] package/libcamera: drop nios2 binutils bug 27597 dependency Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Signed-off-by: Romain Naour --- package/libcamera/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index ccb5281b4ba..e84b8d342ee 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS default y # Invalid packing size of ControlValue struct on m68k depends on !BR2_m68k - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" From a5f10b35fd2e46ca559c97d0389e9c37497a2cb7 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:36:03 +0100 Subject: [PATCH 0528/3013] package/libgeos: drop nios2 binutils bug 27597 dependency Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov Signed-off-by: Romain Naour --- package/libgeos/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 2a27c6f2a4f..76cbb9bdcda 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads not binutils bug 27597" +comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 3b7a8ebefcccb6355f7c5b2d1958bfe408da7452 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:36:04 +0100 Subject: [PATCH 0529/3013] package/pistache: drop nios2 binutils bug 27597 dependency Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Signed-off-by: Romain Naour --- package/pistache/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 3acf1f53f09..ca2d2833cdc 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PISTACHE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_RAPIDJSON help Pistache is a modern and elegant HTTP and REST framework @@ -13,9 +12,8 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" +comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_USE_WCHAR From c34e40fb65952c6f1a681e88dcd2995a90e83031 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:36:05 +0100 Subject: [PATCH 0530/3013] package/postgis: drop nios2 binutils bug 27597 dependency Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov Signed-off-by: Romain Naour --- package/postgis/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 7d423906776..78569d63beb 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ select BR2_PACKAGE_LIBXML2 @@ -18,7 +17,6 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR From 13602787bc17ead55f30456d8932d705e927ddc7 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Mar 2024 22:36:06 +0100 Subject: [PATCH 0531/3013] toolchain: remove binutils bug 27597 Binutils bug 27597 is not present anymore in Buildroot so let's remove it. Signed-off-by: Giulio Benetti Signed-off-by: Romain Naour --- toolchain/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index e8b3db64fb9..944e573f828 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -70,12 +70,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 -# Affect toolchains built with binutils 2.36.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - bool - default y if BR2_nios2 - # https://sourceware.org/bugzilla/show_bug.cgi?id=30730 # Affect toolchains built with binutils 2.40, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 From 05a4e5d5a5a4c6f9fabcf65bb1b46840dc305e29 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 19 Apr 2024 23:52:12 +0200 Subject: [PATCH 0532/3013] package/acpica: bump to version 20240321 For change log since 20230628, see [1]. License file hash changed in [2], due to year update. The upstream download page also changed the published hash from sha1 to sha256. This change is reflected in the hash file. [1] https://github.com/acpica/acpica/blob/G20240322/documents/changes.txt [2] https://github.com/acpica/acpica/commit/c18edfb1abfb50521a363f811bc8e1e64213bd00 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/acpica/acpica.hash | 5 ++--- package/acpica/acpica.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index dd9f8a1d22b..4170587f3a3 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,5 +1,4 @@ # From: https://www.intel.com/content/www/us/en/download/776303/acpi-component-architecture-downloads-unix-format-source-code-and-build-environment-with-an-intel-license.html -sha1 3b893fb771cf3fbd3531de3036e1a5bfc624c9d2 acpica-unix-20230628.tar.gz +sha256 54a299487925fd3e0551c95f9d5cee4f4984930273983eff67aa5cd46f8f338b acpica-unix-20240321.tar.gz # locally computed hash -sha256 86876a745e3d224dcfd222ed3de465b47559e85811df2db9820ef09a9dff5cce acpica-unix-20230628.tar.gz -sha256 905d6f191f3c29aa673602d9c66eb8df00f7e1b35064a081e0de81284ff17ee6 source/include/acpi.h +sha256 b28f54dc421531bbe269afd8c28bf6fdfd6affbe50c2831464f777ec1766d4a5 source/include/acpi.h diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index bbabd9de69a..a3d682257d6 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACPICA_VERSION = 20230628 +ACPICA_VERSION = 20240321 ACPICA_SOURCE = acpica-unix-$(ACPICA_VERSION).tar.gz -ACPICA_SITE = https://downloadmirror.intel.com/783534 +ACPICA_SITE = https://downloadmirror.intel.com/819451 ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 ACPICA_LICENSE_FILES = source/include/acpi.h ACPICA_DEPENDENCIES = host-bison host-flex From 4d9a3f1a32e743fd5bb267442be98b4e0a2d0e14 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 12:52:30 +0200 Subject: [PATCH 0533/3013] package/iperf: bump to version 2.2.0 For release note, see after the file list at: https://sourceforge.net/projects/iperf2/files/ Note: the md5 file hash is also added, because it is published on download page. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/iperf/iperf.hash | 5 +++-- package/iperf/iperf.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/iperf/iperf.hash b/package/iperf/iperf.hash index eb6088649d7..e4d40d5940f 100644 --- a/package/iperf/iperf.hash +++ b/package/iperf/iperf.hash @@ -1,6 +1,7 @@ # From https://sourceforge.net/projects/iperf2/files/ -sha1 e7b669c2e8747df95b59956e83ff53d3971d7a5f iperf-2.1.9.tar.gz +md5 34bb6ac1abeb801bf3f729794dc5ac36 iperf-2.2.0.tar.gz +sha1 bcbd101ab36f3faacaab1a765a96806ca49a1495 iperf-2.2.0.tar.gz # Locally computed: -sha256 5c0771aab00ef14520013aef01675977816e23bb8f5d9fde016f90eb2f1be788 iperf-2.1.9.tar.gz +sha256 16810a9575e4c6dd65e4a18ab5df3cdac6730b3c832cf080a8990f132f68364a iperf-2.2.0.tar.gz sha256 5f9f5c4feca3347c3b3c0ada8b16b4e6b698aac4e6f016a24adf61a5915336d1 COPYING diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 1347f766d1a..303614668a3 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF_VERSION = 2.1.9 +IPERF_VERSION = 2.2.0 IPERF_SITE = https://downloads.sourceforge.net/project/iperf2 IPERF_LICENSE = MIT-like IPERF_LICENSE_FILES = COPYING From 6317f6c9a4107d3409530b653c5900bff17ffb6e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 12:54:41 +0200 Subject: [PATCH 0534/3013] support/testing: add iperf runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_iperf.py | 23 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/test_iperf.py diff --git a/DEVELOPERS b/DEVELOPERS index c132b61f2a2..6bfad234429 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1799,6 +1799,7 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iozone.py +F: support/testing/tests/package/test_iperf.py F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_iptables.py F: support/testing/tests/package/test_jailhouse.py diff --git a/support/testing/tests/package/test_iperf.py b/support/testing/tests/package/test_iperf.py new file mode 100644 index 00000000000..31f04d98967 --- /dev/null +++ b/support/testing/tests/package/test_iperf.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestIperf(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPERF=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("iperf --version") + self.assertRunOk("iperf -s -D") + self.assertRunOk("iperf -c 127.0.0.1 -t 3") From 7c1faf997f868586a40a9cb6f03166d85a67b8f8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 15:28:17 +0200 Subject: [PATCH 0535/3013] support/testing: add fwts runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_fwts.py | 67 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 support/testing/tests/package/test_fwts.py diff --git a/DEVELOPERS b/DEVELOPERS index 6bfad234429..726641b5131 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1787,6 +1787,7 @@ F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py +F: support/testing/tests/package/test_fwts.py F: support/testing/tests/package/test_gawk.py F: support/testing/tests/package/test_ghostscript.py F: support/testing/tests/package/test_ghostscript/ diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py new file mode 100644 index 00000000000..ef792136c22 --- /dev/null +++ b/support/testing/tests/package/test_fwts.py @@ -0,0 +1,67 @@ +import os + +import infra.basetest + + +class TestFwts(infra.basetest.BRTest): + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_EXT2_SIZE="128M" + BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" + BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y + BR2_TARGET_EDK2=y + BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y + BR2_TARGET_GRUB2=y + BR2_TARGET_GRUB2_ARM64_EFI=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y + BR2_PACKAGE_FWTS=y + BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_MTOOLS=y + """ + + def test_run(self): + hda = os.path.join(self.builddir, "images", "disk.img") + flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") + flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") + self.emulator.boot(arch="aarch64", + options=["-M", "sbsa-ref", + "-cpu", "cortex-a57", + "-m", "512M", + "-pflash", flash0, + "-pflash", flash1, + "-hda", hda]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("fwts --version") + + # We run a simple UEFI runtime service variable interface test + # suite. Those tests are using the fwts efi_runtime kernel + # module. + self.assertRunOk("fwts -q uefirtvariable", timeout=30) + + # The previous fwts invocation is expected to have created a + # "results.log" report. We check the file exists and contains + # a known header string. + expected_str = "Results generated by fwts:" + cmd = f"grep -F '{expected_str}' results.log" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith(expected_str)) From 2aa3a23bbe755ef73af7dfbb65dd8ec60c8c1865 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 16:36:17 +0200 Subject: [PATCH 0536/3013] package/fwts: update _SITE url to use https The http URL redirects to https. This commit updates this URL to directly use https. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index f06609777db..a3f91ee4959 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -6,7 +6,7 @@ FWTS_VERSION = 23.07.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz -FWTS_SITE = http://fwts.ubuntu.com/release +FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom FWTS_LICENSE_FILES = debian/copyright From 17a04da7d4fdfe44547e9b50a62c2f4af49e9ae8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 16:36:18 +0200 Subject: [PATCH 0537/3013] package/fwts: bump to version 24.03.00 For release notes since version 23.07.00, see: https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes/24.03.00 https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes/24.01.00 https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes/23.11.00 License file hash changed, due to year update in: https://github.com/fwts/fwts/commit/cb2014e17f3fab0b2a2921e59e6b7acaa089cffe Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fwts/fwts.hash | 4 ++-- package/fwts/fwts.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 8525d47ecb6..0c0dd58c15c 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 a15e11c42856e9dfcf7ac23ed370618d2777eb996dd7843accf12d45b21b551c fwts-V23.07.00.tar.gz +sha256 d7f2642b1ec3697be798409decd6593d52bb1438f0d2dc697cbc85f52d19b41e fwts-V24.03.00.tar.gz # Hash for license file -sha256 b9e44b1f9f65178e037a59a31b051b51dbd6a531d27c8775d3438a6ce53fc874 debian/copyright +sha256 3cd2c5d12f024ff2aa203e37d7e972c4d5ab7bf1a65e3e09aebccf71e64b525b debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index a3f91ee4959..0692121421d 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 23.07.00 +FWTS_VERSION = 24.03.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 From b890206876588ed0d16187abf49d35a45177cc3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Apr 2024 09:14:43 +0200 Subject: [PATCH 0538/3013] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.75 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump to version 5.75 containing various fixes. Added a patch to fix build with disabled CUPS (failing since 5.73, waiting to be reviewed and merged) and enabled autoreconf which is needed for that patch. Changelog: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog Signed-off-by: Jan Čermák Signed-off-by: Thomas Petazzoni --- .../bluez5_utils-headers.mk | 2 +- .../0001-configure.ac-Fix-disable-cups.patch | 41 +++++++++++++++++++ package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +- 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 74b385e110f..2f07a7b4221 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.72 +BLUEZ5_UTILS_HEADERS_VERSION = 5.75 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch b/package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch new file mode 100644 index 00000000000..2c6c46f6fd8 --- /dev/null +++ b/package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch @@ -0,0 +1,41 @@ +From cb0de49bc6f8a6bf8f01a24599b499aa4bf18032 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Tue, 16 Apr 2024 07:26:04 +0200 +Subject: [PATCH] configure.ac: Fix --disable-cups +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +or else we get: + configure: error: conditional "CUPS_SERVERBIN" was never defined. + Usually this means the macro was only invoked conditionally. + +Fixes: https://github.com/bluez/bluez/issues/773 + +Upstream: https://patchwork.kernel.org/project/bluetooth/list/?series=844910 +Signed-off-by: Jan Čermák +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9dea70d..dbba759 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,12 +249,12 @@ AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no") + if (test "${enable_cups}" != "no"); then + AC_MSG_CHECKING([cups directory]) + cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin` +- AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") +- if (test "${cups_serverbin}" != ""); then +- AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) +- fi + AC_MSG_RESULT([${cups_serverbin}]) + fi ++AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") ++AS_IF([test "${cups_serverbin}" != ""],[ ++ AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) ++]) + + AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], + [enable Mesh profile support]), [enable_mesh=${enableval}]) diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 46680cf3c9f..9cc19f87dd3 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 499d7fa345a996c1bb650f5c6749e1d929111fa6ece0be0e98687fee6124536e bluez-5.72.tar.xz +sha256 988cb3c4551f6e3a667708a578f5ca9f93fc896508f98f08709be4f8ab033c2f bluez-5.75.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 3ccb63948ca..26f0f4afd43 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,9 +5,11 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.72 +BLUEZ5_UTILS_VERSION = 5.75 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth +# 0001-configure.ac-Fix-disable-cups.patch +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_INSTALL_STAGING = YES BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB From 0d394c39b8f26ba6e65771cd4afdcc4fac0ed0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Apr 2024 09:13:03 +0200 Subject: [PATCH 0539/3013] package/linux-pam: bump to version 1.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump to latest version, fixing couple of bugs. Remove patch already included in this release. https://github.com/linux-pam/linux-pam/releases/tag/v1.6.1 Signed-off-by: Jan Čermák Signed-off-by: Thomas Petazzoni --- .../0001-pam_namespace-include-stdint-h.patch | 42 ------------------- package/linux-pam/linux-pam.hash | 4 +- package/linux-pam/linux-pam.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/linux-pam/0001-pam_namespace-include-stdint-h.patch diff --git a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch deleted file mode 100644 index 5eda6195054..00000000000 --- a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 -From: Jacob Heider -Date: Wed, 17 Jan 2024 11:49:26 -0500 -Subject: [PATCH] pam_namespace: include stdint.h - -pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, -resulting in the following build failures on 1.6.0: - - pam_namespace.c: In function 'process_line': - pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) - 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { - | ^~~~~~~~ - pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? - 40 | #include "argv_parse.h" - +++ |+#include - 41 | - pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in - 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { - | ^~~~~~~~ - -Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") -Resolves: https://github.com/linux-pam/linux-pam/issues/733 - -Upstream: https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 -Signed-off-by: Fabrice Fontaine ---- - modules/pam_namespace/pam_namespace.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c -index f72d67189..b16731c22 100644 ---- a/modules/pam_namespace/pam_namespace.c -+++ b/modules/pam_namespace/pam_namespace.c -@@ -34,6 +34,8 @@ - - #define _ATFILE_SOURCE - -+#include "config.h" -+#include - #include "pam_cc_compat.h" - #include "pam_inline.h" - #include "pam_namespace.h" diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index cd882715cb4..353613e6e6e 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.6.1/Linux-PAM-1.6.1.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad Linux-PAM-1.6.0.tar.xz +sha256 f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e Linux-PAM-1.6.1.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 89a46e81dff..a205d67c54f 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.6.0 +LINUX_PAM_VERSION = 1.6.1 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES From 36841b5f37105a82fceeeda3312ec77323998f43 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 26 Apr 2024 13:35:38 +0200 Subject: [PATCH 0540/3013] package/spdlog: bump to version 1.14.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/spdlog/spdlog.hash | 2 +- package/spdlog/spdlog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index 3dbe43ac2d8..7a0f442ab0f 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 534f2ee1a4dcbeb22249856edfb2be76a1cf4f708a20b0ac2ed090ee24cfdbc9 spdlog-1.13.0.tar.gz +sha256 429a6b73ade8285cb21f83bacf89e2821dd1720ea7faa3cb518ffe04b4e00efc spdlog-1.14.0.tar.gz sha256 4ccecab18d1ff0b61174fe3d6c430541625d3ddb865b0d5887db296f883c76e7 LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index b45ae0a17d4..c435633f418 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.13.0 +SPDLOG_VERSION = 1.14.0 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE From 2fbffc610ef9d54b38fefd171fde93de136f7477 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 26 Apr 2024 20:02:17 +0200 Subject: [PATCH 0541/3013] package/dropbear: bump to version 2024.85 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 675715ddec5..a901656e5d4 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009 dropbear-2024.84.tar.bz2 +sha256 86b036c433a69d89ce51ebae335d65c47738ccf90d13e5eb0fea832e556da502 dropbear-2024.85.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 1571c5d9571..d9504c5525f 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2024.84 +DROPBEAR_VERSION = 2024.85 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain From 804abf536e5f8ab86160cc4f2066b42eeeb4ec39 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Thu, 25 Apr 2024 19:58:13 +0000 Subject: [PATCH 0542/3013] package/bats-core: bump to version 1.11.0 https://github.com/bats-core/bats-core/releases/tag/v1.11.0 https://github.com/bats-core/bats-core/releases/tag/v1.10.0 https://github.com/bats-core/bats-core/releases/tag/v1.9.0 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/bats-core/bats-core.hash | 2 +- package/bats-core/bats-core.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bats-core/bats-core.hash b/package/bats-core/bats-core.hash index 81c0229af4a..25b2b603394 100644 --- a/package/bats-core/bats-core.hash +++ b/package/bats-core/bats-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0f2df311a536e625a72bff64c838e67c7b5032e6ea9edcdf32758303062b2f3b bats-core-1.8.2.tar.gz +sha256 aeff09fdc8b0c88b3087c99de00cf549356d7a2f6a69e3fcec5e0e861d2f9063 bats-core-1.11.0.tar.gz # License files sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md diff --git a/package/bats-core/bats-core.mk b/package/bats-core/bats-core.mk index e172445930c..716b167c001 100644 --- a/package/bats-core/bats-core.mk +++ b/package/bats-core/bats-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_CORE_VERSION = 1.8.2 +BATS_CORE_VERSION = 1.11.0 BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION)) BATS_CORE_LICENSE = MIT BATS_CORE_LICENSE_FILES = LICENSE.md From 74c0cf2152415ab99c93d4d03acd7bfec39fd511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 18 Apr 2024 15:30:35 +0200 Subject: [PATCH 0543/3013] DEVELOPERS: add myself for Armadeus boards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Romain Naour --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 726641b5131..11ffe17f924 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2778,6 +2778,8 @@ F: support/testing/tests/package/sample_nu.nu F: support/testing/tests/package/test_nu.py N: Sébastien Szymanski +F: board/armadeus/ +F: configs/armadeus* F: package/mmc-utils/ F: package/python-flask-jsonrpc/ F: package/python-flask-login/ From 20a5c02235ae956ffa938968f0ee8ff39d887319 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 15 Apr 2024 14:46:16 +0200 Subject: [PATCH 0544/3013] configs/ti_am62x_sk_defconfig: reorder defconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch doesn't introduce any functional changes but reorganizes the code to prevent the execution of the commands: make ti_am62x_sk_defconfig make savedefconfig from showing a change in the defconfig. Signed-off-by: Dario Binacchi Reviewed-by: Gero Schwäricke Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 5c7b97b3b0b..40501681843 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -3,8 +3,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" -BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From b8a86f5a8fcf2930b17a165ead7274618b7aba75 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 May 2024 23:26:27 +0200 Subject: [PATCH 0545/3013] package/python-pillow: fix legal info Commit dfaa34ddd3398f22718f7361d617d98d53b51630 forgot to update hash of LICENSE file: ERROR: LICENSE has wrong sha256 hash: ERROR: expected: e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a ERROR: got : cf234c27a3f275f5a050f4df3946f8855704226fe4e7ca8b33928cbcecbced37 LICENSE file has been updated to clean up authors and contributors: https://github.com/python-pillow/Pillow/commit/4197263dff19a79f13cd86f6cdc9a0ec6c06da92 Fixes: dfaa34ddd3398f22718f7361d617d98d53b51630 - http://autobuild.buildroot.org/results/5a35d83c73367e1b20534b1bc7f2f564cf653a38 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pillow/python-pillow.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 073b758dfe9..352536a035e 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -3,4 +3,4 @@ md5 6c21a12849ae42f93881f614d8f6f651 pillow-10.3.0.tar.gz sha256 9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d pillow-10.3.0.tar.gz # Locally computed sha256 checksums -sha256 e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a LICENSE +sha256 cf234c27a3f275f5a050f4df3946f8855704226fe4e7ca8b33928cbcecbced37 LICENSE From 7b973daac3f24ffce0246c5bbf80541499d86189 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 1 May 2024 23:12:43 +0200 Subject: [PATCH 0546/3013] DEVELOPERS: remove Sebastian Weyer Sebastian email address at Smile is bouncing, so drop it from the DEVELOPERS file. Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 8 -------- 1 file changed, 8 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 11ffe17f924..5d198567d83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2769,14 +2769,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Sebastian Weyer -F: package/amlogic-boot-fip/ -F: package/nushell/ -F: package/rust-bindgen/ -F: package/spirv-headers/ -F: support/testing/tests/package/sample_nu.nu -F: support/testing/tests/package/test_nu.py - N: Sébastien Szymanski F: board/armadeus/ F: configs/armadeus* From 566eb38bdff666a11034e6543c42647d655e1e73 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Apr 2024 19:05:56 +0200 Subject: [PATCH 0547/3013] package/libarchive: bump to version 3.7.3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .../0002-autotools-do-not-add-iconv-for-Requires.private.patch | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch index 338dad46e02..3cbd304109b 100644 --- a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch +++ b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch @@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac index 99bff20d1..f245d0c55 100644 --- a/configure.ac +++ b/configure.ac -@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then +@@ -434,7 +434,6 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 818113585eb..ab6813686e6 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb libarchive-3.7.2.tar.xz +sha256 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2 libarchive-3.7.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 136f7a9c099..9c35856ff99 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.2 +LIBARCHIVE_VERSION = 3.7.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From 7d1aaddb2bd2f1a6636e93909fe55218e8bfd3ea Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 15 Apr 2024 21:35:22 +0200 Subject: [PATCH 0548/3013] support/testing/tests/fs/test_f2fs.py: bump test k to 6.6.27 This commit bumps to the 6.6.x series to refresh the test, as the 4.19.x series is planned to be end-of-life soon, in December 2024. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/tests/fs/test_f2fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/fs/test_f2fs.py b/support/testing/tests/fs/test_f2fs.py index 826077ac942..5918fe8ca8c 100644 --- a/support/testing/tests/fs/test_f2fs.py +++ b/support/testing/tests/fs/test_f2fs.py @@ -20,7 +20,7 @@ class TestF2FS(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.310" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.27" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" From 1f7c58145497ed01d566e08734a62feef1696807 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 16 Apr 2024 00:02:37 +0200 Subject: [PATCH 0549/3013] package/gnu-efi: enable on RISC-V 64-bit gnu-efi RISC-V 64bit support was introduced in commit [1], first included in version 3.0.14. This commit adds this architecture in _ARCH_SUPPORTS. [1] https://sourceforge.net/p/gnu-efi/code/ci/b95f138fa1550040e68ac3dd34cfce7d148d7984 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnu-efi/Config.in | 1 + package/gnu-efi/gnu-efi.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index d456a23837d..4f44cf9f648 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS bool default y if BR2_ARM_CPU_HAS_ARM + default y if BR2_RISCV_64 default y if BR2_aarch64 default y if BR2_aarch64_be default y if BR2_i386 diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 96caaeb9336..2eed4e40d2d 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -24,6 +24,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) GNU_EFI_PLATFORM = arm else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GNU_EFI_PLATFORM = aarch64 +else ifeq ($(BR2_RISCV_64),y) +GNU_EFI_PLATFORM = riscv64 endif GNU_EFI_MAKE_OPTS = \ From 00522a5022a11a05b21a9e3690c093e3aecb4753 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 15 Apr 2024 21:01:05 -0300 Subject: [PATCH 0550/3013] configs/mx6cubox: update U-Boot and kernel Update to U-Boot 2024.04 and kernel 6.6.27 versions. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx6cubox_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index cbd9378064a..46a1400d9f2 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -6,8 +6,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Toolchain -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,10 +17,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.71" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.27" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-cubox-i nxp/imx/imx6dl-cubox-i-emmc-som-v15 nxp/imx/imx6dl-cubox-i-som-v15 nxp/imx/imx6dl-hummingboard nxp/imx/imx6dl-hummingboard-emmc-som-v15 nxp/imx/imx6dl-hummingboard-som-v15 nxp/imx/imx6q-cubox-i nxp/imx/imx6q-cubox-i-emmc-som-v15 nxp/imx/imx6q-cubox-i-som-v15 nxp/imx/imx6q-hummingboard nxp/imx/imx6q-hummingboard-emmc-som-v15 nxp/imx/imx6q-hummingboard-som-v15" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -32,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From c6784ea0e17db4aa1505792b29587bef91f1d59d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 1 May 2024 22:03:02 +0200 Subject: [PATCH 0551/3013] utils/genrandconfig: remove Sourcery CodeBench Nios-II exclusion BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII has been removed by [1]. [1] 7fa0159a5055363d002089f0c451a84594732cf2 Cc: Giulio Benetti Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 5ebec415b51..df6bede1582 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -294,18 +294,6 @@ def fixup_config(sysinfo, configfile): if 'BR2_PACKAGE_WESTON=y\n' in configlines and \ BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: return False - # The cs nios2 2017.02 toolchain is affected by binutils PR19405 - if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \ - 'BR2_PACKAGE_BOOST=y\n' in configlines: - return False - # The cs nios2 2017.02 toolchain is affected by binutils PR19405 - if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \ - 'BR2_PACKAGE_QT5BASE_GUI=y\n' in configlines: - return False - # The cs nios2 2017.02 toolchain is affected by binutils PR19405 - if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \ - 'BR2_PACKAGE_FLANN=y\n' in configlines: - return False # No C library for internal toolchain if 'BR2_TOOLCHAIN_BUILDROOT_NONE=y' in configlines: return False From 20ddf2fe65e8ed29c661a949c5d535d2983fe561 Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Tue, 16 Apr 2024 09:48:18 -0500 Subject: [PATCH 0552/3013] package/petitboot: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: checking for crypt in -lcrypt... no configure: error: in `/home/arbab/src/buildroot/output/build/petitboot-1.15': configure: error: shadow/crypt libs required Signed-off-by: Reza Arbab Signed-off-by: Yann E. MORIN --- package/petitboot/Config.in | 1 + package/petitboot/petitboot.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 533c7a9f298..66836f31acd 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PETITBOOT # run-time dependencies select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) help diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index cd7631fa5ca..2eb6461144c 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -14,6 +14,7 @@ PETITBOOT_DEPENDENCIES = \ host-bison \ host-flex \ lvm2 \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) PETITBOOT_LICENSE = GPL-2.0 PETITBOOT_LICENSE_FILES = COPYING From 4d57014449e6e5b32e5373aa2afd4fd8cd3a9883 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Apr 2024 21:29:53 +0200 Subject: [PATCH 0553/3013] package/libnetconf2: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc64-buildroot-linux-gnu/12.3.0/../../../../sparc64-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/c84e27815cc607ad78a1901cb2be591df2686ac7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libnetconf2/Config.in | 1 + package/libnetconf2/libnetconf2.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/libnetconf2/Config.in b/package/libnetconf2/Config.in index 7865f9e4873..34934325fa0 100644 --- a/package/libnetconf2/Config.in +++ b/package/libnetconf2/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBNETCONF2 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBYANG help libnetconf2 is a NETCONF library in C intended for building diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index e349c1bce49..88163926c09 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -30,6 +30,10 @@ else LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=OFF endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +LIBNETCONF2_DEPENDENCIES += libxcrypt +endif + HOST_LIBNETCONF2_CONF_OPTS = \ -DENABLE_TESTS=OFF \ -DENABLE_VALGRIND_TESTS=OFF \ From e4981d6756c711e2034072247912bc85d3edae02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Tue, 30 Apr 2024 15:37:51 +0200 Subject: [PATCH 0554/3013] ti-k3-r5-loader: support devicetree customization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is duplicated from the U-Boot makefile & Kconfig. Similarly to U-Boot custom boards sometimes need to adjust the U-Boot devicetree. For example, the AM64x SDRAM controller supports inline ECC which needs to be enabled in the R5 loader devicetree. Please note that some versions of U-Boot have broken external devicetree support and may require manual patching to build. See commit [1] in the U-Boot tree. [1] https://source.denx.de/u-boot/u-boot/-/commit/3609e1dc5f4d4c238dcd23e045ba6223310feffa Signed-off-by: Patrick Oppenlander Signed-off-by: Gero Schwäricke [Romain: add gitlab URL] Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/Config.in | 10 ++++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 6d1adbeac3e..df885cc2af6 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -95,6 +95,16 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_DTS_PATH + string "Device Tree Source file paths" + help + Space-separated list of paths to device tree source files + that will be copied to arch/arm/dts/ before starting the + build. + + To use this device tree source file, the U-Boot configuration + file must refer to it. + config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN string "tiboot3.bin binary name" default "tiboot3.bin" diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 891783e40f5..98a6d473f17 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -88,7 +88,12 @@ define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB fi endef +TI_K3_R5_LOADER_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_DTS_PATH)) + define TI_K3_R5_LOADER_BUILD_CMDS + $(if $(TI_K3_R5_LOADER_CUSTOM_DTS_PATH), + cp -f $(TI_K3_R5_LOADER_CUSTOM_DTS_PATH) $(@D)/arch/arm/dts/ + ) $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef From c94df402d52ef656dbe957c3ac20f656f2fb9505 Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Wed, 1 May 2024 21:04:41 +0200 Subject: [PATCH 0555/3013] configs/visionfive2_defconfig: add hashes for linux/opensbi/u-boot Enable BR2_DOWNLOAD_FORCE_CHECK_HASHES and set the patch directory. Signed-off-by: Lukasz Tekieli [Romain: remove .checkpackageignore entry] Signed-off-by: Romain Naour --- .checkpackageignore | 1 - board/visionfive2/patches/linux-headers/linux-headers.hash | 1 + board/visionfive2/patches/linux/linux.hash | 2 ++ board/visionfive2/patches/opensbi/opensbi.hash | 2 ++ board/visionfive2/patches/uboot/uboot.hash | 2 ++ configs/visionfive2_defconfig | 2 ++ 6 files changed, 9 insertions(+), 1 deletion(-) create mode 120000 board/visionfive2/patches/linux-headers/linux-headers.hash create mode 100644 board/visionfive2/patches/linux/linux.hash create mode 100644 board/visionfive2/patches/opensbi/opensbi.hash create mode 100644 board/visionfive2/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 0b169ea2f18..db23450f038 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -390,7 +390,6 @@ configs/ts5500_defconfig lib_defconfig.ForceCheckHash configs/ts7680_defconfig lib_defconfig.ForceCheckHash configs/uevm5432_defconfig lib_defconfig.ForceCheckHash configs/versal_vck190_defconfig lib_defconfig.ForceCheckHash -configs/visionfive2_defconfig lib_defconfig.ForceCheckHash configs/visionfive_defconfig lib_defconfig.ForceCheckHash configs/wandboard_defconfig lib_defconfig.ForceCheckHash configs/warp7_defconfig lib_defconfig.ForceCheckHash diff --git a/board/visionfive2/patches/linux-headers/linux-headers.hash b/board/visionfive2/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/visionfive2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/visionfive2/patches/linux/linux.hash b/board/visionfive2/patches/linux/linux.hash new file mode 100644 index 00000000000..ccad8068dd8 --- /dev/null +++ b/board/visionfive2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04 linux-6.8.2.tar.xz diff --git a/board/visionfive2/patches/opensbi/opensbi.hash b/board/visionfive2/patches/opensbi/opensbi.hash new file mode 100644 index 00000000000..bc4058abe62 --- /dev/null +++ b/board/visionfive2/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/board/visionfive2/patches/uboot/uboot.hash b/board/visionfive2/patches/uboot/uboot.hash new file mode 100644 index 00000000000..97a2b4eaf95 --- /dev/null +++ b/board/visionfive2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 69c44dfbdd9..bb8ab082af6 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -1,4 +1,6 @@ BR2_riscv=y +BR2_GLOBAL_PATCH_DIR="board/visionfive2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/visionfive2/post-image.sh" From 81d7103a10b6837bfb22c314c90b46adda78bf7d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Apr 2024 08:42:03 +0200 Subject: [PATCH 0556/3013] package/cmake: add BR2_HOST_CMAKE_AT_LEAST_3_28 Buildroot commit 38d07349daece6393800619ecb3ef98299711819 forgot to add the corresponding BR2_HOST_CMAKE_AT_LEAST_X_Y option. Signed-off-by: Bernd Kuhls Signed-off-by: Romain Naour --- package/cmake/Config.in.host | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index 0935e9a564e..c38bb9daaa9 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -47,10 +47,15 @@ config BR2_HOST_CMAKE_AT_LEAST_3_27 bool select BR2_HOST_CMAKE_AT_LEAST_3_26 +config BR2_HOST_CMAKE_AT_LEAST_3_28 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_27 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_HOST_CMAKE_AT_LEAST string + default "3.28" if BR2_HOST_CMAKE_AT_LEAST_3_28 default "3.27" if BR2_HOST_CMAKE_AT_LEAST_3_27 default "3.26" if BR2_HOST_CMAKE_AT_LEAST_3_26 default "3.25" if BR2_HOST_CMAKE_AT_LEAST_3_25 From 30a88f4ab07a1ae7e9860d2f07960d994c6008dc Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 15 Apr 2024 14:08:19 +0200 Subject: [PATCH 0557/3013] package/catch2: bump to version 3.5.4 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 51367855138..ec3450836ab 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 269543a49eb76f40b3f93ff231d4c24c27a7e16c90e47d2e45bcc564de470c6e catch2-3.5.2.tar.gz +sha256 b7754b711242c167d8f60b890695347f90a1ebc95949a045385114165d606dbb catch2-3.5.4.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ee0940642fe..918f1b43199 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.5.2 +CATCH2_VERSION = 3.5.4 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From 6c1b31ff1a0793e44a8ab6d057ff2e80c14a1e1f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 15 Apr 2024 10:36:12 +0200 Subject: [PATCH 0558/3013] package/uuu: bump to version 1.5.179 - Provide macos arm prebuild version. Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.179 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 0f746a76338..cc78f6785b8 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,3 +1,3 @@ # locally computed -sha256 fac38e93714181fbfb0ff52b9cd29395c7eb342def5c3857da87e5429beb3927 uuu_source-uuu_1.5.177.tar.gz +sha256 6742a0c3b1e5b3b892963473f65e2770462f3bf2871424b800ffa0ed159feb84 uuu_source-uuu_1.5.179.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index b6611dc3d40..b633bd70dbe 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.177 +UUU_VERSION = 1.5.179 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From 7e3963cb5e0cbabacb27f763c4ad9e283ecae4fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 15 Apr 2024 06:36:23 +0200 Subject: [PATCH 0559/3013] package/shadow: enable on uclibc Package was disabled with commit 8035ea0a712eaa16d2ac96cd29db0e8726b0f685 because of missing features in uClibc-ng. In uClibc-ng 1.0.47 the missing feature were added, so enable shadow again. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/shadow/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/shadow/Config.in b/package/shadow/Config.in index 987605c7fa1..bbbea811ced 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -2,7 +2,6 @@ menuconfig BR2_PACKAGE_SHADOW bool "shadow" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # reallocarray, explicit_bzero select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Utilities to deal with user accounts. @@ -57,6 +56,5 @@ config BR2_PACKAGE_SHADOW_YESCRYPT endif # BR2_PACKAGE_SHADOW -comment "shadow needs a glibc or musl toolchain w/ headers >= 4.14, dynamic library" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || \ - BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC +comment "shadow needs a toolchain w/ headers >= 4.14, dynamic library" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS From f1723c93b59c021f16181b3ac62397b128cb9677 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 22:59:41 +0200 Subject: [PATCH 0560/3013] package/tor: bump version to 0.4.8.11 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes https://forum.torproject.org/t/stable-release-0-4-8-11/12265 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 8cc8eb435f0..4052f11736c 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.10.tar.gz.sha256sum -sha256 e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86 tor-0.4.8.10.tar.gz +# From https://dist.torproject.org/tor-0.4.8.11.tar.gz.sha256sum +sha256 8f2bdf90e63380781235aa7d604e159570f283ecee674670873d8bb7052c8e07 tor-0.4.8.11.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 12dcf3f07cd..9986a5f472a 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.10 +TOR_VERSION = 0.4.8.11 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From d476d2e7e53a92d4e2c038875cb3255dfb11d167 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:00:12 +0200 Subject: [PATCH 0561/3013] package/intel-gmmlib: bump version to 22.3.19 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index d9cad026c4e..aadf01a1690 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 381f7ad104e3d0d8dd6c3ec0c8304e410a479c439e72db35c83fb7e2b0ec556f intel-gmmlib-22.3.18.tar.gz +sha256 ea9c418b0fd84a982850f230cb2d783dfe2e1f9923065f54b2fcaad1e9b33417 intel-gmmlib-22.3.19.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 94a07ebfb8a..74e19e93fde 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.18 +INTEL_GMMLIB_VERSION = 22.3.19 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From ce486bf62ad4e6f00a6e2bab16b55a960cbbc079 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:00:28 +0200 Subject: [PATCH 0562/3013] package/libcap-ng: bump version to 0.8.5 Switched _SITE to https. Changelog: https://people.redhat.com/sgrubb/libcap-ng/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libcap-ng/Config.in | 2 +- package/libcap-ng/libcap-ng.hash | 2 +- package/libcap-ng/libcap-ng.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libcap-ng/Config.in b/package/libcap-ng/Config.in index 46f0b69ca41..bee66b33574 100644 --- a/package/libcap-ng/Config.in +++ b/package/libcap-ng/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_LIBCAP_NG running applications and print out any capabilities and whether or not it has an open ended bounding set. - http://people.redhat.com/sgrubb/libcap-ng/ + https://people.redhat.com/sgrubb/libcap-ng/ diff --git a/package/libcap-ng/libcap-ng.hash b/package/libcap-ng/libcap-ng.hash index bb4280368d3..022dd1f895a 100644 --- a/package/libcap-ng/libcap-ng.hash +++ b/package/libcap-ng/libcap-ng.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a libcap-ng-0.8.4.tar.gz +sha256 3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff libcap-ng-0.8.5.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 2ec88810b44..9c8012b2384 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.8.4 -LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng +LIBCAP_NG_VERSION = 0.8.5 +LIBCAP_NG_SITE = https://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB LIBCAP_NG_CPE_ID_VALID = YES From 20b4739c4e113cfd41898f2f1cf3f3c2a06ba21b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:00:45 +0200 Subject: [PATCH 0563/3013] package/libdeflate: bump version to 1.20 Release notes: ttps://github.com/ebiggers/libdeflate/blob/master/NEWS.md Build-tested using this defconfig BR2_PACKAGE_LIBDEFLATE=y arm-aarch64 [ 1/42]: OK bootlin-aarch64-glibc [ 2/42]: OK bootlin-arcle-hs38-uclibc [ 3/42]: OK bootlin-armv5-uclibc [ 4/42]: OK bootlin-armv7-glibc [ 5/42]: OK bootlin-armv7m-uclibc [ 6/42]: OK bootlin-armv7-musl [ 7/42]: OK bootlin-m68k-5208-uclibc [ 8/42]: OK bootlin-m68k-68040-uclibc [ 9/42]: OK bootlin-microblazeel-uclibc [10/42]: OK bootlin-mipsel32r6-glibc [11/42]: OK bootlin-mipsel-uclibc [12/42]: OK bootlin-nios2-glibc [13/42]: OK bootlin-openrisc-uclibc [14/42]: OK bootlin-powerpc64le-power8-glibc [15/42]: OK bootlin-powerpc-e500mc-uclibc [16/42]: OK bootlin-riscv32-glibc [17/42]: OK bootlin-riscv64-glibc [18/42]: OK bootlin-riscv64-musl [19/42]: OK bootlin-s390x-z13-glibc [20/42]: OK bootlin-sh4-uclibc [21/42]: OK bootlin-sparc64-glibc [22/42]: OK bootlin-sparc-uclibc [23/42]: OK bootlin-x86-64-glibc [24/42]: OK bootlin-x86-64-musl [25/42]: OK bootlin-x86-64-uclibc [26/42]: OK bootlin-xtensa-uclibc [27/42]: OK br-arm-basic [28/42]: OK br-arm-full-nothread [29/42]: OK br-arm-full-static [30/42]: OK br-i386-pentium4-full [31/42]: OK br-i386-pentium-mmx-musl [32/42]: OK br-mips64-n64-full [33/42]: OK br-mips64r6-el-hf-glibc [34/42]: OK br-powerpc-603e-basic-cpp [35/42]: OK br-powerpc64-power7-glibc [36/42]: OK linaro-aarch64-be [37/42]: OK linaro-aarch64 [38/42]: OK linaro-arm [39/42]: OK sourcery-mips64 [40/42]: OK sourcery-mips [41/42]: OK sourcery-nios2 [42/42]: OK 42 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdeflate/libdeflate.hash | 2 +- package/libdeflate/libdeflate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash index 8609f5ab02e..46afa966357 100644 --- a/package/libdeflate/libdeflate.hash +++ b/package/libdeflate/libdeflate.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 27bf62d71cd64728ff43a9feb92f2ac2f2bf748986d856133cc1e51992428c25 libdeflate-1.19.tar.gz +sha256 ed1454166ced78913ff3809870a4005b7170a6fd30767dc478a09b96847b9c2a libdeflate-1.20.tar.gz sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 3000a584079..4597dc5a8c8 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDEFLATE_VERSION = 1.19 +LIBDEFLATE_VERSION = 1.20 LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING From 5e2e0fedc842dd43aae9c0d2b37140d5c97db51b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:01:00 +0200 Subject: [PATCH 0564/3013] package/libedit: bump version to 20230828-3.1 Changelog: https://www.thrysoee.dk/editline/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index 2e7363d8283..c2ed7f773fa 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f0925a5adf4b1bf116ee19766b7daa766917aec198747943b1c4edf67a4be2bb libedit-20221030-3.1.tar.gz +sha256 4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad libedit-20230828-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index 576a1631732..ea7f98fdbd3 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20221030-3.1 +LIBEDIT_VERSION = 20230828-3.1 LIBEDIT_SITE = https://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses From 61bb21db97637b36acb4d6b874aa4a41c665cc54 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:01:14 +0200 Subject: [PATCH 0565/3013] package/libinput: bump version to 1.25.0 Release notes: https://lists.freedesktop.org/archives/wayland-devel/2023-August/042967.html https://lists.freedesktop.org/archives/wayland-devel/2024-January/043396.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libinput/libinput.hash | 2 +- package/libinput/libinput.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index f6a67fc1ed7..643cb162132 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 fad7011705a21f500229199f789f3e3e794b4c9826b70073745cdaec23bc1d0b libinput-1.23.0.tar.bz2 +sha256 193bd592298bd9e369c0ef3e5d83a6a9d68ddc4cd3dfc84bbe77920a8d0d57df libinput-1.25.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index a4d30b59109..499ed5ff4b2 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.23.0 +LIBINPUT_VERSION = 1.25.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 0d5be689b4ecd21e2562bf90f96732a6a703ae67 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:01:34 +0200 Subject: [PATCH 0566/3013] package/libmicrohttpd: bump version to 1.0.1 Release notes: https://lists.gnu.org/archive/html/info-gnu/2024-02/msg00000.html https://lists.gnu.org/archive/html/info-gnu/2024-02/msg00003.html Changelog: https://git.gnunet.org/libmicrohttpd.git/tree/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index a4c8fbca5b8..f1b3f8b7d8a 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9e7023a151120060d2806a6ea4c13ca9933ece4eacfc5c9464d20edddb76b0a0 libmicrohttpd-0.9.77.tar.gz +sha256 a89e09fc9b4de34dde19f4fcb4faaa1ce10299b9908db1132bbfa1de47882b94 libmicrohttpd-1.0.1.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 72b2bbafd89..6998ffd1ae7 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.77 +LIBMICROHTTPD_VERSION = 1.0.1 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_CPE_ID_VENDOR = gnu From b5c2b86ccf6236b0729016e0cfa98628078a6094 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:01:47 +0200 Subject: [PATCH 0567/3013] package/libminiupnpc: bump version to 2.2.7 Update license hash due to copyright year bump: https://github.com/miniupnp/miniupnp/commit/e370f25e911d7e37d57c07d62ba1f3e24d1479ab Changelog: https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/Changelog.txt Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libminiupnpc/libminiupnpc.hash | 4 ++-- package/libminiupnpc/libminiupnpc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index 21dac02dd31..4f7e7c7aa11 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 37fcd91953508c3e62d6964bb8ffbc5d47f3e13481fa54e6214fcc68704c66f1 miniupnpc-2.2.6.tar.gz -sha256 e143c6e207d0bb874c4be76b57689ffa408063a37a735c6dcec3dc600cb522c5 LICENSE +sha256 b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1 miniupnpc-2.2.7.tar.gz +sha256 7480ae23b082c05ad9823896163d78f3a96f1beadce51f29c96cf898545c27e5 LICENSE diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index dddbe6f81b1..3bd4ee6a9f1 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMINIUPNPC_VERSION = 2.2.6 +LIBMINIUPNPC_VERSION = 2.2.7 LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES From 6d5ce8609f17a3403d1148a0bbf7a2bdb5ec7f67 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:02:04 +0200 Subject: [PATCH 0568/3013] package/libopenssl: bump version to 3.3.0 Changelog: https://www.openssl.org/news/cl33.txt Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 841d4b4cfdd..aca75cf9e4b 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 -sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz +# From https://www.openssl.org/source/openssl-3.3.0.tar.gz.sha256 +sha256 53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02 openssl-3.3.0.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index feb5026c022..5ac6bf97138 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.2.1 +LIBOPENSSL_VERSION = 3.3.0 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From 4c4bb101ba61198a55cb29764e2d35053c216228 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:02:22 +0200 Subject: [PATCH 0569/3013] package/libpciaccess: bump version to 0.18.1 Removed patch which is included in upstream release. Release notes: https://lists.x.org/archives/xorg-announce/2024-March/003483.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...lding-static-library-not-just-shared.patch | 48 ------------------- package/libpciaccess/libpciaccess.hash | 4 +- package/libpciaccess/libpciaccess.mk | 2 +- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch diff --git a/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch b/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch deleted file mode 100644 index df1b4b415ae..00000000000 --- a/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ad7e9cb4b291a46812eea321f0634cfc46fb94e2 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Thu, 14 Mar 2024 13:55:55 -0700 -Subject: [PATCH] meson: allow building static library, not just shared - -Lets builders specify -Ddefault_library={shared,static,both} -to control which types of libpciaccess library are built - -Closes: #20 -Reported-by: Maxime Gauduin (@alucryd) -Signed-off-by: Alan Coopersmith - -Upstream: https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/ad7e9cb4b291a46812eea321f0634cfc46fb94e2 -Signed-off-by: Fabrice Fontaine ---- - .gitlab-ci.yml | 2 +- - src/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index bcb75cf..185edc2 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -91,7 +91,7 @@ meson: - - MESON_OPTIONS: ['-Dzlib=disabled', '-Dzlib=enabled'] - script: - - mkdir -p ../_inst -- - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 $MESON_OPTIONS -+ - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 -Ddefault_library=both $MESON_OPTIONS - - meson configure builddir - - ninja -C builddir test - - ninja -C builddir install -diff --git a/src/meson.build b/src/meson.build -index 24eee04..e319688 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -38,7 +38,7 @@ endif - - inc_src = include_directories('.') - --libpciaccess = shared_library( -+libpciaccess = library( - 'pciaccess', - [ - 'common_bridge.c', --- -GitLab - diff --git a/package/libpciaccess/libpciaccess.hash b/package/libpciaccess/libpciaccess.hash index 4662314509a..e50aacc8464 100644 --- a/package/libpciaccess/libpciaccess.hash +++ b/package/libpciaccess/libpciaccess.hash @@ -1,4 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2024-February/003453.html -sha512 54dff9a493344586d072edf8c8eb8f7960c7dfd64aa5c51a8ec8d4e341f703fd39eb606ee41c4fdd9d5aad3372b7efe6e0fe96eadc575ea91de276320ebc3fbd libpciaccess-0.18.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-March/003483.html +sha512 ef27999446e735df2331e94219ee3dafe9198a2472bb452f63ef9c9c446d5431f9e231e224cfabdeba1402974a5a0064546f9abced4d1770f994f5fc0c2b3310 libpciaccess-0.18.1.tar.xz # Hash for license file: sha256 f33f360f8905940dac01aa21597fe8a6727ca6f4ffa43b380e2116fd0666aa8a COPYING diff --git a/package/libpciaccess/libpciaccess.mk b/package/libpciaccess/libpciaccess.mk index 04f3e2083b5..cd35b270150 100644 --- a/package/libpciaccess/libpciaccess.mk +++ b/package/libpciaccess/libpciaccess.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCIACCESS_VERSION = 0.18 +LIBPCIACCESS_VERSION = 0.18.1 LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.xz LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib LIBPCIACCESS_LICENSE = MIT From ab78b51d83d5593dac5c1e0772ac298228878d9e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:02:33 +0200 Subject: [PATCH 0570/3013] package/libplist: bump version to 2.4.0 Release notes: https://github.com/libimobiledevice/libplist/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libplist/libplist.hash | 2 +- package/libplist/libplist.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libplist/libplist.hash b/package/libplist/libplist.hash index 460f63516a7..9bc79bf3f05 100644 --- a/package/libplist/libplist.hash +++ b/package/libplist/libplist.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4e8580d3f39d3dfa13cefab1a13f39ea85c4b0202e9305c5c8f63818182cac61 libplist-2.3.0.tar.bz2 +sha256 3f5868ae15b117320c1ff5e71be53d29469d4696c4085f89db1975705781a7cd libplist-2.4.0.tar.bz2 sha256 7619c753cac95d4740220223bde48a032606fcaccde5e546f9bc444c81ab356d COPYING diff --git a/package/libplist/libplist.mk b/package/libplist/libplist.mk index 8f094c133df..0b8a69455be 100644 --- a/package/libplist/libplist.mk +++ b/package/libplist/libplist.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPLIST_VERSION = 2.3.0 +LIBPLIST_VERSION = 2.4.0 LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2 LIBPLIST_SITE = https://github.com/libimobiledevice/libplist/releases/download/$(LIBPLIST_VERSION) LIBPLIST_INSTALL_STAGING = YES From ce3ce432feda336e4476eb930353fed8e3318539 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:02:45 +0200 Subject: [PATCH 0571/3013] package/libpng: bump version to 1.6.43 Release notes: https://sourceforge.net/p/png-mng/mailman/message/58741099/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libpng/libpng.hash | 4 ++-- package/libpng/libpng.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index fbae14c51d2..356c0e3e5df 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/58731120/ -sha256 c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 libpng-1.6.42.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/58741099/ +sha256 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c libpng-1.6.43.tar.xz # Locally computed: sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index c4da9f89c73..af38afde47f 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.42 +LIBPNG_VERSION = 1.6.43 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) From 929bffbf4bf8fcb91bda446777f907f32c782656 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 20:51:16 +0200 Subject: [PATCH 0572/3013] package/libglib2: fix atomic handling Correctly fix atomic handling to avoid the following build failure with all users of libglib2 (e.g. gdk-pixbuf) raised since bump to version 2.76.1 in commit 3f9622fe3d85b4d9f734b879abc1d485afea19b2: /usr/lib/libglib-2.0.a(gthread-posix.c.o): in function `g_mutex_trylock': gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' Fixes: - http://autobuild.buildroot.org/results/24a358869b98d83ab374c7c3a185ced450064d35 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0005-link-with-latomic-when-needed.patch | 45 +++++++++++++++++++ package/libglib2/libglib2.mk | 5 --- 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 package/libglib2/0005-link-with-latomic-when-needed.patch diff --git a/package/libglib2/0005-link-with-latomic-when-needed.patch b/package/libglib2/0005-link-with-latomic-when-needed.patch new file mode 100644 index 00000000000..275d86032b1 --- /dev/null +++ b/package/libglib2/0005-link-with-latomic-when-needed.patch @@ -0,0 +1,45 @@ +From d1814dbd3a88c95a43d4c9805bb4a523cf62d97b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Sep 2023 20:42:00 +0200 +Subject: [PATCH] link with -latomic when needed + +Some architecture such as sparc and some flavors of arm needs -latomic +to avoid the following build failure: + +gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3586 +--- + glib/meson.build | 1 + + meson.build | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/glib/meson.build b/glib/meson.build +index c26a35e42..7a761306b 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -426,6 +426,7 @@ libglib = library('glib-2.0', + pcre2, + platform_deps, + thread_dep, ++ atomic_dep + ], + c_args : glib_c_args, + objc_args : glib_c_args, +diff --git a/meson.build b/meson.build +index 25ae10fc2..5ae84b3b3 100644 +--- a/meson.build ++++ b/meson.build +@@ -2130,6 +2130,8 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0') + + libz_dep = dependency('zlib') + ++atomic_dep = cc.find_library('atomic', required: false) ++ + # First check in libc, fallback to libintl, and as last chance build + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible +-- +2.40.1 + diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index c06ded2a5b2..bffc565f11b 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -64,11 +64,6 @@ ifeq ($(BR2_PACKAGE_ELFUTILS),y) LIBGLIB2_DEPENDENCIES += elfutils endif -# Uses __atomic_compare_exchange_4 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -LIBGLIB2_LDFLAGS += -latomic -endif - ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBGLIB2_DEPENDENCIES += libiconv endif From 5efa5e9023ba4e9858c5809c6dee00ba9b75d19f Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Fri, 3 May 2024 17:48:54 +0200 Subject: [PATCH 0573/3013] configs/armadeus_apf27: add hashes for Linux/U-Boot And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. As asked By Romain. Signed-off-by: Julien BOIBESSOT [yann.morin.1998@free.fr: fix check-package] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - board/armadeus/patches/linux-headers/linux-headers.hash | 1 + board/armadeus/patches/linux/linux.hash | 2 ++ board/armadeus/patches/uboot/uboot.hash | 2 ++ configs/armadeus_apf27_defconfig | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) create mode 120000 board/armadeus/patches/linux-headers/linux-headers.hash create mode 100644 board/armadeus/patches/linux/linux.hash create mode 100644 board/armadeus/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index db23450f038..6a8ffe424ff 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -129,7 +129,6 @@ configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash configs/arm_foundationv8_defconfig lib_defconfig.ForceCheckHash -configs/armadeus_apf27_defconfig lib_defconfig.ForceCheckHash configs/armadeus_apf28_defconfig lib_defconfig.ForceCheckHash configs/armadeus_apf51_defconfig lib_defconfig.ForceCheckHash configs/aspeed_ast2500evb_defconfig lib_defconfig.ForceCheckHash diff --git a/board/armadeus/patches/linux-headers/linux-headers.hash b/board/armadeus/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/armadeus/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/armadeus/patches/linux/linux.hash b/board/armadeus/patches/linux/linux.hash new file mode 100644 index 00000000000..804920c10d6 --- /dev/null +++ b/board/armadeus/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9 linux-5.10.215.tar.xz diff --git a/board/armadeus/patches/uboot/uboot.hash b/board/armadeus/patches/uboot/uboot.hash new file mode 100644 index 00000000000..777e0adab20 --- /dev/null +++ b/board/armadeus/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268 u-boot-2018.09.tar.bz2 diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig index a87d319729b..782587e4105 100644 --- a/configs/armadeus_apf27_defconfig +++ b/configs/armadeus_apf27_defconfig @@ -5,6 +5,10 @@ BR2_arm926t=y # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Build +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_HOSTNAME="apf27" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" From f13651ed88944e3af60eedbaab9a983e6274c45b Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Fri, 3 May 2024 17:48:55 +0200 Subject: [PATCH 0574/3013] configs/armadeus_apf28: activates BR2_DOWNLOAD_FORCE_CHECK_HASHES As asked by Romain. Armadeus boards share same Linux hashes. Signed-off-by: Julien BOIBESSOT [yann.morin.1998@free.fr: fix check-package] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - configs/armadeus_apf28_defconfig | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 6a8ffe424ff..b7461c1ccaf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -129,7 +129,6 @@ configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash configs/arm_foundationv8_defconfig lib_defconfig.ForceCheckHash -configs/armadeus_apf28_defconfig lib_defconfig.ForceCheckHash configs/armadeus_apf51_defconfig lib_defconfig.ForceCheckHash configs/aspeed_ast2500evb_defconfig lib_defconfig.ForceCheckHash configs/aspeed_ast2600evb_defconfig lib_defconfig.ForceCheckHash diff --git a/configs/armadeus_apf28_defconfig b/configs/armadeus_apf28_defconfig index 5207cf674c7..4ff79dd0128 100644 --- a/configs/armadeus_apf28_defconfig +++ b/configs/armadeus_apf28_defconfig @@ -5,6 +5,10 @@ BR2_arm926t=y # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Build +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_HOSTNAME="apf28" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" From 09bcfb56962afddf29457953b5eedcd51e40333f Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Fri, 3 May 2024 17:48:56 +0200 Subject: [PATCH 0575/3013] configs/armadeus_apf51: activates BR2_DOWNLOAD_FORCE_CHECK_HASHES As asked by Romain. Armadeus boards share Linux hashes. Signed-off-by: Julien BOIBESSOT [yann.morin.1998@free.fr: fix check-package] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - configs/armadeus_apf51_defconfig | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index b7461c1ccaf..8dd76ac53e9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -129,7 +129,6 @@ configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash configs/arm_foundationv8_defconfig lib_defconfig.ForceCheckHash -configs/armadeus_apf51_defconfig lib_defconfig.ForceCheckHash configs/aspeed_ast2500evb_defconfig lib_defconfig.ForceCheckHash configs/aspeed_ast2600evb_defconfig lib_defconfig.ForceCheckHash configs/asus_tinker-s_rk3288_defconfig lib_defconfig.ForceCheckHash diff --git a/configs/armadeus_apf51_defconfig b/configs/armadeus_apf51_defconfig index af4562ce0f5..8317dd7b8ba 100644 --- a/configs/armadeus_apf51_defconfig +++ b/configs/armadeus_apf51_defconfig @@ -5,6 +5,10 @@ BR2_cortex_a8=y # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Build +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_HOSTNAME="apf51" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" From 38ba3d31a4905cc41b87a2ff9e6fee198d416a92 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 3 May 2024 01:59:57 +0000 Subject: [PATCH 0576/3013] package/bats-support: new package This library provides support functions needed by the bats-assert and bats-file libraries. This library does not provide an installer. Manually install the files under /usr/lib/bats/bats-support which is what the Arch Linux package does[1]. This makes the library loadable using `bats_load_library`[2]. [1] https://gitlab.archlinux.org/archlinux/packaging/packages/bats-support/-/blob/main/PKGBUILD?ref_type=heads [2] https://bats-core.readthedocs.io/en/stable/writing-tests.html#bats-load-library-load-system-wide-libraries There are going to be a few such helpers to be introduced later, so we make them all appear as sub-options of the main package, bats-core. Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: - move as sub-option of bats-core - explain why in commit log ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/bats-core/Config.in | 6 ++++++ package/bats-support/Config.in | 7 +++++++ package/bats-support/bats-support.hash | 5 +++++ package/bats-support/bats-support.mk | 18 ++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/bats-support/Config.in create mode 100644 package/bats-support/bats-support.hash create mode 100644 package/bats-support/bats-support.mk diff --git a/DEVELOPERS b/DEVELOPERS index 5d198567d83..7fc46d6b435 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -540,6 +540,7 @@ F: package/ncdu/ N: Brandon Maier F: board/freescale/ls1046a-frwy/ F: configs/ls1046a-frwy_defconfig +F: package/bats-support/ F: package/python-pysensors/ F: package/qoriq-fm-ucode/ F: package/unifdef/ diff --git a/package/bats-core/Config.in b/package/bats-core/Config.in index 73c38e5a044..7ba119a4129 100644 --- a/package/bats-core/Config.in +++ b/package/bats-core/Config.in @@ -9,3 +9,9 @@ config BR2_PACKAGE_BATS_CORE write behave as expected. https://github.com/bats-core/bats-core + +if BR2_PACKAGE_BATS_CORE + +source "package/bats-support/Config.in" + +endif diff --git a/package/bats-support/Config.in b/package/bats-support/Config.in new file mode 100644 index 00000000000..ce60978197f --- /dev/null +++ b/package/bats-support/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_BATS_SUPPORT + bool "bats-support" + help + bats-support is a supporting library providing common + functions to test helper libraries written for Bats. + + https://github.com/bats-core/bats-support diff --git a/package/bats-support/bats-support.hash b/package/bats-support/bats-support.hash new file mode 100644 index 00000000000..847f39e7c77 --- /dev/null +++ b/package/bats-support/bats-support.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 7815237aafeb42ddcc1b8c698fc5808026d33317d8701d5ec2396e9634e2918f bats-support-0.3.0.tar.gz + +# License files +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 LICENSE diff --git a/package/bats-support/bats-support.mk b/package/bats-support/bats-support.mk new file mode 100644 index 00000000000..765e08ffcea --- /dev/null +++ b/package/bats-support/bats-support.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# bats-support +# +################################################################################ + +BATS_SUPPORT_VERSION = 0.3.0 +BATS_SUPPORT_SITE = $(call github,bats-core,bats-support,v$(BATS_SUPPORT_VERSION)) +BATS_SUPPORT_LICENSE = CC0-1.0 +BATS_SUPPORT_LICENSE_FILES = LICENSE + +define BATS_SUPPORT_INSTALL_TARGET_CMDS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/bats/bats-support/src + $(INSTALL) -m 0755 $(@D)/*.bash -t $(TARGET_DIR)/usr/lib/bats/bats-support + $(INSTALL) -m 0755 $(@D)/src/*.bash -t $(TARGET_DIR)/usr/lib/bats/bats-support/src +endef + +$(eval $(generic-package)) From 154663c71ea4b6f6061801fe79f7554f695f3d38 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 3 May 2024 01:59:58 +0000 Subject: [PATCH 0577/3013] package/bats-assert: new package bats-assert is a helper library providing common assertions for Bats. This library does not provide an installer. Manually install the files under /usr/lib/bats/bats-assert which is what the Arch Linux package does[1]. This makes the library loadable using `bats_load_library`[2]. [1] https://gitlab.archlinux.org/archlinux/packaging/packages/bats-assert/-/blob/main/PKGBUILD?ref_type=heads [2] https://bats-core.readthedocs.io/en/stable/writing-tests.html#bats-load-library-load-system-wide-libraries Signed-off-by: Brandon Maier yann.morin.1998@free.fr: move as sub-option of bats-core] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/bats-assert/Config.in | 15 +++++++++++++++ package/bats-assert/bats-assert.hash | 5 +++++ package/bats-assert/bats-assert.mk | 18 ++++++++++++++++++ package/bats-core/Config.in | 1 + 5 files changed, 40 insertions(+) create mode 100644 package/bats-assert/Config.in create mode 100644 package/bats-assert/bats-assert.hash create mode 100644 package/bats-assert/bats-assert.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7fc46d6b435..2dfd5afd343 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -540,6 +540,7 @@ F: package/ncdu/ N: Brandon Maier F: board/freescale/ls1046a-frwy/ F: configs/ls1046a-frwy_defconfig +F: package/bats-assert/ F: package/bats-support/ F: package/python-pysensors/ F: package/qoriq-fm-ucode/ diff --git a/package/bats-assert/Config.in b/package/bats-assert/Config.in new file mode 100644 index 00000000000..8768331c1eb --- /dev/null +++ b/package/bats-assert/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_BATS_ASSERT + bool "bats-assert" + select BR2_PACKAGE_BATS_SUPPORT # runtime + help + bats-assert is a helper library providing common assertions + for Bats. + + In the context of this project, an assertion is a function + that perform a test and returns 1 on failure or 0 on success. + To make debugging easier, the assertion also outputs relevant + information on failure. The output is formatted for + readability. To make assertions usable outside of @test + blocks, the output is sent to stderr. + + https://github.com/bats-core/bats-assert diff --git a/package/bats-assert/bats-assert.hash b/package/bats-assert/bats-assert.hash new file mode 100644 index 00000000000..94c3908ab32 --- /dev/null +++ b/package/bats-assert/bats-assert.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 98ca3b685f8b8993e48ec057565e6e2abcc541034ed5b0e81f191505682037fd bats-assert-2.1.0.tar.gz + +# License files +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 LICENSE diff --git a/package/bats-assert/bats-assert.mk b/package/bats-assert/bats-assert.mk new file mode 100644 index 00000000000..c0e37e0048b --- /dev/null +++ b/package/bats-assert/bats-assert.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# bats-assert +# +################################################################################ + +BATS_ASSERT_VERSION = 2.1.0 +BATS_ASSERT_SITE = $(call github,bats-core,bats-assert,v$(BATS_ASSERT_VERSION)) +BATS_ASSERT_LICENSE = CC0-1.0 +BATS_ASSERT_LICENSE_FILES = LICENSE + +define BATS_ASSERT_INSTALL_TARGET_CMDS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/bats/bats-assert/src + $(INSTALL) -m 0755 $(@D)/*.bash -t $(TARGET_DIR)/usr/lib/bats/bats-assert + $(INSTALL) -m 0755 $(@D)/src/*.bash -t $(TARGET_DIR)/usr/lib/bats/bats-assert/src +endef + +$(eval $(generic-package)) diff --git a/package/bats-core/Config.in b/package/bats-core/Config.in index 7ba119a4129..d7c0a13b1fb 100644 --- a/package/bats-core/Config.in +++ b/package/bats-core/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_BATS_CORE if BR2_PACKAGE_BATS_CORE +source "package/bats-assert/Config.in" source "package/bats-support/Config.in" endif From a3d91b0a83339e19594dbc12b6345fb38b00f9ea Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 3 May 2024 01:59:59 +0000 Subject: [PATCH 0578/3013] package/bats-file: new package bats-file is a helper library providing common filesystem related assertions and helpers for Bats. This library does not provide an installer. Manually install the files under /usr/lib/bats/bats-file which is what the Arch Linux package does[1]. This makes the library loadable using `bats_load_library`[2]. [1] https://gitlab.archlinux.org/archlinux/packaging/packages/bats-file/-/blob/main/PKGBUILD?ref_type=heads [2] https://bats-core.readthedocs.io/en/stable/writing-tests.html#bats-load-library-load-system-wide-libraries Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: move as sub-option of bats-core] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/bats-core/Config.in | 1 + package/bats-file/Config.in | 14 ++++++++++++++ package/bats-file/bats-file.hash | 5 +++++ package/bats-file/bats-file.mk | 18 ++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/bats-file/Config.in create mode 100644 package/bats-file/bats-file.hash create mode 100644 package/bats-file/bats-file.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2dfd5afd343..c2d3f52a596 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -541,6 +541,7 @@ N: Brandon Maier F: board/freescale/ls1046a-frwy/ F: configs/ls1046a-frwy_defconfig F: package/bats-assert/ +F: package/bats-file/ F: package/bats-support/ F: package/python-pysensors/ F: package/qoriq-fm-ucode/ diff --git a/package/bats-core/Config.in b/package/bats-core/Config.in index d7c0a13b1fb..00beb2115e7 100644 --- a/package/bats-core/Config.in +++ b/package/bats-core/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_BATS_CORE if BR2_PACKAGE_BATS_CORE source "package/bats-assert/Config.in" +source "package/bats-file/Config.in" source "package/bats-support/Config.in" endif diff --git a/package/bats-file/Config.in b/package/bats-file/Config.in new file mode 100644 index 00000000000..c53fcf66434 --- /dev/null +++ b/package/bats-file/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_BATS_FILE + bool "bats-file" + select BR2_PACKAGE_BATS_SUPPORT # runtime + help + bats-file is a helper library providing common filesystem + related assertions and helpers for Bats. + + Assertions are functions that perform a test and output + relevant information on failure to help debugging. They return + 1 on failure and 0 otherwise. Output, formatted for + readability, is sent to the standard error to make assertions + usable outside of @test blocks too. + + https://github.com/bats-core/bats-file diff --git a/package/bats-file/bats-file.hash b/package/bats-file/bats-file.hash new file mode 100644 index 00000000000..9530dc6d9d0 --- /dev/null +++ b/package/bats-file/bats-file.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 9b69043241f3af1c2d251f89b4fcafa5df3f05e97b89db18d7c9bdf5731bb27a bats-file-0.4.0.tar.gz + +# License files +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 LICENSE diff --git a/package/bats-file/bats-file.mk b/package/bats-file/bats-file.mk new file mode 100644 index 00000000000..0499327fe0b --- /dev/null +++ b/package/bats-file/bats-file.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# bats-file +# +################################################################################ + +BATS_FILE_VERSION = 0.4.0 +BATS_FILE_SITE = $(call github,bats-core,bats-file,v$(BATS_FILE_VERSION)) +BATS_FILE_LICENSE = CC0-1.0 +BATS_FILE_LICENSE_FILES = LICENSE + +define BATS_FILE_INSTALL_TARGET_CMDS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/bats/bats-file/src + $(INSTALL) -m 0755 $(@D)/*.bash -t $(TARGET_DIR)/usr/lib/bats/bats-file + $(INSTALL) -m 0755 $(@D)/src/*.bash -t $(TARGET_DIR)/usr/lib/bats/bats-file/src +endef + +$(eval $(generic-package)) From 5b016de048fb5fd09b68828d07726c098c74862a Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 3 May 2024 02:00:00 +0000 Subject: [PATCH 0579/3013] support/testing: add bats runtime test Tests the bats-core, bats-support, bats-assert, and bats-file packages. Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: fix comment of overlay] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_bats.py | 33 +++++++++++++++++++ .../rootfs-overlay/root/test-bats-assert.bats | 11 +++++++ .../rootfs-overlay/root/test-bats-core.bats | 11 +++++++ .../rootfs-overlay/root/test-bats-file.bats | 10 ++++++ 4 files changed, 65 insertions(+) create mode 100644 support/testing/tests/package/test_bats.py create mode 100755 support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-assert.bats create mode 100755 support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-core.bats create mode 100755 support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-file.bats diff --git a/support/testing/tests/package/test_bats.py b/support/testing/tests/package/test_bats.py new file mode 100644 index 00000000000..5136484ebe8 --- /dev/null +++ b/support/testing/tests/package/test_bats.py @@ -0,0 +1,33 @@ +import os + +import infra.basetest + + +class TestBats(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_ENABLE_LOCALE_WHITELIST="" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_BASH=y + BR2_PACKAGE_BATS_CORE=y + BR2_PACKAGE_BATS_ASSERT=y + BR2_PACKAGE_BATS_FILE=y + BR2_ROOTFS_OVERLAY="{}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + # overlay to add a bats test suite + infra.filepath("tests/package/test_bats/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("bats --version") + + self.assertRunOk("bats /root/test-bats-core.bats", timeout=5) + self.assertRunOk("bats /root/test-bats-assert.bats", timeout=5) + self.assertRunOk("bats /root/test-bats-file.bats", timeout=5) diff --git a/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-assert.bats b/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-assert.bats new file mode 100755 index 00000000000..cd0cb482900 --- /dev/null +++ b/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-assert.bats @@ -0,0 +1,11 @@ +#!/usr/bin/env bats + +setup() { + bats_load_library bats-support + bats_load_library bats-assert +} + +@test "bats-assert assert_output" { + run echo "Hello World" + assert_output "Hello World" +} diff --git a/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-core.bats b/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-core.bats new file mode 100755 index 00000000000..54ec941e037 --- /dev/null +++ b/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-core.bats @@ -0,0 +1,11 @@ +#!/usr/bin/env bats + +@test "bats-core true" { + true +} + +@test "bats-core run" { + run echo "Hello World" + [ "$status" -eq 0 ] + [ "$output" = "Hello World" ] +} diff --git a/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-file.bats b/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-file.bats new file mode 100755 index 00000000000..0ac2616b996 --- /dev/null +++ b/support/testing/tests/package/test_bats/rootfs-overlay/root/test-bats-file.bats @@ -0,0 +1,10 @@ +#!/usr/bin/env bats + +setup() { + bats_load_library bats-support + bats_load_library bats-file +} + +@test "bats-file assert_exists" { + assert_exists /root/test-bats-file.bats +} From f5257789d6f088f1e2a0a8b00e1d21d32d2497ac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 3 May 2024 20:31:32 +0200 Subject: [PATCH 0580/3013] package/libglib2: update atomic patch Commit 929bffbf4bf8fcb91bda446777f907f32c782656 forgot to update patch number Moreover, replace it with a new iteration to follow upstream request [1] and avoid the following build host build failure with br-autobuild-1: /usr/bin/ld: cannot find /usr/lib64/libatomic.so.1.2.0: No such file or directory Fixes: 929bffbf4bf8fcb91bda446777f907f32c782656 - http://autobuild.buildroot.org/results/a12b9c4436594818f4ce128595b429adf7d90e31 [1]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3606 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: mention upstream commit now it's merged] Signed-off-by: Yann E. MORIN --- .../0005-link-with-latomic-when-needed.patch | 45 ---------------- .../0006-link-with-latomic-when-needed.patch | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+), 45 deletions(-) delete mode 100644 package/libglib2/0005-link-with-latomic-when-needed.patch create mode 100644 package/libglib2/0006-link-with-latomic-when-needed.patch diff --git a/package/libglib2/0005-link-with-latomic-when-needed.patch b/package/libglib2/0005-link-with-latomic-when-needed.patch deleted file mode 100644 index 275d86032b1..00000000000 --- a/package/libglib2/0005-link-with-latomic-when-needed.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1814dbd3a88c95a43d4c9805bb4a523cf62d97b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 17 Sep 2023 20:42:00 +0200 -Subject: [PATCH] link with -latomic when needed - -Some architecture such as sparc and some flavors of arm needs -latomic -to avoid the following build failure: - -gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' - -Signed-off-by: Fabrice Fontaine -Upstream: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3586 ---- - glib/meson.build | 1 + - meson.build | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/glib/meson.build b/glib/meson.build -index c26a35e42..7a761306b 100644 ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -426,6 +426,7 @@ libglib = library('glib-2.0', - pcre2, - platform_deps, - thread_dep, -+ atomic_dep - ], - c_args : glib_c_args, - objc_args : glib_c_args, -diff --git a/meson.build b/meson.build -index 25ae10fc2..5ae84b3b3 100644 ---- a/meson.build -+++ b/meson.build -@@ -2130,6 +2130,8 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0') - - libz_dep = dependency('zlib') - -+atomic_dep = cc.find_library('atomic', required: false) -+ - # First check in libc, fallback to libintl, and as last chance build - # proxy-libintl subproject. - # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible --- -2.40.1 - diff --git a/package/libglib2/0006-link-with-latomic-when-needed.patch b/package/libglib2/0006-link-with-latomic-when-needed.patch new file mode 100644 index 00000000000..3b5a071010f --- /dev/null +++ b/package/libglib2/0006-link-with-latomic-when-needed.patch @@ -0,0 +1,52 @@ +From 4e6dc4dee0e1c6407113597180d9616b4f275f94 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 2 May 2024 14:02:17 +0200 +Subject: [PATCH] link with -latomic when needed + +Some architecture such as sparc and some flavors of arm needs -latomic +to avoid the following build failure: + +gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/4e6dc4dee0e1c6407113597180d9616b4f275f94 +--- + glib/meson.build | 1 + + meson.build | 9 +++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/glib/meson.build b/glib/meson.build +index 24cbb664d4..b2dd569e1e 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -419,6 +419,7 @@ libglib = library('glib-2.0', + include_directories : configinc, + link_with: [charset_lib, gnulib_lib], + dependencies : [ ++ atomic_dep, + gnulib_libm_dependency, + libiconv, + libintl_deps, +diff --git a/meson.build b/meson.build +index 46c5aa200a..8b42940558 100644 +--- a/meson.build ++++ b/meson.build +@@ -2233,6 +2233,15 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0') + + libz_dep = dependency('zlib') + ++libatomic_test_code = ''' ++ int main (int argc, char ** argv) { ++ return 0; ++ }''' ++atomic_dep = [] ++if cc.links(libatomic_test_code, args : '-latomic', name : 'check for -latomic') ++ atomic_dep = cc.find_library('atomic') ++endif ++ + # First check in libc, fallback to libintl, and as last chance build + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible +-- +2.44.0 + From 4eeb69c9835450da8af8f55c776a7774914e2102 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 May 2024 11:34:46 +0200 Subject: [PATCH 0581/3013] package/proj: needs NPTL NPTL is mandatory since bump to version 9.3.0 in commit 57aba033e6cc81b95d006227c45a15eb3fc77d07 and https://github.com/OSGeo/PROJ/commit/ce080251225d16e11e139a5ebe07cf608fe022b2: /home/buildroot/instance-0/output-1/build/proj-9.3.0/src/iso19111/factory.cpp: In member function 'std::shared_ptr osgeo::proj::io::SQLiteHandleCache::getHandle(const std::string&, PJ_CONTEXT*)': /home/buildroot/instance-0/output-1/build/proj-9.3.0/src/iso19111/factory.cpp:622:9: error: 'pthread_atfork' was not declared in this scope; did you mean 'pthread_attr_t'? 622 | pthread_atfork(nullptr, nullptr, | ^~~~~~~~~~~~~~ | pthread_attr_t Fixes: 57aba033e6cc81b95d006227c45a15eb3fc77d07 - http://autobuild.buildroot.org/results/392664375c5bc5f047d39bff31534a226e8ea526 Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- package/gdal/Config.in | 6 +++--- package/libgeotiff/Config.in | 6 +++--- package/postgis/Config.in | 6 +++--- package/proj/Config.in | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 839a1bd7eaf..6ee088ce0cf 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_GDAL # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj - depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG @@ -25,8 +25,8 @@ config BR2_PACKAGE_GDAL https://gdal.org/ -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, NPTL, wchar" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/libgeotiff/Config.in b/package/libgeotiff/Config.in index 7ed296fb25c..f07c9943614 100644 --- a/package/libgeotiff/Config.in +++ b/package/libgeotiff/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBGEOTIFF bool "libgeotiff" depends on BR2_INSTALL_LIBSTDCPP # proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj - depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_PROJ select BR2_PACKAGE_TIFF @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBGEOTIFF https://github.com/OSGeo/libgeotiff -comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" +comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 78569d63beb..593c0dc1f34 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_POSTGIS depends on BR2_PACKAGE_POSTGRESQL_FULL depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos - depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # libgeos, proj select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ @@ -17,6 +17,6 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" +comment "postgis needs a toolchain w/ C++, NPTL, wchar, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/proj/Config.in b/package/proj/Config.in index 1952fc7d9a5..6d172e2ee99 100644 --- a/package/proj/Config.in +++ b/package/proj/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PROJ bool "proj" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_WCHAR select BR2_PACKAGE_SQLITE help @@ -14,7 +14,7 @@ config BR2_PACKAGE_PROJ http://proj4.org/ -comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" +comment "proj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR From 826e0bc3360ac1daa3581232c52ee47697bfabc6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Apr 2024 18:40:17 +0200 Subject: [PATCH 0582/3013] package/mdadm: do not hardcode -fpie Set LDLIBS to -ldl to remove -fpie and fix the following build failure raised since bump to version 4.3 in commit 99e9ff08d0705279532ca0cf3de22ea54660cbdc and https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=55a1150c7438afcb7756fccd49713ede20a58e4a: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/12.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: mdmon.o: non-pic relocation against symbol Fixes: 99e9ff08d0705279532ca0cf3de22ea54660cbdc - http://autobuild.buildroot.org/results/827b714deeaf091b368d59791e4306b85a8f7f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mdadm/mdadm.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index c6178700ef2..6de9467092e 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -20,7 +20,8 @@ MDADM_BUILD_OPTS = \ CWFLAGS="" \ CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ - CHECK_RUN_DIR=0 + CHECK_RUN_DIR=0 \ + LDLIBS=-ldl MDADM_INSTALL_TARGET_OPTS = install-bin From 0bdce8023102eb9ea75162cd061af411f29b67b7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Apr 2024 19:38:55 +0200 Subject: [PATCH 0583/3013] package/glog: needs gcc >= 6 C++14 is mandatory since bump to version 0.7.0 in commit 2e9f161d4a7a68a041860e5855e98bee9d3a1498 and https://github.com/google/glog/commit/674283420118bb919f83ceb3d9dee31ef43ff3aa and https://github.com/google/glog/commit/42a185cd888439d500a35191cd31a605b7c5bd20 resulting in the following build failure with gcc 5: In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/glog-0.7.0/src/demangle.cc:43:0: /home/buildroot/autobuild/run/instance-2/output-1/build/glog-0.7.0/src/utilities.h:210:22: error: enclosing class of constexpr non-static member function 'google::glog_internal_namespace_::FileDescriptor::operator bool() const' is not a literal type constexpr explicit operator bool() const noexcept { ^ Fixes: 2e9f161d4a7a68a041860e5855e98bee9d3a1498 - http://autobuild.buildroot.org/results/8d5e105283ead1057545b46726385f4ba4dff29e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/glog/Config.in | 6 ++++-- package/opencv4-contrib/Config.in | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/glog/Config.in b/package/glog/Config.in index bbdd1e2151a..85873f02f04 100644 --- a/package/glog/Config.in +++ b/package/glog/Config.in @@ -2,11 +2,13 @@ config BR2_PACKAGE_GLOG bool "glog" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 help C++ implementation of the Google logging module https://github.com/google/glog -comment "glog needs a toolchain w/ C++, threads" +comment "glog needs a toolchain w/ C++, threads, gcc >= 6" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index 261d4148698..d992c6d1acf 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -251,6 +251,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM bool "sfm" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # glog select BR2_PACKAGE_OPENCV4_LIB_IMGPROC select BR2_PACKAGE_OPENCV4_LIB_IMGCODECS select BR2_PACKAGE_EIGEN @@ -261,6 +262,9 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM to perform 3d reconstruction from 2d images. The core of the module is a light version of Libmv. +comment "sfm needs a toolchain w/ gcc >= 6" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_6 + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE bool "shape" help From a8c7a53985a62fd8a25cbe803628c64527da21fc Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 12 Apr 2024 21:12:22 +0000 Subject: [PATCH 0584/3013] boot/arm-trusted-firmware: enable verbose output Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 2d554c1da8e..abf917948ee 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -59,6 +59,7 @@ endif endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + $(if $(VERBOSE),V=1) \ CROSS_COMPILE="$(TARGET_CROSS)" \ BUILD_STRING=$(ARM_TRUSTED_FIRMWARE_VERSION) \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ From 5924a5c2c649c067a4bc434da5aa180170cbc30c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Apr 2024 19:43:28 +0200 Subject: [PATCH 0585/3013] package/ti-sgx-km: needs BR2_ARM_EABIHF ti-sgx-km raises the following build failure without BR2_ARM_EABIHF: eurasiacon/build/linux2/toplevel.mk:230: eurasiacon/build/linux2/moduledefs/target_armel.mk: No such file or directory Fixes: - http://autobuild.buildroot.org/results/17e4da346d062570b9a84ab8eb1ce93c6d7384be - http://autobuild.buildroot.org/results/04fd659472f1928c2621354bb0ea3b60c5dfadec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ti-sgx-km/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in index 964889ff40a..3e8a41b7551 100644 --- a/package/ti-sgx-km/Config.in +++ b/package/ti-sgx-km/Config.in @@ -1,10 +1,10 @@ comment "ti-sgx-km needs a Linux kernel to be built" - depends on BR2_arm + depends on BR2_ARM_EABIHF depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_TI_SGX_KM bool "ti-sgx-km" - depends on BR2_LINUX_KERNEL && BR2_arm + depends on BR2_LINUX_KERNEL && BR2_ARM_EABIHF select BR2_LINUX_NEEDS_MODULES help Kernel modules for TI CPUs with SGX GPU. From a239b6440e90d7cdea3c1a3ef3ec1ff7b24ce52c Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Fri, 3 May 2024 16:55:13 +0700 Subject: [PATCH 0586/3013] package/git: bump to version 2.45.0 Bump the package version to 2.45.0. Release notes: https://lore.kernel.org/git/xmqq8r0ww0sj.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Yann E. MORIN --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index f609a4aaa4a..2e54945a401 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 git-2.44.0.tar.xz +sha256 0aac200bd06476e7df1ff026eb123c6827bc10fe69d2823b4bf2ebebe5953429 git-2.45.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index a9cc3c30a7b..b6a7ec0cbb1 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.44.0 +GIT_VERSION = 2.45.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 6534c7fb98edec8a0bde5e95a34987c1939f3761 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 3 May 2024 20:50:08 +0200 Subject: [PATCH 0587/3013] package/gptfdisk: bump to version 1.0.10 Drop second to fourth patches (already in version) https://sourceforge.net/p/gptfdisk/code/ci/53ac725a88a616b9f3395500d6e520aa04742fa5/tree/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...h-of-sgdisk-when-compiled-with-lates.patch | 60 ------------------- ...ence-when-duplicating-string-argumen.patch | 44 -------------- ...to-deal-with-minor-change-in-libuuid.patch | 41 ------------- package/gptfdisk/gptfdisk.hash | 6 +- package/gptfdisk/gptfdisk.mk | 2 +- 6 files changed, 4 insertions(+), 150 deletions(-) delete mode 100644 package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch delete mode 100644 package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch delete mode 100644 package/gptfdisk/0004-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8dd76ac53e9..fd39d6e0b6c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -762,7 +762,6 @@ package/gpm/0005-fix-building-w-newer-glibc.patch lib_patch.Upstream package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch lib_patch.Upstream package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream -package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch lib_patch.Upstream package/grpc/0003-host-grpc-only-cpp-plugin.patch lib_patch.Upstream diff --git a/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch deleted file mode 100644 index bdeedd95cce..00000000000 --- a/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001 -From: Rod Smith -Date: Fri, 15 Apr 2022 18:10:14 -0400 -Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest - popt (commit 740; presumably eventually release 1.19) - -[Retrieved from: -https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] -Signed-off-by: Fabrice Fontaine ---- - NEWS | 8 ++++++++ - gptcl.cc | 2 +- - support.h | 2 +- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/NEWS b/NEWS -index c7add56..9e153fd 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,11 @@ -+1.0.10 (?/??/2022): -+------------------- -+ -+- Fixed problem that caused sgdisk to crash with errors about being unable -+ to read the disk's partition table when compiled with the latest popt -+ (commit 740, which is pre-release as I type; presumably version 1.19 and -+ later once released). -+ - 1.0.9 (4/14/2022): - ------------------ - -diff --git a/gptcl.cc b/gptcl.cc -index 34c9421..0d578eb 100644 ---- a/gptcl.cc -+++ b/gptcl.cc -@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - } // while - - // Assume first non-option argument is the device filename.... -- device = (char*) poptGetArg(poptCon); -+ device = strdup((char*) poptGetArg(poptCon)); - poptResetContext(poptCon); - - if (device != NULL) { -diff --git a/support.h b/support.h -index 8ba9ad1..f91f1bc 100644 ---- a/support.h -+++ b/support.h -@@ -8,7 +8,7 @@ - #include - #include - --#define GPTFDISK_VERSION "1.0.9" -+#define GPTFDISK_VERSION "1.0.9.1" - - #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) - // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 --- -2.35.1 - diff --git a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch deleted file mode 100644 index 250c0715823..00000000000 --- a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Damian Kurek -Date: Thu, 7 Jul 2022 03:39:16 +0000 -Subject: [PATCH] Fix NULL dereference when duplicating string argument - -poptGetArg can return NULL if there are no additional arguments, which -makes strdup dereference NULL on strlen - -Signed-off-by: Stefan Agner -Upstream: https://sourceforge.net/p/gptfdisk/code/ci/f5de3401b974ce103ffd93af8f9d43505a04aaf9 ---- - gptcl.cc | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gptcl.cc b/gptcl.cc -index 0d578eb..ab95239 100644 ---- a/gptcl.cc -+++ b/gptcl.cc -@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - } // while - - // Assume first non-option argument is the device filename.... -- device = strdup((char*) poptGetArg(poptCon)); -- poptResetContext(poptCon); -+ device = (char*) poptGetArg(poptCon); - - if (device != NULL) { -+ device = strdup(device); -+ poptResetContext(poptCon); - JustLooking(); // reset as necessary - BeQuiet(); // Tell called functions to be less verbose & interactive - if (LoadPartitions((string) device)) { -@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - cerr << "Error encountered; not saving changes.\n"; - retval = 4; - } // if -+ free(device); - } // if (device != NULL) - poptFreeContext(poptCon); - return retval; --- -2.40.0 - diff --git a/package/gptfdisk/0004-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch b/package/gptfdisk/0004-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch deleted file mode 100644 index 22c34ced6f9..00000000000 --- a/package/gptfdisk/0004-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6a8416cbd12d55f882bb751993b94f72d338d96f Mon Sep 17 00:00:00 2001 -From: Rod Smith -Date: Sat, 16 Apr 2022 09:32:04 -0400 -Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid - -Upstream: https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f -Signed-off-by: Ben Wolsieffer ---- - NEWS | 2 ++ - guid.cc | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index 9e153fd..9ec7e63 100644 ---- a/NEWS -+++ b/NEWS -@@ -6,6 +6,8 @@ - (commit 740, which is pre-release as I type; presumably version 1.19 and - later once released). - -+- Updated guid.cc to deal with minor change in libuuid. -+ - 1.0.9 (4/14/2022): - ------------------ - -diff --git a/guid.cc b/guid.cc -index 1e73ab7..d3e4fd5 100644 ---- a/guid.cc -+++ b/guid.cc -@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { - void GUIDData::Randomize(void) { - int i, uuidGenerated = 0; - --#ifdef _UUID_UUID_H -+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) - uuid_generate(uuidData); - ReverseBytes(&uuidData[0], 4); - ReverseBytes(&uuidData[4], 2); --- -2.42.0 - diff --git a/package/gptfdisk/gptfdisk.hash b/package/gptfdisk/gptfdisk.hash index 0b98677afb8..14a8d59a08c 100644 --- a/package/gptfdisk/gptfdisk.hash +++ b/package/gptfdisk/gptfdisk.hash @@ -1,5 +1,5 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.9/ -sha1 284bd000edaf7874b472bd01719c6a71a8030e13 gptfdisk-1.0.9.tar.gz +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.10/ +sha1 70c0bfe4290c2893fc957ef7f6156c5e74e469fc gptfdisk-1.0.10.tar.gz # Locally computed -sha256 dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 gptfdisk-1.0.9.tar.gz +sha256 2abed61bc6d2b9ec498973c0440b8b804b7a72d7144069b5a9209b2ad693a282 gptfdisk-1.0.10.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 393ea9469a7..b35899bf9b9 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.9 +GPTFDISK_VERSION = 1.0.10 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPL-2.0+ GPTFDISK_LICENSE_FILES = COPYING From b3819b761f4a06bc75fe33b785e5ff2cecc5d211 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 3 May 2024 21:28:39 +0200 Subject: [PATCH 0588/3013] package/ledmon: bump to version 1.0.0 - Add host-autoconf-archive mandatory dependency - Drop patches (already in version) https://github.com/intel/ledmon/releases/tag/v1.0.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...nstandard-on_exit-function-by-atexit.patch | 223 ------------------ ...-Fix-unknown-type-name-ssize_t-error.patch | 44 ---- .../ledmon/0003-Add-disable-doc-option.patch | 63 ----- package/ledmon/ledmon.hash | 2 +- package/ledmon/ledmon.mk | 7 +- 5 files changed, 5 insertions(+), 334 deletions(-) delete mode 100644 package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch delete mode 100644 package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch delete mode 100644 package/ledmon/0003-Add-disable-doc-option.patch diff --git a/package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch b/package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch deleted file mode 100644 index 7a89c3f1a42..00000000000 --- a/package/ledmon/0001-Replace-nonstandard-on_exit-function-by-atexit.patch +++ /dev/null @@ -1,223 +0,0 @@ -From e57ad4c71cce734de7f8aa75e84fce97bc148c2b Mon Sep 17 00:00:00 2001 -From: Maksim Kiselev -Date: Mon, 15 May 2023 14:46:56 +0300 -Subject: [PATCH] Replace nonstandard on_exit() function by atexit() - -on_exit() is not portable and not available on the C libraries musl -and uClibc. - -So let's replace it with standard atexit() function. - -Upstream: https://github.com/intel/ledmon/pull/139 - -Signed-off-by: Maksim Kiselev ---- - src/ledctl.c | 12 ++++------- - src/ledmon.c | 59 +++++++++++++++++++++++++++------------------------- - 2 files changed, 35 insertions(+), 36 deletions(-) - -diff --git a/src/ledctl.c b/src/ledctl.c -index 7a89a24..10fd57a 100644 ---- a/src/ledctl.c -+++ b/src/ledctl.c -@@ -214,15 +214,11 @@ static void ibpi_state_fini(struct ibpi_state *p) - * - * This is internal function of ledctl utility. The function cleans up a memory - * allocated for the application and closes all opened handles. This function is -- * design to be registered as on_exit() handler function. -- * -- * @param[in] status exit status of the ledctl application. -- * @param[in] ignored function ignores this argument. -+ * design to be registered as atexit() handler function. - * - * @return The function does not return a value. - */ --static void _ledctl_fini(int status __attribute__ ((unused)), -- void *ignore __attribute__ ((unused))) -+static void _ledctl_fini(void) - { - sysfs_reset(); - list_erase(&ibpi_list); -@@ -948,7 +944,7 @@ static char *ledctl_strstatus(ledctl_status_code_t s) - * @brief Application's entry point. - * - * This is the entry point of ledctl utility. This function does all the work. -- * It allocates and initializes all used structures. Registers on_exit() -+ * It allocates and initializes all used structures. Registers atexit() - * handlers. - * Then the function parses command line options and commands given and scans - * sysfs tree for controllers, block devices and RAID devices. If no error is -@@ -983,7 +979,7 @@ int main(int argc, char *argv[]) - status = _init_ledctl_conf(); - if (status != LEDCTL_STATUS_SUCCESS) - return status; -- if (on_exit(_ledctl_fini, progname)) -+ if (atexit(_ledctl_fini)) - exit(LEDCTL_STATUS_ONEXIT_ERROR); - slot_request_init(&slot_req); - status = _cmdline_parse(argc, argv, &slot_req); -diff --git a/src/ledmon.c b/src/ledmon.c -index 6f52fd6..1329295 100644 ---- a/src/ledmon.c -+++ b/src/ledmon.c -@@ -57,6 +57,19 @@ - #include "utils.h" - #include "vmdssd.h" - -+/** -+ * This macro is the alternative way to get exit status -+ * in atexit() callback function -+ */ -+#define EXIT(x) ((exit)(exit_status = (x))) -+ -+static int exit_status; -+ -+/** -+ * Flag to print exit status -+ */ -+static int ignore; -+ - /** - * @brief List of active block devices. - * -@@ -151,20 +164,16 @@ static int possible_params_size = ARRAY_SIZE(possible_params); - * - * This is internal function of monitor service. It is used to finalize daemon - * process i.e. free allocated memory, unlock and remove pidfile and close log -- * file and syslog. The function is registered as on_exit() handler. -- * -- * @param[in] status The function ignores this parameter. -- * @param[in] program_name The name of the binary file. This argument -- * is passed via on_exit() function. -+ * file and syslog. The function is registered as atexit() handler. - * - * @return The function does not return a value. - */ --static void _ledmon_fini(int __attribute__ ((unused)) status, void *program_name) -+static void _ledmon_fini(void) - { - sysfs_reset(); - list_erase(&ledmon_block_list); - log_close(); -- pidfile_remove(program_name); -+ pidfile_remove(progname); - } - - typedef enum { -@@ -207,30 +216,25 @@ static char *ledmon_strstatus(ledmon_status_code_t s) - * - * This is internal function of monitor service. It is used to report an exit - * status of the monitor service. The message is logged in to syslog and to log -- * file. The function is registered as on_exit() hander. -- * -- * @param[in] status Status given in the last call to exit() -- * function. -- * @param[in] arg Argument passed to on_exit(). -+ * file. The function is registered as atexit() handler. - * - * @return The function does not return a value. - */ --static void _ledmon_status(int status, void *arg) -+static void _ledmon_status(void) - { - int log_level; - char message[4096]; -- int ignore = *((int *)arg); - - if (ignore) - return; - -- if (status == LEDMON_STATUS_SUCCESS) -+ if (exit_status == LEDMON_STATUS_SUCCESS) - log_level = LOG_LEVEL_INFO; - else - log_level = LOG_LEVEL_ERROR; - - snprintf(message, sizeof(message), "exit status is %s.", -- ledmon_strstatus(status)); -+ ledmon_strstatus(exit_status)); - - if (get_log_fd() >= 0) - _log(log_level, message); -@@ -364,10 +368,10 @@ static ledmon_status_code_t _cmdline_parse_non_daemonise(int argc, char *argv[]) - break; - case 'h': - _ledmon_help(); -- exit(EXIT_SUCCESS); -+ EXIT(EXIT_SUCCESS); - case 'v': - _ledmon_version(); -- exit(EXIT_SUCCESS); -+ EXIT(EXIT_SUCCESS); - case ':': - case '?': - return LEDMON_STATUS_CMDLINE_ERROR; -@@ -890,14 +894,13 @@ static void _close_parent_fds(void) - int main(int argc, char *argv[]) - { - ledmon_status_code_t status = LEDMON_STATUS_SUCCESS; -- static int ignore; - - setup_options(&longopt, &shortopt, possible_params, - possible_params_size); - set_invocation_name(argv[0]); - openlog(progname, LOG_PID | LOG_PERROR, LOG_DAEMON); - -- if (on_exit(_ledmon_status, &ignore)) -+ if (atexit(_ledmon_status)) - return LEDMON_STATUS_ONEXIT_ERROR; - - if (_cmdline_parse_non_daemonise(argc, argv) != LEDMON_STATUS_SUCCESS) -@@ -935,18 +938,18 @@ int main(int argc, char *argv[]) - - if (pid < 0) { - log_debug("main(): fork() failed (errno=%d).", errno); -- exit(EXIT_FAILURE); -+ EXIT(EXIT_FAILURE); - } - if (pid > 0) { - ignore = 1; /* parent: don't print exit status */ -- exit(EXIT_SUCCESS); -+ EXIT(EXIT_SUCCESS); - } - - pid_t sid = setsid(); - - if (sid < 0) { - log_debug("main(): setsid() failed (errno=%d).", errno); -- exit(EXIT_FAILURE); -+ EXIT(EXIT_FAILURE); - } - - _close_parent_fds(); -@@ -960,16 +963,16 @@ int main(int argc, char *argv[]) - - if (chdir("/") < 0) { - log_debug("main(): chdir() failed (errno=%d).", errno); -- exit(EXIT_FAILURE); -+ EXIT(EXIT_FAILURE); - } - if (pidfile_create(progname)) { - log_debug("main(): pidfile_creat() failed."); -- exit(EXIT_FAILURE); -+ EXIT(EXIT_FAILURE); - } - _ledmon_setup_signals(); - -- if (on_exit(_ledmon_fini, progname)) -- exit(LEDMON_STATUS_ONEXIT_ERROR); -+ if (atexit(_ledmon_fini)) -+ EXIT(LEDMON_STATUS_ONEXIT_ERROR); - list_init(&ledmon_block_list, (item_free_t)block_device_fini); - sysfs_init(); - log_info("monitor service has been started..."); -@@ -987,5 +990,5 @@ int main(int argc, char *argv[]) - } - ledmon_remove_shared_conf(); - stop_udev_monitor(); -- exit(EXIT_SUCCESS); -+ EXIT(EXIT_SUCCESS); - } --- -2.39.2 - diff --git a/package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch b/package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch deleted file mode 100644 index 4aeadbbbf8d..00000000000 --- a/package/ledmon/0002-Fix-unknown-type-name-ssize_t-error.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b9f454cd29b6b5a0927b3c1e98807d54ffacd73e Mon Sep 17 00:00:00 2001 -From: Maksim Kiselev -Date: Mon, 15 May 2023 19:29:45 +0300 -Subject: [PATCH] Fix unknown type name ‘ssize_t’ error - -This error occurs for builds with musl libc. -Move include to utils header to -resolve this issue. - -Upstream: https://github.com/intel/ledmon/pull/139 - -Signed-off-by: Maksim Kiselev ---- - src/utils.c | 1 - - src/utils.h | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/utils.c b/src/utils.c -index 86b9593..0b83d5a 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -33,7 +33,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/src/utils.h b/src/utils.h -index 5d590b9..d02da8f 100644 ---- a/src/utils.h -+++ b/src/utils.h -@@ -22,6 +22,7 @@ - #define _UTILS_H_INCLUDED_ - - #include -+#include - #include "config_file.h" - #include "stdlib.h" - #include "stdint.h" --- -2.39.2 - diff --git a/package/ledmon/0003-Add-disable-doc-option.patch b/package/ledmon/0003-Add-disable-doc-option.patch deleted file mode 100644 index ab7a242289e..00000000000 --- a/package/ledmon/0003-Add-disable-doc-option.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 141628519d227b59be3977b16ebaab0feb22b295 Mon Sep 17 00:00:00 2001 -From: Maksim Kiselev -Date: Sun, 20 Aug 2023 11:35:57 +0300 -Subject: [PATCH] Add '--disable-doc' option - -Introduce a configure option to disable documentation installation -in case if it is not required. - -Upstream: https://github.com/intel/ledmon/pull/154 - -Signed-off-by: Maksim Kiselev ---- - Makefile.am | 8 ++++++-- - configure.ac | 11 ++++++++++- - 2 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ddcd200..644a8d2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,6 +20,10 @@ if SYSTEMD_CONDITION - OPTIONAL_SUBDIR = systemd - endif - --SUBDIRS = doc src $(OPTIONAL_SUBDIR) -+if WITH_DOC -+ DOC_SUBDIR = doc -+ dist_doc_DATA = README.md -+endif -+ -+SUBDIRS = src $(DOC_SUBDIR) $(OPTIONAL_SUBDIR) - EXTRA_DIST = config/config.h systemd/ledmon.service.in --dist_doc_DATA = README.md -diff --git a/configure.ac b/configure.ac -index 05baa62..114957f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,6 +74,15 @@ AM_CONDITIONAL([SYSTEMD_CONDITION], [test "$SYSTEMD_STR" = yes]) - # target directory for ledmon service file - AC_SUBST([SYSTEMD_PATH], "$(pkg-config systemd --variable=systemdsystemunitdir)") - -+# Add configure option to disable documentation building -+AC_ARG_ENABLE([doc], -+ [AS_HELP_STRING([--disable-doc], -+ [do not install ledmon documentaion])], -+ [with_doc=${enableval}], -+ [with_doc=yes]) -+ -+AM_CONDITIONAL([WITH_DOC], [test "x$with_doc" = "xyes"]) -+ - AC_CONFIG_FILES([Makefile - doc/Makefile - src/Makefile -@@ -86,5 +95,5 @@ $PACKAGE_NAME $VERSION configuration: - Preprocessor flags: ${AM_CPPFLAGS} ${CPPFLAGS} - C compiler flags: ${AM_CFLAGS} ${CFLAGS} - Common install location: ${prefix} -- configure parameters: --enable-systemd=${SYSTEMD_STR} -+ configure parameters: --enable-systemd=${SYSTEMD_STR} --enable-doc=${with_doc} - ]) --- -2.39.2 - diff --git a/package/ledmon/ledmon.hash b/package/ledmon/ledmon.hash index dfc5d742426..e9cfcc63cb6 100644 --- a/package/ledmon/ledmon.hash +++ b/package/ledmon/ledmon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 40ee7e462b78c77468cc2ef356a06c5b6db44747d596dc11532f7b6f378d2d4b ledmon-0.97.tar.gz +sha256 2826786cd5e7fe7d32d22e9d209b23124801fec9c3220dcd7fb45706f3818dc5 ledmon-1.0.0.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/ledmon/ledmon.mk b/package/ledmon/ledmon.mk index 473d0de7a32..71150ad1e47 100644 --- a/package/ledmon/ledmon.mk +++ b/package/ledmon/ledmon.mk @@ -4,16 +4,17 @@ # ################################################################################ -LEDMON_VERSION = 0.97 +LEDMON_VERSION = 1.0.0 LEDMON_SITE = $(call github,intel,ledmon,v$(LEDMON_VERSION)) -LEDMON_DEPENDENCIES = host-pkgconf pciutils sg3_utils udev +LEDMON_DEPENDENCIES = host-autoconf-archive host-pkgconf pciutils sg3_utils udev # The code base also include a COPYING.LIB file with the LGPL-2.1 text, # and some source files are published under LGPL-2.1, but all of them are # at some point linked with GPL-2.0 code, making the resulting binaries # GPL-2.0 licensed LEDMON_LICENSE = GPL-2.0 LEDMON_LICENSE_FILES = COPYING -# 0002-Fix-unknown-type-name-ssize_t-error.patch +# From git LEDMON_AUTORECONF = YES +LEDMON_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive $(eval $(autotools-package)) From eddc53a9c1561ed315b817cb1f9333ff38950ee2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 3 May 2024 21:53:04 +0200 Subject: [PATCH 0589/3013] package/zziplib: bump to version 0.13.74 - Drop patches (already in version) - docs/copying.htm renamed to docs/copying.htm.md, and reformatted from HTML to Markdown, with upstream commit: https://github.com/gdraheim/zziplib/commit/b8138ba56ecb9d5d27c22d85fae37bdd594d2edb https://github.com/gdraheim/zziplib/blob/v0.13.74/ChangeLog Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: - explain why hash of docs/copying.htm.md changed ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 75 ------------------- ...reate-symlinks-only-if-target-is-mis.patch | 72 ------------------ package/zziplib/zziplib.hash | 4 +- package/zziplib/zziplib.mk | 4 +- 5 files changed, 4 insertions(+), 152 deletions(-) delete mode 100644 package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch delete mode 100644 package/zziplib/0002-ZZIP_LIBLATEST-create-symlinks-only-if-target-is-mis.patch diff --git a/.checkpackageignore b/.checkpackageignore index fd39d6e0b6c..a2bf1581f46 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1703,7 +1703,6 @@ package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch lib_pat package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch lib_patch.Upstream package/zip/0008-fix-musl-static-build.patch lib_patch.Upstream package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch lib_patch.Upstream -package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch lib_patch.Upstream support/dependencies/check-host-asciidoc.sh Shellcheck support/dependencies/check-host-cmake.sh Shellcheck support/dependencies/check-host-gzip.sh Shellcheck diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch deleted file mode 100644 index 780d990ab79..00000000000 --- a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 -From: Guido Draheim -Date: Sat, 22 May 2021 15:13:28 +0200 -Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib - -[Andreas: Extract link creation for versioned libraries from commit -0e8d35f92efb680c81f6ec1fca9f11d173dce389.] -Signed-off-by: Andreas Ziegler ---- - zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- - 1 file changed, 45 insertions(+), 12 deletions(-) - -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index a966d5f..ccd08b6 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) - option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) - endif() - -+if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) -+option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) -+else() -+option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) -+endif() -+ - # used in zzip/_config.h - set(ZZIP_PACKAGE "${PROJECT_NAME}lib") - set(ZZIP_VERSION "${PROJECT_VERSION}") -@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) - endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) - endif(ZZIP_LIBTOOL) - -+if(ZZIP_LIBLATEST) -+ if(BUILD_SHARED_LIBS) -+ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) -+ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ else() -+ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) -+ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) -+ endif() -+ get_target_property(libname libzzip OUTPUT_NAME) -+ get_target_property(librelease libzzip RELEASE_POSTFIX) -+ add_custom_target(libzzip_latest ALL -+ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} -+ ) -+ install(FILES -+ ${outdir}/${lib}${libname}${dll} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ if(ZZIPFSEEKO) -+ get_target_property(libname libzzipfseeko OUTPUT_NAME) -+ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) -+ add_custom_target(libzzipfseeko_latest ALL -+ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} -+ ) -+ install(FILES -+ ${outdir}/${lib}${libname}${dll} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ endif(ZZIPFSEEKO) -+ if(ZZIPMMAPPED) -+ get_target_property(libname libzzipmmapped OUTPUT_NAME) -+ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) -+ add_custom_target(libzzipmmaped_latest ALL -+ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} -+ ) -+ install(FILES -+ ${outdir}/${lib}${libname}${dll} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ endif(ZZIPMMAPPED) -+endif(ZZIP_LIBLATEST) -+ -+ - ## messages ############################################## - - message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") diff --git a/package/zziplib/0002-ZZIP_LIBLATEST-create-symlinks-only-if-target-is-mis.patch b/package/zziplib/0002-ZZIP_LIBLATEST-create-symlinks-only-if-target-is-mis.patch deleted file mode 100644 index c8ccd48dbad..00000000000 --- a/package/zziplib/0002-ZZIP_LIBLATEST-create-symlinks-only-if-target-is-mis.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 5977725ecea038f32a86938703ca1ed2b080b31c Mon Sep 17 00:00:00 2001 -From: Andreas Ziegler -Date: Fri, 29 Jul 2022 12:32:27 +0200 -Subject: [PATCH] ZZIP_LIBLATEST: create symlinks only if target is missing - -zzip/CMakeList.txt uses custom build targets to create symlinks to the -(normally versioned) build results from unversioned file names. These -targets are executed unconditionally, every time a build is started, -regardless of the existence of the symlink. - -Debug builds, however, generate unversioned libraries. The build targets -therefore overwrite existing files with recursive links. - -Create custom targets depending on the target file plus custom build -commands containing the symlink creation, thereby ensuring that symlinks -are only created if the link target is missing. - -Signed-off-by: Andreas Ziegler -Upstream: https://github.com/gdraheim/zziplib/pull/138 ---- - zzip/CMakeLists.txt | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index 4fa6b9c..dd1e56a 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -350,8 +350,12 @@ if(ZZIP_LIBLATEST) - endif() - get_target_property(libname libzzip OUTPUT_NAME) - get_target_property(librelease libzzip RELEASE_POSTFIX) -+ set(libzzip_target "${lib}${libname}${dll}") -+ add_custom_command(OUTPUT ${libzzip_target} -+ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzip_target} -+ ) - add_custom_target(libzzip_latest ALL -- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} -+ DEPENDS ${libzzip_target} - ) - install(FILES - ${outdir}/${lib}${libname}${dll} -@@ -359,8 +363,12 @@ if(ZZIP_LIBLATEST) - if(ZZIPFSEEKO) - get_target_property(libname libzzipfseeko OUTPUT_NAME) - get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) -+ set(libzzipfseeko_target "${lib}${libname}${dll}") -+ add_custom_command(OUTPUT ${libzzipfseeko_target} -+ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzipfseeko_target} -+ ) - add_custom_target(libzzipfseeko_latest ALL -- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} -+ DEPENDS ${libzzipfseeko_target} - ) - install(FILES - ${outdir}/${lib}${libname}${dll} -@@ -369,8 +377,12 @@ if(ZZIP_LIBLATEST) - if(ZZIPMMAPPED) - get_target_property(libname libzzipmmapped OUTPUT_NAME) - get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) -+ set(libzzipmmapped_target "${lib}${libname}${dll}") -+ add_custom_command(OUTPUT ${libzzipmmapped_target} -+ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzipmmapped_target} -+ ) - add_custom_target(libzzipmmaped_latest ALL -- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} -+ DEPENDS ${libzzipmmapped_target} - ) - install(FILES - ${outdir}/${lib}${libname}${dll} --- -2.34.1 - diff --git a/package/zziplib/zziplib.hash b/package/zziplib/zziplib.hash index b6a75ae0cbe..3bff51f07f1 100644 --- a/package/zziplib/zziplib.hash +++ b/package/zziplib/zziplib.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc zziplib-0.13.72.tar.gz +sha256 319093aa98d39453f3ea2486a86d8a2fab2d5632f6633a2665318723a908eecf zziplib-0.13.74.tar.gz sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL -sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm +sha256 9418aca218090f0bebfa91298c8145c7342de095eced3d72ea241c178df59368 docs/copying.htm.md diff --git a/package/zziplib/zziplib.mk b/package/zziplib/zziplib.mk index 6cb9dedce81..0ef53436d24 100644 --- a/package/zziplib/zziplib.mk +++ b/package/zziplib/zziplib.mk @@ -4,10 +4,10 @@ # ################################################################################ -ZZIPLIB_VERSION = 0.13.72 +ZZIPLIB_VERSION = 0.13.74 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 -ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm +ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm.md ZZIPLIB_CPE_ID_VALID = YES ZZIPLIB_INSTALL_STAGING = YES ZZIPLIB_CONF_OPTS += \ From a8be7900a363ab21d8a1234d410cbc1ccee1edfd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 May 2024 10:52:14 +0200 Subject: [PATCH 0590/3013] package/rsync: bump to version 3.3.0 Drop first patch (already in version) https://github.com/RsyncProject/rsync/blob/v3.3.0/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...py-in-crypto-lib-instead-of-MD5_Init.patch | 28 ------------------- ...pkg-config-to-retrieve-openssl-depe.patch} | 0 package/rsync/rsync.hash | 4 +-- package/rsync/rsync.mk | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch rename package/rsync/{0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch => 0001-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch} (100%) diff --git a/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch deleted file mode 100644 index 53811599689..00000000000 --- a/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 556a2c5bc2f6244f140a96302d4df92cfc25af8b Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Tue, 25 Oct 2022 21:55:53 -0700 -Subject: [PATCH] Check for EVP_MD_CTX_copy in crypto lib instead of MD5_Init. - -Upstream: https://github.com/WayneD/rsync/commit/556a2c5bc2f6244f140a96302d4df92cfc25af8b -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a2c99558..ccad7f13 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -432,10 +432,10 @@ AH_TEMPLATE([USE_OPENSSL], - if test x"$enable_openssl" != x"no"; then - if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then - AC_MSG_RESULT(yes) -- AC_SEARCH_LIBS(MD5_Init, crypto, -+ AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, - [AC_DEFINE(USE_OPENSSL) - enable_openssl=yes], -- [err_msg="$err_msg$nl- Failed to find MD5_Init function in openssl crypto lib."; -+ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; - no_lib="$no_lib openssl"]) - else - AC_MSG_RESULT(no) diff --git a/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch b/package/rsync/0001-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch similarity index 100% rename from package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch rename to package/rsync/0001-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch diff --git a/package/rsync/rsync.hash b/package/rsync/rsync.hash index 842b5c099f4..edeca9c4df2 100644 --- a/package/rsync/rsync.hash +++ b/package/rsync/rsync.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz.asc -sha256 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb rsync-3.2.7.tar.gz +# https://rsync.samba.org/ftp/rsync/src/rsync-3.3.0.tar.gz.asc +sha256 7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90 rsync-3.3.0.tar.gz # Locally calculated sha256 85c19ea50a224c2d0067a69c083584e5717b40b76610ec1218f91385775067dd COPYING diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index b9d392c8cb5..188c87e1d43 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYNC_VERSION = 3.2.7 +RSYNC_VERSION = 3.3.0 RSYNC_SITE = https://rsync.samba.org/ftp/rsync/src RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING From 6f1e06a8976c25dabe3ded671da94bd6a826b62a Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sun, 5 May 2024 13:00:51 +0000 Subject: [PATCH 0591/3013] package/multipath-tools: bump version to 0.9.8 Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 03a2867144a..03b36f008ec 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 8f0a7ddc01137d0f90ac3ef5700131dfbd6cf3bbbccdcfa317e8379efa328d59 multipath-tools-0.9.7.tar.gz +sha256 0f8cfe691d54192c7593cd932e3080bcd35d25454ae2ebb4043213b38eec34ab multipath-tools-0.9.8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 164d8506004..7547f02dbe6 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.7 +MULTIPATH_TOOLS_VERSION = 0.9.8 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From 3614c2b169d9c698042371a2444ca3e7adf99c36 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sun, 5 May 2024 13:01:28 +0000 Subject: [PATCH 0592/3013] package/makedumpfile: bump version to 1.7.5 Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/makedumpfile/makedumpfile.hash | 2 +- package/makedumpfile/makedumpfile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index fdb30de88d8..9083ced4230 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0554f5de516c51f5756e437dbfc353722b16b20e875241275554b474e89298db makedumpfile-1.7.4.tar.gz +sha256 0c53f1e5e11e75e4896197df795bee63b3d46b8821fbc3368f7a240861b543b5 makedumpfile-1.7.5.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 410752682da..5fa1331910a 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.7.4 +MAKEDUMPFILE_VERSION = 1.7.5 MAKEDUMPFILE_SITE = https://github.com/makedumpfile/makedumpfile/releases/download/$(MAKEDUMPFILE_VERSION) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 From a2be1561693a05e09aee57e50c81b5d6dac05a49 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 13:22:27 +0200 Subject: [PATCH 0593/3013] package/kexec: fix x86_64 build with binutils 2.41 Fix the following x86_64 build failure with binutils 2.41: purgatory/arch/i386/entry32-16.S:23: Error: 64bit mode not supported on `i386'. Fixes: - http://autobuild.buildroot.org/results/60f2f163b491879a8ea7f2d56a6b0d38b3cf439c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...uilding-on-x86_64-with-binutils-2-41.patch | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch diff --git a/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch b/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch new file mode 100644 index 00000000000..ae44c21fe12 --- /dev/null +++ b/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch @@ -0,0 +1,94 @@ +From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001 +From: Michel Lind +Date: Tue, 30 Jan 2024 04:14:31 -0600 +Subject: Fix building on x86_64 with binutils 2.41 + +Newer versions of the GNU assembler (observed with binutils 2.41) will +complain about the ".arch i386" in files assembled with "as --64", +with the message "Error: 64bit mode not supported on 'i386'". + +Fix by moving ".arch i386" below the relevant ".code32" directive, so +that the assembler is no longer expecting 64-bit instructions to be used +by the time that the ".arch i386" directive is encountered. + +Based on similar iPXE fix: +https://github.com/ipxe/ipxe/commit/6ca597eee + +Signed-off-by: Michel Lind +Signed-off-by: Simon Horman +Upstream: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=328de8e00e298f00d7ba6b25dc3950147e9642e6 +Signed-off-by: Fabrice Fontaine +--- + purgatory/arch/i386/entry32-16-debug.S | 2 +- + purgatory/arch/i386/entry32-16.S | 2 +- + purgatory/arch/i386/entry32.S | 2 +- + purgatory/arch/i386/setup-x86.S | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S +index 5167944d..12e11649 100644 +--- a/purgatory/arch/i386/entry32-16-debug.S ++++ b/purgatory/arch/i386/entry32-16-debug.S +@@ -25,10 +25,10 @@ + .globl entry16_debug_pre32 + .globl entry16_debug_first32 + .globl entry16_debug_old_first32 +- .arch i386 + .balign 16 + entry16_debug: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S +index c051aab0..eace0958 100644 +--- a/purgatory/arch/i386/entry32-16.S ++++ b/purgatory/arch/i386/entry32-16.S +@@ -20,10 +20,10 @@ + #undef i386 + .text + .globl entry16, entry16_regs +- .arch i386 + .balign 16 + entry16: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S +index f7a494f1..8ce9e316 100644 +--- a/purgatory/arch/i386/entry32.S ++++ b/purgatory/arch/i386/entry32.S +@@ -20,10 +20,10 @@ + #undef i386 + + .text +- .arch i386 + .globl entry32, entry32_regs + entry32: + .code32 ++ .arch i386 + + /* Setup a gdt that should that is generally usefully */ + lgdt %cs:gdt +diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S +index 201bb2cb..a212eed4 100644 +--- a/purgatory/arch/i386/setup-x86.S ++++ b/purgatory/arch/i386/setup-x86.S +@@ -21,10 +21,10 @@ + #undef i386 + + .text +- .arch i386 + .globl purgatory_start + purgatory_start: + .code32 ++ .arch i386 + + /* Load a gdt so I know what the segment registers are */ + lgdt %cs:gdt +-- +cgit 1.2.3-korg + From 2bb0c57ca273d9a2348e468bcdedad696b24ee8d Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 2 May 2024 09:23:26 +0200 Subject: [PATCH 0594/3013] package/qemu: fix disabling fp-bench test compilation With the bump to version 8.1.1, the patch that disabled the compilation of the fp-bench test is no longer applicable, even though the package compilation process does not report any errors in applying the patch itself. The new patch does not disable the test by default but only if the file fenv.h is not missing, with the hope that this approach will be considered acceptable by the maintainer and merged upstream. The patch is an adaptation of the one sent upstream. Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...fp-disable-fp-bench-build-by-default.patch | 28 ----------- ...on-t-build-fp-bench-test-if-fenv.h-i.patch | 49 +++++++++++++++++++ 3 files changed, 49 insertions(+), 29 deletions(-) delete mode 100644 package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch create mode 100644 package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch diff --git a/.checkpackageignore b/.checkpackageignore index a2bf1581f46..870c286bcd9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1356,7 +1356,6 @@ package/python3/0028-fix-building-on-older-distributions.patch lib_patch.Upstrea package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch lib_patch.Upstream package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch lib_patch.Upstream package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch lib_patch.Upstream -package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch lib_patch.Upstream package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch lib_patch.Upstream package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch lib_patch.Upstream package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch lib_patch.Upstream diff --git a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch deleted file mode 100644 index fb7a9a69897..00000000000 --- a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 83d976d6d7f0357659d5daa0f01c52048a609e88 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 25 Aug 2021 21:55:53 +0200 -Subject: [PATCH] tests/fp: disable fp-bench build by default - -Fixes: -https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00947.html - -Signed-off-by: Romain Naour ---- - tests/fp/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/fp/meson.build b/tests/fp/meson.build -index 8bd0979f67..2fe019d2c6 100644 ---- a/tests/fp/meson.build -+++ b/tests/fp/meson.build -@@ -640,6 +640,7 @@ fpbench = executable( - dependencies: [qemuutil], - include_directories: [sfinc, include_directories(tfdir)], - c_args: fpcflags, -+ build_by_default: false, - ) - - fptestlog2 = executable( --- -2.35.1 - diff --git a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch new file mode 100644 index 00000000000..b7e41d6f232 --- /dev/null +++ b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch @@ -0,0 +1,49 @@ +From b4a692f46135af1011bf0adbfeb19abf354ca191 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Tue, 30 Apr 2024 09:40:55 +0200 +Subject: [PATCH] tests/fp/meson: don't build fp-bench test if fenv.h is + missing + +The fp-bench test (i. e. tests/fp/fp-bench.c) use fenv.h that is not +always provided by the libc (uClibc). The patch disables its compilation +in case the header is not available. + +The patch is based on a suggestion from Paolo Bonzini, which you can +find at the following link. + +Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html +Suggested-by: Paolo Bonzini +Signed-off-by: Dario Binacchi +Upstream: https://patchwork.ozlabs.org/project/qemu-devel/patch/20240430164752.645521-1-dario.binacchi@amarulasolutions.com/ +--- + tests/fp/meson.build | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/tests/fp/meson.build b/tests/fp/meson.build +index cbc17392d678..cd052667e940 100644 +--- a/tests/fp/meson.build ++++ b/tests/fp/meson.build +@@ -126,12 +126,14 @@ test('fp-test-mulAdd', fptest, + ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], + suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 90) + +-executable( +- 'fp-bench', +- ['fp-bench.c', '../../fpu/softfloat.c'], +- dependencies: [qemuutil, libtestfloat, libsoftfloat], +- c_args: fpcflags, +-) ++if cc.has_header('fenv.h') ++ executable( ++ 'fp-bench', ++ ['fp-bench.c', '../../fpu/softfloat.c'], ++ dependencies: [qemuutil, libtestfloat, libsoftfloat], ++ c_args: fpcflags, ++ ) ++endif + + fptestlog2 = executable( + 'fp-test-log2', +-- +2.43.0 + From bf8e4c2052b4b1fc07aa89b8134a1385855aaa45 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 2 May 2024 09:23:27 +0200 Subject: [PATCH 0595/3013] package/qemu: renumber patch Commit 3fa1ae00681ca ("package/qemu: add option to enable tracing") added a patch with a wrong number. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- ...003-tracing-install-trace-events-file-only-if-necessary.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/qemu/{0004-tracing-install-trace-events-file-only-if-necessary.patch => 0003-tracing-install-trace-events-file-only-if-necessary.patch} (100%) diff --git a/package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch b/package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch similarity index 100% rename from package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch rename to package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch From 66ebbebdb4dc7bc56339e0a1f1cb8d2e8e30c2f2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 May 2024 10:20:14 +0200 Subject: [PATCH 0596/3013] package/stress-ng: fix uclibc-ng build Fix the following uclibc-ng build failure raised since bump to version 0.17.07 in commit 6fb179b906a1755d77bda9e501c5335ac163f3cb and https://github.com/ColinIanKing/stress-ng/commit/2ad8aff9bc1ab822cf615c72712c6031a8f60bbd: stress-sock.c: In function 'stress_sock_client': stress-sock.c:656:35: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'? 656 | if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) { | ^~~~~~~~~~~ | MSG_ZEROCOPY stress-sock.c:656:35: note: each undeclared identifier is reported only once for each function it appears in CC stress-sockfd.c stress-sock.c: In function 'stress_sock_server': stress-sock.c:1060:34: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'? 1060 | if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) { | ^~~~~~~~~~~ | MSG_ZEROCOPY Fixes: 6fb179b906a1755d77bda9e501c5335ac163f3cb - http://autobuild.buildroot.org/results/bcff31bd9820cf0b95f8d8c6de44fd4ab8e2f065 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: reference upstream commit now it's merged] Signed-off-by: Yann E. MORIN --- ...sock.c-fix-build-without-SO_ZEROCOPY.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch diff --git a/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch b/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch new file mode 100644 index 00000000000..f1f4ab56369 --- /dev/null +++ b/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch @@ -0,0 +1,56 @@ +From 142c3b2414f0adfb13b59dea993054a0daa6cd52 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 4 May 2024 10:04:20 +0200 +Subject: [PATCH] stress-sock.c: fix build without SO_ZEROCOPY + +uclibc-ng defines MSG_ZEROCOPY but not SO_ZEROCOPY resulting in the +following build failure since version 0.17.04 and +https://github.com/ColinIanKing/stress-ng/commit/2ad8aff9bc1ab822cf615c72712c6031a8f60bbd: + +stress-sock.c: In function 'stress_sock_client': +stress-sock.c:656:35: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'? + 656 | if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) { + | ^~~~~~~~~~~ + | MSG_ZEROCOPY +stress-sock.c:656:35: note: each undeclared identifier is reported only once for each function it appears in +CC stress-sockfd.c +stress-sock.c: In function 'stress_sock_server': +stress-sock.c:1060:34: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'? + 1060 | if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) { + | ^~~~~~~~~~~ + | MSG_ZEROCOPY + +Fixes: + - http://autobuild.buildroot.org/results/bcff31bd9820cf0b95f8d8c6de44fd4ab8e2f065 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/ColinIanKing/stress-ng/commit/142c3b2414f0adfb13b59dea993054a0daa6cd52 +--- + stress-sock.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/stress-sock.c b/stress-sock.c +index 253730168..880530d04 100644 +--- a/stress-sock.c ++++ b/stress-sock.c +@@ -649,7 +649,7 @@ retry: + args->name, errno, strerror(errno)); + goto free_controls; + } +-#if defined(MSG_ZEROCOPY) ++#if defined(MSG_ZEROCOPY) && defined(SO_ZEROCOPY) + if (sock_zerocopy) { + int so_zerocopy = 1; + +@@ -1053,7 +1053,7 @@ static int OPTIMIZE3 stress_sock_server( + goto die; + } + +-#if defined(MSG_ZEROCOPY) ++#if defined(MSG_ZEROCOPY) && defined(SO_ZEROCOPY) + if (sock_zerocopy) { + int so_zerocopy = 1; + +-- +2.43.0 + From e4d07f8d816c864421b9f33ccaf2922cbd5d5a12 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 10 Apr 2024 23:44:52 +0200 Subject: [PATCH 0597/3013] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE As suggested by Arnout during the review [1], we can assume that U-Boot needs ti-k3-boot-firmware when it is selected (likely by ti-k3-r5-loader). We can remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE without legacy handling since this option is not part of any Buildroot release. [1] http://lists.busybox.net/pipermail/buildroot/2024-April/689263.html Cc: Arnout Vandecappelle Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- Config.in.legacy | 3 +-- boot/uboot/Config.in | 11 ----------- boot/uboot/uboot.mk | 6 +++++- configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 98a4125f4b1..599f67b7f86 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -161,9 +161,8 @@ config BR2_TARGET_TI_K3_IMAGE_GEN U-Boot binman tool (requires U-boot >= 2023.10). config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - bool "u-boot TI K3 DM option has been renamed." + bool "u-boot TI K3 DM option has been removed." select BR2_LEGACY - select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE help The TI K3 Device Manager is already included in ti-k3-boot-firmware. diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 8d2228dc7dd..8133b780bb7 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -240,17 +240,6 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE U-Boot, and that the TEE variable pointing to OPTEE's tee.elf, is passed during the Buildroot build. -config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE - bool "U-Boot needs ti-k3-boot-firmware" - depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE - help - TI K3 devices needs at least ti-sysfw (System Firmware) when - built with u-boot's binman tool. - - Some TI K3 devices using a split firmware boot flow (AM62, - j721e) also need the Device Manager (DM) firmware to be - available for the U-Boot build. - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0ee63cabdb5..b9f165f0418 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -194,7 +194,11 @@ UBOOT_DEPENDENCIES += optee-os UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y) +# TI K3 devices needs at least ti-sysfw (System Firmware) provided +# by ti-k3-boot-firmware when built with u-boot's binman tool. +# Some TI K3 devices using a split firmware boot flow (AM62, +# j721e) also need the Device Manager (DM) firmware. +ifeq ($(BR2_TARGET_TI_K3_BOOT_FIRMWARE),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 40501681843..84a409fc3b1 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -37,7 +37,6 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 28e97f94e2f..8dbe0fae330 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -37,7 +37,6 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From 91b1de167e4b4c52850d464a7062a4fd6c68ed12 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 10 Apr 2024 23:44:53 +0200 Subject: [PATCH 0598/3013] boot/{uboot, ti-k3-r5-loader}: remove unneeded python-jsonschema dependency Commits 8a4c3c91e7 ("boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option") and 1aec483412 ("boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option") added the python-jsonschema (target variant) dependency to the binman option while only host-python-jsonschema is required. http://lists.busybox.net/pipermail/buildroot/2024-April/689291.html Reported-by: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- boot/ti-k3-r5-loader/Config.in | 1 - boot/uboot/Config.in | 1 - 2 files changed, 2 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index df885cc2af6..a6cc16a0c30 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,7 +1,6 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman help Separate U-Boot SPL build for R5 core on TI's K3 processors. diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 8133b780bb7..ba959641390 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -273,7 +273,6 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN config BR2_TARGET_UBOOT_USE_BINMAN bool "U-Boot use binman" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema select BR2_TARGET_UBOOT_NEEDS_PYTHON3 select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT From db57017f90ec7585c9fd898503897eb8cac1c945 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 10 Apr 2024 23:44:54 +0200 Subject: [PATCH 0599/3013] board/ti/am6{2, 4}x: add missing uboot.hash file Arnout noticed during the review that uboot.hash was missing from BR2_GLOBAL_PATCH_DIR. "The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we update the U-Boot version, it will no longer be. So to be future safe, we should add a local override of the uboot hash file as well (which is simply identical to uboot.hash)." This is required since BR2_DOWNLOAD_FORCE_CHECK_HASHES is now enabled. [1] http://lists.busybox.net/pipermail/buildroot/2024-April/689283.html Reported-by: Arnout Vandecappelle Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- board/ti/am62x-sk/patches/uboot/uboot.hash | 2 ++ board/ti/am64x-sk/patches/uboot/uboot.hash | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 board/ti/am62x-sk/patches/uboot/uboot.hash create mode 100644 board/ti/am64x-sk/patches/uboot/uboot.hash diff --git a/board/ti/am62x-sk/patches/uboot/uboot.hash b/board/ti/am62x-sk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..0e171c56f59 --- /dev/null +++ b/board/ti/am62x-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/board/ti/am64x-sk/patches/uboot/uboot.hash b/board/ti/am64x-sk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..0e171c56f59 --- /dev/null +++ b/board/ti/am64x-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 From 7f5cd99dd7ee82d4b977a04b0809a77f89c853c1 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Mon, 6 May 2024 17:22:49 +0200 Subject: [PATCH 0600/3013] configs/acmesystems_acqua_a5_*: add hashes for Linux/at91bootstrap3 And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 -- .../acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash | 2 ++ .../acqua-a5/patches/linux-headers/linux-headers.hash | 1 + board/acmesystems/acqua-a5/patches/linux/linux.hash | 2 ++ configs/acmesystems_acqua_a5_256mb_defconfig | 2 ++ configs/acmesystems_acqua_a5_512mb_defconfig | 2 ++ 6 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash create mode 120000 board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash create mode 100644 board/acmesystems/acqua-a5/patches/linux/linux.hash diff --git a/.checkpackageignore b/.checkpackageignore index 870c286bcd9..1135fa71752 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -117,8 +117,6 @@ boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch lib_p boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch lib_patch.Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch lib_patch.Upstream configs/aarch64_efi_defconfig lib_defconfig.ForceCheckHash -configs/acmesystems_acqua_a5_256mb_defconfig lib_defconfig.ForceCheckHash -configs/acmesystems_acqua_a5_512mb_defconfig lib_defconfig.ForceCheckHash configs/acmesystems_aria_g25_128mb_defconfig lib_defconfig.ForceCheckHash configs/acmesystems_aria_g25_256mb_defconfig lib_defconfig.ForceCheckHash configs/acmesystems_arietta_g25_128mb_defconfig lib_defconfig.ForceCheckHash diff --git a/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash b/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 00000000000..06a63d449da --- /dev/null +++ b/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdc04cca9e811043efdea43ad203d70d897e23a8bd46f01896ba45c8df50f6ec at91bootstrap3-v3.10.3-br1.tar.gz diff --git a/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash b/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/acmesystems/acqua-a5/patches/linux/linux.hash b/board/acmesystems/acqua-a5/patches/linux/linux.hash new file mode 100644 index 00000000000..6dbbeca57f4 --- /dev/null +++ b/board/acmesystems/acqua-a5/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 1fd7ec8c3d9c4e4b3a41d11e2c6d151e5fbf875dd08b3577f73afd6ee6674605 linux-6.6.12.tar.xz diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index ef577341949..359b356cb41 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -3,6 +3,8 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index a69e2a2251f..194de0b530a 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -3,6 +3,8 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" From 74787fdd10543d482786fef582702bc24c1da626 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Mon, 6 May 2024 17:23:14 +0200 Subject: [PATCH 0601/3013] configs/acmesystems_acqua_a5_*: bump to Linux 6.6.30 Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni --- board/acmesystems/acqua-a5/patches/linux/linux.hash | 2 +- configs/acmesystems_acqua_a5_256mb_defconfig | 2 +- configs/acmesystems_acqua_a5_512mb_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/acmesystems/acqua-a5/patches/linux/linux.hash b/board/acmesystems/acqua-a5/patches/linux/linux.hash index 6dbbeca57f4..4b20a009a7e 100644 --- a/board/acmesystems/acqua-a5/patches/linux/linux.hash +++ b/board/acmesystems/acqua-a5/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1fd7ec8c3d9c4e4b3a41d11e2c6d151e5fbf875dd08b3577f73afd6ee6674605 linux-6.6.12.tar.xz +sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 359b356cb41..b102dde0bae 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 194de0b530a..da54eaf6206 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" From e86aec1663357a9f1f7de56129dfd1ab1c5d2cda Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:44 +0200 Subject: [PATCH 0602/3013] boot/barebox/Config.in: source argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: boot/barebox/Config.in:79: syntax error boot/barebox/Config.in:79:warning: ignoring unsupported character '/' boot/barebox/Config.in:79:warning: ignoring unsupported character '/' boot/barebox/Config.in:79:warning: ignoring unsupported character '/' boot/barebox/Config.in:79:warning: ignoring unsupported character '.' boot/barebox/Config.in:79: invalid statement boot/barebox/Config.in:93: syntax error boot/barebox/Config.in:93:warning: ignoring unsupported character '/' boot/barebox/Config.in:93:warning: ignoring unsupported character '/' boot/barebox/Config.in:93:warning: ignoring unsupported character '/' boot/barebox/Config.in:93:warning: ignoring unsupported character '.' boot/barebox/Config.in:93: invalid statement Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- boot/barebox/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index dba4a1a8d62..0bd3386795c 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -76,7 +76,7 @@ config BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION endif -source boot/barebox/barebox/Config.in +source "boot/barebox/barebox/Config.in" menuconfig BR2_TARGET_BAREBOX_AUX bool "Build barebox with an auxiliary config" @@ -90,7 +90,7 @@ menuconfig BR2_TARGET_BAREBOX_AUX if BR2_TARGET_BAREBOX_AUX -source boot/barebox/barebox-aux/Config.in +source "boot/barebox/barebox-aux/Config.in" endif From 4abda655e6148cc3607101cb24933706fb2b6801 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:45 +0200 Subject: [PATCH 0603/3013] package/cmocka/Config.in: bool argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/cmocka/Config.in:2: syntax error package/cmocka/Config.in:2: invalid statement package/cmocka/Config.in:3: invalid statement package/cmocka/Config.in:4: invalid statement [...] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/cmocka/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cmocka/Config.in b/package/cmocka/Config.in index cf49d0f6be0..80e29778d32 100644 --- a/package/cmocka/Config.in +++ b/package/cmocka/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_CMOCKA - bool cmocka + bool "cmocka" depends on !BR2_STATIC_LIBS help cmocka is an elegant unit testing framework for C with support From ff70f9ee4c7ea08471ce6aca948f5ae83e4e011d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:46 +0200 Subject: [PATCH 0604/3013] package/dovecot/Config.in: source argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/dovecot/Config.in:36: syntax error package/dovecot/Config.in:36:warning: ignoring unsupported character '/' package/dovecot/Config.in:36:warning: ignoring unsupported character '/' package/dovecot/Config.in:36:warning: ignoring unsupported character '.' package/dovecot/Config.in:36: invalid statement Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/dovecot/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index c94421526f1..034dcc175ff 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -33,7 +33,7 @@ config BR2_PACKAGE_DOVECOT_SQLITE help Enable SQLite support. -source package/dovecot-pigeonhole/Config.in +source "package/dovecot-pigeonhole/Config.in" endif # BR2_PACKAGE_DOVECOT From 9f8d3f47d7caa395aa7c528891455389b0f0109e Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:47 +0200 Subject: [PATCH 0605/3013] package/python-pydal/Config.in: bool argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/python-pydal/Config.in:2: syntax error package/python-pydal/Config.in:2: invalid statement package/python-pydal/Config.in:3: invalid statement [...] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/python-pydal/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pydal/Config.in b/package/python-pydal/Config.in index f1c97f91a0c..204b47a09ab 100644 --- a/package/python-pydal/Config.in +++ b/package/python-pydal/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PYTHON_PYDAL - bool python-pydal + bool "python-pydal" help pyDAL is a pure Python Database Abstraction Layer. It dynamically generates the SQL in real time using the From a214c4568b2b93984be39ff8d3f9f4acb6af898c Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:48 +0200 Subject: [PATCH 0606/3013] package/x11r7/Config.in: source argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/x11r7/Config.in:14: syntax error package/x11r7/Config.in:14:warning: ignoring unsupported character '/' package/x11r7/Config.in:14:warning: ignoring unsupported character '/' package/x11r7/Config.in:14:warning: ignoring unsupported character '/' package/x11r7/Config.in:14:warning: ignoring unsupported character '.' package/x11r7/Config.in:14: invalid statement [...] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/x11r7/Config.in | 420 ++++++++++++++++++++-------------------- 1 file changed, 210 insertions(+), 210 deletions(-) diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index b91f97bb34e..0002dfe598e 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -11,232 +11,232 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" - source package/x11r7/xserver_xorg-server/Config.in - source package/x11r7/xwayland/Config.in + source "package/x11r7/xserver_xorg-server/Config.in" + source "package/x11r7/xwayland/Config.in" endmenu menu "X11R7 Libraries" - source package/x11r7/libxcb/Config.in - source package/x11r7/xcb-util/Config.in - source package/x11r7/xcb-util-cursor/Config.in - source package/x11r7/xcb-util-image/Config.in - source package/x11r7/xcb-util-keysyms/Config.in - source package/x11r7/xcb-util-renderutil/Config.in - source package/x11r7/xcb-util-wm/Config.in - source package/x11r7/xlib_libFS/Config.in - source package/x11r7/xlib_libICE/Config.in - source package/x11r7/xlib_libSM/Config.in - source package/x11r7/xlib_libX11/Config.in - source package/x11r7/xlib_libXScrnSaver/Config.in - source package/x11r7/xlib_libXau/Config.in - source package/x11r7/xlib_libXaw/Config.in - source package/x11r7/xlib_libXcomposite/Config.in - source package/x11r7/xlib_libXcursor/Config.in - source package/x11r7/xlib_libXdamage/Config.in - source package/x11r7/xlib_libXdmcp/Config.in - source package/x11r7/xlib_libXext/Config.in - source package/x11r7/xlib_libXfixes/Config.in - source package/x11r7/xlib_libXfont/Config.in - source package/x11r7/xlib_libXfont2/Config.in - source package/x11r7/xlib_libXft/Config.in - source package/x11r7/xlib_libXi/Config.in - source package/x11r7/xlib_libXinerama/Config.in - source package/x11r7/xlib_libXmu/Config.in - source package/x11r7/xlib_libXpm/Config.in - source package/x11r7/xlib_libXpresent/Config.in - source package/x11r7/xlib_libXrandr/Config.in - source package/x11r7/xlib_libXrender/Config.in - source package/x11r7/xlib_libXres/Config.in - source package/x11r7/xlib_libXt/Config.in - source package/x11r7/xlib_libXtst/Config.in - source package/x11r7/xlib_libXv/Config.in - source package/x11r7/xlib_libXvMC/Config.in - source package/x11r7/xlib_libXxf86dga/Config.in - source package/x11r7/xlib_libXxf86vm/Config.in - source package/x11r7/xlib_libdmx/Config.in - source package/x11r7/xlib_libfontenc/Config.in - source package/x11r7/xlib_libxcvt/Config.in - source package/x11r7/xlib_libxkbfile/Config.in - source package/x11r7/xlib_libxshmfence/Config.in - source package/x11r7/xlib_xtrans/Config.in + source "package/x11r7/libxcb/Config.in" + source "package/x11r7/xcb-util/Config.in" + source "package/x11r7/xcb-util-cursor/Config.in" + source "package/x11r7/xcb-util-image/Config.in" + source "package/x11r7/xcb-util-keysyms/Config.in" + source "package/x11r7/xcb-util-renderutil/Config.in" + source "package/x11r7/xcb-util-wm/Config.in" + source "package/x11r7/xlib_libFS/Config.in" + source "package/x11r7/xlib_libICE/Config.in" + source "package/x11r7/xlib_libSM/Config.in" + source "package/x11r7/xlib_libX11/Config.in" + source "package/x11r7/xlib_libXScrnSaver/Config.in" + source "package/x11r7/xlib_libXau/Config.in" + source "package/x11r7/xlib_libXaw/Config.in" + source "package/x11r7/xlib_libXcomposite/Config.in" + source "package/x11r7/xlib_libXcursor/Config.in" + source "package/x11r7/xlib_libXdamage/Config.in" + source "package/x11r7/xlib_libXdmcp/Config.in" + source "package/x11r7/xlib_libXext/Config.in" + source "package/x11r7/xlib_libXfixes/Config.in" + source "package/x11r7/xlib_libXfont/Config.in" + source "package/x11r7/xlib_libXfont2/Config.in" + source "package/x11r7/xlib_libXft/Config.in" + source "package/x11r7/xlib_libXi/Config.in" + source "package/x11r7/xlib_libXinerama/Config.in" + source "package/x11r7/xlib_libXmu/Config.in" + source "package/x11r7/xlib_libXpm/Config.in" + source "package/x11r7/xlib_libXpresent/Config.in" + source "package/x11r7/xlib_libXrandr/Config.in" + source "package/x11r7/xlib_libXrender/Config.in" + source "package/x11r7/xlib_libXres/Config.in" + source "package/x11r7/xlib_libXt/Config.in" + source "package/x11r7/xlib_libXtst/Config.in" + source "package/x11r7/xlib_libXv/Config.in" + source "package/x11r7/xlib_libXvMC/Config.in" + source "package/x11r7/xlib_libXxf86dga/Config.in" + source "package/x11r7/xlib_libXxf86vm/Config.in" + source "package/x11r7/xlib_libdmx/Config.in" + source "package/x11r7/xlib_libfontenc/Config.in" + source "package/x11r7/xlib_libxcvt/Config.in" + source "package/x11r7/xlib_libxkbfile/Config.in" + source "package/x11r7/xlib_libxshmfence/Config.in" + source "package/x11r7/xlib_xtrans/Config.in" endmenu menu "X11R7 Applications" - source package/x11r7/xapp_appres/Config.in - source package/x11r7/xapp_bdftopcf/Config.in - source package/x11r7/xapp_beforelight/Config.in - source package/x11r7/xapp_bitmap/Config.in - source package/x11r7/xapp_editres/Config.in - source package/x11r7/xapp_fonttosfnt/Config.in - source package/x11r7/xapp_fslsfonts/Config.in - source package/x11r7/xapp_fstobdf/Config.in - source package/x11r7/xapp_iceauth/Config.in - source package/x11r7/xapp_ico/Config.in - source package/x11r7/xapp_listres/Config.in - source package/x11r7/xapp_luit/Config.in - source package/x11r7/xapp_mkfontscale/Config.in - source package/x11r7/xapp_oclock/Config.in - source package/x11r7/xapp_rgb/Config.in - source package/x11r7/xapp_rstart/Config.in - source package/x11r7/xapp_scripts/Config.in - source package/x11r7/xapp_sessreg/Config.in - source package/x11r7/xapp_setxkbmap/Config.in - source package/x11r7/xapp_showfont/Config.in - source package/x11r7/xapp_smproxy/Config.in - source package/x11r7/xapp_twm/Config.in - source package/x11r7/xapp_viewres/Config.in - source package/x11r7/xapp_x11perf/Config.in - source package/x11r7/xapp_xauth/Config.in - source package/x11r7/xapp_xbacklight/Config.in - source package/x11r7/xapp_xbiff/Config.in - source package/x11r7/xapp_xcalc/Config.in - source package/x11r7/xapp_xclipboard/Config.in - source package/x11r7/xapp_xclock/Config.in - source package/x11r7/xapp_xcmsdb/Config.in - source package/x11r7/xapp_xcompmgr/Config.in - source package/x11r7/xapp_xconsole/Config.in - source package/x11r7/xapp_xcursorgen/Config.in - source package/x11r7/xapp_xdbedizzy/Config.in - source package/x11r7/xapp_xditview/Config.in - source package/x11r7/xapp_xdm/Config.in - source package/x11r7/xapp_xdpyinfo/Config.in - source package/x11r7/xapp_xdriinfo/Config.in - source package/x11r7/xapp_xedit/Config.in - source package/x11r7/xapp_xev/Config.in - source package/x11r7/xapp_xeyes/Config.in - source package/x11r7/xapp_xf86dga/Config.in - source package/x11r7/xapp_xfd/Config.in - source package/x11r7/xapp_xfindproxy/Config.in - source package/x11r7/xapp_xfontsel/Config.in - source package/x11r7/xapp_xfs/Config.in - source package/x11r7/xapp_xfsinfo/Config.in - source package/x11r7/xapp_xgamma/Config.in - source package/x11r7/xapp_xgc/Config.in - source package/x11r7/xapp_xhost/Config.in - source package/x11r7/xapp_xinit/Config.in - source package/x11r7/xapp_xinput/Config.in - source package/x11r7/xapp_xinput-calibrator/Config.in - source package/x11r7/xapp_xkbcomp/Config.in - source package/x11r7/xapp_xkbevd/Config.in - source package/x11r7/xapp_xkbprint/Config.in - source package/x11r7/xapp_xkbutils/Config.in - source package/x11r7/xapp_xkill/Config.in - source package/x11r7/xapp_xload/Config.in - source package/x11r7/xapp_xlogo/Config.in - source package/x11r7/xapp_xlsatoms/Config.in - source package/x11r7/xapp_xlsclients/Config.in - source package/x11r7/xapp_xlsfonts/Config.in - source package/x11r7/xapp_xmag/Config.in - source package/x11r7/xapp_xman/Config.in - source package/x11r7/xapp_xmessage/Config.in - source package/x11r7/xapp_xmh/Config.in - source package/x11r7/xapp_xmodmap/Config.in - source package/x11r7/xapp_xmore/Config.in - source package/x11r7/xapp_xpr/Config.in - source package/x11r7/xapp_xprop/Config.in - source package/x11r7/xapp_xrandr/Config.in - source package/x11r7/xapp_xrdb/Config.in - source package/x11r7/xapp_xrefresh/Config.in - source package/x11r7/xapp_xset/Config.in - source package/x11r7/xapp_xsetmode/Config.in - source package/x11r7/xapp_xsetpointer/Config.in - source package/x11r7/xapp_xsetroot/Config.in - source package/x11r7/xapp_xsm/Config.in - source package/x11r7/xapp_xstdcmap/Config.in - source package/x11r7/xapp_xvidtune/Config.in - source package/x11r7/xapp_xvinfo/Config.in - source package/x11r7/xapp_xwd/Config.in - source package/x11r7/xapp_xwininfo/Config.in - source package/x11r7/xapp_xwud/Config.in + source "package/x11r7/xapp_appres/Config.in" + source "package/x11r7/xapp_bdftopcf/Config.in" + source "package/x11r7/xapp_beforelight/Config.in" + source "package/x11r7/xapp_bitmap/Config.in" + source "package/x11r7/xapp_editres/Config.in" + source "package/x11r7/xapp_fonttosfnt/Config.in" + source "package/x11r7/xapp_fslsfonts/Config.in" + source "package/x11r7/xapp_fstobdf/Config.in" + source "package/x11r7/xapp_iceauth/Config.in" + source "package/x11r7/xapp_ico/Config.in" + source "package/x11r7/xapp_listres/Config.in" + source "package/x11r7/xapp_luit/Config.in" + source "package/x11r7/xapp_mkfontscale/Config.in" + source "package/x11r7/xapp_oclock/Config.in" + source "package/x11r7/xapp_rgb/Config.in" + source "package/x11r7/xapp_rstart/Config.in" + source "package/x11r7/xapp_scripts/Config.in" + source "package/x11r7/xapp_sessreg/Config.in" + source "package/x11r7/xapp_setxkbmap/Config.in" + source "package/x11r7/xapp_showfont/Config.in" + source "package/x11r7/xapp_smproxy/Config.in" + source "package/x11r7/xapp_twm/Config.in" + source "package/x11r7/xapp_viewres/Config.in" + source "package/x11r7/xapp_x11perf/Config.in" + source "package/x11r7/xapp_xauth/Config.in" + source "package/x11r7/xapp_xbacklight/Config.in" + source "package/x11r7/xapp_xbiff/Config.in" + source "package/x11r7/xapp_xcalc/Config.in" + source "package/x11r7/xapp_xclipboard/Config.in" + source "package/x11r7/xapp_xclock/Config.in" + source "package/x11r7/xapp_xcmsdb/Config.in" + source "package/x11r7/xapp_xcompmgr/Config.in" + source "package/x11r7/xapp_xconsole/Config.in" + source "package/x11r7/xapp_xcursorgen/Config.in" + source "package/x11r7/xapp_xdbedizzy/Config.in" + source "package/x11r7/xapp_xditview/Config.in" + source "package/x11r7/xapp_xdm/Config.in" + source "package/x11r7/xapp_xdpyinfo/Config.in" + source "package/x11r7/xapp_xdriinfo/Config.in" + source "package/x11r7/xapp_xedit/Config.in" + source "package/x11r7/xapp_xev/Config.in" + source "package/x11r7/xapp_xeyes/Config.in" + source "package/x11r7/xapp_xf86dga/Config.in" + source "package/x11r7/xapp_xfd/Config.in" + source "package/x11r7/xapp_xfindproxy/Config.in" + source "package/x11r7/xapp_xfontsel/Config.in" + source "package/x11r7/xapp_xfs/Config.in" + source "package/x11r7/xapp_xfsinfo/Config.in" + source "package/x11r7/xapp_xgamma/Config.in" + source "package/x11r7/xapp_xgc/Config.in" + source "package/x11r7/xapp_xhost/Config.in" + source "package/x11r7/xapp_xinit/Config.in" + source "package/x11r7/xapp_xinput/Config.in" + source "package/x11r7/xapp_xinput-calibrator/Config.in" + source "package/x11r7/xapp_xkbcomp/Config.in" + source "package/x11r7/xapp_xkbevd/Config.in" + source "package/x11r7/xapp_xkbprint/Config.in" + source "package/x11r7/xapp_xkbutils/Config.in" + source "package/x11r7/xapp_xkill/Config.in" + source "package/x11r7/xapp_xload/Config.in" + source "package/x11r7/xapp_xlogo/Config.in" + source "package/x11r7/xapp_xlsatoms/Config.in" + source "package/x11r7/xapp_xlsclients/Config.in" + source "package/x11r7/xapp_xlsfonts/Config.in" + source "package/x11r7/xapp_xmag/Config.in" + source "package/x11r7/xapp_xman/Config.in" + source "package/x11r7/xapp_xmessage/Config.in" + source "package/x11r7/xapp_xmh/Config.in" + source "package/x11r7/xapp_xmodmap/Config.in" + source "package/x11r7/xapp_xmore/Config.in" + source "package/x11r7/xapp_xpr/Config.in" + source "package/x11r7/xapp_xprop/Config.in" + source "package/x11r7/xapp_xrandr/Config.in" + source "package/x11r7/xapp_xrdb/Config.in" + source "package/x11r7/xapp_xrefresh/Config.in" + source "package/x11r7/xapp_xset/Config.in" + source "package/x11r7/xapp_xsetmode/Config.in" + source "package/x11r7/xapp_xsetpointer/Config.in" + source "package/x11r7/xapp_xsetroot/Config.in" + source "package/x11r7/xapp_xsm/Config.in" + source "package/x11r7/xapp_xstdcmap/Config.in" + source "package/x11r7/xapp_xvidtune/Config.in" + source "package/x11r7/xapp_xvinfo/Config.in" + source "package/x11r7/xapp_xwd/Config.in" + source "package/x11r7/xapp_xwininfo/Config.in" + source "package/x11r7/xapp_xwud/Config.in" endmenu if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR menu "X11R7 Drivers" - source package/x11r7/xdriver_xf86-input-evdev/Config.in - source package/x11r7/xdriver_xf86-input-joystick/Config.in - source package/x11r7/xdriver_xf86-input-libinput/Config.in - source package/x11r7/xdriver_xf86-input-mouse/Config.in - source package/x11r7/xdriver_xf86-input-synaptics/Config.in - source package/x11r7/xdriver_xf86-input-tslib/Config.in - source package/x11r7/xdriver_xf86-input-vmmouse/Config.in - source package/x11r7/xdriver_xf86-video-amdgpu/Config.in - source package/x11r7/xdriver_xf86-video-ark/Config.in - source package/x11r7/xdriver_xf86-video-ast/Config.in - source package/x11r7/xdriver_xf86-video-ati/Config.in - source package/x11r7/xdriver_xf86-video-cirrus/Config.in - source package/x11r7/xdriver_xf86-video-dummy/Config.in - source package/x11r7/xdriver_xf86-video-fbdev/Config.in - source package/x11r7/xdriver_xf86-video-fbturbo/Config.in - source package/x11r7/xdriver_xf86-video-geode/Config.in - source package/x11r7/xdriver_xf86-video-i128/Config.in - source package/x11r7/xdriver_xf86-video-imx/Config.in - source package/x11r7/xdriver_xf86-video-intel/Config.in - source package/x11r7/xdriver_xf86-video-mach64/Config.in - source package/x11r7/xdriver_xf86-video-mga/Config.in - source package/x11r7/xdriver_xf86-video-neomagic/Config.in - source package/x11r7/xdriver_xf86-video-nouveau/Config.in - source package/x11r7/xdriver_xf86-video-nv/Config.in - source package/x11r7/xdriver_xf86-video-openchrome/Config.in - source package/x11r7/xdriver_xf86-video-qxl/Config.in - source package/x11r7/xdriver_xf86-video-r128/Config.in - source package/x11r7/xdriver_xf86-video-savage/Config.in - source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in - source package/x11r7/xdriver_xf86-video-sis/Config.in - source package/x11r7/xdriver_xf86-video-tdfx/Config.in - source package/x11r7/xdriver_xf86-video-trident/Config.in - source package/x11r7/xdriver_xf86-video-vesa/Config.in - source package/x11r7/xdriver_xf86-video-vmware/Config.in - source package/x11r7/xdriver_xf86-video-voodoo/Config.in + source "package/x11r7/xdriver_xf86-input-evdev/Config.in" + source "package/x11r7/xdriver_xf86-input-joystick/Config.in" + source "package/x11r7/xdriver_xf86-input-libinput/Config.in" + source "package/x11r7/xdriver_xf86-input-mouse/Config.in" + source "package/x11r7/xdriver_xf86-input-synaptics/Config.in" + source "package/x11r7/xdriver_xf86-input-tslib/Config.in" + source "package/x11r7/xdriver_xf86-input-vmmouse/Config.in" + source "package/x11r7/xdriver_xf86-video-amdgpu/Config.in" + source "package/x11r7/xdriver_xf86-video-ark/Config.in" + source "package/x11r7/xdriver_xf86-video-ast/Config.in" + source "package/x11r7/xdriver_xf86-video-ati/Config.in" + source "package/x11r7/xdriver_xf86-video-cirrus/Config.in" + source "package/x11r7/xdriver_xf86-video-dummy/Config.in" + source "package/x11r7/xdriver_xf86-video-fbdev/Config.in" + source "package/x11r7/xdriver_xf86-video-fbturbo/Config.in" + source "package/x11r7/xdriver_xf86-video-geode/Config.in" + source "package/x11r7/xdriver_xf86-video-i128/Config.in" + source "package/x11r7/xdriver_xf86-video-imx/Config.in" + source "package/x11r7/xdriver_xf86-video-intel/Config.in" + source "package/x11r7/xdriver_xf86-video-mach64/Config.in" + source "package/x11r7/xdriver_xf86-video-mga/Config.in" + source "package/x11r7/xdriver_xf86-video-neomagic/Config.in" + source "package/x11r7/xdriver_xf86-video-nouveau/Config.in" + source "package/x11r7/xdriver_xf86-video-nv/Config.in" + source "package/x11r7/xdriver_xf86-video-openchrome/Config.in" + source "package/x11r7/xdriver_xf86-video-qxl/Config.in" + source "package/x11r7/xdriver_xf86-video-r128/Config.in" + source "package/x11r7/xdriver_xf86-video-savage/Config.in" + source "package/x11r7/xdriver_xf86-video-siliconmotion/Config.in" + source "package/x11r7/xdriver_xf86-video-sis/Config.in" + source "package/x11r7/xdriver_xf86-video-tdfx/Config.in" + source "package/x11r7/xdriver_xf86-video-trident/Config.in" + source "package/x11r7/xdriver_xf86-video-vesa/Config.in" + source "package/x11r7/xdriver_xf86-video-vmware/Config.in" + source "package/x11r7/xdriver_xf86-video-voodoo/Config.in" endmenu endif menu "X11R7 Fonts" - source package/x11r7/xfont_font-util/Config.in - source package/x11r7/xfont_encodings/Config.in - source package/x11r7/xfont_font-adobe-100dpi/Config.in - source package/x11r7/xfont_font-adobe-75dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-type1/Config.in - source package/x11r7/xfont_font-alias/Config.in - source package/x11r7/xfont_font-arabic-misc/Config.in - source package/x11r7/xfont_font-bh-100dpi/Config.in - source package/x11r7/xfont_font-bh-75dpi/Config.in - source package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in - source package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in - source package/x11r7/xfont_font-bh-ttf/Config.in - source package/x11r7/xfont_font-bh-type1/Config.in - source package/x11r7/xfont_font-bitstream-100dpi/Config.in - source package/x11r7/xfont_font-bitstream-75dpi/Config.in - source package/x11r7/xfont_font-bitstream-type1/Config.in - source package/x11r7/xfont_font-cronyx-cyrillic/Config.in - source package/x11r7/xfont_font-cursor-misc/Config.in - source package/x11r7/xfont_font-daewoo-misc/Config.in - source package/x11r7/xfont_font-dec-misc/Config.in - source package/x11r7/xfont_font-ibm-type1/Config.in - source package/x11r7/xfont_font-isas-misc/Config.in - source package/x11r7/xfont_font-jis-misc/Config.in - source package/x11r7/xfont_font-micro-misc/Config.in - source package/x11r7/xfont_font-misc-cyrillic/Config.in - source package/x11r7/xfont_font-misc-ethiopic/Config.in - source package/x11r7/xfont_font-misc-meltho/Config.in - source package/x11r7/xfont_font-misc-misc/Config.in - source package/x11r7/xfont_font-mutt-misc/Config.in - source package/x11r7/xfont_font-schumacher-misc/Config.in - source package/x11r7/xfont_font-screen-cyrillic/Config.in - source package/x11r7/xfont_font-sony-misc/Config.in - source package/x11r7/xfont_font-sun-misc/Config.in - source package/x11r7/xfont_font-winitzki-cyrillic/Config.in - source package/x11r7/xfont_font-xfree86-type1/Config.in + source "package/x11r7/xfont_font-util/Config.in" + source "package/x11r7/xfont_encodings/Config.in" + source "package/x11r7/xfont_font-adobe-100dpi/Config.in" + source "package/x11r7/xfont_font-adobe-75dpi/Config.in" + source "package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in" + source "package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in" + source "package/x11r7/xfont_font-adobe-utopia-type1/Config.in" + source "package/x11r7/xfont_font-alias/Config.in" + source "package/x11r7/xfont_font-arabic-misc/Config.in" + source "package/x11r7/xfont_font-bh-100dpi/Config.in" + source "package/x11r7/xfont_font-bh-75dpi/Config.in" + source "package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in" + source "package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in" + source "package/x11r7/xfont_font-bh-ttf/Config.in" + source "package/x11r7/xfont_font-bh-type1/Config.in" + source "package/x11r7/xfont_font-bitstream-100dpi/Config.in" + source "package/x11r7/xfont_font-bitstream-75dpi/Config.in" + source "package/x11r7/xfont_font-bitstream-type1/Config.in" + source "package/x11r7/xfont_font-cronyx-cyrillic/Config.in" + source "package/x11r7/xfont_font-cursor-misc/Config.in" + source "package/x11r7/xfont_font-daewoo-misc/Config.in" + source "package/x11r7/xfont_font-dec-misc/Config.in" + source "package/x11r7/xfont_font-ibm-type1/Config.in" + source "package/x11r7/xfont_font-isas-misc/Config.in" + source "package/x11r7/xfont_font-jis-misc/Config.in" + source "package/x11r7/xfont_font-micro-misc/Config.in" + source "package/x11r7/xfont_font-misc-cyrillic/Config.in" + source "package/x11r7/xfont_font-misc-ethiopic/Config.in" + source "package/x11r7/xfont_font-misc-meltho/Config.in" + source "package/x11r7/xfont_font-misc-misc/Config.in" + source "package/x11r7/xfont_font-mutt-misc/Config.in" + source "package/x11r7/xfont_font-schumacher-misc/Config.in" + source "package/x11r7/xfont_font-screen-cyrillic/Config.in" + source "package/x11r7/xfont_font-sony-misc/Config.in" + source "package/x11r7/xfont_font-sun-misc/Config.in" + source "package/x11r7/xfont_font-winitzki-cyrillic/Config.in" + source "package/x11r7/xfont_font-xfree86-type1/Config.in" endmenu menu "X11R7 X protocols" - source package/x11r7/xcb-proto/Config.in - source package/x11r7/xorgproto/Config.in + source "package/x11r7/xcb-proto/Config.in" + source "package/x11r7/xorgproto/Config.in" endmenu menu "X11R7 Utilities" - source package/x11r7/xutil_makedepend/Config.in - source package/x11r7/mcookie/Config.in + source "package/x11r7/xutil_makedepend/Config.in" + source "package/x11r7/mcookie/Config.in" endmenu menu "X11R7 Other data" - source package/x11r7/xdata_xbitmaps/Config.in - source package/x11r7/xdata_xcursor-themes/Config.in - source package/x11r7/xcursor-transparent-theme/Config.in + source "package/x11r7/xdata_xbitmaps/Config.in" + source "package/x11r7/xdata_xcursor-themes/Config.in" + source "package/x11r7/xcursor-transparent-theme/Config.in" endmenu endif From 82ed4fb1c9348426c1e598b6d255dfe0e426be0d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 6 May 2024 12:52:30 -0600 Subject: [PATCH 0607/3013] package/ell: bump to version 0.65 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index f5ded676c3d..3adca75140e 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965 ell-0.63.tar.xz +sha256 9ee7ac57b188d391cead705d3596a6d3240341786475149db297782a52269aa5 ell-0.65.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index f43dbdb5f7e..a682635539e 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.63 +ELL_VERSION = 0.65 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From ffc4af650aeff6787569fa70957f8fe3c1c297b7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 6 May 2024 12:52:31 -0600 Subject: [PATCH 0608/3013] package/iwd: bump to version 2.17 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 3f18146e133..9f88b2d6f10 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba iwd-2.16.tar.xz +sha256 5901ab3fbb74bb75ec9adda35daeff595e4d238882fee7fc8c805b30ca79d943 iwd-2.17.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index af6b2f849a7..c516bab4717 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.16 +IWD_VERSION = 2.17 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From f82384652c0feed99dc07f08fae5ec1646d38dfc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 16:17:59 +0200 Subject: [PATCH 0609/3013] package/shadow: fix NLS build NLS is an optional dependency since the addition of the package in commit f78c5cb5cae93a9e63dad4361d78e1787759382f: /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/12.3.0/../../../../arm-buildroot-linux-musleabi/bin/ld: ../lib/.libs/libshadow.a(libshadow_la-alloc.o): in function `xcalloc': alloc.c:(.text+0x7c): undefined reference to `libintl_gettext' Fixes: f78c5cb5cae93a9e63dad4361d78e1787759382f - http://autobuild.buildroot.org/results/9f604d09745ffa1f4db3bdcfe0326c236effac0c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/shadow/shadow.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 491f271330a..e4d8b67b8a7 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -10,6 +10,8 @@ SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause SHADOW_LICENSE_FILES = COPYING SHADOW_CPE_ID_VENDOR = debian +SHADOW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +SHADOW_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) SHADOW_CONF_OPTS = \ --disable-man \ From 45c1def9915ead52a5e4b874c33194653b598117 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 17:53:49 +0200 Subject: [PATCH 0610/3013] package/pppd: fix build with kernel < 4.7 Fix the following build failure with kernel < 4.7 raised since bump to version 2.5.0 in commit 0c15169f5ae57d88a77df34cc896044a37c9597b and https://github.com/ppp-project/ppp/commit/81ad945630120cc1c27c8bb00503be42b76ff202: sys-linux.c: In function 'get_ppp_stats_rtnetlink': sys-linux.c:1783:29: error: field 'ifsm' has incomplete type 1783 | struct if_stats_msg ifsm; | ^~~~ Fixes: - http://autobuild.buildroot.org/results/82392df447f650f241f23e59e65131fb4a930010 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...pile-with-older-Linux-kernel-headers.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch diff --git a/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch b/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch new file mode 100644 index 00000000000..46c293103ad --- /dev/null +++ b/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch @@ -0,0 +1,66 @@ +From 7a3f478a4b7128d4f70ea64d99fedec766b1c009 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon +Date: Tue, 31 Oct 2023 11:47:21 +0200 +Subject: [PATCH] pppd/sys-linux: Fix compile with older Linux kernel headers + (#452) + +When compiling pppd against kernel headers which don't provide +the definitions for the NETLINK mechanisms, leave out the code +which uses NETLINK, so as to avoid getting compile errors. + +Upstream commit in Linux refers. + +commit 10c9ead9f3c6bb24bddc9a96681f7d58e6623966 +Author: Roopa Prabhu +Date: Wed Apr 20 08:43:43 2016 -0700 +rtnetlink: add new RTM_GETSTATS message to dump link stats + +This commit adds the #defines and structs used, so simply not compiling +this code if the required #defines isn't there should solve the problem. + +Closes: #450 + +Signed-off-by: Jaco Kroon +Upstream: https://github.com/ppp-project/ppp/commit/7a3f478a4b7128d4f70ea64d99fedec766b1c009 +Signed-off-by: Fabrice Fontaine +--- + pppd/sys-linux.c | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c +index 561b150f2..a8d6cd95b 100644 +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -131,16 +131,6 @@ + #include + #include + #include +- +-/* Attempt at retaining compile-support with older than 4.7 kernels, or kernels +- * where RTM_NEWSTATS isn't defined for whatever reason. +- */ +-#ifndef RTM_NEWSTATS +-#define RTM_NEWSTATS 92 +-#define RTM_GETSTATS 94 +-#define IFLA_STATS_LINK_64 1 +-#endif +- + #include + + /* glibc versions prior to 2.24 do not define SOL_NETLINK */ +@@ -1776,6 +1766,7 @@ get_ppp_stats_ioctl(int u, struct pppd_stats *stats) + static int + get_ppp_stats_rtnetlink(int u, struct pppd_stats *stats) + { ++#ifdef RTM_NEWSTATS + static int fd = -1; + + struct { +@@ -1825,6 +1816,7 @@ get_ppp_stats_rtnetlink(int u, struct pppd_stats *stats) + err: + close(fd); + fd = -1; ++#endif + return 0; + } + From c0dc1b3425ae3bade14553a96e7475a79d753d4e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 6 May 2024 09:40:11 +0200 Subject: [PATCH 0611/3013] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6761770801 The Linux kernel fails to build since commit e88225ed882 (package/binutils: make 2.41 the default version): arch/arm/mm/proc-feroceon.S: Assembler messages: arch/arm/mm/proc-feroceon.S:587: Error: junk at end of line, first unrecognized character is `#' make[3]: *** [scripts/Makefile.build:430: arch/arm/mm/proc-feroceon.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Fix the build by bumping the kernel to 4.14.336, which includes commit 3ab03df64f77 (ARM: 8933/1: replace Sun/Solaris style flag on section directive): https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=3ab03df64f7754728a2257c47775a70a88428331 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/sheevaplug_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 7f186df22c0..0879f17071e 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -27,7 +27,7 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.253" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.336" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 56ce35d235b7f7b297e33c118e4e7b64491f73c6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 6 May 2024 09:40:12 +0200 Subject: [PATCH 0612/3013] configs/sheevaplug_defconfig: add hashes for u-boot and Linux And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Generated by utils/add-custom-hashes, with the (redundant) linux-headers.hash replaced by a symlink. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - board/sheevaplug/patches/linux-headers/linux-headers.hash | 1 + board/sheevaplug/patches/linux/linux.hash | 2 ++ board/sheevaplug/patches/uboot/uboot.hash | 2 ++ configs/sheevaplug_defconfig | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) create mode 120000 board/sheevaplug/patches/linux-headers/linux-headers.hash create mode 100644 board/sheevaplug/patches/linux/linux.hash create mode 100644 board/sheevaplug/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 1135fa71752..44d4250e14e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -348,7 +348,6 @@ configs/rock_pi_n8_defconfig lib_defconfig.ForceCheckHash configs/rockpro64_defconfig lib_defconfig.ForceCheckHash configs/roseapplepi_defconfig lib_defconfig.ForceCheckHash configs/s6lx9_microboard_defconfig lib_defconfig.ForceCheckHash -configs/sheevaplug_defconfig lib_defconfig.ForceCheckHash configs/sipeed_lichee_rv_defconfig lib_defconfig.ForceCheckHash configs/sipeed_lichee_rv_dock_defconfig lib_defconfig.ForceCheckHash configs/sipeed_licheepi_nano_defconfig lib_defconfig.ForceCheckHash diff --git a/board/sheevaplug/patches/linux-headers/linux-headers.hash b/board/sheevaplug/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/sheevaplug/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/sheevaplug/patches/linux/linux.hash b/board/sheevaplug/patches/linux/linux.hash new file mode 100644 index 00000000000..b207306a2b1 --- /dev/null +++ b/board/sheevaplug/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz diff --git a/board/sheevaplug/patches/uboot/uboot.hash b/board/sheevaplug/patches/uboot/uboot.hash new file mode 100644 index 00000000000..d6818bac36b --- /dev/null +++ b/board/sheevaplug/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4 u-boot-2018.07.tar.bz2 diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 0879f17071e..6b3719a5076 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -4,6 +4,7 @@ BR2_arm926t=y # system BR2_GLOBAL_PATCH_DIR="board/sheevaplug/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" From babb39c87366217ce84269ba11b29475d3d183b7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 10:19:58 +0200 Subject: [PATCH 0613/3013] package/libhtp: security bump to version 0.5.48 Fix CVE-2024-23837 and CVE-2024-28871 https://github.com/OISF/libhtp/security/advisories/GHSA-f9wf-rrjj-qx8m https://github.com/OISF/libhtp/security/advisories/GHSA-ffr2-45w9-7wmg https://github.com/OISF/libhtp/blob/0.5.48/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libhtp/libhtp.hash | 2 +- package/libhtp/libhtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libhtp/libhtp.hash b/package/libhtp/libhtp.hash index c016cb3439e..1809bc93a30 100644 --- a/package/libhtp/libhtp.hash +++ b/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d4214f94522fa5a1ec1909dbb52831c534788d93bc6b2ca8252de9332b11b606 libhtp-0.5.45.tar.gz +sha256 7f0719732fd0c82f9915e3df27e31548798590ad624fbad24f58b50885248ab8 libhtp-0.5.48.tar.gz sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/package/libhtp/libhtp.mk b/package/libhtp/libhtp.mk index 8a732d1d5c5..8735f593d9e 100644 --- a/package/libhtp/libhtp.mk +++ b/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.45 +LIBHTP_VERSION = 0.5.48 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE From a8e60c4600f42212cb8c42e5b288d6406bb80db4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 10:19:59 +0200 Subject: [PATCH 0614/3013] package/suricata: security bump to version 6.0.19 Fixes: - CVE-2024-23839 - Critical severity - CVE-2024-23836 - Critical severity - CVE-2024-23835 - High severity - CVE-2024-24568 - Moderate severity - CVE-2024-28870 - HIGH - CVE-2024-32663 CRITICAL (HIGH for 6.0.x) - CVE-2024-32664 CRITICAL (HIGH for 7.0.x) - CVE-2024-32867 MODERATE https://forum.suricata.io/t/suricata-7-0-3-and-6-0-16-released/4468 https://forum.suricata.io/t/suricata-7-0-4-and-6-0-17-released/4534 https://forum.suricata.io/t/suricata-6-0-18-released/4539 https://forum.suricata.io/t/suricata-7-0-5-and-6-0-19-released/4617 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/suricata/suricata.hash | 2 +- package/suricata/suricata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash index 41befa61b96..58ab0d93b0a 100644 --- a/package/suricata/suricata.hash +++ b/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 1bd546149ac6671c2476d520a38eab7755e10c3080fd2ec2dc8624b0cf89ee75 suricata-6.0.15.tar.gz +sha256 98c812faef466d337f107f13ae37843f1c719942b93832d70f1a2fd7ee1b5c2c suricata-6.0.19.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 5b526353284..2083e0cabac 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -4,7 +4,7 @@ # ################################################################################ -SURICATA_VERSION = 6.0.15 +SURICATA_VERSION = 6.0.19 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE From 5272c6bea1247e87a32947bd960757a19fdf8b90 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 09:00:49 +0200 Subject: [PATCH 0615/3013] package/oprofile: fix static build with binutils >= 2.40 sframe library was added by binutils 2.40 and https://github.com/bminor/binutils-gdb/commit/19e559f1c91bfaedbd2f91d85ee161f3f03fda3c resulting in the following static build failure: /home/buildroot/autobuild/run/instance-1/output-1/build/binutils-2.41/bfd/elf-sframe.c:220: undefined reference to `sframe_decode' [...] configure: error: bfd library not found Fixes: - http://autobuild.buildroot.org/results/a9f3e09e6543b3773440c011e93bd41e357691e4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-fix-static-build-with-binutils-2.40.patch | 62 +++++++++++++++++++ package/oprofile/oprofile.mk | 7 +++ 2 files changed, 69 insertions(+) create mode 100644 package/oprofile/0002-fix-static-build-with-binutils-2.40.patch diff --git a/package/oprofile/0002-fix-static-build-with-binutils-2.40.patch b/package/oprofile/0002-fix-static-build-with-binutils-2.40.patch new file mode 100644 index 00000000000..3134363abcc --- /dev/null +++ b/package/oprofile/0002-fix-static-build-with-binutils-2.40.patch @@ -0,0 +1,62 @@ +From 1e4cd78bca2bd6e0d17b6cb9caf1b172d7bac564 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 6 May 2024 08:41:49 +0200 +Subject: [PATCH] fix static build with binutils >= 2.40 + +sframe library was added by binutils 2.40 and +https://github.com/bminor/binutils-gdb/commit/19e559f1c91bfaedbd2f91d85ee161f3f03fda3c +resulting in the following static build failure: + +/home/buildroot/autobuild/run/instance-1/output-1/build/binutils-2.41/bfd/elf-sframe.c:220: undefined reference to `sframe_decode' + +[...] + +configure: error: bfd library not found + +Fixes: + - http://autobuild.buildroot.org/results/a9f3e09e6543b3773440c011e93bd41e357691e4 + +Signed-off-by: Fabrice Fontaine +Upstream: https://sourceforge.net/p/oprofile/bugs/295 +--- + configure.ac | 2 +- + m4/binutils.m4 | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dc447f89..72ef0a21 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -334,7 +334,7 @@ AX_CHECK_DOCBOOK + dnl finally restore the original libs setting + LIBS="$ORIG_SAVE_LIBS" + LIBERTY_LIBS="-liberty $DL_LIB $INTL_LIB" +-BFD_LIBS="-lbfd -liberty $DL_LIB $INTL_LIB $Z_LIB" ++BFD_LIBS="-lbfd -liberty $DL_LIB $INTL_LIB $SFRAME_LIB $Z_LIB" + POPT_LIBS="-lpopt" + AC_SUBST(LIBERTY_LIBS) + AC_SUBST(BFD_LIBS) +diff --git a/m4/binutils.m4 b/m4/binutils.m4 +index c50e2f3c..e1ccd8e7 100644 +--- a/m4/binutils.m4 ++++ b/m4/binutils.m4 +@@ -10,11 +10,14 @@ AC_CHECK_FUNCS(xmemdup) + AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl"; DL_LIB="-ldl", DL_LIB="") + AC_CHECK_LIB(intl, main, LIBS="$LIBS -lintl"; INTL_LIB="-lintl", INTL_LIB="") + +-AC_CHECK_LIB(bfd, bfd_openr, LIBS="-lbfd $LIBS"; Z_LIB="", ++AC_CHECK_LIB(bfd, bfd_openr, LIBS="-lbfd $LIBS"; SFRAME_LIB=""; Z_LIB="", + [AC_CHECK_LIB(z, compress, + dnl Use a different bfd function here so as not to use cached result from above + [AC_CHECK_LIB(bfd, bfd_fdopenr, LIBS="-lbfd -lz $LIBS"; Z_LIB="-lz", +- [AC_MSG_ERROR([bfd library not found])], -lz) ++dnl Use a different bfd function here so as not to use cached result from above ++ [AC_CHECK_LIB(bfd, bfd_close, LIBS="-lbfd -lsframe -lz $LIBS"; SFRAME_LIB="-lsframe"; Z_LIB="-lz", ++ [AC_MSG_ERROR([bfd library not found])], -lsframe -lz) ++ ], -lz) + ], + [AC_MSG_ERROR([libz library not found; required by libbfd])]) + ] +-- +2.43.0 + diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 512fbf9ea1e..590e63b4ac0 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -12,6 +12,13 @@ OPROFILE_CPE_ID_VENDOR = maynard_johnson OPROFILE_CONF_OPTS = \ --disable-account-check \ --with-kernel=$(STAGING_DIR)/usr +# 0002-fix-static-build-with-binutils-2.40.patch +OPROFILE_AUTORECONF = YES + +define OPROFILE_CREATE_MISSING_FILES + touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/ChangeLog +endef +OPROFILE_POST_EXTRACT_HOOKS += OPROFILE_CREATE_MISSING_FILES OPROFILE_DEPENDENCIES = popt binutils host-pkgconf From 837d2a7ef257bfe0c091ab8ed3416ccc94b188b0 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sun, 5 May 2024 22:54:19 +0300 Subject: [PATCH 0616/3013] configs/orangepi_zero2w: new board This patch adds basic support for the new OrangePi Zero2W board: - http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-2W.html Brief summary of the board features: - H618 Allwinner SoC - Quad-Core ARM Cortex-A53 Processor 1.5GHz - Mali G31 MP2 GPU - LPDDR4: 1GB/2GB/4GB - Wi-Fi5.0+BT 5.0 - 2x Type-C USB 2.0 - 1x Mini HDMI - Wi-Fi 5.0 + BT 5.0 - 40-pin expansion interface (GPIO / UART / I2C / SPI / PWM) - 24-pin expansion interface (2x USB 2.0 / ETH / IR / audio) BSP includes the following components: - mainline ATF v2.10 - mainline U-Boot v2024.04 - mainline Linux kernel v6.8 No custom scripts required: all is covered by common orangepi scripts. However new option BR2_DOWNLOAD_FORCE_CHECK_HASHES requires checksums for all the BSP components. They are added as board specific patches. Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + .../arm-trusted-firmware.hash | 2 + .../patches/linux-headers/linux-headers.hash | 1 + .../orangepi-zero2w/patches/linux/linux.hash | 2 + .../orangepi-zero2w/patches/uboot/uboot.hash | 2 + board/orangepi/orangepi-zero2w/readme.txt | 32 ++++++++++ configs/orangepi_zero2w_defconfig | 58 +++++++++++++++++++ 7 files changed, 99 insertions(+) create mode 100644 board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/orangepi/orangepi-zero2w/patches/linux-headers/linux-headers.hash create mode 100644 board/orangepi/orangepi-zero2w/patches/linux/linux.hash create mode 100644 board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash create mode 100644 board/orangepi/orangepi-zero2w/readme.txt create mode 100644 configs/orangepi_zero2w_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c2d3f52a596..3b19665a842 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2800,11 +2800,13 @@ F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ F: board/orangepi/orangepi-zero-plus2/ +F: board/orangepi/orangepi-zero2w/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig F: configs/orangepi_zero_plus2_defconfig +F: configs/orangepi_zero2w_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ diff --git a/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..c9d043c46f1 --- /dev/null +++ b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz diff --git a/board/orangepi/orangepi-zero2w/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-zero2w/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/orangepi/orangepi-zero2w/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-zero2w/patches/linux/linux.hash b/board/orangepi/orangepi-zero2w/patches/linux/linux.hash new file mode 100644 index 00000000000..5a6f308c7b1 --- /dev/null +++ b/board/orangepi/orangepi-zero2w/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9e723232d603ab45ebf043c34714c48f277ab195c29abcb8472f2a4c3a5a1995 linux-6.8.6.tar.xz diff --git a/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash b/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash new file mode 100644 index 00000000000..97a2b4eaf95 --- /dev/null +++ b/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/orangepi/orangepi-zero2w/readme.txt b/board/orangepi/orangepi-zero2w/readme.txt new file mode 100644 index 00000000000..84796579da8 --- /dev/null +++ b/board/orangepi/orangepi-zero2w/readme.txt @@ -0,0 +1,32 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the OrangePi Zero2W. Current configuration will +bring-up the board and allow access through the serial console. + +Orangepi Zero 2W links: +- http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-2W.html +- https://linux-sunxi.org/Xunlong_Orange_Pi_Zero2W + +How to build +============ + + $ make orangepi_zero2w_defconfig + $ make + +Note: you will need access to the internet to download the required sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Orangepi Zero2W and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/orangepi_zero2w_defconfig b/configs/orangepi_zero2w_defconfig new file mode 100644 index 00000000000..4d8f25f4513 --- /dev/null +++ b/configs/orangepi_zero2w_defconfig @@ -0,0 +1,58 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero2w/patches" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero2w" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.6" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero2w" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero2W" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +# BR2_TARGET_ROOTFS_TAR is not set + +# host tools +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# image scripts +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From 6fe29e41ccd6682bca48b0d9d206ae3a631339f0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 21:08:21 +0200 Subject: [PATCH 0617/3013] package/liburiparser: security bump to version 0.9.8 - Fixed: [CVE-2024-34402] Protect against integer overflow in ComposeQueryEngine - Fixed: [CVE-2024-34403] Protect against integer overflow in ComposeQueryMallocExMm https://github.com/uriparser/uriparser/blob/uriparser-0.9.8/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 73b4ec6867c..f2e33178974 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1ddae35cb3cc2c36e8199829d46f1c7f8b222e74a723fdae67ec8561e1ac5a39 uriparser-0.9.7.tar.xz +sha256 1d71c054837ea32a31e462bce5a1af272379ecf511e33448e88100b87ff73b2e uriparser-0.9.8.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index 6d25b1d9bbe..b0ba8c387bd 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.7 +LIBURIPARSER_VERSION = 0.9.8 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause From 36b06928c8d63ef82cc785aaa72c5818c8dec0bc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 21:00:44 +0200 Subject: [PATCH 0618/3013] package/libutempter: do not hardcode PIE PIE will be set by buildroot if the user wants it so set {COMPILE,LINK}_PIE to an empty value to fix the following build failure raised since the addition of the package in commit 02c818bc5c7a6967a212f12e4caa8ccdfa0b452b: /home/buildroot/autobuild/run/instance-3/output-1/host/bin/m68k-linux-gcc -W -Wall -Waggregate-return -Wcast-align -Wconversion -Wdisabled-optimization -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -std=gnu99 -DLIBEXECDIR=\"/usr/lib\" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wl,-z,relro -Wl,-stats -fPIE -pie -Wl,-z,now utempter.c -o utempter [...] /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/12.3.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/Scrt1.o: in function `lib_main': (.text+0x4): undefined reference to `__shared_flat_add_library' Fixes: 02c818bc5c7a6967a212f12e4caa8ccdfa0b452b - http://autobuild.buildroot.org/results/3a5581fd4edf56bbdc48ab111a2351fc70f1c703 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libutempter/libutempter.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libutempter/libutempter.mk b/package/libutempter/libutempter.mk index d51f70049cc..aad98126f79 100644 --- a/package/libutempter/libutempter.mk +++ b/package/libutempter/libutempter.mk @@ -11,7 +11,8 @@ LIBUTEMPTER_LICENSE = LGPL-2.1+ LIBUTEMPTER_LICENSE_FILES = COPYING define LIBUTEMPTER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + COMPILE_PIE= LINK_PIE= endef define LIBUTEMPTER_INSTALL_STAGING_CMDS From 314e9549a4533cf94707cf0c1736dcbf5b0266ac Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:51 -0500 Subject: [PATCH 0619/3013] boot/optee-os: bump to release v4.2.0 Bump OP-TEE to the latest tagged release Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 4 ++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 75bf00d4509..34ea9931367 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "4.0.0" + bool "4.2.0" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help @@ -70,7 +70,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "4.0.0" if BR2_TARGET_OPTEE_OS_LATEST + default "4.2.0" if BR2_TARGET_OPTEE_OS_LATEST default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 1f13931ca20..663640b2cec 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/4.0.0/optee-os-4.0.0.tar.gz -sha256 2c2c9525b36c96dfad6216520721b8e9663e6cacc61d0108a0c8bffc0ea175f1 optee-os-4.0.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/4.2.0/optee-os-4.2.0.tar.gz +sha256 ce70f0d177001bf4855cd6cd6396f515af6126e4bba9b12c716a437a5cb40c7b optee-os-4.2.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From b95b7752930356775dd19d6f30088c84feff0f11 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:52 -0500 Subject: [PATCH 0620/3013] boot/uboot: bump to version v2024.04 Update to the latest tagged release of U-Boot Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 6 +++--- boot/uboot/uboot.hash | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index ba959641390..d0901edc9d7 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2024.01" + bool "2024.04" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2024.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2024.04" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -279,7 +279,7 @@ config BR2_TARGET_UBOOT_USE_BINMAN help Use binman tool for generation and signing of boot images. - https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + https://docs.u-boot.org/en/v2024.04/develop/package/binman.html menu "U-Boot binary format" diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index fbe5d215409..a8021fb696b 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From 7ff2c03287302213968e00b54e5b7a4e79238fcb Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:53 -0500 Subject: [PATCH 0621/3013] boot/ti-k3-r5-loader: bump to version v2024.04 The ti-k3-r5-loader is just U-Boot with a different defconfig compiled for the 32b MCU cores needed for TI's K3 generation of SoCs. Update to match the U-Boot version Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index a6cc16a0c30..c276528fad5 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -17,7 +17,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2024.01" + bool "2024.04" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -61,7 +61,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.04" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index fbe5d215409..a8021fb696b 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From ae6d1f7375534351440b2b151721cb9eb8d5bca8 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:54 -0500 Subject: [PATCH 0622/3013] boot/ti-k3-boot-firmware: bump to version 09.02.00.009 The 09.02.00.009 release of ti-linux-firmware has the latest updates to TI's TIFS, DM and DMSC firmware needed for the K3 generation of processors. Update to pull in these latest updates. Reviewed-by: Heiko Thiery Tested-by: Andreas Dannenberg Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 2 +- boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash index 95131180ef4..2398d02da25 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61 LICENSE.ti -sha256 6032a258ce731d987576115f5de44c677a6b0cf8bddcd61a9a2852928bdfff92 ti-linux-firmware-08.06.00.006.tar.xz +sha256 ae888a0a22f8c5b8fe841236d6e40bb2f821d9a4161dab6924fd989e1467ef0e ti-linux-firmware-09.02.00.009.tar.xz diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk index 1f8ade207c1..9332732ad4a 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -4,9 +4,7 @@ # ################################################################################ -# The hash 340194800a581baf976360386dfc7b5acab8d948 defined in the -# Makefile of ti-k3-image-gen corresponds to the tag 08.06.00.006. -TI_K3_BOOT_FIRMWARE_VERSION = 08.06.00.006 +TI_K3_BOOT_FIRMWARE_VERSION = 09.02.00.009 TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES From 33e092f8bb0db1000718d9a78ccccf0534382b08 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:55 -0500 Subject: [PATCH 0623/3013] configs/ti_am62x_sk_defconfig: update TFA to v2.10 Update the TFA firmware to the latest LTS tag for v2.10 release of arm-trusted-firmware Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- configs/ti_am62x_sk_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 74fe35c9bc7..8f60864fbf6 100644 --- a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz +sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 84a409fc3b1..3ce48629996 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y From c1fdfc00dbaaceb2d4b6ae29e50c20992bed7292 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:56 -0500 Subject: [PATCH 0624/3013] configs/ti_am64x_sk_defconfig: update TFA to v2.10 Update the TFA firmware to the latest LTS tag for v2.10 release of arm-trusted-firmware Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- configs/ti_am64x_sk_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 74fe35c9bc7..8f60864fbf6 100644 --- a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz +sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 8dbe0fae330..bd576d90bbc 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y From cc2910a7dbd331ae0ad6a8f06ce7cd0559a1ebe1 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:57 -0500 Subject: [PATCH 0625/3013] configs/ti_am62x_sk_defconfig: update U-Boot to v2024.04 Bump to the latest release from U-Boot Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 3ce48629996..51e8793a663 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -27,12 +27,12 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 7efd75867cd84926b7aa6524e0a41c50c32b20e1 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:58 -0500 Subject: [PATCH 0626/3013] configs/ti_am64x_sk_defconfig: update U-Boot to v2024.04 Bump to the latest release from U-Boot Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- configs/ti_am64x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index bd576d90bbc..dc53d8f141e 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -27,12 +27,12 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 1f5fd13567a6ecfbb91f832ce2e20d50337dcd86 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:26:59 -0500 Subject: [PATCH 0627/3013] configs/ti_am62x_sk_defconfig: bump kernel to v6.8.8 Update to the latest kernel to pull in the latest bug fixes and features for TI's SoCs and reference boards Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- board/ti/am62x-sk/patches/linux/linux.hash | 2 +- configs/ti_am62x_sk_defconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash index cedae67f33f..2e9aad399eb 100644 --- a/board/ti/am62x-sk/patches/linux/linux.hash +++ b/board/ti/am62x-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz +sha256 1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba linux-6.8.8.tar.xz diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 51e8793a663..36052dba407 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.8" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From deede5e9dee8ba34a15919e95385cae1847d72b4 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:27:00 -0500 Subject: [PATCH 0628/3013] configs/ti_am64x_sk_defconfig: update kernel to v6.8.8 Update to the latest kernel to pull in the latest bug fixes and features for TI's SoCs and reference boards Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- board/ti/am64x-sk/patches/linux/linux.hash | 2 +- configs/ti_am64x_sk_defconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/ti/am64x-sk/patches/linux/linux.hash b/board/ti/am64x-sk/patches/linux/linux.hash index cedae67f33f..2e9aad399eb 100644 --- a/board/ti/am64x-sk/patches/linux/linux.hash +++ b/board/ti/am64x-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz +sha256 1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba linux-6.8.8.tar.xz diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index dc53d8f141e..1e8b8c9c022 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.8" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" From 35c7cc56441ea58834201c7d08026e05209fc1e9 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 2 May 2024 11:27:01 -0500 Subject: [PATCH 0629/3013] DEVELOPERS: add myself to TI's packages and reference boards Add myself to the DEVELOPERS files to help review patches related to TI's reference boards. Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3b19665a842..1c5ad1e42a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -551,6 +551,13 @@ F: package/vmtouch/ N: Brock Williams F: package/pdmenu/ +N: Bryan Brattlof +F: board/ti/ +F: boot/ti-k3-boot-firmware/ +F: boot/ti-k3-r5-loader/ +F: configs/ti_am62x_sk_defconfig +F: configs/ti_am64x_sk_defconfig + N: Carlo Caione F: package/jailhouse/ F: package/sunxi-boards/ From bbcf02c7ff586a110a576a85b9634b5f11eb6ee3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 22:02:06 +0200 Subject: [PATCH 0630/3013] package/pppd: add linux-pam optional dependency linux-pam is an optional dependency which is enbled by default since bump to version 2.5.0 in commit 0c15169f5ae57d88a77df34cc896044a37c9597b and https://github.com/ppp-project/ppp/commit/2883dd07101bf851e2ea368f0c04c91aea85cff2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pppd/pppd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 616b843e3d2..0a1eaf92095 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -17,6 +17,13 @@ PPPD_AUTORECONF = YES PPPD_INSTALL_STAGING = YES PPPD_CONF_OPTS = --enable-multilink +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +PPPD_CONF_OPTS += --with-pam=$(STAGING_DIR)/usr +PPPD_DEPENDENCIES += linux-pam +else +PPPD_CONF_OPTS += --without-pam +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) PPPD_CONF_OPTS += \ --enable-eaptls \ From 274eaa6c4087f8582966e6d6bf22f86497a67bdb Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 6 May 2024 22:08:56 +0200 Subject: [PATCH 0631/3013] configs/olimex_imx233_olinuxino: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_imx233_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index 275dd98afe5..647292899ef 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -14,7 +14,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.83" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino" BR2_TARGET_UBOOT_FORMAT_SD=y From 1e3cc620b4320aa045b3e23c6111171489437b29 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 6 May 2024 22:08:57 +0200 Subject: [PATCH 0632/3013] configs/olimex_imx233_olinuxino: configure eth0 with DHCP Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_imx233_olinuxino_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index 647292899ef..7049cfeac1a 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -7,6 +7,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" +BR2_SYSTEM_DHCP="eth0" # For automatic firmware loading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y From 20817818333acb9bbfb22b4b194a1b36fadf7648 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 6 May 2024 22:08:58 +0200 Subject: [PATCH 0633/3013] configs/olimex_imx233_olinuxino: add hashes for Linux & U-Boot and enable BR2_DOWNLOAD_FORCE_CHECK_HASHES Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../imx233_olinuxino/patches/linux-headers/linux-headers.hash | 1 + board/olimex/imx233_olinuxino/patches/linux/linux.hash | 2 ++ board/olimex/imx233_olinuxino/patches/uboot/uboot.hash | 2 ++ configs/olimex_imx233_olinuxino_defconfig | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) create mode 120000 board/olimex/imx233_olinuxino/patches/linux-headers/linux-headers.hash create mode 100644 board/olimex/imx233_olinuxino/patches/linux/linux.hash create mode 100644 board/olimex/imx233_olinuxino/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 44d4250e14e..33d2b011aed 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -262,7 +262,6 @@ configs/olimex_a20_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash configs/olimex_a20_olinuxino_micro_defconfig lib_defconfig.ForceCheckHash configs/olimex_a33_olinuxino_defconfig lib_defconfig.ForceCheckHash configs/olimex_a64_olinuxino_defconfig lib_defconfig.ForceCheckHash -configs/olimex_imx233_olinuxino_defconfig lib_defconfig.ForceCheckHash configs/olimex_stmp157_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash configs/olpc_xo175_defconfig lib_defconfig.ForceCheckHash configs/olpc_xo1_defconfig lib_defconfig.ForceCheckHash diff --git a/board/olimex/imx233_olinuxino/patches/linux-headers/linux-headers.hash b/board/olimex/imx233_olinuxino/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/olimex/imx233_olinuxino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/olimex/imx233_olinuxino/patches/linux/linux.hash b/board/olimex/imx233_olinuxino/patches/linux/linux.hash new file mode 100644 index 00000000000..1dba724d0c4 --- /dev/null +++ b/board/olimex/imx233_olinuxino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 88b69611093613ce4494527685f833af0c31b986dcbeda7086f69f18f9e0b190 linux-6.1.83.tar.xz diff --git a/board/olimex/imx233_olinuxino/patches/uboot/uboot.hash b/board/olimex/imx233_olinuxino/patches/uboot/uboot.hash new file mode 100644 index 00000000000..c1aeddf06c0 --- /dev/null +++ b/board/olimex/imx233_olinuxino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index 7049cfeac1a..d45c55ada37 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -5,6 +5,10 @@ BR2_arm926t=y # Linux headers same as kernel, a 6.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Build +BR2_GLOBAL_PATCH_DIR="board/olimex/imx233_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_SYSTEM_DHCP="eth0" From aae8ebc9a5a0bc997d2ab986623f7b0fd9d86f85 Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Tue, 30 Apr 2024 22:37:08 +0200 Subject: [PATCH 0634/3013] package/snmppp: bump to version 3.5.1 Drop non-v3 fix patch as this was upstreamed Signed-off-by: Jesse Van Gavere Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../snmppp/0001-fix-build-without-v3.patch | 43 ------------------- package/snmppp/snmppp.hash | 2 +- package/snmppp/snmppp.mk | 2 +- 4 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 package/snmppp/0001-fix-build-without-v3.patch diff --git a/.checkpackageignore b/.checkpackageignore index 33d2b011aed..2118269003e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1466,7 +1466,6 @@ package/smcroute/S41smcroute NotExecutable lib_sysv.Indent lib_sysv.Variables package/smstools3/0001-fix-Makefile.patch lib_patch.Upstream package/smstools3/0002-fix-build-with-gcc-10.x.patch lib_patch.Upstream package/smstools3/S50smsd Shellcheck lib_sysv.Variables -package/snmppp/0001-fix-build-without-v3.patch lib_patch.Upstream package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch lib_patch.Upstream package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch lib_patch.Upstream package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch lib_patch.Upstream diff --git a/package/snmppp/0001-fix-build-without-v3.patch b/package/snmppp/0001-fix-build-without-v3.patch deleted file mode 100644 index 4e81f7bfc15..00000000000 --- a/package/snmppp/0001-fix-build-without-v3.patch +++ /dev/null @@ -1,43 +0,0 @@ -fix build without v3 - -Fix the following build failure without version3 raised since version -3.5.0: - -msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()': -msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'? - 263 | if (m_target->get_version() == version3) { - | ^~~~~~~~ - | version1 - -Fixes: - - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to katz.agentpp.com@magenta.de] - -diff -Nura snmp++-3.5.0.orig/src/msgqueue.cpp snmp++-3.5.0/src/msgqueue.cpp ---- snmp++-3.5.0.orig/src/msgqueue.cpp 2023-03-20 10:49:30.629000853 +0100 -+++ snmp++-3.5.0/src/msgqueue.cpp 2023-03-20 10:51:36.880664304 +0100 -@@ -260,18 +260,20 @@ - m_target->set_retry(m_target->get_retry() - 1); - SetSendTime(); - int status; -- if (m_target->get_version() == version3) { - #ifdef _SNMPv3 -+ if (m_target->get_version() == version3) { - // delete entry in cache - if (m_snmp->get_mpv3()) - m_snmp->get_mpv3()->delete_from_cache(m_pdu.get_request_id()); --#endif - status = m_snmp->snmp_engine(m_pdu, m_pdu.get_error_status(), m_pdu.get_error_index(), - *m_target, m_callBack, m_callData, m_socket, 0, this); - } - else { -+#endif - status = send_snmp_request(m_socket, m_rawPdu, m_rawPduLen, *m_address); -+#ifdef _SNMPv3 - } -+#endif - if (status != 0) - return SNMP_CLASS_TL_FAILED; - diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 74c6a3e98f2..b66056ef40b 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 43a433bd5f6fd67add5a26add6521ca664c41aead438405658ed57483664b4bf snmp++-3.5.0.tar.gz +sha256 034553f7cb75d7ce1fe70cb3ba06e88587b6bca4fa062d10344ce4555a1395f7 snmp++-3.5.1.tar.gz sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 9f1916dd662..966bb340fd3 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.5.0 +SNMPPP_VERSION = 3.5.1 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf From 8937cd065cb4004d9eade7e75ec808fc2400ba4b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 Apr 2024 22:47:43 +0200 Subject: [PATCH 0635/3013] support/testing: TestPerlDBDmysql: use ext2 instead of cpio The CPIO filesystem generated by TestPerlDBDmysql is too large, and doesn't fit as an initramfs in the 256MB of RAM available in the versatilepb machine. This causes a failure while running a basic test "perl -MDBI -e '1'" since "/usr/lib/perl5", and many files being missing from the root filesystem, ultimately causing the test to fail. Can't locate DBI.pm in @INC (you may need to install the DBI module) (@INC entries checked: /usr/lib/perl5/site_perl/5.38.2/arm-linux /usr/lib/perl5/site_perl/5.38.2 /usr/lib/perl5/5.38.2/arm-linux /usr/lib/perl5/5.38.2). It would make sense to switch all test cases to use ext2 + a hard-drive, but for now, let's fix the few test cases that are causing problems. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6735654506 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_perl_dbd_mysql.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/support/testing/tests/package/test_perl_dbd_mysql.py b/support/testing/tests/package/test_perl_dbd_mysql.py index f8fe832b41e..93551b420fa 100644 --- a/support/testing/tests/package/test_perl_dbd_mysql.py +++ b/support/testing/tests/package/test_perl_dbd_mysql.py @@ -1,4 +1,5 @@ from tests.package.test_perl import TestPerlBase +import os class TestPerlDBDmysql(TestPerlBase): @@ -13,8 +14,18 @@ class TestPerlDBDmysql(TestPerlBase): """ BR2_PACKAGE_PERL=y BR2_PACKAGE_PERL_DBD_MYSQL=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" """ + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() + def test_run(self): self.login() self.module_test("DBI") From cefcd5bbadf2a8c8cb8c97049a478964ebddb95e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 Apr 2024 22:47:44 +0200 Subject: [PATCH 0636/3013] package/perl-dbd-mysql: fix runtime issue with MariaDB Now that the TestPerlDBDmysql can be run normally, a new runtime issue appear due to switch from oracle-mysql to MariaDB: # perl -MDBI -e '1' # echo $? 0 # perl -MDBD::mysql -e '1' Can't load '/usr/lib/perl5/site_perl/5.38.2/arm-linux/auto/DBD/mysql/mysql.so' for module DBD::mysql: /usr/lib/perl5/site_perl/5.38.2/arm-linux/auto/DBD/mysql/mysql.so: undefined symbol: net_buffer_length at /usr/lib/perl5/5.38.2/arm-linux/DynaLoader.pm line 206. This is fixed by an upstream commit [1] from 4.046_01 release. [1] https://github.com/perl5-dbi/DBD-mysql/commit/0f0cebe87fab335873fd3701bc304922da826940 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6735654506 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...net_buffer_length-macro-if-available.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch diff --git a/package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch b/package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch new file mode 100644 index 00000000000..d7767c1f42e --- /dev/null +++ b/package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch @@ -0,0 +1,41 @@ +From 9189ef77679c22de3bbd2142031858373236520b Mon Sep 17 00:00:00 2001 +From: Michiel Beijen +Date: Fri, 23 Feb 2018 07:52:33 +0000 +Subject: [PATCH] Use net_buffer_length macro if available + +Upstream: https://github.com/perl5-dbi/DBD-mysql/commit/0f0cebe87fab335873fd3701bc304922da826940 + +(cherry picked from commit 0f0cebe87fab335873fd3701bc304922da826940) +Signed-off-by: Romain Naour +--- + mysql.xs | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/mysql.xs b/mysql.xs +index 8edee55..9b4d60f 100644 +--- a/mysql.xs ++++ b/mysql.xs +@@ -819,15 +819,14 @@ dbd_mysql_get_info(dbh, sql_info_type) + retsv = newSVpvn("`", 1); + break; + case SQL_MAXIMUM_STATEMENT_LENGTH: +-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 +- /* MariaDB 10 is not MySQL source level compatible so this +- only applies to MySQL*/ +- /* mysql_get_option() was added in mysql 5.7.3 */ +- /* MYSQL_OPT_NET_BUFFER_LENGTH was added in mysql 5.7.9 */ ++ /* net_buffer_length macro is not defined in MySQL 5.7 and some MariaDB ++ versions - if it is not available, use newer mysql_get_option */ ++#if !defined(net_buffer_length) ++ ; ++ unsigned long buffer_len; + mysql_get_option(NULL, MYSQL_OPT_NET_BUFFER_LENGTH, &buffer_len); + retsv = newSViv(buffer_len); + #else +- /* before mysql 5.7.9 use net_buffer_length macro */ + retsv = newSViv(net_buffer_length); + #endif + break; +-- +2.44.0 + From e379f1c5dd51d46ce4f5979e5efcae09538b7e1f Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 1 May 2024 11:53:05 +0900 Subject: [PATCH 0637/3013] package/flannel: bump to version 0.25.1 Signed-off-by: Geoff Levand Signed-off-by: Thomas Petazzoni --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index c1ceeed9e81..97700d37ec5 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f9e68bc9c5b41ee7f721a754c9fa4eddf3da775faa9e638581a564e33b3fabcf flannel-0.24.2.tar.gz +sha256 c0de130efa2b14bc0f057a17df07bfd61154b30ce4a5eca24594c5b533ce661d flannel-0.25.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 02e62256cf1..aa246447643 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANNEL_VERSION = 0.24.2 +FLANNEL_VERSION = 0.25.1 FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 From 0f5bb364c629dd7fc91f4295f872e46d89c0feef Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Mon, 29 Apr 2024 20:04:41 +0300 Subject: [PATCH 0638/3013] package/sdbus-cpp: bump to version 2.0.0 Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v2.0.0 Signed-off-by: Sergey Bobrenok Signed-off-by: Thomas Petazzoni --- package/sdbus-cpp/sdbus-cpp.hash | 2 +- package/sdbus-cpp/sdbus-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index b5ca7ecdffb..1350fc6781d 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 577986929f911320fb9ef6a3e2badd464dc38411ebc25d2966f5cb85c39f0897 sdbus-cpp-1.5.0.tar.gz +sha256 88af4569161a0d0192f0f4a94582a1af4e75722499d06984fb7f91f638f5afb3 sdbus-cpp-2.0.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 18fc6a88a96..675ed1fa1fe 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.5.0 +SDBUS_CPP_VERSION = 2.0.0 SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd From 1a2564e6880b70256c850a3fb54e9ec77d109d58 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 May 2024 17:05:07 +0200 Subject: [PATCH 0639/3013] package/libjwt: add CPE variables cpe:2.3:a:bencollins:jwt_c_library is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6335E595-6F38-4837-83BB-C78B687BB75B Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libjwt/libjwt.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 1643aa7b7a4..8929904d104 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -11,6 +11,8 @@ LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +LIBJWT_CPE_ID_VENDOR = bencollins +LIBJWT_CPE_ID_PRODUCT = jwt_c_library LIBJWT_CONF_OPTS = --without-examples ifeq ($(BR2_PACKAGE_OPENSSL),y) From 7e6098f9b487c5bc8ee6a36b5e14964c98ad2cb9 Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Thu, 2 May 2024 07:55:16 +0300 Subject: [PATCH 0640/3013] package/uclibc: bump to 1.0.48 - The 1.0.48 release of uClibc-ng includes the fix for the SPARC related issue discussed at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 - The hash for COPYING.LIB was changed because '^L' (0x0C) characters were removed from COPYING.LIB in uClibc-ng repo. Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.hash | 6 +++--- package/uclibc/uclibc.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index a10ceab54cb..7097bbf99a5 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.47/uClibc-ng-1.0.47.tar.xz.sha256 -sha256 29a4d684a06da344ee3ee09acc2ca7649d592ae3ff848f698145c46def05efcb uClibc-ng-1.0.47.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.47/uClibc-ng-1.0.48.tar.xz.sha256 +sha256 3bf5fc6cc5cbc454b6c478424755c6f71e7c15578a2c966f02606aa5c5596e21 uClibc-ng-1.0.48.tar.xz # Locally calculated -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index a7b18133ff0..9593e18d45c 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.47 +UCLIBC_VERSION = 1.0.48 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From 6db46a67852acba97930fd43a372607b138700de Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Thu, 2 May 2024 07:55:17 +0300 Subject: [PATCH 0641/3013] arch/Config.in: allow building a buildroot toolchain on SPARC With this patch series we again allow building a Buildroot toolchain for SPARC, because SPARC was fixed in uClibc-ng, so SPARC systems work fine now. Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni --- arch/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index 9912f9fce68..e7349e83ae1 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -216,11 +216,6 @@ config BR2_sh config BR2_sparc bool "SPARC" select BR2_USE_MMU - # uClibc-ng broken on sparc due to recent gcc changes - # that need to be reverted since gcc 8.4, 9.3 and 10.1. - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 - # gcc <= 10.x has been removed from Buildroot. - select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT help SPARC (from Scalable Processor Architecture) is a RISC instruction set architecture (ISA) developed by Sun From 26f5efd7cd1f4074c5e8dcc77199ad78e6033fec Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 25 Apr 2024 20:32:12 +0300 Subject: [PATCH 0642/3013] package/linux-firmware: bump version to 20240410 Updated WHENCE hash due to various new entries for new blobs. Signed-off-by: Andy Shevchenko Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 5a19292a74c..6462112fea0 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 ab7caff09bbb9e68e2b8a7c3e86d32b65f6444caa4ef8b0aabca9503da2c678d linux-firmware-20240115.tar.xz +sha256 b7f231228439c4302be2dfb5014dad18f4a77d663a11667c08c7b8aea7580d99 linux-firmware-20240410.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -38,6 +38,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 92d477fe15d81875bc5bcc4c54df7e95b65f42e4c44d64d840f39cd0aa153d6f WHENCE +sha256 77a4c5cacd61e58b47af61a6bf636f7fc37b626647a2a406210ac61d0ddd9aef WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 7e1e5cf6f26..0821816246d 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20240115 +LINUX_FIRMWARE_VERSION = 20240410 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES From 9b25246e9b731f167454ba4f8182eed1926f50a6 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 25 Apr 2024 20:32:13 +0300 Subject: [PATCH 0643/3013] package/linux-firmware: Add Intel AtomISP v2 firmwares Many of Intel based tablets (and all phones that were designed with Intel SoCs) have Intel AtomISP v2 engine. Add an entry for recently added firmwares for them. Signed-off-by: Andy Shevchenko Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 6 ++++++ package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 920c0a2ef16..ce0b88ad6c2 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -637,6 +637,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CX23885 Firmware files for Conexant Cx23885/7/8 PCIe broadcast A/V decoder needed by the Linux CX23885 driver. +config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_ATOMISP + bool "Intel AtomISP v2" + help + Firmware files for Intel AtomISP v2 (also know as IPU2) + needed by the Linux AtomISP v2 driver. + endmenu endif diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 0821816246d..84c96d2216b 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -846,6 +846,12 @@ LINUX_FIRMWARE_FILES += v4l-cx23885-avcore-01.fw # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_ATOMISP),y) +LINUX_FIRMWARE_FILES += intel/ipu/shisp_2400b0_v21.bin +LINUX_FIRMWARE_FILES += intel/ipu/shisp_2401a0_v21.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ivsc +endif + ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) define LINUX_FIRMWARE_BUILD_CMDS From a3ee47ef22f4035d715461e98ff8a2c4f76735ea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 22:23:04 +0200 Subject: [PATCH 0644/3013] package/suricata: fix static build Fix the following static build failure raised since bump to version version 6.0.14 in commit ce17f93e828a07292e03653be04a49480250f23f and https://github.com/OISF/suricata/commit/31ba4fd1522dd0d7f933767b9205c67a4e726fe5: configure:22378: checking for pcap_open_dead in -lpcap configure:22407: /home/buildroot/autobuild/run/instance-3/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -static -std=c11 -march=native -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -rdynamic conftest.c -lpcap -ljansson -lpthread -lyaml -lpcre -latomic -lz >&5 /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/12.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libpcap.a(pcap-linux.o): in function `nl80211_init': pcap-linux.c:(.text+0xc34): undefined reference to `nl_socket_alloc' [...] checking for pcap_open_dead in -lpcap... no Fixes: ce17f93e828a07292e03653be04a49480250f23f - http://autobuild.buildroot.org/results/9e25c2508bd4100d2d1d3180e79060d762361213 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-configure.ac-fix-static-build.patch | 52 +++++++++++++++++++ package/suricata/suricata.mk | 1 + 2 files changed, 53 insertions(+) create mode 100644 package/suricata/0002-configure.ac-fix-static-build.patch diff --git a/package/suricata/0002-configure.ac-fix-static-build.patch b/package/suricata/0002-configure.ac-fix-static-build.patch new file mode 100644 index 00000000000..fc5384a1145 --- /dev/null +++ b/package/suricata/0002-configure.ac-fix-static-build.patch @@ -0,0 +1,52 @@ +From 6e1d8aceea8c4e49f00d8e630b681641a36c688f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 6 May 2024 09:31:05 +0200 +Subject: [PATCH] configure.ac: fix static build + +static build is broken since +https://github.com/OISF/suricata/commit/31ba4fd1522dd0d7f933767b9205c67a4e726fe5 +because AC_CHECK_LIB is called before PKG_CHECK_MODULES: + +configure:22378: checking for pcap_open_dead in -lpcap +configure:22407: /home/buildroot/autobuild/run/instance-3/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -static -std=c11 -march=native -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -rdynamic conftest.c -lpcap -ljansson -lpthread -lyaml -lpcre -latomic -lz >&5 +/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/12.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libpcap.a(pcap-linux.o): in function `nl80211_init': +pcap-linux.c:(.text+0xc34): undefined reference to `nl_socket_alloc' + +[...] + +checking for pcap_open_dead in -lpcap... no + +Fixes: + - http://autobuild.buildroot.org/results/9e25c2508bd4100d2d1d3180e79060d762361213 + +Signed-off-by: Fabrice Fontaine +Upstream: https://redmine.openinfosecfoundation.org/issues/7008 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 232ee9bed..6277cb9b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1219,6 +1219,8 @@ + fi + fi + ++ PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[:]) ++ + if test "$have_wpcap" != "yes"; then + AC_CHECK_LIB(pcap, pcap_open_dead, [], [ + echo +@@ -1234,8 +1236,6 @@ + PCAP_LIB_NAME="pcap" + fi + +- PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[:]) +- + AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no") + if test "$HAVE_PCAP_CONFIG" = "no" -o "$cross_compiling" = "yes"; then + AC_MSG_RESULT(no pcap-config is use) +-- +2.43.0 + diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 2083e0cabac..e60ed2fce8a 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -10,6 +10,7 @@ SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE SURICATA_CPE_ID_VENDOR = oisf # 0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch +# 0002-configure.ac-fix-static-build.patch SURICATA_AUTORECONF = YES SURICATA_DEPENDENCIES = \ From be3252fe01f39f8ac21d611861bd0c5dda58b09f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 22:52:49 +0200 Subject: [PATCH 0645/3013] package/openocd: fix build with libgpiod2 openocd is not compatible with libgpiod2 resulting in the following build failure since the addition of libgpiod2 in commit 57391fad2e619395340b81957ddceab1b1df2e20: src/jtag/drivers/linuxgpiod.c: In function 'helper_get_line': src/jtag/drivers/linuxgpiod.c:283:19: error: 'GPIOD_LINE_REQUEST_DIRECTION_INPUT' undeclared (first use in this function); did you mean 'GPIOD_LINE_DIRECTION_INPUT'? 283 | int dir = GPIOD_LINE_REQUEST_DIRECTION_INPUT, flags = 0, val = 0, retval; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | GPIOD_LINE_DIRECTION_INPUT Fixes: 57391fad2e619395340b81957ddceab1b1df2e20 - http://autobuild.buildroot.org/results/7195e8b76350f26ab3b963702d88b254512e6928 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/openocd/openocd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 78c6e10c58e..b24d1eacf0b 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -56,8 +56,14 @@ OPENOCD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ $(if $(BR2_PACKAGE_LIBHID),libhid) \ - $(if $(BR2_PACKAGE_HIDAPI),hidapi) \ - $(if $(BR2_PACKAGE_LIBGPIOD),libgpiod) + $(if $(BR2_PACKAGE_HIDAPI),hidapi) + +ifeq ($(BR2_PACKAGE_LIBGPIOD),y) +OPENOCD_DEPENDENCIES += libgpiod +OPENOCD_CONF_OPTS += --enable-linuxgpiod +else +OPENOCD_CONF_OPTS += --disable-linuxgpiod +endif # Adapters OPENOCD_CONF_OPTS += \ From e0066bcb851b730f0517b5d5712a9e49b4296c7d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 23:03:48 +0200 Subject: [PATCH 0646/3013] package/mdadm: fix uclibc and musl build Fix following uclibc build failure raised since bump to version 4.3 in commit 99e9ff08d0705279532ca0cf3de22ea54660cbdc and https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=577fd10486d8d1472a6b559066f344ac30a3a391: Create.c: In function 'write_zeroes_fork': Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) 155 | if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, | ^~~~~~~~~~~~~~~~~~~~ as well as the following musl build failure: util.c: In function 'get_md_name': util.c:1031:29: error: 'NAME_MAX' undeclared (first use in this function); did you mean 'MD_NAME_MAX'? 1031 | static char devname[NAME_MAX]; | ^~~~~~~~ | MD_NAME_MAX util.c:1031:29: note: each undeclared identifier is reported only once for each function it appears in /home/buildroot/instance-0/output-1/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -DNO_LIBUDEV -DSendmail=\""/usr/sbin/sendmail -t"\" -DCONFFILE=\"/etc/mdadm.conf\" -DCONFFILE2=\"/etc/mdadm/mdadm.conf\" -DMAP_DIR=\"/run/mdadm\" -DMAP_FILE=\"map\" -DMDMON_DIR=\"/run/mdadm\" -DFAILED_SLOTS_DIR=\"/run/mdadm/failed-slots\" -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DBINDIR=\"/sbin\" -o Monitor.o -c Monitor.c /home/buildroot/instance-0/output-1/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -DNO_LIBUDEV -DSendmail=\""/usr/sbin/sendmail -t"\" -DCONFFILE=\"/etc/mdadm.conf\" -DCONFFILE2=\"/etc/mdadm/mdadm.conf\" -DMAP_DIR=\"/run/mdadm\" -DMAP_FILE=\"map\" -DMDMON_DIR=\"/run/mdadm\" -DFAILED_SLOTS_DIR=\"/run/mdadm/failed-slots\" -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DBINDIR=\"/sbin\" -o dlink.o -c dlink.c Create.c: In function 'write_zeroes_fork': Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) 155 | if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, | ^~~~~~~~~~~~~~~~~~~~ Fixes: 99e9ff08d0705279532ca0cf3de22ea54660cbdc - http://autobuild.buildroot.org/results/0e04bcdb591ca5642053e1f7e31384f06581e989 - http://autobuild.buildroot.org/results/c77ee2615e9d473e93d95c778648c7e897b7f234 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ts-h-include-for-NAME_MAX-definition.patch | 32 ++++++++++++++ .../0003-Create.c-fix-uclibc-build.patch | 42 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch create mode 100644 package/mdadm/0003-Create.c-fix-uclibc-build.patch diff --git a/package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch b/package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch new file mode 100644 index 00000000000..ceaf7f923ca --- /dev/null +++ b/package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch @@ -0,0 +1,32 @@ +From 8bda86099089b44129ef6206764f9de47a45f0db Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 12 Mar 2024 11:01:50 +0100 +Subject: util.c: add limits.h include for NAME_MAX definition + +Add limits.h include for NAME_MAX definition. + +Signed-off-by: Alexander Kanavin +Signed-off-by: Mariusz Tkaczyk + +Upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=8bda86099089b44129ef6206764f9de47a45f0db +Signed-off-by: Fabrice Fontaine +--- + util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.c b/util.c +index 05ad3343..49a9c6e2 100644 +--- a/util.c ++++ b/util.c +@@ -36,7 +36,7 @@ + #include + #include + #include +- ++#include + + /* + * following taken from linux/blkpg.h because they aren't +-- +cgit 1.2.3-korg + diff --git a/package/mdadm/0003-Create.c-fix-uclibc-build.patch b/package/mdadm/0003-Create.c-fix-uclibc-build.patch new file mode 100644 index 00000000000..c8399be0768 --- /dev/null +++ b/package/mdadm/0003-Create.c-fix-uclibc-build.patch @@ -0,0 +1,42 @@ +From 52bead95d2957437c691891fcdc49bd6afccdd49 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 12 Apr 2024 18:45:13 +0200 +Subject: Create.c: fix uclibc build + +Define FALLOC_FL_ZERO_RANGE if needed as FALLOC_FL_ZERO_RANGE is only +defined for aarch64 on uclibc-ng resulting in the following or1k build +failure since commit 577fd10486d8d1472a6b559066f344ac30a3a391: + +Create.c: In function 'write_zeroes_fork': +Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) + 155 | if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/0e04bcdb591ca5642053e1f7e31384f06581e989 + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Mariusz Tkaczyk +Upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=52bead95d2957437c691891fcdc49bd6afccdd49 +--- + Create.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Create.c b/Create.c +index 4397ff49..d94253b1 100644 +--- a/Create.c ++++ b/Create.c +@@ -32,6 +32,10 @@ + #include + #include + ++#ifndef FALLOC_FL_ZERO_RANGE ++#define FALLOC_FL_ZERO_RANGE 16 ++#endif ++ + static int round_size_and_verify(unsigned long long *size, int chunk) + { + if (*size == 0) +-- +cgit 1.2.3-korg + From 26b054083d36a0fb16340b10a9df239879a2c573 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 6 May 2024 23:30:38 +0200 Subject: [PATCH 0647/3013] package/python-rpds-py: bump to version 0.18.1 As reported by Antoine Coutant on the Buildroot mailing list [1]: rpds depends on the crate pyo3. This crate uses "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits targets. That leads to an error as reported by Buildroot Gitlab-ci. An issue have been opened on pyo3's github [2]. A fix have been accepted by pyo3 [3] and merged in pyo3 0.20.3 release [4]. This pyo3 0.20.3 uses crate portable-atomic [5] to provide atomic types and compare and swap operations for all targets that can use std. python-rpds-py 0.18.1 is the first release that use pyo3 0.20.3. Before python-rpds-py 0.18.1 release fixing this issue would require that we be able to patch a package during the Cargo vendoring step [6]. [1] http://lists.busybox.net/pipermail/buildroot/2024-February/684867.html [2]: https://github.com/PyO3/pyo3/issues/3614 [3]: https://github.com/PyO3/pyo3/pull/3619 [4]: https://github.com/PyO3/pyo3/blob/v0.20.3/CHANGELOG.md [5]: https://github.com/taiki-e/portable-atomic [6]: http://lists.busybox.net/pipermail/buildroot/2024-February/684886.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6783811842 (TestPythonPy3Dtschema) https://gitlab.com/buildroot.org/buildroot/-/jobs/6783811860 (TestPythonPy3FlaskExpectsJson) Reported-by: Antoine Coutant Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index 4650d9c385d..62b508ae6b9 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz +sha256 d9b542bf5321495737005a78d9fbf40541b898d1e2b3309cbe36a2431977be8b rpds_py-0.18.1.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index cee2ff290a4..c38f749521d 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.17.1 +PYTHON_RPDS_PY_VERSION = 0.18.1 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/2d/aa/e7c404bdee1db7be09860dff423d022ffdce9269ec8e6532cce09ee7beea PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From c3e17c407a39ee4d576540c86b4b3b0549e81136 Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Tue, 7 May 2024 07:15:48 +0300 Subject: [PATCH 0648/3013] configs/qemu_sparc_ss10: re-introduce defconfig - With uClibc-ng-1.0.48 we can restore this defconfig because uClibc-ng now provides the fix for SPARC. - The instructions in board/qemu/sparc-ss10/readme.txt are still valid without any corrections. The system boots properly ang the login prompt appears. Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 +++ .../qemu/sparc-ss10/patches/linux/linux.hash | 2 ++ configs/qemu_sparc_ss10_defconfig | 32 +++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 board/qemu/sparc-ss10/patches/linux/linux.hash create mode 100644 configs/qemu_sparc_ss10_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 1c5ad1e42a9..77971e03dbf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -846,6 +846,10 @@ F: package/wolftpm/ N: Dimitrios Siganos F: package/wireless-regdb/ +N: Dmitry Chestnykh +F: board/qemu/sparc-ss10/ +F: configs/qemu_sparc_ss10_defconfig + N: Dominik Faessler F: package/logsurfer/ diff --git a/board/qemu/sparc-ss10/patches/linux/linux.hash b/board/qemu/sparc-ss10/patches/linux/linux.hash new file mode 100644 index 00000000000..762f8575e7e --- /dev/null +++ b/board/qemu/sparc-ss10/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 1973e6fc3e8617fc8b0e24b33180449f1a39fa6a607f8dba61cf91b4c5bba466 linux-6.8.6.tar.gz diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig new file mode 100644 index 00000000000..67d6cf67f65 --- /dev/null +++ b/configs/qemu_sparc_ss10_defconfig @@ -0,0 +1,32 @@ +# Architecture +BR2_sparc=y +BR2_sparc_v8=y + +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/sparc-ss10/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y + +# Linux kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.6" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From 9b235e3cacb32b002a624cf47fb3393a875df968 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 7 May 2024 08:45:20 +0200 Subject: [PATCH 0649/3013] package/libgpiod2: drop host-autoconf-archive dependency host-autoconf-archive was added to libgpiod in commit 8df6ae3127ccdc0873df2246b32918e846b074c3 because of a patch to configure.ac. It is not needed by libgpiod2 as there is no patch since the addition of the package in commit 57391fad2e619395340b81957ddceab1b1df2e20 Fixes: 57391fad2e619395340b81957ddceab1b1df2e20 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libgpiod2/libgpiod2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libgpiod2/libgpiod2.mk b/package/libgpiod2/libgpiod2.mk index 9c478f1ffb6..856eb9bd14d 100644 --- a/package/libgpiod2/libgpiod2.mk +++ b/package/libgpiod2/libgpiod2.mk @@ -12,7 +12,7 @@ LIBGPIOD2_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD2_LICENSE = LGPL-2.1+ LIBGPIOD2_LICENSE_FILES = COPYING LIBGPIOD2_INSTALL_STAGING = YES -LIBGPIOD2_DEPENDENCIES = host-pkgconf host-autoconf-archive +LIBGPIOD2_DEPENDENCIES = host-pkgconf LIBGPIOD2_CONF_OPTS = \ --disable-bindings-python \ --disable-examples \ From c6ef948f298dcfe68942787c0ce5040105f65395 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Fri, 19 Apr 2024 09:12:41 +0300 Subject: [PATCH 0650/3013] package/libusbgx: bump to recent git version The current tagged version is more than 6 years old, and no new tags have been made upstream, so let's update to the latest git version. The current version contains many fixes and improvements and supports several new types of USB gadgets. The patch was a backport from upstream, so it can be dropped. Also, upstream has changed from https://github.com/libusbgx/libusbgx to https://github.com/linux-usb-gadgets/libusbgx: the former is a redirect to the latter. Signed-off-by: Alexander Shiyan Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-Add-include-of-sys-sysmacro.h.patch | 98 ------------------- package/libusbgx/Config.in | 2 +- package/libusbgx/libusbgx.hash | 2 +- package/libusbgx/libusbgx.mk | 4 +- 5 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2118269003e..3be4f6a1df1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -982,7 +982,6 @@ package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.pa package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch lib_patch.Upstream package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch lib_patch.Upstream package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch lib_patch.Upstream -package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch lib_patch.Upstream package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch lib_patch.Upstream package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch lib_patch.Upstream package/libwebsock/0002-fix-ssl.patch lib_patch.Upstream diff --git a/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch b/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch deleted file mode 100644 index 0f47454f7a3..00000000000 --- a/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 45c14ef4d5d7ced0fbf984208de44ced6d5ed898 Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Mon, 10 Sep 2018 15:52:09 +0200 -Subject: [PATCH] libusbgx: fix build with glibc-2.28 since - is no more included by - -Since https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html sys/sysmacros.h -must be explicitly included. -Without sys/sysmacros.h and with glibc-2.28 build fails with error like: -src/.libs/libusbgx.so: undefined reference to minor' src/.libs/libusbgx.so: undefined reference tomajor' -src/.libs/libusbgx.so: undefined reference to `makedev' - -Signed-off-by: Sid Spry -Signed-off-by: Gwenhael Goavec-Merou ---- - examples/gadget-acm-ecm.c | 1 + - examples/gadget-import.c | 1 + - examples/gadget-ms.c | 1 + - examples/show-gadgets.c | 1 + - examples/show-udcs.c | 1 + - include/usbg/usbg_internal_libconfig.h | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/examples/gadget-acm-ecm.c b/examples/gadget-acm-ecm.c -index 1c5e2ca..29360da 100644 ---- a/examples/gadget-acm-ecm.c -+++ b/examples/gadget-acm-ecm.c -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/examples/gadget-import.c b/examples/gadget-import.c -index e684fdb..63df449 100644 ---- a/examples/gadget-import.c -+++ b/examples/gadget-import.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - - int main(int argc, char **argv) -diff --git a/examples/gadget-ms.c b/examples/gadget-ms.c -index 478c370..a5c6681 100644 ---- a/examples/gadget-ms.c -+++ b/examples/gadget-ms.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/examples/show-gadgets.c b/examples/show-gadgets.c -index 707d448..a2a21c8 100644 ---- a/examples/show-gadgets.c -+++ b/examples/show-gadgets.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/examples/show-udcs.c b/examples/show-udcs.c -index 66e950f..2f5cc45 100644 ---- a/examples/show-udcs.c -+++ b/examples/show-udcs.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - - int main(void) -diff --git a/include/usbg/usbg_internal_libconfig.h b/include/usbg/usbg_internal_libconfig.h -index ac51758..3fa55c0 100644 ---- a/include/usbg/usbg_internal_libconfig.h -+++ b/include/usbg/usbg_internal_libconfig.h -@@ -12,6 +12,7 @@ - #ifndef USBG_INTERNAL_LIBCONFIG_H - #define USBG_INTERNAL_LIBCONFIG_H - -+#include - #include - #ifdef __cplusplus - extern "C" { --- -2.16.4 - diff --git a/package/libusbgx/Config.in b/package/libusbgx/Config.in index fcebf3cfaa9..09a2b8f15e1 100644 --- a/package/libusbgx/Config.in +++ b/package/libusbgx/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBUSBGX libusbgx is a C library encapsulating the kernel USB gadget-configfs userspace API functionality. - https://github.com/libusbgx/libusbgx + https://github.com/linux-usb-gadgets/libusbgx comment "libusbgx needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libusbgx/libusbgx.hash b/package/libusbgx/libusbgx.hash index dd43ec7b978..b18258978f3 100644 --- a/package/libusbgx/libusbgx.hash +++ b/package/libusbgx/libusbgx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 b15abc89a0ef82c6a650cc1d58b5ba50f7ce076db392add84caabcd86c608ee2 libusbgx-0.2.0.tar.gz +sha256 d0b483d8b190a75a1f9b52d6db229de5580c78b201077361a524cf32c5aad517 libusbgx-a5bfa81017a9b2064bc449cf74f5f9d106445f62.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/libusbgx/libusbgx.mk b/package/libusbgx/libusbgx.mk index 516ad259702..03e8dff6bb5 100644 --- a/package/libusbgx/libusbgx.mk +++ b/package/libusbgx/libusbgx.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUSBGX_VERSION = 0.2.0 -LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,libusbgx-v$(LIBUSBGX_VERSION)) +LIBUSBGX_VERSION = a5bfa81017a9b2064bc449cf74f5f9d106445f62 +LIBUSBGX_SITE = $(call github,linux-usb-gadgets,libusbgx,$(LIBUSBGX_VERSION)) LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig From 818b6270a845df43d03d85622d4dfc1d48248bf6 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Wed, 17 Apr 2024 11:13:21 -0700 Subject: [PATCH 0651/3013] package/batctl: update to 2023.1 to match batman-adv Although the kernel interface has not changed, it is convenient to have the batctl match the batman-adv version. So, bump the package to match 01ec4a39f5ceb83c62b0040067ba53197a0a6843 batman-adv bump. Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- package/batctl/batctl.hash | 6 +++--- package/batctl/batctl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/batctl/batctl.hash b/package/batctl/batctl.hash index 56bea3c5da2..7bc6fee67f7 100644 --- a/package/batctl/batctl.hash +++ b/package/batctl/batctl.hash @@ -1,6 +1,6 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.0/batctl-2021.0.tar.gz.sha1 -sha1 87d0bb34950cb70578a0ca5ce706513a8279a01c batctl-2021.0.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2023.1/batctl-2023.1.tar.gz.sha1 +sha1 8d899c6323e228b9b370caf28e6d67621cb7d35d batctl-2023.1.tar.gz # Locally calculated -sha256 9cec8bf1952f885192749a9dc0318a54633b717aaf05c438d504efd83f5201e4 batctl-2021.0.tar.gz +sha256 e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1 batctl-2023.1.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batctl/batctl.mk b/package/batctl/batctl.mk index 8ff591844de..197e4beb72a 100644 --- a/package/batctl/batctl.mk +++ b/package/batctl/batctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATCTL_VERSION = 2021.0 +BATCTL_VERSION = 2023.1 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h) BATCTL_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT From b34fa00d85df2b8905d0edd60a2d3863815b1a71 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 7 May 2024 09:30:06 +0200 Subject: [PATCH 0652/3013] Update for 2024.02.2 Signed-off-by: Peter Korsgaard (cherry picked from commit 0155095c558e915d6c5261a4d8cb4ec9ee9953a7) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 28 ++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 4b0cc082442..13ac1085490 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,31 @@ +2024.02.2, released May 7th, 2024 + + Important / security related fixes. + + Security: The /dev/shm entry in the default /etc/fstab used + for busybox and sysv init systems was missing the sticky bit, + allowing users to delete and replace other users files. + + Defconfigs: Mangopi mq1rdw1: Lock kernel headers to 6.6.x. + + Updated/fixed packages: apache, botan, + brcmfmac_sdio-firmware-rpi, clamav, cmake, containerd, + crucible, dmenu-wayland, dmraid, docker-cli, docker-engine, + domoticz, fmc, freeipmi, gdal, gdb, giflib, gnupg2, go, + google-breakpad, googlefontdirectory, imx-gpu-viv, inih, + libassuan, libblockdev, libcurl, libdrm, libgpg-error, + libksba, libnpth, libressl, libtracefs, lxc, mbedtls, mesa3d, + oatpp, opensc, oprofile, perl-net-ssleay, petitboot, + php-xdebug, psplash, python-pypng, python-segno, + python-service-identity, python3, skeleton-init-sysv, systemd, + tcf-agent, tiff, uuu, wolfssl, xmrig, zic + + Issues resolved (http://bugs.uclibc.org): + + #14416: Mesa3D missing DRI3 support for various Gallium drivers + #16009: 'select' does not work with 'choice' + #16036: android-tools version is too old + 2024.02.1, released March 26th, 2024 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index cb7a81af6ec..ac595f5749b 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02.1' +RELEASE='2024.02.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 2e07cd5a1bc7f2b2d2db9702eca159729232b839 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 7 May 2024 10:51:08 +0200 Subject: [PATCH 0653/3013] docs/website: Update for 2024.02.2 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 559d396ed29..cc83d42a9fa 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
    Download
    -

    Latest stable / long term support release: 2024.02.1

    +

    Latest stable / long term support release: 2024.02.2

    - +
    - +
    -

    buildroot-2024.02.1.tar.gz

    -

    PGP signature

    +

    buildroot-2024.02.2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2024.02.1.tar.xz

    -

    PGP signature

    +

    buildroot-2024.02.2.tar.xz

    +

    PGP signature

    +

    Latest release candidate: 2024.05-rc1

    - +
    - +
    -

    buildroot-2024.02-rc2.tar.gz

    -

    PGP signature

    +

    buildroot-2024.05-rc1.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2024.02-rc2.tar.xz

    -

    PGP signature

    +

    buildroot-2024.05-rc1.tar.xz

    +

    PGP signature

    ---> + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
    diff --git a/docs/website/news.html b/docs/website/news.html index 072523dd65f..e13def66cf8 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

    News

      +
    • +
      +
      +
      +

      2024.05-rc1 released

      +

      30 May 2024

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2024.05-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • +
    • From b329eb2172c5622dfbb45026dfb2384a5c12a233 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 07:43:50 +0100 Subject: [PATCH 0998/3013] package/bootgen: bump to xilinx_v2024.1 Bump bootgen to xilinx_v2024.1. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- package/bootgen/bootgen.hash | 2 +- package/bootgen/bootgen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash index 6f34b2b8506..506aae8a844 100644 --- a/package/bootgen/bootgen.hash +++ b/package/bootgen/bootgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aa8120369d8a6016c731a3338188045c82833602e8ea955b53130a16560e5eb3 bootgen-xilinx_v2023.2.tar.gz +sha256 7879c7d40642bcf7adcec177a51cf73f95bd45d315f75d125d3fc1680c0a9b24 bootgen-xilinx_v2024.1.tar.gz sha256 4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3 LICENSE diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk index 70338090f4c..912e2e31b3e 100644 --- a/package/bootgen/bootgen.mk +++ b/package/bootgen/bootgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOTGEN_VERSION = xilinx_v2023.2 +BOOTGEN_VERSION = xilinx_v2024.1 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION)) HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf BOOTGEN_LICENSE = Apache-2.0 From 8d5a3d1af54a85f4796ae73a61169e08098faf39 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:46 +0100 Subject: [PATCH 0999/3013] board/zynq/patches: add xilinx_2024.1 hashes Add the Linux and u-boot hashes for xilinx_2024.1 release. xilinx_2024.1 release includes: - uboot 2024.01 - linux 6.6.10 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- board/zynq/patches/linux/linux.hash | 1 + board/zynq/patches/uboot/uboot.hash | 1 + 2 files changed, 2 insertions(+) diff --git a/board/zynq/patches/linux/linux.hash b/board/zynq/patches/linux/linux.hash index 8ed4bbead46..db57012f985 100644 --- a/board/zynq/patches/linux/linux.hash +++ b/board/zynq/patches/linux/linux.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 56acddefc6f6fdc00df5b75ceb4f86a9d0af9a4fef78cf57f9f2c274b22f006f xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz +sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz diff --git a/board/zynq/patches/uboot/uboot.hash b/board/zynq/patches/uboot/uboot.hash index 35e54e0baf8..516707bf26b 100644 --- a/board/zynq/patches/uboot/uboot.hash +++ b/board/zynq/patches/uboot/uboot.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 32a997a748697ff27e5e6db8edaff5ba893077214bc18b5267daff0b708dab53 xlnx_rebase_v2023.01_2023.2.tar.gz +sha256 58e391a001d9d8ed347ab3258ff7c8435c866b1ff2b2c22ebc95af592444c0f5 xlnx_rebase_v2024.01_2024.1.tar.gz From eefc510767c3d9ea7f7c89642e34b8cdb6174195 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:47 +0100 Subject: [PATCH 1000/3013] board/zynq/post-image.sh: support linux 6.6 dts directory structure Linux 6.6 includes a xilinx directory in the dts directory structure for zynq boards. This patch updates the post-image.sh to match the zynqmp post-image.sh in order to support this change. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- board/zynq/post-image.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh index 192354b5bea..f44b66342d4 100755 --- a/board/zynq/post-image.sh +++ b/board/zynq/post-image.sh @@ -4,9 +4,9 @@ # let's use a symlink with that name that points to the *first* # devicetree listed in the config. -FIRST_DT=$(sed -n \ - 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ - "${BR2_CONFIG}") +FIRST_DT=$(sed -nr \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ + "${BR2_CONFIG}") [ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" From a13aca12af814b789884ae84360b2397da9c84ca Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 31 May 2024 13:57:25 +0200 Subject: [PATCH 1001/3013] board/zynq: make post-image.sh a symlink to board/zynqmp/post-image.sh The zynq/zynqmp post-image scripts are now identical, so replace the zynq copy with a symlink to limit redundancy. Signed-off-by: Peter Korsgaard --- board/zynq/post-image.sh | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) mode change 100755 => 120000 board/zynq/post-image.sh diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh deleted file mode 100755 index f44b66342d4..00000000000 --- a/board/zynq/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# By default U-Boot loads DTB from a file named "system.dtb", so -# let's use a symlink with that name that points to the *first* -# devicetree listed in the config. - -FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - "${BR2_CONFIG}") - -[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" - -BOARD_DIR="$(dirname "$0")" - -support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh new file mode 120000 index 00000000000..775184415df --- /dev/null +++ b/board/zynq/post-image.sh @@ -0,0 +1 @@ +../zynqmp/post-image.sh \ No newline at end of file From 2770ab249cae186511b134dcc6196f8fa47163b6 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:48 +0100 Subject: [PATCH 1002/3013] configs/zynq_zc702_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_zc702_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zc702_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 84c8843ced7..9e37678d9bf 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zc702" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zc702" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc702" BR2_TARGET_UBOOT_NEEDS_DTC=y From 3e0cedb2ab072ba4cf5b39b64448e93e3e36c894 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:49 +0100 Subject: [PATCH 1003/3013] configs/zynq_zc706_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_zc706_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zc706_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index e22ba7a3d95..9ccf23f6e12 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zc706" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zc706" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706" BR2_TARGET_UBOOT_NEEDS_DTC=y From f555bffb8ed3e699f94fbfc88255bc0bca937e0d Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:50 +0100 Subject: [PATCH 1004/3013] configs/zynq_zed_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_zed_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zed_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 33e7aa02e0f..95606caf5cf 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zed" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zed" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed" BR2_TARGET_UBOOT_NEEDS_DTC=y From 622d3b25307bdc6db74628515be7f7b244f4bf77 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:51 +0100 Subject: [PATCH 1005/3013] configs/zynq_microzed_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_microzed_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_microzed_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 8fb9bc49dc2..c6ca5a6244d 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-microzed" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-microzed" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed" BR2_TARGET_UBOOT_NEEDS_DTC=y From b574b0b9e6d076e25a3d67e8f4bddcd690ef2b1f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:52 +0100 Subject: [PATCH 1006/3013] board/zynq/patches: remove xilinx 6.1.70 hashes Now that the zynq_* defconfigs have migrated to xilinx_2024.1, remove the older hashes. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- board/zynq/patches/linux/linux.hash | 1 - board/zynq/patches/uboot/uboot.hash | 1 - 2 files changed, 2 deletions(-) diff --git a/board/zynq/patches/linux/linux.hash b/board/zynq/patches/linux/linux.hash index db57012f985..d85f7734780 100644 --- a/board/zynq/patches/linux/linux.hash +++ b/board/zynq/patches/linux/linux.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 56acddefc6f6fdc00df5b75ceb4f86a9d0af9a4fef78cf57f9f2c274b22f006f xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz diff --git a/board/zynq/patches/uboot/uboot.hash b/board/zynq/patches/uboot/uboot.hash index 516707bf26b..a5ab9fae05d 100644 --- a/board/zynq/patches/uboot/uboot.hash +++ b/board/zynq/patches/uboot/uboot.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 32a997a748697ff27e5e6db8edaff5ba893077214bc18b5267daff0b708dab53 xlnx_rebase_v2023.01_2023.2.tar.gz sha256 58e391a001d9d8ed347ab3258ff7c8435c866b1ff2b2c22ebc95af592444c0f5 xlnx_rebase_v2024.01_2024.1.tar.gz From 9a629f5129d652960b203e53685aea24a4dd86a1 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 31 May 2024 12:44:25 +0200 Subject: [PATCH 1007/3013] utils/docker-run: allow running with Podman Podman is command line compatible with Docker, there's no need to require contributors to install Docker to run checks before sending patches. The additional "--userns=keep-id" option is necessary because unlike Docker Podman creates a user namespace for containers by default. Without keep-id the repository and pre-existing output files belong to root inside the container namespace, breaking writes, certain Git safety checks, and possibly all access (if the user is using a strict umask). Signed-off-by: Fiona Klute Signed-off-by: Yann E. MORIN --- utils/docker-run | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 79694474c14..3dcabe2718b 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -29,6 +29,16 @@ declare -a mountpoints=( "$(pwd)" ) +if command -v docker >/dev/null; then + DOCKER="docker" +elif command -v podman >/dev/null; then + DOCKER="podman" + docker_opts+=( --userns=keep-id ) +else + echo "ERROR: Neither docker nor podman available!" >&2 + exit 1 +fi + # curl lists (and recognises and uses) other types of *_proxy variables, # but only those make sense for Buildroot: for env in all_proxy http_proxy https_proxy ftp_proxy no_proxy; do @@ -84,4 +94,4 @@ if tty -s; then docker_opts+=( -t ) fi -exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}" +exec ${DOCKER} run "${docker_opts[@]}" "${IMAGE}" "${@}" From f99862d63499619cf7e22e50b5331371bb5fc7c0 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Fri, 31 May 2024 13:05:19 +0300 Subject: [PATCH 1008/3013] package/tbtools: bump to version 0.4.0 Update against the latest release of tbtools. Signed-off-by: Mika Westerberg Signed-off-by: Yann E. MORIN --- package/tbtools/tbtools.hash | 2 +- package/tbtools/tbtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tbtools/tbtools.hash b/package/tbtools/tbtools.hash index ebd838ebe18..06705fc19d8 100644 --- a/package/tbtools/tbtools.hash +++ b/package/tbtools/tbtools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e5ddbcb3dcf6315a1fe6fe2d4846b5208e75f24e626d43a0ea68358e8b15dba7 tbtools-0.3.2-cargo2.tar.gz +sha256 1276ded79276d42c06a16293e26de32566c023383416fb8c91f86d141acce691 tbtools-0.4.0-cargo2.tar.gz sha256 9b16a3add311d607af8d9b348a842a37840d0f47dfcc6cf2a7756ee02c24ed69 LICENSE diff --git a/package/tbtools/tbtools.mk b/package/tbtools/tbtools.mk index 36bfcd7f49a..fc5ffc4215b 100644 --- a/package/tbtools/tbtools.mk +++ b/package/tbtools/tbtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBTOOLS_VERSION = 0.3.2 +TBTOOLS_VERSION = 0.4.0 TBTOOLS_SITE = $(call github,intel,tbtools,v$(TBTOOLS_VERSION)) TBTOOLS_LICENSE = MIT TBTOOLS_LICENSE_FILES = LICENSE From 5b54a92563b536acd34f6ea54fd1161a257e2365 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 30 May 2024 22:34:53 +0200 Subject: [PATCH 1009/3013] package/swupdate: bump to version 2024.05 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 19ef3a27249..13964351f60 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 89ec8926d66627255fe689ed96ad8d30f5c539315956dacf9890e308095dee3b swupdate-2023.12.1.tar.gz +sha256 c8af1e964d0123a7d4bbba981170eff723db87dcd37e5881c584ffee54194d1a swupdate-2024.05.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 467e4f22ead..b36aabb1e7d 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2023.12.1 +SWUPDATE_VERSION = 2024.05 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ From 19cffcb9799aa9150f5e11fd013f37d2a6e84fb4 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 30 May 2024 22:47:03 +0200 Subject: [PATCH 1010/3013] configs/acmesystems_aria_*: bump Linux to 4.19.315 to fix compilation error The Linux kernel failed to build since commit e88225ed882 (package/binutils: make 2.41 the default version). The new version contains the commit 790756c7e0229 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") that fixes the issue. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- configs/acmesystems_aria_g25_128mb_defconfig | 2 +- configs/acmesystems_aria_g25_256mb_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/acmesystems_aria_g25_128mb_defconfig b/configs/acmesystems_aria_g25_128mb_defconfig index c428e318d21..acf24d1fed5 100644 --- a/configs/acmesystems_aria_g25_128mb_defconfig +++ b/configs/acmesystems_aria_g25_128mb_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" diff --git a/configs/acmesystems_aria_g25_256mb_defconfig b/configs/acmesystems_aria_g25_256mb_defconfig index 83f7625dc70..2713c3ca79c 100644 --- a/configs/acmesystems_aria_g25_256mb_defconfig +++ b/configs/acmesystems_aria_g25_256mb_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" From 4700e2104f01d3d780dc2657a6ca0db44435f224 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 30 May 2024 22:47:04 +0200 Subject: [PATCH 1011/3013] configs/acmesystems_aria_*: add hashes for at91bootstrap3/Linux/headers And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- .../aria-g25/patches/at91bootstrap3/at91bootstrap3.hash | 2 ++ .../aria-g25/patches/linux-headers/linux-headers.hash | 1 + board/acmesystems/aria-g25/patches/linux/linux.hash | 2 ++ configs/acmesystems_aria_g25_128mb_defconfig | 2 ++ configs/acmesystems_aria_g25_256mb_defconfig | 2 ++ 6 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 board/acmesystems/aria-g25/patches/at91bootstrap3/at91bootstrap3.hash create mode 120000 board/acmesystems/aria-g25/patches/linux-headers/linux-headers.hash create mode 100644 board/acmesystems/aria-g25/patches/linux/linux.hash diff --git a/.checkpackageignore b/.checkpackageignore index 8f5fc0a4768..5d15fa8046f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -117,8 +117,6 @@ boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch lib_p boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch lib_patch.Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch lib_patch.Upstream configs/aarch64_efi_defconfig lib_defconfig.ForceCheckHash -configs/acmesystems_aria_g25_128mb_defconfig lib_defconfig.ForceCheckHash -configs/acmesystems_aria_g25_256mb_defconfig lib_defconfig.ForceCheckHash configs/acmesystems_arietta_g25_128mb_defconfig lib_defconfig.ForceCheckHash configs/acmesystems_arietta_g25_256mb_defconfig lib_defconfig.ForceCheckHash configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash diff --git a/board/acmesystems/aria-g25/patches/at91bootstrap3/at91bootstrap3.hash b/board/acmesystems/aria-g25/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 00000000000..6edf3d3345e --- /dev/null +++ b/board/acmesystems/aria-g25/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5ea2a8fed1ba0024229c6f6d77176679e1b24791bdbce8e285634013d4a93551 at91bootstrap3-v3.10.3-git4.tar.gz diff --git a/board/acmesystems/aria-g25/patches/linux-headers/linux-headers.hash b/board/acmesystems/aria-g25/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/acmesystems/aria-g25/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/acmesystems/aria-g25/patches/linux/linux.hash b/board/acmesystems/aria-g25/patches/linux/linux.hash new file mode 100644 index 00000000000..81824a41ee4 --- /dev/null +++ b/board/acmesystems/aria-g25/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz diff --git a/configs/acmesystems_aria_g25_128mb_defconfig b/configs/acmesystems_aria_g25_128mb_defconfig index acf24d1fed5..261a2c9fa36 100644 --- a/configs/acmesystems_aria_g25_128mb_defconfig +++ b/configs/acmesystems_aria_g25_128mb_defconfig @@ -6,6 +6,8 @@ BR2_arm926t=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/aria-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/configs/acmesystems_aria_g25_256mb_defconfig b/configs/acmesystems_aria_g25_256mb_defconfig index 2713c3ca79c..183c4f7b730 100644 --- a/configs/acmesystems_aria_g25_256mb_defconfig +++ b/configs/acmesystems_aria_g25_256mb_defconfig @@ -6,6 +6,8 @@ BR2_arm926t=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/aria-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y From 0611216ee7c5c631334e08e91e1c39d6b784ebcd Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 30 May 2024 22:47:05 +0200 Subject: [PATCH 1012/3013] configs/acmesystems_arietta_*: bump Linux to 4.19.315 to fix compilation error The Linux kernel failed to build since commit e88225ed882 (package/binutils: make 2.41 the default version). The new version contains the commit 790756c7e0229 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") that fixes the issue. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- configs/acmesystems_arietta_g25_128mb_defconfig | 2 +- configs/acmesystems_arietta_g25_256mb_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/acmesystems_arietta_g25_128mb_defconfig b/configs/acmesystems_arietta_g25_128mb_defconfig index b882b2bdb26..74f395cf86a 100644 --- a/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/configs/acmesystems_arietta_g25_128mb_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" diff --git a/configs/acmesystems_arietta_g25_256mb_defconfig b/configs/acmesystems_arietta_g25_256mb_defconfig index 10501d462cb..9c730761301 100644 --- a/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/configs/acmesystems_arietta_g25_256mb_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.216" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" From e5dff2797c26b77ed811b802f7556a797c348a84 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 30 May 2024 22:47:06 +0200 Subject: [PATCH 1013/3013] configs/acmesystems_arietta_*: add hashes for at91bootstrap3/Linux/headers And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- .../arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash | 2 ++ .../arietta-g25/patches/linux-headers/linux-headers.hash | 1 + board/acmesystems/arietta-g25/patches/linux/linux.hash | 2 ++ configs/acmesystems_arietta_g25_128mb_defconfig | 2 ++ configs/acmesystems_arietta_g25_256mb_defconfig | 2 ++ 6 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 board/acmesystems/arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash create mode 120000 board/acmesystems/arietta-g25/patches/linux-headers/linux-headers.hash create mode 100644 board/acmesystems/arietta-g25/patches/linux/linux.hash diff --git a/.checkpackageignore b/.checkpackageignore index 5d15fa8046f..846cd8e1ecf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -117,8 +117,6 @@ boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch lib_p boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch lib_patch.Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch lib_patch.Upstream configs/aarch64_efi_defconfig lib_defconfig.ForceCheckHash -configs/acmesystems_arietta_g25_128mb_defconfig lib_defconfig.ForceCheckHash -configs/acmesystems_arietta_g25_256mb_defconfig lib_defconfig.ForceCheckHash configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash diff --git a/board/acmesystems/arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash b/board/acmesystems/arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 00000000000..6edf3d3345e --- /dev/null +++ b/board/acmesystems/arietta-g25/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5ea2a8fed1ba0024229c6f6d77176679e1b24791bdbce8e285634013d4a93551 at91bootstrap3-v3.10.3-git4.tar.gz diff --git a/board/acmesystems/arietta-g25/patches/linux-headers/linux-headers.hash b/board/acmesystems/arietta-g25/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/acmesystems/arietta-g25/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/acmesystems/arietta-g25/patches/linux/linux.hash b/board/acmesystems/arietta-g25/patches/linux/linux.hash new file mode 100644 index 00000000000..81824a41ee4 --- /dev/null +++ b/board/acmesystems/arietta-g25/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz diff --git a/configs/acmesystems_arietta_g25_128mb_defconfig b/configs/acmesystems_arietta_g25_128mb_defconfig index 74f395cf86a..43ec1d2d5fa 100644 --- a/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/configs/acmesystems_arietta_g25_128mb_defconfig @@ -6,6 +6,8 @@ BR2_arm926t=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/arietta-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/configs/acmesystems_arietta_g25_256mb_defconfig b/configs/acmesystems_arietta_g25_256mb_defconfig index 9c730761301..294ab312447 100644 --- a/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/configs/acmesystems_arietta_g25_256mb_defconfig @@ -6,6 +6,8 @@ BR2_arm926t=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration +BR2_GLOBAL_PATCH_DIR="board/acmesystems/arietta-g25/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y From c1723c0dfda041efb3da1d4da94909cbc0003e77 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 22 May 2024 22:13:26 +0200 Subject: [PATCH 1014/3013] package/octave: add optional bzip2 support Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 853f767d971..a087961be97 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -19,6 +19,13 @@ OCTAVE_DEPENDENCIES = \ openblas \ pcre2 +ifeq ($(BR2_PACKAGE_BZIP2),y) +OCTAVE_CONF_OPTS += --with-bz2 +OCTAVE_DEPENDENCIES += bzip2 +else +OCTAVE_CONF_OPTS += --without-bz2 +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From 82efc2faa923e8881748738963be1fbe3cb2bb45 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 27 May 2024 14:45:05 +0100 Subject: [PATCH 1015/3013] package/libcamera: bump to version 0.3.0 Signed-off-by: Kieran Bingham Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 1ae74b3b18c..1566356b999 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 f9c3e949f9d6a42e29322833e57a0e6e8c54655507c820636470ea597e767fd8 libcamera-v0.2.0-git4.tar.gz +sha256 1e0a3feff93577a30bcd4e67aa4c1969aecabcd90f78f540a637bb77553c5a7d libcamera-v0.3.0-git4.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index eecbaa44b91..dfcd340b75a 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.2.0 +LIBCAMERA_VERSION = v0.3.0 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From e7f25b2b40e2beeac2f7fbe70fbb91cc892ed1ae Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 May 2024 21:06:07 +0200 Subject: [PATCH 1016/3013] package/mongoose: bump to version 7.14 https://github.com/cesanta/mongoose/releases/tag/7.14 Signed-off-by: Giulio Benetti [Peter: fix missing newline in .hash file] Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.hash | 4 ++-- package/mongoose/mongoose.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index 716833eeed0..8874ba4171f 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5c9dc8d1d1762ef483b6d2fbf5234e421ca944b722225bb533d2d0507b118a0f mongoose-7.13.tar.gz -sha256 4ba646f5a7012d8b52f3a74398e446f56960dde0572f7241a2215430da5dd5a2 LICENSE +sha256 7c4aecf92f7f27f1cbb2cbda3c185c385f2b7af84f6bd7c0ce31b84742b15691 mongoose-7.14.tar.gz +sha256 7e2bc5dabbc27b431a530540161ba860906f12109d4b84b1e4bc8879f1afc3bc LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index e2e3be790aa..d2cd45451ef 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.13 +MONGOOSE_VERSION = 7.14 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE From 86b39fbe7ddfe716cfb67b624bf61e4e9ca1def1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 May 2024 21:00:01 +0200 Subject: [PATCH 1017/3013] package/dhcpdump: bump to version 1.9 - Switch to an active fork (which is already used by Fedora 39) - Drop patch (not needed since https://github.com/bbonev/dhcpdump/commit/be272278c3c3fd7fe0d30203d9047fff6b83fa44) - HAVE_STRSEP has been dropped since https://github.com/bbonev/dhcpdump/commit/0f7c525da62e7ae928782b2beae9c5313fb972f8 - CFLAGS and LDFLAGS must be set since https://github.com/bbonev/dhcpdump/commit/6eac74e7efb88bcce9423b3a452dcaa1d48850f0 - This bump will fix the following build failure with gcc 14 thanks to https://github.com/bbonev/dhcpdump/commit/be272278c3c3fd7fe0d30203d9047fff6b83fa44: dhcpdump.c: In function 'pcap_callback': dhcpdump.c:153:17: error: implicit declaration of function 'strftime' [-Wimplicit-function-declaration] 153 | strftime(timestamp, sizeof(timestamp), "%Y-%m-%d %H:%M:%S.", | ^~~~~~~~ dhcpdump.c:28:1: note: include '' or provide a declaration of 'strftime' 27 | #include "dhcp_options.h" +++ |+#include 28 | https://github.com/bbonev/dhcpdump/releases/tag/v1.9 Fixes: - http://autobuild.buildroot.org/results/9e559d634ac4e06f74f7b9e0402e45209aef2952 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../0001-use-non-bsd-structures.patch | 23 ------------------- package/dhcpdump/Config.in | 2 +- package/dhcpdump/dhcpdump.hash | 2 +- package/dhcpdump/dhcpdump.mk | 13 +++++------ 5 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8f5fc0a4768..543b6f33cf8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -533,7 +533,6 @@ package/dhcp/S80dhcp-relay Shellcheck lib_sysv.Variables package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables -package/dhcpdump/0001-use-non-bsd-structures.patch lib_patch.Upstream package/dhrystone/0001-cmdline-nruns.patch lib_patch.Sob lib_patch.Upstream package/dhrystone/0002-HZ.patch lib_patch.Sob lib_patch.Upstream package/dhrystone/0003-exit.patch lib_patch.Sob lib_patch.Upstream diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch deleted file mode 100644 index 40115fb640f..00000000000 --- a/package/dhcpdump/0001-use-non-bsd-structures.patch +++ /dev/null @@ -1,23 +0,0 @@ -The udphdr structure has uh_* fields when _FAVOR_BSD is -defined. Otherwise, the fields are just named source, dest, len and -check. See . - -Signed-off-by: Thomas Petazzoni - -Index: dhcpdump-1.8/dhcpdump.c -=================================================================== ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 -@@ -163,10 +163,10 @@ - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); - -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) - return; - -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); - } - - // check for matching CHADDR (Peter Apian-Bennewitz ) diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in index e0abe040fc6..30e42928e42 100644 --- a/package/dhcpdump/Config.in +++ b/package/dhcpdump/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP help A tool for monitoring dhcp requests using tcpdump. - http://www.mavetju.org/unix/general.php + https://github.com/bbonev/dhcpdump diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash index a24db5b275c..fdf3243ad10 100644 --- a/package/dhcpdump/dhcpdump.hash +++ b/package/dhcpdump/dhcpdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk index ec9571c0af1..21cbd56b9ca 100644 --- a/package/dhcpdump/dhcpdump.mk +++ b/package/dhcpdump/dhcpdump.mk @@ -4,8 +4,9 @@ # ################################################################################ -DHCPDUMP_VERSION = 1.8 -DHCPDUMP_SITE = http://www.mavetju.org/download +DHCPDUMP_VERSION = 1.9 +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) DHCPDUMP_DEPENDENCIES = libpcap DHCPDUMP_LICENSE = BSD-2-Clause DHCPDUMP_LICENSE_FILES = LICENSE @@ -15,12 +16,10 @@ ifeq ($(BR2_STATIC_LIBS),y) DHCPDUMP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` endif -# glibc, uclibc and musl have strsep() -DHCPDUMP_CFLAGS = $(TARGET_CFLAGS) -DHAVE_STRSEP - define DHCPDUMP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(DHCPDUMP_CFLAGS) \ - -D_GNU_SOURCE" LIBS="$(DHCPDUMP_LIBS)" dhcpdump + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(DHCPDUMP_LIBS)" dhcpdump endef define DHCPDUMP_INSTALL_TARGET_CMDS From cf9cd968a3a6a01fe72fae01bb6ea0dcccf9795f Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 22 May 2024 09:28:40 +0300 Subject: [PATCH 1018/3013] package/timescaledb: bump version to 2.15.0 Release notes: https://github.com/timescale/timescaledb/blob/2.15.0/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index f98098bdb80..ba81c74c7e2 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c7768b267ea67914d0491b28da102faecd317060e429b2da7530517fbc94e73b timescaledb-2.14.2.tar.gz +sha256 ff2019f734566f73af0a8041db50f7f1d0ad6967f7e2e7d796d388cd38c0b5bb timescaledb-2.15.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 59731270c58..d6c81642341 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.14.2 +TIMESCALEDB_VERSION = 2.15.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 584ebdea6e2edb415b6a3c96bea490a0d2beea78 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 28 May 2024 07:22:18 -0600 Subject: [PATCH 1019/3013] utils/genrandconfig: switch to async/await format This requires python 3.5 or newer but is a bit cleaner than the previous coroutine method. This should also fix a python3.12 issue: [Tue, 28 May 2024 13:09:05] INFO: generate the configuration Traceback (most recent call last): File "/home/autobuild/autobuild/instance-0/buildroot/utils/genrandconfig", line 833, in ret = asyncio.run(gen_config(args)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3.12/asyncio/runners.py", line 194, in run return runner.run(main) ^^^^^^^^^^^^^^^^ File "/usr/lib/python3.12/asyncio/runners.py", line 89, in run raise ValueError("a coroutine was expected, got {!r}".format(coro)) ValueError: a coroutine was expected, got [Tue, 28 May 2024 13:09:06] WARN: failed to generate configuration Signed-off-by: James Hilliard Reviewed-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 62 +++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index df6bede1582..b838dda34d2 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -28,11 +28,6 @@ import traceback from distutils.version import StrictVersion import platform -if sys.version_info < (3, 8): - from asyncio import coroutine -else: - from types import coroutine - class SystemInfo: DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] @@ -60,8 +55,7 @@ class SystemInfo: # -- return None - @coroutine - def has(self, prog): + async def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -76,11 +70,11 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - proc = yield from asyncio.create_subprocess_shell( + proc = await asyncio.create_subprocess_shell( "%s -version | grep gcj" % prog, stdout=asyncio.subprocess.DEVNULL, stderr=asyncio.subprocess.DEVNULL) - ret = yield from proc.wait() + ret = await proc.wait() if ret != 1: have_it = False # -- @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): return configs -@coroutine -def is_toolchain_usable(configfile, config): +async def is_toolchain_usable(configfile, config): """Check if the toolchain is actually usable.""" with open(configfile) as configf: @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( 'ldd', '--version', stdout=asyncio.subprocess.PIPE) - ldd_version_output, _ = yield from proc.communicate() + ldd_version_output, _ = await proc.communicate() if proc.returncode: return False glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): return True -@coroutine -def fixup_config(sysinfo, configfile): +async def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations This function returns 'True' when the configuration has been @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - has_java = yield from sysinfo.has("java") - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ @@ -669,8 +660,7 @@ def fixup_config(sysinfo, configfile): return True -@coroutine -def gen_config(args): +async def gen_config(args): """Generate a new random configuration This function generates the configuration, by choosing a random @@ -728,8 +718,7 @@ def gen_config(args): # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing - has_diffoscope = yield from sysinfo.has("diffoscope") - if has_diffoscope and randint(0, 10) == 0: + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") @@ -743,14 +732,13 @@ def gen_config(args): with open(configfile, "w+") as configf: configf.writelines(configlines) - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) - if not toolchain_usable: + if not await is_toolchain_usable(configfile, toolchainconfig): return 2 # Now, generate the random selection of packages, and fixup @@ -764,37 +752,33 @@ def gen_config(args): file=sys.stderr) return 1 bounded_loop -= 1 - make_rand = [ + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randpackageconfig" if args.toolchains_csv else "randconfig" - ] - proc = yield from asyncio.create_subprocess_exec(*make_rand) - ret = yield from proc.wait() + "randpackageconfig" if args.toolchains_csv else "randconfig") + ret = await proc.wait() if ret: return ret - ret = yield from fixup_config(sysinfo, configfile) - if ret: + if await fixup_config(sysinfo, configfile): break - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") - ret = yield from proc.wait() - return ret + return await proc.wait() if __name__ == '__main__': From 42fad03182ed53de8003b66d50e893f42b72145e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Thu, 30 May 2024 22:32:56 +0200 Subject: [PATCH 1020/3013] packages: bump skalibs-related packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update all skarnet.org packages to their current upstream version: - execline - mdevd - s6 - s6-dns - s6-linux-init - s6-linux-utils - s6-networking - s6-portable-utils - s6-rc - skalibs This patch(set) updates the packages from skarnet.org. It is one commit to avoid build failures due to incompatible versions: for example, when only skalibs are updated, execline fails to build; conversely, bumping execline before skalibs also yields build failures. Signed-off-by: J. Neuschäfer [yann.morin.1998@free.fr: - cleanup commit title - reword commit log - include explanations why all bumps are done at once ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - package/execline/execline.hash | 4 +- package/execline/execline.mk | 4 +- package/mdevd/mdevd.hash | 4 +- package/mdevd/mdevd.mk | 4 +- package/s6-dns/s6-dns.hash | 4 +- package/s6-dns/s6-dns.mk | 4 +- package/s6-linux-init/s6-linux-init.hash | 4 +- package/s6-linux-init/s6-linux-init.mk | 4 +- ...utils-rngseed.c-fix-build-with-glibc.patch | 39 ------------------- package/s6-linux-utils/s6-linux-utils.hash | 4 +- package/s6-linux-utils/s6-linux-utils.mk | 4 +- package/s6-networking/s6-networking.hash | 4 +- package/s6-networking/s6-networking.mk | 4 +- .../s6-portable-utils/s6-portable-utils.hash | 4 +- .../s6-portable-utils/s6-portable-utils.mk | 4 +- package/s6-rc/s6-rc.hash | 4 +- package/s6-rc/s6-rc.mk | 4 +- package/s6/s6.hash | 4 +- package/s6/s6.mk | 4 +- package/skalibs/skalibs.hash | 4 +- package/skalibs/skalibs.mk | 4 +- 22 files changed, 40 insertions(+), 80 deletions(-) delete mode 100644 package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index 543b6f33cf8..8345b6db958 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1379,7 +1379,6 @@ package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch lib_patch.Upstream package/rygel/S99rygel Shellcheck lib_sysv.Indent lib_sysv.Variables package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch lib_patch.Upstream -package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch lib_patch.Upstream package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch lib_patch.Upstream package/samba4/0001-libreplace-disable-libbsd-support.patch lib_patch.Upstream package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch lib_patch.Upstream diff --git a/package/execline/execline.hash b/package/execline/execline.hash index 1d72e2cb49f..3f9ff8a1384 100644 --- a/package/execline/execline.hash +++ b/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 01260fcaf80ffbca2a94aa55ea474dfb9e39b3033b55c8af88126791879531f6 execline-2.9.0.1.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 df750035d0fb21c7265bffb7ed7e1b661de1e842944a2252bdcddc32d0d97217 execline-2.9.5.1.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/execline/execline.mk b/package/execline/execline.mk index 38f4570ba47..842ded6b88a 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -4,8 +4,8 @@ # ################################################################################ -EXECLINE_VERSION = 2.9.0.1 -EXECLINE_SITE = http://skarnet.org/software/execline +EXECLINE_VERSION = 2.9.5.1 +EXECLINE_SITE = https://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING EXECLINE_INSTALL_STAGING = YES diff --git a/package/mdevd/mdevd.hash b/package/mdevd/mdevd.hash index dea2f149784..9436ed8b01f 100644 --- a/package/mdevd/mdevd.hash +++ b/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 33cf2b118634538fd24f302b30f52cc8aa28ea68b414916ce482b54a4ee57283 mdevd-0.1.6.0.tar.gz -sha256 7fe938b5e0fec18848955ca8081c532e24ae77310beb730b301e1f77bad3d390 COPYING +sha256 f6ecf0ef7cd48d04efc75acb2dad967d850bc8815bdb0098f1c9ef043394d430 mdevd-0.1.6.3.tar.gz +sha256 b2edd59a202a710440522f05dcbf418b0493540120efcb407876772ee42d2c7c COPYING diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk index 9997cb5275e..c92659d961d 100644 --- a/package/mdevd/mdevd.mk +++ b/package/mdevd/mdevd.mk @@ -4,8 +4,8 @@ # ################################################################################ -MDEVD_VERSION = 0.1.6.0 -MDEVD_SITE = http://skarnet.org/software/mdevd +MDEVD_VERSION = 0.1.6.3 +MDEVD_SITE = https://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING MDEVD_INSTALL_STAGING = YES diff --git a/package/s6-dns/s6-dns.hash b/package/s6-dns/s6-dns.hash index 50830245209..334ea1667cd 100644 --- a/package/s6-dns/s6-dns.hash +++ b/package/s6-dns/s6-dns.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 76af222472c4754f83cdc59ad354255ce1b1e6f6833a059328463f8e51f4db43 s6-dns-2.3.5.4.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 cf0258574ec7d62b654e0c2ad78af4c7d67ac4c9cb37f781480f597e54b30f6d s6-dns-2.3.7.1.tar.gz +sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING diff --git a/package/s6-dns/s6-dns.mk b/package/s6-dns/s6-dns.mk index 1b7d65570f1..a848f2e6c0d 100644 --- a/package/s6-dns/s6-dns.mk +++ b/package/s6-dns/s6-dns.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.5.4 -S6_DNS_SITE = http://skarnet.org/software/s6-dns +S6_DNS_VERSION = 2.3.7.1 +S6_DNS_SITE = https://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING S6_DNS_INSTALL_STAGING = YES diff --git a/package/s6-linux-init/s6-linux-init.hash b/package/s6-linux-init/s6-linux-init.hash index f70a4f87b5b..25292c35b2d 100644 --- a/package/s6-linux-init/s6-linux-init.hash +++ b/package/s6-linux-init/s6-linux-init.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 92055a7964cf66604066ad964a2c2392ee7c5e64821be03146c1341e0d8c3dc6 s6-linux-init-1.0.8.0.tar.gz -sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING +sha256 11ae08d0a66210b5e56b6baee0f6b9b1b69fbedb05fda1285b115a31ca46c77f s6-linux-init-1.1.2.0.tar.gz +sha256 f68451e55e6686dc187df1ca427c574d9ac0d6f6926e1bdb909ad8b657668fe5 COPYING diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index 6aec220de41..ae2bcdb8d81 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 1.0.8.0 -S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init +S6_LINUX_INIT_VERSION = 1.1.2.0 +S6_LINUX_INIT_SITE = https://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING S6_LINUX_INIT_DEPENDENCIES = s6 s6-linux-utils s6-portable-utils diff --git a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch deleted file mode 100644 index 2df8a997001..00000000000 --- a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3ab8bdc1c657f91a2a96f4e6db308d17098de0c4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 23 Feb 2023 12:09:11 +0100 -Subject: [PATCH] src/s6-linux-utils/rngseed.c: fix build with glibc < - -getrandom and sys/random.h are only available since glibc 2.25 resulting -in the following build failure since version 2.6.0.0 and -https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: - -src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory - #include - ^ - -Fixes: - - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/skarnet/s6-linux-utils/pull/2] ---- - src/s6-linux-utils/rngseed.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/minutils/rngseed.c b/src/minutils/rngseed.c -index 2b1772c..223f50a 100644 ---- a/src/minutils/rngseed.c -+++ b/src/minutils/rngseed.c -@@ -12,7 +12,9 @@ - #include - #include - #include -+#ifdef SKALIBS_HASGETRANDOM - #include -+#endif - #include - - #include --- -2.39.1 - diff --git a/package/s6-linux-utils/s6-linux-utils.hash b/package/s6-linux-utils/s6-linux-utils.hash index c932a4363ae..97a67c674e3 100644 --- a/package/s6-linux-utils/s6-linux-utils.hash +++ b/package/s6-linux-utils/s6-linux-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 6c7132734a0c8287002ee6910c469f175a97d766a8023c0c33af8ba92643ed59 s6-linux-utils-2.6.0.0.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 8f944633ca87d3d23e0f03c9c383d1502d508c9bac16d38c3fbf723a5eab2bb7 s6-linux-utils-2.6.2.0.tar.gz +sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk index ffa3ffac5b2..f83f47ac3e8 100644 --- a/package/s6-linux-utils/s6-linux-utils.mk +++ b/package/s6-linux-utils/s6-linux-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_LINUX_UTILS_VERSION = 2.6.0.0 -S6_LINUX_UTILS_SITE = http://skarnet.org/software/s6-linux-utils +S6_LINUX_UTILS_VERSION = 2.6.2.0 +S6_LINUX_UTILS_SITE = https://skarnet.org/software/s6-linux-utils S6_LINUX_UTILS_LICENSE = ISC S6_LINUX_UTILS_LICENSE_FILES = COPYING S6_LINUX_UTILS_DEPENDENCIES = skalibs diff --git a/package/s6-networking/s6-networking.hash b/package/s6-networking/s6-networking.hash index 1890f95221a..df65274b3dd 100644 --- a/package/s6-networking/s6-networking.hash +++ b/package/s6-networking/s6-networking.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 7ac79d4de3d9c13532e444ab7497c4e04ad0fa7229d502984d9dc7d48aa64418 s6-networking-2.5.1.1.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 c33c6f1b2be16f89a21af946cfd06242a12f98184c898b755ddb24338671ceb1 s6-networking-2.7.0.2.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index f740f22635b..239d8a679e5 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.5.1.1 -S6_NETWORKING_SITE = http://skarnet.org/software/s6-networking +S6_NETWORKING_VERSION = 2.7.0.2 +S6_NETWORKING_SITE = https://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING S6_NETWORKING_INSTALL_STAGING = YES diff --git a/package/s6-portable-utils/s6-portable-utils.hash b/package/s6-portable-utils/s6-portable-utils.hash index aa38c8b5daa..2454e91a4d7 100644 --- a/package/s6-portable-utils/s6-portable-utils.hash +++ b/package/s6-portable-utils/s6-portable-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ebb39f8934fd36f25d31352e61bbd94dc02b1e9f04411850d2fd9658bd916e36 s6-portable-utils-2.2.5.0.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 3e4492055d160c25fb90153f0efc277d7d52bf981bbe3ea2e9dfe51c493561ff s6-portable-utils-2.3.0.3.tar.gz +sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk index 8cdb4fa9656..c40100b06c6 100644 --- a/package/s6-portable-utils/s6-portable-utils.mk +++ b/package/s6-portable-utils/s6-portable-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_PORTABLE_UTILS_VERSION = 2.2.5.0 -S6_PORTABLE_UTILS_SITE = http://skarnet.org/software/s6-portable-utils +S6_PORTABLE_UTILS_VERSION = 2.3.0.3 +S6_PORTABLE_UTILS_SITE = https://skarnet.org/software/s6-portable-utils S6_PORTABLE_UTILS_LICENSE = ISC S6_PORTABLE_UTILS_LICENSE_FILES = COPYING S6_PORTABLE_UTILS_DEPENDENCIES = skalibs diff --git a/package/s6-rc/s6-rc.hash b/package/s6-rc/s6-rc.hash index 0a84345e368..a09c08ba3cf 100644 --- a/package/s6-rc/s6-rc.hash +++ b/package/s6-rc/s6-rc.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 4f24a4966a4aa353d2bd1a8afca9b88c7b7bd29c46b3a1a7f5305686b9d6e038 s6-rc-0.5.3.2.tar.gz -sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING +sha256 00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982 s6-rc-0.5.4.2.tar.gz +sha256 f68451e55e6686dc187df1ca427c574d9ac0d6f6926e1bdb909ad8b657668fe5 COPYING diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk index 85b047883ba..61090c9a276 100644 --- a/package/s6-rc/s6-rc.mk +++ b/package/s6-rc/s6-rc.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_RC_VERSION = 0.5.3.2 -S6_RC_SITE = http://skarnet.org/software/s6-rc +S6_RC_VERSION = 0.5.4.2 +S6_RC_SITE = https://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING S6_RC_INSTALL_STAGING = YES diff --git a/package/s6/s6.hash b/package/s6/s6.hash index 3c5ce4265af..fb5e74e4039 100644 --- a/package/s6/s6.hash +++ b/package/s6/s6.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 6c1474be3e889dac392cee307abe015cd4be0c85c725c84ea7f184f0e34503a2 s6-2.11.1.2.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 c95d51787602e0c8c8e4f92a710cbdaa4ee797ee886e71342727e2974f95c06b s6-2.12.0.4.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6/s6.mk b/package/s6/s6.mk index 78962ed1593..fb4910e28b5 100644 --- a/package/s6/s6.mk +++ b/package/s6/s6.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_VERSION = 2.11.1.2 -S6_SITE = http://skarnet.org/software/s6 +S6_VERSION = 2.12.0.4 +S6_SITE = https://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING S6_INSTALL_STAGING = YES diff --git a/package/skalibs/skalibs.hash b/package/skalibs/skalibs.hash index dd202b97fb2..d871ee65035 100644 --- a/package/skalibs/skalibs.hash +++ b/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 3e228f72f18d88c17f6c4e0a66881d6d3779427b7e7e889f3142b6f26da30285 skalibs-2.12.0.1.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3 skalibs-2.14.1.1.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk index 0ff449a5bad..67e3c694fca 100644 --- a/package/skalibs/skalibs.mk +++ b/package/skalibs/skalibs.mk @@ -4,8 +4,8 @@ # ################################################################################ -SKALIBS_VERSION = 2.12.0.1 -SKALIBS_SITE = http://skarnet.org/software/skalibs +SKALIBS_VERSION = 2.14.1.1 +SKALIBS_SITE = https://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING SKALIBS_INSTALL_STAGING = YES From f97e6293de1491e75b0798bddf4b0532c7f92bd2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 1 Jun 2024 12:04:17 +0200 Subject: [PATCH 1021/3013] utils/docker-run: set podman userns option in environment Commit 9a629f5 "utils/docker-run: allow running with Podman" added an option on system providing the podman command. This case is mainly for Fedora systems. Fedora repositories have a podman-docker package, that provides the docker command for compatibility. See [1]. In that case, invoking "docker" redirects to podman. When this package is installed on a Fedora system, both the docker and podman commands are available. Since the docker command is checked before podman, the --userns option is not passed in that case. This brings "permission denied" errors. Other cases are also possible, like a host system providing the real Docker alongside a podman installation. In such a case, to avoid unexpected change of behavior of the docker-run script, the original search order is preserved (search for "docker" first, then "podman"). This commit changes the way the podman user namespace mode is set. Rather than adding the "--userns=keep-id" command line option only in the podman case, it is globally set using the PODMAN_USERNS=keep-id environment variable [2]. Doing so makes sure that the variable will be consumed by the "docker" compatibility command, and just ignored by the real "docker" implementation. [1] https://packages.fedoraproject.org/pkgs/podman/podman-docker/ [2] https://docs.podman.io/en/latest/markdown/podman-run.1.html Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- utils/docker-run | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 3dcabe2718b..1adb02d74e6 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -29,11 +29,16 @@ declare -a mountpoints=( "$(pwd)" ) +# We use the PODMAN_USERNS environment variable rather than using the +# --userns command line argument because Fedora system may have the +# podman-docker package installed, providing the "docker" +# compatibility command. +export PODMAN_USERNS="keep-id" + if command -v docker >/dev/null; then DOCKER="docker" elif command -v podman >/dev/null; then DOCKER="podman" - docker_opts+=( --userns=keep-id ) else echo "ERROR: Neither docker nor podman available!" >&2 exit 1 From a6784999b23cbe156d63177bf283b844d76aa4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Fri, 31 May 2024 22:31:00 +0200 Subject: [PATCH 1022/3013] {linux, linux-headers}: bump 4.19.x, 5.4.x, 5.10.x, 5.15.x, 6.1.x, 6.6.x, 6.8.x series MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gero Schwäricke Signed-off-by: Yann E. MORIN --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index d3d4c429109..194a24f3918 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.8.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.8.12" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index af82148e808..b972557fc00 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 f905f1238ea7a8e85314bacf283302e8097006010d25fcea726d0de0ea5bc9b6 linux-6.8.9.tar.xz -sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz -sha256 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d linux-6.1.90.tar.xz +sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz +sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz +sha256 9019f427bfdc9ced5bc954d760d37ac08c0cdffb45ad28087fc45a73e64336c9 linux-6.1.92.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6 linux-5.15.158.tar.xz -sha256 e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151 linux-5.10.216.tar.xz -sha256 dad2b068946f0ca0026130d7ab17601d5074d90b381379c4479314d4edf4304c linux-5.4.275.tar.xz +sha256 f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 linux-5.15.160.tar.xz +sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz +sha256 7e1f5b28588e49ddfd18e7772476e4e8b52bdc9c3e19beafcbb7c103e6c01f51 linux-5.4.277.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a8145e2ecf8437b6d06400c3358a595c47a74443b164890cf12a07d8722539c8 linux-4.19.313.tar.xz +sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d8f48ed0b7b..48101783b94 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -415,13 +415,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.313" if BR2_KERNEL_HEADERS_4_19 - default "5.4.275" if BR2_KERNEL_HEADERS_5_4 - default "5.10.216" if BR2_KERNEL_HEADERS_5_10 - default "5.15.158" if BR2_KERNEL_HEADERS_5_15 - default "6.1.90" if BR2_KERNEL_HEADERS_6_1 - default "6.6.30" if BR2_KERNEL_HEADERS_6_6 - default "6.8.9" if BR2_KERNEL_HEADERS_6_8 + default "4.19.315" if BR2_KERNEL_HEADERS_4_19 + default "5.4.277" if BR2_KERNEL_HEADERS_5_4 + default "5.10.218" if BR2_KERNEL_HEADERS_5_10 + default "5.15.160" if BR2_KERNEL_HEADERS_5_15 + default "6.1.92" if BR2_KERNEL_HEADERS_6_1 + default "6.6.32" if BR2_KERNEL_HEADERS_6_6 + default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 3423666fb90ecc858b7f53f1ae9c4120be4f8c8c Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:22 +0200 Subject: [PATCH 1023/3013] DEVELOPERS: add Thomas Perale for 'go' Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 53ec6049a1f..2914e3c8a8c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3031,6 +3031,9 @@ F: package/frotz/ F: package/kvm-unit-tests/ F: package/xorcurses/ +N: Thomas Perale +F: package/go/ + N: Thomas Petazzoni F: arch/Config.in.arm F: board/beaglev/ From 0290c543dec8aae7cedf2bf149a950fdf4e7a44a Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:23 +0200 Subject: [PATCH 1024/3013] package/go: new subdirectory for go variants Move every go compiler-related packages into a newly created package/go/ subdirectory. This subdirectory structure moves the GO_VERSION variable into the common package/go/go.mk file. In the next commits, host-go will be turned into a virtual-package and the common GO_VERSION force the providers to use the same Go compiler version. Common variables to all providers are kept in package/go/go.mk and package/go/Config.in.host. Also, the subdirectory structure forces the evaluation of the common GO_VERSION before the providers access it. Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- DEVELOPERS | 3 -- package/Config.in.host | 3 -- package/go/Config.in.host | 4 ++ .../go-bootstrap-stage1/Config.in.host | 0 .../go-bootstrap-stage1.hash | 0 .../go-bootstrap-stage1.mk | 0 .../go-bootstrap-stage2/Config.in.host | 0 .../go-bootstrap-stage2.hash | 0 .../go-bootstrap-stage2.mk | 0 .../go-bootstrap-stage3/Config.in.host | 0 .../go-bootstrap-stage3.hash | 0 .../go-bootstrap-stage3.mk | 0 package/go/go.mk | 40 +------------- ...explicit-option-for-crosscompilation.patch | 0 ...ldvcs-false-when-building-go-bootstr.patch | 0 package/go/{ => go}/go.hash | 0 package/go/go/go.mk | 53 +++++++++++++++++++ 18 files changed, 60 insertions(+), 45 deletions(-) rename package/{ => go}/go-bootstrap-stage1/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage1/go-bootstrap-stage1.hash (100%) rename package/{ => go}/go-bootstrap-stage1/go-bootstrap-stage1.mk (100%) rename package/{ => go}/go-bootstrap-stage2/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage2/go-bootstrap-stage2.hash (100%) rename package/{ => go}/go-bootstrap-stage2/go-bootstrap-stage2.mk (100%) rename package/{ => go}/go-bootstrap-stage3/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage3/go-bootstrap-stage3.hash (100%) rename package/{ => go}/go-bootstrap-stage3/go-bootstrap-stage3.mk (100%) rename package/go/{ => go}/0001-build.go-explicit-option-for-crosscompilation.patch (100%) rename package/go/{ => go}/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%) rename package/go/{ => go}/go.hash (100%) create mode 100644 package/go/go/go.mk diff --git a/.checkpackageignore b/.checkpackageignore index 8345b6db958..c25298d54bd 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -715,7 +715,7 @@ package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch lib_patch.U package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch lib_patch.Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_patch.Upstream package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream -package/go/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream +package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream diff --git a/DEVELOPERS b/DEVELOPERS index 2914e3c8a8c..9cfc84dd65c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -616,9 +616,6 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ -F: package/go-bootstrap-stage1/ -F: package/go-bootstrap-stage2/ -F: package/go-bootstrap-stage3/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index 986b2854d0f..eacce5e4482 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -44,9 +44,6 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap-stage1/Config.in.host" - source "package/go-bootstrap-stage2/Config.in.host" - source "package/go-bootstrap-stage3/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 0d89e875adc..7edf45850d8 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -31,3 +31,7 @@ config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + +source "package/go/go-bootstrap-stage1/Config.in.host" +source "package/go/go-bootstrap-stage2/Config.in.host" +source "package/go/go-bootstrap-stage3/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go/go-bootstrap-stage1/Config.in.host similarity index 100% rename from package/go-bootstrap-stage1/Config.in.host rename to package/go/go-bootstrap-stage1/Config.in.host diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.hash b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap-stage1/go-bootstrap-stage1.hash rename to package/go/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk similarity index 100% rename from package/go-bootstrap-stage1/go-bootstrap-stage1.mk rename to package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go/go-bootstrap-stage2/Config.in.host similarity index 100% rename from package/go-bootstrap-stage2/Config.in.host rename to package/go/go-bootstrap-stage2/Config.in.host diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.hash similarity index 100% rename from package/go-bootstrap-stage2/go-bootstrap-stage2.hash rename to package/go/go-bootstrap-stage2/go-bootstrap-stage2.hash diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk similarity index 100% rename from package/go-bootstrap-stage2/go-bootstrap-stage2.mk rename to package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk diff --git a/package/go-bootstrap-stage3/Config.in.host b/package/go/go-bootstrap-stage3/Config.in.host similarity index 100% rename from package/go-bootstrap-stage3/Config.in.host rename to package/go/go-bootstrap-stage3/Config.in.host diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.hash b/package/go/go-bootstrap-stage3/go-bootstrap-stage3.hash similarity index 100% rename from package/go-bootstrap-stage3/go-bootstrap-stage3.hash rename to package/go/go-bootstrap-stage3/go-bootstrap-stage3.hash diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.mk b/package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk similarity index 100% rename from package/go-bootstrap-stage3/go-bootstrap-stage3.mk rename to package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk diff --git a/package/go/go.mk b/package/go/go.mk index 43dfe1eae56..5aa61c61999 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -5,14 +5,7 @@ ################################################################################ GO_VERSION = 1.22.3 -GO_SITE = https://storage.googleapis.com/golang -GO_SOURCE = go$(GO_VERSION).src.tar.gz -GO_LICENSE = BSD-3-Clause -GO_LICENSE_FILES = LICENSE -GO_CPE_ID_VENDOR = golang - -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -96,15 +89,6 @@ else HOST_GO_CGO_ENABLED = 0 endif -HOST_GO_CROSS_ENV = \ - CC_FOR_TARGET="$(TARGET_CC)" \ - CXX_FOR_TARGET="$(TARGET_CXX)" \ - GOOS="linux" \ - GOARCH=$(GO_GOARCH) \ - $(if $(GO_GO386),GO386=$(GO_GO386)) \ - $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ - GO_ASSUME_CROSSCOMPILING=1 - else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # host-go can still be used to build packages for the host. No need to set all # the arch stuff since we will not be cross-compiling. @@ -123,27 +107,7 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. -HOST_GO_MAKE_ENV = \ - GO111MODULE=off \ - GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ - GOROOT_FINAL=$(HOST_GO_ROOT) \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - GOOS=linux \ - CC=$(HOSTCC_NOCCACHE) \ - CXX=$(HOSTCXX_NOCCACHE) \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - $(HOST_GO_CROSS_ENV) - -define HOST_GO_BUILD_CMDS - cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) -endef - -define HOST_GO_INSTALL_CMDS +define GO_BINARIES_INSTALL $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_ROOT)/bin/go $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt @@ -165,4 +129,4 @@ define HOST_GO_INSTALL_CMDS find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef -$(eval $(host-generic-package)) +include $(sort $(wildcard package/go/*/*.mk)) diff --git a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch similarity index 100% rename from package/go/0001-build.go-explicit-option-for-crosscompilation.patch rename to package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch diff --git a/package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch similarity index 100% rename from package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch rename to package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch diff --git a/package/go/go.hash b/package/go/go/go.hash similarity index 100% rename from package/go/go.hash rename to package/go/go/go.hash diff --git a/package/go/go/go.mk b/package/go/go/go.mk new file mode 100644 index 00000000000..c3c40922f43 --- /dev/null +++ b/package/go/go/go.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# go +# +################################################################################ + +GO_SITE = https://storage.googleapis.com/golang +GO_SOURCE = go$(GO_VERSION).src.tar.gz + +GO_LICENSE = BSD-3-Clause +GO_LICENSE_FILES = LICENSE +GO_CPE_ID_VENDOR = golang + +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 + +ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) + +HOST_GO_CROSS_ENV = \ + CC_FOR_TARGET="$(TARGET_CC)" \ + CXX_FOR_TARGET="$(TARGET_CXX)" \ + GOOS="linux" \ + GOARCH=$(GO_GOARCH) \ + $(if $(GO_GO386),GO386=$(GO_GO386)) \ + $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ + GO_ASSUME_CROSSCOMPILING=1 + +endif + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_MAKE_ENV = \ + GO111MODULE=off \ + GOCACHE=$(HOST_GO_HOST_CACHE) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ + GOROOT_FINAL=$(HOST_GO_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ + $(HOST_GO_CROSS_ENV) + +define HOST_GO_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_INSTALL_CMDS + $(GO_BINARIES_INSTALL) +endef + +$(eval $(host-generic-package)) From 58a291470acf458239202bd81bfc642b9cadd298 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:24 +0200 Subject: [PATCH 1025/3013] package/pkg-golang: select BR2_PACKAGE_HOST_GO Makes every packages built by the Go compiler select a new variable introduced in this patch: BR2_PACKAGE_HOST_GO. In later commits Go compiler variant will be introduced (built from source, pre-built binaries) and selecting BR2_PACKAGE_HOST_GO will force to add host-go provider to the dependency list. The same pattern is used for Rust packages. Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- package/balena-engine/Config.in | 1 + package/cni-plugins/Config.in | 1 + package/containerd/Config.in | 1 + package/crucible/Config.in | 1 + package/delve/Config.in | 1 + package/delve/Config.in.host | 1 + package/docker-cli/Config.in | 1 + package/docker-compose/Config.in | 1 + package/docker-engine/Config.in | 1 + package/embiggen-disk/Config.in | 1 + package/flannel/Config.in | 1 + package/gitlab-runner/Config.in | 1 + package/go/Config.in.host | 5 +++++ package/gocryptfs/Config.in | 1 + package/mender-artifact/Config.in.host | 1 + package/mender-connect/Config.in | 1 + package/mender/Config.in | 1 + package/moby-buildkit/Config.in | 1 + package/moby-buildkit/Config.in.host | 1 + package/nerdctl/Config.in | 1 + package/runc/Config.in | 1 + package/runc/Config.in.host | 1 + package/tinifier/Config.in | 1 + package/wtfutil/Config.in | 1 + 24 files changed, 28 insertions(+) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index 02f694515ec..5966b33f585 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_BALENA_ENGINE depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime diff --git a/package/cni-plugins/Config.in b/package/cni-plugins/Config.in index 25e6ff534df..6d4ca0a5b41 100644 --- a/package/cni-plugins/Config.in +++ b/package/cni-plugins/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CNI_PLUGINS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU + select BR2_PACKAGE_HOST_GO help Container Networking Interface plugins. diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 2dd04b109c7..f014c56e105 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CONTAINERD depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES diff --git a/package/crucible/Config.in b/package/crucible/Config.in index b27eb31ae5d..1e1b29c3df8 100644 --- a/package/crucible/Config.in +++ b/package/crucible/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRUCIBLE bool "crucible" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help Crucible is a One-Time-Programmable (OTP) fusing tool for the i.MX family. diff --git a/package/delve/Config.in b/package/delve/Config.in index 9428e4016ad..288dc1ea15a 100644 --- a/package/delve/Config.in +++ b/package/delve/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_DELVE_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + select BR2_PACKAGE_HOST_GO config BR2_PACKAGE_DELVE bool "delve" diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host index dab5ca89144..0938ab0659b 100644 --- a/package/delve/Config.in.host +++ b/package/delve/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_DELVE bool "host delve" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help Delve is a debugger for the Go programming language. diff --git a/package/docker-cli/Config.in b/package/docker-cli/Config.in index 6f187c9d222..52e7f7c8712 100644 --- a/package/docker-cli/Config.in +++ b/package/docker-cli/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_CLI depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Docker is a platform to build, ship, and run applications as lightweight containers. diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 59128f7a199..f3560e402b7 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_DOCKER_CLI + select BR2_PACKAGE_HOST_GO help Multi-container applications with the Docker CLI. diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index d48ffe6484a..49a002a6478 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_LIBSECCOMP help diff --git a/package/embiggen-disk/Config.in b/package/embiggen-disk/Config.in index 667d71c86e6..c323fb1b6d6 100644 --- a/package/embiggen-disk/Config.in +++ b/package/embiggen-disk/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_EMBIGGEN_DISK depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_UTIL_LINUX # sfdisk select BR2_PACKAGE_UTIL_LINUX_BINARIES # sfdisk help diff --git a/package/flannel/Config.in b/package/flannel/Config.in index eb8d798f48b..f37cfaa9cc3 100644 --- a/package/flannel/Config.in +++ b/package/flannel/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_FLANNEL depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Flannel is a virtual network that gives a subnet to each host for use with container runtimes. diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in index 4289613ab9e..cfe8c941bca 100644 --- a/package/gitlab-runner/Config.in +++ b/package/gitlab-runner/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GITLAB_RUNNER select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_CA_CERTIFICATES # runtime select BR2_PACKAGE_GIT # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL_CURL # runtime select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 7edf45850d8..e1833d09050 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -32,6 +32,11 @@ config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS default y depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS +# Go packages should select BR2_PACKAGE_HOST_GO +config BR2_PACKAGE_HOST_GO + bool + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" source "package/go/go-bootstrap-stage3/Config.in.host" diff --git a/package/gocryptfs/Config.in b/package/gocryptfs/Config.in index 2630cafdcfa..2c70b9b21ba 100644 --- a/package/gocryptfs/Config.in +++ b/package/gocryptfs/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GOCRYPTFS bool "gocryptfs" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help gocryptfs is an encrypted FUSE overlay filesystem. diff --git a/package/mender-artifact/Config.in.host b/package/mender-artifact/Config.in.host index c7be0ed2616..39353b23e74 100644 --- a/package/mender-artifact/Config.in.host +++ b/package/mender-artifact/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MENDER_ARTIFACT bool "host mender-artifact" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help The mender-artifact tool is a CLI implementation of the Mender artifacts library. diff --git a/package/mender-connect/Config.in b/package/mender-connect/Config.in index 0845910880b..d478e468c2e 100644 --- a/package/mender-connect/Config.in +++ b/package/mender-connect/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MENDER_CONNECT depends on BR2_USE_WCHAR # libglib2 -> gettext depends on BR2_USE_MMU # dbus -> fork() select BR2_PACKAGE_DBUS # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_MENDER # runtime select BR2_PACKAGE_OPENSSL diff --git a/package/mender/Config.in b/package/mender/Config.in index 7d768cebec6..4831548f76d 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in index 93c852bcdb3..1a0b599097c 100644 --- a/package/moby-buildkit/Config.in +++ b/package/moby-buildkit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MOBY_BUILDKIT depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_USE_MMU select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + select BR2_PACKAGE_HOST_GO help BuildKit is a toolkit for converting source code to build artifacts in an efficient, expressive and repeatable manner. diff --git a/package/moby-buildkit/Config.in.host b/package/moby-buildkit/Config.in.host index a3b18548f84..d4eb0d74c31 100644 --- a/package/moby-buildkit/Config.in.host +++ b/package/moby-buildkit/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MOBY_BUILDKIT bool "host moby-buildkit" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help BuildKit is a toolkit for converting source code to build artifacts in an efficient expressive and repeatable manner. diff --git a/package/nerdctl/Config.in b/package/nerdctl/Config.in index 969b9bb40e9..062b36ab850 100644 --- a/package/nerdctl/Config.in +++ b/package/nerdctl/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_NERDCTL depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CONTAINERD # runtime + select BR2_PACKAGE_HOST_GO help Docker-compatible CLI for containerd, controlling runc. diff --git a/package/runc/Config.in b/package/runc/Config.in index fe527b19548..73eac72527c 100644 --- a/package/runc/Config.in +++ b/package/runc/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RUNC depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + select BR2_PACKAGE_HOST_GO help runC is a CLI tool for spawning and running containers according to the OCI specification. diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host index 4b2555e029b..78193cb499b 100644 --- a/package/runc/Config.in.host +++ b/package/runc/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_RUNC bool "host runc" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help runC is a CLI tool for spawning and running containers according to the OCI specification. diff --git a/package/tinifier/Config.in b/package/tinifier/Config.in index fbadfe6bd9e..eae8b8f4993 100644 --- a/package/tinifier/Config.in +++ b/package/tinifier/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TINIFIER bool "tinifier" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help CLI tool for images compressing diff --git a/package/wtfutil/Config.in b/package/wtfutil/Config.in index 8c3efcea5dd..3fd8c41bab0 100644 --- a/package/wtfutil/Config.in +++ b/package/wtfutil/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_WTFUTIL bool "wtfutil" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help WTF is the personal information dashboard for your terminal. From fa2536ec940105acc71630144bd1187c931462ac Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:25 +0200 Subject: [PATCH 1026/3013] package/go: make host package a virtual package Turns host-go into a virtual package, with a single providers: - host-go-src, which builds host-go from source based on the same logic that was previously used in package/go/go/go.mk, now moved to package/go/go-src/go-src.mk to remove any ambiguity on the role of the package. In later commits, we'll add host-go-bin a prebuilt binary host go compiler as another provider. A similar solution is proposed for host-rust. Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- package/go/Config.in.host | 24 +++++++++++++++++ ...explicit-option-for-crosscompilation.patch | 0 ...ldvcs-false-when-building-go-bootstr.patch | 0 package/go/{go/go.hash => go-src/go-src.hash} | 0 package/go/{go/go.mk => go-src/go-src.mk} | 27 ++++++++++--------- package/go/go.mk | 2 ++ 7 files changed, 41 insertions(+), 14 deletions(-) rename package/go/{go => go-src}/0001-build.go-explicit-option-for-crosscompilation.patch (100%) rename package/go/{go => go-src}/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%) rename package/go/{go/go.hash => go-src/go-src.hash} (100%) rename package/go/{go/go.mk => go-src/go-src.mk} (66%) diff --git a/.checkpackageignore b/.checkpackageignore index c25298d54bd..25ad6f1d634 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -715,7 +715,7 @@ package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch lib_patch.U package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch lib_patch.Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_patch.Upstream package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream -package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream +package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream diff --git a/package/go/Config.in.host b/package/go/Config.in.host index e1833d09050..483393f8e4a 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -37,6 +37,30 @@ config BR2_PACKAGE_HOST_GO bool depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS +if BR2_PACKAGE_HOST_GO + +choice + prompt "Go compiler variant" + default BR2_PACKAGE_HOST_GO_SRC + help + Select a Go compiler variant. + + Default to 'host-go-src'. + +config BR2_PACKAGE_HOST_GO_SRC + bool "host go (source)" + help + This package will build the go compiler for the host. + +endchoice + +config BR2_PACKAGE_PROVIDES_HOST_GO + string + # Default to host-go-src + default "host-go-src" if BR2_PACKAGE_HOST_GO_SRC + +endif + source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" source "package/go/go-bootstrap-stage3/Config.in.host" diff --git a/package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch similarity index 100% rename from package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch rename to package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch diff --git a/package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch similarity index 100% rename from package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch rename to package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch diff --git a/package/go/go/go.hash b/package/go/go-src/go-src.hash similarity index 100% rename from package/go/go/go.hash rename to package/go/go-src/go-src.hash diff --git a/package/go/go/go.mk b/package/go/go-src/go-src.mk similarity index 66% rename from package/go/go/go.mk rename to package/go/go-src/go-src.mk index c3c40922f43..1e061e20bc1 100644 --- a/package/go/go/go.mk +++ b/package/go/go-src/go-src.mk @@ -1,21 +1,22 @@ ################################################################################ # -# go +# go-src # ################################################################################ -GO_SITE = https://storage.googleapis.com/golang -GO_SOURCE = go$(GO_VERSION).src.tar.gz +GO_SRC_SITE = https://storage.googleapis.com/golang +GO_SRC_SOURCE = go$(GO_VERSION).src.tar.gz -GO_LICENSE = BSD-3-Clause -GO_LICENSE_FILES = LICENSE -GO_CPE_ID_VENDOR = golang +GO_SRC_LICENSE = BSD-3-Clause +GO_SRC_LICENSE_FILES = LICENSE +GO_SRC_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 +HOST_GO_SRC_PROVIDES = host-go +HOST_GO_SRC_DEPENDENCIES = host-go-bootstrap-stage3 ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) -HOST_GO_CROSS_ENV = \ +HOST_GO_SRC_CROSS_ENV = \ CC_FOR_TARGET="$(TARGET_CC)" \ CXX_FOR_TARGET="$(TARGET_CXX)" \ GOOS="linux" \ @@ -28,7 +29,7 @@ endif # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. -HOST_GO_MAKE_ENV = \ +HOST_GO_SRC_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ @@ -39,14 +40,14 @@ HOST_GO_MAKE_ENV = \ CC=$(HOSTCC_NOCCACHE) \ CXX=$(HOSTCXX_NOCCACHE) \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - $(HOST_GO_CROSS_ENV) + $(HOST_GO_SRC_CROSS_ENV) -define HOST_GO_BUILD_CMDS +define HOST_GO_SRC_BUILD_CMDS cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) + $(HOST_GO_SRC_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) endef -define HOST_GO_INSTALL_CMDS +define HOST_GO_SRC_INSTALL_CMDS $(GO_BINARIES_INSTALL) endef diff --git a/package/go/go.mk b/package/go/go.mk index 5aa61c61999..dfcb633aa77 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -129,4 +129,6 @@ define GO_BINARIES_INSTALL find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef +$(eval $(host-virtual-package)) + include $(sort $(wildcard package/go/*/*.mk)) From 9cf5c95e38488f79a4a27ca7a27a5875029cbbe4 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:27 +0200 Subject: [PATCH 1027/3013] support/testing: add tests for Go providers Test the source provider of host-go to build a Go package. The tests consist of building and installing a Go package in the root file system of an ARM vexpress QEMU system. Signed-off-by: Thomas Perale [yann.morin.1998@free.fr: drop the go-bin test-case] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_go.py | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 support/testing/tests/package/test_go.py diff --git a/support/testing/tests/package/test_go.py b/support/testing/tests/package/test_go.py new file mode 100644 index 00000000000..0b25fbc26d5 --- /dev/null +++ b/support/testing/tests/package/test_go.py @@ -0,0 +1,27 @@ +import os + +import infra.basetest + + +class TestGoBase(infra.basetest.BRTest): + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + +class TestGoSource(TestGoBase): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_HOST_GO=y + BR2_PACKAGE_HOST_GO_SRC=y + BR2_PACKAGE_TINIFIER=y + """ + + def test_run(self): + self.login() + self.assertRunOk("tinifier -h") From 6c8a7a7bc92f56b53b2602727a12aa13e3248d24 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:24 +0000 Subject: [PATCH 1028/3013] package/mtd: bump to version 2.2.0 https://lists.infradead.org/pipermail/linux-mtd/2024-March/104058.html Signed-off-by: Brandon Maier Signed-off-by: Yann E. MORIN --- package/mtd/mtd.hash | 4 ++-- package/mtd/mtd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index 9926a34a804..1efb06f4902 100644 --- a/package/mtd/mtd.hash +++ b/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://infraroot.at/pub/mtd/mtd-utils-2.1.6.tar.bz2.asc -sha256 c1d853bc4adf83bcabd2792fc95af33bdd8643c97e8f7b3f0180af36af76f0e5 mtd-utils-2.1.6.tar.bz2 +# https://infraroot.at/pub/mtd/mtd-utils-2.2.0.tar.bz2.asc +sha256 250d082f67375ca8451b5fcfc9a23a53ced3ebebd8312c288daf2507bbab1324 mtd-utils-2.2.0.tar.bz2 sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 998cc419b31..f71179c2de6 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.1.6 +MTD_VERSION = 2.2.0 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 From 5806419b9150e7d019a2a8fe13f184c6943cc171 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:22 +0000 Subject: [PATCH 1029/3013] support/testing: add mtd test Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: - don't set an empty BR2_ENABLE_LOCALE_WHITELIST ] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_mtd.py | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 support/testing/tests/package/test_mtd.py diff --git a/support/testing/tests/package/test_mtd.py b/support/testing/tests/package/test_mtd.py new file mode 100644 index 00000000000..bdb09c39ec6 --- /dev/null +++ b/support/testing/tests/package/test_mtd.py @@ -0,0 +1,47 @@ +import os + +import infra.basetest + + +class TestMtd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MTD=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_CPIO=y + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + + self.emulator.login() + + mtd = "/dev/mtd0" + erasesize = 256 * 1024 + test_sectors = 4 + test_size = erasesize * test_sectors + + output, exit_code = self.emulator.run(f"mtd_debug info {mtd}") + output = [x.strip() for x in output if x.strip()] + self.assertEqual(output, [ + "mtd.type = MTD_NORFLASH", + "mtd.flags = MTD_CAP_NORFLASH", + "mtd.size = 134217728 (128M)", + "mtd.erasesize = 262144 (256K)", + "mtd.writesize = 1", + "mtd.oobsize = 0", + "regions = 0", + ]) + + # Test flashcp + self.assertRunOk(f"dd if=/dev/urandom of=random.bin bs={test_size} count=1") + self.assertRunOk(f"flashcp random.bin {mtd}") + self.assertRunOk(f"cmp -s -n {test_size} random.bin {mtd}") + + # Test flash_erase + self.assertRunOk(f"dd if=/dev/zero bs={test_size} count=1 | tr '\\000' '\\377' >nor-erase.bin") + self.assertRunOk(f"flash_erase {mtd} 0 {test_sectors}") + self.assertRunOk(f"cmp -s -n {test_size} nor-erase.bin {mtd}") From 7eb1ea5b6548270eb736054be87a250ea975ff6d Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:23 +0000 Subject: [PATCH 1030/3013] package/mtd: switch to https mirror As mentioned in the last release notes, there is an https mirror[1]. Switch to this as ftp is not as widely supported anymore. [1] https://lists.infradead.org/pipermail/linux-mtd/2023-August/100922.html Signed-off-by: Brandon Maier Signed-off-by: Yann E. MORIN --- package/mtd/mtd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 998cc419b31..39b9f2a5236 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -6,7 +6,7 @@ MTD_VERSION = 2.1.6 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 -MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils +MTD_SITE = https://infraroot.at/pub/mtd MTD_LICENSE = GPL-2.0 MTD_LICENSE_FILES = COPYING MTD_CPE_ID_VENDOR = mtd-utils_project From f6ad5198245015425f8720117b6bd4f3df243de5 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:25 +0000 Subject: [PATCH 1031/3013] DEVELOPERS: add myself for package/mtd Signed-off-by: Brandon Maier Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 53ec6049a1f..b9568ed7c58 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,6 +545,7 @@ F: configs/ls1046a-frwy_defconfig F: package/bats-assert/ F: package/bats-file/ F: package/bats-support/ +F: package/mtd/ F: package/python-pysensors/ F: package/qoriq-fm-ucode/ F: package/unifdef/ From 363a0fb1461aaeb6bb1185f231bee19f513a8c52 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 1 Jun 2024 14:59:30 +0200 Subject: [PATCH 1032/3013] package/nano: bump to version 8.0 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 3ca37c6337e..fc9a0947a35 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v7/nano-7.2.tar.xz.asc +# https://www.nano-editor.org/dist/v8/nano-8.0.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526 nano-7.2.tar.xz +sha256 c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4 nano-8.0.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 8b93527becc..72f4de6a0ac 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 7 -NANO_VERSION = $(NANO_VERSION_MAJOR).2 +NANO_VERSION_MAJOR = 8 +NANO_VERSION = $(NANO_VERSION_MAJOR).0 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From a0d47a69916e7e143059ee21d6b70a5a65abfefc Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 1 Jun 2024 14:59:41 +0200 Subject: [PATCH 1033/3013] package/libfribidi: bump to version 1.0.14 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 9187112cee8..b37fb92236f 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2 fribidi-1.0.13.tar.xz +sha256 76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a fribidi-1.0.14.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index ba0859c93d4..7c6d32fb76b 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.13 +LIBFRIBIDI_VERSION = 1.0.14 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ From 707318c08b5de008e3de51aa6e9b38391c3c8e37 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 1 Jun 2024 14:59:51 +0200 Subject: [PATCH 1034/3013] package/luarocks: bump to version 3.11.1 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/luarocks/luarocks.hash | 2 +- package/luarocks/luarocks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index fbf52702168..15a44f9dbe9 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 25f56b3c7272fb35b869049371d649a1bbe668a56d24df0a66e3712e35dd44a6 luarocks-3.11.0.tar.gz +sha256 c3fb3d960dffb2b2fe9de7e3cb004dc4d0b34bb3d342578af84f84325c669102 luarocks-3.11.1.tar.gz sha256 660773f53ed17cd0d8be7d67168c25e8cc664a506788c7b5971192bdd2994a9d COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 4c992291426..cf5f966cd5e 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.11.0 +LUAROCKS_VERSION = 3.11.1 LUAROCKS_SITE = https://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From 507caef3ddf5ab7d933e14303508db057c4b9501 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 31 May 2024 20:53:28 +0200 Subject: [PATCH 1035/3013] package/dnsmasq: Fix init script restart command Restarting dnsmasq can cause constant issues: stop works, but start fails because the new instance can't bind the socket. Another restart immediately after works just fine: # /etc/init.d/S80dnsmasq restart Stopping dnsmasq: OK Starting dnsmasq: dnsmasq: failed to create listening socket for 192.168.128.1: Address in use FAIL # /etc/init.d/S80dnsmasq restart Stopping dnsmasq: FAIL Starting dnsmasq: OK Solve this by waiting for process to actually stop before returning from the stop command. Clean up the PID file after to avoid potential issues with the PID being reused after stop. The wait could also be placed inside the restart block, but putting it into the stop block has the advantage that it also avoids similar issues for any other callers. Signed-off-by: Fiona Klute [yann.morin.1998@free.fr: - fix shellcheck - reflow commit log ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - package/dnsmasq/S80dnsmasq | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 846cd8e1ecf..914f3b5bb54 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -552,7 +552,6 @@ package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch lib_patch.Upstream package/dmraid/0001-fix-compilation-under-musl.patch lib_patch.Upstream package/dmraid/S20dmraid lib_sysv.Variables -package/dnsmasq/S80dnsmasq Shellcheck package/docker-engine/S60dockerd Shellcheck lib_sysv.Indent lib_sysv.Variables package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch lib_patch.Upstream package/domoticz/S99domoticz Shellcheck diff --git a/package/dnsmasq/S80dnsmasq b/package/dnsmasq/S80dnsmasq index 175daf9d268..f1e1a685854 100644 --- a/package/dnsmasq/S80dnsmasq +++ b/package/dnsmasq/S80dnsmasq @@ -10,12 +10,21 @@ case "$1" in printf "Starting dnsmasq: " start-stop-daemon -S -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- \ --pid-file="$PIDFILE" + # shellcheck disable=SC2181 [ $? = 0 ] && echo "OK" || echo "FAIL" ;; stop) printf "Stopping dnsmasq: " start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + # shellcheck disable=SC2181 [ $? = 0 ] && echo "OK" || echo "FAIL" + # wait for dnsmasq process to be gone + while true; do + pid="$( cat "${PIDFILE}" 2>/dev/null || true )" + { [ -n "${pid}" ] && [ -d "/proc/${pid}" ]; } || break + sleep 0.1 + done + rm -f "$PIDFILE" ;; restart|reload) $0 stop From cc08d6f5d1a152279c340f56539a43d932ea0b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Wed, 29 May 2024 20:22:57 +0200 Subject: [PATCH 1036/3013] micropython: Add patch to avoid textrel on arm/thumb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Yann E. MORIN --- ...-non-Thumb2-long-jump-workaround-opt.patch | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch diff --git a/package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch b/package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch new file mode 100644 index 00000000000..b05791045e7 --- /dev/null +++ b/package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch @@ -0,0 +1,130 @@ +From 7b050b366b7dacfb43779c51702a892d8f1873d0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= +Date: Sun, 2 Apr 2023 19:58:42 +0200 +Subject: [PATCH] py/nlrthumb: Make non-Thumb2 long-jump workaround opt-in. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Although the original motivation given for the workaround[1] is correct, +nlr.o and nlrthumb.o are linked with a small enough distance that the +problem does not occur, and the workaround isn't necessary. The distance +between the b instruction and its target (nlr_push_tail) is just 64 +bytes[2], well within the ±2046 byte range addressable by an +unconditional branch instruction in Thumb mode. + +The workaround induces a relocation in the text section (textrel), which +isn't supported everywhere, notably not on musl-libc[3], where it causes +a crash on start-up. With the workaround removed, micropython works on an +ARMv5T Linux system built with musl-libc. + +This commit changes nlrthumb.c to use a direct jump by default, but +leaves the long jump workaround as an option for those cases where it's +actually needed. + +[1]: commit dd376a239dc4f47b0ee7866810fcda151f3cf6dd + +Author: Damien George +Date: Fri Sep 1 15:25:29 2017 +1000 + + py/nlrthumb: Get working again on standard Thumb arch (ie not Thumb2). + + "b" on Thumb might not be long enough for the jump to nlr_push_tail so + it must be done indirectly. + +[2]: Excerpt from objdump -d micropython: + +000095c4 : + 95c4: b510 push {r4, lr} + 95c6: 0004 movs r4, r0 + 95c8: f02d fd42 bl 37050 + 95cc: 6943 ldr r3, [r0, #20] + 95ce: 6023 str r3, [r4, #0] + 95d0: 6144 str r4, [r0, #20] + 95d2: 2000 movs r0, #0 + 95d4: bd10 pop {r4, pc} + +000095d6 : + 95d6: b510 push {r4, lr} + 95d8: f02d fd3a bl 37050 + 95dc: 6943 ldr r3, [r0, #20] + 95de: 681b ldr r3, [r3, #0] + 95e0: 6143 str r3, [r0, #20] + 95e2: bd10 pop {r4, pc} + +000095e4 : + 95e4: 60c4 str r4, [r0, #12] + 95e6: 6105 str r5, [r0, #16] + 95e8: 6146 str r6, [r0, #20] + 95ea: 6187 str r7, [r0, #24] + 95ec: 4641 mov r1, r8 + 95ee: 61c1 str r1, [r0, #28] + 95f0: 4649 mov r1, r9 + 95f2: 6201 str r1, [r0, #32] + 95f4: 4651 mov r1, sl + 95f6: 6241 str r1, [r0, #36] @ 0x24 + 95f8: 4659 mov r1, fp + 95fa: 6281 str r1, [r0, #40] @ 0x28 + 95fc: 4669 mov r1, sp + 95fe: 62c1 str r1, [r0, #44] @ 0x2c + 9600: 4671 mov r1, lr + 9602: 6081 str r1, [r0, #8] + 9604: e7de b.n 95c4 + +[3]: https://www.openwall.com/lists/musl/2020/09/25/4 + +Signed-off-by: J. Neuschäfer +Upstream: https://github.com/micropython/micropython/commit/7b050b366b7dacfb43779c51702a892d8f1873d0 +--- + py/mpconfig.h | 6 ++++++ + py/nlrthumb.c | 10 +++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/py/mpconfig.h b/py/mpconfig.h +index af2480266..1aa3e0699 100644 +--- a/py/mpconfig.h ++++ b/py/mpconfig.h +@@ -587,6 +587,12 @@ + /*****************************************************************************/ + /* Python internal features */ + ++// Use a special long jump in nlrthumb.c, which may be necessary if nlr.o and ++// nlrthumb.o are linked far apart from each other. ++#ifndef MICROPY_NLR_THUMB_USE_LONG_JUMP ++#define MICROPY_NLR_THUMB_USE_LONG_JUMP (0) ++#endif ++ + // Whether to enable import of external modules + // When disabled, only importing of built-in modules is supported + // When enabled, a port must implement mp_import_stat (among other things) +diff --git a/py/nlrthumb.c b/py/nlrthumb.c +index a22c5df5b..e7b24f242 100644 +--- a/py/nlrthumb.c ++++ b/py/nlrthumb.c +@@ -38,6 +38,14 @@ + + __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) { + ++ // If you get a linker error here, indicating that a relocation doesn't ++ // fit, try the following (in that order): ++ // ++ // 1. Ensure that nlr.o nlrthumb.o are linked closely together, i.e. ++ // there aren't too many other files between them in the linker list ++ // (PY_CORE_O_BASENAME in py/py.mk) ++ // 2. Set -DMICROPY_NLR_THUMB_USE_LONG_JUMP=1 during the build ++ // + __asm volatile ( + "str r4, [r0, #12] \n" // store r4 into nlr_buf + "str r5, [r0, #16] \n" // store r5 into nlr_buf +@@ -71,7 +79,7 @@ __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) { + "str lr, [r0, #8] \n" // store lr into nlr_buf + #endif + +- #if !defined(__thumb2__) ++ #if MICROPY_NLR_THUMB_USE_LONG_JUMP + "ldr r1, nlr_push_tail_var \n" + "bx r1 \n" // do the rest in C + ".align 2 \n" +-- +2.43.0 + From f3b2f0f9859b4bcb422d69437ecb01ee9038d3c1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 Jun 2024 14:39:08 +0200 Subject: [PATCH 1037/3013] package/gcc: update to 13.3.0 See here for changes made to this release: https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=13.3 Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- .../0001-disable-split-stack-for-non-thread-builds.patch | 0 .../0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch | 0 .../0003-Remove-crypt-and-crypt_r-interceptors.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 6 files changed, 4 insertions(+), 4 deletions(-) rename package/gcc/{13.2.0 => 13.3.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) rename package/gcc/{13.2.0 => 13.3.0}/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch (100%) rename package/gcc/{13.2.0 => 13.3.0}/0003-Remove-crypt-and-crypt_r-interceptors.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 914f3b5bb54..9264f84a158 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -665,7 +665,7 @@ package/gamin/0001-no-abstract-sockets.patch lib_patch.Upstream package/gamin/0002-no-const-return.patch lib_patch.Sob lib_patch.Upstream package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch lib_patch.Upstream package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream diff --git a/package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/13.2.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch b/package/gcc/13.3.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch similarity index 100% rename from package/gcc/13.2.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch rename to package/gcc/13.3.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch diff --git a/package/gcc/13.2.0/0003-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/13.3.0/0003-Remove-crypt-and-crypt_r-interceptors.patch similarity index 100% rename from package/gcc/13.2.0/0003-Remove-crypt-and-crypt_r-interceptors.patch rename to package/gcc/13.3.0/0003-Remove-crypt-and-crypt_r-interceptors.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 2324561a3ef..969702b707f 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -74,7 +74,7 @@ config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "12.3.0" if BR2_GCC_VERSION_12_X - default "13.2.0" if BR2_GCC_VERSION_13_X + default "13.3.0" if BR2_GCC_VERSION_13_X default "14.1.0" if BR2_GCC_VERSION_14_X default "arc-2023.09-release" if BR2_GCC_VERSION_ARC diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 08d4fca6e7a..0b48a1acddd 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -4,8 +4,8 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.2.0/sha512.sum -sha512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 gcc-13.2.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.3.0/sha512.sum +sha512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 gcc-13.3.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-14.1.0/sha512.sum sha512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea gcc-14.1.0.tar.xz From 1d127da425c3b7f7f483968d038a73d32f592263 Mon Sep 17 00:00:00 2001 From: Sebastien Laveze Date: Wed, 29 May 2024 09:29:10 +0200 Subject: [PATCH 1038/3013] package/mosquitto: build mosquitto_{ctrl,passwd} if the broker is enabled The tools require openssl (and cjson for mosquitto_ctrl), and are silently skipped by the mosquitto build system if those are not available. The tools are small compared to the broker and dependencies: -rwxr-xr-x 1 peko peko 4.8M Jun 1 00:42 target/usr/lib/libcrypto.so.3 -rwxr-xr-x 1 peko peko 968K Jun 1 00:42 target/usr/lib/libssl.so.3 -rwxr-xr-x 1 peko peko 266K Jun 1 00:42 target/usr/sbin/mosquitto -rwxr-xr-x 1 peko peko 54K Jun 1 00:42 target/usr/bin/mosquitto_ctrl -rwxr-xr-x 1 peko peko 34K Jun 1 00:42 target/usr/lib/libcjson.so.1.7.18 -rwxr-xr-x 1 peko peko 26K Jun 1 00:42 target/usr/bin/mosquitto_passwd So automatically build them (if the dependencies are available) when the broker is built. Notice: We have to explicitly build apps/mosquitto_ctrl + apps/mosquitto_passwd and not just apps, as apps/Makefile uses a DIRS variable that conflicts with the DIRS=.. we pass to the toplevel Makefile. Signed-off-by: Sebastien Laveze [Peter: drop dedicated option, also handle mosquitto_ctrl] Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index b847e56fec5..6b249c37fd6 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -91,7 +91,7 @@ endif MOSQUITTO_MAKE_DIRS = lib client ifeq ($(BR2_PACKAGE_MOSQUITTO_BROKER),y) -MOSQUITTO_MAKE_DIRS += src +MOSQUITTO_MAKE_DIRS += src apps/mosquitto_ctrl apps/mosquitto_passwd endif define MOSQUITTO_BUILD_CMDS From ebe238f2b595136be92c53aa70c40d3f333cc34e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 2 Jun 2024 16:55:42 +0200 Subject: [PATCH 1039/3013] package/pkg-download: use _DL_SUBDIR as root dir of generated archives Currently, when we generate archives, e.g. for git, svn, cargo or go, we use the package _BASENAME_RAW as the root directory of the generated archive. For example, for package foo at version 1.2.3, that would generate an archive rooted at foo-1.2.3/. This is usually what we want, except in one specific condition: when the package shares its download with another package *and* it is a generated archive. In that case, the root directory will be different for each of the two packages, which is incorrect, but was so far benign: we never had any hash for such generated archives, and they were only generated in two cases: - linux and linux-headers - barebox and barebox-aux As we skip one directory depth when extracting the archives, we did not care what the root directory was; whether it was that of one package or the other was of no consequence. But now that we can have hashes for archives generated from custom versions, this breaks the usual case where the headers used for the toolchains are those of the kernel to build for the target. In this case, we may end up downloading the linux-headers package before we download the linux package, so we'd get the hash for an archive rooted at linux-headers-XXX/, but the one for the linux package the archive would be rooted at linux-XXX/, or we may end up (e.g. with parallel builds) downloading the linux package first and linux-headers next. That would cause conflicts in hashes, as demonstrated by the only defconfig we have in that situation, olimex_stmp157_olinuxino_lime_defconfig. _BASENAME_RAW is a construct that is expanded to include the RAWNAME followed by a dash and the version, if there is a version, or with just the RAWNAME when there is no version. We tweak the download macro to use _DL_SUBDIR followed by the version. This is only used by VCS backends (cvs, git, svn...) and so there will always be a version string, so no need to duplicate the case without a version like is done for _BASENAME_RAW _DL_SUBDIR defaults to _RAWNAME, so this is a noop by default, unless the package declares it shares its download with another one, in which case the generated archive will now be rooted as for the shared package. This was triggered by: https://patchwork.ozlabs.org/project/buildroot/patch/20240602070634.597337-1-francois.perrad@gadz.org/ Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Francois Perrad Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 4be45c9d12d..bec213fb711 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -117,7 +117,7 @@ define DOWNLOAD -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ $(foreach f,$($(2)_HASH_FILES),-H '$(f)') \ - -n '$($(2)_BASENAME_RAW)' \ + -n '$($(2)_DL_SUBDIR)-$($(2)_VERSION)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ $(if $(filter YES,$($(2)_SVN_EXTERNALS)),-r) \ From 75da04c817b07a9c426cf2e438b0f8883096f4ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 2 Jun 2024 18:21:23 +0200 Subject: [PATCH 1040/3013] package/qt5base: fix download Since qt5base was last bumped in 8ab4a0a348b2 (package/qt5: bump packages to latest kde submodule versions), the hash for the downloaded tarball has changed: $ make qt5base-source [...] ERROR: expected: 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d ERROR: got : 3067c4d84ba9927bfe65bf606c17af082199e0a3b22781fbf9bc6c6bc3de26dd We know the hash was good back when 8ab4a0a348b2 was applied, because the tarball has been cached on sources.buildroot.org with the expected hash: $ curl 'https://sources.buildroot.net/qt5base/qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2' 2>/dev/null |sha256sum - 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d - But now, the archive generated by the KDE gorge (Gitlab underneath) has another hash (as seen above). This means that the KDE forge (Gitlab) has changed the way it generates archives. So, what's the delta? It turns out that the only changes are about CRLF that were present in the original archive, and are no longer in the new one. It is to be noted that the affected files do not have CRLFS in the repository. It further turns out that the archive was previously generated with .gitattibutes of the main branch ('dev' in Qt repositories), while now they are generated with the .gitattibutes of the commit for which they are generated. Switch to using the git download method for really reproducible archives... Signed-off-by: Yann E. MORIN Cc: Sebastian Weyer Cc: Peter Korsgaard Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index ffc474f49eb..77b88fa9095 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2 +sha256 9219c8e5d82b32b351743fb548f248400f3b3eca9db37a43b2b8c929d2625c01 qt5base-da6e958319e95fe564d3b30c931492dd666bfaff-git4.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e173639cca6..bbab9b3de17 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -5,8 +5,8 @@ ################################################################################ QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff -QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) -QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 +QT5BASE_SITE = $(QT5_SITE)/qtbase +QT5BASE_SITE_METHOD = git QT5BASE_CPE_ID_VENDOR = qt QT5BASE_CPE_ID_PRODUCT = qt From 4456bec6ab7c579ec6adc472fdca705a01ad57ed Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 2 Jun 2024 09:06:33 +0200 Subject: [PATCH 1041/3013] configs/olimex_stmp157_olinuxino_lime: add hashes and enable BR2_DOWNLOAD_FORCE_CHECK_HASHES Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../stmp1_olinuxino/patches/linux-headers/linux-headers.hash | 1 + board/olimex/stmp1_olinuxino/patches/linux/linux.hash | 2 ++ board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash | 2 ++ configs/olimex_stmp157_olinuxino_lime_defconfig | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) create mode 120000 board/olimex/stmp1_olinuxino/patches/linux-headers/linux-headers.hash create mode 100644 board/olimex/stmp1_olinuxino/patches/linux/linux.hash create mode 100644 board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 9264f84a158..1c5ab08f5f1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -249,7 +249,6 @@ configs/olimex_a20_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash configs/olimex_a20_olinuxino_micro_defconfig lib_defconfig.ForceCheckHash configs/olimex_a33_olinuxino_defconfig lib_defconfig.ForceCheckHash configs/olimex_a64_olinuxino_defconfig lib_defconfig.ForceCheckHash -configs/olimex_stmp157_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash configs/olpc_xo175_defconfig lib_defconfig.ForceCheckHash configs/olpc_xo1_defconfig lib_defconfig.ForceCheckHash configs/orangepi_lite2_defconfig lib_defconfig.ForceCheckHash diff --git a/board/olimex/stmp1_olinuxino/patches/linux-headers/linux-headers.hash b/board/olimex/stmp1_olinuxino/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/olimex/stmp1_olinuxino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/olimex/stmp1_olinuxino/patches/linux/linux.hash b/board/olimex/stmp1_olinuxino/patches/linux/linux.hash new file mode 100644 index 00000000000..8691d5ffd39 --- /dev/null +++ b/board/olimex/stmp1_olinuxino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 5d3ca43b81056305860d7407c871eac4f8eafa603029ee67816574a31444fd93 linux-fc74113e14d76aea9482264ff42e07397b94553d-git4.tar.gz diff --git a/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash b/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash new file mode 100644 index 00000000000..a991a1922fb --- /dev/null +++ b/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6aaa18a9023db29ceaad5bca240605990b68a6bf348aaefad0bee8be8d37648e uboot-efadf793a0a5924e2c96362dc1df3e56622ebb97-git4.tar.gz diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index 8bd8e10ca98..ecfa7813543 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -5,6 +5,10 @@ BR2_cortex_a7=y # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Build +BR2_GLOBAL_PATCH_DIR="board/olimex/stmp1_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System configuration BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" From 0deb8c4c5dcae01e1da772e2e1540aa989e8af8b Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 2 Jun 2024 16:19:54 +0200 Subject: [PATCH 1042/3013] package/ncftp: bump to version 3.2.7 Change download location as the new version is not available at the old location. Remove already upstreamed patch. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/ncftp/0001-fix-gcc-10.patch | 24 ------------------------ package/ncftp/ncftp.hash | 2 +- package/ncftp/ncftp.mk | 8 +++----- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/ncftp/0001-fix-gcc-10.patch diff --git a/.checkpackageignore b/.checkpackageignore index 25ad6f1d634..c3de61111fa 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1086,7 +1086,6 @@ package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream -package/ncftp/0001-fix-gcc-10.patch lib_patch.Upstream package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream diff --git a/package/ncftp/0001-fix-gcc-10.patch b/package/ncftp/0001-fix-gcc-10.patch deleted file mode 100644 index 8ff9c44c502..00000000000 --- a/package/ncftp/0001-fix-gcc-10.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with gcc 10 - -Add missing extern to gBm to fix the following build failure with --fno-common which is enabled by default with gcc 10: - -/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: bookmark.o:(.bss+0x10): multiple definition of `gBm'; gpshare.o:(.bss+0x24): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/78822bc0e0039e8f8949011a256cac022863276f - -Signed-off-by: Fabrice Fontaine - -diff -Nura ncftp-3.2.6-orig/sh_util/gpshare.c ncftp-3.2.6/sh_util/gpshare.c ---- ncftp-3.2.6-orig/sh_util/gpshare.c 2020-08-21 10:46:34.173816750 +0200 -+++ ncftp-3.2.6/sh_util/gpshare.c 2020-08-21 10:52:25.407976319 +0200 -@@ -28,7 +28,7 @@ - - static int gIsAtty1 = 1, gIsAtty2 = 1; - extern int gLoadedBm, gBookmarkMatchMode; --Bookmark gBm; -+extern Bookmark gBm; - - double - FileSize(double size, const char **uStr0, double *uMult0) diff --git a/package/ncftp/ncftp.hash b/package/ncftp/ncftp.hash index 3ab27df5cc8..3e390b10153 100644 --- a/package/ncftp/ncftp.hash +++ b/package/ncftp/ncftp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23 ncftp-3.2.6-src.tar.gz +sha256 d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8 ncftp-3.2.7-src.tar.xz sha256 4fe2f063d25d79c49712a272ebb68e050c703eed9c66c80108427edfe3285580 doc/LICENSE.txt diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 676a9c58959..a3aa3fb1940 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -4,11 +4,9 @@ # ################################################################################ -NCFTP_VERSION = 3.2.6 -# use .gz as upstream .xz tarball has changed after the hash was added for -# 2017.02. Can be changed back to .xz when version is bumped -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz -NCFTP_SITE = ftp://ftp.ncftp.com/ncftp +NCFTP_VERSION = 3.2.7 +NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz +NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License NCFTP_LICENSE_FILES = doc/LICENSE.txt From a1d5e366b5bb42e2655113f02256caeb17983218 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:04 +0200 Subject: [PATCH 1043/3013] package/doom-wad: drop reference to ftp.idsoftware.com The server was decommisioned in 2017 and is unlikely to ever come back, so drop the reference: https://www.doomworld.com/forum/topic/96999-rip-ftpidsoftwarecom/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/doom-wad/doom-wad.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/doom-wad/doom-wad.mk b/package/doom-wad/doom-wad.mk index f348fc2207e..5d37a6a6d42 100644 --- a/package/doom-wad/doom-wad.mk +++ b/package/doom-wad/doom-wad.mk @@ -7,7 +7,6 @@ DOOM_WAD_VERSION = 1.9 DOOM_WAD_SOURCE = doom$(subst .,,$(DOOM_WAD_VERSION))s.zip # Official server currently unavailable -# DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom DOOM_WAD_SITE = http://www.jbserver.com/downloads/games/doom/misc/shareware define DOOM_WAD_EXTRACT_CMDS From 1efc1e7b90f2c1a831d31ecbc1f58320f60bb560 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:05 +0200 Subject: [PATCH 1044/3013] package/ebtables: switch to https:// For consistency, adapt the reference in the hash file too. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: switch to https as suggested by Baruch] Signed-off-by: Yann E. MORIN --- package/ebtables/ebtables.hash | 2 +- package/ebtables/ebtables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ebtables/ebtables.hash b/package/ebtables/ebtables.hash index 98106b0d601..c09403b63ba 100644 --- a/package/ebtables/ebtables.hash +++ b/package/ebtables/ebtables.hash @@ -1,4 +1,4 @@ -# ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz.sha256sum +# https://netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz.sha256sum sha256 b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a ebtables-2.0.11.tar.gz # Locally computed sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 2f9dd5ac4bf..46c22dde9ba 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -5,7 +5,7 @@ ################################################################################ EBTABLES_VERSION = 2.0.11 -EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables +EBTABLES_SITE = https://netfilter.org/pub/ebtables EBTABLES_LICENSE = GPL-2.0+ EBTABLES_LICENSE_FILES = COPYING EBTABLES_CPE_ID_VENDOR = netfilter From 02f6617b680a42eeec5ba7b5d478111dbc8ca185 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:06 +0200 Subject: [PATCH 1045/3013] package/file: use https:// _SITE ftp.astrom.com also serves the files over https://, so use that instead. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: use https, not http] Signed-off-by: Yann E. MORIN --- package/file/file.hash | 2 +- package/file/file.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index 08e8497471a..7c15569c094 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,5 +1,5 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.45.tar.gz.asc +# https://astron.com/pub/file/file-5.45.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A sha256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82 file-5.45.tar.gz sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING diff --git a/package/file/file.mk b/package/file/file.mk index b67fcaead47..27d9181d764 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -5,7 +5,7 @@ ################################################################################ FILE_VERSION = 5.45 -FILE_SITE = ftp://ftp.astron.com/pub/file +FILE_SITE = https://astron.com/pub/file FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c FILE_CPE_ID_VALID = YES From e30a0035e1d4f04da877d22afcd9c60a2438ba01 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:07 +0200 Subject: [PATCH 1046/3013] package/freeradius-client: use https:// _SITE The tarballs are also available at https://freeradius.org/ftp/pub/freeradius/, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/freeradius-client/freeradius-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freeradius-client/freeradius-client.mk b/package/freeradius-client/freeradius-client.mk index b1136434154..32be15ba793 100644 --- a/package/freeradius-client/freeradius-client.mk +++ b/package/freeradius-client/freeradius-client.mk @@ -5,7 +5,7 @@ ################################################################################ FREERADIUS_CLIENT_VERSION = 1.1.7 -FREERADIUS_CLIENT_SITE = ftp://ftp.freeradius.org/pub/freeradius +FREERADIUS_CLIENT_SITE = https://freeradius.org/ftp/pub/freeradius FREERADIUS_CLIENT_LICENSE = BSD-2-Clause FREERADIUS_CLIENT_LICENSE_FILES = COPYRIGHT FREERADIUS_CLIENT_INSTALL_STAGING = YES From f37a3fb49895c36bc9271693d0e1478d89267f23 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:08 +0200 Subject: [PATCH 1047/3013] package/freeradius-server: use https:// _SITE The tarballs are also available at https://freeradius.org/ftp/pub/freeradius/, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/freeradius-server/freeradius-server.hash | 2 +- package/freeradius-server/freeradius-server.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash index a267bd6f8cc..6ee8f7786c3 100644 --- a/package/freeradius-server/freeradius-server.hash +++ b/package/freeradius-server/freeradius-server.hash @@ -1,4 +1,4 @@ # Locally computed, after checking -# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig +# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2 sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index c64ae799187..1ec77a1cc45 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -7,7 +7,7 @@ FREERADIUS_SERVER_VERSION = 3.2.3 FREERADIUS_SERVER_SOURCE = \ freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 -FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius +FREERADIUS_SERVER_SITE = https://freeradius.org/ftp/pub/freeradius FREERADIUS_SERVER_LICENSE = GPL-2.0 FREERADIUS_SERVER_LICENSE_FILES = COPYRIGHT FREERADIUS_SERVER_CPE_ID_VENDOR = freeradius From 88dc6a6e492be30875dcedc8b19802aa0ac3880b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:09 +0200 Subject: [PATCH 1048/3013] package/libmnl: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Reviewed-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libmnl/libmnl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk index 08eebbaed9a..3bd3a03c891 100644 --- a/package/libmnl/libmnl.mk +++ b/package/libmnl/libmnl.mk @@ -6,7 +6,7 @@ LIBMNL_VERSION = 1.0.5 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2 -LIBMNL_SITE = http://netfilter.org/projects/libmnl/files +LIBMNL_SITE = https://netfilter.org/projects/libmnl/files LIBMNL_INSTALL_STAGING = YES LIBMNL_LICENSE = LGPL-2.1+ LIBMNL_LICENSE_FILES = COPYING From 5cbcbf5078b51ac15fe58a506a51639685dcd370 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:10 +0200 Subject: [PATCH 1049/3013] package/libmnl: use upstream sha256sum ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. This provides a .sha256sum but NOT md5/sha1, so update the .hash file to match. Signed-off-by: Peter Korsgaard Reviewed-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libmnl/libmnl.hash | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libmnl/libmnl.hash b/package/libmnl/libmnl.hash index 4b592333cb2..e2db46f03b1 100644 --- a/package/libmnl/libmnl.hash +++ b/package/libmnl/libmnl.hash @@ -1,7 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libmnl/libmnl-1.0.5.tar.bz2.{md5sum,sha1sum} -md5 0bbb70573119ec5d49435114583e7a49 libmnl-1.0.5.tar.bz2 -sha1 63c6456b77f7978a7b37e62c1b38346b2ef2d91c libmnl-1.0.5.tar.bz2 +# From https://netfilter.org/projects/libmnl/files/libmnl-1.0.5.tar.bz2.sha256sum +sha256 274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525 libmnl-1.0.5.tar.bz2 # Locally calculated -sha256 274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525 libmnl-1.0.5.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING From b530de097f905e616e735baa3494a597e176e5b5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:11 +0200 Subject: [PATCH 1050/3013] package/libnetfilter_acct: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libnetfilter_acct/Config.in | 2 +- package/libnetfilter_acct/libnetfilter_acct.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetfilter_acct/Config.in b/package/libnetfilter_acct/Config.in index ecfef6dc648..614af27fe12 100644 --- a/package/libnetfilter_acct/Config.in +++ b/package/libnetfilter_acct/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBNETFILTER_ACCT libnetfilter_acct is the userspace library providing interface to extended accounting infrastructure. - http://www.netfilter.org/projects/libnetfilter_acct/ + https://www.netfilter.org/projects/libnetfilter_acct/ diff --git a/package/libnetfilter_acct/libnetfilter_acct.mk b/package/libnetfilter_acct/libnetfilter_acct.mk index e791f6f13fb..6763ad27ddd 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.mk +++ b/package/libnetfilter_acct/libnetfilter_acct.mk @@ -6,7 +6,7 @@ LIBNETFILTER_ACCT_VERSION = 1.0.3 LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz2 -LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files +LIBNETFILTER_ACCT_SITE = https://www.netfilter.org/projects/libnetfilter_acct/files LIBNETFILTER_ACCT_INSTALL_STAGING = YES LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl LIBNETFILTER_ACCT_LICENSE = LGPL-2.1+ From af4038d0ce70534c31825068dee708c44c088b93 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:12 +0200 Subject: [PATCH 1051/3013] package/libnetfilter_acct: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libnetfilter_acct/libnetfilter_acct.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnetfilter_acct/libnetfilter_acct.hash b/package/libnetfilter_acct/libnetfilter_acct.hash index a72d83fb288..da9e1a32643 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.hash +++ b/package/libnetfilter_acct/libnetfilter_acct.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.3.tar.bz2.{md5sum,sha1sum} +# From https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2.{md5sum,sha1sum} md5 814b2972b2f5c740ff87510bc109168b libnetfilter_acct-1.0.3.tar.bz2 sha1 4b9073e4aa989b0f000c8da1ab01b22fceed52b2 libnetfilter_acct-1.0.3.tar.bz2 From 9f615dc406e20b0d07394ab1a863826c0928f016 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:13 +0200 Subject: [PATCH 1052/3013] package/libnetfilter_log: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libnetfilter_log/Config.in | 2 +- package/libnetfilter_log/libnetfilter_log.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetfilter_log/Config.in b/package/libnetfilter_log/Config.in index b244e8a8e9b..66e1b170bc0 100644 --- a/package/libnetfilter_log/Config.in +++ b/package/libnetfilter_log/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBNETFILTER_LOG libnetfilter_log is a userspace library providing interface to packets that have been logged by the kernel packet filter. - http://www.netfilter.org/projects/libnetfilter_log/ + https://www.netfilter.org/projects/libnetfilter_log/ diff --git a/package/libnetfilter_log/libnetfilter_log.mk b/package/libnetfilter_log/libnetfilter_log.mk index 01f94aac410..9b01f819bb6 100644 --- a/package/libnetfilter_log/libnetfilter_log.mk +++ b/package/libnetfilter_log/libnetfilter_log.mk @@ -6,7 +6,7 @@ LIBNETFILTER_LOG_VERSION = 1.0.2 LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2 -LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files +LIBNETFILTER_LOG_SITE = https://www.netfilter.org/projects/libnetfilter_log/files LIBNETFILTER_LOG_INSTALL_STAGING = YES LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libmnl libnfnetlink LIBNETFILTER_LOG_LICENSE = GPL-2.0+ From 07a44a24248cfee4b44296c2634ef8e218590d37 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:14 +0200 Subject: [PATCH 1053/3013] package/libnetfilter_log: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/libnetfilter_log/libnetfilter_log.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnetfilter_log/libnetfilter_log.hash b/package/libnetfilter_log/libnetfilter_log.hash index 7589284f406..1e3cea0a809 100644 --- a/package/libnetfilter_log/libnetfilter_log.hash +++ b/package/libnetfilter_log/libnetfilter_log.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.2.tar.bz2.sha256sum +# From https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.2.tar.bz2.sha256sum sha256 e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea libnetfilter_log-1.0.2.tar.bz2 # Hash for license file: From d946d31325af3ca388d4d3bbff4ad8f786fabb06 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:15 +0200 Subject: [PATCH 1054/3013] package/lynx: use https:// _SITE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ftp server does not allow anonymous login, causing the download to fail: wget --passive-ftp -nd -t 3 -O '/home/peko/source/buildroot/output-qt/build/.lynx2.8.9rel.1.tar.bz2.XlcdCK/output' 'ftp://ftp.invisible-island.net/lynx/tarballs/lynx2.8.9rel.1.tar.bz2' --2024-06-02 22:21:49-- ftp://ftp.invisible-island.net/lynx/tarballs/lynx2.8.9rel.1.tar.bz2 => ‘/home/peko/source/buildroot/output-qt/build/.lynx2.8.9rel.1.tar.bz2.XlcdCK/output’ Resolving ftp.invisible-island.net (ftp.invisible-island.net)... 216.194.253.29 Connecting to ftp.invisible-island.net (ftp.invisible-island.net)|216.194.253.29|:21... connected. Logging in as anonymous ... Login incorrect. Luckily the tarball is also available over https://, so use that instead. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: - use https, not http - drop trailing '/' in _SITE ] Signed-off-by: Yann E. MORIN --- package/lynx/lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index da57eb26010..83173292624 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -6,7 +6,7 @@ LYNX_VERSION = 2.8.9rel.1 LYNX_SOURCE = lynx$(LYNX_VERSION).tar.bz2 -LYNX_SITE = ftp://ftp.invisible-island.net/lynx/tarballs +LYNX_SITE = https://invisible-mirror.net/archives/lynx/tarballs LYNX_PATCH = \ https://salsa.debian.org/lynx-team/lynx/-/raw/debian/2.9.0dev.6-3_deb11u1/debian/patches/90_CVE-2021-38165.patch # 90_CVE-2021-38165.patch From 3eb84214a177be4c939f1e158c43924a4a1d0fe8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:16 +0200 Subject: [PATCH 1055/3013] package/ncftp: use https:// _SITE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ftp server does not respond, so change to https:// instead. Here the 3.2.6 version is under older_versions. wget ftp://ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.gz --2024-06-03 08:10:44-- ftp://ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.gz => ‘ncftp-3.2.6-src.tar.gz’ Resolving ftp.ncftp.com (ftp.ncftp.com)... 209.197.102.38 Connecting to ftp.ncftp.com (ftp.ncftp.com)|209.197.102.38|:21... ^C http redirects to https, so update the help text to match. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/ncftp/Config.in | 2 +- package/ncftp/ncftp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in index 6a939aa88cf..c8870a3dde8 100644 --- a/package/ncftp/Config.in +++ b/package/ncftp/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_NCFTP application programs implementing the File Transfer Protocol (FTP). - http://www.ncftp.com/ncftp/ + https://www.ncftp.com/ncftp/ if BR2_PACKAGE_NCFTP diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 676a9c58959..d380ebae027 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -8,7 +8,7 @@ NCFTP_VERSION = 3.2.6 # use .gz as upstream .xz tarball has changed after the hash was added for # 2017.02. Can be changed back to .xz when version is bumped NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz -NCFTP_SITE = ftp://ftp.ncftp.com/ncftp +NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp/older_versions NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License NCFTP_LICENSE_FILES = doc/LICENSE.txt From 1f7de59273144a9c6c173ff14e2cc7eb6649a078 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:17 +0200 Subject: [PATCH 1056/3013] package/newlib-bare-metal: use https:// _SITE The tarballs are also available over https, so use that instead. Signed-off-by: Peter Korsgaard Reviewed-by: Neal Frager Signed-off-by: Yann E. MORIN --- package/newlib-bare-metal/newlib-bare-metal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index 9f5d7657517..89092eb973d 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -5,7 +5,7 @@ ################################################################################ NEWLIB_BARE_METAL_VERSION = 4.4.0.20231231 -NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib +NEWLIB_BARE_METAL_SITE = https://sourceware.org/ftp/newlib NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).tar.gz NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal NEWLIB_BARE_METAL_ADD_TOOLCHAIN_DEPENDENCY = NO From 5438d7d8034387c79111c70fecbdee356f704854 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:18 +0200 Subject: [PATCH 1057/3013] package/nfacct: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nfacct/Config.in | 2 +- package/nfacct/nfacct.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nfacct/Config.in b/package/nfacct/Config.in index e30d2d997b3..02e7a6dbaaf 100644 --- a/package/nfacct/Config.in +++ b/package/nfacct/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_NFACCT nfacct is the command line tool to create/retrieve/delete netfilter accounting objects. - http://www.netfilter.org/projects/nfacct/ + https://www.netfilter.org/projects/nfacct/ diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk index d4c7c4ce707..0092cb9c26c 100644 --- a/package/nfacct/nfacct.mk +++ b/package/nfacct/nfacct.mk @@ -6,7 +6,7 @@ NFACCT_VERSION = 1.0.2 NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2 -NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files +NFACCT_SITE = https://www.netfilter.org/projects/nfacct/files NFACCT_DEPENDENCIES = host-pkgconf \ libnetfilter_acct NFACCT_LICENSE = GPL-2.0 From d58b1dfa6d1f4de11cec35aeea11b1b05da7a184 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:19 +0200 Subject: [PATCH 1058/3013] package/nfacct: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nfacct/nfacct.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfacct/nfacct.hash b/package/nfacct/nfacct.hash index aac5ce0ab88..4038ff86bca 100644 --- a/package/nfacct/nfacct.hash +++ b/package/nfacct/nfacct.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} +# From https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} md5 94faafdaaed85ca9220c5692be8a408e nfacct-1.0.2.tar.bz2 sha1 17d6576778227ea93c62600d9b18ff4932963c6a nfacct-1.0.2.tar.bz2 # Locally computed From 9a47d734bd67dc9902ce663ec86ff4e9b1539b5b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:20 +0200 Subject: [PATCH 1059/3013] package/uboot-tools: use https:// _SITE The tarballs are also available over https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/uboot-tools/uboot-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 12e10dea913..e9c7edb2185 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -6,7 +6,7 @@ UBOOT_TOOLS_VERSION = 2021.07 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 -UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot +UBOOT_TOOLS_SITE = https://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt UBOOT_TOOLS_CPE_ID_VENDOR = denx From 0ec558208ef7d799ec0db9b02fb64029e74754e9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:21 +0200 Subject: [PATCH 1060/3013] package/ulogd: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/ulogd/Config.in | 2 +- package/ulogd/ulogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in index e0e199961ac..6631076ae70 100644 --- a/package/ulogd/Config.in +++ b/package/ulogd/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_ULOGD ulogd is a userspace logging daemon for netfilter/iptables related logging. - http://www.netfilter.org/projects/ulogd/ + https://www.netfilter.org/projects/ulogd/ comment "ulogd needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 2ebf076d9a2..8ef8ec57013 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -6,7 +6,7 @@ ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 -ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files +ULOGD_SITE = https://www.netfilter.org/projects/ulogd/files ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink From d36ce5f3860406325f07ffe4725d27f50dcf56b7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:22 +0200 Subject: [PATCH 1061/3013] package/ulogd: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/ulogd/ulogd.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.hash b/package/ulogd/ulogd.hash index 35b518b9ced..8d729aeb8af 100644 --- a/package/ulogd/ulogd.hash +++ b/package/ulogd/ulogd.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.8.tar.bz2.sha256sum +# From https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.8.tar.bz2.sha256sum sha256 4ead6c3970c3f57fa1e89fe2d7cc483ba6fe2bd1b08701521e0b3afd667df291 ulogd-2.0.8.tar.bz2 # Locally calculated From e5993e6cd493dd6329bbf54cd7c19c5862a8a1e6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:23 +0200 Subject: [PATCH 1062/3013] package/zip: download from sourceforge The tarball (with .tar.gz extension but same content) is also available over https from sourceforge, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/zip/zip.hash | 2 +- package/zip/zip.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/zip/zip.hash b/package/zip/zip.hash index eb4bbf3b033..cbb96beb313 100644 --- a/package/zip/zip.hash +++ b/package/zip/zip.hash @@ -1,3 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tgz +sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tar.gz sha256 8ecd6c1bab449127eb665cef1561e73a8bce52e217375f6f466939e137b1e110 LICENSE diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 3aa59e7ba7a..0457ba94143 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -5,9 +5,9 @@ ################################################################################ ZIP_VERSION = 3.0 -# The version is really 3.0, but the tarball is named zip30.tgz -ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz -ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src +# The version is really 3.0, but the tarball is named zip30.tar.gz +ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tar.gz +ZIP_SITE = https://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/$(ZIP_VERSION) ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE ZIP_CPE_ID_VENDOR = info-zip_project From eca3ea8d3f83a19a1ce9823306e689d2b0b92c5d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:24 +0200 Subject: [PATCH 1063/3013] package/proftpd: download from github The tarball is also available over https from github, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/proftpd/proftpd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 242de38b0d9..cd7d2326725 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -5,7 +5,7 @@ ################################################################################ PROFTPD_VERSION = 1.3.8b -PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source +PROFTPD_SITE = https://github.com/proftpd/proftpd/archive/v$(PROFTPD_VERSION) PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING PROFTPD_CPE_ID_VENDOR = proftpd From 6d0d809a28d802873c3ebd209791bfdeaa2a6353 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:25 +0200 Subject: [PATCH 1064/3013] package/on2-8170-libs: remove package The linux4sam_1.9 upstream is no longer available for this binary-only library that was used with a gstreamer 0.10 plugin, which was itself removed in 2020.02 with commit fb49c7a26182f9d (package/gstreamer/*: remove packages), so remove the package. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/on2-8170-libs/Config.in | 15 -------------- package/on2-8170-libs/on2-8170-libs.hash | 2 -- package/on2-8170-libs/on2-8170-libs.mk | 26 ------------------------ 5 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 package/on2-8170-libs/Config.in delete mode 100644 package/on2-8170-libs/on2-8170-libs.hash delete mode 100644 package/on2-8170-libs/on2-8170-libs.mk diff --git a/Config.in.legacy b/Config.in.legacy index 46f7a304cba..a1650733a98 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.05" +config BR2_PACKAGE_ON2_8170_LIBS + bool "on2-8170-libs removed" + select BR2_LEGACY + help + Upstream for this binary only library is no longer available. + config BR2_GCC_VERSION_11_X bool "gcc 11.x support removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 1b6a5b0dabb..2ec4e70566a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -44,7 +44,6 @@ menu "Audio and video applications" source "package/multicat/Config.in" source "package/musepack/Config.in" source "package/ncmpc/Config.in" - source "package/on2-8170-libs/Config.in" source "package/opus-tools/Config.in" source "package/pipewire/Config.in" source "package/pipewire-media-session/Config.in" diff --git a/package/on2-8170-libs/Config.in b/package/on2-8170-libs/Config.in deleted file mode 100644 index 2a60c581e49..00000000000 --- a/package/on2-8170-libs/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_ON2_8170_LIBS - bool "on2-8170-libs" - #This is a binary only package which has been compiled for glibc - depends on BR2_arm926t - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_LINUX_KERNEL # on2-8170-modules - select BR2_PACKAGE_ON2_8170_MODULES # runtime - help - Libraries for Hantro X170 video decoder - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer - -comment "on2-8170-libs needs a glibc toolchain and a Linux kernel to be built" - depends on BR2_arm926t - depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/on2-8170-libs/on2-8170-libs.hash b/package/on2-8170-libs/on2-8170-libs.hash deleted file mode 100644 index c8b76e57945..00000000000 --- a/package/on2-8170-libs/on2-8170-libs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 db7390a13e7c0426894a6f966ecde1f89e6566416088c50729750e800306a2de on2-8170-libs-1.0.tar.gz diff --git a/package/on2-8170-libs/on2-8170-libs.mk b/package/on2-8170-libs/on2-8170-libs.mk deleted file mode 100644 index ad321d832fc..00000000000 --- a/package/on2-8170-libs/on2-8170-libs.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# on2-8170-libs -# -################################################################################ - -ON2_8170_LIBS_VERSION = 1.0 -ON2_8170_LIBS_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec - -ON2_8170_LIBS_LICENSE = PROPRIETARY -# No license file is included in the archive - -ON2_8170_LIBS_INSTALL_STAGING = YES - -define ON2_8170_LIBS_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - cp -dpf $(@D)/*.a $(@D)/*.so $(STAGING_DIR)/usr/lib - cp -dpf $(@D)/*.h $(STAGING_DIR)/usr/include -endef - -define ON2_8170_LIBS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -dpf $(@D)/*.so $(TARGET_DIR)/usr/lib -endef - -$(eval $(generic-package)) From 083a66e1f8b46c5a79082717e59740a4dbd7cfeb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:26 +0200 Subject: [PATCH 1065/3013] package/on2-8170-modules: remove package With the corresponding binary library and gstreamer 0.10 plugin removed, the package for the kernel module does not make a lot of sense, so remove the package. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/on2-8170-modules/Config.in | 13 ------------- package/on2-8170-modules/on2-8170-modules.hash | 2 -- package/on2-8170-modules/on2-8170-modules.mk | 14 -------------- 5 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 package/on2-8170-modules/Config.in delete mode 100644 package/on2-8170-modules/on2-8170-modules.hash delete mode 100644 package/on2-8170-modules/on2-8170-modules.mk diff --git a/Config.in.legacy b/Config.in.legacy index a1650733a98..b5a87d4e88d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.05" +config BR2_PACKAGE_ON2_8170_MODULES + bool "on2-8170-modules removed" + select BR2_LEGACY + help + The corresponding library and gstreamer 0.10 plugin are no + longer available. + config BR2_PACKAGE_ON2_8170_LIBS bool "on2-8170-libs removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 2ec4e70566a..bfbec1c21d0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -574,7 +574,6 @@ endmenu source "package/nvme/Config.in" source "package/ofono/Config.in" source "package/ola/Config.in" - source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" source "package/openipmi/Config.in" diff --git a/package/on2-8170-modules/Config.in b/package/on2-8170-modules/Config.in deleted file mode 100644 index 8c51e0c8d4e..00000000000 --- a/package/on2-8170-modules/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_ON2_8170_MODULES - bool "on2-8170-modules" - depends on BR2_LINUX_KERNEL - depends on BR2_arm926t - help - Kernel modules for Hantro x170 hardware video decompression - support. - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer - -comment "on2-8170-modules needs a Linux kernel to be built" - depends on BR2_arm926t - depends on !BR2_LINUX_KERNEL diff --git a/package/on2-8170-modules/on2-8170-modules.hash b/package/on2-8170-modules/on2-8170-modules.hash deleted file mode 100644 index cfb1272dd36..00000000000 --- a/package/on2-8170-modules/on2-8170-modules.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 d04d3acb8755281f6721d2a2efe04014060f83f38972208f356a486d52ca8bfc on2-8170-modules-73b08061d30789178e692bc332b73d1d9922bf39.tar.gz diff --git a/package/on2-8170-modules/on2-8170-modules.mk b/package/on2-8170-modules/on2-8170-modules.mk deleted file mode 100644 index 98643134be5..00000000000 --- a/package/on2-8170-modules/on2-8170-modules.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# on2-8170-modules -# -################################################################################ - -ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39 -ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION)) - -ON2_8170_MODULES_LICENSE = GPL-2.0+ -#There is no license file - -$(eval $(kernel-module)) -$(eval $(generic-package)) From 1a61c1d9b1919120883b689c3767925bd91d3028 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:28:28 +0200 Subject: [PATCH 1066/3013] Config.in: drop --passive-ftp from default wget options Fedora has recently migrated to wget2, which has dropped ftp support and the --passive-ftp command line option: https://fedoraproject.org/wiki/Changes/Wget2asWget It turns out that the command line option also doesn't do anything for wget1 as it was made the default in wget 1.10: https://git.savannah.gnu.org/cgit/wget.git/tree/NEWS?h=v1.13#n292 wget 1.10 is from 2005, so it is safe to assume that all supported distributions use >= 1.10. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in b/Config.in index b5a94325c4b..bdf5fa8647d 100644 --- a/Config.in +++ b/Config.in @@ -105,7 +105,7 @@ menu "Commands" config BR2_WGET string "Wget command" - default "wget --passive-ftp -nd -t 3" + default "wget -nd -t 3" config BR2_SVN string "Subversion (svn) command" From 9703351e3f7c089975369bfa8995041d6565542e Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 3 Jun 2024 11:25:13 +0200 Subject: [PATCH 1067/3013] DEVELOPERS: add Yegor Yefremov for package/ncftp Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index b9568ed7c58..03aa7bfa742 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3342,6 +3342,7 @@ F: package/libxmlb/ F: package/linux-firmware/ F: package/linux-serial-test/ F: package/modem-manager/ +F: package/ncftp/ F: package/nftables/ F: package/nuttcp/ F: package/parted/ From 2cdd3d1ccfbf36a921b737749367a70ad29e87a5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 2 Jun 2024 00:31:19 +0200 Subject: [PATCH 1068/3013] package/tpm2-tss: create tss user and group for tpm /dev nodes When systemd and tpm2-tss with fapi support are enabled, the fakeroot script fail with: :35: Failed to resolve user 'tss': No such process. When fapi support is enabled, tpm2-tss package install additional configuration files that are expecting tss user and group exist [1]. /etc/sysusers.d/tpm2-tss.conf /etc/tmpfiles.d/tpm2-tss-fapi.conf The build fail in the fakeroot environment while handling tmpfiles installed by tpm2-tss with fapi by host-systemd. tss user and group is currently created by the tpm2-abrmd package but tpm2-tss package also provide a udev rule file tpm-udev.rules [2] that set the ownership of dev nodes /dev/tpmX and /dev/tpmrmX to tss user/group. So tpm2-tss package must define TPM2_TSS_USERS to create tss user and group, not tpm2-abrmd package. So, move TPM2_ABRMD_USERS to TPM2_TSS_USERS. Note: tpm2-abrmd is nowadays deprecated since the in-kernel Resource Manager (available since kernel 4.12) is preferred [3]. [1] https://github.com/tpm2-software/tpm2-tss/blob/4.1.3/INSTALL.md?plain=1#L184 [2] https://github.com/tpm2-software/tpm2-tss/blob/4.1.3/dist/tpm-udev.rules [3] https://github.com/tpm2-software/tpm2-abrmd/blob/3.0.0/README.md?plain=1#L39 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/tpm2-abrmd/tpm2-abrmd.mk | 4 ---- package/tpm2-tss/tpm2-tss.mk | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk index 8de233008e5..0e62cb176a1 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -29,8 +29,4 @@ define TPM2_ABRMD_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S80tpm2-abrmd endef -define TPM2_ABRMD_USERS - tss -1 tss -1 * - - - TPM2 Access Broker & Resource Management daemon -endef - $(eval $(autotools-package)) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 10d605fc65c..b76d16e71e9 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -42,4 +42,8 @@ else TPM2_TSS_CONF_OPTS += --disable-fapi endif +define TPM2_TSS_USERS + tss -1 tss -1 * - - - tss user for tpm2 +endef + $(eval $(autotools-package)) From 0e567a1580eaffcf6e18a68747e7d5701bcb176d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 2 Jun 2024 00:31:20 +0200 Subject: [PATCH 1069/3013] package/systemd: add optional tpm2 dependency When tpm2-tss package is selected, systemd can enable its TPM2 support [1] used by systemd-boot, systemd-cryptenroll (when cryptsetup package is also enabled) [2] and other tool systemd-pcr{extend,lock,machine}. [1] https://github.com/systemd/systemd/blob/db11bab38ccf1ed257f310d29070843d4c58ea01/meson.build#L1341 [2] https://www.freedesktop.org/software/systemd/man/latest/systemd-cryptenroll.html Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 8987dc19a61..483b2d24a58 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -577,6 +577,13 @@ else SYSTEMD_CONF_OPTS += -Dhibernate=false endif +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +SYSTEMD_DEPENDENCIES += tpm2-tss +SYSTEMD_CONF_OPTS += -Dtpm2=true +else +SYSTEMD_CONF_OPTS += -Dtpm2=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y) SYSTEMD_INSTALL_IMAGES = YES SYSTEMD_DEPENDENCIES += gnu-efi host-python-pyelftools From 929a491f4073d600cd95be4cf97d53faa9a6e38e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 31 May 2024 19:17:33 -0600 Subject: [PATCH 1070/3013] utils/genrandconfig: drop glibc Linaro toolchain version check It has been well over 10 years since glibc 2.14 was released; the last Debian version that had an earlier glibc was Wheezy, which Freexian stopped to maintain as an ELTS in June 2020, 4 years ago, while the oldest still maintained Ubuntu has glibc 2.21. It is now safe to assume glibc 2.14 on all major, relevant distributions nowadays. The distutils module is no longer bundled with python 3.12 so this eliminates the need to install additional python modules under python 3.12. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: add Debian and Ubuntu references] Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b838dda34d2..0889be0d43b 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -25,8 +25,6 @@ import os from random import randint import sys import traceback -from distutils.version import StrictVersion -import platform class SystemInfo: @@ -166,23 +164,6 @@ async def is_toolchain_usable(configfile, config): print(" Missing: %s" % toolchainline.strip(), file=sys.stderr) return False - # The latest Linaro toolchains on x86-64 hosts requires glibc - # 2.14+ on the host. - if platform.machine() == 'x86_64': - if 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - proc = await asyncio.create_subprocess_exec( - 'ldd', '--version', stdout=asyncio.subprocess.PIPE) - ldd_version_output, _ = await proc.communicate() - if proc.returncode: - return False - glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] - if StrictVersion('2.14') > StrictVersion(glibc_version): - print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) - return False - return True From 7c53563f9d0a2f7b90007da9a1e470d25ef75ef0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 2 Jun 2024 14:41:39 -0600 Subject: [PATCH 1071/3013] package/vala: bump to version 0.56.17 Set GI_GIRDIR env variable which is now required for configure to function. Details: https://gitlab.gnome.org/GNOME/vala/-/commit/a9d38070ce86d7994b949f7cb426fbf670a953d8 Signed-off-by: James Hilliard [yann.morin.1998@free.fr: drop spurious reflow of _DEPENDENCIES] Signed-off-by: Yann E. MORIN --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index b3716f0854a..a16875ac6a6 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.56/vala-0.56.14.sha256sum -sha256 9382c268ca9bdc02aaedc8152a9818bf3935273041f629c56de410e360a3f557 vala-0.56.14.tar.xz +# From https://download.gnome.org/sources/vala/0.56/vala-0.56.17.sha256sum +sha256 26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a vala-0.56.17.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 415d996faa2..85f928202a6 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.56 -VALA_VERSION = $(VALA_VERSION_MAJOR).14 +VALA_VERSION = $(VALA_VERSION_MAJOR).17 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ @@ -15,7 +15,9 @@ VALA_CPE_ID_VENDOR = gnome HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 # Yes, the autoconf script understands ':' as "xsltproc is not # available". -HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=: +HOST_VALA_CONF_ENV = \ + ac_cv_path_XSLTPROC=: \ + GI_GIRDIR="$(STAGING_DIR)/usr/share/gir-1.0" HOST_VALA_CONF_OPTS += --disable-valadoc # We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs From d9d4be3ca5cd51baf81e6eaf9f70c007cd802dc8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 13:55:48 +0200 Subject: [PATCH 1072/3013] boot/at91bootstrap: remove package The upstream is no longer available, no defconfigs use it and the package has been replaced 12 years ago with at91bootstrap3 with commit ca0d69c61cc (at91bootstrap3: new package), so remove it. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 - Config.in.legacy | 7 + boot/Config.in | 1 - boot/at91bootstrap/0001-eabi-fix.patch | 334 ------------------ .../0002-gcc-4.6.x-ldscript-fix.patch | 29 -- .../0003-u-boot-relocation-fix.patch | 284 --------------- boot/at91bootstrap/Config.in | 49 --- boot/at91bootstrap/at91bootstrap.hash | 3 - boot/at91bootstrap/at91bootstrap.mk | 55 --- 9 files changed, 7 insertions(+), 758 deletions(-) delete mode 100644 boot/at91bootstrap/0001-eabi-fix.patch delete mode 100644 boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch delete mode 100644 boot/at91bootstrap/0003-u-boot-relocation-fix.patch delete mode 100644 boot/at91bootstrap/Config.in delete mode 100644 boot/at91bootstrap/at91bootstrap.hash delete mode 100644 boot/at91bootstrap/at91bootstrap.mk diff --git a/.checkpackageignore b/.checkpackageignore index 1c5ab08f5f1..3b493de92d0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -96,9 +96,6 @@ board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch lib_patch.Upstream boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch lib_patch.Upstream -boot/at91bootstrap/0001-eabi-fix.patch lib_patch.Upstream -boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch lib_patch.Upstream -boot/at91bootstrap/0003-u-boot-relocation-fix.patch lib_patch.Upstream boot/at91dataflashboot/0001-do-not-install.patch lib_patch.Upstream boot/at91dataflashboot/0002-eabi-fixes.patch lib_patch.Upstream boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index b5a87d4e88d..7e5bc28bae1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TARGET_AT91BOOTSTRAP + bool "at91bootstrap removed" + select BR2_LEGACY + help + Upstream for at91bootstrap 1.x is no longer available and + has been replaced by at91bootstrap3. + config BR2_PACKAGE_ON2_8170_MODULES bool "on2-8170-modules removed" select BR2_LEGACY diff --git a/boot/Config.in b/boot/Config.in index 87e1b7c00e3..3e00d28e561 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -1,7 +1,6 @@ menu "Bootloaders" source "boot/afboot-stm32/Config.in" -source "boot/at91bootstrap/Config.in" source "boot/at91bootstrap3/Config.in" source "boot/at91dataflashboot/Config.in" source "boot/arm-trusted-firmware/Config.in" diff --git a/boot/at91bootstrap/0001-eabi-fix.patch b/boot/at91bootstrap/0001-eabi-fix.patch deleted file mode 100644 index eab3c20928e..00000000000 --- a/boot/at91bootstrap/0001-eabi-fix.patch +++ /dev/null @@ -1,334 +0,0 @@ -When using an EABI toolchain, the default compilation generates -references to __aeabi_unwind_cpp_pr0(). This symbol is defined in -libgcc, but we don't want to use it for a bootloader. - -Therefore, this patch passes some additional CFLAGS to disable the -generation of such references by avoiding unwind tables, exceptions, -etc. - -Signed-off-by: Thomas Petazzoni ---- - board/at91cap9adk/dataflash/Makefile | 2 +- - board/at91cap9adk/norflash/Makefile | 2 +- - board/at91cap9stk/nandflash/Makefile | 2 +- - board/at91sam9260ek/dataflash/Makefile | 2 +- - board/at91sam9260ek/nandflash/Makefile | 2 +- - board/at91sam9261ek/dataflash/Makefile | 2 +- - board/at91sam9261ek/nandflash/Makefile | 2 +- - board/at91sam9263ek/dataflash/Makefile | 2 +- - board/at91sam9263ek/nandflash/Makefile | 2 +- - board/at91sam9g10ek/dataflash/Makefile | 2 +- - board/at91sam9g10ek/nandflash/Makefile | 2 +- - board/at91sam9g20ek/dataflash/Makefile | 2 +- - board/at91sam9g20ek/nandflash/Makefile | 2 +- - board/at91sam9g45ekes/nandflash/Makefile | 2 +- - board/at91sam9m10ekes/dataflash/Makefile | 2 +- - board/at91sam9m10ekes/nandflash/Makefile | 2 +- - board/at91sam9m10g45ek/dataflash/Makefile | 2 +- - board/at91sam9m10g45ek/nandflash/Makefile | 2 +- - board/at91sam9rlek/dataflash/Makefile | 2 +- - board/at91sam9rlek/nandflash/Makefile | 2 +- - board/at91sam9xeek/dataflash/Makefile | 2 +- - board/at91sam9xeek/nandflash/Makefile | 2 +- - lib/Makefile | 2 +- - 23 files changed, 23 insertions(+), 23 deletions(-) - -Index: Bootstrap-v1.16/board/at91cap9adk/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9adk/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9adk/dataflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91cap9adk/norflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9adk/norflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9adk/norflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91cap9stk/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9stk/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9stk/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - -Index: Bootstrap-v1.16/board/at91sam9260ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9260ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9260ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9260ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9260ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9260ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9261ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9261ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9261ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9261ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9261ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9261ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9263ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9263ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9263ek/dataflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9263ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9263ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9263ek/nandflash/Makefile -@@ -33,7 +33,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g10ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g10ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g10ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g10ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g10ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g10ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g20ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g20ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g20ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g20ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g20ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g20ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g45ekes/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g45ekes/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g45ekes/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10ekes/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10ekes/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10ekes/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10ekes/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10ekes/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10ekes/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10g45ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10g45ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10g45ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10g45ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10g45ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10g45ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9rlek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9rlek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9rlek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9rlek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9rlek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9rlek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9xeek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9xeek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9xeek/dataflash/Makefile -@@ -38,7 +38,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9xeek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9xeek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9xeek/nandflash/Makefile -@@ -38,7 +38,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/lib/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/lib/Makefile -+++ Bootstrap-v1.16/lib/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. diff --git a/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch b/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch deleted file mode 100644 index e4ed04e865e..00000000000 --- a/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b783d1f9bf985c0981e755bd2c13e091e9d6837f Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Tue, 6 Nov 2012 09:38:50 +0100 -Subject: [PATCH] at91bootstrap: fix overlap linker issue - -The linker script of the at91bootstrap package has to be modified when -built from gcc-4.6.x version. Indeed a section named text.startup is -created and has to be added into the text section. - -Signed-off-by: Gregory Hermant ---- - elf32-littlearm.lds | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/elf32-littlearm.lds b/elf32-littlearm.lds -index a33952f..4f3ba25 100644 ---- a/elf32-littlearm.lds -+++ b/elf32-littlearm.lds -@@ -7,6 +7,7 @@ SECTIONS - .text : { - _stext = .; - *(.text) -+ *(.text*) - *(.rodata) /* read-only data (constants) */ - *(.rodata*) - . = ALIGN(4); --- -1.7.9.5 - diff --git a/boot/at91bootstrap/0003-u-boot-relocation-fix.patch b/boot/at91bootstrap/0003-u-boot-relocation-fix.patch deleted file mode 100644 index 0c9b9114cb5..00000000000 --- a/boot/at91bootstrap/0003-u-boot-relocation-fix.patch +++ /dev/null @@ -1,284 +0,0 @@ -From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001 -From: Alexandre Belloni -Date: Thu, 25 Oct 2012 22:57:14 +0200 -Subject: [PATCH] u-boot relocation fix - -Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because -of the relocation changes. - -We have to get JUMP_ADDR consistant with what is used by u-boot -(CONFIG_SYS_TEXT_BASE). - -I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be -converted yet. But anyway, that means that it is either not working or -doesn't care so changing it here shouldn't harm. - -We also have to increase the IMG_SIZE as u-boot as grown larger than the -default value. As requested on the u-boot ML, we assume that it could -be up to 495kB big. - -It means that now, you have to flash your kernel at 0x00084000 instead -of 0x00042000. And so you also have to load it from that adress from -u-boot. - -Then, remember that you could decrease IMG_SIZE to boot faster. - -Signed-off-by: Alexandre Belloni ---- - board/at91sam9260ek/dataflash/at91sam9260ek.h | 4 ++-- - board/at91sam9260ek/nandflash/at91sam9260ek.h | 2 +- - board/at91sam9261ek/dataflash/at91sam9261ek.h | 4 ++-- - board/at91sam9261ek/nandflash/at91sam9261ek.h | 2 +- - board/at91sam9263ek/dataflash/at91sam9263ek.h | 4 ++-- - board/at91sam9263ek/nandflash/at91sam9263ek.h | 2 +- - board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 4 ++-- - board/at91sam9g10ek/nandflash/at91sam9g10ek.h | 2 +- - board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 4 ++-- - board/at91sam9g20ek/nandflash/at91sam9g20ek.h | 2 +- - board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 2 +- - .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 2 +- - board/at91sam9rlek/dataflash/at91sam9rlek.h | 4 ++-- - board/at91sam9rlek/nandflash/at91sam9rlek.h | 2 +- - board/at91sam9xeek/dataflash/at91sam9xeek.h | 4 ++-- - board/at91sam9xeek/nandflash/at91sam9xeek.h | 2 +- - 16 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h -index 1834246..91081a1 100644 ---- a/board/at91sam9260ek/dataflash/at91sam9260ek.h -+++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h -@@ -74,10 +74,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9260ek/nandflash/at91sam9260ek.h b/board/at91sam9260ek/nandflash/at91sam9260ek.h -index 2cac601..f8fdff2 100644 ---- a/board/at91sam9260ek/nandflash/at91sam9260ek.h -+++ b/board/at91sam9260ek/nandflash/at91sam9260ek.h -@@ -92,7 +92,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h -index 8ce30e9..276ba3d 100644 ---- a/board/at91sam9261ek/dataflash/at91sam9261ek.h -+++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h -@@ -97,10 +97,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9261ek/nandflash/at91sam9261ek.h b/board/at91sam9261ek/nandflash/at91sam9261ek.h -index badc3ac..e628c97 100644 ---- a/board/at91sam9261ek/nandflash/at91sam9261ek.h -+++ b/board/at91sam9261ek/nandflash/at91sam9261ek.h -@@ -114,7 +114,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h -index 5c9da4b..870f9e2 100644 ---- a/board/at91sam9263ek/dataflash/at91sam9263ek.h -+++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h -@@ -96,10 +96,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x4B2 /* AT91SAM9263-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9263ek/nandflash/at91sam9263ek.h b/board/at91sam9263ek/nandflash/at91sam9263ek.h -index 505afc7..8ab4f46 100644 ---- a/board/at91sam9263ek/nandflash/at91sam9263ek.h -+++ b/board/at91sam9263ek/nandflash/at91sam9263ek.h -@@ -108,7 +108,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 1202 /* AT91SAM9263-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -index b2faf44..f4f556b 100644 ---- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -+++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -@@ -98,10 +98,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -index 66c40a3..6c3ecda 100644 ---- a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -+++ b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -@@ -115,7 +115,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9G10-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -index eea0439..7fc70d6 100644 ---- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -+++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -@@ -75,10 +75,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -index 31bd499..e797e4d 100644 ---- a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -+++ b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -@@ -93,7 +93,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -index a60fd41..5587a00 100644 ---- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -+++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -@@ -89,7 +89,7 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x9CD /* AT91SAM9M10-EKES */ - #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ -diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -index 5c726b5..9090097 100644 ---- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -+++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -@@ -85,7 +85,7 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x726 /* AT91SAM9M10G45-EK */ - #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ -diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h -index 05c42dc..150f17e 100644 ---- a/board/at91sam9rlek/dataflash/at91sam9rlek.h -+++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h -@@ -89,10 +89,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9rlek/nandflash/at91sam9rlek.h b/board/at91sam9rlek/nandflash/at91sam9rlek.h -index 656b4ba..594db8f 100644 ---- a/board/at91sam9rlek/nandflash/at91sam9rlek.h -+++ b/board/at91sam9rlek/nandflash/at91sam9rlek.h -@@ -112,7 +112,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h -index 27d1822..08e515d 100644 ---- a/board/at91sam9xeek/dataflash/at91sam9xeek.h -+++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h -@@ -74,10 +74,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9xeek/nandflash/at91sam9xeek.h b/board/at91sam9xeek/nandflash/at91sam9xeek.h -index 5dbc63e..9fac7cb 100644 ---- a/board/at91sam9xeek/nandflash/at91sam9xeek.h -+++ b/board/at91sam9xeek/nandflash/at91sam9xeek.h -@@ -94,7 +94,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ --- -1.7.9.5 - diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in deleted file mode 100644 index 0f6430fd8dd..00000000000 --- a/boot/at91bootstrap/Config.in +++ /dev/null @@ -1,49 +0,0 @@ -config BR2_TARGET_AT91BOOTSTRAP - bool "AT91 Bootstrap" - depends on BR2_arm926t - help - AT91Bootstrap is a first level bootloader for the Atmel AT91 - devices. It integrates algorithms for: - - Device initialization such as clock configuration, PIO - settings... - - Peripheral drivers such as PIO, PMC or SDRAMC... - - Physical media algorithm such as DataFlash, NandFlash, NOR - Flash... - -if BR2_TARGET_AT91BOOTSTRAP - -config BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR - string "custom patch dir" - help - If your board requires custom patches, add the path to the - directory containing the patches here. The patches must be - named at91bootstrap--.patch. - - Most users may leave this empty - -config BR2_TARGET_AT91BOOTSTRAP_BOARD - string "Bootstrap board" - default "" - help - This is used to do a make _config - -choice - prompt "Boot Memory" - default BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - help - Select Chip for which AT91 bootstrap should be built - -config BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - bool "Data Flash" - -config BR2_TARGET_AT91BOOTSTRAP_NANDFLASH - bool "NAND Flash" - -endchoice - -config BR2_TARGET_AT91BOOTSTRAP_MEMORY - string - default "dataflash" if BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - default "nandflash" if BR2_TARGET_AT91BOOTSTRAP_NANDFLASH - -endif diff --git a/boot/at91bootstrap/at91bootstrap.hash b/boot/at91bootstrap/at91bootstrap.hash deleted file mode 100644 index d9f8db88976..00000000000 --- a/boot/at91bootstrap/at91bootstrap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 d66192a274247f4baa39fa932eadf903d7add55641d89d30402f967c4f2282a5 AT91Bootstrap1.16.zip -sha256 6a3ac5dfcf19e6bac1b1109d30d72818768a3855e2594b84fe2b012b5fe0e77b include/sdramc.h diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk deleted file mode 100644 index 385957b5d47..00000000000 --- a/boot/at91bootstrap/at91bootstrap.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# at91bootstrap -# -################################################################################ - -AT91BOOTSTRAP_VERSION = 1.16 -AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap -AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip -AT91BOOTSTRAP_LICENSE = BSD-Source-Code -AT91BOOTSTRAP_LICENSE_FILES = include/sdramc.h - -AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) -AT91BOOTSTRAP_MEMORY = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) -AT91BOOTSTRAP_MAKE_SUBDIR = board/$(AT91BOOTSTRAP_BOARD)/$(AT91BOOTSTRAP_MEMORY) -AT91BOOTSTRAP_BINARY = $(AT91BOOTSTRAP_MAKE_SUBDIR)/$(AT91BOOTSTRAP_MEMORY)_$(AT91BOOTSTRAP_BOARD).bin - -AT91BOOTSTRAP_INSTALL_IMAGES = YES -AT91BOOTSTRAP_INSTALL_TARGET = NO - -define AT91BOOTSTRAP_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(AT91BOOTSTRAP_DL_DIR)/$(AT91BOOTSTRAP_SOURCE) - mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)/* $(@D) - rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION) -endef - -ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),) -define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES - $(APPLY_PATCHES) $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \*.patch -endef - -AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES -endif - -# The at91bootstrap Makefile doesn't support customizing -# CFLAGS/LDFLAGS, so we cheat and pass our custom flags through CC and -# LD. -define AT91BOOTSTRAP_BUILD_CMDS - $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) \ - CC="$(TARGET_CC) -fno-stack-protector" \ - LD="$(TARGET_CC) -fno-PIE" \ - -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR) -endef - -define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS - cp $(@D)/$(AT91BOOTSTRAP_BINARY) $(BINARIES_DIR) -endef - -$(eval $(generic-package)) - -ifeq ($(BR2_TARGET_AT91BOOTSTRAP)$(BR_BUILDING),yy) -ifeq ($(AT91BOOTSTRAP_BOARD),) -$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting) -endif -endif From 08bd2bc482215dea5ec4b17f304168d35c29f820 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 13:55:49 +0200 Subject: [PATCH 1073/3013] boot/at91dataflashboot: remove package At91dataflashboot is an ancient (2006) fork of at91bootstrap1 specifically for the Atmel/Microchip AT45 series (dataflash) of serial flashes. The package hasn't seen any meaningful updates since, is not used by any defconfigs and at91bootstrap3 nowadays has AT45 support - So remove the package. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - Config.in.legacy | 6 +++ boot/Config.in | 1 - .../0001-do-not-install.patch | 22 ---------- boot/at91dataflashboot/0002-eabi-fixes.patch | 43 ------------------- boot/at91dataflashboot/Config.in | 3 -- boot/at91dataflashboot/at91dataflashboot.hash | 2 - boot/at91dataflashboot/at91dataflashboot.mk | 28 ------------ 8 files changed, 6 insertions(+), 101 deletions(-) delete mode 100644 boot/at91dataflashboot/0001-do-not-install.patch delete mode 100644 boot/at91dataflashboot/0002-eabi-fixes.patch delete mode 100644 boot/at91dataflashboot/Config.in delete mode 100644 boot/at91dataflashboot/at91dataflashboot.hash delete mode 100644 boot/at91dataflashboot/at91dataflashboot.mk diff --git a/.checkpackageignore b/.checkpackageignore index 3b493de92d0..50fdab88f9b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -96,8 +96,6 @@ board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch lib_patch.Upstream boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch lib_patch.Upstream -boot/at91dataflashboot/0001-do-not-install.patch lib_patch.Upstream -boot/at91dataflashboot/0002-eabi-fixes.patch lib_patch.Upstream boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch lib_patch.Upstream boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch lib_patch.Upstream boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 7e5bc28bae1..f0bff5191f8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,6 +153,12 @@ config BR2_TARGET_AT91BOOTSTRAP Upstream for at91bootstrap 1.x is no longer available and has been replaced by at91bootstrap3. +config BR2_TARGET_AT91DATAFLASHBOOT + bool "at91dataflashboot removed" + select BR2_LEGACY + help + at91dataflashboot has been replaced by at91bootstrap3. + config BR2_PACKAGE_ON2_8170_MODULES bool "on2-8170-modules removed" select BR2_LEGACY diff --git a/boot/Config.in b/boot/Config.in index 3e00d28e561..14e0ca65fa6 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -2,7 +2,6 @@ menu "Bootloaders" source "boot/afboot-stm32/Config.in" source "boot/at91bootstrap3/Config.in" -source "boot/at91dataflashboot/Config.in" source "boot/arm-trusted-firmware/Config.in" source "boot/barebox/Config.in" source "boot/beaglev-ddrinit/Config.in" diff --git a/boot/at91dataflashboot/0001-do-not-install.patch b/boot/at91dataflashboot/0001-do-not-install.patch deleted file mode 100644 index 41d97ad20e8..00000000000 --- a/boot/at91dataflashboot/0001-do-not-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable the automatic installation of at91dataflashboot since it tries -to install things to /tftpboot, which is not possible when not -building as root. - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: at91dataflashboot-1.05/Makefile -=================================================================== ---- at91dataflashboot-1.05.orig/Makefile -+++ at91dataflashboot-1.05/Makefile -@@ -40,7 +40,7 @@ - - I=config.h com.h dataflash.h embedded_services.h main.h stdio.h include/AT91RM9200.h include/lib_AT91RM9200.h - --all: clean $(BINNAME) $(LSSNAME) install -+all: clean $(BINNAME) $(LSSNAME) - $(SIZE) $(OUTNAME) - - # C objects here diff --git a/boot/at91dataflashboot/0002-eabi-fixes.patch b/boot/at91dataflashboot/0002-eabi-fixes.patch deleted file mode 100644 index e38905f7cbb..00000000000 --- a/boot/at91dataflashboot/0002-eabi-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -Get at91dataflashboot to build with EABI toolchains, by providing the -__aeabi_uidiv and __aeabi_uidivmod symbols. The code is based on -U-Boot's code. - -Signed-off-by: Thomas Petazzoni ---- - _udivsi3.S | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -Index: DataflashBoot-1.05/_udivsi3.S -=================================================================== ---- DataflashBoot-1.05.orig/_udivsi3.S -+++ DataflashBoot-1.05/_udivsi3.S -@@ -12,8 +12,11 @@ - .text - .globl __udivsi3 - .type __udivsi3 ,function -+ .globl __aeabi_uidiv -+ .type __aeabi_uidiv ,function - .align 0 - __udivsi3 : -+ __aeabi_uidiv: - cmp divisor, #0 - beq Ldiv0 - mov curbit, #1 -@@ -68,6 +71,17 @@ - mov r0, #0 @ about as wrong as it could be - ldmia sp!, {pc} - .size __udivsi3 , . - __udivsi3 -+ -+.globl __aeabi_uidivmod -+__aeabi_uidivmod: -+ -+ stmfd sp!, {r0, r1, ip, lr} -+ bl __aeabi_uidiv -+ ldmfd sp!, {r1, r2, ip, lr} -+ mul r3, r0, r2 -+ sub r1, r1, r3 -+ mov pc, lr -+ - /* # 235 "libgcc1.S" */ - /* # 320 "libgcc1.S" */ - /* # 421 "libgcc1.S" */ diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in deleted file mode 100644 index 8b37d844095..00000000000 --- a/boot/at91dataflashboot/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_TARGET_AT91DATAFLASHBOOT - bool "AT91 DataFlashBoot" - depends on BR2_arm && BR2_arm926t diff --git a/boot/at91dataflashboot/at91dataflashboot.hash b/boot/at91dataflashboot/at91dataflashboot.hash deleted file mode 100644 index 57df4e53898..00000000000 --- a/boot/at91dataflashboot/at91dataflashboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2cfeb6a9236e1a743c8010f05e504dbc92169ef42d9a6cf7948954a577bfc386 DataflashBoot-1.05.tar.bz2 diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk deleted file mode 100644 index cb329a90dff..00000000000 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# at91dataflashboot -# -################################################################################ - -AT91DATAFLASHBOOT_VERSION = 1.05 -AT91DATAFLASHBOOT_SOURCE = DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).tar.bz2 -AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot - -AT91DATAFLASHBOOT_INSTALL_TARGET = NO -AT91DATAFLASHBOOT_INSTALL_IMAGES = YES - -AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -AT91DATAFLASHBOOT_CFLAGS += -marm -endif - -define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)" -endef - -define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS - cp $(@D)/DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) From 40d0797027a610a3afcb8c2703210298a52f60f5 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 3 Jun 2024 15:43:58 +0200 Subject: [PATCH 1074/3013] package/ntp: fix build with GCC 14.x Fix pthread_detach() detection that is broken when building with GCC 14.x: checking for pthread_kill... yes checking for pthread_rwlock_destroy with ... yes checking for pthread_detach with ... no configure: error: could not locate pthread_detach() make[1]: *** [package/pkg-generic.mk:273: /home/user/buildroot/bsp-barebox/build/ntp-4.2.8p17/.stamp_configured] Error 1 make: *** [Makefile:82: _all] Error 2 Reference: https://bugs.ntp.org/show_bug.cgi?id=3926 Additionally, refresh patch 0002 to fix the offset of hunk 1. Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- package/ntp/0002-ntp-syscalls-fallback.patch | 9 ++++--- .../ntp/0003-fix-pthread-detach-check.patch | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 package/ntp/0003-fix-pthread-detach-check.patch diff --git a/package/ntp/0002-ntp-syscalls-fallback.patch b/package/ntp/0002-ntp-syscalls-fallback.patch index 535fc93dfdb..46704b9d3fe 100644 --- a/package/ntp/0002-ntp-syscalls-fallback.patch +++ b/package/ntp/0002-ntp-syscalls-fallback.patch @@ -8,10 +8,11 @@ Signed-off-by: James Knight configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1523,11 +1523,11 @@ AC_CACHE_CHECK( +Index: ntp-4.2.8p17/configure.ac +=================================================================== +--- ntp-4.2.8p17.orig/configure.ac ++++ ntp-4.2.8p17/configure.ac +@@ -1472,11 +1472,11 @@ AC_CACHE_CHECK( [ntp_cv_var_ntp_syscalls], [ ntp_cv_var_ntp_syscalls=no diff --git a/package/ntp/0003-fix-pthread-detach-check.patch b/package/ntp/0003-fix-pthread-detach-check.patch new file mode 100644 index 00000000000..894b422f2c1 --- /dev/null +++ b/package/ntp/0003-fix-pthread-detach-check.patch @@ -0,0 +1,26 @@ +fix pthread_detach check + +Upstream: https://bugs.ntp.org/show_bug.cgi?id=3926 + +Signed-off-by: Yegor Yefremov +--- + sntp/m4/openldap-thread-check.m4 | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +Index: ntp-4.2.8p17/sntp/m4/openldap-thread-check.m4 +=================================================================== +--- ntp-4.2.8p17.orig/sntp/m4/openldap-thread-check.m4 ++++ ntp-4.2.8p17/sntp/m4/openldap-thread-check.m4 +@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock; + dnl save the flags + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +-#ifndef NULL +-#define NULL (void*)0 +-#endif +-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) ++pthread_t thread; ++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) + ]) + + if test $ol_cv_func_pthread_detach = no ; then From 454426961cf43c8ab0cf13b8fe83e498b1de424a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 3 Jun 2024 22:00:25 +0200 Subject: [PATCH 1075/3013] package/esp-hosted: fix build failure on Linux 6.8.12+ Add local patch pending upstream to fix build failure due to old Linux Bluetooth API. Fixes: http://autobuild.buildroot.net/results/d64fa083ec27c3684d4186d2b1b05e041ad330f5/ http://autobuild.buildroot.net/results/5c4fac191970444e63109a762023c0e60f9693e2/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...x-Bluetooth-build-failure-on-Linux-6.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch diff --git a/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch b/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch new file mode 100644 index 00000000000..c701aaa82fb --- /dev/null +++ b/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch @@ -0,0 +1,37 @@ +From f8903bc2be7ae5ac9fb9bbeed8512e974c6e60ec Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 3 Jun 2024 21:53:38 +0200 +Subject: [PATCH] esp_hosted_ng: Fix Bluetooth build failure on Linux 6.8.11+ + +After Linux commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=84a4bb6548a29326564f0e659fb8064503ecc1c7 +BT_HS has been removed and consequently AMP controllers can't be created, +so at this point only HCI_PRIMARY has been left as unique controller type +to be created and this became implicit with no need to define if the +controller if HCI_PRIMARY or HCI_AMP. So let's assign HCI_PRIMARY up to +Linux 6.8.11 only preventing build failure. + +Upstream: https://github.com/espressif/esp-hosted/pull/400 + +Signed-off-by: Giulio Benetti +--- + esp_hosted_ng/host/esp_bt.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/esp_hosted_ng/host/esp_bt.c b/esp_hosted_ng/host/esp_bt.c +index 3b78c11698..4598ac0e0a 100644 +--- a/esp_hosted_ng/host/esp_bt.c ++++ b/esp_hosted_ng/host/esp_bt.c +@@ -240,7 +240,9 @@ int esp_init_bt(struct esp_adapter *adapter) + hdev->set_bdaddr = esp_bt_set_bdaddr; + #endif + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(6, 8, 11)) + hdev->dev_type = HCI_PRIMARY; ++#endif + + SET_HCIDEV_DEV(hdev, adapter->dev); + +-- +2.34.1 + From 1e81379b940f0b530c1c5f56c5e08a5d0b971098 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 3 Jun 2024 19:32:09 +0200 Subject: [PATCH 1076/3013] package/libgpg-error: bump to version 1.49 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 4 ++-- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 3b3464592a6..f87accdd970 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 8bdb504750b4da9e7daffa164cf1ed9900671f32 libgpg-error-1.48.tar.bz2 -sha256 89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f libgpg-error-1.48.tar.bz2 +sha1 28668dc3f693dfd8fa6724c702559e45ab5b15c0 libgpg-error-1.49.tar.bz2 +sha256 8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9 libgpg-error-1.49.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 3dd0ec94da7..9f60b7bc842 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.48 +LIBGPG_ERROR_VERSION = 1.49 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From ca256b6d2c4aa0f1d04f99132f8948c0b09b43f2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 3 Jun 2024 19:33:03 +0200 Subject: [PATCH 1077/3013] package/dmidecode: bump to version 3.6 For change log, see: https://git.savannah.gnu.org/cgit/dmidecode.git/tree/NEWS?h=dmidecode-3-6 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/dmidecode/dmidecode.hash | 4 ++-- package/dmidecode/dmidecode.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index 654c4cc537c..ab1f62be65d 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature from: -# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz.sig -sha256 79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073 dmidecode-3.5.tar.xz +# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.6.tar.xz.sig +sha256 e40c65f3ec3dafe31ad8349a4ef1a97122d38f65004ed66575e1a8d575dd8bae dmidecode-3.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 353978daa94..550e29d6247 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.5 +DMIDECODE_VERSION = 3.6 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ From c489ac4c1eca47d463d14b0cdb697f2692405b2e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 3 Jun 2024 20:57:50 +0200 Subject: [PATCH 1078/3013] package/open62541: bump to version 1.3.11 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/open62541/open62541.hash | 2 +- package/open62541/open62541.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 366a0894e32..be9ee77cc2d 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c78e0d2b1cb1a22db0102ed7f439073bc22ff44c5e9d9175f1b8e644f7b21f44 open62541-v1.3.10-git4.tar.gz +sha256 34fbf37e7f8e159b0a187bf8b0663af0187161ba4c5015828590c919645d596a open62541-v1.3.11-git4.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 1be44eb0b44..26c3cd5c2e1 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.10 +OPEN62541_VERSION = v1.3.11 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From 6a1c376492d6bb39a8725baae934f2b248501e0c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 3 Jun 2024 09:12:44 +0300 Subject: [PATCH 1079/3013] package/makedumpfile: enable build with musl libc makedumpfile libc dependency is coming from elfutils. Commit bf9583a50276f52 ("package/elfutils: enable on musl") removed elfutils libc dependency. makedumpfile now builds fine with musl libc. Remove its libc dependency. Cc: Alexander Egorenkov Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/makedumpfile/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/makedumpfile/Config.in b/package/makedumpfile/Config.in index 62549f851fc..325a31d7b6c 100644 --- a/package/makedumpfile/Config.in +++ b/package/makedumpfile/Config.in @@ -8,11 +8,10 @@ config BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS default y if BR2_s390x default y if BR2_sparc64 -comment "makedumpfile needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" +comment "makedumpfile needs a toolchain w/ wchar, dynamic library, threads" depends on BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_MAKEDUMPFILE bool "makedumpfile" @@ -20,7 +19,6 @@ config BR2_PACKAGE_MAKEDUMPFILE depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # dlopen depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_XZ From f7f2c8249662ea3a2076af31aae3fa0a7f819dac Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 2 Jun 2024 15:07:32 +0200 Subject: [PATCH 1080/3013] configs/ls1028ardb: add hashes and enable BR2_DOWNLOAD_FORCE_CHECK_HASHES Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../ls1028ardb/patches/linux-headers/linux-headers.hash | 1 + board/freescale/ls1028ardb/patches/linux/linux.hash | 2 ++ board/freescale/ls1028ardb/patches/uboot/uboot.hash | 2 ++ configs/ls1028ardb_defconfig | 5 +++-- 6 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/ls1028ardb/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/ls1028ardb/patches/linux/linux.hash create mode 100644 board/freescale/ls1028ardb/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 50fdab88f9b..fad6ff5c8b9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -206,7 +206,6 @@ configs/kontron_bl_imx8mm_defconfig lib_defconfig.ForceCheckHash configs/kontron_pitx_imx8m_defconfig lib_defconfig.ForceCheckHash configs/kontron_smarc_sal28_defconfig lib_defconfig.ForceCheckHash configs/linksprite_pcduino_defconfig lib_defconfig.ForceCheckHash -configs/ls1028ardb_defconfig lib_defconfig.ForceCheckHash configs/ls1046a-frwy_defconfig lib_defconfig.ForceCheckHash configs/mangopi_mq1rdw2_defconfig lib_defconfig.ForceCheckHash configs/mender_x86_64_efi_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..17c409530da --- /dev/null +++ b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0dda154c335e1a50c727601e698b6a0827e3f92308873b373449fb888df5acfd atf-LSDK-21.08.tar.gz diff --git a/board/freescale/ls1028ardb/patches/linux-headers/linux-headers.hash b/board/freescale/ls1028ardb/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/ls1028ardb/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/ls1028ardb/patches/linux/linux.hash b/board/freescale/ls1028ardb/patches/linux/linux.hash new file mode 100644 index 00000000000..bd5e29d026c --- /dev/null +++ b/board/freescale/ls1028ardb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6db58cf91b98f7fc279f341279a5d43d4069fb56a660a34209aba6af53ea2b57 linux-LSDK-21.08.tar.gz diff --git a/board/freescale/ls1028ardb/patches/uboot/uboot.hash b/board/freescale/ls1028ardb/patches/uboot/uboot.hash new file mode 100644 index 00000000000..d0cc110fdd0 --- /dev/null +++ b/board/freescale/ls1028ardb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6279c161ad8a218b549e6631be969b74f358cf01a20103953ccaf3bb14185ac2 u-boot-LSDK-21.08.tar.gz diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index d92c543b449..462e642c3d8 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -2,8 +2,9 @@ BR2_aarch64=y BR2_cortex_a72=y -# patches -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" +# Build +BR2_GLOBAL_PATCH_DIR="board/freescale/ls1028ardb/patches board/freescale/common/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y # Toolchain # Linux headers same as kernel, a 5.10 series From b71c5936ad60c9a3d084f5a7b1a7f8ade1cd4c63 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 2 Jun 2024 15:21:08 +0200 Subject: [PATCH 1081/3013] configs/mx6cubox: add hashes and enable BR2_DOWNLOAD_FORCE_CHECK_HASHES Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../mx6cubox/patches/linux-headers/linux-headers.hash | 1 + board/solidrun/mx6cubox/patches/linux/linux.hash | 2 ++ board/solidrun/mx6cubox/patches/uboot/uboot.hash | 2 ++ configs/mx6cubox_defconfig | 6 +++++- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 120000 board/solidrun/mx6cubox/patches/linux-headers/linux-headers.hash create mode 100644 board/solidrun/mx6cubox/patches/linux/linux.hash create mode 100644 board/solidrun/mx6cubox/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index fad6ff5c8b9..8825d644ab5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -221,7 +221,6 @@ configs/microchip_sama7g5ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash configs/minnowboard_max_defconfig lib_defconfig.ForceCheckHash configs/mx25pdk_defconfig lib_defconfig.ForceCheckHash configs/mx53loco_defconfig lib_defconfig.ForceCheckHash -configs/mx6cubox_defconfig lib_defconfig.ForceCheckHash configs/mx6sx_udoo_neo_defconfig lib_defconfig.ForceCheckHash configs/mx6udoo_defconfig lib_defconfig.ForceCheckHash configs/nexbox_a95x_defconfig lib_defconfig.ForceCheckHash diff --git a/board/solidrun/mx6cubox/patches/linux-headers/linux-headers.hash b/board/solidrun/mx6cubox/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/solidrun/mx6cubox/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/solidrun/mx6cubox/patches/linux/linux.hash b/board/solidrun/mx6cubox/patches/linux/linux.hash new file mode 100644 index 00000000000..8b8381e6190 --- /dev/null +++ b/board/solidrun/mx6cubox/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 639e50060e3c8f23ed017cb10cfeacc6ba88ff5583812bb76859b4cc6a128291 linux-6.6.27.tar.xz diff --git a/board/solidrun/mx6cubox/patches/uboot/uboot.hash b/board/solidrun/mx6cubox/patches/uboot/uboot.hash new file mode 100644 index 00000000000..c1aeddf06c0 --- /dev/null +++ b/board/solidrun/mx6cubox/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index 46a1400d9f2..bd94f3fc863 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -9,6 +9,10 @@ BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +# Build +BR2_GLOBAL_PATCH_DIR="board/solidrun/mx6cubox/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_OVERLAY="board/solidrun/mx6cubox/rootfs_overlay" @@ -36,10 +40,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From 3d4896c52909b43e0c3049f8f79f77b5c502e2dd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 2 Jun 2024 14:41:39 -0600 Subject: [PATCH 1082/3013] package/vala: bump to version 0.56.17 Fixes: http://autobuild.buildroot.net/results/f08/f087b879167252690ed198de771292142c6249f8/ Set GI_GIRDIR env variable which is now required for configure to function. Details: https://gitlab.gnome.org/GNOME/vala/-/commit/a9d38070ce86d7994b949f7cb426fbf670a953d8 Signed-off-by: James Hilliard [yann.morin.1998@free.fr: drop spurious reflow of _DEPENDENCIES] Signed-off-by: Yann E. MORIN --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index b3716f0854a..a16875ac6a6 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.56/vala-0.56.14.sha256sum -sha256 9382c268ca9bdc02aaedc8152a9818bf3935273041f629c56de410e360a3f557 vala-0.56.14.tar.xz +# From https://download.gnome.org/sources/vala/0.56/vala-0.56.17.sha256sum +sha256 26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a vala-0.56.17.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 415d996faa2..85f928202a6 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.56 -VALA_VERSION = $(VALA_VERSION_MAJOR).14 +VALA_VERSION = $(VALA_VERSION_MAJOR).17 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ @@ -15,7 +15,9 @@ VALA_CPE_ID_VENDOR = gnome HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 # Yes, the autoconf script understands ':' as "xsltproc is not # available". -HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=: +HOST_VALA_CONF_ENV = \ + ac_cv_path_XSLTPROC=: \ + GI_GIRDIR="$(STAGING_DIR)/usr/share/gir-1.0" HOST_VALA_CONF_OPTS += --disable-valadoc # We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs From baaf7f738a76d363aed753888da0712c7c430976 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Mon, 3 Jun 2024 18:09:35 +0200 Subject: [PATCH 1083/3013] board/freescale/common/imx/imx8-bootloader-prepare.sh: fix FIT external position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using imx-mkimage 6.1.36_2.1.0 or later, an additional data structure is inserted in the generated image. The FIT external data position passed to the uboot mkimage program needs to be adjusted accordingly. Fixes: https://bugs.busybox.net/show_bug.cgi?id=15973 Fixes: 72de78902330 ("package/imx-mkimage: bump version to lf-6.1.36-2.1.0") Tested-by: Sébastien Szymanski [Sébastien: Tested on i.MX8MM EVK and i.MX8MP EVK] [Sébastien: - fix subject - add Tested-by tag - fix Fixes tags ] Signed-off-by: Sébastien Szymanski Signed-off-by: Peter Korsgaard --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index a9ee154e9c4..b353d506fe4 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -8,6 +8,8 @@ main () exit 1 fi + FIT_EXTERNAL_POSITION=0x5000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin @@ -16,7 +18,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin @@ -28,7 +30,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin @@ -40,7 +42,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x912000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin @@ -52,7 +54,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x920000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin From 095bd205ae22c285bab272ad341948236dac5bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Mon, 3 Jun 2024 15:32:42 +0200 Subject: [PATCH 1084/3013] docs/manual: document python-aiohttp needed for pkg-stats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Mélotte Signed-off-by: Peter Korsgaard --- docs/manual/prerequisite.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/manual/prerequisite.adoc b/docs/manual/prerequisite.adoc index 262a5153f5a..ab609c12bed 100644 --- a/docs/manual/prerequisite.adoc +++ b/docs/manual/prerequisite.adoc @@ -96,3 +96,6 @@ corresponding tool on the host system: * Graph generation tools: ** +graphviz+ to use 'graph-depends' and '-graph-depends' ** +python-matplotlib+ to use 'graph-build' + +* Package statistics tools ('pkg-stats'): +** +python-aiohttp+ From 05617724ee2b5db9a1a6bb07272915ef3c1fd535 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 26 Apr 2024 23:51:44 +0200 Subject: [PATCH 1085/3013] package/kmod: fix build with musl Patch from upstream PR still being discussed: https://github.com/kmod-project/kmod/pull/32 Fixes: #16093 Signed-off-by: Fiona Klute [yann.morin.1998@free.fr: - add upstream tag to the patch - reference #16093 ] Signed-off-by: Yann E. MORIN --- ...able-implementation-for-basename-API.patch | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 package/kmod/0002-Use-portable-implementation-for-basename-API.patch diff --git a/package/kmod/0002-Use-portable-implementation-for-basename-API.patch b/package/kmod/0002-Use-portable-implementation-for-basename-API.patch new file mode 100644 index 00000000000..26f108d66ee --- /dev/null +++ b/package/kmod/0002-Use-portable-implementation-for-basename-API.patch @@ -0,0 +1,134 @@ +From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 9 Dec 2023 17:35:59 -0800 +Subject: [PATCH] Use portable implementation for basename API + +musl has removed the non-prototype declaration of basename from +string.h [1] which now results in build errors with clang-17+ compiler + +Implement GNU basename behavior using strchr which is portable across libcs + +Fixes +../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +71 | "Commands:\n", basename(argv[0])); +| ^ + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Suggested-by: Rich Felker + +Signed-off-by: Khem Raj + +Upstream: https://github.com/kmod-project/kmod/pull/32 +Signed-off-by: Fiona Klute +--- + libkmod/libkmod-config.c | 2 +- + shared/util.c | 4 ++-- + shared/util.h | 7 +++++++ + testsuite/testsuite.c | 2 +- + tools/depmod.c | 2 +- + tools/kmod.c | 4 ++-- + 6 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c +index e83621b3..8aa555a4 100644 +--- a/libkmod/libkmod-config.c ++++ b/libkmod/libkmod-config.c +@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, + bool is_single = false; + + if (name == NULL) { +- name = basename(path); ++ name = gnu_basename(path); + is_single = true; + } + +diff --git a/shared/util.c b/shared/util.c +index e2bab83a..0e16670e 100644 +--- a/shared/util.c ++++ b/shared/util.c +@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t * + + char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) + { +- char *modname; ++ const char *modname; + +- modname = basename(path); ++ modname = gnu_basename(path); + if (modname == NULL || modname[0] == '\0') + return NULL; + +diff --git a/shared/util.h b/shared/util.h +index c4a3916b..073dc5a7 100644 +--- a/shared/util.h ++++ b/shared/util.h +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -76,6 +77,12 @@ do { \ + __p->__v = (val); \ + } while(0) + ++static _always_inline_ const char *gnu_basename(const char *s) ++{ ++ const char *p = strrchr(s, '/'); ++ return p ? p+1 : s; ++} ++ + static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u) + { + return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); +diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c +index 318343ac..aafc9873 100644 +--- a/testsuite/testsuite.c ++++ b/testsuite/testsuite.c +@@ -70,7 +70,7 @@ static void help(void) + + printf("Usage:\n" + "\t%s [options] \n" +- "Options:\n", basename(progname)); ++ "Options:\n", gnu_basename(progname)); + + for (itr = options, itr_short = options_short; + itr->name != NULL; itr++, itr_short++) +diff --git a/tools/depmod.c b/tools/depmod.c +index 43fc354a..cfb15b11 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files + if (name != NULL) + namelen = strlen(name); + else { +- name = basename(dir); ++ name = gnu_basename(dir); + namelen = strlen(name); + dirlen -= namelen + 1; + } +diff --git a/tools/kmod.c b/tools/kmod.c +index 55689c07..df91e5c6 100644 +--- a/tools/kmod.c ++++ b/tools/kmod.c +@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[]) + "Options:\n" + "\t-V, --version show version\n" + "\t-h, --help show this help\n\n" +- "Commands:\n", basename(argv[0])); ++ "Commands:\n", gnu_basename(argv[0])); + + for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { + if (kmod_cmds[i]->help != NULL) { +@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) + const char *cmd; + size_t i; + +- cmd = basename(argv[0]); ++ cmd = gnu_basename(argv[0]); + + for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { + if (streq(kmod_compat_cmds[i]->name, cmd)) From 35278e9cd680459c139fbb13a3d3141e6152a94b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Jun 2024 20:27:19 +0200 Subject: [PATCH 1086/3013] package/docker-compose: correct vendored tarball hash Fixes: http://autobuild.buildroot.net/results/3a8/3a84e12ea7a88d1aefbc9e467416458d7bc6e7f5/ The vendored tarball hash was accidently created with tar < 1.35, leading to a wrong hash: https://lore.kernel.org/buildroot/CA+h8R2qWatxGjtUnkNpETBBn6OUASgNXrK=vkOBWDbSzFCXPDw@mail.gmail.com/T/ Fix it by replacing it by the correct tar-1.35 hash. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/docker-compose/docker-compose.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 1fd454e3fa1..12e839c71c4 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 448eaf225c2984a2d78b4faa3fe74a4aa1e2bb791f90ac8d4970d3d046e638df docker-compose-2.27.0-go2.tar.gz +sha256 42e9d2a33806656bd145ec742a3ba00b64acc3f88b500793d3b78319c39e25e0 docker-compose-2.27.0-go2.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE From d6e0f1b6226c4dadb07d430fdc751a95fbccb272 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 4 Jun 2024 13:17:20 -0700 Subject: [PATCH 1087/3013] package/go: security bump to go1.22.4 Fixes the following CVEs: CVE-2024-24789: archive/zip: mishandling of corrupt central directory record CVE-2024-24790: net/netip: unexpected behavior from Is methods for IPv4-mapped IPv6 addresses View the release notes for more information: https://go.dev/doc/devel/release#go1.22.4 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 6bbde5b5892..7952461f2d5 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 80648ef34f903193d72a59c0dff019f5f98ae0c9aa13ade0b0ecbff991a76f68 go1.22.3.src.tar.gz +sha256 fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784 go1.22.4.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 43dfe1eae56..461a472dd49 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.22.3 +GO_VERSION = 1.22.4 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 9f39676bdbd4936669a128c544ade514b3afef6a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 31 May 2024 21:40:25 +0200 Subject: [PATCH 1088/3013] package/octave: add optional {Graphics, Image}Magick++ support Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/octave/octave.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index a087961be97..6a21bef7b87 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -26,6 +26,16 @@ else OCTAVE_CONF_OPTS += --without-bz2 endif +ifeq ($(BR2_PACKAGE_GRAPHICSMAGICK),y) +OCTAVE_CONF_OPTS += --with-magick=GraphicsMagick++ +OCTAVE_DEPENDENCIES += graphicsmagick +else ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) +OCTAVE_CONF_OPTS += --with-magick=ImageMagick++ +OCTAVE_DEPENDENCIES += imagemagick +else +OCTAVE_CONF_OPTS += --without-magick +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From 54d48c8cad4e89c1428a0b9440116a01b0431fae Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sat, 1 Jun 2024 22:14:27 -0500 Subject: [PATCH 1089/3013] package/python3: miscellaneous fixups There is no longer a need to lie about having mercurial installed as of upstream 5c4b0d063a, so drop the ac_cv_prog_HAS_HG override. `PYTHON3_REMOVE_USELESS_FILES`, while not exactly useless, had been referencing stale files and not performing full cleanup: * the "m" ABI suffix was dropped in upstream 6c44fde3e0 (python 3.8) * the smtpd was dropped in upstream a797fba888 (python 3.1) * the wininst* binaries were dropped in upstream 0e2a0f72cc (python 3.10) These legacy references have now been dropped. The smtpd.py file is a bit quirky because despite having been removed upstream, Buildroot's patches to disable certain modules have been carrying it forward. This has been rectified. While here, rework the file removals to accomodate the ABI suffix change and to globally remove __pycache__ directories. It's important to note that Buildroot uses legacy pyc placements for sourceless distributions, meaning __pycache__ is not used at all [0]. When necessary, optimized pyc files will be generated into the correct paths in subsequent hooks. [0]: https://peps.python.org/pep-3147/#case-4-legacy-pyc-files-and-source-less-imports Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- .../0008-Add-an-option-to-disable-pydoc.patch | 16 ++++++----- ...009-Add-an-option-to-disable-lib2to3.patch | 27 ++++++++++--------- .../0017-Add-an-option-to-disable-IDLE.patch | 26 +++++++++--------- package/python3/python3.mk | 23 +++++----------- 4 files changed, 43 insertions(+), 49 deletions(-) diff --git a/package/python3/0008-Add-an-option-to-disable-pydoc.patch b/package/python3/0008-Add-an-option-to-disable-pydoc.patch index 3c678bef1cd..ffb6a7796fc 100644 --- a/package/python3/0008-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0008-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From 77fcd90a1236d59d40aa32d3bc4bef4303eb4066 Mon Sep 17 00:00:00 2001 +From e6284624679a525440dc4bfddc1347f8add22fd8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -12,6 +12,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: fix scripts array to reflect upstream ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ @@ -19,7 +21,7 @@ Signed-off-by: Adam Duskett 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5a40b7c5484..e87bc1fcd32 100644 +index 5a40b7c548..e87bc1fcd3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1877,7 +1877,9 @@ bininstall: commoninstall altbininstall @@ -52,7 +54,7 @@ index 5a40b7c5484..e87bc1fcd32 100644 libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index b4d7d2cca6a..d56d8f9d1c5 100644 +index b4d7d2cca6..d56d8f9d1c 100644 --- a/configure.ac +++ b/configure.ac @@ -4222,6 +4222,12 @@ AS_VAR_IF([posix_threads], [stub], [ @@ -69,7 +71,7 @@ index b4d7d2cca6a..d56d8f9d1c5 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 53b066cb18b..d8647724650 100644 +index 53b066cb18..25e6f4fc26 100644 --- a/setup.py +++ b/setup.py @@ -1597,6 +1597,12 @@ class DummyProcess: @@ -77,8 +79,8 @@ index 53b066cb18b..d8647724650 100644 import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) + -+ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -+ 'Lib/smtpd.py'] ++ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3'] ++ + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/pydoc3' ] + @@ -96,5 +98,5 @@ index 53b066cb18b..d8647724650 100644 # --install-platlib -- -2.44.0 +2.34.1 diff --git a/package/python3/0009-Add-an-option-to-disable-lib2to3.patch b/package/python3/0009-Add-an-option-to-disable-lib2to3.patch index 13cb273bf83..06f38e92b38 100644 --- a/package/python3/0009-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0009-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From 18e19402fab3939223a58481734e685d25c3102b Mon Sep 17 00:00:00 2001 +From 3fbd10c59a777c4ef7ee1bd3fb70808e25e11703 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -14,14 +14,16 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett [ Bernd Kuhls: ported to Python 3.11.4] Signed-off-by: Bernd Kuhls +[ Vincent Fazio: fix scripts array to reflect upstream ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 17 ++++++++++++----- configure.ac | 6 ++++++ - setup.py | 6 +++--- - 3 files changed, 21 insertions(+), 8 deletions(-) + setup.py | 4 +++- + 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e87bc1fcd32..1a0ab0de426 100644 +index e87bc1fcd3..1a0ab0de42 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1881,7 +1881,9 @@ ifeq (@PYDOC@,yes) @@ -82,7 +84,7 @@ index e87bc1fcd32..1a0ab0de426 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index d56d8f9d1c5..bf91fb2f824 100644 +index d56d8f9d1c..bf91fb2f82 100644 --- a/configure.ac +++ b/configure.ac @@ -7147,6 +7147,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu @@ -99,24 +101,23 @@ index d56d8f9d1c5..bf91fb2f824 100644 AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) diff --git a/setup.py b/setup.py -index d8647724650..e02591dae10 100644 +index 25e6f4fc26..78d880f9db 100644 --- a/setup.py +++ b/setup.py -@@ -1598,11 +1598,11 @@ class DummyProcess: +@@ -1598,10 +1598,12 @@ class DummyProcess: import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) -- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] +- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3'] ++ scripts = ['Tools/scripts/idle3'] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/pydoc3' ] -- + if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/2to3' ] + setup(# PyPI Metadata (PEP 301) name = "Python", - version = sys.version.split()[0], -- -2.44.0 +2.34.1 diff --git a/package/python3/0017-Add-an-option-to-disable-IDLE.patch b/package/python3/0017-Add-an-option-to-disable-IDLE.patch index f0af3f53f4d..fe44ef0d054 100644 --- a/package/python3/0017-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0017-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From f74c580b9e5bd8c710627b48cea4e152426e71e6 Mon Sep 17 00:00:00 2001 +From dd4ac2662ae1feaa3a29c4088193e48645b080f7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -11,14 +11,16 @@ Signed-off-by: Maxime Ripard Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: fixup setup array to reflect upstream ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ - setup.py | 5 ++++- - 3 files changed, 16 insertions(+), 2 deletions(-) + setup.py | 4 +++- + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8e5f6762d20..4e407cbcfa9 100644 +index 8e5f6762d2..4e407cbcfa 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1875,7 +1875,9 @@ bininstall: commoninstall altbininstall @@ -51,7 +53,7 @@ index 8e5f6762d20..4e407cbcfa9 100644 libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index cb7e980e5b5..fe497ec9dfb 100644 +index cb7e980e5b..fe497ec9df 100644 --- a/configure.ac +++ b/configure.ac @@ -7206,6 +7206,12 @@ AC_ARG_ENABLE(lib2to3, @@ -68,25 +70,25 @@ index cb7e980e5b5..fe497ec9dfb 100644 AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) diff --git a/setup.py b/setup.py -index e02591dae10..ada914c5501 100644 +index 78d880f9db..ca05faec97 100644 --- a/setup.py +++ b/setup.py -@@ -1598,11 +1598,14 @@ class DummyProcess: +@@ -1598,12 +1598,14 @@ class DummyProcess: import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) -- scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] -+ scripts = [ 'Lib/smtpd.py'] +- scripts = ['Tools/scripts/idle3'] ++ scripts = [] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/pydoc3' ] if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/2to3' ] + if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/idle3' ] -+ + setup(# PyPI Metadata (PEP 301) name = "Python", - version = sys.version.split()[0], -- -2.44.0 +2.34.1 diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 5d9d77af50e..6859fc22744 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -36,8 +36,7 @@ HOST_PYTHON3_CONF_OPTS += \ # Make python believe we don't have 'hg', so that it doesn't try to # communicate over the network during the build. HOST_PYTHON3_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ - ac_cv_prog_HAS_HG=/bin/false + LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" PYTHON3_DEPENDENCIES = host-python3 libffi @@ -156,14 +155,11 @@ else PYTHON3_CONF_OPTS += --disable-ossaudiodev endif -# Make python believe we don't have 'hg', so that it doesn't try to -# communicate over the network during the build. PYTHON3_CONF_ENV += \ ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes \ - ac_cv_prog_HAS_HG=/bin/false + ac_cv_working_tzset=yes # GCC is always compliant with IEEE754 ifeq ($(BR2_ENDIAN),"LITTLE") @@ -200,18 +196,11 @@ PYTHON3_CONF_OPTS += \ # define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config - rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config rm -f $(TARGET_DIR)/usr/bin/python3-config - rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3 - rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/distutils/command/wininst*.exe - for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m-*/ \ - -type f -not -name Makefile` ; do \ - rm -f $$i ; \ - done - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/__pycache__/ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/lib-dynload/sysconfigdata/__pycache__ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/collections/__pycache__ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/importlib/__pycache__ + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)-*/ \ + -type f -not -name Makefile -exec rm -rf {} \; + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -type d \ + -name __pycache__ -exec rm -rf {} \; endef PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_USELESS_FILES From e19ae5ecad7a12673d61781f9090c2610f2dcf18 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Jun 2024 23:42:03 +0200 Subject: [PATCH 1090/3013] Update for 2024.05-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 32 ++++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index b2bdde50697..8978a2ba7e3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,35 @@ +2024.05-rc2, released June 4th, 2024 + + Fixes all over the tree. + + Download: + - Dropped the (noop) --passive-ftp option from default wget + options for compatibility with wget2 + + - Fixed an issue with the generated archives (for + git/svn/cargo/go) when multiple packages share an archive + (E.G. linux vs linux-headers). + + Defconfigs: Fix build issue with binutils 2.41+ for + Acmesystems Aria / Arietta, add download hashes for a number + of defconfigs. Fix FIT external position for i.MX8 boards + + Updated/fixed packages: dnsmasq, docker-compose, doom-wad, + ebtables, esp-hosted, file, freeradius-client, + freeradius-server, go, kmod, libmnl, libnetfilter_acct, + libnetfilter_log, linux, luarocks, lynx, makedumpfile, + micropython, mtd, ncftp, newlib-bare-metal, nfacct, ntp, + octave, proftpd, qt5base, systemd, tpm2-tss, uboot-tools, + ulogd, vala, zip + + Removed packages: at91bootstrap, at91dataflashboot, + on2-8170-libs, on2-8170-modules + + Issues resolved (http://bugs.uclibc.org): + + #15973: imx8m bootloader image generation broken since update.. + #16093: kmod and gcc-14 build error + 2024.05-rc1, released May 30th, 2024 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index 40f862b5155..3bef4344664 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.05-rc1 +export BR2_VERSION := 2024.05-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1717102000 +BR2_VERSION_EPOCH = 1717537000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index b6793870a89..33b9b63537d 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

      buildroot-2023.11.2.tar.xz

      --> -

      Latest release candidate: 2024.05-rc1

      +

      Latest release candidate: 2024.05-rc2

      - +
      - +
      -

      buildroot-2024.05-rc1.tar.gz

      -

      PGP signature

      +

      buildroot-2024.05-rc2.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2024.05-rc1.tar.xz

      -

      PGP signature

      +

      buildroot-2024.05-rc2.tar.xz

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index e13def66cf8..f817c0ef745 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

      News

        +
      • +
        +
        +
        +

        2024.05-rc2 released

        +

        4 June 2024

        +
        +
        +

        Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

        + +

        Go to the downloads page to pick up the + 2024.05-rc2 + release, and report any problems found to the + mailing list or + bug tracker.

        +
        +
        +
        • +
      • From e26e0caf38e5dbf0085a117795c2964e6cc5c1f9 Mon Sep 17 00:00:00 2001 From: Alex Michel Date: Tue, 4 Jun 2024 08:19:10 +0000 Subject: [PATCH 1091/3013] package/libzenoh-c: add GLIBC and aarch64, x86_64 and arm dependencies The manual of zenoh-c says that: zenoh-c only have support for following targets: aarch64-unknown-linux-gnu, x86_64-unknown-linux-gnu, arm-unknown-linux-gnueabi This patch provides a blind option BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS, which is default y for above architectures. Additionally adds a dependency on GLIBC because one of the autobuilders had a problem with MUSL. Moved also the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS from package's dependency list to the BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS option. Fixes: http://autobuild.buildroot.net/results/680f25769526e5eef43d254a10a525b165846c75 http://autobuild.buildroot.net/results/31ed69cb2ffe8e9bc13a27c3fda16c27e9855b56 http://autobuild.buildroot.net/results/fdc74b8a42388b51cc4197c38b552559b97cbb8c http://autobuild.buildroot.net/results/6e7ad53d44b417f6aa62acd8b2396720f5a14e82 http://autobuild.buildroot.net/results/c85927b1dd25a84981adc5cc537eb07d02da40bc http://autobuild.buildroot.net/results/5389ac0174791b3d899fda7769b4f0f2dfeb805b http://autobuild.buildroot.net/results/285bd8f5aa338dbaf9ac0e5f78593b10bd54cbb5 Signed-off-by: Alex Michel Signed-off-by: Arnout Vandecappelle --- package/libzenoh-c/Config.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/package/libzenoh-c/Config.in b/package/libzenoh-c/Config.in index d22807c0475..c0028bec6fc 100644 --- a/package/libzenoh-c/Config.in +++ b/package/libzenoh-c/Config.in @@ -1,9 +1,21 @@ +config BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_x86_64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + config BR2_PACKAGE_LIBZENOH_C bool "libzenoh-c" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HOST_RUSTC help This package provides a C binding based on the main Zenoh implementation written in Rust. https://github.com/eclipse-zenoh/zenoh-c + +comment "libzenoh-c needs a glibc toolchain" + depends on BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC From 90167378de35a640ed07f18ded1e0a88aba11396 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Tue, 4 Jun 2024 11:09:15 +0200 Subject: [PATCH 1092/3013] package/lightning: fix build on mips64 with n32 ABI Grab commit 778d326740f9893c398f959b419629935b613099 from upstream to fix the build on mips64 and mips64el when the n32 ABI is used. Fixes: http://autobuild.buildroot.net/results/27123bf0ddc84599bceb02ac987327817d498659/ Signed-off-by: Paul Cercueil Signed-off-by: Arnout Vandecappelle --- ...ips-Fix-build-on-MIPS64-with-n32-ABI.patch | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch diff --git a/package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch b/package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch new file mode 100644 index 00000000000..19582d143f5 --- /dev/null +++ b/package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch @@ -0,0 +1,133 @@ +From 66a9a994c03d65fc37d701a60b26506bede49ae1 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Sun, 2 Jun 2024 22:35:24 +0200 +Subject: [PATCH] mips: Fix build on MIPS64 with n32 ABI + +The build on MIPS64 with n32 ABI was broken for a few reasons. + +- The _movi_d_w() functions had a different prototype in jit_mips-fpu.c + than in lightning.c; +- The movi_d_w() was still provided by lightning.c even though + jit_mips-fpu.c provides its own version; +- The "ww" opcodes were allowed, which was probably not meant to happen. + +Fixes a build issue reported by Buildroot: +http://autobuild.buildroot.net/results/27123bf0ddc84599bceb02ac987327817d498659/ + +Signed-off-by: Paul Cercueil +Upstream: http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=778d326740f9893c398f959b419629935b613099 +--- + lib/jit_mips-fpu.c | 4 ++-- + lib/jit_mips.c | 3 +-- + lib/lightning.c | 43 +++++++++++++++++++++---------------------- + 3 files changed, 24 insertions(+), 26 deletions(-) + +diff --git a/lib/jit_mips-fpu.c b/lib/jit_mips-fpu.c +index 61db30e..8ad97e9 100644 +--- a/lib/jit_mips-fpu.c ++++ b/lib/jit_mips-fpu.c +@@ -349,7 +349,7 @@ static void _movi_f(jit_state_t*,jit_int32_t,jit_float32_t*); + # define movi64(r0, i0) _movi64(_jit, r0, i0) + static void _movi64(jit_state_t*,jit_int32_t,jit_int64_t); + # define movi_d_w(r0, i0) _movi_d_w(_jit, r0, i0) +-static void _movi_d_w(jit_state_t*,jit_int32_t,jit_int64_t); ++static void _movi_d_w(jit_state_t*,jit_int32_t,jit_float64_t); + # elif __WORDSIZE == 64 + # define movi64(r0, i0) movi(r0, i0) + # endif +@@ -1152,7 +1152,7 @@ _movi64(jit_state_t *_jit, jit_int32_t r0, jit_int64_t i0) + } + + static void +-_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_int64_t i0) ++_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_float64_t i0) + { + union { + jit_int64_t l; +diff --git a/lib/jit_mips.c b/lib/jit_mips.c +index 4fb6c34..6eb41a0 100644 +--- a/lib/jit_mips.c ++++ b/lib/jit_mips.c +@@ -2184,8 +2184,7 @@ _emit_code(jit_state_t *_jit) + case jit_code_movi_w_d: + movi_w_d(rn(node->u.w), node->v.w); + break; +-#endif +-#if __WORDSIZE == 32 ++#else + case jit_code_movr_ww_d: + movr_ww_d(rn(node->u.w), rn(node->v.w), rn(node->w.w)); + break; +diff --git a/lib/lightning.c b/lib/lightning.c +index b40d35b..2c10928 100644 +--- a/lib/lightning.c ++++ b/lib/lightning.c +@@ -4331,12 +4331,12 @@ static void _htoni_ul(jit_state_t*, jit_int32_t, jit_word_t); + #endif + # define movi_f_w(r0, i0) _movi_f_w(_jit, r0, i0) + static void _movi_f_w(jit_state_t*, jit_int32_t, jit_float32_t); +-#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) +-# define movi_d_ww(r0, r1, i0) _movi_d_ww(_jit, r0, r1, i0) +-static void _movi_d_ww(jit_state_t*, jit_int32_t, jit_int32_t, jit_float64_t); +-#else ++#if __WORDSIZE == 64 + # define movi_d_w(r0, i0) _movi_d_w(_jit, r0, i0) + static void _movi_d_w(jit_state_t*, jit_int32_t, jit_float64_t); ++#elif !(defined(__mips__) && NEW_ABI) ++# define movi_d_ww(r0, r1, i0) _movi_d_ww(_jit, r0, r1, i0) ++static void _movi_d_ww(jit_state_t*, jit_int32_t, jit_int32_t, jit_float64_t); + #endif + #define cloi(r0, i0) _cloi(_jit, r0, i0) + static void _cloi(jit_state_t*, jit_int32_t, jit_word_t); +@@ -4803,7 +4803,23 @@ _movi_f_w(jit_state_t *_jit, jit_int32_t r0, jit_float32_t i0) + movi(r0, data.i); + } + +-#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) ++#if __WORDSIZE == 64 ++static void ++_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_float64_t i0) ++{ ++ union { ++ jit_int64_t l; ++ jit_float64_t d; ++ } data; ++ data.d = i0; ++# if defined(__ia64__) ++ /* Should be used only in this case (with out0 == 120) */ ++ if (r0 >= 120) ++ r0 = _jitc->rout + (r0 - 120); ++# endif ++ movi(r0, data.l); ++} ++#elif !(defined(__mips__) && NEW_ABI) + static void + _movi_d_ww(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_float64_t i0) + { +@@ -4821,23 +4837,6 @@ _movi_d_ww(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_float64_t i0) + movi(r0, data.i[1]); + # endif + } +- +-#else +-static void +-_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_float64_t i0) +-{ +- union { +- jit_int64_t l; +- jit_float64_t d; +- } data; +- data.d = i0; +-# if defined(__ia64__) +- /* Should be used only in this case (with out0 == 120) */ +- if (r0 >= 120) +- r0 = _jitc->rout + (r0 - 120); +-# endif +- movi(r0, data.l); +-} + #endif + + void +-- +2.43.0 + From ed9288505caa4c3d1c30d5d73ef3189a40ae243a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Jun 2024 20:41:27 +0200 Subject: [PATCH 1093/3013] support/testing: sample_python_pybind.py: use python3 shebang No functional change as we install a python symlink, but use python3 for consistency with the other scripts. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/sample_python_pybind.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py index 605c0bab159..9c605caf612 100644 --- a/support/testing/tests/package/sample_python_pybind.py +++ b/support/testing/tests/package/sample_python_pybind.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import example print(example.add(1, 2)) print(example.says) From 407b25219d1d8abe1ce4c71c008ec3e455b45483 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 4 Jun 2024 22:25:17 +0200 Subject: [PATCH 1094/3013] configs/beaglebone_qt5_defconfig: fix Linux compilation errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping to TI's most recent Linux 4.19 version (i.e. linux-4.19.94-ti-r72) does not fix compilation errors but allows you to cleanly apply the necessary patches. Two errors have been fixed: 1 Since commit e88225ed88208 ("package/binutils: make 2.41 the default version"), the Linux kernel is failing to build with this output: arch/arm/mm/proc-v6.S:267: Error: junk at end of line, first unrecognized character is `#' make[3]: *** [scripts/Makefile.build:403: arch/arm/mm/proc-v6.o] Error 1 The patch [1] fixes the issue. 2 Since commit dc0f7215c604e ("package/gcc: switch to 13.x as default"), the Linux kernel is failing to build with this output: In file included from ./include/linux/kernel.h:10, from drivers/ata/libahci.c:35: drivers/ata/libahci.c: In function ‘ahci_led_store’: ./include/linux/compiler.h:348:45: error: call to ‘__compiletime_assert_1154’ declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) 348 | _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) The patch [2] allows to cleanly apply patch [3] that fixes the issue. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=762d2dcd9e233e3025f8627ea65f23e568045edb [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=67a00c299c5c143817c948fbc7de1a2fa1af38fb [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c3ddc06cedb62f2904e58fd95170bf206bee149 Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...ce-Sun-Solaris-style-flag-on-section.patch | 432 ++++++++++++++++++ ...EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch | 80 ++++ ...a-ahci-fix-enum-constants-for-gcc-13.patch | 357 +++++++++++++++ configs/beaglebone_qt5_defconfig | 2 +- 4 files changed, 870 insertions(+), 1 deletion(-) create mode 100644 board/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch create mode 100644 board/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch create mode 100644 board/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch diff --git a/board/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/board/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 100644 index 00000000000..e99363aeb65 --- /dev/null +++ b/board/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1,432 @@ +From 790756c7e0229dedc83bf058ac69633045b1000e Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Mon, 4 Nov 2019 19:31:45 +0100 +Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section + directive + +It looks like a section directive was using "Solaris style" to declare +the section flags. Replace this with the GNU style so that Clang's +integrated assembler can assemble this directive. + +The modified instances were identified via: +$ ag \.section | grep # + +Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119 +Link: https://github.com/ClangBuiltLinux/linux/issues/744 +Link: https://bugs.llvm.org/show_bug.cgi?id=43759 +Link: https://reviews.llvm.org/D69296 + +Acked-by: Nicolas Pitre +Reviewed-by: Ard Biesheuvel +Reviewed-by: Stefan Agner +Signed-off-by: Nick Desaulniers +Suggested-by: Fangrui Song +Suggested-by: Jian Cai +Suggested-by: Peter Smith +Signed-off-by: Russell King +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=762d2dcd9e233e3025f8627ea65f23e568045edb +--- + arch/arm/boot/bootp/init.S | 2 +- + arch/arm/boot/compressed/big-endian.S | 2 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/boot/compressed/piggy.S | 2 +- + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm740.S | 2 +- + arch/arm/mm/proc-arm7tdmi.S | 2 +- + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + arch/arm/mm/proc-arm9tdmi.S | 2 +- + arch/arm/mm/proc-fa526.S | 2 +- + arch/arm/mm/proc-feroceon.S | 2 +- + arch/arm/mm/proc-mohawk.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-v6.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-v7m.S | 4 ++-- + arch/arm/mm/proc-xsc3.S | 2 +- + arch/arm/mm/proc-xscale.S | 2 +- + 28 files changed, 29 insertions(+), 29 deletions(-) + +diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S +index 5c476bd2b4ce..b562da2f7040 100644 +--- a/arch/arm/boot/bootp/init.S ++++ b/arch/arm/boot/bootp/init.S +@@ -13,7 +13,7 @@ + * size immediately following the kernel, we could build this into + * a binary blob, and concatenate the zImage using the cat command. + */ +- .section .start,#alloc,#execinstr ++ .section .start, "ax" + .type _start, #function + .globl _start + +diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S +index 88e2a88d324b..0e092c36da2f 100644 +--- a/arch/arm/boot/compressed/big-endian.S ++++ b/arch/arm/boot/compressed/big-endian.S +@@ -6,7 +6,7 @@ + * Author: Nicolas Pitre + */ + +- .section ".start", #alloc, #execinstr ++ .section ".start", "ax" + + mrc p15, 0, r0, c1, c0, 0 @ read control reg + orr r0, r0, #(1 << 7) @ enable big endian mode +diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S +index ae70754d003d..ead21e5f2b80 100644 +--- a/arch/arm/boot/compressed/head.S ++++ b/arch/arm/boot/compressed/head.S +@@ -140,7 +140,7 @@ + #endif + .endm + +- .section ".start", #alloc, #execinstr ++ .section ".start", "ax" + /* + * sort out different calling conventions + */ +diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S +index 0284f84dcf38..27577644ee72 100644 +--- a/arch/arm/boot/compressed/piggy.S ++++ b/arch/arm/boot/compressed/piggy.S +@@ -1,5 +1,5 @@ + /* SPDX-License-Identifier: GPL-2.0 */ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy_data" +diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S +index 4fa5371bc662..2785da387c91 100644 +--- a/arch/arm/mm/proc-arm1020.S ++++ b/arch/arm/mm/proc-arm1020.S +@@ -491,7 +491,7 @@ cpu_arm1020_name: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1020_proc_info,#object + __arm1020_proc_info: +diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S +index 5d8a8339e09a..e9ea237ed785 100644 +--- a/arch/arm/mm/proc-arm1020e.S ++++ b/arch/arm/mm/proc-arm1020e.S +@@ -449,7 +449,7 @@ arm1020e_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1020e_proc_info,#object + __arm1020e_proc_info: +diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S +index b3dd95c345e4..920c279e7879 100644 +--- a/arch/arm/mm/proc-arm1022.S ++++ b/arch/arm/mm/proc-arm1022.S +@@ -443,7 +443,7 @@ arm1022_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1022_proc_info,#object + __arm1022_proc_info: +diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S +index e927187157d7..0bdf25a95b10 100644 +--- a/arch/arm/mm/proc-arm1026.S ++++ b/arch/arm/mm/proc-arm1026.S +@@ -437,7 +437,7 @@ arm1026_crval: + string cpu_arm1026_name, "ARM1026EJ-S" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm1026_proc_info,#object + __arm1026_proc_info: +diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S +index c99d24363f32..39361e196d61 100644 +--- a/arch/arm/mm/proc-arm720.S ++++ b/arch/arm/mm/proc-arm720.S +@@ -172,7 +172,7 @@ arm720_crval: + * See for a definition of this structure. + */ + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm720_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cpu_flush:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S +index 1b4a3838393f..1a94bbf6e53f 100644 +--- a/arch/arm/mm/proc-arm740.S ++++ b/arch/arm/mm/proc-arm740.S +@@ -128,7 +128,7 @@ __arm740_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + .type __arm740_proc_info,#object + __arm740_proc_info: + .long 0x41807400 +diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S +index 17a4687065c7..52b66cf0259e 100644 +--- a/arch/arm/mm/proc-arm7tdmi.S ++++ b/arch/arm/mm/proc-arm7tdmi.S +@@ -72,7 +72,7 @@ __arm7tdmi_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm7tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, \ + extra_hwcaps=0 +diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S +index 298c76b47749..31ac8acc34dc 100644 +--- a/arch/arm/mm/proc-arm920.S ++++ b/arch/arm/mm/proc-arm920.S +@@ -434,7 +434,7 @@ arm920_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm920_proc_info,#object + __arm920_proc_info: +diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S +index 824be3a0bc23..ca2c7ca8af21 100644 +--- a/arch/arm/mm/proc-arm922.S ++++ b/arch/arm/mm/proc-arm922.S +@@ -412,7 +412,7 @@ arm922_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm922_proc_info,#object + __arm922_proc_info: +diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S +index d40cff8f102c..a381a0c9f109 100644 +--- a/arch/arm/mm/proc-arm925.S ++++ b/arch/arm/mm/proc-arm925.S +@@ -477,7 +477,7 @@ arm925_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm925_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S +index 4ef89e1d1127..1ba253c2bce1 100644 +--- a/arch/arm/mm/proc-arm926.S ++++ b/arch/arm/mm/proc-arm926.S +@@ -460,7 +460,7 @@ arm926_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm926_proc_info,#object + __arm926_proc_info: +diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S +index 1c26d991386d..4b8a00220cc9 100644 +--- a/arch/arm/mm/proc-arm940.S ++++ b/arch/arm/mm/proc-arm940.S +@@ -340,7 +340,7 @@ __arm940_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __arm940_proc_info,#object + __arm940_proc_info: +diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S +index 2dc1c75a4fd4..555becf9c758 100644 +--- a/arch/arm/mm/proc-arm946.S ++++ b/arch/arm/mm/proc-arm946.S +@@ -395,7 +395,7 @@ __arm946_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + .type __arm946_proc_info,#object + __arm946_proc_info: + .long 0x41009460 +diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S +index 913c06e590af..ef517530130b 100644 +--- a/arch/arm/mm/proc-arm9tdmi.S ++++ b/arch/arm/mm/proc-arm9tdmi.S +@@ -66,7 +66,7 @@ __arm9tdmi_setup: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro arm9tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req + .type __\name\()_proc_info, #object +diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S +index 8120b6f4dbb8..dddf833fe000 100644 +--- a/arch/arm/mm/proc-fa526.S ++++ b/arch/arm/mm/proc-fa526.S +@@ -185,7 +185,7 @@ fa526_cr1_set: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __fa526_proc_info,#object + __fa526_proc_info: +diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S +index bb6dc34d42a3..b12b76bc8d30 100644 +--- a/arch/arm/mm/proc-feroceon.S ++++ b/arch/arm/mm/proc-feroceon.S +@@ -571,7 +571,7 @@ feroceon_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro feroceon_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S +index f08308578885..d47d6c5cee63 100644 +--- a/arch/arm/mm/proc-mohawk.S ++++ b/arch/arm/mm/proc-mohawk.S +@@ -416,7 +416,7 @@ mohawk_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __88sv331x_proc_info,#object + __88sv331x_proc_info: +diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S +index d5bc5d702563..baba503ba816 100644 +--- a/arch/arm/mm/proc-sa110.S ++++ b/arch/arm/mm/proc-sa110.S +@@ -196,7 +196,7 @@ sa110_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .type __sa110_proc_info,#object + __sa110_proc_info: +diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S +index be7b611c76c7..75ebacc8e4e5 100644 +--- a/arch/arm/mm/proc-sa1100.S ++++ b/arch/arm/mm/proc-sa1100.S +@@ -239,7 +239,7 @@ sa1100_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro sa1100_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S +index c1c85eb3484f..1dd0d5ca27da 100644 +--- a/arch/arm/mm/proc-v6.S ++++ b/arch/arm/mm/proc-v6.S +@@ -261,7 +261,7 @@ v6_crval: + string cpu_elf_name, "v6" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + /* + * Match any ARMv6 processor core. +diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S +index c4e8006a1a8c..48e0ef6f0dcc 100644 +--- a/arch/arm/mm/proc-v7.S ++++ b/arch/arm/mm/proc-v7.S +@@ -644,7 +644,7 @@ __v7_setup_stack: + string cpu_elf_name, "v7" + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + /* + * Standard v7 proc info content +diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S +index 1a49d503eafc..84459c1d31b8 100644 +--- a/arch/arm/mm/proc-v7m.S ++++ b/arch/arm/mm/proc-v7m.S +@@ -93,7 +93,7 @@ ENTRY(cpu_cm7_proc_fin) + ret lr + ENDPROC(cpu_cm7_proc_fin) + +- .section ".init.text", #alloc, #execinstr ++ .section ".init.text", "ax" + + __v7m_cm7_setup: + mov r8, #(V7M_SCB_CCR_DC | V7M_SCB_CCR_IC| V7M_SCB_CCR_BP) +@@ -177,7 +177,7 @@ ENDPROC(__v7m_setup) + string cpu_elf_name "v7m" + string cpu_v7m_name "ARMv7-M" + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro __v7m_proc name, initfunc, cache_fns = nop_cache_fns, hwcaps = 0, proc_fns = v7m_processor_functions + .long 0 /* proc_info_list.__cpu_mm_mmu_flags */ +diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S +index 1ac0fbbe9f12..42eaecc43cfe 100644 +--- a/arch/arm/mm/proc-xsc3.S ++++ b/arch/arm/mm/proc-xsc3.S +@@ -496,7 +496,7 @@ xsc3_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro xsc3_proc_info name:req, cpu_val:req, cpu_mask:req + .type __\name\()_proc_info,#object +diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S +index bdb2b7749b03..18ac5a1f8922 100644 +--- a/arch/arm/mm/proc-xscale.S ++++ b/arch/arm/mm/proc-xscale.S +@@ -610,7 +610,7 @@ xscale_crval: + + .align + +- .section ".proc.info.init", #alloc ++ .section ".proc.info.init", "a" + + .macro xscale_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache + .type __\name\()_proc_info,#object +-- +2.43.0 + diff --git a/board/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch b/board/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch new file mode 100644 index 00000000000..50f5cf71a70 --- /dev/null +++ b/board/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch @@ -0,0 +1,80 @@ +From 67a00c299c5c143817c948fbc7de1a2fa1af38fb Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Tue, 11 Oct 2022 10:46:17 +0800 +Subject: [PATCH] ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS + +commit 1e41e693f458eef2d5728207dbd327cd3b16580a upstream. + +UBSAN complains about array-index-out-of-bounds: +[ 1.980703] kernel: UBSAN: array-index-out-of-bounds in /build/linux-9H675w/linux-5.15.0/drivers/ata/libahci.c:968:41 +[ 1.980709] kernel: index 15 is out of range for type 'ahci_em_priv [8]' +[ 1.980713] kernel: CPU: 0 PID: 209 Comm: scsi_eh_8 Not tainted 5.15.0-25-generic #25-Ubuntu +[ 1.980716] kernel: Hardware name: System manufacturer System Product Name/P5Q3, BIOS 1102 06/11/2010 +[ 1.980718] kernel: Call Trace: +[ 1.980721] kernel: +[ 1.980723] kernel: show_stack+0x52/0x58 +[ 1.980729] kernel: dump_stack_lvl+0x4a/0x5f +[ 1.980734] kernel: dump_stack+0x10/0x12 +[ 1.980736] kernel: ubsan_epilogue+0x9/0x45 +[ 1.980739] kernel: __ubsan_handle_out_of_bounds.cold+0x44/0x49 +[ 1.980742] kernel: ahci_qc_issue+0x166/0x170 [libahci] +[ 1.980748] kernel: ata_qc_issue+0x135/0x240 +[ 1.980752] kernel: ata_exec_internal_sg+0x2c4/0x580 +[ 1.980754] kernel: ? vprintk_default+0x1d/0x20 +[ 1.980759] kernel: ata_exec_internal+0x67/0xa0 +[ 1.980762] kernel: sata_pmp_read+0x8d/0xc0 +[ 1.980765] kernel: sata_pmp_read_gscr+0x3c/0x90 +[ 1.980768] kernel: sata_pmp_attach+0x8b/0x310 +[ 1.980771] kernel: ata_eh_revalidate_and_attach+0x28c/0x4b0 +[ 1.980775] kernel: ata_eh_recover+0x6b6/0xb30 +[ 1.980778] kernel: ? ahci_do_hardreset+0x180/0x180 [libahci] +[ 1.980783] kernel: ? ahci_stop_engine+0xb0/0xb0 [libahci] +[ 1.980787] kernel: ? ahci_do_softreset+0x290/0x290 [libahci] +[ 1.980792] kernel: ? trace_event_raw_event_ata_eh_link_autopsy_qc+0xe0/0xe0 +[ 1.980795] kernel: sata_pmp_eh_recover.isra.0+0x214/0x560 +[ 1.980799] kernel: sata_pmp_error_handler+0x23/0x40 +[ 1.980802] kernel: ahci_error_handler+0x43/0x80 [libahci] +[ 1.980806] kernel: ata_scsi_port_error_handler+0x2b1/0x600 +[ 1.980810] kernel: ata_scsi_error+0x9c/0xd0 +[ 1.980813] kernel: scsi_error_handler+0xa1/0x180 +[ 1.980817] kernel: ? scsi_unjam_host+0x1c0/0x1c0 +[ 1.980820] kernel: kthread+0x12a/0x150 +[ 1.980823] kernel: ? set_kthread_struct+0x50/0x50 +[ 1.980826] kernel: ret_from_fork+0x22/0x30 +[ 1.980831] kernel: + +This happens because sata_pmp_init_links() initialize link->pmp up to +SATA_PMP_MAX_PORTS while em_priv is declared as 8 elements array. + +I can't find the maximum Enclosure Management ports specified in AHCI +spec v1.3.1, but "12.2.1 LED message type" states that "Port Multiplier +Information" can utilize 4 bits, which implies it can support up to 16 +ports. Hence, use SATA_PMP_MAX_PORTS as EM_MAX_SLOTS to resolve the +issue. + +BugLink: https://bugs.launchpad.net/bugs/1970074 +Cc: stable@vger.kernel.org +Signed-off-by: Kai-Heng Feng +Signed-off-by: Damien Le Moal +Signed-off-by: Greg Kroah-Hartman +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=67a00c299c5c143817c948fbc7de1a2fa1af38fb +--- + drivers/ata/ahci.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h +index 9290e787abdc..d5b9f9689877 100644 +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -265,7 +265,7 @@ enum { + PCS_7 = 0x94, /* 7+ port PCS (Denverton) */ + + /* em constants */ +- EM_MAX_SLOTS = 8, ++ EM_MAX_SLOTS = SATA_PMP_MAX_PORTS, + EM_MAX_RETRY = 5, + + /* em_ctl bits */ +-- +2.43.0 + diff --git a/board/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch b/board/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch new file mode 100644 index 00000000000..6a5b3f594b8 --- /dev/null +++ b/board/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch @@ -0,0 +1,357 @@ +From ba6e23d2c9e3bcabda328467ba4eeca12f37e2ae Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Sat, 3 Dec 2022 11:54:25 +0100 +Subject: [PATCH] ata: ahci: fix enum constants for gcc-13 + +commit f07788079f515ca4a681c5f595bdad19cfbd7b1d upstream. + +gcc-13 slightly changes the type of constant expressions that are defined +in an enum, which triggers a compile time sanity check in libata: + +linux/drivers/ata/libahci.c: In function 'ahci_led_store': +linux/include/linux/compiler_types.h:357:45: error: call to '__compiletime_assert_302' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) +357 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) + +The new behavior is that sizeof() returns the same value for the +constant as it does for the enum type, which is generally more sensible +and consistent. + +The problem in libata is that it contains a single enum definition for +lots of unrelated constants, some of which are large positive (unsigned) +integers like 0xffffffff, while others like (1<<31) are interpreted as +negative integers, and this forces the enum type to become 64 bit wide +even though most constants would still fit into a signed 32-bit 'int'. + +Fix this by changing the entire enum definition to use BIT(x) in place +of (1< +Cc: linux-ide@vger.kernel.org +Cc: Damien Le Moal +Cc: stable@vger.kernel.org +Cc: Randy Dunlap +Signed-off-by: Arnd Bergmann +Tested-by: Luis Machado +Signed-off-by: Damien Le Moal +[Backport to linux-4.19.y] +Signed-off-by: Paul Barker +Signed-off-by: Greg Kroah-Hartman +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c3ddc06cedb62f2904e58fd95170bf206bee149 +--- + drivers/ata/ahci.h | 232 +++++++++++++++++++++++---------------------- + 1 file changed, 117 insertions(+), 115 deletions(-) + +diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h +index d5b9f9689877..8cc6cb14767b 100644 +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + /* Enclosure Management Control */ + #define EM_CTRL_MSG_TYPE 0x000f0000 +@@ -70,12 +71,12 @@ enum { + AHCI_PORT_PRIV_FBS_DMA_SZ = AHCI_CMD_SLOT_SZ + + AHCI_CMD_TBL_AR_SZ + + (AHCI_RX_FIS_SZ * 16), +- AHCI_IRQ_ON_SG = (1 << 31), +- AHCI_CMD_ATAPI = (1 << 5), +- AHCI_CMD_WRITE = (1 << 6), +- AHCI_CMD_PREFETCH = (1 << 7), +- AHCI_CMD_RESET = (1 << 8), +- AHCI_CMD_CLR_BUSY = (1 << 10), ++ AHCI_IRQ_ON_SG = BIT(31), ++ AHCI_CMD_ATAPI = BIT(5), ++ AHCI_CMD_WRITE = BIT(6), ++ AHCI_CMD_PREFETCH = BIT(7), ++ AHCI_CMD_RESET = BIT(8), ++ AHCI_CMD_CLR_BUSY = BIT(10), + + RX_FIS_PIO_SETUP = 0x20, /* offset of PIO Setup FIS data */ + RX_FIS_D2H_REG = 0x40, /* offset of D2H Register FIS data */ +@@ -93,37 +94,37 @@ enum { + HOST_CAP2 = 0x24, /* host capabilities, extended */ + + /* HOST_CTL bits */ +- HOST_RESET = (1 << 0), /* reset controller; self-clear */ +- HOST_IRQ_EN = (1 << 1), /* global IRQ enable */ +- HOST_MRSM = (1 << 2), /* MSI Revert to Single Message */ +- HOST_AHCI_EN = (1 << 31), /* AHCI enabled */ ++ HOST_RESET = BIT(0), /* reset controller; self-clear */ ++ HOST_IRQ_EN = BIT(1), /* global IRQ enable */ ++ HOST_MRSM = BIT(2), /* MSI Revert to Single Message */ ++ HOST_AHCI_EN = BIT(31), /* AHCI enabled */ + + /* HOST_CAP bits */ +- HOST_CAP_SXS = (1 << 5), /* Supports External SATA */ +- HOST_CAP_EMS = (1 << 6), /* Enclosure Management support */ +- HOST_CAP_CCC = (1 << 7), /* Command Completion Coalescing */ +- HOST_CAP_PART = (1 << 13), /* Partial state capable */ +- HOST_CAP_SSC = (1 << 14), /* Slumber state capable */ +- HOST_CAP_PIO_MULTI = (1 << 15), /* PIO multiple DRQ support */ +- HOST_CAP_FBS = (1 << 16), /* FIS-based switching support */ +- HOST_CAP_PMP = (1 << 17), /* Port Multiplier support */ +- HOST_CAP_ONLY = (1 << 18), /* Supports AHCI mode only */ +- HOST_CAP_CLO = (1 << 24), /* Command List Override support */ +- HOST_CAP_LED = (1 << 25), /* Supports activity LED */ +- HOST_CAP_ALPM = (1 << 26), /* Aggressive Link PM support */ +- HOST_CAP_SSS = (1 << 27), /* Staggered Spin-up */ +- HOST_CAP_MPS = (1 << 28), /* Mechanical presence switch */ +- HOST_CAP_SNTF = (1 << 29), /* SNotification register */ +- HOST_CAP_NCQ = (1 << 30), /* Native Command Queueing */ +- HOST_CAP_64 = (1 << 31), /* PCI DAC (64-bit DMA) support */ ++ HOST_CAP_SXS = BIT(5), /* Supports External SATA */ ++ HOST_CAP_EMS = BIT(6), /* Enclosure Management support */ ++ HOST_CAP_CCC = BIT(7), /* Command Completion Coalescing */ ++ HOST_CAP_PART = BIT(13), /* Partial state capable */ ++ HOST_CAP_SSC = BIT(14), /* Slumber state capable */ ++ HOST_CAP_PIO_MULTI = BIT(15), /* PIO multiple DRQ support */ ++ HOST_CAP_FBS = BIT(16), /* FIS-based switching support */ ++ HOST_CAP_PMP = BIT(17), /* Port Multiplier support */ ++ HOST_CAP_ONLY = BIT(18), /* Supports AHCI mode only */ ++ HOST_CAP_CLO = BIT(24), /* Command List Override support */ ++ HOST_CAP_LED = BIT(25), /* Supports activity LED */ ++ HOST_CAP_ALPM = BIT(26), /* Aggressive Link PM support */ ++ HOST_CAP_SSS = BIT(27), /* Staggered Spin-up */ ++ HOST_CAP_MPS = BIT(28), /* Mechanical presence switch */ ++ HOST_CAP_SNTF = BIT(29), /* SNotification register */ ++ HOST_CAP_NCQ = BIT(30), /* Native Command Queueing */ ++ HOST_CAP_64 = BIT(31), /* PCI DAC (64-bit DMA) support */ + + /* HOST_CAP2 bits */ +- HOST_CAP2_BOH = (1 << 0), /* BIOS/OS handoff supported */ +- HOST_CAP2_NVMHCI = (1 << 1), /* NVMHCI supported */ +- HOST_CAP2_APST = (1 << 2), /* Automatic partial to slumber */ +- HOST_CAP2_SDS = (1 << 3), /* Support device sleep */ +- HOST_CAP2_SADM = (1 << 4), /* Support aggressive DevSlp */ +- HOST_CAP2_DESO = (1 << 5), /* DevSlp from slumber only */ ++ HOST_CAP2_BOH = BIT(0), /* BIOS/OS handoff supported */ ++ HOST_CAP2_NVMHCI = BIT(1), /* NVMHCI supported */ ++ HOST_CAP2_APST = BIT(2), /* Automatic partial to slumber */ ++ HOST_CAP2_SDS = BIT(3), /* Support device sleep */ ++ HOST_CAP2_SADM = BIT(4), /* Support aggressive DevSlp */ ++ HOST_CAP2_DESO = BIT(5), /* DevSlp from slumber only */ + + /* registers for each SATA port */ + PORT_LST_ADDR = 0x00, /* command list DMA addr */ +@@ -145,24 +146,25 @@ enum { + PORT_DEVSLP = 0x44, /* device sleep */ + + /* PORT_IRQ_{STAT,MASK} bits */ +- PORT_IRQ_COLD_PRES = (1 << 31), /* cold presence detect */ +- PORT_IRQ_TF_ERR = (1 << 30), /* task file error */ +- PORT_IRQ_HBUS_ERR = (1 << 29), /* host bus fatal error */ +- PORT_IRQ_HBUS_DATA_ERR = (1 << 28), /* host bus data error */ +- PORT_IRQ_IF_ERR = (1 << 27), /* interface fatal error */ +- PORT_IRQ_IF_NONFATAL = (1 << 26), /* interface non-fatal error */ +- PORT_IRQ_OVERFLOW = (1 << 24), /* xfer exhausted available S/G */ +- PORT_IRQ_BAD_PMP = (1 << 23), /* incorrect port multiplier */ +- +- PORT_IRQ_PHYRDY = (1 << 22), /* PhyRdy changed */ +- PORT_IRQ_DEV_ILCK = (1 << 7), /* device interlock */ +- PORT_IRQ_CONNECT = (1 << 6), /* port connect change status */ +- PORT_IRQ_SG_DONE = (1 << 5), /* descriptor processed */ +- PORT_IRQ_UNK_FIS = (1 << 4), /* unknown FIS rx'd */ +- PORT_IRQ_SDB_FIS = (1 << 3), /* Set Device Bits FIS rx'd */ +- PORT_IRQ_DMAS_FIS = (1 << 2), /* DMA Setup FIS rx'd */ +- PORT_IRQ_PIOS_FIS = (1 << 1), /* PIO Setup FIS rx'd */ +- PORT_IRQ_D2H_REG_FIS = (1 << 0), /* D2H Register FIS rx'd */ ++ PORT_IRQ_COLD_PRES = BIT(31), /* cold presence detect */ ++ PORT_IRQ_TF_ERR = BIT(30), /* task file error */ ++ PORT_IRQ_HBUS_ERR = BIT(29), /* host bus fatal error */ ++ PORT_IRQ_HBUS_DATA_ERR = BIT(28), /* host bus data error */ ++ PORT_IRQ_IF_ERR = BIT(27), /* interface fatal error */ ++ PORT_IRQ_IF_NONFATAL = BIT(26), /* interface non-fatal error */ ++ PORT_IRQ_OVERFLOW = BIT(24), /* xfer exhausted available S/G */ ++ PORT_IRQ_BAD_PMP = BIT(23), /* incorrect port multiplier */ ++ ++ PORT_IRQ_PHYRDY = BIT(22), /* PhyRdy changed */ ++ PORT_IRQ_DEV_ILCK = BIT(7), /* device interlock */ ++ PORT_IRQ_DMPS = BIT(7), /* mechanical presence status */ ++ PORT_IRQ_CONNECT = BIT(6), /* port connect change status */ ++ PORT_IRQ_SG_DONE = BIT(5), /* descriptor processed */ ++ PORT_IRQ_UNK_FIS = BIT(4), /* unknown FIS rx'd */ ++ PORT_IRQ_SDB_FIS = BIT(3), /* Set Device Bits FIS rx'd */ ++ PORT_IRQ_DMAS_FIS = BIT(2), /* DMA Setup FIS rx'd */ ++ PORT_IRQ_PIOS_FIS = BIT(1), /* PIO Setup FIS rx'd */ ++ PORT_IRQ_D2H_REG_FIS = BIT(0), /* D2H Register FIS rx'd */ + + PORT_IRQ_FREEZE = PORT_IRQ_HBUS_ERR | + PORT_IRQ_IF_ERR | +@@ -178,34 +180,34 @@ enum { + PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS, + + /* PORT_CMD bits */ +- PORT_CMD_ASP = (1 << 27), /* Aggressive Slumber/Partial */ +- PORT_CMD_ALPE = (1 << 26), /* Aggressive Link PM enable */ +- PORT_CMD_ATAPI = (1 << 24), /* Device is ATAPI */ +- PORT_CMD_FBSCP = (1 << 22), /* FBS Capable Port */ +- PORT_CMD_ESP = (1 << 21), /* External Sata Port */ +- PORT_CMD_HPCP = (1 << 18), /* HotPlug Capable Port */ +- PORT_CMD_PMP = (1 << 17), /* PMP attached */ +- PORT_CMD_LIST_ON = (1 << 15), /* cmd list DMA engine running */ +- PORT_CMD_FIS_ON = (1 << 14), /* FIS DMA engine running */ +- PORT_CMD_FIS_RX = (1 << 4), /* Enable FIS receive DMA engine */ +- PORT_CMD_CLO = (1 << 3), /* Command list override */ +- PORT_CMD_POWER_ON = (1 << 2), /* Power up device */ +- PORT_CMD_SPIN_UP = (1 << 1), /* Spin up device */ +- PORT_CMD_START = (1 << 0), /* Enable port DMA engine */ +- +- PORT_CMD_ICC_MASK = (0xf << 28), /* i/f ICC state mask */ +- PORT_CMD_ICC_ACTIVE = (0x1 << 28), /* Put i/f in active state */ +- PORT_CMD_ICC_PARTIAL = (0x2 << 28), /* Put i/f in partial state */ +- PORT_CMD_ICC_SLUMBER = (0x6 << 28), /* Put i/f in slumber state */ ++ PORT_CMD_ASP = BIT(27), /* Aggressive Slumber/Partial */ ++ PORT_CMD_ALPE = BIT(26), /* Aggressive Link PM enable */ ++ PORT_CMD_ATAPI = BIT(24), /* Device is ATAPI */ ++ PORT_CMD_FBSCP = BIT(22), /* FBS Capable Port */ ++ PORT_CMD_ESP = BIT(21), /* External Sata Port */ ++ PORT_CMD_HPCP = BIT(18), /* HotPlug Capable Port */ ++ PORT_CMD_PMP = BIT(17), /* PMP attached */ ++ PORT_CMD_LIST_ON = BIT(15), /* cmd list DMA engine running */ ++ PORT_CMD_FIS_ON = BIT(14), /* FIS DMA engine running */ ++ PORT_CMD_FIS_RX = BIT(4), /* Enable FIS receive DMA engine */ ++ PORT_CMD_CLO = BIT(3), /* Command list override */ ++ PORT_CMD_POWER_ON = BIT(2), /* Power up device */ ++ PORT_CMD_SPIN_UP = BIT(1), /* Spin up device */ ++ PORT_CMD_START = BIT(0), /* Enable port DMA engine */ ++ ++ PORT_CMD_ICC_MASK = (0xfu << 28), /* i/f ICC state mask */ ++ PORT_CMD_ICC_ACTIVE = (0x1u << 28), /* Put i/f in active state */ ++ PORT_CMD_ICC_PARTIAL = (0x2u << 28), /* Put i/f in partial state */ ++ PORT_CMD_ICC_SLUMBER = (0x6u << 28), /* Put i/f in slumber state */ + + /* PORT_FBS bits */ + PORT_FBS_DWE_OFFSET = 16, /* FBS device with error offset */ + PORT_FBS_ADO_OFFSET = 12, /* FBS active dev optimization offset */ + PORT_FBS_DEV_OFFSET = 8, /* FBS device to issue offset */ + PORT_FBS_DEV_MASK = (0xf << PORT_FBS_DEV_OFFSET), /* FBS.DEV */ +- PORT_FBS_SDE = (1 << 2), /* FBS single device error */ +- PORT_FBS_DEC = (1 << 1), /* FBS device error clear */ +- PORT_FBS_EN = (1 << 0), /* Enable FBS */ ++ PORT_FBS_SDE = BIT(2), /* FBS single device error */ ++ PORT_FBS_DEC = BIT(1), /* FBS device error clear */ ++ PORT_FBS_EN = BIT(0), /* Enable FBS */ + + /* PORT_DEVSLP bits */ + PORT_DEVSLP_DM_OFFSET = 25, /* DITO multiplier offset */ +@@ -213,45 +215,45 @@ enum { + PORT_DEVSLP_DITO_OFFSET = 15, /* DITO offset */ + PORT_DEVSLP_MDAT_OFFSET = 10, /* Minimum assertion time */ + PORT_DEVSLP_DETO_OFFSET = 2, /* DevSlp exit timeout */ +- PORT_DEVSLP_DSP = (1 << 1), /* DevSlp present */ +- PORT_DEVSLP_ADSE = (1 << 0), /* Aggressive DevSlp enable */ ++ PORT_DEVSLP_DSP = BIT(1), /* DevSlp present */ ++ PORT_DEVSLP_ADSE = BIT(0), /* Aggressive DevSlp enable */ + + /* hpriv->flags bits */ + + #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) + +- AHCI_HFLAG_NO_NCQ = (1 << 0), +- AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */ +- AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */ +- AHCI_HFLAG_32BIT_ONLY = (1 << 3), /* force 32bit */ +- AHCI_HFLAG_MV_PATA = (1 << 4), /* PATA port */ +- AHCI_HFLAG_NO_MSI = (1 << 5), /* no PCI MSI */ +- AHCI_HFLAG_NO_PMP = (1 << 6), /* no PMP */ +- AHCI_HFLAG_SECT255 = (1 << 8), /* max 255 sectors */ +- AHCI_HFLAG_YES_NCQ = (1 << 9), /* force NCQ cap on */ +- AHCI_HFLAG_NO_SUSPEND = (1 << 10), /* don't suspend */ +- AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as +- link offline */ +- AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf */ +- AHCI_HFLAG_NO_FPDMA_AA = (1 << 13), /* no FPDMA AA */ +- AHCI_HFLAG_YES_FBS = (1 << 14), /* force FBS cap on */ +- AHCI_HFLAG_DELAY_ENGINE = (1 << 15), /* do not start engine on +- port start (wait until +- error-handling stage) */ +- AHCI_HFLAG_NO_DEVSLP = (1 << 17), /* no device sleep */ +- AHCI_HFLAG_NO_FBS = (1 << 18), /* no FBS */ ++ AHCI_HFLAG_NO_NCQ = BIT(0), ++ AHCI_HFLAG_IGN_IRQ_IF_ERR = BIT(1), /* ignore IRQ_IF_ERR */ ++ AHCI_HFLAG_IGN_SERR_INTERNAL = BIT(2), /* ignore SERR_INTERNAL */ ++ AHCI_HFLAG_32BIT_ONLY = BIT(3), /* force 32bit */ ++ AHCI_HFLAG_MV_PATA = BIT(4), /* PATA port */ ++ AHCI_HFLAG_NO_MSI = BIT(5), /* no PCI MSI */ ++ AHCI_HFLAG_NO_PMP = BIT(6), /* no PMP */ ++ AHCI_HFLAG_SECT255 = BIT(8), /* max 255 sectors */ ++ AHCI_HFLAG_YES_NCQ = BIT(9), /* force NCQ cap on */ ++ AHCI_HFLAG_NO_SUSPEND = BIT(10), /* don't suspend */ ++ AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = BIT(11), /* treat SRST timeout as ++ link offline */ ++ AHCI_HFLAG_NO_SNTF = BIT(12), /* no sntf */ ++ AHCI_HFLAG_NO_FPDMA_AA = BIT(13), /* no FPDMA AA */ ++ AHCI_HFLAG_YES_FBS = BIT(14), /* force FBS cap on */ ++ AHCI_HFLAG_DELAY_ENGINE = BIT(15), /* do not start engine on ++ port start (wait until ++ error-handling stage) */ ++ AHCI_HFLAG_NO_DEVSLP = BIT(17), /* no device sleep */ ++ AHCI_HFLAG_NO_FBS = BIT(18), /* no FBS */ + + #ifdef CONFIG_PCI_MSI +- AHCI_HFLAG_MULTI_MSI = (1 << 20), /* per-port MSI(-X) */ ++ AHCI_HFLAG_MULTI_MSI = BIT(20), /* per-port MSI(-X) */ + #else + /* compile out MSI infrastructure */ + AHCI_HFLAG_MULTI_MSI = 0, + #endif +- AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */ +- AHCI_HFLAG_YES_ALPM = (1 << 23), /* force ALPM cap on */ +- AHCI_HFLAG_NO_WRITE_TO_RO = (1 << 24), /* don't write to read +- only registers */ +- AHCI_HFLAG_IS_MOBILE = (1 << 25), /* mobile chipset, use ++ AHCI_HFLAG_WAKE_BEFORE_STOP = BIT(22), /* wake before DMA stop */ ++ AHCI_HFLAG_YES_ALPM = BIT(23), /* force ALPM cap on */ ++ AHCI_HFLAG_NO_WRITE_TO_RO = BIT(24), /* don't write to read ++ only registers */ ++ AHCI_HFLAG_IS_MOBILE = BIT(25), /* mobile chipset, use + SATA_MOBILE_LPM_POLICY + as default lpm_policy */ + +@@ -269,22 +271,22 @@ enum { + EM_MAX_RETRY = 5, + + /* em_ctl bits */ +- EM_CTL_RST = (1 << 9), /* Reset */ +- EM_CTL_TM = (1 << 8), /* Transmit Message */ +- EM_CTL_MR = (1 << 0), /* Message Received */ +- EM_CTL_ALHD = (1 << 26), /* Activity LED */ +- EM_CTL_XMT = (1 << 25), /* Transmit Only */ +- EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ +- EM_CTL_SGPIO = (1 << 19), /* SGPIO messages supported */ +- EM_CTL_SES = (1 << 18), /* SES-2 messages supported */ +- EM_CTL_SAFTE = (1 << 17), /* SAF-TE messages supported */ +- EM_CTL_LED = (1 << 16), /* LED messages supported */ ++ EM_CTL_RST = BIT(9), /* Reset */ ++ EM_CTL_TM = BIT(8), /* Transmit Message */ ++ EM_CTL_MR = BIT(0), /* Message Received */ ++ EM_CTL_ALHD = BIT(26), /* Activity LED */ ++ EM_CTL_XMT = BIT(25), /* Transmit Only */ ++ EM_CTL_SMB = BIT(24), /* Single Message Buffer */ ++ EM_CTL_SGPIO = BIT(19), /* SGPIO messages supported */ ++ EM_CTL_SES = BIT(18), /* SES-2 messages supported */ ++ EM_CTL_SAFTE = BIT(17), /* SAF-TE messages supported */ ++ EM_CTL_LED = BIT(16), /* LED messages supported */ + + /* em message type */ +- EM_MSG_TYPE_LED = (1 << 0), /* LED */ +- EM_MSG_TYPE_SAFTE = (1 << 1), /* SAF-TE */ +- EM_MSG_TYPE_SES2 = (1 << 2), /* SES-2 */ +- EM_MSG_TYPE_SGPIO = (1 << 3), /* SGPIO */ ++ EM_MSG_TYPE_LED = BIT(0), /* LED */ ++ EM_MSG_TYPE_SAFTE = BIT(1), /* SAF-TE */ ++ EM_MSG_TYPE_SES2 = BIT(2), /* SES-2 */ ++ EM_MSG_TYPE_SGPIO = BIT(3), /* SGPIO */ + }; + + struct ahci_cmd_hdr { +-- +2.43.0 + diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 0038acfcfdb..b83ef54fa88 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.94-ti-r72)/linux-4.19.94-ti-r72.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 5f576c3142257f3f8647029c72364411fcbe886b Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 4 Jun 2024 22:25:18 +0200 Subject: [PATCH 1095/3013] configs/beaglebone_qt5_defconfig: add hashes for Linux/headers/U-Boot The patch adds .hash files for Linux, Linux headers and U-Boot and then enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - board/beaglebone/patches/linux-headers/linux-headers.hash | 1 + board/beaglebone/patches/linux/linux.hash | 2 ++ board/beaglebone/patches/uboot/uboot.hash | 2 ++ configs/beaglebone_qt5_defconfig | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) create mode 120000 board/beaglebone/patches/linux-headers/linux-headers.hash create mode 100644 board/beaglebone/patches/linux/linux.hash create mode 100644 board/beaglebone/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 8825d644ab5..7de60f6946c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -145,7 +145,6 @@ configs/bananapi_m2_zero_defconfig lib_defconfig.ForceCheckHash configs/bananapro_defconfig lib_defconfig.ForceCheckHash configs/beagleboardx15_defconfig lib_defconfig.ForceCheckHash configs/beaglebone_defconfig lib_defconfig.ForceCheckHash -configs/beaglebone_qt5_defconfig lib_defconfig.ForceCheckHash configs/beaglev_defconfig lib_defconfig.ForceCheckHash configs/beelink_gs1_defconfig lib_defconfig.ForceCheckHash configs/broadcom_northstar_defconfig lib_defconfig.ForceCheckHash diff --git a/board/beaglebone/patches/linux-headers/linux-headers.hash b/board/beaglebone/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/beaglebone/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/beaglebone/patches/linux/linux.hash b/board/beaglebone/patches/linux/linux.hash new file mode 100644 index 00000000000..72d5bfff98d --- /dev/null +++ b/board/beaglebone/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 394523e61eabf24bf920981ba967799ff90b6099a72dc1d1b92c918433439f61 linux-4.19.94-ti-r72.tar.gz diff --git a/board/beaglebone/patches/uboot/uboot.hash b/board/beaglebone/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4b82872f31e --- /dev/null +++ b/board/beaglebone/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a u-boot-2021.04.tar.bz2 diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index b83ef54fa88..ae46fff228e 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -4,6 +4,7 @@ BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/beaglebone/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" From 38669bbf0cb620c56b071177d3d58572a17db3c4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 21:51:09 +0200 Subject: [PATCH 1096/3013] package/docker-compose: bump to 2.27.1 for bug fixes Signed-off-by: Yann E. MORIN Cc: Peter Korsgaard Cc: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 12e839c71c4..2896eee40c7 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 42e9d2a33806656bd145ec742a3ba00b64acc3f88b500793d3b78319c39e25e0 docker-compose-2.27.0-go2.tar.gz +sha256 7ca8746c86ba25491f5bbdc44c41d5cf7f64defa69f4015c601e1a562f7f64fb docker-compose-2.27.1-go2.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 32b2236a915..44e27787aba 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.27.0 +DOCKER_COMPOSE_VERSION = 2.27.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 7db4dc07c464727e3eda9994510db55c3f16f925 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 5 Jun 2024 11:54:56 +0200 Subject: [PATCH 1097/3013] configs/imx8mn_bsh_smm_s2[_pro]: add hashes The patch adds .hash files for Arm trusted firmware, Linux, Linux headers and U-Boot and then enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 -- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash | 1 + board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash | 2 ++ board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash | 2 ++ configs/imx8mn_bsh_smm_s2_defconfig | 2 ++ configs/imx8mn_bsh_smm_s2_pro_defconfig | 2 ++ 7 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/bsh/common/imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash create mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash create mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 7de60f6946c..6799b027c67 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -195,8 +195,6 @@ configs/imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/imx6ulpico_defconfig lib_defconfig.ForceCheckHash configs/imx7d-sdb_defconfig lib_defconfig.ForceCheckHash configs/imx7dpico_defconfig lib_defconfig.ForceCheckHash -configs/imx8mn_bsh_smm_s2_defconfig lib_defconfig.ForceCheckHash -configs/imx8mn_bsh_smm_s2_pro_defconfig lib_defconfig.ForceCheckHash configs/imx8mpico_defconfig lib_defconfig.ForceCheckHash configs/imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/imxrt1050-evk_defconfig lib_defconfig.ForceCheckHash diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..80e592dab60 --- /dev/null +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 fc4cdac7c08fc398b6d4b705285dc13ac2d2b30a7449c6f07e9ccd81207241df arm-trusted-firmware-v2.5.tar.gz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash new file mode 100644 index 00000000000..b017ef2a893 --- /dev/null +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3e4d8e561da5703a205ae8d7b2bed6c5c64fc4299eebcbfd20481e63b57d5ee3 linux-6.1.6.tar.xz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash new file mode 100644 index 00000000000..7cef5b688ec --- /dev/null +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 u-boot-2023.04.tar.bz2 diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 8b2b74395ef..841512ed1a1 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" BR2_LINUX_KERNEL=y diff --git a/configs/imx8mn_bsh_smm_s2_pro_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig index e9ff244a355..b4553ceb521 100644 --- a/configs/imx8mn_bsh_smm_s2_pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh" From ba19e5162e14941ccc1c0092d3dbc7160c7da683 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 5 Jun 2024 09:49:31 -0600 Subject: [PATCH 1098/3013] package/systemd: bump to version 254.13 Drop patch which is now upstream. Among other things, this fixes building with Linux 6.9. https://github.com/systemd/systemd-stable/commit/a4ce4095ce77ca5df6827e24b47cbaa675517d39 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...rning-about-empty-directive-argument.patch | 45 ------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch diff --git a/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch b/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch deleted file mode 100644 index 9408a6da0ed..00000000000 --- a/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8040fa55a1cbc34dede3205a902095ecd26c21e3 Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Sat, 24 Feb 2024 12:05:44 +0000 -Subject: [PATCH] install: fix compiler warning about empty directive argument -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On ppc64el with gcc 13.2 on Ubuntu 24.04: - -3s In file included from ../src/basic/macro.h:386, -483s from ../src/basic/alloc-util.h:10, -483s from ../src/shared/install.c:12: -483s ../src/shared/install.c: In function ‘install_changes_dump’: -483s ../src/shared/install.c:432:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=] -483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", -483s | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -483s ../src/shared/install.c:432:75: note: format string is defined here -483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", - -Upstream: https://github.com/systemd/systemd/commit/8040fa55a1cbc34dede3205a902095ecd26c21e3 -Signed-off-by: Fabrice Fontaine ---- - src/shared/install.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/shared/install.c b/src/shared/install.c -index fabf5db7ed2e1..c3a94d1912165 100644 ---- a/src/shared/install.c -+++ b/src/shared/install.c -@@ -340,9 +340,12 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes, - assert(verb || r >= 0); - - for (size_t i = 0; i < n_changes; i++) { -- if (changes[i].type < 0) -- assert(verb); - assert(changes[i].path); -+ /* This tries to tell the compiler that it's safe to use 'verb' in a string format if there -+ * was an error, but the compiler doesn't care and fails anyway, so strna(verb) is used -+ * too. */ -+ assert(verb || changes[i].type >= 0); -+ verb = strna(verb); - - /* When making changes here, make sure to also change install_error() in dbus-manager.c. */ - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index e5588f06a2c..f999d0d34ed 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz +sha256 26ac73c2108132b1d11ff939e8b1bece42f1c1da03fdf4a242af5a7cf3ac34f1 systemd-254.13.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 483b2d24a58..6b3553723c4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.9 +SYSTEMD_VERSION = 254.13 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From 093a0ccb93ddbf633cad3699d5b4f6f4b7fb8e7e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 5 Jun 2024 12:10:14 -0600 Subject: [PATCH 1099/3013] package/python-lxml: bump to version 5.2.2 Fixes: http://autobuild.buildroot.net/results/99c/99c28a0b0bf0fd20b02289d7a73c5c2f7664778e Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index a23cdcec9e9..3eb427a80d2 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # From https://pypi.org/project/lxml/ -sha256 3eea6ed6e6c918e468e693c41ef07f3c3acc310b70ddd9cc72d9ef84bc9564ca lxml-5.1.0.tar.gz +sha256 bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87 lxml-5.2.2.tar.gz # Locally computed sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 2da8b8056c2..2a26c132a7f 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 5.1.0 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/2b/b4/bbccb250adbee490553b6a52712c46c20ea1ba533a643f1424b27ffc6845 +PYTHON_LXML_VERSION = 5.2.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/63/f7/ffbb6d2eb67b80a45b8a0834baa5557a14a5ffce0979439e7cd7f0c4055b PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From f84c8d17168fe0f5dcf3d57d4c2a1e4f08b79f18 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:13 +0200 Subject: [PATCH 1100/3013] package/liblockfile: drop empty patch tarball The Debian control aarchive does not contain any patch for liblockfile 1.17; it has had no patch since Debian packaged version 1.16-1.1. Drop the path tarball now. Signed-off-by: Yann E. MORIN [Arnout: also drop from hash file] Signed-off-by: Arnout Vandecappelle --- package/liblockfile/liblockfile.hash | 1 - package/liblockfile/liblockfile.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/package/liblockfile/liblockfile.hash b/package/liblockfile/liblockfile.hash index c2cacd6fed8..b78a3b37877 100644 --- a/package/liblockfile/liblockfile.hash +++ b/package/liblockfile/liblockfile.hash @@ -1,6 +1,5 @@ # From https://snapshot.debian.org/archive/debian/20210128T210947Z/pool/main/libl/liblockfile/liblockfile_1.17-1.dsc sha256 6e937f3650afab4aac198f348b89b1ca42edceb17fb6bb0918f642143ccfd15e liblockfile_1.17.orig.tar.gz -sha256 e3657c0e3facfeccb58900c0b48d56cd68ad5f9f24d1b4c6eaa69c26490fb673 liblockfile_1.17-1.debian.tar.bz2 # Locally computed sha256 3d080ab931103a823e6b9b788ccbc3e9d44797bd54546f3feebfd305f90de46a COPYRIGHT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/GPL-2 diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index f472809ebc8..6535634efa6 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -7,7 +7,6 @@ LIBLOCKFILE_VERSION = 1.17 LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz LIBLOCKFILE_SITE = http://snapshot.debian.org/archive/debian/20210128T210947Z/pool/main/libl/liblockfile -LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-1.debian.tar.bz2 LIBLOCKFILE_LICENSE = LGPL-2.0+, GPL-2.0+ (dotlockfile) LIBLOCKFILE_LICENSE_FILES = COPYRIGHT licenses/GPL-2 licenses/LGPL-2 From 9fb9d71bfcbe6854b9c5a4a7d9b5d3acabbdf192 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:14 +0200 Subject: [PATCH 1101/3013] fs/tar: use appropriate TAR Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- fs/tar/tar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk index 841af147063..92b39f993fc 100644 --- a/fs/tar/tar.mk +++ b/fs/tar/tar.mk @@ -13,7 +13,7 @@ TAR_OPTS += --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 define ROOTFS_TAR_CMD (cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \ - tar $(TAR_OPTS) -cf $@ --null --xattrs-include='*' --no-recursion -T - --numeric-owner) + $(TAR) $(TAR_OPTS) -cf $@ --null --xattrs-include='*' --no-recursion -T - --numeric-owner) endef $(eval $(rootfs)) From c6ee0ea47c1dddcafa41a00cb99790321fb60e3f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:15 +0200 Subject: [PATCH 1102/3013] package/cvs: use appropriate TAR Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- package/cvs/cvs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 64c15f16fee..cf9127fc3a2 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -31,7 +31,7 @@ CVS_CONF_OPTS += --with-external-zlib endif define CVS_BZIP_UNPACK - $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | $(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 endef From 68fd0009e377181ade06cce3bff1a89d548542e5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:16 +0200 Subject: [PATCH 1103/3013] package/flutter-engine: use appropriate TAR Signed-off-by: Yann E. MORIN Cc: Adam Duskett [Arnout: quote TAR="..."] Signed-off-by: Arnout Vandecappelle --- package/flutter-engine/flutter-engine.mk | 1 + package/flutter-engine/gen-tarball | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index d9c2b3dee59..dfc3c03ef97 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -176,6 +176,7 @@ endif # Generate a tarball if one does not already exist. define FLUTTER_ENGINE_GENERATE_TARBALL + TAR="$(TAR)" \ PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ PYTHONPATH=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR) \ PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ diff --git a/package/flutter-engine/gen-tarball b/package/flutter-engine/gen-tarball index 2d2117b9be5..23b121d1f95 100755 --- a/package/flutter-engine/gen-tarball +++ b/package/flutter-engine/gen-tarball @@ -70,7 +70,7 @@ gen_tarball() { # - it insists on having a full git repositoy, with .git et al., which means # we can't generate a reproducible archive anyway. # So we jsut create a plain tarball. - tar -C "${SCRATCH_DIR}"/src -czf "${TARBALL_NAME}" . + ${TAR} -C "${SCRATCH_DIR}"/src -czf "${TARBALL_NAME}" . mv "${TARBALL_NAME}" "${TARBALL_DL_PATH}" } From ce6b48c2cf2811b769b03bb2d010d93537b2c176 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:17 +0200 Subject: [PATCH 1104/3013] package/pkg-download: export TAR for download backends Later commits will start using this variable. Signed-off-by: Yann E. MORIN [Arnout: quote TAR="..."] Signed-off-by: Arnout Vandecappelle --- package/pkg-download.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index bec213fb711..7028d3917a5 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -109,7 +109,9 @@ endif define DOWNLOAD $(Q)mkdir -p $($(2)_DL_DIR) - $(Q)$(EXTRA_ENV) $($(2)_DL_ENV) \ + $(Q)$(EXTRA_ENV) \ + $($(2)_DL_ENV) \ + TAR="$(TAR)" \ BR_NO_CHECK_HASH_FOR="$(if $(BR2_DOWNLOAD_FORCE_CHECK_HASHES),,$(BR_NO_CHECK_HASH_FOR))" \ flock $($(2)_DL_DIR)/.lock $(DL_WRAPPER) \ -c '$($(2)_DL_VERSION)' \ From 86f6c7929e4afcdeff72bb475d31af9fb9f00f60 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:18 +0200 Subject: [PATCH 1105/3013] support/download/helpers: use appropriate TAR Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/download/helpers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/download/helpers b/support/download/helpers index 823e4d2f912..5ed9078287b 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -59,7 +59,7 @@ mk_tar_gz() { LC_ALL=C sort <"${tmp}.list" >"${tmp}.sorted" # Create POSIX tarballs, since that's the format the most reproducible - tar cf - --transform="s#^\./#${base_dir}/#S" \ + ${TAR} cf - --transform="s#^\./#${base_dir}/#S" \ --numeric-owner --owner=0 --group=0 --mtime="${date}" \ --format=posix --pax-option="${pax_options}" --mode='go=u,go-w' \ -T "${tmp}.sorted" >"${tmp}.tar" @@ -78,7 +78,7 @@ post_process_unpack() { local one_file mkdir "${dest}" - tar -C "${dest}" --strip-components=1 -xzf "${tarball}" + ${TAR} -C "${dest}" --strip-components=1 -xzf "${tarball}" one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |sed 's/\x0.*//')" touch -r "${one_file}" "${dest}.timestamp" } From 84309d7071de9c54a3633967eb2abaa75b8dc9f9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:19 +0200 Subject: [PATCH 1106/3013] support/download/cvs: fix shellcheck Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - support/download/cvs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 6799b027c67..d0bd179a5c0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1650,7 +1650,6 @@ support/dependencies/check-host-xzcat.sh Shellcheck support/dependencies/dependencies.sh Shellcheck support/download/bzr Shellcheck lib_shellscript.ConsecutiveEmptyLines support/download/cargo-post-process Shellcheck -support/download/cvs Shellcheck support/download/dl-wrapper Shellcheck support/download/file Shellcheck support/download/go-post-process Shellcheck diff --git a/support/download/cvs b/support/download/cvs index 0c079e24035..b771caf2800 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -40,12 +40,13 @@ shift $((OPTIND-1)) # Get rid of our options # 10 minutes should do the trick. _cvs() { if [ -z "${quiet}" ]; then - printf '%s ' timeout 10m ${CVS} "${@}"; printf '\n' + printf '%s ' timeout 10m "${CVS}" "${@}"; printf '\n' fi _plain_cvs "$@" } # Note: please keep command below aligned with what is printed above _plain_cvs() { + # shellcheck disable=SC2086 # We really want word splitting in CVS eval timeout 10m ${CVS} "${@}" } From c013836ae6c3026aae16a0465ddc1288274e63ee Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:20 +0200 Subject: [PATCH 1107/3013] support/download/cvs: use appropriate TAR Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/download/cvs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/cvs b/support/download/cvs index b771caf2800..a6840fea7bf 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -68,4 +68,4 @@ export TZ=UTC _cvs ${quiet} -z3 -d"'${uri}'" \ co "${@}" -d "'${basename}'" ${select} "'${rev}'" -P "'${rawname}'" -tar czf "${output}" "${basename}" +${TAR} czf "${output}" "${basename}" From f77d698f83b230f7efcb7d28af3aacfa9589cc89 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:21 +0200 Subject: [PATCH 1108/3013] support/scripts/apply-patches: use appropriate TAR Note that here, it is in fact not really relevant. We only extract a tarball, and we don't use any "modern" or GNU-only options like --strip-components. However, for consistency it's better to use the same tar everywhere. Signed-off-by: Yann E. MORIN Cc: "Maier, Brandon L Collins" Reviewed-by: brandon.maier@collins.com [Arnout: quote TAR="..."] Signed-off-by: Arnout Vandecappelle --- package/Makefile.in | 2 +- support/scripts/apply-patches.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index f415e55f84c..5476234c7e2 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -231,7 +231,7 @@ endif INSTALL := $(shell which install || type -p install) UNZIP := $(shell which unzip || type -p unzip) -q -APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) +APPLY_PATCHES = TAR="$(TAR)" PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) HOST_CPPFLAGS = -I$(HOST_DIR)/include HOST_CFLAGS ?= -O2 diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 6da83f6826e..4e633b23bef 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -146,7 +146,7 @@ function scan_patchdir { unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked" rm -rf "$unpackedarchivedir" 2> /dev/null mkdir "$unpackedarchivedir" - tar -C "$unpackedarchivedir" -xaf "${path}/$i" + ${TAR} -C "$unpackedarchivedir" -xaf "${path}/$i" scan_patchdir "$unpackedarchivedir" else apply_patch "$path" "$i" From 545704bd52165c119c6d95c268a5726ea7a88b1a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:22 +0200 Subject: [PATCH 1109/3013] package/sunxi-mali-utgard-driver: handle patching the Buildroot way Signed-off-by: Yann E. MORIN Cc: Giulio Benetti Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- .../0001-build.sh-do-not-apply-patches.patch | 39 +++++++++++++++++++ .../sunxi-mali-utgard-driver.mk | 3 +- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch diff --git a/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch b/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch new file mode 100644 index 00000000000..02c6aa78848 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch @@ -0,0 +1,39 @@ +From 079ed8aa57ba6629b992c3d0d01904d3e5170d3b Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 5 Jun 2024 13:06:16 +0200 +Subject: [PATCH] build.sh: do not apply patches + +In Buildroot, we handle applying the patches in a generic way, with +appropriate tools (e.g. with a proper tar). + +Upstream: not applicable +Signed-off-by: Yann E. MORIN +--- + build.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/build.sh b/build.sh +index d1fedff..26efc53 100755 +--- a/build.sh ++++ b/build.sh +@@ -10,6 +10,8 @@ BUILD_OPTS="USING_UMP=0 + USING_DEVFREQ=1" + + apply_patches() { ++ return 0 # Patching handled by Buildroot ++ + pushd $2 + + quilt push -a +@@ -22,6 +24,8 @@ apply_patches() { + } + + unapply_patches() { ++ return 0 # Patching handled by Buildroot ++ + pushd $2 + + quilt pop -a +-- +2.45.1 + diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk index 72fade58ed6..b8a12247d39 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -16,8 +16,7 @@ SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh + $(APPLY_PATCHES) $(@D)/$(SUNXI_MALI_UTGARD_REV) $(@D)/patches endef SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES From d1853f898e9bb2a05a49f4fd69a811d11cd8e371 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Thu, 6 Jun 2024 14:21:47 +0700 Subject: [PATCH 1110/3013] package/git: minor bump to 2.45.2 Minor release bump to address "git lfs" and "git annex" breakage (for release notes see [1]). Link: https://lore.kernel.org/git/xmqqr0dheuw5.fsf@gitster.g/ [1] Signed-off-by: Bagas Sanjaya Signed-off-by: Yann E. MORIN --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 7dbeec714bd..f72fd60ec2d 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 e64d340a8e627ae22cfb8bcc651cca0b497cf1e9fdf523735544ff4a732f12bf git-2.45.1.tar.xz +sha256 51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb git-2.45.2.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 04f489e038b..d84b2e487c2 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.45.1 +GIT_VERSION = 2.45.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 6614e2f9da2c916f4707dc476fb0d123a835fd3c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:00:20 +0100 Subject: [PATCH 1111/3013] configs/versal_vck190_defconfig: bump to xilinx-v2024.1 This patch bumps the versal_vck190_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PLM xilinx-v2024.1 - PSMFW xilinx-v2024.1 Removed ATF patches that were needed for ATF v2.8. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- ...-build-add-support-for-new-binutils-versions.patch | 1 - .../0002-build-tools-avoid-unnecessary-link.patch | 1 - configs/versal_vck190_defconfig | 11 +++++------ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 120000 board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch delete mode 120000 board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch diff --git a/board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch b/board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch deleted file mode 120000 index 8ad996914b4..00000000000 --- a/board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch \ No newline at end of file diff --git a/board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch b/board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch deleted file mode 120000 index fecdee54493..00000000000 --- a/board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch \ No newline at end of file diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 8561b6641ab..ecfc10cc91d 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -33,10 +33,9 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.2" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2024.1" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_BOOTGEN=y -BR2_GLOBAL_PATCH_DIR="board/versal/patches" From 24b6340bac612802c4d96403c2d05d214d05fdfe Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:14:34 +0100 Subject: [PATCH 1112/3013] configs/zynqmp_kria_kv260_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer needed. With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now the offset between the base address of the boot.bin and u-boot.itb instead of a raw base address of u-boot.itb. This allows for A/B firmware updates since the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. Thus, Kria SOMs come with the following QSPI address table. Partition A: 0x200000 - boot.bin 0x280000 - u-boot.itb Partition B: 0xF80000 - boot.bin 0x1000000 - u-boot.itb This patch updates the addressing in the readme.txt accordingly. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- board/zynqmp/kria/readme.txt | 4 ++-- configs/zynqmp_kria_kv260_defconfig | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index 96009804b30..c6be22133ca 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -90,8 +90,8 @@ KV260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload mmc 1 0x1000000 u-boot.itb - $ sf erase 0xf80000 +$filesize - $ sf write 0x1000000 0xf80000 $filesize + $ sf erase 0x280000 +$filesize + $ sf write 0x1000000 0x280000 $filesize Flashing boot.bin: $ sf probe diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index a3a157267c8..7b402e032c6 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -32,11 +31,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 3137e5bf8f06343e60096ef9e89b1d0788fb6c0f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:14:35 +0100 Subject: [PATCH 1113/3013] configs/zynqmp_kria_kr260_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_kria_kr260_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer needed. With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now the offset between the base address of the boot.bin and u-boot.itb instead of a raw base address of u-boot.itb. This allows for A/B firmware updates since the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. Thus, Kria SOMs come with the following QSPI address table. Partition A: 0x200000 - boot.bin 0x280000 - u-boot.itb Partition B: 0xF80000 - boot.bin 0x1000000 - u-boot.itb This patch updates the addressing in the readme.txt accordingly. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- board/zynqmp/kria/readme.txt | 4 ++-- configs/zynqmp_kria_kr260_defconfig | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index c6be22133ca..ca3164383ab 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -103,8 +103,8 @@ KD240 / KR260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload usb 0 0x1000000 u-boot.itb - $ sf erase 0xf80000 +$filesize - $ sf write 0x1000000 0xf80000 $filesize + $ sf erase 0x280000 +$filesize + $ sf write 0x1000000 0x280000 $filesize Flashing boot.bin: $ sf probe diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 2089c3f3554..3bf269ab6ba 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -32,11 +31,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kr260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kr260-kria/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 49fa6ebb71f89e3c9e13d12070bea41ccf6ed700 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:47:37 +0100 Subject: [PATCH 1114/3013] configs/zynq_*: move hashes This patch moves the linux and uboot hashes from 'board/zynq/patches' to 'board/xilinx/patches'. The reason for this is that all of the Xilinx boards including zynq, zynqmp and versal will be using the same linux and uboot repo. By putting the hashes in 'board/xilinx/patches', the same hashes can be shared amongst all of the Xilinx boards. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- board/{zynq => xilinx}/patches/linux-headers/linux-headers.hash | 0 board/{zynq => xilinx}/patches/linux/linux.hash | 0 board/{zynq => xilinx}/patches/uboot/uboot.hash | 0 configs/zynq_microzed_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename board/{zynq => xilinx}/patches/linux-headers/linux-headers.hash (100%) rename board/{zynq => xilinx}/patches/linux/linux.hash (100%) rename board/{zynq => xilinx}/patches/uboot/uboot.hash (100%) diff --git a/board/zynq/patches/linux-headers/linux-headers.hash b/board/xilinx/patches/linux-headers/linux-headers.hash similarity index 100% rename from board/zynq/patches/linux-headers/linux-headers.hash rename to board/xilinx/patches/linux-headers/linux-headers.hash diff --git a/board/zynq/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash similarity index 100% rename from board/zynq/patches/linux/linux.hash rename to board/xilinx/patches/linux/linux.hash diff --git a/board/zynq/patches/uboot/uboot.hash b/board/xilinx/patches/uboot/uboot.hash similarity index 100% rename from board/zynq/patches/uboot/uboot.hash rename to board/xilinx/patches/uboot/uboot.hash diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index c6ca5a6244d..f955a0c4ade 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 9e37678d9bf..75ebc2a3ba3 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 9ccf23f6e12..ce539eefafa 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 95606caf5cf..925faeac8e7 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" From c3344a3a5f19dc5059e6201f55800c0a8a3dc609 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 6 Jun 2024 10:38:51 +0200 Subject: [PATCH 1115/3013] package/libopenssl: security bump to version 3.3.1 Fixes CVE-2024-4741 (for details see [1]). [1] https://www.openssl.org/news/secadv/20240528.txt Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index aca75cf9e4b..dd1c99f7a77 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.3.0.tar.gz.sha256 -sha256 53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02 openssl-3.3.0.tar.gz +# From https://www.openssl.org/source/openssl-3.3.1.tar.gz.sha256 +sha256 777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e openssl-3.3.1.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 5ac6bf97138..d209bb8e96b 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.3.0 +LIBOPENSSL_VERSION = 3.3.1 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From 1608313efff353b65d8f7b4606aa86a178938acc Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 02:35:01 +0300 Subject: [PATCH 1116/3013] package/json-glib: add host build Signed-off-by: Jarkko Sakkinen [yann.morin.1998@free.fr: also disable doc and tests] Signed-off-by: Yann E. MORIN --- package/json-glib/json-glib.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index cd53f24cee5..e216af20b19 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -18,6 +18,15 @@ JSON_GLIB_DEPENDENCIES = \ host-pkgconf \ libglib2 +HOST_JSON_GLIB_DEPENDENCIES = \ + host-pkgconf \ + host-libglib2 + +HOST_JSON_GLIB_CONF_OPTS = \ + -Dgtk_doc=disabled \ + -Dtests=false \ + -Dintrospection=disabled + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection @@ -34,3 +43,4 @@ endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) +$(eval $(host-meson-package)) From b2eec8c6265a38cdba1afadf7f60e0fd00f3b448 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 02:35:02 +0300 Subject: [PATCH 1117/3013] package/libtpms: add host package Libtpms is a library that targets the integration of TPM functionality into hypervisors, primarily into Qemu. Libtpms provides a very narrow public API for this purpose so that integration is possible. Only the minimum of necessary APIs are made publicly available. Signed-off-by: Jarkko Sakkinen Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/libtpms/libtpms.hash | 2 ++ package/libtpms/libtpms.mk | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/libtpms/libtpms.hash create mode 100644 package/libtpms/libtpms.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9cfc84dd65c..d3143982482 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1517,6 +1517,7 @@ N: Jared Bents F: package/libvirt/ N: Jarkko Sakkinen +F: package/libtpms/ F: package/quota/ N: Jason Pruitt diff --git a/package/libtpms/libtpms.hash b/package/libtpms/libtpms.hash new file mode 100644 index 00000000000..1026aaa4f4d --- /dev/null +++ b/package/libtpms/libtpms.hash @@ -0,0 +1,2 @@ +sha256 2807466f1563ebe45fdd12dd26e501e8a0c4fbb99c7c428fbb508789efd221c0 libtpms-0.9.6.tar.gz +sha256 82f1e6bae374bb6a9d4f4596767fd33e499718d560de140fd9f3d402cc5e41fb LICENSE diff --git a/package/libtpms/libtpms.mk b/package/libtpms/libtpms.mk new file mode 100644 index 00000000000..19d7cef89f5 --- /dev/null +++ b/package/libtpms/libtpms.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libtpms +# +################################################################################ + +LIBTPMS_VERSION = 0.9.6 +LIBTPMS_SITE = $(call github,stefanberger,libtpms,v$(LIBTPMS_VERSION)) +LIBTPMS_LICENSE = BSD-4-Clause +LIBTPMS_LICENSE_FILES = LICENSE +LIBTPMS_INSTALL_STAGING = YES + +# Required because a plain Git clone is used: +HOST_LIBTPMS_AUTORECONF = YES +HOST_LIBTPMS_DEPENDENCIES = host-pkgconf host-openssl +HOST_LIBTPMS_CONF_OPTS = --with-openssl -with-tpm2 + +$(eval $(host-autotools-package)) From 87b9b126d23be1e95b3d2b82438f65e28f554a87 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 02:35:03 +0300 Subject: [PATCH 1118/3013] package/swtpm: add host package The SWTPM package provides TPM emulators with different front-end interfaces to libtpms. TPM emulators provide socket interfaces (TCP/IP and Unix) and the Linux CUSE interface for the creation of multiple native /dev/vtpm* devices. Signed-off-by: Jarkko Sakkinen [yann.morin.1998@free.fr: disable tests] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/swtpm/Config.in.host | 11 +++++++++++ package/swtpm/swtpm.hash | 2 ++ package/swtpm/swtpm.mk | 28 ++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/swtpm/Config.in.host create mode 100644 package/swtpm/swtpm.hash create mode 100644 package/swtpm/swtpm.mk diff --git a/DEVELOPERS b/DEVELOPERS index d3143982482..cf48e01037c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1519,6 +1519,7 @@ F: package/libvirt/ N: Jarkko Sakkinen F: package/libtpms/ F: package/quota/ +F: package/swtpm/ N: Jason Pruitt F: package/librtlsdr/ diff --git a/package/Config.in.host b/package/Config.in.host index eacce5e4482..9cdca626330 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -107,6 +107,7 @@ menu "Host utilities" source "package/starfive-spltool/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" + source "package/swtpm/Config.in.host" source "package/swugenerator/Config.in.host" source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" diff --git a/package/swtpm/Config.in.host b/package/swtpm/Config.in.host new file mode 100644 index 00000000000..0dd984ff8d3 --- /dev/null +++ b/package/swtpm/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_SWTPM + bool "host swtpm" + help + Compiles SWTPM software TPM emulator for the host. + + The SWTPM package provides TPM emulators with different + front-end interfaces to libtpms. TPM emulators provide socket + interfaces (TCP/IP and Unix) and the Linux CUSE interface for + the creation of multiple native /dev/vtpm* devices. + + https://github.com/stefanberger/swtpm/wiki diff --git a/package/swtpm/swtpm.hash b/package/swtpm/swtpm.hash new file mode 100644 index 00000000000..934d3b6ee0a --- /dev/null +++ b/package/swtpm/swtpm.hash @@ -0,0 +1,2 @@ +sha256 b281b4e8c39f68e1928675f788abc70072e4081152e129144359a8c5c304c06b swtpm-0.8.2.tar.gz +sha256 19d27d6e96d07022e5e688f75c974f1ceb9aae9e90e0fccae68666d02099cc4b LICENSE diff --git a/package/swtpm/swtpm.mk b/package/swtpm/swtpm.mk new file mode 100644 index 00000000000..598d56cf1d4 --- /dev/null +++ b/package/swtpm/swtpm.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# swtpm +# +################################################################################ + +SWTPM_VERSION = 0.8.2 +SWTPM_SITE = $(call github,stefanberger,swtpm,v$(SWTPM_VERSION)) +SWTPM_LICENSE = BSD-4-Clause +SWTPM_LICENSE_FILES = LICENSE + +HOST_SWTPM_DEPENDENCIES = \ + host-json-glib \ + host-libopenssl \ + host-libtasn1 \ + host-libtool \ + host-libtpms \ + host-pkgconf + +# Required because a plain Git clone is used: +HOST_SWTPM_AUTORECONF = YES + +HOST_SWTPM_CONF_OPTS = \ + --disable-tests \ + --with-openssl \ + --without-seccomp + +$(eval $(host-autotools-package)) From f820d41f0a7479bd43b72dcc4f70b978e5d0ed70 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 6 Jun 2024 13:34:57 +0200 Subject: [PATCH 1119/3013] package/delve: only select host-go when needed Commit 58a291470acf (package/pkg-golang: select BR2_PACKAGE_HOST_GO) ensured that we had the host-go enabled for all packages that need it. However, for delve, the select was added to the _ARCH_SUPPORTS symbol, which means that host-go is built as soon as delve supports the target, even when devle itself is not enabled. Move the select to the main symbol. Fixes: 58a291470acf458239202bd81bfc642b9cadd298 Signed-off-by: Yann E. MORIN --- package/delve/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/delve/Config.in b/package/delve/Config.in index 288dc1ea15a..2ba70e8ceba 100644 --- a/package/delve/Config.in +++ b/package/delve/Config.in @@ -7,12 +7,12 @@ config BR2_PACKAGE_DELVE_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - select BR2_PACKAGE_HOST_GO config BR2_PACKAGE_DELVE bool "delve" depends on BR2_PACKAGE_DELVE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Delve is a debugger for the Go programming language. From 7c286c345cf42bc341a3f0502e33fc8477fdd904 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 13:48:11 +0300 Subject: [PATCH 1120/3013] package/tpm2-tools: bump version to 5.7 tpm2_encodeobject is essential for testing RSAPKCS1 and ECDSA TPM2 signing keys, as the key blob is loaded to the chip in DER format defined by ASN.1 schema. Link: https://lore.kernel.org/linux-crypto/20240528210823.28798-1-jarkko@kernel.org/ Cc: Erik Larsson Cc: Thomas Petazzoni Signed-off-by: Jarkko Sakkinen [yann.morin.1998@free.fr: fix path of LICENSE file] Signed-off-by: Yann E. MORIN --- package/tpm2-tools/tpm2-tools.hash | 4 ++-- package/tpm2-tools/tpm2-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index f50a896363a..cb7e8085d60 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz -sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE +sha256 3810d36b5079256f4f2f7ce552e22213d43b1031c131538df8a2dbc3c570983a tpm2-tools-5.7.tar.gz +sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c docs/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 12f924eee53..cdb8931a3c7 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,10 +4,10 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 5.2 +TPM2_TOOLS_VERSION = 5.7 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause -TPM2_TOOLS_LICENSE_FILES = doc/LICENSE +TPM2_TOOLS_LICENSE_FILES = docs/LICENSE TPM2_TOOLS_CPE_ID_VALID = YES TPM2_TOOLS_SELINUX_MODULES = tpm2 TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf From 9c1fabc1ac5bd0469d21aea91335ee35c5287f90 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 6 Jun 2024 12:18:06 +0200 Subject: [PATCH 1121/3013] configs/stm32f769_disco_sd: add hashes The patch adds .hash files for Linux, Linux headers and U-Boot and then enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../stm32f769-disco/patches/linux-headers/linux-headers.hash | 1 + .../stmicroelectronics/stm32f769-disco/patches/linux/linux.hash | 2 ++ .../stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash | 2 ++ configs/stm32f769_disco_sd_defconfig | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) create mode 120000 board/stmicroelectronics/stm32f769-disco/patches/linux-headers/linux-headers.hash create mode 100644 board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash create mode 100644 board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index d0bd179a5c0..35c8c0a59c7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -333,7 +333,6 @@ configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash configs/stm32f429_disco_xip_defconfig lib_defconfig.ForceCheckHash configs/stm32f469_disco_sd_defconfig lib_defconfig.ForceCheckHash configs/stm32f469_disco_xip_defconfig lib_defconfig.ForceCheckHash -configs/stm32f769_disco_sd_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157a_dk1_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash diff --git a/board/stmicroelectronics/stm32f769-disco/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32f769-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/stm32f769-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash new file mode 100644 index 00000000000..49a2ba85a7d --- /dev/null +++ b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8beb69ada46f1cbca2f4cf901ec078846035c1cd925d9471422f65aff74243ba linux-5.15.108.tar.xz diff --git a/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash new file mode 100644 index 00000000000..7cef5b688ec --- /dev/null +++ b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 u-boot-2023.04.tar.bz2 diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 725c985ec04..952d22cc60d 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_m7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f769-disco/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32f769-disco/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f769-disco/genimage.cfg" From 9eb7eb456a6a530749d1c0121794c415b4888b96 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 6 Jun 2024 12:22:08 +0200 Subject: [PATCH 1122/3013] configs/stm32f429_disco_xip: add hashes The patch adds the .hash file for Linux, which then allow to enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Note that the defconfig uses linux-headers that are not the same as the kernel (although the same series), and instead use the 6.1.x version from the linux-headers package choice. So we don't need to add a .hash file for linux-headers. Signed-off-by: Dario Binacchi [yann.morin.1998@free.fr: don't add linux-headers symlink; explain why] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../stmicroelectronics/stm32f429-disco/patches/linux/linux.hash | 2 ++ configs/stm32f429_disco_xip_defconfig | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash diff --git a/.checkpackageignore b/.checkpackageignore index 35c8c0a59c7..8a21b3f155b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -330,7 +330,6 @@ configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash -configs/stm32f429_disco_xip_defconfig lib_defconfig.ForceCheckHash configs/stm32f469_disco_sd_defconfig lib_defconfig.ForceCheckHash configs/stm32f469_disco_xip_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157a_dk1_defconfig lib_defconfig.ForceCheckHash diff --git a/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash new file mode 100644 index 00000000000..c1bd9f9100d --- /dev/null +++ b/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c2b74b96dd3d0cc9f300914ef7c4eef76d5fac9de6047961f49e69447ce9f905 linux-6.1.27.tar.xz diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index 99ae8cc7533..e3d3cc38ff8 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -3,6 +3,8 @@ BR2_cortex_m4=y BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f429-disco/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From c1554df688cb1563c8da2f8fcba21020dcf126a1 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 6 Jun 2024 13:07:56 +0100 Subject: [PATCH 1123/3013] configs/versal_vck190_defconfig: add hashes Signed-off-by: Brandon Maier Signed-off-by: Neal Frager Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ board/xilinx/patches/versal-firmware/versal-firmware.hash | 2 ++ configs/versal_vck190_defconfig | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 100644 board/xilinx/patches/versal-firmware/versal-firmware.hash diff --git a/.checkpackageignore b/.checkpackageignore index c3de61111fa..eea412d01da 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -358,7 +358,6 @@ configs/ts4900_defconfig lib_defconfig.ForceCheckHash configs/ts5500_defconfig lib_defconfig.ForceCheckHash configs/ts7680_defconfig lib_defconfig.ForceCheckHash configs/uevm5432_defconfig lib_defconfig.ForceCheckHash -configs/versal_vck190_defconfig lib_defconfig.ForceCheckHash configs/visionfive_defconfig lib_defconfig.ForceCheckHash configs/wandboard_defconfig lib_defconfig.ForceCheckHash configs/warp7_defconfig lib_defconfig.ForceCheckHash diff --git a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..e300398541a --- /dev/null +++ b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c3369c89eab4e452bbc76c630e5dccb6c0ae588c0175b6c8549aa0241deb06ef xlnx_rebase_v2.10_2024.1.tar.gz diff --git a/board/xilinx/patches/versal-firmware/versal-firmware.hash b/board/xilinx/patches/versal-firmware/versal-firmware.hash new file mode 100644 index 00000000000..c4d745f22cc --- /dev/null +++ b/board/xilinx/patches/versal-firmware/versal-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f versal-firmware-xilinx_v2024.1.tar.gz diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index ecfc10cc91d..69272e721c7 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -39,3 +39,5 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_BOOTGEN=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" From b53d2d257584cd1aa16471e3f4d43b75eda77df4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Jun 2024 14:27:52 +0200 Subject: [PATCH 1124/3013] configs/qemu_ppc64le_pseries_defconfig: Linux needs host-openssl Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7019514688 The kernel build needs host-openssl since commit 9982e0b5a63ca (configs/qemu: update defconfigs to Linux 6.6.18), so enable it. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- configs/qemu_ppc64le_pseries_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index ebc3b7a6fd1..9c678ec1e57 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -23,6 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # host-qemu for gitlab testing From ee12457487e139f9ea0fc05941151f55bcbbeb1b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Jun 2024 14:27:53 +0200 Subject: [PATCH 1125/3013] configs/qemu_ppc64_pseries_defconfig: Linux needs host-openssl Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7019514677 The kernel build needs host-openssl since commit 9982e0b5a63ca (configs/qemu: update defconfigs to Linux 6.6.18), so enable it. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- configs/qemu_ppc64_pseries_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 350380578a2..5f6f51d2580 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -23,6 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # host-qemu for gitlab testing From d9a0954288c43c01633343a4a701692de8068cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 9 Feb 2024 21:44:39 +0100 Subject: [PATCH 1126/3013] configs: add raspberrypi 5 defconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This configuration builds an image for the RaspberryPi 5. Cc: Adam Duskett Cc: Yann E. MORIN Signed-off-by: Gaël PORTAY [yann.morin.1998@free.fr: check hashes] Signed-off-by: Yann E. MORIN --- board/raspberrypi/cmdline_5.txt | 1 + board/raspberrypi/config_5.txt | 14 ++++++ board/raspberrypi/linux-4k-page-size.fragment | 1 + board/raspberrypi/readme.txt | 6 +++ board/raspberrypi5 | 1 + configs/raspberrypi5_defconfig | 50 +++++++++++++++++++ 6 files changed, 73 insertions(+) create mode 100644 board/raspberrypi/cmdline_5.txt create mode 100644 board/raspberrypi/config_5.txt create mode 100644 board/raspberrypi/linux-4k-page-size.fragment create mode 120000 board/raspberrypi5 create mode 100644 configs/raspberrypi5_defconfig diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt new file mode 100644 index 00000000000..ac457353e2e --- /dev/null +++ b/board/raspberrypi/cmdline_5.txt @@ -0,0 +1 @@ +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt new file mode 100644 index 00000000000..bbed19fe46d --- /dev/null +++ b/board/raspberrypi/config_5.txt @@ -0,0 +1,14 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment new file mode 100644 index 00000000000..5df91df1aa0 --- /dev/null +++ b/board/raspberrypi/linux-4k-page-size.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 9202b5ff37a..aa6421ea017 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model B5 (aka Raspberry Pi 5). How to build it =============== @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +For model 5 B: + + $ make raspberrypi5_defconfig + Build the rootfs ---------------- @@ -94,6 +99,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 diff --git a/board/raspberrypi5 b/board/raspberrypi5 new file mode 120000 index 00000000000..fcdafc81edb --- /dev/null +++ b/board/raspberrypi5 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig new file mode 100644 index 00000000000..73592c4a1a4 --- /dev/null +++ b/configs/raspberrypi5_defconfig @@ -0,0 +1,50 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y + +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/raspberrypi5/patches" From 8e2f5c106f0774cc7b02d4853f9a4c46ebcb3c19 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 12:52:10 +0100 Subject: [PATCH 1127/3013] configs/zynqmp_zcu102_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_zcu102_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- configs/zynqmp_zcu102_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index c920093d8d7..f40002f6d93 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,11 +30,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu102-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From c0ec5438d96cb10e6dfce409c8007c18c0f9349c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 12:52:11 +0100 Subject: [PATCH 1128/3013] configs/zynqmp_zcu104_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_zcu104_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- configs/zynqmp_zcu104_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index 452f2343c8d..ef9c9bad492 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,11 +30,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu104-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu104-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 089943812eb8dcbd308f3a3dea02d482bf9189df Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 12:52:12 +0100 Subject: [PATCH 1129/3013] configs/zynqmp_zcu106_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_zcu106_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- configs/zynqmp_zcu106_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 011c7f0fae5..07c595436f8 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,11 +30,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu106-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 9755de93360bf84801f551fb9da17b45359e8dfa Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 9 May 2024 09:49:27 -0500 Subject: [PATCH 1130/3013] board/ti/am64x-sk/patches/linux: backport linux clock fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With newer versions of DM or DMSC firmware (v09.02.07+) invalid clock requests will be NAKed and generate a warning in the kernel logs rather than being ignored like in previous versions of firmware. This, together with the linux clk driver assuming that all clock IDs are contiguous, can generate a significant amount of warnings during boot when many drivers are being probed. A fix for this has been merged into Linux (commit: ad3ac13c6ec31) however the backport to older kernels was missed which unfortunately affects the current v6.8 kernel. Manually backport this fix while we're using the v6.8 kernel Signed-off-by: Bryan Brattlof Tested-by: Gero Schwäricke [Arnout: add Upstream tag] Signed-off-by: Arnout Vandecappelle --- ...-clk-Adding-support-for-non-contiguo.patch | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 board/ti/am64x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch diff --git a/board/ti/am64x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch b/board/ti/am64x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch new file mode 100644 index 00000000000..788b6439d89 --- /dev/null +++ b/board/ti/am64x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch @@ -0,0 +1,75 @@ +From 750cdf4cb6791c45d479ed73a97728100394fb32 Mon Sep 17 00:00:00 2001 +From: Udit Kumar +Date: Tue, 13 Feb 2024 13:56:40 +0530 +Subject: [PATCH] clk: keystone: sci-clk: Adding support for non contiguous + clocks +X-Developer-Signature: v=1; a=openpgp-sha256; l=1876; i=bb@ti.com; + h=from:subject; bh=CKSvD6FpqwRzx8blynhoCEc3XUR5TlwjFJdcgjQwpgg=; + b=owNCWmg5MUFZJlNZHYzOLwAAZP/////7puP/r7v/9q9s+8t7wa8/97UZO//d+XvPsvfv2/+wA + RsYHaQAAAAAAAAGg09IPUGmgAaAANBoAAAGmnqAPU9Q0DQ0HqMQDQ8ptTeqeogaABoPU0NAPUAA + 0GgDJ6gANAAMg0GmgNGgDEGh6jR6h6hp6mgepoPU2oDTIGho0IaHqA00yDQNBoGTRoDTRkAZNAD + AmTIBkGjIGmQyAZDRkAaANAYIxBk0DQAAHODcFn1CAGBsJeG8ZtU3FQCBdLH7LjDIouHeAszY1j + AFkqjaWIFXEVi8NV3giRplb1JjCYunXimTaK06SgQRYsUGRSbKOVQP2t1LlAYS93QjOMWF6CHXK + 69KzHyBDpXR2mHAAkHcHX0X3SAYJkxPElwJ1ZnHK1RfDKRfJcRQKzxnryM+4x2mCxpIFIIjpVLk + nItd1Vl1SEF2QiWZIYV4b0lawcUqLGgTQZ0+qpJ5QORYrvPXE4DR89JlJYBU4DjxAoyACH6KN0o + AiaknqZTfMwmF8iREpU4SgDEVun3X3OFlkBp3hBO+Ynb12GJoLSFBSz9IWE2ooLKFalh5XJMZfl + +GthEEOnlrMQHOF8qCr+JAKqXEqSrwLGuEIMFbnGEjJYruo4ENGOmGVlkvW+kLRp5ibCXAAcDMM + TPOUZ/i7kinChIDsZnF4A== +X-Developer-Key: i=bb@ti.com; a=openpgp; + fpr=D3D177E40A38DF4D1853FEEF41B90D5D71D56CE0 + +Most of clocks and their parents are defined in contiguous range, +But in few cases, there is gap in clock numbers[0]. +Driver assumes clocks to be in contiguous range, and add their clock +ids incrementally. + +New firmware started returning error while calling get_freq and is_on +API for non-available clock ids. + +In this fix, driver checks and adds only valid clock ids. + +[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html +Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present. + +Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks") +Signed-off-by: Udit Kumar +Reviewed-by: Nishanth Menon +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ad3ac13c6ec318b43e769cc9ffde67528e58e555 +Signed-off-by: Bryan Brattlof +--- + drivers/clk/keystone/sci-clk.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c +index 35fe197dd303c..eb2ef44869b23 100644 +--- a/drivers/clk/keystone/sci-clk.c ++++ b/drivers/clk/keystone/sci-clk.c +@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) + struct sci_clk *sci_clk, *prev; + int num_clks = 0; + int num_parents; ++ bool state; + int clk_id; + const char * const clk_names[] = { + "clocks", "assigned-clocks", "assigned-clock-parents", NULL +@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) + clk_id = args.args[1] + 1; + + while (num_parents--) { ++ /* Check if this clock id is valid */ ++ ret = provider->ops->is_auto(provider->sci, ++ sci_clk->dev_id, clk_id, &state); ++ ++ if (ret) { ++ clk_id++; ++ continue; ++ } ++ + sci_clk = devm_kzalloc(dev, + sizeof(*sci_clk), + GFP_KERNEL); + +base-commit: 9fbb5fcb41e7e96fb8769a9f5a12a35a984c23bd +-- +2.43.2 + From 4fb7eb8285412c5fe410dbef47b42888240decbb Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 9 May 2024 09:49:28 -0500 Subject: [PATCH 1131/3013] board/ti/am62x-sk/patches/linux: backport linux clock fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With newer versions of DM or DMSC firmware (>v09.02.07) invalid clock requests will be NAKed and generate a warning in the kernel logs rather than being ignored like in previous versions of firmware. This, together with the linux clk driver assuming that all clock IDs are contiguous, can generate a significant amount of warnings during boot when many drivers are being probed. A fix for this has been merged into Linux (commit: ad3ac13c6ec31) however the backport to older kernels was missed which unfortunately affects the current v6.8 kernel. Manually backport this fix while we're using the v6.8 kernel Signed-off-by: Bryan Brattlof Tested-by: Gero Schwäricke [Arnout: add Upsream tag] Signed-off-by: Arnout Vandecappelle --- ...-clk-Adding-support-for-non-contiguo.patch | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch diff --git a/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch b/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch new file mode 100644 index 00000000000..788b6439d89 --- /dev/null +++ b/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch @@ -0,0 +1,75 @@ +From 750cdf4cb6791c45d479ed73a97728100394fb32 Mon Sep 17 00:00:00 2001 +From: Udit Kumar +Date: Tue, 13 Feb 2024 13:56:40 +0530 +Subject: [PATCH] clk: keystone: sci-clk: Adding support for non contiguous + clocks +X-Developer-Signature: v=1; a=openpgp-sha256; l=1876; i=bb@ti.com; + h=from:subject; bh=CKSvD6FpqwRzx8blynhoCEc3XUR5TlwjFJdcgjQwpgg=; + b=owNCWmg5MUFZJlNZHYzOLwAAZP/////7puP/r7v/9q9s+8t7wa8/97UZO//d+XvPsvfv2/+wA + RsYHaQAAAAAAAAGg09IPUGmgAaAANBoAAAGmnqAPU9Q0DQ0HqMQDQ8ptTeqeogaABoPU0NAPUAA + 0GgDJ6gANAAMg0GmgNGgDEGh6jR6h6hp6mgepoPU2oDTIGho0IaHqA00yDQNBoGTRoDTRkAZNAD + AmTIBkGjIGmQyAZDRkAaANAYIxBk0DQAAHODcFn1CAGBsJeG8ZtU3FQCBdLH7LjDIouHeAszY1j + AFkqjaWIFXEVi8NV3giRplb1JjCYunXimTaK06SgQRYsUGRSbKOVQP2t1LlAYS93QjOMWF6CHXK + 69KzHyBDpXR2mHAAkHcHX0X3SAYJkxPElwJ1ZnHK1RfDKRfJcRQKzxnryM+4x2mCxpIFIIjpVLk + nItd1Vl1SEF2QiWZIYV4b0lawcUqLGgTQZ0+qpJ5QORYrvPXE4DR89JlJYBU4DjxAoyACH6KN0o + AiaknqZTfMwmF8iREpU4SgDEVun3X3OFlkBp3hBO+Ynb12GJoLSFBSz9IWE2ooLKFalh5XJMZfl + +GthEEOnlrMQHOF8qCr+JAKqXEqSrwLGuEIMFbnGEjJYruo4ENGOmGVlkvW+kLRp5ibCXAAcDMM + TPOUZ/i7kinChIDsZnF4A== +X-Developer-Key: i=bb@ti.com; a=openpgp; + fpr=D3D177E40A38DF4D1853FEEF41B90D5D71D56CE0 + +Most of clocks and their parents are defined in contiguous range, +But in few cases, there is gap in clock numbers[0]. +Driver assumes clocks to be in contiguous range, and add their clock +ids incrementally. + +New firmware started returning error while calling get_freq and is_on +API for non-available clock ids. + +In this fix, driver checks and adds only valid clock ids. + +[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html +Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present. + +Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks") +Signed-off-by: Udit Kumar +Reviewed-by: Nishanth Menon +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ad3ac13c6ec318b43e769cc9ffde67528e58e555 +Signed-off-by: Bryan Brattlof +--- + drivers/clk/keystone/sci-clk.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c +index 35fe197dd303c..eb2ef44869b23 100644 +--- a/drivers/clk/keystone/sci-clk.c ++++ b/drivers/clk/keystone/sci-clk.c +@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) + struct sci_clk *sci_clk, *prev; + int num_clks = 0; + int num_parents; ++ bool state; + int clk_id; + const char * const clk_names[] = { + "clocks", "assigned-clocks", "assigned-clock-parents", NULL +@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) + clk_id = args.args[1] + 1; + + while (num_parents--) { ++ /* Check if this clock id is valid */ ++ ret = provider->ops->is_auto(provider->sci, ++ sci_clk->dev_id, clk_id, &state); ++ ++ if (ret) { ++ clk_id++; ++ continue; ++ } ++ + sci_clk = devm_kzalloc(dev, + sizeof(*sci_clk), + GFP_KERNEL); + +base-commit: 9fbb5fcb41e7e96fb8769a9f5a12a35a984c23bd +-- +2.43.2 + From e4b8380503a4ae78564133d1be94ab54cfe108e4 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Fri, 10 May 2024 09:32:12 +0200 Subject: [PATCH 1132/3013] package/qt6base: avoid enabling both desktop and es2 opengl Fixes the following error: ERROR: Feature "opengles2": Forcing to "ON" breaks its condition: NOT WIN32 AND NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND Condition values dump: WIN32 = "" WATCHOS = "0" QT_FEATURE_opengl_desktop = "ON" GLESv2_FOUND = "TRUE" CMake Error at cmake/QtBuildInformation.cmake:209 (message): Check the configuration messages for an error that has occurred. Call Stack (most recent call first): cmake/QtBuildInformation.cmake:39 (qt_configure_print_summary) cmake/QtBuildRepoHelpers.cmake:332 (qt_print_feature_summary) CMakeLists.txt:208 (qt_build_repo_end) To recreate the error, use the following defconfig (based on freescale_imx8mmevk_defconfig): BR2_aarch64=y BR2_ARM_FPU_VFPV3=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_QT6=y BR2_PACKAGE_QT6BASE_GUI=y BR2_PACKAGE_QT6BASE_OPENGL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y BR2_PACKAGE_IMX_GPU_VIV=y BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Signed-off-by: Roy Kollen Svendsen Signed-off-by: Arnout Vandecappelle --- package/qt6/qt6base/qt6base.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 6857725ef5c..211808d2af7 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -259,10 +259,15 @@ QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF endif ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) -QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_CONF_OPTS += \ + -DFEATURE_opengl=ON \ + -DFEATURE_opengl_desktop=ON QT6BASE_DEPENDENCIES += libgl else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) -QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_CONF_OPTS += \ + -DFEATURE_opengl=ON \ + -DFEATURE_opengles2=ON \ + -DFEATURE_opengl_desktop=OFF QT6BASE_DEPENDENCIES += libgles else QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no From 4dafb8b5c2adb6208f56e2abda954e264b8e6fdd Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 13 May 2024 21:30:35 +0000 Subject: [PATCH 1133/3013] support/testing/infra/builder.py: fix missing $HOME during build When running a test that uses host-python-setuptools using the Buildroot Docker image, for example running the following command, > ./utils/docker-run ./support/testing/run-tests -o output -s -k tests.package.test_python_pytest.TestPythonPy3Pytest The build fails with the following error, > File "/home/blmaier/buildroot/output/TestPythonPy3Pytest/build/host-python-setuptools-69.2.0/setuptools/_distutils/dist.py", line 354, in _gen_paths > yield pathlib.Path('~').expanduser() / filename > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/home/blmaier/buildroot/output/TestPythonPy3Pytest/host/lib/python3.11/pathlib.py", line 1385, in expanduser > raise RuntimeError("Could not determine home directory.") > RuntimeError: Could not determine home directory. > > ERROR Backend subprocess exited when trying to invoke get_requires_for_build_wheel Python setuptools is looking for $HOME but failing to find it. Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- support/testing/infra/builder.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index a2abb9ed89e..295bc7b83d3 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -52,7 +52,10 @@ def configure(self, make_extra_opts=[], make_extra_env={}): "> end defconfig\n") self.logfile.flush() - env = {"PATH": os.environ["PATH"]} + env = { + "PATH": os.environ["PATH"], + "HOME": os.environ["HOME"] + } env.update(make_extra_env) cmd = ["make", @@ -79,7 +82,11 @@ def build(self, make_extra_opts=[], make_extra_env={}): in the environment that calls make. e.g. make_extra_env={"BR2_DL_DIR": "/path"} """ - env = {"PATH": os.environ["PATH"]} + env = { + "PATH": os.environ["PATH"], + "HOME": os.environ["HOME"] + } + if "http_proxy" in os.environ: self.logfile.write("Using system proxy: " + os.environ["http_proxy"] + "\n") From ed05bfcab6b25653c997dbc98bef5604597471a9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 May 2024 23:54:02 +0200 Subject: [PATCH 1134/3013] package/bc: fix build with gcc 14.x Fixes: http://autobuild.buildroot.net/results/4d3/4d3c0e0a08cd734699cb61412c99d705738e8ab4/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...and-write-errors-on-input-and-output.patch | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch b/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch index cc72e5cd693..87654e3c143 100644 --- a/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch +++ b/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch @@ -26,6 +26,10 @@ Origin: other Bug-Debian: http://bugs.debian.org/488735 Signed-off-by: Matthew Weber +Signed-off-by: Bernd Kuhls +[Bernd: + Updated to incorporate changes by Matthias Klose + on 2024-03-13 that fix Debian bug https://bugs.debian.org/1065375] --- bc/execute.c | 10 +++++++++- bc/main.c | 3 +++ @@ -276,6 +280,14 @@ diff --git a/dc/dc.c b/dc/dc.c index 6a2bb26..ccdb1c2 100644 --- a/dc/dc.c +++ b/dc/dc.c +@@ -45,6 +45,7 @@ + #include + #include "dc.h" + #include "dc-proto.h" ++#include "number.h" + + #ifndef EXIT_SUCCESS /* C89 */ + # define EXIT_SUCCESS 0 @@ -59,6 +59,7 @@ static void bug_report_info DC_DECLVOID() { @@ -304,6 +316,14 @@ diff --git a/dc/eval.c b/dc/eval.c index 05a3d9e..6c54e61 100644 --- a/dc/eval.c +++ b/dc/eval.c +@@ -41,6 +41,7 @@ + #endif + #include "dc.h" + #include "dc-proto.h" ++#include "number.h" + + typedef enum {DC_FALSE, DC_TRUE} dc_boolean; + @@ -97,12 +97,15 @@ static int input_pushback; static int input_fil DC_DECLVOID() @@ -512,6 +532,14 @@ diff --git a/dc/misc.c b/dc/misc.c index cd23602..cd910b8 100644 --- a/dc/misc.c +++ b/dc/misc.c +@@ -47,6 +47,7 @@ + #include + #include "dc.h" + #include "dc-proto.h" ++#include "number.h" + + #ifndef EXIT_FAILURE /* C89 */ + # define EXIT_FAILURE 1 @@ -89,6 +89,7 @@ dc_show_id DC_DECLARG((fp, id, suffix)) fprintf(fp, "'%c' (%#o)%s", (unsigned int) id, id, suffix); else @@ -593,8 +621,11 @@ diff --git a/dc/stack.c b/dc/stack.c index 49422df..174411d 100644 --- a/dc/stack.c +++ b/dc/stack.c -@@ -35,7 +35,10 @@ +@@ -33,9 +33,13 @@ + #include "dc.h" + #include "dc-proto.h" #include "dc-regdef.h" ++#include "number.h" /* an oft-used error message: */ -#define Empty_Stack fprintf(stderr, "%s: stack empty\n", progname) @@ -657,6 +688,14 @@ diff --git a/dc/string.c b/dc/string.c index dee9169..389d899 100644 --- a/dc/string.c +++ b/dc/string.c +@@ -45,6 +45,7 @@ + #endif + #include "dc.h" + #include "dc-proto.h" ++#include "number.h" + + /* here is the completion of the dc_string type: */ + struct dc_string { @@ -94,6 +94,7 @@ dc_out_str DC_DECLARG((value, discard_flag)) dc_discard discard_flag DC_DECLEND { From 9c628fc1568d1f63dfbee0a7be6aa2be92dc89ab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 May 2024 23:54:03 +0200 Subject: [PATCH 1135/3013] package/rrdtool: fix build with gcc 14.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .../0001-Constify-argv-fix-warnings.patch | 1586 +++++++++++++++++ 1 file changed, 1586 insertions(+) create mode 100644 package/rrdtool/0001-Constify-argv-fix-warnings.patch diff --git a/package/rrdtool/0001-Constify-argv-fix-warnings.patch b/package/rrdtool/0001-Constify-argv-fix-warnings.patch new file mode 100644 index 00000000000..e41e729a0e6 --- /dev/null +++ b/package/rrdtool/0001-Constify-argv-fix-warnings.patch @@ -0,0 +1,1586 @@ +From b76e3c578f1e9f582e9c28f50d82b1f569602075 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20Such=C3=A1nek?= +Date: Fri, 5 Jan 2024 15:31:48 +0100 +Subject: [PATCH] Constify argv, fix warnings. (#1242) + +* Fix perl warnings + + - cast POPs to void to avoid unused value warning + - declare functions that don't set RETVAL as returning void + +Signed-off-by: Michal Suchanek + +* Constify argv + +rrd has no business modifying the string pointed to by passed agrv, and +as far as gcc can see it does indeed not modify them because it compiles +with const argv. + +This fixes warnings when passing const strings into rrd, and avoids the +need to duplicate all strings in the tcl bindings. + +This fixes warnings like these: +[ 3s] prog/sensord/rrd.c: In function 'rrdInit': +[ 3s] prog/sensord/rrd.c:302:40: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] +[ 3s] 302 | ret = rrd_create(argc, (char**) argv); +[ 3s] | ^ +[ 3s] prog/sensord/rrd.c: In function 'rrdUpdate': +[ 3s] prog/sensord/rrd.c:458:42: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] +[ 3s] 458 | if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) { +[ 3s] | ^ + +Signed-off-by: Michal Suchanek + +* tcl: Do not duplicate const strings + +--------- + +Signed-off-by: Michal Suchanek + +Upstream: https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075 + +Signed-off-by: Bernd Kuhls +--- + CHANGES | 3 ++ + bindings/lua/rrdlua.c | 25 +++++----- + bindings/perl-shared/RRDs.xs | 36 +++++++------- + bindings/python/rrdtoolmodule.c | 38 +++++++-------- + bindings/ruby/main.c | 10 ++-- + bindings/tcl/tclrrd.c | 84 ++++++++------------------------- + src/optparse.c | 14 +++--- + src/optparse.h | 6 +-- + src/rrd.h | 38 +++++++-------- + src/rrd_cgi.c | 24 +++++----- + src/rrd_create.c | 2 +- + src/rrd_daemon.c | 12 ++--- + src/rrd_dump.c | 4 +- + src/rrd_fetch.c | 2 +- + src/rrd_first.c | 2 +- + src/rrd_flushcached.c | 2 +- + src/rrd_graph.c | 6 +-- + src/rrd_graph.h | 4 +- + src/rrd_graph_helper.c | 2 +- + src/rrd_info.c | 2 +- + src/rrd_last.c | 2 +- + src/rrd_lastupdate.c | 2 +- + src/rrd_list.c | 6 +-- + src/rrd_modify.c | 2 +- + src/rrd_modify.h | 2 +- + src/rrd_resize.c | 4 +- + src/rrd_restore.c | 2 +- + src/rrd_tool.c | 26 +++++----- + src/rrd_tune.c | 2 +- + src/rrd_update.c | 4 +- + src/rrd_xport.c | 2 +- + src/rrdupdate.c | 7 +-- + 32 files changed, 168 insertions(+), 209 deletions(-) + +diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c +index d1a700641..2095c3b5b 100644 +--- a/bindings/lua/rrdlua.c ++++ b/bindings/lua/rrdlua.c +@@ -37,8 +37,8 @@ + extern void rrd_freemem(void *mem); + + extern int luaopen_rrd (lua_State * L); +-typedef int (*RRD_FUNCTION)(int, char **); +-typedef rrd_info_t *(RRD_FUNCTION_V)(int, char **); ++typedef int (*RRD_FUNCTION)(int, const char **); ++typedef rrd_info_t *(RRD_FUNCTION_V)(int, const char **); + + /**********************************************************/ + +@@ -49,9 +49,9 @@ static void reset_rrd_state(void) + rrd_clear_error(); + } + +-static char **make_argv(const char *cmd, lua_State * L) ++static const char **make_argv(const char *cmd, lua_State * L) + { +- char **argv; ++ const char **argv; + int i; + int argc = lua_gettop(L) + 1; + +@@ -60,13 +60,12 @@ static char **make_argv(const char *cmd, lua_State * L) + luaL_error(L, "Can't allocate memory for arguments array", cmd); + + /* fprintf(stderr, "Args:\n"); */ +- argv[0] = (char *) cmd; /* Dummy arg. Cast to (char *) because rrd */ +- /* functions don't expect (const * char) */ ++ argv[0] = cmd; + /* fprintf(stderr, "%s\n", argv[0]); */ + for (i=1; i + #include "../../src/rrd_tool.h" + #include "../../src/rrd_format.h" ++#include "../../src/unused.h" + + /* support pre-8.4 tcl */ + +@@ -41,47 +42,39 @@ extern int Tclrrd_SafeInit( + * Hence, we need to do some preparation before + * calling the rrd library functions. + */ +-static char **getopt_init( ++static const char **getopt_init( + int argc, + CONST84 char *argv[]) + { +- char **argv2; ++ const char **argv2; + int i; + + argv2 = calloc(argc, sizeof(char *)); + for (i = 0; i < argc; i++) { +- argv2[i] = strdup(argv[i]); ++ argv2[i] = argv[i]; + } + return argv2; + } + + static void getopt_cleanup( +- int argc, +- char **argv2) ++ int UNUSED(argc), ++ const char **argv2) + { +- int i; +- +- for (i = 0; i < argc; i++) { +- if (argv2[i] != NULL) { +- free(argv2[i]); +- } +- } +- free(argv2); ++ free((void *)argv2); + } + + static void getopt_free_element( +- char *argv2[], ++ const char *argv2[], + int argn) + { + if (argv2[argn] != NULL) { +- free(argv2[argn]); + argv2[argn] = NULL; + } + } + + static void getopt_squieeze( + int *argc, +- char *argv2[]) ++ const char *argv2[]) + { + int i, null_i = 0, argc_tmp = *argc; + +@@ -104,7 +97,7 @@ static int Rrd_Create( + CONST84 char *argv[]) + { + int argv_i; +- char **argv2; ++ const char **argv2; + char *parsetime_error = NULL; + time_t last_up = time(NULL) - 10; + long int long_tmp; +@@ -295,7 +288,7 @@ static int Rrd_Flushcached( + return TCL_ERROR; + } + +- rrd_flushcached(argc, (char**)argv); ++ rrd_flushcached(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -380,7 +373,7 @@ static int Rrd_Update( + CONST84 char *argv[]) + { + int argv_i; +- char **argv2, *template = NULL; ++ const char **argv2, *template = NULL; + + argv2 = getopt_init(argc, argv); + +@@ -391,16 +384,10 @@ static int Rrd_Update( + Tcl_AppendResult(interp, "RRD Error: option '", + argv2[argv_i - 1], "' needs an argument", + (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } +- if (template != NULL) { +- free(template); +- } +- template = strdup(argv2[argv_i]); ++ template = argv2[argv_i]; + getopt_free_element(argv2, argv_i - 1); + getopt_free_element(argv2, argv_i); + } else if (!strcmp(argv2[argv_i], "--")) { +@@ -409,9 +396,6 @@ static int Rrd_Update( + } else if (argv2[argv_i][0] == '-') { + Tcl_AppendResult(interp, "RRD Error: unknown option '", + argv2[argv_i], "'", (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } +@@ -422,18 +406,12 @@ static int Rrd_Update( + if (argc < 2) { + Tcl_AppendResult(interp, "RRD Error: needs rrd filename", + (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } + + rrd_update_r(argv2[1], template, argc - 2, (const char **)argv2 + 2); + +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + + if (rrd_test_error()) { +@@ -454,7 +432,6 @@ static int Rrd_Info( + { + int status = TCL_OK; + rrd_info_t *data; +- char **argv2; + + /* TODO: support for rrdcached */ + if (argc != 2) { +@@ -463,9 +440,7 @@ static int Rrd_Info( + return TCL_ERROR; + } + +- argv2 = getopt_init(argc, argv); +- +- data = rrd_info_r(argv2[1]); ++ data = rrd_info_r(argv[1]); + + if (data) { + Tcl_SetObjResult(interp, convert_info(data)); +@@ -477,7 +452,6 @@ static int Rrd_Info( + status = TCL_ERROR; + } + +- getopt_cleanup(argc, argv2); + return status; + } + +@@ -488,7 +462,6 @@ static int Rrd_Lastupdate( + CONST84 char *argv[]) + { + time_t last_update; +- char **argv2; + char **ds_namv; + char **last_ds; + char s[30]; +@@ -502,8 +475,7 @@ static int Rrd_Lastupdate( + return TCL_ERROR; + } + +- argv2 = getopt_init(argc, argv); +- if (rrd_lastupdate_r(argv2[1], &last_update, ++ if (rrd_lastupdate_r(argv[1], &last_update, + &ds_cnt, &ds_namv, &last_ds) == 0) { + listPtr = Tcl_GetObjResult(interp); + for (i = 0; i < ds_cnt; i++) { +@@ -527,7 +499,6 @@ static int Rrd_Lastupdate( + free(ds_namv); + } + } +- getopt_cleanup(argc, argv2); + return TCL_OK; + } + +@@ -543,10 +514,8 @@ static int Rrd_Fetch( + char **ds_namv; + Tcl_Obj *listPtr; + char s[30]; +- char **argv2; + +- argv2 = getopt_init(argc, argv); +- if (rrd_fetch(argc, argv2, &start, &end, &step, ++ if (rrd_fetch(argc, argv, &start, &end, &step, + &ds_cnt, &ds_namv, &data) != -1) { + datai = data; + listPtr = Tcl_GetObjResult(interp); +@@ -562,7 +531,6 @@ static int Rrd_Fetch( + free(ds_namv); + free(data); + } +- getopt_cleanup(argc, argv2); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -590,7 +558,7 @@ static int Rrd_Graph( + int rc, xsize, ysize; + double ymin, ymax; + char dimensions[50]; +- char **argv2; ++ const char **argv2; + CONST84 char *save; + + /* +@@ -692,11 +660,7 @@ static int Rrd_Tune( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_tune(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_tune(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -716,11 +680,7 @@ static int Rrd_Resize( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_resize(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_resize(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -740,11 +700,7 @@ static int Rrd_Restore( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_restore(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_restore(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +diff --git a/src/optparse.c b/src/optparse.c +index 9040ba8b2..79a3efe11 100644 +--- a/src/optparse.c ++++ b/src/optparse.c +@@ -10,7 +10,7 @@ + #define options_argv(i) \ + ((i) < options->argc ? options->argv[i] : NULL) + +-void optparse_init(struct optparse *options, int argc, char **argv) ++void optparse_init(struct optparse *options, int argc, const char **argv) + { + options->argv = argv; + options->argc = argc; +@@ -42,7 +42,7 @@ is_longopt(const char *arg) + static void + permute(struct optparse *options, int index) + { +- char *nonoption = options->argv[index]; ++ const char *nonoption = options->argv[index]; + for (int i = index; i < options->optind - 1; i++) + options->argv[i] = options->argv[i + 1]; + options->argv[options->optind - 1] = nonoption; +@@ -67,7 +67,7 @@ int optparse(struct optparse *options, const char *optstring) + options->errmsg[0] = '\0'; + options->optopt = 0; + options->optarg = NULL; +- char *option = options_argv(options->optind); ++ const char *option = options_argv(options->optind); + if (option == NULL) { + return -1; + } else if (is_dashdash(option)) { +@@ -88,7 +88,7 @@ int optparse(struct optparse *options, const char *optstring) + option += options->subopt + 1; + options->optopt = option[0]; + int type = argtype(optstring, option[0]); +- char *next = options_argv(options->optind + 1); ++ const char *next = options_argv(options->optind + 1); + switch (type) { + case -1: + opterror(options, "invalid option -- '%c'", option[0]); +@@ -128,10 +128,10 @@ int optparse(struct optparse *options, const char *optstring) + return 0; + } + +-char *optparse_arg(struct optparse *options) ++const char *optparse_arg(struct optparse *options) + { + options->subopt = 0; +- char *option = options->argv[options->optind]; ++ const char *option = options->argv[options->optind]; + if (option != NULL) + options->optind++; + return option; +@@ -222,7 +222,7 @@ optparse_long(struct optparse *options, + int *longindex) + { + // printf("%i < %i\n",options->optind,options->argc); +- char *option = options_argv(options->optind); ++ const char *option = options_argv(options->optind); + if (option == NULL) { + return -1; + } else if (is_dashdash(option)) { +diff --git a/src/optparse.h b/src/optparse.h +index c4b0ec19c..7a0bb3885 100644 +--- a/src/optparse.h ++++ b/src/optparse.h +@@ -44,7 +44,7 @@ + */ + + struct optparse { +- char **argv; ++ const char **argv; + int argc; + int permute; + int optind; +@@ -65,7 +65,7 @@ struct optparse_long { + /** + * Initializes the parser state. + */ +-void optparse_init(struct optparse *options, int argc, char **argv); ++void optparse_init(struct optparse *options, int argc, const char **argv); + + /** + * Read the next option in the argv array. +@@ -98,6 +98,6 @@ optparse_long(struct optparse *options, + * subcommand returned by optparse_arg(). This function allows you to + * ignore the value of optind. + */ +-char *optparse_arg(struct optparse *options); ++const char *optparse_arg(struct optparse *options); + + #endif +diff --git a/src/rrd.h b/src/rrd.h +index 184887ccc..b40f9a449 100644 +--- a/src/rrd.h ++++ b/src/rrd.h +@@ -155,10 +155,10 @@ extern "C" { + /* main function blocks */ + int rrd_create( + int, +- char **); ++ const char **); + rrd_info_t *rrd_info( + int, +- char **); ++ const char **); + rrd_info_t *rrd_info_push( + rrd_info_t *, + char *, +@@ -170,19 +170,19 @@ extern "C" { + rrd_info_t *); + char *rrd_list( + int, +- char **); ++ const char **); + char *rrd_list_r( + int, +- char *dirname); ++ const char *dirname); + int rrd_update( + int, +- char **); ++ const char **); + rrd_info_t *rrd_update_v( + int, +- char **); ++ const char **); + int rrd_graph( + int, +- char **, ++ const char **, + char ***, + int *, + int *, +@@ -191,11 +191,11 @@ extern "C" { + double *); + rrd_info_t *rrd_graph_v( + int, +- char **); ++ const char **); + + int rrd_fetch( + int, +- char **, ++ const char **, + time_t *, + time_t *, + unsigned long *, +@@ -204,32 +204,32 @@ extern "C" { + rrd_value_t **); + int rrd_restore( + int, +- char **); ++ const char **); + int rrd_dump( + int, +- char **); ++ const char **); + int rrd_tune( + int, +- char **); ++ const char **); + time_t rrd_last( + int, +- char **); ++ const char **); + int rrd_lastupdate( + int argc, +- char **argv); ++ const char **argv); + time_t rrd_first( + int, +- char **); ++ const char **); + int rrd_resize( + int, +- char **); ++ const char **); + char *rrd_strversion( + void); + double rrd_version( + void); + int rrd_xport( + int, +- char **, ++ const char **, + int *, + time_t *, + time_t *, +@@ -239,7 +239,7 @@ extern "C" { + rrd_value_t **); + int rrd_flushcached( + int argc, +- char **argv); ++ const char **argv); + + void rrd_freemem( + void *mem); +@@ -323,7 +323,7 @@ extern "C" { + const char **argv); + int rrd_dump_opt_r( + const char *filename, +- char *outname, ++ const char *outname, + int opt_noheader); + int rrd_dump_r( + const char *filename, +diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c +index b82c310db..14a4f511a 100644 +--- a/src/rrd_cgi.c ++++ b/src/rrd_cgi.c +@@ -102,7 +102,7 @@ static char *rrdstrip( + static char *scanargs( + char *line, + int *argc, +- char ***args); ++ const char ***args); + + /* format at-time specified times using strftime */ + static char *printstrftime( +@@ -317,7 +317,7 @@ static const char *putvar( + } + + /* expand those RRD:* directives that can be used recursively */ +-static char *rrd_expand_vars( ++static const char *rrd_expand_vars( + char *buffer) + { + int i; +@@ -434,7 +434,7 @@ static int readfile( + + int main( + int argc, +- char *argv[]) ++ const char *argv[]) + { + char *buffer; + long i; +@@ -926,7 +926,7 @@ static char *drawgraph( + } + calfree(); + if (rrd_graph +- (argc + 1, (char **) args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, ++ (argc + 1, args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, + &ymax) != -1) { + return stralloc(calcpr[0]); + } else { +@@ -973,7 +973,7 @@ static char *printtimelast( + /* not raising argc in step with args - 1 since the last argument + will be used below for strftime */ + +- last = rrd_last(argc, (char **) args - 1); ++ last = rrd_last(argc, args - 1); + if (rrd_test_error()) { + char err[4096]; + +@@ -1027,7 +1027,7 @@ static char *printtimenow( + static char *scanargs( + char *line, + int *argument_count, +- char ***arguments) ++ const char ***arguments) + { + char *getP; /* read cursor */ + char *putP; /* write cursor */ +@@ -1039,8 +1039,8 @@ static char *scanargs( + + /* local array of arguments while parsing */ + int argc = 1; +- char **argv; +- char **argv_tmp; /* temp variable for realloc() */ ++ const char **argv; ++ const char **argv_tmp; /* temp variable for realloc() */ + + #ifdef DEBUG_PARSER + printf("<-- scanargs(%s) -->\n", line); +@@ -1051,7 +1051,7 @@ static char *scanargs( + + /* create initial argument array of char pointers */ + argsz = 32; +- argv = (char **) malloc(argsz * sizeof(char *)); ++ argv = malloc(argsz * sizeof(char *)); + if (!argv) { + return NULL; + } +@@ -1146,7 +1146,7 @@ static char *scanargs( + if (argc == argsz - 2) { + /* resize argument array */ + argsz *= 2; +- argv_tmp = (char **) rrd_realloc(argv, argsz * sizeof(char *)); ++ argv_tmp = rrd_realloc(argv, argsz * sizeof(char *)); + if (*argv_tmp == NULL) { + return NULL; + } +@@ -1213,7 +1213,7 @@ static int parse( + /* the name of the vairable ... */ + char *val; + long valln; +- char **args; ++ const char **args; + char *end; + long end_offset; + int argc; +@@ -1264,7 +1264,7 @@ static int parse( + /* make sure we do not shrink the mallocd block */ + size_t newbufsize = i + strlen(end) + valln + 1; + +- *buf = (char *) rrd_realloc(*buf, newbufsize); ++ *buf = rrd_realloc(*buf, newbufsize); + + if (*buf == NULL) { + perror("Realoc buf:"); +diff --git a/src/rrd_create.c b/src/rrd_create.c +index f9bad0866..919b4195a 100644 +--- a/src/rrd_create.c ++++ b/src/rrd_create.c +@@ -76,7 +76,7 @@ static void parseGENERIC_DS( + + int rrd_create( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"start", 'b', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c +index 751798aa1..21c38a11d 100644 +--- a/src/rrd_daemon.c ++++ b/src/rrd_daemon.c +@@ -1877,7 +1877,7 @@ static int handle_request_tune( + HANDLER_PROTO) + { /* {{{ */ + int status; +- char** argv = NULL; ++ const char** argv = NULL; + int argc, argc_tmp; + char* i; + int rc; +@@ -1916,7 +1916,7 @@ static int handle_request_tune( + goto done; + } + +- if ((argv = (char **) malloc(argc * sizeof(char*))) == NULL) { ++ if ((argv = malloc(argc * sizeof(char*))) == NULL) { + rc = send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOMEM)); + goto done; + } +@@ -1927,7 +1927,7 @@ static int handle_request_tune( + argc_tmp += 1; + } + +- status = rrd_tune_r(file, argc, (const char **)argv); ++ status = rrd_tune_r(file, argc, argv); + if (status != 0) { + rc = send_response(sock, RESP_ERR, "Got error %s\n", rrd_get_error()); + goto done; +@@ -1935,7 +1935,7 @@ static int handle_request_tune( + rc = send_response(sock, RESP_OK, "Success\n"); + done: + free(file); +- free(argv); ++ free((void *)argv); + return rc; + } + +@@ -4505,7 +4505,7 @@ static int cleanup( + + static int read_options( + int argc, +- char **argv) ++ const char **argv) + { /* {{{ */ + struct optparse_long longopts[] = { + {NULL, 'a', OPTPARSE_REQUIRED}, +@@ -5050,7 +5050,7 @@ static int read_options( + + int main( + int argc, +- char **argv) ++ const char **argv) + { + int status; + +diff --git a/src/rrd_dump.c b/src/rrd_dump.c +index a4490d594..c58e0ee4a 100644 +--- a/src/rrd_dump.c ++++ b/src/rrd_dump.c +@@ -497,7 +497,7 @@ static size_t rrd_dump_opt_cb_fileout( + + int rrd_dump_opt_r( + const char *filename, +- char *outname, ++ const char *outname, + int opt_noheader) + { + FILE *out_file; +@@ -543,7 +543,7 @@ int rrd_dump_r( + + int rrd_dump( + int argc, +- char **argv) ++ const char **argv) + { + int opt; + struct optparse_long longopts[] = { +diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c +index c739bfc45..54780f19b 100644 +--- a/src/rrd_fetch.c ++++ b/src/rrd_fetch.c +@@ -61,7 +61,7 @@ + + int rrd_fetch( + int argc, +- char **argv, ++ const char **argv, + time_t *start, + time_t *end, /* which time frame do you want ? + * will be changed to represent reality */ +diff --git a/src/rrd_first.c b/src/rrd_first.c +index a696c5c38..f3dde5404 100644 +--- a/src/rrd_first.c ++++ b/src/rrd_first.c +@@ -13,7 +13,7 @@ + + time_t rrd_first( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"rraindex", 129, OPTPARSE_REQUIRED}, +diff --git a/src/rrd_flushcached.c b/src/rrd_flushcached.c +index 090bca749..3bf6cd29d 100644 +--- a/src/rrd_flushcached.c ++++ b/src/rrd_flushcached.c +@@ -22,7 +22,7 @@ + #include "rrd_tool.h" + #include "rrd_client.h" + +-int rrd_flushcached (int argc, char **argv) ++int rrd_flushcached (int argc, const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index b32d45085..46511e9a3 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4607,7 +4607,7 @@ int scan_for_col( + /* Now just a wrapper around rrd_graph_v */ + int rrd_graph( + int argc, +- char **argv, ++ const char **argv, + char ***prdata, + int *xsize, + int *ysize, +@@ -4690,7 +4690,7 @@ int rrd_graph( + + rrd_info_t *rrd_graph_v( + int argc, +- char **argv) ++ const char **argv) + { + image_desc_t im; + rrd_info_t *grinfo; +@@ -4953,7 +4953,7 @@ void rrd_graph_init( + + void rrd_graph_options( + int argc, +- char *argv[], ++ const char **argv, + struct optparse *poptions, + image_desc_t *im) + { +diff --git a/src/rrd_graph.h b/src/rrd_graph.h +index 4df32ec66..083cf3800 100644 +--- a/src/rrd_graph.h ++++ b/src/rrd_graph.h +@@ -473,12 +473,12 @@ void time_clean( + + void rrd_graph_options( + int, +- char **, ++ const char **, + struct optparse *, + image_desc_t *); + void rrd_graph_script( + int, +- char **, ++ const char **, + image_desc_t *const, + int); + int rrd_graph_color( +diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c +index 99cdefa65..ba90e1a6c 100644 +--- a/src/rrd_graph_helper.c ++++ b/src/rrd_graph_helper.c +@@ -1952,7 +1952,7 @@ static int parse_xport( + + void rrd_graph_script( + int argc, +- char *argv[], ++ const char **argv, + image_desc_t *const im, + int optno) + { +diff --git a/src/rrd_info.c b/src/rrd_info.c +index c0c6f68c7..eb0d4e4de 100644 +--- a/src/rrd_info.c ++++ b/src/rrd_info.c +@@ -82,7 +82,7 @@ rrd_info_t + + rrd_info_t *rrd_info( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_last.c b/src/rrd_last.c +index 026a1e828..1aae72512 100644 +--- a/src/rrd_last.c ++++ b/src/rrd_last.c +@@ -11,7 +11,7 @@ + + time_t rrd_last( + int argc, +- char **argv) ++ const char **argv) + { + char *opt_daemon = NULL; + time_t lastupdate; +diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c +index ab30dcf67..4f7f4770e 100644 +--- a/src/rrd_lastupdate.c ++++ b/src/rrd_lastupdate.c +@@ -14,7 +14,7 @@ + #include "rrd_client.h" + #include + +-int rrd_lastupdate (int argc, char **argv) ++int rrd_lastupdate (int argc, const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_list.c b/src/rrd_list.c +index e743b9b7d..6e96220ea 100644 +--- a/src/rrd_list.c ++++ b/src/rrd_list.c +@@ -37,7 +37,7 @@ static char *move_past_prefix(const char *prefix, const char *string) + return (char *)&(string[index]); + } + +-static char *rrd_list_rec(int recursive, char *root, char *dirname) ++static char *rrd_list_rec(int recursive, const char *root, const char *dirname) + { + #define SANE_ASPRINTF2(_dest_str, _format, ...) \ + if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ +@@ -138,7 +138,7 @@ static char *rrd_list_rec(int recursive, char *root, char *dirname) + return out; + } + +-char *rrd_list_r(int recursive, char *dirname) ++char *rrd_list_r(int recursive, const char *dirname) + { + #define SANE_ASPRINTF(_dest_str, _format, ...) \ + if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ +@@ -240,7 +240,7 @@ char *rrd_list_r(int recursive, char *dirname) + return rrd_list_rec(recursive, dirname, dirname); + } + +-char *rrd_list(int argc, char **argv) ++char *rrd_list(int argc, const char **argv) + { + char *opt_daemon = NULL; + int status; +diff --git a/src/rrd_modify.c b/src/rrd_modify.c +index a2b07f640..70ac9e77f 100644 +--- a/src/rrd_modify.c ++++ b/src/rrd_modify.c +@@ -1297,7 +1297,7 @@ static int add_rras(const rrd_t *in, rrd_t *out, const int *ds_map, + } + + int handle_modify(const rrd_t *in, const char *outfilename, +- int argc, char **argv, int optidx, ++ int argc, const char **argv, int optidx, + int newstep) { + // parse add/remove options + int rc = -1; +diff --git a/src/rrd_modify.h b/src/rrd_modify.h +index 52d8789be..64a39926e 100644 +--- a/src/rrd_modify.h ++++ b/src/rrd_modify.h +@@ -28,7 +28,7 @@ typedef struct { + } rra_mod_op_t; + + int handle_modify(const rrd_t *in, const char *outfilename, +- int argc, char **argv, int optind, ++ int argc, const char **argv, int optind, + int newstep); + + typedef union { +diff --git a/src/rrd_resize.c b/src/rrd_resize.c +index fb75d81ff..742e6d141 100644 +--- a/src/rrd_resize.c ++++ b/src/rrd_resize.c +@@ -12,9 +12,9 @@ + + int rrd_resize( + int argc, +- char **argv) ++ const char **argv) + { +- char *infilename, outfilename[11] = "resize.rrd"; ++ const char *infilename, outfilename[11] = "resize.rrd"; + rrd_t rrdold, rrdnew; + rrd_value_t buffer; + int version; +diff --git a/src/rrd_restore.c b/src/rrd_restore.c +index 85d481e0c..ebef5efe8 100644 +--- a/src/rrd_restore.c ++++ b/src/rrd_restore.c +@@ -1378,7 +1378,7 @@ int write_file( + + int rrd_restore( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"range-check", 'r', OPTPARSE_NONE}, +diff --git a/src/rrd_tool.c b/src/rrd_tool.c +index cc6119d9a..56321ee1a 100644 +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -22,16 +22,16 @@ + + + static void PrintUsage( +- char *cmd); ++ const char *cmd); + static int CountArgs( + char *aLine); + static int CreateArgs( ++ const char *, + char *, +- char *, +- char **); ++ const char **); + static int HandleInputLine( + int, +- char **, ++ const char **, + FILE *); + int RemoteMode = 0; + int ChangeRoot = 0; +@@ -42,7 +42,7 @@ int ChangeRoot = 0; + + + static void PrintUsage( +- char *cmd) ++ const char *cmd) + { + + #ifdef BUILD_DATE +@@ -443,11 +443,11 @@ static char *fgetslong( + + int main( + int argc, +- char *argv[]) ++ const char *argv[]) + { +- char **myargv; ++ const char **myargv; + char *aLine; +- char *firstdir = ""; ++ const char *firstdir = ""; + + #ifdef MUST_DISABLE_SIGFPE + signal(SIGFPE, SIG_IGN); +@@ -526,7 +526,7 @@ int main( + printf("ERROR: not enough arguments\n"); + continue; + } +- if ((myargv = (char **) malloc((argc + 1) * ++ if ((myargv = malloc((argc + 1) * + sizeof(char *))) == NULL) { + perror("malloc"); + exit(1); +@@ -572,7 +572,7 @@ int main( + resolving them portably is not really simple. */ + static int HandleInputLine( + int argc, +- char **argv, ++ const char **argv, + FILE * out) + { + #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR) +@@ -887,12 +887,12 @@ static int CountArgs( + * CreateArgs - take a string (aLine) and tokenize + */ + static int CreateArgs( +- char *pName, ++ const char *pName, + char *aLine, +- char **argv) ++ const char **argv) + { + char *getP, *putP; +- char **pargv = argv; ++ const char **pargv = argv; + char Quote = 0; + int inArg = 0; + int len; +diff --git a/src/rrd_tune.c b/src/rrd_tune.c +index 198817f37..dd3f3f7cb 100644 +--- a/src/rrd_tune.c ++++ b/src/rrd_tune.c +@@ -71,7 +71,7 @@ static int set_hwsmootharg( + + int rrd_tune( + int argc, +- char **argv) ++ const char **argv) + { + char *opt_daemon = NULL; + const char *in_filename = NULL; +diff --git a/src/rrd_update.c b/src/rrd_update.c +index fbbe2820a..bb9a0602c 100644 +--- a/src/rrd_update.c ++++ b/src/rrd_update.c +@@ -299,7 +299,7 @@ static void initialize_time( + + rrd_info_t *rrd_update_v( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"template", 't', OPTPARSE_REQUIRED}, +@@ -674,7 +674,7 @@ static int rrd_template_update(const char *filename, /* {{{ */ + + int rrd_update( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"template", 't', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_xport.c b/src/rrd_xport.c +index d15d33dd9..93c02f926 100644 +--- a/src/rrd_xport.c ++++ b/src/rrd_xport.c +@@ -73,7 +73,7 @@ static int rrd_xport_format_addprints( + + int rrd_xport( + int argc, +- char **argv, ++ const char **argv, + int UNUSED(*xsize), + time_t *start, + time_t *end, /* which time frame do you want ? +diff --git a/src/rrdupdate.c b/src/rrdupdate.c +index cbbf48cc1..e368516c8 100644 +--- a/src/rrdupdate.c ++++ b/src/rrdupdate.c +@@ -20,19 +20,20 @@ int main( + int argc, + char **argv) + { ++ const char **cargv = (const char **)argv; + char *name=basename(argv[0]); + rrd_info_t *info; + + if (!strcmp(name, "rrdcreate")) { +- rrd_create(argc, argv); ++ rrd_create(argc, cargv); + } + else if (!strcmp(name, "rrdinfo")) { +- info=rrd_info(argc, argv); ++ info=rrd_info(argc, cargv); + rrd_info_print(info); + rrd_info_free(info); + } + else { +- rrd_update(argc, argv); ++ rrd_update(argc, cargv); + } + + if (rrd_test_error()) { From 5fcc4e19602ad37d018ccf3543fe82a291837f43 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 May 2024 23:54:04 +0200 Subject: [PATCH 1136/3013] package/collectd: fix build with gcc 14.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...c-nut-c-detect-int-types-required-by.patch | 153 ++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 package/collectd/0003-configure.ac-src-nut-c-detect-int-types-required-by.patch diff --git a/package/collectd/0003-configure.ac-src-nut-c-detect-int-types-required-by.patch b/package/collectd/0003-configure.ac-src-nut-c-detect-int-types-required-by.patch new file mode 100644 index 00000000000..f08dc1b7310 --- /dev/null +++ b/package/collectd/0003-configure.ac-src-nut-c-detect-int-types-required-by.patch @@ -0,0 +1,153 @@ +From d409ffa2a64cac3fc2abe2bb86ec3a80cb34d0a6 Mon Sep 17 00:00:00 2001 +From: Jim Klimov +Date: Wed, 31 Aug 2022 11:40:01 +0200 +Subject: [PATCH] configure.ac, src/nut.c: detect int types required by NUT API + we build against + +Either use the stricter int types required by NUT headers since v2.8.0 release, +or the relaxed (arch-dependent) types required by older NUT releases - depending +on which NUT API version the collectd is building against at the moment. + +Inspired by discussion at https://github.com/networkupstools/nut/issues/1638 + +Upstream: https://github.com/collectd/collectd/commit/d409ffa2a64cac3fc2abe2bb86ec3a80cb34d0a6 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/nut.c | 4 +-- + 2 files changed, 102 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1737aff316..f88ed26505 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5881,6 +5881,106 @@ if test "x$with_libupsclient" = "xyes"; then + CPPFLAGS="$SAVE_CPPFLAGS" + fi + ++if test "x$with_libupsclient" = "xyes"; then ++ dnl The m4 script logic below is modelled after NUT_FUNC_GETNAMEINFO_ARGTYPES ++ dnl further originating in curl autoconf scripts or beyond. See there for an ++ dnl example of general-case logic to handle matching of numerous possible ++ dnl data types for each argument in supported API variants. ++ dnl Note: techically compiler complains here not about int types themselves, ++ dnl but about pointers to such data. We know "out of band" that e.g. NUT ++ dnl change to "size_t" happened at once for all arguments in the API, so ++ dnl simplify the handling here and now with that assumption. ++ AC_LANG_PUSH([C]) ++ SAVE_CPPFLAGS="$CPPFLAGS" ++ SAVE_LDFLAGS="$LDFLAGS" ++ SAVE_CFLAGS="$CFLAGS" ++ CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags" ++ LDFLAGS="$LDFLAGS $with_libupsclient_libs" ++ CFLAGS="$CFLAGS $with_libupsclient_cflags" ++ if test "x$GCC" = "xyes"; then ++ CFLAGS="$CFLAGS -Wall -Werror" ++ fi ++ ++ dnl upscli_splitname() *is* there forever (2007 or older) ++ dnl but int types e.g. "port" changed in NUT 2.8.0 ++ dnl Also this is the UPSCONN_t::port field type: ++ AC_CACHE_CHECK([int type of port argument for NUT upscli_splitname], ++ [collectd_cv_func_upscli_splitname_args], [ ++ collectd_cv_func_upscli_splitname_args="unknown" ++ for port_arg in 'uint16_t' 'int' ; do ++ AC_COMPILE_IFELSE([ ++ AC_LANG_PROGRAM([ ++#include ++/* int upscli_splitname(const char *buf, char **upsname, char **hostname, *port); */ ++ ],[ ++const char *origname = "ups@localhost:3493"; ++$port_arg port=0; ++char *hostname; ++char *upsname; ++int res = upscli_splitname(origname, &upsname, &hostname, &port); ++return(res); ++ ]) ++ ],[ ++ collectd_cv_func_upscli_splitname_args="$port_arg" ++ break ++ ]) ++ done ++ ]) ++ ++ AS_IF([test x"$collectd_cv_func_upscli_splitname_args" = xunknown], ++ [AC_MSG_WARN([Can not find proper port type for upscli_splitname()]) ++ with_libupsclient="no (required data types for NUT API were not detected)"], ++ [AC_DEFINE_UNQUOTED(NUT_PORT_TYPE, $collectd_cv_func_upscli_splitname_args, ++ [Define to the integer type for TCP/IP ports used by NUT API we build against]) ++ ]) ++ ++ ++ AC_CACHE_CHECK([int type of length/numbering arguments for NUT upscli_list_next], ++ [collectd_cv_func_upscli_list_next_args], [ ++ collectd_cv_func_upscli_list_next_args="unknown" ++ for size_arg in 'size_t' 'unsigned int' 'int' ; do ++ AC_COMPILE_IFELSE([ ++ AC_LANG_PROGRAM([ ++#include ++/* int upscli_list_next(UPSCONN_t *ups, numq, const char **query, *numa, char ***answer); */ ++ ++#if HAVE_UPSCONN_T ++typedef UPSCONN_t collectd_upsconn_t; ++#elif HAVE_UPSCONN ++typedef UPSCONN collectd_upsconn_t; ++#else ++#error "Unable to determine the UPS connection type." ++#endif ++ ],[ ++$size_arg query_num=0; ++$size_arg answer_num=0; ++const char * query; ++char** answer; ++collectd_upsconn_t ups; ++int res = upscli_list_next(&ups, query_num, &query, &answer_num, &answer); ++return(res); ++ ]) ++ ],[ ++ collectd_cv_func_upscli_list_next_args="$size_arg" ++ break ++ ]) ++ done ++ ]) ++ ++ AS_IF([test x"$collectd_cv_func_upscli_list_next_args" = xunknown], ++ [AC_MSG_WARN([Can not find proper type for array sizes and string lengths used by upscli_list_next()]) ++ with_libupsclient="no (required data types for NUT API were not detected)"], ++ [AC_DEFINE_UNQUOTED(NUT_SIZE_TYPE, $collectd_cv_func_upscli_list_next_args, ++ [Define to the integer type for array sizes and string lengths used by NUT API we build against]) ++ ]) ++ ++ ++ CPPFLAGS="$SAVE_CPPFLAGS" ++ LDFLAGS="$SAVE_LDFLAGS" ++ CFLAGS="$SAVE_CFLAGS" ++ AC_LANG_POP([C]) ++fi ++ + if test "x$with_libupsclient" = "xyes"; then + BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_libupsclient_cflags" + BUILD_WITH_LIBUPSCLIENT_LIBS="$with_libupsclient_libs" +diff --git a/src/nut.c b/src/nut.c +index a9a6c98380..1a29438b07 100644 +--- a/src/nut.c ++++ b/src/nut.c +@@ -46,7 +46,7 @@ struct nut_ups_s { + collectd_upsconn_t *conn; + char *upsname; + char *hostname; +- int port; ++ NUT_PORT_TYPE port; + nut_ups_t *next; + }; + +@@ -250,7 +250,7 @@ static int nut_read(user_data_t *user_data) { + const char *query[3] = {"VAR", ups->upsname, NULL}; + unsigned int query_num = 2; + char **answer; +- unsigned int answer_num; ++ NUT_SIZE_TYPE answer_num; + int status; + + /* (Re-)Connect if we have no connection */ From d3f47c2486069fa6ee843f39a790d9bbde5de6f6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 May 2024 23:54:05 +0200 Subject: [PATCH 1137/3013] package/sofia-sip: fix build with gcc 14.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...mpatible-pointer-type-in-sip_basic-c.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/sofia-sip/0001-Fix-incompatible-pointer-type-in-sip_basic-c.patch diff --git a/package/sofia-sip/0001-Fix-incompatible-pointer-type-in-sip_basic-c.patch b/package/sofia-sip/0001-Fix-incompatible-pointer-type-in-sip_basic-c.patch new file mode 100644 index 00000000000..7f890fd27b3 --- /dev/null +++ b/package/sofia-sip/0001-Fix-incompatible-pointer-type-in-sip_basic-c.patch @@ -0,0 +1,27 @@ +From 46b02f0655af0a9594e805f09a8ee99278f84777 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= +Date: Mon, 19 Feb 2024 09:06:20 +0200 +Subject: [PATCH] Fix incompatible pointer type in sip_basic.c + +Closes #248 + +Upstream: https://github.com/freeswitch/sofia-sip/pull/249 + +Signed-off-by: Bernd Kuhls +--- + libsofia-sip-ua/sip/sip_basic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsofia-sip-ua/sip/sip_basic.c b/libsofia-sip-ua/sip/sip_basic.c +index 3444fb25..82e824e3 100644 +--- a/libsofia-sip-ua/sip/sip_basic.c ++++ b/libsofia-sip-ua/sip/sip_basic.c +@@ -2901,7 +2901,7 @@ issize_t sip_identity_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen) + ext = strchr(ppt, ';'); + + if (ext) { +- msg_param_t *params = su_alloc(home, sizeof(msg_param_t)); ++ msg_param_t const *params = su_alloc(home, sizeof(msg_param_t)); + if (msg_params_d(home, &ext, ¶ms) >= 0) { + id->id_info_params = params; + } From 4f8167b5cac41cc78e124236f41c0289fca6ee6c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 May 2024 23:54:06 +0200 Subject: [PATCH 1138/3013] package/unixodbc: fix build with gcc 14.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...r-Fix-incompatible-pointer-to-intege.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch diff --git a/package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch b/package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch new file mode 100644 index 00000000000..8efe6dae4e5 --- /dev/null +++ b/package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch @@ -0,0 +1,49 @@ +From 45f501e1be2db6b017cc242c79bfb9de32b332a1 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 29 Jan 2024 08:27:29 +0100 +Subject: [PATCH] PostgreSQL driver: Fix incompatible pointer-to-integer types + +These result in out-of-bounds stack writes on 64-bit architectures +(caller has 4 bytes, callee writes 8 bytes), and seem to have gone +unnoticed on little-endian architectures (although big-endian +architectures must be broken). + +This change is required to avoid a build failure with GCC 14. + +Upstream: https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1 + +Signed-off-by: Bernd Kuhls +--- + Drivers/Postgre7.1/info.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c +index 63ac91f..2216ecd 100644 +--- a/Drivers/Postgre7.1/info.c ++++ b/Drivers/Postgre7.1/info.c +@@ -1779,14 +1779,14 @@ char *table_name; + char index_name[MAX_INFO_STRING]; + short fields_vector[8]; + char isunique[10], isclustered[10]; +-SDWORD index_name_len, fields_vector_len; ++SQLLEN index_name_len, fields_vector_len; + TupleNode *row; + int i; + HSTMT hcol_stmt; + StatementClass *col_stmt, *indx_stmt; + char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING]; + char **column_names = 0; +-Int4 column_name_len; ++SQLLEN column_name_len; + int total_columns = 0; + char error = TRUE; + ConnInfo *ci; +@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt; + StatementClass *tbl_stmt; + char tables_query[STD_STATEMENT_LEN]; + char attname[MAX_INFO_STRING]; +-SDWORD attname_len; ++SQLLEN attname_len; + char pktab[MAX_TABLE_LEN + 1]; + Int2 result_cols; + From 671b8f4c57dee15a65110c2f64873fc4fe104f05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 15 May 2024 12:40:50 +0200 Subject: [PATCH 1139/3013] package/uclibc: fix compile issue with gcc 14.x Fixes: http://autobuild.buildroot.net/results/d9b924bdea3fd61060fa0e961c12534c1fff80de Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle --- .../0002-fix-kernel_stat64-definition.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/uclibc/0002-fix-kernel_stat64-definition.patch diff --git a/package/uclibc/0002-fix-kernel_stat64-definition.patch b/package/uclibc/0002-fix-kernel_stat64-definition.patch new file mode 100644 index 00000000000..5a87586af89 --- /dev/null +++ b/package/uclibc/0002-fix-kernel_stat64-definition.patch @@ -0,0 +1,35 @@ +From 186878405324e96f61d896a149f623e0c792c972 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 14 May 2024 23:18:56 -0700 +Subject: [PATCH] fix kernel_stat64 definition + +The commit 74ca8d6f5d2e ("remove UCLIBC_HAS_LFS") removed conditional +compilation dependent on __UCLIBC_HAS_LFS__, assuming it to be always +defined, but removed the wrong branch in the definition of +kernel_stat64. +Fix kernel_stat64 definition to be stat64. + +Signed-off-by: Max Filippov +Tested-by: Chris Packham +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=186878405324e96f61d896a149f623e0c792c972 +--- + libc/sysdeps/linux/common-generic/bits/kernel_stat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h +index 7a97bb4d7..e874a4a9f 100644 +--- a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h ++++ b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h +@@ -18,7 +18,7 @@ + * However that requires more #ifndef in relevant wrappers, + * further uglifying them + */ +-#define kernel_stat64 stat ++#define kernel_stat64 stat64 + + #endif /* _BITS_STAT_STRUCT_H */ + +-- +2.30.2 + From 311bb82c9e3a27f36639a1c93d8d5bc8e7eb034f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 15 May 2024 18:25:01 +0200 Subject: [PATCH 1140/3013] package/syslog-ng: fix libcurl build without C++ Fix the following libcurl build failure without C++ raised since bump to version 4.7.1 in commit 105f0398c76f3288b2668e0b3ec722b2ebe55a0b and https://github.com/syslog-ng/syslog-ng/commit/86feed7bff068a48be477a5b702ca24abc441d70: configure: error: C++ support is mandatory when the cloud-auth module is enabled. Fixes: 105f0398c76f3288b2668e0b3ec722b2ebe55a0b - http://autobuild.buildroot.org/results/cf36fb119224ba50a768dbe363d4c381f76eb476 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/syslog-ng/syslog-ng.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 4f9a455e819..57ee46ce052 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -61,8 +61,13 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL),y) SYSLOG_NG_DEPENDENCIES += libcurl -SYSLOG_NG_CONF_OPTS += --enable-http --enable-cloud-auth +SYSLOG_NG_CONF_OPTS += --enable-http SYSLOG_NG_CONF_OPTS += --with-libcurl="$(STAGING_DIR)/usr" +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +SYSLOG_NG_CONF_OPTS += --enable-cloud-auth +else +SYSLOG_NG_CONF_OPTS += --disable-cloud-auth +endif else SYSLOG_NG_CONF_OPTS += --disable-http --disable-cloud-auth endif From e6b30e239289ed9d31fd8805551f72c9897affa2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 15 May 2024 18:26:26 +0200 Subject: [PATCH 1141/3013] package/p11-kit: fix build with gcc 14 Fix the following build failure with gcc 14: p11-kit/import-object.c: In function 'add_attrs_pubkey_rsa': p11-kit/import-object.c:223:62: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); | ^~~~~~~~~~~~~~~~~~~~~~~~ | | | long unsigned int * Fixes: - http://autobuild.buildroot.org/results/41508a057568ad715e9e00a67adfc3867445d6c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...teger-truncation-on-32-bit-platforms.patch | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 package/p11-kit/0001-import-object-Avoid-integer-truncation-on-32-bit-platforms.patch diff --git a/package/p11-kit/0001-import-object-Avoid-integer-truncation-on-32-bit-platforms.patch b/package/p11-kit/0001-import-object-Avoid-integer-truncation-on-32-bit-platforms.patch new file mode 100644 index 00000000000..03f54b4408c --- /dev/null +++ b/package/p11-kit/0001-import-object-Avoid-integer-truncation-on-32-bit-platforms.patch @@ -0,0 +1,109 @@ +From d49c92c8420db6ee4c88515bdb014f68f4d471d9 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Sat, 2 Dec 2023 09:24:01 +0900 +Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The build fails when compiling for 32-bit platforms with +-Werror=incompatible-pointer-types: + + CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build + setarch i686 -- meson compile -C _build -v + ... + + ../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’: + ../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types] + 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); + | ^~~~~~~~~~~~~~~~~~~~~~~~ + | | + | long unsigned int * + +Reported by Sam James in: +https://github.com/p11-glue/p11-kit/issues/608 + +Signed-off-by: Daiki Ueno + +Upstream: https://github.com/p11-glue/p11-kit/commit/d49c92c8420db6ee4c88515bdb014f68f4d471d9 +Signed-off-by: Fabrice Fontaine +--- + p11-kit/import-object.c | 30 +++++++++++++++++++++++++++--- + 1 file changed, 27 insertions(+), 3 deletions(-) + +diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c +index feee0765..fb47b964 100644 +--- a/p11-kit/import-object.c ++++ b/p11-kit/import-object.c +@@ -55,6 +55,7 @@ + #endif + + #include ++#include + #include + #include + #include +@@ -201,6 +202,7 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, + CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) }; + CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, }; + CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, }; ++ size_t len = 0; + + pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len); + if (pubkey == NULL) { +@@ -220,17 +222,31 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, + goto cleanup; + } + +- attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); ++ attr_modulus.pValue = p11_asn1_read (asn, "modulus", &len); + if (attr_modulus.pValue == NULL) { + p11_message (_("failed to obtain modulus")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain modulus")); ++ goto cleanup; ++ } ++#endif ++ attr_modulus.ulValueLen = len; + +- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen); ++ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len); + if (attr_exponent.pValue == NULL) { + p11_message (_("failed to obtain exponent")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain exponent")); ++ goto cleanup; ++ } ++#endif ++ attr_exponent.ulValueLen = len; + + result = p11_attrs_build (attrs, &attr_key_type, &attr_encrypt, &attr_modulus, &attr_exponent, NULL); + if (result == NULL) { +@@ -260,12 +276,20 @@ add_attrs_pubkey_ec (CK_ATTRIBUTE *attrs, + CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) }; + CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, }; + CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, }; ++ size_t len = 0; + +- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen); ++ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len); + if (attr_ec_params.pValue == NULL) { + p11_message (_("failed to obtain EC parameters")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain EC parameters")); ++ goto cleanup; ++ } ++#endif ++ attr_ec_params.ulValueLen = len; + + /* subjectPublicKey is read as BIT STRING value which contains + * EC point data. We need to DER encode this data as OCTET STRING. From 7d249dab514e6fc003cb92962890d2ce36b87931 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Thu, 16 May 2024 12:06:50 +0200 Subject: [PATCH 1142/3013] package/nginx: fix compile error in configure script Building with GCC 14 fails at the configure step with: ./configure: error: libatomic_ops library was not found. The error is not caused by a missing library, but by an unrelated "incompatible pointer type" error in the test program: ... checking for atomic_ops library objs/autotest.c: In function 'main': objs/autotest.c:9:48: error: passing argument 1 of 'AO_compare_and_swap' from incompatible pointer type [-Wincompatible-pointer-types] This used to be a warning, but it is an error since GCC 14.[1] Fix this by patching the test program in order to use the correct pointer types. Fixes: http://autobuild.buildroot.net/results/a3d/a3d8c6fd631b31e272e4d8cc6c3318f2e4151882 [1] https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types Signed-off-by: Edgar Bonet Signed-off-by: Arnout Vandecappelle --- ...ix-compile-error-in-configure-script.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/nginx/0011-Fix-compile-error-in-configure-script.patch diff --git a/package/nginx/0011-Fix-compile-error-in-configure-script.patch b/package/nginx/0011-Fix-compile-error-in-configure-script.patch new file mode 100644 index 00000000000..672162759e2 --- /dev/null +++ b/package/nginx/0011-Fix-compile-error-in-configure-script.patch @@ -0,0 +1,33 @@ +From e1bcac837f6aeabc4ddece06ecbcf2bcca8dd651 Mon Sep 17 00:00:00 2001 +From: Edgar Bonet +Date: Thu, 16 May 2024 11:15:10 +0200 +Subject: [PATCH] Configure: fixed building libatomic test. + +Using "long *" instead of "AO_t *" leads either to -Wincompatible-pointer-types +or -Wpointer-sign warnings, depending on whether long and size_t are compatible +types (e.g., ILP32 versus LP64 data models). Notably, -Wpointer-sign warnings +are enabled by default in Clang only, and -Wincompatible-pointer-types is an +error starting from GCC 14. + +Signed-off-by: Edgar Bonet +Upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 +--- + auto/lib/libatomic/conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf +index d1e484a..0f12b9c 100644 +--- a/auto/lib/libatomic/conf ++++ b/auto/lib/libatomic/conf +@@ -20,7 +20,7 @@ else + #include " + ngx_feature_path= + ngx_feature_libs="-latomic_ops" +- ngx_feature_test="long n = 0; ++ ngx_feature_test="AO_t n = 0; + if (!AO_compare_and_swap(&n, 0, 1)) + return 1; + if (AO_fetch_and_add(&n, 1) != 1) +-- +2.34.1 + From 139e47861724cfdd82f4e77396e34c43f7f4825f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 7 Jun 2024 15:08:12 +0200 Subject: [PATCH 1143/3013] package/composer: fix improperly scoped variable Fixes: ef57da23b9950a8820c64c268672265f233cfb00 Signed-off-by: Yann E. MORIN --- package/composer/composer.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/composer/composer.mk b/package/composer/composer.mk index 9bfabc28af8..5ade9ccccf6 100644 --- a/package/composer/composer.mk +++ b/package/composer/composer.mk @@ -9,8 +9,8 @@ COMPOSER_SOURCE = composer-$(COMPOSER_VERSION).phar # Here, we pass a dummy URL parameter in order to control the name the file # will have once downloaded. # Otherwise, the names will clash ifever we update the version. -BASE_SITE = https://getcomposer.org/download/$(COMPOSER_VERSION)/composer.phar -COMPOSER_SITE = $(BASE_SITE)?n=f/$(COMPOSER_SOURCE) +COMPOSER_BASE_SITE = https://getcomposer.org/download/$(COMPOSER_VERSION)/composer.phar +COMPOSER_SITE = $(COMPOSER_BASE_SITE)?n=f/$(COMPOSER_SOURCE) COMPOSER_LICENSE = MIT COMPOSER_LICENSE_FILES = LICENSE COMPOSER_CPE_ID_VENDOR = getcomposer From 035651209f4a975cb5413b3911f5598db73e4822 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sat, 8 Jun 2024 22:25:09 -0500 Subject: [PATCH 1144/3013] package/python3: fix config directory pattern If a platform triplet is not detected during the configure stage, the config directory (LIBPL) defaults to `config-$VERSION`. In this scenario, the `PYTHON3_REMOVE_USELESS_FILES` hook would fail due to `find` incorrectly expecting a second dash and then the triplet. Now, we glob anything after the version which will match in both cases. Fixes: 54d48c8cad ("package/python3: miscellaneous fixups") Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- package/python3/python3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6859fc22744..86fa3b970d0 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -197,7 +197,7 @@ PYTHON3_CONF_OPTS += \ define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config rm -f $(TARGET_DIR)/usr/bin/python3-config - find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)-*/ \ + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)*/ \ -type f -not -name Makefile -exec rm -rf {} \; find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -type d \ -name __pycache__ -exec rm -rf {} \; From a1efb5427b51bc4b39e3e33be080f1898cfea15e Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sun, 9 Jun 2024 12:40:48 -0500 Subject: [PATCH 1145/3013] package/python3: fix config directory pattern Previously, when running `PYTHON3_REMOVE_USELESS_FILES`, the hook to clean up files from the python config directory assumed a pattern of "config-$(VERSION)m-$(PLATFORM_TRIPLET)". However, the "m" ABI suffix was dropped in python 3.8, so the hook would never actually find files to delete. No error was raised due to the use of a subshell to invoke find. Also, if a platform triplet is not detected during the configure stage, the config directory (LIBPL) defaults to `config-$VERSION`, and has no trailing `-$PLATFORM_TRIPLET`. Now, we glob anything after the version to ensure files get deleted. Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- package/python3/python3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 5d9d77af50e..950006698b9 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -204,7 +204,7 @@ define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python3-config rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3 rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/distutils/command/wininst*.exe - for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m-*/ \ + for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)*/ \ -type f -not -name Makefile` ; do \ rm -f $$i ; \ done From 436d86840af0de56ded6843d02d3b2f3805d53e2 Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Sun, 9 Jun 2024 16:09:41 +0200 Subject: [PATCH 1146/3013] DEVELOPERS: fix alphabetical order Signed-off-by: Kilian Zinnecker Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 03aa7bfa742..805b8215ec5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1950,8 +1950,8 @@ F: package/libcamera/ N: Kilian Zinnecker F: board/avnet/rzboard_v2l/ F: board/radxa/rock5b/ -F: configs/rock5b_defconfig F: configs/avnet_rzboard_v2l_defconfig +F: configs/rock5b_defconfig F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi From 893c39ba4c273c261329a2997e28e710beee184a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 10 Jun 2024 09:37:56 +0200 Subject: [PATCH 1147/3013] Update for 2024.02.3 Signed-off-by: Peter Korsgaard (cherry picked from commit a73dd8f787ae8f303fbfb4791a1f77d6c5280692) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 58 ++++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 8978a2ba7e3..c5c71bd6ef2 100644 --- a/CHANGES +++ b/CHANGES @@ -109,6 +109,64 @@ #16036: android-tools version is too old #16075: Cannot use linux kernel extensions from external tree.. +2024.02.3, released June 10th, 2024 + + Important / security related fixes. + + Misc: + - Fixed a number of compilation issues for hosts using GCC + 14.x, including for kconfig. + + Download: + - Drop redundant --passive-ftp from default wget options and + migrate a number of packages using FTP upstreams to HTTP(S) + for compatibility with wget2 which does not have FTP support + + - Ensure downloads are correctly shared for host packages that + try to do so using _DL_SUBDIR and ensure the correct + toplevel directory name is used in generated tarballs when + downloads are shared. + + Arch: Enable SSE2 support for x86 Pentium M variant. + + Defconfigs: Orangepi PC/R1, Raspberrypi zero2w, Sipeed + licheepi nano, Wandboard: Fix compilation issues. PC x86-64 + bios/efi: add wireless regdb to fix kernel warning during + boot, iMX.8 boards: Adjust FIT external data position to match + imx-mkimage changes, fixing boot issues. + + Updated/fixed packages: am33x-cm, apcupsd, + arm-trusted-firmware, binutils-bare-metal, bpftool, catch2, + ccache, cjson, clamav, cog, coreutils, cryptodev-linux, + dhcpcd, dmraid, dnsmasq, docker-cli, docker-compose, + docker-engine, doom-wad, duma, elf2flt, ebtables, elfutils, + evemu, file, fluidsynth, freeradius-client, freeradius-server, + freerdp, fwts, gcc, gcc-bare-metal, git, gnuplot, go, + gr-osmosdr, gst1-plugins-good, hidapi, imagemagick, + intel-gmmlib, ivi-homescreen, janus-gateway, kexec, kmod, + kodi, libarchive, libdrm, libedit, libffi, libglib2, libhtp, + libjwt, libkrb5, libmanette, libmdbx, libmnl, + libnetfilter_acct, libnetfilter_log, libnpth, libopenssl, + libpng, libuhttpd, liburiparser, libutempter, libvncserver, + libwpe, lightning, linux-firmware, linux-pam, lua-cffi, + luajit, lvm2, lynx, mariadb, mesa3d, micropython, minisign, + musl, mutt, ncftp, network-manager, newlib-bare-metal, nfacct, + nfs-utils, octave, openjpeg, openocd, oprofile, + perl-dbd-mysql, php, postgresql, pppd, privoxy, procps-ng, + proftpd, proj, putty, python-ml-dtypes, python-pillow, + python-rds-py, qemu, qt5base, redis-plus-plus, rtl8189fs, + ruby, samba4, shadow, smcroute, speech, squid, sscep, + suricata, swupdate, systemd, ti-sgx-km, tinycbor, tinyproxy, + tor, tpm2-tss, ttyd, uboot-tools, ulogd, vala, weston, + wpewebkit, x11vnc, zbar, zeromq, zfs, zip, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #15766: BR2_PACKAGE_WESTON_XWAYLAND -- 12.0.1 -- fails to build.. + #15973: imx8m bootloader image generation broken since update.. + #16075: Cannot use linux kernel extensions from external tree.. + #16093: kmod and gcc-14 build error + 2024.02.2, released May 7th, 2024 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ac595f5749b..983f2f58b39 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02.2' +RELEASE='2024.02.3' ### Change here for more memory/cores ### VM_MEMORY=2048 From 12b2860d7562d5cf1b7492b58f4f10f0405444c4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 10 Jun 2024 10:32:27 +0200 Subject: [PATCH 1148/3013] docs/website: Update for 2024.02.3 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 33b9b63537d..127c004e364 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
        Download
        -

        Latest stable / long term support release: 2024.02.2

        +

        Latest stable / long term support release: 2024.02.3

        - +
        - +
        -

        buildroot-2024.02.2.tar.gz

        -

        PGP signature

        +

        buildroot-2024.02.3.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2024.02.2.tar.xz

        -

        PGP signature

        +

        buildroot-2024.02.3.tar.xz

        +

        PGP signature

        + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
        diff --git a/docs/website/news.html b/docs/website/news.html index c57a8e31751..691d27071ab 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

        News

          +
        • +
          +
          +
          +

          2024.05 released

          +

          12 June 2024

          +
          +
          +

          The stable 2024.05 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2024.05 release.

          +
          +
          +
          • +
        • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 983f2f58b39..ce57bc07198 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02.3' +RELEASE='2024.05' ### Change here for more memory/cores ### VM_MEMORY=2048 From ec80d557a2e86f882844864252099286734d0719 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 12 Jun 2024 18:40:41 +0200 Subject: [PATCH 1152/3013] docs/website/news.html: add 2024.05 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 691d27071ab..9abdf8f7208 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

          2024.05 released

          The stable 2024.05 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2024.05 release.

          From 1556395c9f11517a74ba1e76ce976c34344d66ed Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 12 Jun 2024 18:41:29 +0200 Subject: [PATCH 1153/3013] Kickoff 2024.08 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4320eeb1b7e..138cfc5f8d6 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.05 +export BR2_VERSION := 2024.08-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1718188000 From a4d38ef61cb1846871d15f49bdffd70a5ca05a2c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 12 Jun 2024 18:51:57 +0200 Subject: [PATCH 1154/3013] configs: stm32f429_disco_xip: use same headers as kernel Instead of downloading a different version of the kernel for the headers as for the runtime kernel itself, use the same one. By doing so, we now need to add the hash file for linux-headers. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- .../stm32f429-disco/patches/linux-headers/linux-headers.hash | 1 + configs/stm32f429_disco_xip_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash diff --git a/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index e3d3cc38ff8..11ec6c4bf72 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f429-disco/patches" From 1c1edaefb819b85d13db8b618df9dbd208a98e69 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 14 May 2024 10:58:00 +0200 Subject: [PATCH 1155/3013] docs, package/gcc: switch to Gitlab issue tracker Our Bugzilla is so slow and unstable that it has become unusable. Let's switch to using the Gitlab issue tracker instead. There are still lots of references to the Bugzilla bug tracker in our News page at https://buildroot.org/news.html, but these are for older news. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: don't needlessly re-flow] Signed-off-by: Yann E. MORIN --- docs/manual/contribute.adoc | 2 +- docs/manual/resources.adoc | 2 +- docs/website/contribute.html | 2 +- docs/website/support.html | 2 +- package/gcc/gcc.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 6ff6c153147..c88035597e7 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -25,7 +25,7 @@ for more information on obtaining a Buildroot git tree. === Reproducing, analyzing and fixing bugs A first way of contributing is to have a look at the open bug reports in -the https://bugs.buildroot.org/buglist.cgi?product=buildroot[Buildroot bug +the https://gitlab.com/buildroot.org/buildroot/-/issues[Buildroot bug tracker]. As we strive to keep the bug count as small as possible, all help in reproducing, analyzing and fixing reported bugs is more than welcome. Don't hesitate to add a comment to bug reports reporting your diff --git a/docs/manual/resources.adoc b/docs/manual/resources.adoc index 68b7eb9062a..4ef709c317b 100644 --- a/docs/manual/resources.adoc +++ b/docs/manual/resources.adoc @@ -40,7 +40,7 @@ better as it will reach more people, both developers and users. Bug tracker:: + Bugs in Buildroot can be reported via the mailing list or alternatively -via the https://bugs.buildroot.org/buglist.cgi?product=buildroot[Buildroot +via the https://gitlab.com/buildroot.org/buildroot/-/issues[Buildroot bugtracker]. Please refer to xref:reporting-bugs[] before creating a bug report. diff --git a/docs/website/contribute.html b/docs/website/contribute.html index aa1cf93f1b9..95028ee788c 100644 --- a/docs/website/contribute.html +++ b/docs/website/contribute.html @@ -13,7 +13,7 @@
          • Reproducing, analyzing and fixing bugs from our - bug tracker
            • + bug tracker
          • Analyzing and fixing autobuild failures
          • Reviewing and testing patches sent by other developers. See the diff --git a/docs/website/support.html b/docs/website/support.html index 28873c6d76f..0bcf365332b 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -81,7 +81,7 @@

            Search the List Archives

        If you think you found a bug in Buildroot, you can use the - Bug Tracker to post your bugs and/or + Bug Tracker to post your bugs and/or participate to find solutions to existing problems.

        Note: patches are only accepted through the mailing list.

        diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 672f9472a94..e4780353cb5 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -83,7 +83,7 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-mpc=$(HOST_DIR) \ --with-mpfr=$(HOST_DIR) \ --with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \ - --with-bugurl="http://bugs.buildroot.net/" \ + --with-bugurl="https://gitlab.com/buildroot.org/buildroot/-/issues" \ --without-zstd ifeq ($(BR2_REPRODUCIBLE),y) From 2bf45fa99c09302c4d313b79ae7b165a958e354e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Jun 2024 18:21:53 +0200 Subject: [PATCH 1156/3013] package/sentry-cli: needs pkgconf and openssl Signed-off-by: Yann E. MORIN --- package/sentry-cli/sentry-cli.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk index df419f81e19..3ddf5e44fc0 100644 --- a/package/sentry-cli/sentry-cli.mk +++ b/package/sentry-cli/sentry-cli.mk @@ -9,6 +9,6 @@ SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) SENTRY_CLI_LICENSE = BSD-3-clause SENTRY_CLI_LICENSE_FILES = LICENSE -HOST_SENTRY_CLI_DEPENDENCIES = host-zlib +HOST_SENTRY_CLI_DEPENDENCIES = host-pkgconf host-openssl host-zlib $(eval $(host-cargo-package)) From 7dd7a6820551278d6c002d2bda394364f9932946 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Jun 2024 13:30:46 +0200 Subject: [PATCH 1157/3013] {linux, linux-headers}: bump 6.{1, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index b972557fc00..9374af71b0d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz -sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz -sha256 9019f427bfdc9ced5bc954d760d37ac08c0cdffb45ad28087fc45a73e64336c9 linux-6.1.92.tar.xz +sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz +sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 linux-5.15.160.tar.xz sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 48101783b94..487d941a16f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -419,8 +419,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.277" if BR2_KERNEL_HEADERS_5_4 default "5.10.218" if BR2_KERNEL_HEADERS_5_10 default "5.15.160" if BR2_KERNEL_HEADERS_5_15 - default "6.1.92" if BR2_KERNEL_HEADERS_6_1 - default "6.6.32" if BR2_KERNEL_HEADERS_6_6 + default "6.1.93" if BR2_KERNEL_HEADERS_6_1 + default "6.6.33" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 125d9f1b4ddd7a4e4a4ab4a43dc06cf42b328bc4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Jun 2024 13:30:47 +0200 Subject: [PATCH 1158/3013] {toolchain, linux-headers}: add support for 6.9 headers And add (and default to) 6.9 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 9374af71b0d..ac7028c5356 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 272800e0d1a7d01a78bce95a3aaf5c80816f50eb15c517d7003e58355760ecc2 linux-6.9.4.tar.xz sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 487d941a16f..e2664a523e8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_8 + default BR2_KERNEL_HEADERS_6_9 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_8 bool "Linux 6.8.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + +config BR2_KERNEL_HEADERS_6_9 + bool "Linux 6.9.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -128,8 +132,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9 + bool "6.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8 - bool "6.8.x or later" + bool "6.8.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 @@ -422,6 +430,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.93" if BR2_KERNEL_HEADERS_6_1 default "6.6.33" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 + default "6.9.4" if BR2_KERNEL_HEADERS_6_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index baf69ce4635..1aa17cbfbdb 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -647,6 +647,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -660,6 +664,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c4b0d25542..45a87fb3c89 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -166,8 +166,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_9 + bool "6.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_8 - bool "6.8.x or later" + bool "6.8.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7 From aa70c331a29d662a0da8115a36a7e0716f6f4983 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Jun 2024 13:30:48 +0200 Subject: [PATCH 1159/3013] linux: bump latest version to 6.9 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 194a24f3918..865b7fd2402 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.8)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.9)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.8.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.9.4" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From 1b3ed2610d12bf928175bf46158b3433ca33f2de Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Jun 2024 13:30:49 +0200 Subject: [PATCH 1160/3013] package/linux-headers: drop 6.8.x option The 6.8.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- Config.in.legacy | 9 ++++++++- linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f0bff5191f8..c1d6fd646e6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,7 +144,14 @@ endif ############################################################################### -comment "Legacy options removed in 2024.05" +comment "Legacy options removed in 2024.08" + +config BR2_KERNEL_HEADERS_6_8 + bool "kernel headers version 6.8.x are no longer supported" + select BR2_LEGACY + help + Version 6.8.x of the Linux kernel headers are no longer + maintained upstream and are now removed. config BR2_TARGET_AT91BOOTSTRAP bool "at91bootstrap removed" diff --git a/linux/linux.hash b/linux/linux.hash index ac7028c5356..6ebd708bcb8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 272800e0d1a7d01a78bce95a3aaf5c80816f50eb15c517d7003e58355760ecc2 linux-6.9.4.tar.xz -sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e2664a523e8..7b7928549c1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -48,10 +48,6 @@ config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 -config BR2_KERNEL_HEADERS_6_8 - bool "Linux 6.8.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 - config BR2_KERNEL_HEADERS_6_9 bool "Linux 6.9.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 @@ -429,7 +425,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.160" if BR2_KERNEL_HEADERS_5_15 default "6.1.93" if BR2_KERNEL_HEADERS_6_1 default "6.6.33" if BR2_KERNEL_HEADERS_6_6 - default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default "6.9.4" if BR2_KERNEL_HEADERS_6_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 4ced9cf5b9bb267750b10e464e216da939e667d7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 15 Jun 2024 12:01:23 +0200 Subject: [PATCH 1161/3013] package/octave: bump to version 9.2.0 See release announce: https://octave.org/news/release/2024/06/07/octave-9.2.0-released.html Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/octave/octave.hash | 4 ++-- package/octave/octave.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/octave/octave.hash b/package/octave/octave.hash index 3ea5a1cd8d7..d9313734f16 100644 --- a/package/octave/octave.hash +++ b/package/octave/octave.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -# https://ftp.gnu.org/gnu/octave/octave-9.1.0.tar.lz.sig +# https://ftp.gnu.org/gnu/octave/octave-9.2.0.tar.lz.sig # using key DBD9C84E39FE1AAE99F04446B05F05B75D36644B -sha256 f1769f61bd10c8ade6aee352b1bbb016e5fd8fc8394896a64dc26ef675ba3cea octave-9.1.0.tar.lz +sha256 dcb2c098701cfcbc083f07e90e146261d15cdbf5e89c031032422112c89b47da octave-9.2.0.tar.lz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 6a21bef7b87..69b292bb6b8 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCTAVE_VERSION = 9.1.0 +OCTAVE_VERSION = 9.2.0 OCTAVE_SITE = https://ftp.gnu.org/gnu/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ From 913a6c7788ef2dcc76860e45d2abe70cce812b9d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 15 Jun 2024 12:23:31 +0200 Subject: [PATCH 1162/3013] package/octave: add optional libcurl support Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 69b292bb6b8..d879fd67303 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -36,6 +36,13 @@ else OCTAVE_CONF_OPTS += --without-magick endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +OCTAVE_CONF_OPTS += --with-curl +OCTAVE_DEPENDENCIES += libcurl +else +OCTAVE_CONF_OPTS += --without-curl +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From d1f3ae32c2feba6541b41dac77e6daf63fc3aece Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 12 Jun 2024 18:22:46 +0000 Subject: [PATCH 1163/3013] ppd-merge: speed up per-package-rsync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The per-package-rsync stage can add a significant amount of time to builds. They can also be annoying as the target-finalize and host-finalize targets are the slowest and run on every `make all`, which is used frequently for partial rebuilds. The per-package-rsync is slow because it launches a new rsync for each source tree, and each rsync must rescan the destination directory and potentially overwrite files multiple times. We can instead merge all the rsync calls down into one call, and rsync is smarter about scanning all the source directories and only copying over the files it needs to. We feed the source trees to rsync in reverse-order, as this preserves the original behaviour. I.e. when using multiple rsyncs, the last source tree would overwrite anything in the destination. Now when using a single rsync, we put the last tree first as rsync will select the first file it finds. This only supports the 'copy' mode, which is used in the finalize step. The 'hardlink' mode would require specifying each source tree with the --link-dest flag, and rsync only support at most 20 such trees at a time, so we'd need a clever loop, so the 'hardlink' mode is left out, at least for now. Below is a benchmark running the host-finalize target for a build with 200 packages. Benchmark 1: before copy Time (mean ± σ): 27.171 s ± 0.777 s [User: 6.170 s, System: 14.830 s] Range (min … max): 26.343 s … 28.566 s 10 runs Benchmark 2: after copy Time (mean ± σ): 6.296 s ± 0.196 s [User: 2.874 s, System: 5.600 s] Range (min … max): 6.094 s … 6.709 s 10 runs Summary after copy ran 4.32 ± 0.18 times faster than before copy Cc: Herve Codina Cc: Yann E. MORIN Cc: Thomas Petazzoni Reviewed-by: Herve Codina Signed-off-by: Brandon Maier Tested-by: Yann E. MORIN Reviewed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/pkg-utils.mk | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index d1964299af4..3ab9e9fe52c 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -221,18 +221,12 @@ ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) # $4: literal "copy" or "hardlink" to copy or hardlink files from src to dest define per-package-rsync mkdir -p $(3) - $(foreach pkg,$(1),\ - rsync -a \ - --hard-links \ - $(if $(filter hardlink,$(4)), \ - --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/, \ - $(if $(filter copy,$(4)), \ - $(empty), \ - $(error per-package-rsync can only "copy" or "hardlink", not "$(4)") \ - ) \ - ) \ - $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3)$(sep)) + $(if $(filter hardlink,$(4)), \ + $(foreach pkg,$(1),\ + rsync -a --hard-links --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ $(3)$(sep)), \ + printf "%s/$(2)/\n" $(1) | tac \ + | rsync -a --hard-links --files-from=- --no-R -r $(PER_PACKAGE_DIR) $(3)) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current From ddc46ee1a2024ec9eb38718e34ab9aca38a7302b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Jun 2024 20:20:23 +0200 Subject: [PATCH 1164/3013] package/nut: needs threads threads are mandantory since bump to version 2.8.2 in commit 4edd837ac0193db83202030ee2997ac811e6bc45 and https://github.com/networkupstools/nut/commit/ff401e538bcbead62a3532887135518ef9e779df: In file included from nutipc.cpp:38: ../include/nutipc.hpp:455:3: error: 'pthread_t' does not name a type 455 | pthread_t m_impl; | ^~~~~~~~~ Fixes: 4edd837ac0193db83202030ee2997ac811e6bc45 - http://autobuild.buildroot.org/results/d16a24d60b298d7616a516ec0c6c30696ed93a58 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/collectd/Config.in | 5 +++-- package/nut/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index e6d549f81f1..5f39507cffd 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -430,13 +430,14 @@ config BR2_PACKAGE_COLLECTD_NTPD config BR2_PACKAGE_COLLECTD_NUT bool "nut" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_NUT help The NUT plugin collects uninterruptible power supply (UPS) statistics using the Network UPS Tools (NUT). -comment "nut needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "nut needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_COLLECTD_OLSRD bool "olsrd" diff --git a/package/nut/Config.in b/package/nut/Config.in index df647b9b48d..0ecd33d583a 100644 --- a/package/nut/Config.in +++ b/package/nut/Config.in @@ -1,11 +1,12 @@ -comment "nut needs a toolchain w/ C++" +comment "nut needs a toolchain w/ C++, threads" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_NUT bool "nut" depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help Network UPS tools From 106e43e3036f4c71419c698445ab979e3f32007a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Jun 2024 09:56:19 +0200 Subject: [PATCH 1165/3013] package/execline: fix uclibc build Fix the following uclibc build failure raised since bump to version 2.9.5.1 in commit 42fad03182ed53de8003b66d50e893f42b72145e and https://github.com/skarnet/execline/commit/6dfe54be869c117676dcc004400ac68096945531: src/execline/eltest.c: In function 'eltest_run': src/execline/eltest.c:366:31: error: 'struct stat' has no member named 'st_mtim'; did you mean 'st_mtime'? 366 | return timespec_cmp(&st.st_mtim, &st.st_atim) > 0 ; | ^~~~~~~ | st_mtime Fixes: 42fad03182ed53de8003b66d50e893f42b72145e - http://autobuild.buildroot.org/results/64bf2928f36e07332052854cbaaa7a6f8f347e29 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/execline/execline.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/execline/execline.mk b/package/execline/execline.mk index 842ded6b88a..b3d2d98216c 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -12,6 +12,7 @@ EXECLINE_INSTALL_STAGING = YES EXECLINE_DEPENDENCIES = skalibs EXECLINE_CONF_OPTS = \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ --prefix=/ \ --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ From a6648ad8dacc4d40ead5e54aeb5be9969b1e8529 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 13 Jun 2024 07:14:19 +0100 Subject: [PATCH 1166/3013] boot/xilinx-prebuilt: new boot package This patch add a new boot package for downloading prebuilt firmware for Xilinx versal and zynqmp evaluation boards. It solves the problem of being able to verify the hash when downloading a prebuilt zynqmp pmufw.elf binary. Signed-off-by: Neal Frager Reviewed-by: Brandon Maier [yann.morin.1998@free.fr: - move the hash file to the package dir, not the board dir - move board name after familly choice - add default board name for each family - qstrip the Kconfig strings before use - introduce XILINX_PREBUILT_BOARD_DIR to simplify paths - explain the *.pdi glob - simplify non-versal install ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 + boot/Config.in | 1 + boot/xilinx-prebuilt/Config.in | 48 +++++++++++++++++++++++ boot/xilinx-prebuilt/xilinx-prebuilt.hash | 2 + boot/xilinx-prebuilt/xilinx-prebuilt.mk | 43 ++++++++++++++++++++ 5 files changed, 96 insertions(+) create mode 100644 boot/xilinx-prebuilt/Config.in create mode 100644 boot/xilinx-prebuilt/xilinx-prebuilt.hash create mode 100644 boot/xilinx-prebuilt/xilinx-prebuilt.mk diff --git a/DEVELOPERS b/DEVELOPERS index 52a7572d410..75642ed77f8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2336,8 +2336,10 @@ F: package/qt5/qt5opcua/ N: Neal Frager F: board/versal/ +F: board/xilinx/ F: board/zynq/ F: board/zynqmp/ +F: boot/xilinx-prebuilt/ F: configs/versal_vck190_defconfig F: configs/zynq_zc702_defconfig F: configs/zynq_zc706_defconfig diff --git a/boot/Config.in b/boot/Config.in index 14e0ca65fa6..25a50265d24 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -21,5 +21,6 @@ source "boot/ti-k3-boot-firmware/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" +source "boot/xilinx-prebuilt/Config.in" endmenu diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in new file mode 100644 index 00000000000..7c992e6de3d --- /dev/null +++ b/boot/xilinx-prebuilt/Config.in @@ -0,0 +1,48 @@ +config BR2_TARGET_XILINX_PREBUILT + bool "xilinx-prebuilt" + depends on BR2_aarch64 + help + Pre-built firmware files for Xilinx boards. + + https://github.com/Xilinx/soc-prebuilt-firmware + +if BR2_TARGET_XILINX_PREBUILT + +config BR2_TARGET_XILINX_PREBUILT_VERSION + string "prebuilt version" + default "xilinx_v2024.1" + help + Release version of Xilinx firmware. + Must be xilinx_v2023.1 or newer. + +choice + bool "family variant" + default BR2_TARGET_XILINX_PREBUILT_ZYNQMP + +config BR2_TARGET_XILINX_PREBUILT_ZYNQMP + bool "zynqmp" + +config BR2_TARGET_XILINX_PREBUILT_KRIA + bool "kria" + +config BR2_TARGET_XILINX_PREBUILT_VERSAL + bool "versal" + +endchoice + +config BR2_TARGET_XILINX_PREBUILT_FAMILY + string + default "zynqmp" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP + default "kria" if BR2_TARGET_XILINX_PREBUILT_KRIA + default "versal" if BR2_TARGET_XILINX_PREBUILT_VERSAL + +config BR2_TARGET_XILINX_PREBUILT_BOARD + string "board name" + default "zcu102" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP + default "kr260" if BR2_TARGET_XILINX_PREBUILT_KRIA + default "vck190" if BR2_TARGET_XILINX_PREBUILT_VERSAL + help + Name of Xilinx target board. + Used for installing the appropriate firmware. + +endif # BR2_TARGET_XILINX_PREBUILT diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx-prebuilt.hash new file mode 100644 index 00000000000..c955cd79f54 --- /dev/null +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f xilinx-prebuilt-xilinx_v2024.1.tar.gz diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk new file mode 100644 index 00000000000..eb78ed10cd6 --- /dev/null +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# xilinx-prebuilt +# +################################################################################ + +XILINX_PREBUILT_VERSION = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_VERSION)) +XILINX_PREBUILT_SITE = $(call github,Xilinx,soc-prebuilt-firmware,$(XILINX_PREBUILT_VERSION)) +XILINX_PREBUILT_LICENSE = MIT +XILINX_PREBUILT_LICENSE_FILES = LICENSE +XILINX_PREBUILT_INSTALL_TARGET = NO +XILINX_PREBUILT_INSTALL_IMAGES = YES + +XILINX_PREBUILT_FAMILY = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_FAMILY)) +XILINX_PREBUILT_BOARD = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_BOARD)) + +XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAMILY) + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) +# We need the *.pdi glob, because the file has different names for the +# different boards, but htere is only one, and it has to be named +# vpl_gen_fixed.pdi when installed. +define XILINX_PREBUILT_INSTALL_VERSAL + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/plm.elf \ + $(BINARIES_DIR)/plm.elf + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf \ + $(BINARIES_DIR)/psmfw.elf + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/*.pdi \ + $(BINARIES_DIR)/vpl_gen_fixed.pdi +endef +else # BR2_TARGET_XILINX_PREBUILT_VERSAL +define XILINX_PREBUILT_INSTALL_OTHERS + $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/pmufw.elf \ + $(BINARIES_DIR)/pmufw.elf +endef +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL + +define XILINX_PREBUILT_INSTALL_IMAGES_CMDS + $(XILINX_PREBUILT_INSTALL_VERSAL) + $(XILINX_PREBUILT_INSTALL_OTHERS) +endef + +$(eval $(generic-package)) From 35a4ec05533b97bdff48a6f2c07e4b8bb1074467 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 13 Jun 2024 07:14:20 +0100 Subject: [PATCH 1167/3013] boot/uboot.mk: new zynqmp pmufw prebuilt option The new BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option will enable u-boot to use the xilinx-prebuilt package for downloading a pmufw.elf that gets included in the generated boot.bin. If the BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option is enabled, then the BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw will be ignored. Signed-off-by: Neal Frager Reviewed-by: Brandon Maier [yann.morin.1998@free.fr: - add 'custom' to prompt for BR2_TARGET_UBOOT_ZYNQMP_PMUFW - fix checkpackage ] Signed-off-by: Yann E. MORIN --- boot/uboot/Config.in | 16 +++++++++++++++- boot/uboot/uboot.mk | 9 ++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d0901edc9d7..f37040a28a9 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -512,9 +512,23 @@ config BR2_TARGET_UBOOT_ZYNQMP if BR2_TARGET_UBOOT_ZYNQMP +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + bool "xilinx-prebuilt pmufw.elf" + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || BR2_TARGET_XILINX_PREBUILT_KRIA + help + Use xilinx-prebuilt boot package for downloading prebuilt + zynqmp pmufw.elf from + https://github.com/Xilinx/soc-prebuilt-firmware repo. + + U-Boot build process will generate a boot.bin (to be loaded by + by the ZynqMP boot ROM) containing both the U-Boot SPL and the + PMU firmware in the Xilinx-specific boot format. + config BR2_TARGET_UBOOT_ZYNQMP_PMUFW - string "PMU firmware location" + string "Custom PMU firmware location" depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on !BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT help Location of a PMU firmware binary. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index b9f165f0418..19f4cdb557e 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -436,6 +436,10 @@ endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) +ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT),y) +UBOOT_DEPENDENCIES += xilinx-prebuilt +UBOOT_ZYNQMP_PMUFW_PATH = $(BINARIES_DIR)/pmufw.elf +else UBOOT_ZYNQMP_PMUFW = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PMUFW)) ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) @@ -444,7 +448,10 @@ BR_NO_CHECK_HASH_FOR += $(notdir $(UBOOT_ZYNQMP_PMUFW)) UBOOT_ZYNQMP_PMUFW_PATH = $(UBOOT_DL_DIR)/$(notdir $(UBOOT_ZYNQMP_PMUFW)) else ifneq ($(UBOOT_ZYNQMP_PMUFW),) UBOOT_ZYNQMP_PMUFW_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PMUFW)) -endif +endif #ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) + +endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) define UBOOT_ZYNQMP_KCONFIG_PMUFW From 551ba16a0f09fe550acb3ef6d12a1b2587d03292 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 13 Jun 2024 07:14:21 +0100 Subject: [PATCH 1168/3013] configs/zynqmp_*: migrate to xilinx-prebuilt Migrate zynqmp defconfigs to xilinx-prebuilt. Signed-off-by: Neal Frager Reviewed-by: Brandon Maier [yann.morin.1998@free.fr: drop defaults from defconfigs] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 5 ----- configs/zynqmp_kria_kr260_defconfig | 7 ++++++- configs/zynqmp_kria_kv260_defconfig | 8 +++++++- configs/zynqmp_zcu102_defconfig | 6 +++++- configs/zynqmp_zcu104_defconfig | 7 ++++++- configs/zynqmp_zcu106_defconfig | 7 ++++++- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dd1fd31e864..34cdc406755 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -345,11 +345,6 @@ configs/visionfive_defconfig lib_defconfig.ForceCheckHash configs/wandboard_defconfig lib_defconfig.ForceCheckHash configs/warp7_defconfig lib_defconfig.ForceCheckHash configs/zynqmp_kria_kd240_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_kria_kr260_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_kria_kv260_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_zcu102_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_zcu104_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_zcu106_defconfig lib_defconfig.ForceCheckHash linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch lib_patch.Upstream package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/4th/0001-avoid-regen-during-install.patch lib_patch.Upstream diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 3bf269ab6ba..24fdea9c30c 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -31,10 +31,15 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kr260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_KRIA=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 7b402e032c6..a16da66e38d 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -31,10 +31,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="kv260" +BR2_TARGET_XILINX_PREBUILT_KRIA=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index f40002f6d93..3f1726a13f1 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -30,10 +30,14 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index ef9c9bad492..b6d943333fc 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -30,10 +30,15 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu104-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu104" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 07c595436f8..c10ec70ed8d 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -30,10 +30,15 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu106" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" From 8271323649c42420adaf4513b0472a7203f7784d Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 13 Jun 2024 07:14:22 +0100 Subject: [PATCH 1169/3013] configs/versal_vck190_defconfig: migrate to xilinx-prebuilt Migrate versal_vck190_defconfig to xilinx-prebuilt. Signed-off-by: Neal Frager Reviewed-by: Brandon Maier [yann.morin.1998@free.fr: drop default from defconfig] Signed-off-by: Yann E. MORIN --- configs/versal_vck190_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 69272e721c7..21dfe2577aa 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -32,9 +32,9 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y -BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2024.1" -BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_VERSAL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From 1fbeeb23c8fca597beda37b9394d4099f1cadc41 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 13 Jun 2024 07:14:23 +0100 Subject: [PATCH 1170/3013] package/versal-firmware: remove package This patch removes the package/versal-firmware as this package is replaced by the boot/xilinx-prebuilt target boot firmware package. Signed-off-by: Neal Frager Reviewed-by: Brandon Maier [yann.morin.1998@free.fr: handle legacy] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 +++++++ DEVELOPERS | 1 - .../versal-firmware/versal-firmware.hash | 2 -- boot/xilinx-prebuilt/Config.in | 1 + package/Config.in | 1 - package/versal-firmware/Config.in | 24 ------------------- package/versal-firmware/versal-firmware.mk | 21 ---------------- 7 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 board/xilinx/patches/versal-firmware/versal-firmware.hash delete mode 100644 package/versal-firmware/Config.in delete mode 100644 package/versal-firmware/versal-firmware.mk diff --git a/Config.in.legacy b/Config.in.legacy index c1d6fd646e6..29c386bec43 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_VERSAL_FIRMWARE + bool "versal-firmware has been replaced by xilinx-prebuilt" + select BR2_TARGET_XILINX_PREBUILT + select BR2_LEGACY + help + The versal-firmware package has been replaced by the more + generic xilinx-prebuilt package. + config BR2_KERNEL_HEADERS_6_8 bool "kernel headers version 6.8.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 75642ed77f8..8bfd36f1d89 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2353,7 +2353,6 @@ F: package/binutils-bare-metal/ F: package/bootgen/ F: package/gcc-bare-metal/ F: package/newlib-bare-metal/ -F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ N: Nicola Di Lieto diff --git a/board/xilinx/patches/versal-firmware/versal-firmware.hash b/board/xilinx/patches/versal-firmware/versal-firmware.hash deleted file mode 100644 index c4d745f22cc..00000000000 --- a/board/xilinx/patches/versal-firmware/versal-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f versal-firmware-xilinx_v2024.1.tar.gz diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in index 7c992e6de3d..d3df1c06e7b 100644 --- a/boot/xilinx-prebuilt/Config.in +++ b/boot/xilinx-prebuilt/Config.in @@ -17,6 +17,7 @@ config BR2_TARGET_XILINX_PREBUILT_VERSION choice bool "family variant" + default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_PACKAGE_VERSAL_FIRMWARE # legacy default BR2_TARGET_XILINX_PREBUILT_ZYNQMP config BR2_TARGET_XILINX_PREBUILT_ZYNQMP diff --git a/package/Config.in b/package/Config.in index bfbec1c21d0..550fdc1f411 100644 --- a/package/Config.in +++ b/package/Config.in @@ -459,7 +459,6 @@ menu "Firmware" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" - source "package/versal-firmware/Config.in" source "package/wilc-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in deleted file mode 100644 index 01daefd2040..00000000000 --- a/package/versal-firmware/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_VERSAL_FIRMWARE - bool "versal-firmware" - depends on BR2_aarch64 - help - Pre-built firmware files for Xilinx Versal boards. - - https://github.com/Xilinx/soc-prebuilt-firmware - -if BR2_PACKAGE_VERSAL_FIRMWARE - -config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION - string "firmware version" - default "xilinx_v2023.1" - help - Release version of Versal firmware. - -config BR2_PACKAGE_VERSAL_FIRMWARE_BOARD - string "board name" - default "vck190" - help - Name of Versal target board. - Used for installing the appropriate firmware. - -endif # BR2_PACKAGE_VERSAL_FIRMWARE diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk deleted file mode 100644 index 1ced259be10..00000000000 --- a/package/versal-firmware/versal-firmware.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# versal-firmware -# -################################################################################ - -VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_SITE = $(call github,Xilinx,soc-prebuilt-firmware,$(VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_LICENSE = MIT -VERSAL_FIRMWARE_LICENSE_FILES = LICENSE -VERSAL_FIRMWARE_INSTALL_TARGET = NO -VERSAL_FIRMWARE_INSTALL_IMAGES = YES - -define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS - $(foreach f,plm.elf psmfw.elf vpl_gen_fixed.pdi,\ - $(INSTALL) -D -m 0755 $(@D)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)-versal/$(f) \ - $(BINARIES_DIR)/$(f) - ) -endef - -$(eval $(generic-package)) From b39dfdde338bb254b958fbfbe6c7f0fb4e447e34 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Jun 2024 22:28:24 +0200 Subject: [PATCH 1171/3013] package/avro-c: fix build with gcc 14 Fix the following build failure with gcc 14: In file included from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro/legacy.h:33, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro/io.h:31, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro/consumer.h:30, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro.h:28, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/examples/quickstop.c:18: /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/examples/quickstop.c: In function 'print_person': /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/examples/quickstop.c:123:61: error: passing argument 3 of 'first_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] 123 | avro_value_get_string(&first_value, &p, &size); | ^~ | | | int32_t ** {aka int **} Fixes: - http://autobuild.buildroot.org/results/fdbc6a888ba8bb51f4e076a450919477d1378eb3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-Fix-typos-in-docs-and-examples-2795.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch diff --git a/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch b/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch new file mode 100644 index 00000000000..72faaa0abe7 --- /dev/null +++ b/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch @@ -0,0 +1,59 @@ +From 52f051dbeefad0b7e73187becad6c33747b047d3 Mon Sep 17 00:00:00 2001 +From: Sahil Kang +Date: Mon, 11 Mar 2024 03:01:21 -0700 +Subject: [PATCH] AVRO-3957: [C] Fix typos in docs and examples (#2795) + +* AVRO-3957: [C] Fix misformatted type in docs + +Signed-off-by: Sahil Kang +Signed-off-by: Sahil Kang + +* AVRO-3957: [C] Fix type in quickstop example + +This removes the following warning: + + avro/lang/c/examples/quickstop.c:123:40: warning: incompatible pointer types passing 'int32_t **' (aka 'int **') to parameter of type + 'const char **' [-Wincompatible-pointer-types] + avro_value_get_string(&first_value, &p, &size); + +Signed-off-by: Sahil Kang +Signed-off-by: Sahil Kang + +--------- + +Signed-off-by: Sahil Kang +Signed-off-by: Sahil Kang + +Upstream: https://github.com/apache/avro/commit/52f051dbeefad0b7e73187becad6c33747b047d3 +Signed-off-by: Fabrice Fontaine +--- + lang/c/docs/index.txt | 2 +- + lang/c/examples/quickstop.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/index.txt b/docs/index.txt +index a439a052631..df16f9d9678 100644 +--- a/docs/index.txt ++++ b/docs/index.txt +@@ -178,7 +178,7 @@ different versions of the Avro library. That means that it's really + only safe to use these hash values internally within the context of a + single execution of a single application. + +-The +reset+ method “clears out” an +avro_value_t instance, making sure ++The +reset+ method “clears out” an +avro_value_t+ instance, making sure + that it's ready to accept the contents of a new value. For scalars, + this is usually a no-op, since the new value will just overwrite the old + one. For arrays and maps, this removes any existing elements from the +diff --git a/examples/quickstop.c b/examples/quickstop.c +index ff9e9700590..b26dad10c04 100644 +--- a/examples/quickstop.c ++++ b/examples/quickstop.c +@@ -107,7 +107,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema) + if (rval == 0) { + int64_t id; + int32_t age; +- int32_t *p; ++ const char *p; + size_t size; + avro_value_t id_value; + avro_value_t first_value; From 61505649746cb4d0dd57e35ff6139b7925bab72d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Jun 2024 20:49:03 +0200 Subject: [PATCH 1172/3013] package/checksec: bump to version 2.7.1 https://github.com/slimm609/checksec.sh/blob/2.7.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/checksec/checksec.hash | 2 +- package/checksec/checksec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/checksec/checksec.hash b/package/checksec/checksec.hash index a29866ba078..856662b193a 100644 --- a/package/checksec/checksec.hash +++ b/package/checksec/checksec.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39d4158f96bdc7533ad6595703375c0046951fe4f6367b831ef92d9c66c1a307 checksec-2.6.0.tar.gz +sha256 eba0616f4033385d6093608a2a2aad3c2debb847d6778c87346f89c80946684f checksec-2.7.1.tar.gz sha256 55154b4be6dfcb3ff29d1e3648d0d07b3943a5fcc3af7c2e0e799b074734f722 LICENSE.txt diff --git a/package/checksec/checksec.mk b/package/checksec/checksec.mk index ed9846ac2df..c1170e822ed 100644 --- a/package/checksec/checksec.mk +++ b/package/checksec/checksec.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKSEC_VERSION = 2.6.0 +CHECKSEC_VERSION = 2.7.1 CHECKSEC_SITE = $(call github,slimm609,checksec.sh,$(CHECKSEC_VERSION)) CHECKSEC_LICENSE = BSD-3-Clause CHECKSEC_LICENSE_FILES = LICENSE.txt From 9b2c10bc06d37aca151e8443ccbc236184eec5b0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 12 Jun 2024 18:51:57 +0200 Subject: [PATCH 1173/3013] configs: stm32f429_disco_xip: use same headers as kernel Instead of downloading a different version of the kernel for the headers as for the runtime kernel itself, use the same one. By doing so, we now need to add the hash file for linux-headers. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard (cherry picked from commit a4d38ef61cb1846871d15f49bdffd70a5ca05a2c) Signed-off-by: Peter Korsgaard --- .../stm32f429-disco/patches/linux-headers/linux-headers.hash | 1 + configs/stm32f429_disco_xip_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash diff --git a/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/stm32f429-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index e3d3cc38ff8..11ec6c4bf72 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f429-disco/patches" From acf158125b7f391a37b3c93ee08dbc6a269ff284 Mon Sep 17 00:00:00 2001 From: Lance Fredrickson Date: Thu, 13 Jun 2024 07:44:51 -0600 Subject: [PATCH 1174/3013] package/linux-firmware: Add additional firmware fo Intel iwlwifi 9xxx Intel Wireless-AC 9560 looks for iwlwifi-so-a0-jf-b0-*.ucode. Signed-off-by: Lance Fredrickson Signed-off-by: Yann E. MORIN --- package/linux-firmware/linux-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 8dcd57fb7c2..13dbc6d98c8 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -583,6 +583,7 @@ endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX),y) LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode +LINUX_FIRMWARE_FILES += iwlwifi-so-a0-jf-b0*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif From 722804c4a1307e4d2eeae7496c4645da2bb63329 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 16 Jun 2024 14:43:21 +0200 Subject: [PATCH 1175/3013] package/glibc: drop ignores for 2.38 specific CVEs Commit b5680f53d60 (package/glibc: bump to 2.39) forgot to drop the ignores for the 2.38 specific CVEs. Do that now. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/glibc/glibc.mk | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 96a850516f5..8bc4cd46664 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -24,34 +24,6 @@ GLIBC_CPE_ID_VENDOR = gnu # allow proper matching with the CPE database. GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) -# Fixed by b25508dd774b617f99419bdc3cf2ace4560cd2d6, which is between -# 2.38 and the version we're really using -GLIBC_IGNORE_CVES += CVE-2023-4527 - -# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between -# 2.38 and the version we're really using -GLIBC_IGNORE_CVES += CVE-2023-4806 - -# Fixed by 750a45a783906a19591fb8ff6b7841470f1f5710, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-4911 - -# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-5156 - -# Fixed by 23514c72b780f3da097ecf33a793b7ba9c2070d2, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-6246 - -# Fixed by d0338312aace5bbfef85e03055e1212dd0e49578, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-6779 - -# Fixed by d37c2b20a4787463d192b32041c3406c2bd91de0, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-6780 - # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 From 7bfea9372f1842279a8f57b5fc4428bbae822e91 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 16 Jun 2024 14:43:22 +0200 Subject: [PATCH 1176/3013] package/glibc: security bump to 2.39-74 for post-2.39 security fixes Fixes the following security issues: GLIBC-SA-2024-0004: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) GLIBC-SA-2024-0005: nscd: Stack-based buffer overflow in netgroup cache (CVE-2024-33599) GLIBC-SA-2024-0006: nscd: Null pointer crash after notfound response (CVE-2024-33600) GLIBC-SA-2024-0007: nscd: netgroup cache may terminate daemon on memory allocation failure (CVE-2024-33601) GLIBC-SA-2024-0008: nscd: netgroup cache assumes NSS callback uses in-buffer strings (CVE-2024-33602) In addition, the following bugs are fixed: [19622] network: Support aliasing with struct sockaddr [30701] time: getutxent misbehaves on 32-bit x86 when _TIME_BITS=64 [30994] REP MOVSB performance suffers from page aliasing on Zen 4 [31339] libc: arm32 loader crash after cleanup in 2.36 [31325] mips: clone3 is wrong for o32 [31335] math: Compile glibc with -march=x86-64-v3 should disable FMA4 multi-arch version [31402] libc: clone (NULL, NULL, ...) clobbers %r7 register on s390{,x} [31479] libc: Missing #include in sched_getcpu.c may result in a loss of rseq acceleration [31316] build: Fails test misc/tst-dirname "Didn't expect signal from child: got `Illegal instruction'" on non SSE CPUs [31371] x86-64: APX and Tile registers aren't preserved in ld.so trampoline [31372] dynamic-link: _dl_tlsdesc_dynamic doesn't preserve all caller- saved registers [31429] build: Glibc failed to build with -march=x86-64-v3 [31501] dynamic-link: _dl_tlsdesc_dynamic_xsavec may clobber %rbx [31640] dynamic-link: POWER10 ld.so crashes in elf_machine_load_address with GCC 14 [31676] Configuring with CC="gcc -march=x86-64-v3" --with-rtld-early-cflags=-march=x86-64 results in linker failure [31677] nscd: nscd: netgroup cache: invalid memcpy under low memory/storage conditions [31678] nscd: nscd: Null pointer dereferences after failed netgroup cache insertion [31679] nscd: nscd: netgroup cache may terminate daemon on memory allocation failure [31680] nscd: nscd: netgroup cache assumes NSS callback uses in-buffer strings [31686] dynamic-link: Stack-based buffer overflow in parse_tunables_string [31719] dynamic-link: --enable-hardcoded-path-in-tests doesn't work with -Wl,--enable-new-dtags [31782] Test build failure with recent GCC trunk (x86/tst-cpu-features-supports.c:69:3: error: parameter to builtin not valid: avx5124fmaps) [31798] pidfd_getpid.c is miscompiled by GCC 6.4 [31867] build: "CPU ISA level is lower than required" on SSE2-free CPUs [31883] build: ISA level support configure check relies on bashism / is otherwise broken for arithmetic Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 14 +++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 94b7819a30c..aaf7848a7cf 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 2ba018b344e0e8330dcadd6130f4174f0fc2502b2e032210345e0e5a2f7ed12e glibc-2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e.tar.gz +sha256 2858e8e47c4c0df32b526c56d5590ec939e8178201ee9526bb070999ce4aa1f2 glibc-2.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 8bc4cd46664..db6fa55819f 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e +GLIBC_VERSION = 2.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -24,6 +24,18 @@ GLIBC_CPE_ID_VENDOR = gnu # allow proper matching with the CPE database. GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) +# Fixed by glibc-2.39-31-g31da30f23cddd36db29d5b6a1c7619361b271fb4 +GLIBC_IGNORE_CVES += CVE-2024-2961 + +# Fixed by glibc-2.39-35-g1263d583d2e28afb8be53f8d6922f0842036f35d +GLIBC_IGNORE_CVES += CVE-2024-33599 + +# Fixed by glibc-2.39-37-gc99f886de54446cd4447db6b44be93dabbdc2f8b +GLIBC_IGNORE_CVES += CVE-2024-33600 + +# Fixed by glibc-2.39-38-ga9a8d3eebb145779a18d90e3966009a1daa63cd +GLIBC_IGNORE_CVES += CVE-2024-33601 CVE-2024-33602 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index f304ba8021b..6940900f8da 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e +LOCALEDEF_VERSION = 2.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From 27bec292f2ef2fc87ff4fa720cb9428a664122a5 Mon Sep 17 00:00:00 2001 From: Alex Michel Date: Thu, 16 May 2024 06:48:51 +0000 Subject: [PATCH 1177/3013] package/libzenoh-c: bump to version 0.11.0.3 https://github.com/eclipse-zenoh/zenoh-c/releases/tag/0.11.0.3 Signed-off-by: Alex Michel [Arnout: set hash for -cargo2 tarball instead of upstream one] Signed-off-by: Arnout Vandecappelle --- package/libzenoh-c/libzenoh-c.hash | 2 +- package/libzenoh-c/libzenoh-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libzenoh-c/libzenoh-c.hash b/package/libzenoh-c/libzenoh-c.hash index 8331f5cca4b..559c9122ad5 100644 --- a/package/libzenoh-c/libzenoh-c.hash +++ b/package/libzenoh-c/libzenoh-c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c792f0be936ecbb3f759124be28950a01385f4680eaf4f1da55997640899648e libzenoh-c-0.11.0.2-cargo2.tar.gz +sha256 c86e468527e573d92b01bf454333dda4dc1217f14d5d5f94c24311961313c234 libzenoh-c-0.11.0.3-cargo2.tar.gz sha256 01a44774f7b1a453595c7c6d7f7308284ba6a1059dc49e14dad6647e1d44a338 LICENSE diff --git a/package/libzenoh-c/libzenoh-c.mk b/package/libzenoh-c/libzenoh-c.mk index 3a50fe6bf1c..07c153e328f 100644 --- a/package/libzenoh-c/libzenoh-c.mk +++ b/package/libzenoh-c/libzenoh-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZENOH_C_VERSION = 0.11.0.2 +LIBZENOH_C_VERSION = 0.11.0.3 LIBZENOH_C_SITE = $(call github,eclipse-zenoh,zenoh-c,$(LIBZENOH_C_VERSION)) LIBZENOH_C_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_C_LICENSE_FILES = LICENSE From dad0ebf4416c7918dca5291e3e1d887d5625078f Mon Sep 17 00:00:00 2001 From: Alex Michel Date: Thu, 16 May 2024 11:59:11 +0000 Subject: [PATCH 1178/3013] package/libzenoh-pico: bump version to 0.11.0.3 https://github.com/eclipse-zenoh/zenoh-pico/releases Signed-off-by: Alex Michel Signed-off-by: Arnout Vandecappelle --- package/libzenoh-pico/libzenoh-pico.hash | 2 +- package/libzenoh-pico/libzenoh-pico.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libzenoh-pico/libzenoh-pico.hash b/package/libzenoh-pico/libzenoh-pico.hash index 945d0f9aaf2..9ea45969aab 100644 --- a/package/libzenoh-pico/libzenoh-pico.hash +++ b/package/libzenoh-pico/libzenoh-pico.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c259da44aa919919d1129b6a46edb05e2f5f2bf2818f73c27f515e443da9fc83 libzenoh-pico-0.11.0.1.tar.gz +sha256 a5bc5cae6fd4ade3d69d8a2ed0aef89f4c8f752f79d74b7462f5bb3437680b72 libzenoh-pico-0.11.0.3.tar.gz sha256 d386df32cf327bbb25abe894277d3d7e0f447bafc59f4ad362615b0136f30db5 LICENSE diff --git a/package/libzenoh-pico/libzenoh-pico.mk b/package/libzenoh-pico/libzenoh-pico.mk index 86204de14f9..9163ba30ad2 100644 --- a/package/libzenoh-pico/libzenoh-pico.mk +++ b/package/libzenoh-pico/libzenoh-pico.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZENOH_PICO_VERSION = 0.11.0.1 +LIBZENOH_PICO_VERSION = 0.11.0.3 LIBZENOH_PICO_SITE = $(call github,eclipse-zenoh,zenoh-pico,$(LIBZENOH_PICO_VERSION)) LIBZENOH_PICO_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_PICO_LICENSE_FILES = LICENSE From a559a684284f52542a6c921a011710a4f85ba036 Mon Sep 17 00:00:00 2001 From: Jean-Michel Friedt Date: Thu, 16 May 2024 10:34:21 +0200 Subject: [PATCH 1179/3013] package/gnuradio: add optional IIO support to GNU Radio Indeed libiio dependency must be activated. This used to be an external package but is now included in gnuradio itself. Signed-off-by: Jean-Michel Friedt Signed-off-by: Arnout Vandecappelle --- package/gnuradio/Config.in | 7 +++++++ package/gnuradio/gnuradio.mk | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index be997e91e27..d9ad6506725 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -136,6 +136,13 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks +config BR2_PACKAGE_GNURADIO_IIO + bool "gr-iio support" + select BR2_PACKAGE_LIBIIO + select BR2_PACKAGE_GNURADIO_BLOCKS + help + IIO support + config BR2_PACKAGE_GNURADIO_NETWORK bool "gr-network support" select BR2_PACKAGE_GNURADIO_BLOCKS diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 4e82c9e1298..bdaab86f353 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -112,6 +112,13 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_IIO),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_IIO=ON +GNURADIO_DEPENDENCIES += libiio +else +GNURADIO_CONF_OPTS += -DENABLE_GR_IIO=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging From f3fb7426413e6e479f32288f9bb3c10a058d99c1 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 19 Jun 2024 21:56:24 +0200 Subject: [PATCH 1180/3013] package/qbee-agent: select BR2_PACKAGE_HOST_GO Every golang package must select the host-go package. This will allow the user to select the Go compiler variant (build from source or pre-built). The same pattern is used for Rust packages. This was done for all golang packages in commit 58a291470acf458239202bd81bfc642b9cadd298, but qbee-agent was missed. Signed-off-by: Arnout Vandecappelle --- package/qbee-agent/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qbee-agent/Config.in b/package/qbee-agent/Config.in index e75adf5805f..4fbe6d404d2 100644 --- a/package/qbee-agent/Config.in +++ b/package/qbee-agent/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_QBEE_AGENT depends on BR2_USE_MMU # bash depends on !BR2_STATIC_LIBS # shadow depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # shadow + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_SHADOW # runtime From b8ef8838f15eb881c1a300c7598af53ca9b64b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Henrik=20Bj=C3=B8rnstad?= Date: Wed, 12 Jun 2024 13:09:44 +0200 Subject: [PATCH 1181/3013] package/qbee-agent: bump version to 2024.23 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jon Henrik Bjørnstad Signed-off-by: Arnout Vandecappelle --- package/qbee-agent/qbee-agent.hash | 2 +- package/qbee-agent/qbee-agent.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qbee-agent/qbee-agent.hash b/package/qbee-agent/qbee-agent.hash index 8e9e7230ea5..9be642ef6fc 100644 --- a/package/qbee-agent/qbee-agent.hash +++ b/package/qbee-agent/qbee-agent.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d329d6d1c885ec4d410ab8c5f93320ab603cef860311a6b392edd5b903039a81 qbee-agent-2024.09-go2.tar.gz +sha256 1f77442186f29fa7a0bdf1382334cb05f48af3f1b606e62b316f0a99618b5a9f qbee-agent-2024.23-go2.tar.gz sha256 02d07d96be99eb042b01ba650079a440ce26a78c5e0e1e8060c33a8c9e200404 LICENSE diff --git a/package/qbee-agent/qbee-agent.mk b/package/qbee-agent/qbee-agent.mk index 30219eebdc7..aba9edb824e 100644 --- a/package/qbee-agent/qbee-agent.mk +++ b/package/qbee-agent/qbee-agent.mk @@ -5,12 +5,12 @@ ################################################################################ # keep QBEE_AGENT_COMMIT_ID in sync when updating -QBEE_AGENT_VERSION = 2024.09 +QBEE_AGENT_VERSION = 2024.23 QBEE_AGENT_SITE = $(call github,qbee-io,qbee-agent,$(QBEE_AGENT_VERSION)) QBEE_AGENT_LICENSE = Apache-2.0 QBEE_AGENT_LICENSE_FILES = LICENSE -QBEE_AGENT_COMMIT_ID = c30d43b8e64cfef960cee9475b58ae083e4ad246 +QBEE_AGENT_COMMIT_ID = 3219c17730eab4c80598494732b4bed4c4c18b51 QBEE_AGENT_GOMOD = go.qbee.io/agent From fe138e89c57f43644848fee68d08be6e2e0deb5e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 4 Jun 2024 13:24:52 +0200 Subject: [PATCH 1182/3013] package/libcap: bump to version 2.70 Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 0f1501d31bc..dd9bc75a021 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb libcap-2.69.tar.xz +sha256 23a6ef8aadaf1e3e875f633bb2d116cfef8952dba7bc7c569b13458e1952b30f libcap-2.70.tar.xz # Hash for license file: sha256 68467e731f4744bd6e0bb69e8df9c3a994e09cd6b203d0c41327ac6d079c581d License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index fe2f24ad8c5..a1b2636c5db 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.69 +LIBCAP_VERSION = 2.70 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause From f7f2903f3ed88ef5c2f10171c93e90bd9ad5d83e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 4 Jun 2024 13:25:02 +0200 Subject: [PATCH 1183/3013] package/zstd: bump to version 1.5.6 Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/zstd/zstd.hash | 4 ++-- package/zstd/zstd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index abfb1d62e20..8be85c356a6 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz.sha256 -sha256 9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 zstd-1.5.5.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz.sha256 +sha256 8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1 zstd-1.5.6.tar.gz # License files (locally computed) sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index e25202fd63c..a2da0dd4795 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.5 +ZSTD_VERSION = 1.5.6 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From c6b6587629e4fb902b990bab1fe7acbf7424c248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Tue, 4 Jun 2024 14:57:01 +0200 Subject: [PATCH 1184/3013] package/imx-mkimage: bump version to lf-6.6.3-1.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Arnout Vandecappelle --- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 034b3d02ed3..3161d66ad2e 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fd538dc571ce06609d6a4d9ee8cfd7d0c93ec4685afa9f1079e5a5931ad3bdbc imx-mkimage-lf-6.1.36_2.1.0.tar.gz +sha256 48e7bad4a49e693415418859bb0330b63938a77bbb12660bc64761a5daa915c9 imx-mkimage-lf-6.6.3_1.0.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c LICENSE diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 6e70a946bf6..a82854eb6e2 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = lf-6.1.36_2.1.0 +IMX_MKIMAGE_VERSION = lf-6.6.3_1.0.0 IMX_MKIMAGE_SITE = $(call github,nxp-imx,imx-mkimage,$(IMX_MKIMAGE_VERSION)) IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = LICENSE From 62ee2060bbcfdb5b36a0ab41dc212e76b2a08815 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 4 Jun 2024 19:09:11 +0200 Subject: [PATCH 1185/3013] package/pinentry: bump to version 1.3.0 For change log, see [1] License file hash changed, after updating the FSF address in [2]. The sha256 hash is moved out the "Locally computed" section in the hash file, since it is now published on [3]. pinentry 1.3.0 updated its gpg-error.m4 macro file in [4] to detect gpgrt-config. Its path needs to be forced in _CONF_ENV to make sure it will work in all host environments. See the log entry of commit d7f2d8403e "package/gnupg2: fix build failure when host provides an old gpgrt-config" [5] for a complete explanation. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=blob;f=NEWS;h=1ea7e76f836fe15fe7c59b954d7aab768bd090e6 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commitdiff;h=66abf7cb1e1bde1ec71e13690dc6d6944c89cae9 [3] https://www.gnupg.org/download/integrity_check.html [4] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commitdiff;h=21e85333f9669ef369376e83eb80ccd7a8933842 [5] https://gitlab.com/buildroot.org/buildroot/-/commit/d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/pinentry/pinentry.hash | 6 +++--- package/pinentry/pinentry.mk | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/pinentry/pinentry.hash b/package/pinentry/pinentry.hash index 187c86f9bd7..9c54520da6c 100644 --- a/package/pinentry/pinentry.hash +++ b/package/pinentry/pinentry.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 29daaf45f15cb5b8ec9b4a06284343f7a87082fb pinentry-1.2.1.tar.bz2 +sha1 28effa1722865786cb984f3099a32db40f96ea26 pinentry-1.3.0.tar.bz2 +sha256 9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de pinentry-1.3.0.tar.bz2 # Locally computed -sha256 457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067 pinentry-1.2.1.tar.bz2 -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk index 338d61af2d7..b49037c91be 100644 --- a/package/pinentry/pinentry.mk +++ b/package/pinentry/pinentry.mk @@ -4,7 +4,7 @@ # ################################################################################ -PINENTRY_VERSION = 1.2.1 +PINENTRY_VERSION = 1.3.0 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry PINENTRY_LICENSE = GPL-2.0+ @@ -18,6 +18,10 @@ PINENTRY_CONF_OPTS += \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ --without-libcap # requires PAM +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +PINENTRY_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PINENTRY_CONF_ENV += LIBS=-latomic endif From ecb7a9fd660cff6e9bbae42c7eea179c7c207497 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 5 Jun 2024 08:31:58 +0200 Subject: [PATCH 1186/3013] package/uuu: bump to version 1.5.182 This is a hot fix for version 1.5.181. Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.182 Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 787bf7d4870..9dc286c41ff 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,3 +1,3 @@ # locally computed -sha256 5e3bab017cf1b7a6a85d0cd46c0de6660de9b93fb24b0a21d8ecc4fb9f663e2c uuu_source-uuu_1.5.181.tar.gz +sha256 723d3da358e6af974a056e3adbcb105fac9dad4b87544de0d22b8c974a8037aa uuu_source-uuu_1.5.182.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 056b2a8c52d..63556b9938a 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.181 +UUU_VERSION = 1.5.182 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From 4e39f5571304ba92fdfc8286fea6c50824b04e56 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Jun 2024 10:15:41 +0200 Subject: [PATCH 1187/3013] package/iproute2: bump to version 6.9.0 Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index d57a93de7d1..a716bf75a18 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce iproute2-6.8.0.tar.xz +sha256 2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0 iproute2-6.9.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 3db2ab925d0..525101aff11 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.8.0 +IPROUTE2_VERSION = 6.9.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 49bd6bb638ff73eae3b486b207201382d46a6c05 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Jun 2024 10:15:51 +0200 Subject: [PATCH 1188/3013] package/ntp: bump to version 4.2.8p18 diff COPYRIGHT: -* Copyright (c) Network Time Foundation 2011-2023 * +* Copyright (c) Network Time Foundation 2011-2024 * Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/ntp/ntp.hash | 6 +++--- package/ntp/ntp.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index 96e21bf2df7..44f3486d7ab 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,4 +1,4 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.8p17.tar.gz.sha256 -sha256 103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866 ntp-4.2.8p17.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.8p18.tar.gz.sha256 +sha256 cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5 ntp-4.2.8p18.tar.gz # Locally computed -sha256 06246b8c15ccc1a1873c78525c810f0802e68f383e79ee041e06d1ab9cbf80a4 COPYRIGHT +sha256 45b6e5a0a5f0ac4afdd9e23caa2241779e4da463e4dba32a41b4dbd61577b2a3 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index e64f6308ece..1a7c7e79376 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -6,7 +6,7 @@ NTP_VERSION_MAJOR = 4.2 NTP_VERSION_MINOR = 8 -NTP_VERSION_POINT = 17 +NTP_VERSION_POINT = 18 NTP_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR)p$(NTP_VERSION_POINT) NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent From c986928affc59f5bbefae8c7af963eaf45fdc8c8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 9 Jun 2024 19:21:48 +0200 Subject: [PATCH 1189/3013] support/testing: add ntp runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 + support/testing/tests/package/test_ntp.py | 86 +++++++++++++++++++ .../test_ntp/rootfs-overlay/etc/ntp.conf | 10 +++ 3 files changed, 98 insertions(+) create mode 100644 support/testing/tests/package/test_ntp.py create mode 100644 support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf diff --git a/DEVELOPERS b/DEVELOPERS index 8bfd36f1d89..8a5cceba78e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1869,6 +1869,8 @@ F: support/testing/tests/package/test_netsnmp/ F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_ntp.py +F: support/testing/tests/package/test_ntp/ F: support/testing/tests/package/test_numactl.py F: support/testing/tests/package/test_numactl/ F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_ntp.py b/support/testing/tests/package/test_ntp.py new file mode 100644 index 00000000000..13fff6419be --- /dev/null +++ b/support/testing/tests/package/test_ntp.py @@ -0,0 +1,86 @@ +import os +import re +import time + +import infra.basetest + + +class TestNtp(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_ntp/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_NTP=y + BR2_PACKAGE_NTP_NTPD=y + BR2_PACKAGE_NTP_NTPQ=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def dict_from_ntpq_output(self, output): + d = {} + for line in output: + if ':' not in line: + continue + fields = re.split(r":", line, maxsplit=2) + name = fields[0].strip() + value = fields[1].strip() + d[name] = value + return d + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check our binaries can execute. + self.assertRunOk("ntpd --version") + self.assertRunOk("ntpq --version") + + # The ntp daemon is expected to be started from init startup + # scripts, for the Buildroot package recipe. We wait a bit + # here to let the daemon settle. The next test step checks for + # the local peer to be the system peer (by checking the + # '*'). If querying the peers too soon after startup the peer + # will not be marked as such. + time.sleep(3 * self.timeout_multiplier) + + # We query the ntp daemon peers. From our test configuration + # file, we should have exactly one. + out, ret = self.emulator.run("ntpq --peers") + self.assertEqual(ret, 0) + # ntpq --peers produces two lines of headers. So we check we + # have at least 3 lines of output. + self.assertGreaterEqual(len(out), 3) + # We check we see our undisciplined local clock and it's the + # system peer. + self.assertTrue(out[2].startswith("*LOCAL(0)")) + + # We query the refid variable. We expect to see our + # undisciplined local clock. + out, ret = self.emulator.run("ntpq -c 'readvar 0 refid'") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "refid=LOCAL(0)") + + # We query the ntp system info. We check the reference ID is + # the same as in the test configuration file. + out, ret = self.emulator.run("ntpq -c sysinfo") + self.assertEqual(ret, 0) + sysinfo = self.dict_from_ntpq_output(out) + refid = "reference ID" + self.assertIn(refid, sysinfo) + self.assertEqual(sysinfo[refid], "127.127.1.0") + + # Finally, we query the ntp system statistics. We check we can + # see some uptime. We waited a bit at the beginning of this + # test, plus the few queries we previously did should have + # accumulated some uptime. + out, ret = self.emulator.run("ntpq -c sysstats") + self.assertEqual(ret, 0) + sysstats = self.dict_from_ntpq_output(out) + up = "uptime" + self.assertIn(up, sysstats) + self.assertGreater(int(sysstats[up]), 0) diff --git a/support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf b/support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf new file mode 100644 index 00000000000..2ead3deb6ab --- /dev/null +++ b/support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf @@ -0,0 +1,10 @@ +# Set an undisciplined local clock for testing without the need of +# network connectivity. +server 127.127.1.0 iburst prefer +fudge 127.127.1.0 stratum 10 + +# Keep standard access control setup. The test is doing local queries +# from 127.0.0.1. +restrict default nomodify nopeer noquery limited kod +restrict 127.0.0.1 +restrict [::1] From 238975031101247078f99724e6dc5d85317fc484 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 5 Jun 2024 14:18:09 +0200 Subject: [PATCH 1190/3013] package/esp-hosted: bump version to 2024-06-05 Drop both local patches that have been committed upstream. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- ..._ng-fix-build-failure-on-Linux-6.9.0.patch | 37 ------------------- ...x-Bluetooth-build-failure-on-Linux-6.patch | 37 ------------------- package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 2 +- 4 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch delete mode 100644 package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch diff --git a/package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch b/package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch deleted file mode 100644 index 21e8730d37f..00000000000 --- a/package/esp-hosted/0001-esp_hosted_ng-fix-build-failure-on-Linux-6.9.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1cd8671eb64a1278466e7a9c90ceca1be0f8c0d5 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 1 Apr 2024 17:15:19 +0200 -Subject: [PATCH] esp_hosted_ng: fix build failure on Linux 6.9.0 - -With Linux commit: -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=620d269f29a569ba37419cc03cf1da2d55f6252a -spi_master compatibility has gone, so let's redefine missing needed -macros spi_master and spi_master_put() locally if Linux version is >= -6.9.0. - -Upstream: https://github.com/espressif/esp-hosted/pull/358 - -Signed-off-by: Giulio Benetti ---- - esp_hosted_ng/host/spi/esp_spi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/esp_hosted_ng/host/spi/esp_spi.c b/esp_hosted_ng/host/spi/esp_spi.c -index d0bd513bd6..9817056b2d 100644 ---- a/esp_hosted_ng/host/spi/esp_spi.c -+++ b/esp_hosted_ng/host/spi/esp_spi.c -@@ -378,6 +378,11 @@ static int __spi_controller_match(struct device *dev, const void *data) - return ctlr->bus_num == *bus_num; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)) -+#define spi_master spi_controller -+#define spi_master_put(_ctlr) spi_controller_put(_ctlr) -+#endif -+ - static struct spi_controller *spi_busnum_to_master(u16 bus_num) - { - struct platform_device *pdev = NULL; --- -2.34.1 - diff --git a/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch b/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch deleted file mode 100644 index c701aaa82fb..00000000000 --- a/package/esp-hosted/0002-esp_hosted_ng-Fix-Bluetooth-build-failure-on-Linux-6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f8903bc2be7ae5ac9fb9bbeed8512e974c6e60ec Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 3 Jun 2024 21:53:38 +0200 -Subject: [PATCH] esp_hosted_ng: Fix Bluetooth build failure on Linux 6.8.11+ - -After Linux commit: -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=84a4bb6548a29326564f0e659fb8064503ecc1c7 -BT_HS has been removed and consequently AMP controllers can't be created, -so at this point only HCI_PRIMARY has been left as unique controller type -to be created and this became implicit with no need to define if the -controller if HCI_PRIMARY or HCI_AMP. So let's assign HCI_PRIMARY up to -Linux 6.8.11 only preventing build failure. - -Upstream: https://github.com/espressif/esp-hosted/pull/400 - -Signed-off-by: Giulio Benetti ---- - esp_hosted_ng/host/esp_bt.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/esp_hosted_ng/host/esp_bt.c b/esp_hosted_ng/host/esp_bt.c -index 3b78c11698..4598ac0e0a 100644 ---- a/esp_hosted_ng/host/esp_bt.c -+++ b/esp_hosted_ng/host/esp_bt.c -@@ -240,7 +240,9 @@ int esp_init_bt(struct esp_adapter *adapter) - hdev->set_bdaddr = esp_bt_set_bdaddr; - #endif - -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(6, 8, 11)) - hdev->dev_type = HCI_PRIMARY; -+#endif - - SET_HCIDEV_DEV(hdev, adapter->dev); - --- -2.34.1 - diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index d449f5030ee..3afee5aef4d 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8f25c01522fdcb2003ffbfcc0ccf4981f27bddc8080ba978e33590d56f5ae20b esp-hosted-669fd9cd1892bb8b364701968d5f06225346eea9.tar.gz +sha256 2c87d68c2b74dd000b128696abc0cdc76d22abfefb6581ff61b7d7bcdaab51f5 esp-hosted-b1422afc4fe0a2ea1ffd6b5459edddc4d968ee71.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 520ad5dc8c7..70ca7bf572f 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = 669fd9cd1892bb8b364701968d5f06225346eea9 +ESP_HOSTED_VERSION = b1422afc4fe0a2ea1ffd6b5459edddc4d968ee71 ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 From eee73d0cc0a9fe9373ad72851276a528e5e829da Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 6 Jun 2024 20:21:24 +0200 Subject: [PATCH 1191/3013] package/ntp: remove the obsolete patch 0001-nano.patch: both MOD_NANO and MOD_TAI were added to glibc 2.12 on 2011-03-30 in commit 83fe108b0a9bc4f2deb14695bb0c8b2011e79f28. They were added to musl 0.7.5 in commit f5ba2bc9c on 2011-03-18. And they were added to uClibc 1.0.23 in commit 2d8ea0524b on 2017-03-17. We consider all of these old enough to assume they always exist. Renumber the remaining patches. Signed-off-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 3 +- package/ntp/0001-nano.patch | 28 ------------------- ...patch => 0001-ntp-syscalls-fallback.patch} | 0 ...ch => 0002-fix-pthread-detach-check.patch} | 0 4 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 package/ntp/0001-nano.patch rename package/ntp/{0002-ntp-syscalls-fallback.patch => 0001-ntp-syscalls-fallback.patch} (100%) rename package/ntp/{0003-fix-pthread-detach-check.patch => 0002-fix-pthread-detach-check.patch} (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 34cdc406755..3f184fded52 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1108,8 +1108,7 @@ package/norm/0001-protolib-drop-linux-version-check.patch lib_patch.Upstream package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch lib_patch.Upstream package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch lib_patch.Upstream package/nss-pam-ldapd/S45nslcd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables -package/ntp/0001-nano.patch lib_patch.Upstream -package/ntp/0002-ntp-syscalls-fallback.patch lib_patch.Upstream +package/ntp/0001-ntp-syscalls-fallback.patch lib_patch.Upstream package/ntp/S49ntp.in lib_sysv.Variables package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch lib_patch.Upstream package/numactl/0001-link-with-latomic-if-needed-again.patch lib_patch.Upstream diff --git a/package/ntp/0001-nano.patch b/package/ntp/0001-nano.patch deleted file mode 100644 index bce34782619..00000000000 --- a/package/ntp/0001-nano.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fixes issues with glibc header files, see -http://bugs.gentoo.org/show_bug.cgi?id=270483 - -Signed-off-by: Gustavo Zacarias - -Rebase to apply cleanly. - -Signed-off-by: Danomi Manchego - - -diff -purN a/include/ntp_syscall.h b/include/ntp_syscall.h ---- a/include/ntp_syscall.h 2015-02-11 08:42:37.794576469 -0500 -+++ b/include/ntp_syscall.h 2015-02-11 08:43:03.216957279 -0500 -@@ -10,6 +10,14 @@ - # include - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - # ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/package/ntp/0002-ntp-syscalls-fallback.patch b/package/ntp/0001-ntp-syscalls-fallback.patch similarity index 100% rename from package/ntp/0002-ntp-syscalls-fallback.patch rename to package/ntp/0001-ntp-syscalls-fallback.patch diff --git a/package/ntp/0003-fix-pthread-detach-check.patch b/package/ntp/0002-fix-pthread-detach-check.patch similarity index 100% rename from package/ntp/0003-fix-pthread-detach-check.patch rename to package/ntp/0002-fix-pthread-detach-check.patch From ecf060a2ff93626fb5fbe1c52b8d42b6ee0fbb5b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Jun 2024 21:52:08 +0200 Subject: [PATCH 1192/3013] package/php: security bump version to 8.3.8 Fixes CVE-2024-4577, CVE-2024-5458, CVE-2024-5585 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/429 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 9b25eabd32b..cd5f8a1c1bd 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 d53433c1ca6b2c8741afa7c524272e6806c1e895e5912a058494fea89988570a php-8.3.7.tar.xz +sha256 aea358b56186f943c2bbd350c9005b9359133d47e954cfc561385319ae5bb8d7 php-8.3.8.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index ad2d901dfd7..268b8e0a62e 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.7 +PHP_VERSION = 8.3.8 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 7338e103890c669c48797b0c96d1a5a66ce2d811 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Jun 2024 22:12:16 +0200 Subject: [PATCH 1193/3013] package/go-bootstrap-stage3: move missing patch The patch was added in commit 25991c843c3f (package/go-bootstrap-stage3: fix go-bootstrap when parent dir contains invalid .git). Then all the go-compiler packages were moved to a common sub-directory, in commit 0290c543dec8 (package/go: new subdirectory for go variants). However, the patch for commit 0290c543dec8 was sent to the mailing list before 25991c843c3f was applied, so it could not have moved a file that was only added later. Move that file, now. Signed-off-by: Yann E. MORIN Cc: Thomas Perale Cc: Romain Naour --- ...001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/{ => go}/go-bootstrap-stage3/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%) diff --git a/package/go-bootstrap-stage3/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go-bootstrap-stage3/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch similarity index 100% rename from package/go-bootstrap-stage3/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch rename to package/go/go-bootstrap-stage3/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch From 99a5d51c6e9fbc24b86e1c144253cdfe5eb770c8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 20 Jun 2024 17:57:22 +0200 Subject: [PATCH 1194/3013] package/go: ensure there is a host-go provider Commit fa2536ec9401 (package/go: make host package a virtual package) introduced host-go as a host-only virtual package, which had a single provider, the choice of which is only exposed when a (target or host) package has selected BR2_PACKAGE_HOST_GO to indicate it needs host-go. However, this forgot to account for prompt-less, host-only packages, which have no way of selecting that symbol. Having prompt-less, host-only packages is a totally unexceptional, supported case; for example a host package can be depended upon by another (target or host) package, or by a filesystem, and we do not require Kconfig symbols to be exposed for those packages. As a consequence, when not package is enabled, that can select that symbol, we can't run 'make source' or 'make host-foo-source': make[1]: *** No rule to make target 'host-', needed by '[...]/build/host-go-1.22.4/.stamp_configured'. Stop. Fix that by moving the provider symbol out of the if-block, so that there is always a provider defined. Now, we only have host-go-src as a provider, but the symbol is still part of the choice that is conditional (and that _has_ to be conditional), so the BR2_PACKAGE_HOST_GO_SRC can never be set unless there is a package that explicitly select BR2_PACKAGE_HOST_GO. So, drop the conditional on the default, so that there is always a provider available. This mirrors other similar situations, like the rust case. Fixes: fa2536ec940105acc71630144bd1187c931462ac Signed-off-by: Yann E. MORIN LGTM: Arnout Vandecappelle (Essensium/Mind) (on IRC) --- package/go/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 483393f8e4a..92c1f4cdc3a 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -54,12 +54,12 @@ config BR2_PACKAGE_HOST_GO_SRC endchoice +endif + config BR2_PACKAGE_PROVIDES_HOST_GO string - # Default to host-go-src - default "host-go-src" if BR2_PACKAGE_HOST_GO_SRC - -endif + # Default to host-go-src, as the only provider for now + default "host-go-src" source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" From 85e41f5f21378a10adc3468c758555009e5ccda2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 09:08:49 +0200 Subject: [PATCH 1195/3013] board/xilinx: re-add hash file for xilinx-prebuilt When xilinx pre-built was added in a6648ad8da (boot/xilinx-prebuilt: new boot package), the hash file was initially a board-specific hash file. However, that hash file, in commit a6648ad8da, really belonged to the xilinx-prebuilt package, for two reasons: the package needs a hash file for the version it installs, and no defconfig was using it at that time. So the hash file was moved out of the boar directory, and into the package directory when the patch was applied. When the xilinx-related boards were changed to use xilinx-prebuilt, in 551ba16a0f (configs/zynqmp_*: migrate to xilinx-prebuilt) and 8271323649 (configs/versal_vck190_defconfig: migrate to xilinx-prebuilt), they were correctly made to use a custom, non-default version. But then, it meant that those defconfig would no longer have a hash when we would bump the default version in xilinx-prebuilt. Re-add the initial board-specific hash file now that it is required. Fixes: 551ba16a0f09fe550acb3ef6d12a1b2587d03292 Fixes: 8271323649c42420adaf4513b0472a7203f7784d Signed-off-by: Yann E. MORIN Cc: Neal Frager Reviewed-by: Neal Frager --- board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash diff --git a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash new file mode 100644 index 00000000000..c955cd79f54 --- /dev/null +++ b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f xilinx-prebuilt-xilinx_v2024.1.tar.gz From df899041fb83cb114aaee150732a4dc130039076 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 13 Jun 2024 19:51:04 +0200 Subject: [PATCH 1196/3013] utils/update-rust: add script to automatically update the rust version When we update the rust version, we need to update a large list of hashes for rust-bin, and update the hash for rust (source). This is very tedious and very error-prone. Add a helper script that generates the hash files automatically, and also iupdate the _VERSION in the .mk. We decided not to carry the hint about the verification of the tarballs against the upstream GPG signature for three reasons: - it requires that all the tarballs be downloaded, which can take quite some time; - the hash files are available for all the needed archives; - the hash files are downloaded over https, so if someone managed to get a hold of the rust server to provide backdoored archives, they can also change the hash files; - properly verifying the archives would require a chain of trust between the person running the upsate script, and the rust GPG key, which is not a given, and verifying sigantures using an unverified key is not providing much security, if at all. Regenerate the hash files with that script. Note (for the future, maybe): there are manifest files for each release, https:/static.rust-lang.org/dist/channel-rust-VERSION.toml, that we could use to generate the RUST_HOSTS and RUST_TARGETS list. However, adding new hosts or new targets implies updating the corresponding _ARCH_SUPPORTS and accompanying symbols, so better leave that to a manual operation, at least for now. Notes: Many thanks to James for providing an initial script with the same purpose. Given the feedback from previous reviews, it was simpler to rewrite it from scratch; it should now be much, much simpler. Signed-off-by: Yann E. MORIN Cc: James Hilliard Tested-by: James Hilliard --- package/rust-bin/rust-bin.hash | 41 +-------- package/rust/rust.hash | 4 +- package/rustc/Config.in.host | 4 + utils/update-rust | 151 +++++++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+), 38 deletions(-) create mode 100755 utils/update-rust diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d44cb2cb678..9b82b4ca011 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,111 +1,78 @@ +# Generated with utils/update-rust +# Do not edit manually + # From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc sha256 88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626 rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc sha256 f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca rust-1.74.1-i686-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc sha256 d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79 rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc sha256 17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc sha256 054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23 rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc sha256 4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc sha256 3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f rust-1.74.1-s390x-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc sha256 5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc sha256 a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc sha256 d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959 rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc sha256 38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425 rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc sha256 5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.asc sha256 9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3 rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.asc sha256 26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5 rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.asc sha256 c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27 rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.asc sha256 96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2 rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.asc sha256 339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9 rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc sha256 915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.asc sha256 e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0 rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.asc sha256 7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.asc sha256 7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.asc sha256 b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b rust-std-1.74.1-i586-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.asc sha256 de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90 rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.asc sha256 1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b rust-std-1.74.1-i686-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.asc sha256 c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f rust-std-1.74.1-mips-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.asc sha256 d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.asc sha256 7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0 rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.asc sha256 733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26 rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc sha256 7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58 rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc sha256 931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320 rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc sha256 40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5 rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc sha256 2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc sha256 781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296 rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.asc sha256 e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1 rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc sha256 df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc sha256 98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz -# Locally generated +# Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 175fa71bafb..34349eef8b4 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,5 +1,7 @@ +# Generated with utils/update-rust +# Do not edit manually + # From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc sha256 b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e rustc-1.74.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index baa68994e62..d15443e53f0 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -1,4 +1,5 @@ # All host rust packages should depend on this option +# When adding new entries below, update RUST_HOSTS in utils/update-rust config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS bool default y if BR2_HOSTARCH = "aarch64" @@ -18,6 +19,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # The below entries match Tier 1 platforms as described at # https://doc.rust-lang.org/nightly/rustc/platform-support.html. +# When adding new entries below, update RUST_TARGETS in utils/update-rust config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS bool # aarch64-unknown-linux-gnu @@ -30,6 +32,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS # The below entries match Tier 2 platforms with host tools as # described at # https://doc.rust-lang.org/nightly/rustc/platform-support.html. +# When adding new entries below, update RUST_TARGETS in utils/update-rust config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS bool # aarch64-unknown-linux-musl @@ -63,6 +66,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS # The below entries match Tier 2 platforms without host tools as # described at # https://doc.rust-lang.org/nightly/rustc/platform-support.html. +# When adding new entries below, update RUST_TARGETS in utils/update-rust config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS bool # arm-unknown-linux-musleabi diff --git a/utils/update-rust b/utils/update-rust new file mode 100755 index 00000000000..4d74e9e5e0d --- /dev/null +++ b/utils/update-rust @@ -0,0 +1,151 @@ +#!/usr/bin/env python3 + +import argparse +import pathlib +import requests +import sys + +# When updating this list, also update: +# - package/rustc/Config.in.host: +# BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS +# - package/rustc/rustc.mk: +# RUSTC_HOST_NAME +RUST_HOSTS = [ + "aarch64-unknown-linux-gnu", + "i686-unknown-linux-gnu", + "powerpc-unknown-linux-gnu", + "powerpc64-unknown-linux-gnu", + "powerpc64le-unknown-linux-gnu", + "riscv64gc-unknown-linux-gnu", + "s390x-unknown-linux-gnu", + "x86_64-unknown-linux-gnu", +] + +# When updating this list, also update one of: +# - package/rustc/Config.in.host: +# BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS +# BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS +# BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS +# - package/rustc/rustc.mk: +# RUSTC_TARGET_NAME +# and check whether one of the follwoing needs updating: +# - package/rustc/Config.in.host: +# BR2_PACKAGE_HOST_RUSTC_ARCH +# BR2_PACKAGE_HOST_RUSTC_ABI +RUST_TARGETS = [ + "aarch64-unknown-linux-gnu", + "aarch64-unknown-linux-musl", + "arm-unknown-linux-gnueabi", + "arm-unknown-linux-gnueabihf", + "arm-unknown-linux-musleabi", + "arm-unknown-linux-musleabihf", + "armv5te-unknown-linux-gnueabi", + "armv5te-unknown-linux-musleabi", + "armv7-unknown-linux-gnueabi", + "armv7-unknown-linux-gnueabihf", + "armv7-unknown-linux-musleabi", + "armv7-unknown-linux-musleabihf", + "i586-unknown-linux-gnu", + "i586-unknown-linux-musl", + "i686-unknown-linux-gnu", + "i686-unknown-linux-musl", + "mips-unknown-linux-musl", + "mips64-unknown-linux-muslabi64", + "mips64el-unknown-linux-muslabi64", + "mipsel-unknown-linux-musl", + "powerpc-unknown-linux-gnu", + "powerpc64-unknown-linux-gnu", + "powerpc64le-unknown-linux-gnu", + "riscv64gc-unknown-linux-gnu", + "s390x-unknown-linux-gnu", + "sparc64-unknown-linux-gnu", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-linux-musl", +] + +RUST_DIST_URL = "https://static.rust-lang.org/dist" + +LICENSES = { + "APACHE": "62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a", + "MIT": "23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3", +} + + +def update_mk_file(mk_file, new_version): + with open(mk_file, "r") as fd: + lines = fd.readlines() + + version_var = pathlib.Path(mk_file).stem.upper().replace("-", "_") + "_VERSION" + with open(mk_file, "w") as fd: + for line in lines: + words = line.split() + if len(words) == 3 and words[0] == version_var and words[1] == "=": + fd.write(f"{words[0]} = {new_version}\n") + else: + fd.write(line) + + +def gen_hash_file_src(hash_file, new_version): + with open(hash_file, "w") as fd: + fd.write(f"# Generated with {sys.argv[0]}\n# Do not edit manually\n\n") + f_name = f"rustc-{new_version}-src.tar.xz" + print(f"\r\033[KUpdating {f_name}", end="") + h_url = f"{RUST_DIST_URL}/{f_name}.sha256" + r = requests.get(h_url) + if r.status_code != 200: + raise RuntimeError(f"No hash for {f_name}. Has source been removed?") + # rstrip() content, and explicitly add the \n, in case + # a hash file does not have a trailing \n. + fd.write(f"# From {h_url}\nsha256 {r.content.decode().rstrip()}\n") + fd.write("# Locally generated\n") + for license in LICENSES: + fd.write(f"sha256 {LICENSES[license]} LICENSE-{license}\n") + + +def gen_hash_file_bin(hash_file, new_version): + with open(hash_file, "w") as fd: + fd.write(f"# Generated with {sys.argv[0]}\n# Do not edit manually\n\n") + for host in RUST_HOSTS: + f_name = f"rust-{new_version}-{host}.tar.xz" + print(f"\r\033[KUpdating {f_name}", end="") + h_url = f"{RUST_DIST_URL}/{f_name}.sha256" + r = requests.get(h_url) + if r.status_code != 200: + raise RuntimeError(f"No hash for {f_name}. Has host {host} been removed?") + # rstrip() content, and explicitly add the \n, in case + # a hash file does not have a trailing \n. + fd.write(f"# From {h_url}\nsha256 {r.content.decode().rstrip()}\n") + for target in RUST_TARGETS: + f_name = f"rust-std-{new_version}-{target}.tar.xz" + print(f"\r\033[KUpdating {f_name}", end="") + h_url = f"{RUST_DIST_URL}/{f_name}.sha256" + r = requests.get(h_url) + if r.status_code != 200: + raise RuntimeError(f"No hash for {f_name}. Has target {target} been removed?") + # rstrip() content, and explicitly add the \n, in case + # a hash file does not have a trailing \n. + fd.write(f"# From {h_url}\nsha256 {r.content.decode().rstrip()}\n") + fd.write("# Locally generated\n") + for license in LICENSES: + fd.write(f"sha256 {LICENSES[license]} LICENSE-{license}\n") + + +def main(): + parser = argparse.ArgumentParser(description="Update rust") + parser.add_argument("version", help="Rust version to update to", type=str) + + args = parser.parse_args() + + try: + update_mk_file("package/rust/rust.mk", args.version) + update_mk_file("package/rust-bin/rust-bin.mk", args.version) + gen_hash_file_src("package/rust/rust.hash", args.version) + gen_hash_file_bin("package/rust-bin/rust-bin.hash", args.version) + except FileNotFoundError as e: + print(f"{e.filename}: {e.strerror} ({sys.argv[0]} must be run at the root of the Buildroot tree)") + + print("\r\033[K", end="") + + +if __name__ == "__main__": + main() From 2ab21855bb067470763fe42fbb485b0f83029e76 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 13 Jun 2024 20:35:23 +0200 Subject: [PATCH 1197/3013] package/rust: update to 1.79.0 In rust 1.75.0, the follwong targets were dropped [0]: mips-unknown-linux-musl mips64-unknown-linux-muslabi64 mips64el-unknown-linux-muslabi64 mipsel-unknown-linux-musl [0] https://github.com/rust-lang/rust/commit/03870154f4badc1939f718ac74c49438ce507241 Signed-off-by: Yann E. MORIN --- package/rust-bin/rust-bin.hash | 136 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 4 +- package/rust/rust.mk | 2 +- package/rustc/Config.in.host | 8 -- utils/update-rust | 4 - 6 files changed, 68 insertions(+), 88 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 9b82b4ca011..853a5305ec1 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,78 +1,70 @@ # Generated with utils/update-rust # Do not edit manually -# From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626 rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca rust-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79 rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23 rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -sha256 4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -sha256 3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f rust-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256 -sha256 d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959 rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -sha256 38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425 rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256 -sha256 9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3 rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -sha256 26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5 rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -sha256 c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27 rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -sha256 96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2 rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -sha256 339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9 rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -sha256 e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0 rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -sha256 7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256 -sha256 7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256 -sha256 b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b rust-std-1.74.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90 rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256 -sha256 1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b rust-std-1.74.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256 -sha256 c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f rust-std-1.74.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -sha256 d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -sha256 7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0 rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256 -sha256 733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26 rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58 rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320 rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5 rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -sha256 2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -sha256 781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296 rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -sha256 e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1 rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256 -sha256 98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +sha256 8e7a2d514ee469325e5a7d0a2f0cad313aecb4c3da134f3bf84f7901a809d566 rust-1.79.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 74a4b17c7b80b87d2e1f4fa83c8c0c5e920eee6d72fe570df97aa96d85fc25ec rust-1.79.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +sha256 a640336f90db45a00e35444afd5f38ec8a9035b4f1f7ae17fb5d9357d3483773 rust-1.79.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +sha256 dd5a1d8ec6c5810893388391f194b11876643d2add3918968ab1473bce9a2cc0 rust-1.79.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 40d7dd809c873f9462a35735c511d82ba0e46edb56c74e8da01ff3a002bef2aa rust-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +sha256 acfb935d96986b05d6f8071a75ecc62f404d64faa65b81b1bb025821cfd3507b rust-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-s390x-unknown-linux-gnu.tar.xz.sha256 +sha256 24aab3cef43b4d8319ad7976313cfcbd6942ebd7a1824d39707f5629dc615ba8 rust-1.79.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.79.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 ce552d6bf22a2544ea78647d98cb405d5089af58dbcaa4efea711bf8becd71c5 rust-1.79.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +sha256 519abf4757fbd8d7e3bb4e4cfdc362ded972c1d95f04675684df2d31e8c0899b rust-std-1.79.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-aarch64-unknown-linux-musl.tar.xz.sha256 +sha256 428bf4fb5a66e93c2e13a8cddae71e903559d8666c727f0d45ececc7da7d2404 rust-std-1.79.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +sha256 bae338708a07e26ac2f51c291478e33fb85fbff9632e2da2714f3d1a91c3773a rust-std-1.79.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 fa6f5f03b68faf9b4449266e4836bcae24027fba7a3822a48822d772fc76c064 rust-std-1.79.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-musleabi.tar.xz.sha256 +sha256 1ba19c8e7dae60c7ae3f406545b65eef4fa6de31f3dd2fe83e0bbd06ade2c536 rust-std-1.79.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +sha256 24fa88bf0aa867be686c7d26233949ae9dbadc10b1e9c6ed36930cabe48d69b3 rust-std-1.79.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +sha256 c2f906d1c9d130e06687eeea5ea50697485b321dd1a8e537200a52db508db361 rust-std-1.79.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +sha256 73f3bc406ce4bcd4d64b7101a07a82bfff0f3cf793ba071b04c250c1feb08a03 rust-std-1.79.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +sha256 af7707874d52823cce0323a4ae900ed34201eefab97f4781c8280bf33ecb68b7 rust-std-1.79.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 a17fde385e3f420f5f825e019b4739a469a4aece9071a7ff7b7ff3c8a0486245 rust-std-1.79.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +sha256 74957092140452f41f39eceaeb0490054181a36c4d2eec53ab3a611bd3c8c38f rust-std-1.79.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +sha256 344e2190418912eb4415ac38a819202fd05c51e2b8f926d42cf43f5121e479d2 rust-std-1.79.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-i586-unknown-linux-gnu.tar.xz.sha256 +sha256 9c38f2cd4c19196fcf113166237ab03512bf19ce5a7f13c3bfe0e5cc3317eb44 rust-std-1.79.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-i586-unknown-linux-musl.tar.xz.sha256 +sha256 a9ba68598744117d10fa074535bb48585d4f6ad77170cbcb43841a56dc76f5c7 rust-std-1.79.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 158294f7c424ef75d84046b573f225c15d531745cc79d416a18c11aa8253830e rust-std-1.79.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-i686-unknown-linux-musl.tar.xz.sha256 +sha256 a0087ba6e159550aab8ff93390faec42e2687ec13908ab3e45946c2769aea00c rust-std-1.79.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +sha256 6aa2f351bc7dccb544781f4fecddb5ef67e05bb310c84e0106d968231384d9f4 rust-std-1.79.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +sha256 af95929af71494ee3e6988ead07204ea05b6f2b729cdb1ffcc26db75e47bf318 rust-std-1.79.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 3b5d53d70837d5ec942ec41a8da37ed932bbdc1e53f78dc54e218db458701588 rust-std-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +sha256 2b8af4060acb10f347c66a3477ae92151beba12192590ea40723dcf9b1f7f5b2 rust-std-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-s390x-unknown-linux-gnu.tar.xz.sha256 +sha256 d70e710a5138871e8d972f195ced9f7aa639ccef23a87fa03cc527d2b9c3cd36 rust-std-1.79.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +sha256 f7c7a73a8e5640f9d5aca6b26866b4da08cf3d3509ed1c4184309fb868acbff2 rust-std-1.79.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 2c914483c0882d44af2e50a181cbd2c953d672d50b31aa669ee2346cade1f108 rust-std-1.79.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.79.0-x86_64-unknown-linux-musl.tar.xz.sha256 +sha256 30b9418561e6a7c18396a259304d3ddb4ad9d262f0ed6f227e08d232b8b32e8c rust-std-1.79.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index ca35d27d1cb..1c9b0466b3f 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.74.1 +RUST_BIN_VERSION = 1.79.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 34349eef8b4..1a0fb0dec24 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,8 +1,8 @@ # Generated with utils/update-rust # Do not edit manually -# From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256 -sha256 b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e rustc-1.74.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.79.0-src.tar.xz.sha256 +sha256 ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a rustc-1.79.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index c544582c998..9f644b71abd 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.74.1 +RUST_VERSION = 1.79.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index d15443e53f0..c3e9a13f39c 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -92,14 +92,6 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL - # mips-unknown-linux-musl - default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 - # mips64-unknown-linux-muslabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mips64el-unknown-linux-muslabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mipsel-unknown-linux-musl - default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # sparc64-unknown-linux-gnu default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC diff --git a/utils/update-rust b/utils/update-rust index 4d74e9e5e0d..6799324facc 100755 --- a/utils/update-rust +++ b/utils/update-rust @@ -49,10 +49,6 @@ RUST_TARGETS = [ "i586-unknown-linux-musl", "i686-unknown-linux-gnu", "i686-unknown-linux-musl", - "mips-unknown-linux-musl", - "mips64-unknown-linux-muslabi64", - "mips64el-unknown-linux-muslabi64", - "mipsel-unknown-linux-musl", "powerpc-unknown-linux-gnu", "powerpc64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", From 129042be12517d9d028ac846e7531c08d31ce597 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 11 Jun 2024 19:51:48 +0200 Subject: [PATCH 1198/3013] package/python-web2py: fix build with python 3.12 Backport an upstream patch to fix a build error with python 3.12 (imp module not longer available). Enable SSL in host-python when the admin panel is enabled: web2py will wnt to generate a password, and uses pydal for that, which in turns uses hashlib.pbkdf2_hmac(). Until python 3.11, there was a pure-python fallback for when python was built without openssl; with 3.12, that fallback was removed, so opensll is now required. Signed-off-by: Yann E. MORIN --- .../0001-fix-regexen-and-classname.patch | 294 ++++++++++++++++++ package/python-web2py/Config.in | 8 +- 2 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 package/python-web2py/0001-fix-regexen-and-classname.patch diff --git a/package/python-web2py/0001-fix-regexen-and-classname.patch b/package/python-web2py/0001-fix-regexen-and-classname.patch new file mode 100644 index 00000000000..f134c3d31be --- /dev/null +++ b/package/python-web2py/0001-fix-regexen-and-classname.patch @@ -0,0 +1,294 @@ +From ad5cbbfdfacdcd3b4663e91a638de022d6e20477 Mon Sep 17 00:00:00 2001 +From: eevelweezel +Date: Mon, 6 Nov 2023 00:17:20 -0600 +Subject: [PATCH] fix regexen and classname + +Upstream: https://github.com/web2py/web2py/commit/ad5cbbfdfacdcd3b4663e91a638de022d6e20477 +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN + +--- + applications/admin/controllers/default.py | 64 +++++++++++------------ + gluon/compileapp.py | 4 +- + gluon/contrib/appconfig.py | 2 +- + 3 files changed, 35 insertions(+), 35 deletions(-) + +diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py +index 88697267..c53a3a76 100644 +--- a/applications/admin/controllers/default.py ++++ b/applications/admin/controllers/default.py +@@ -85,7 +85,7 @@ def safe_open(a, b): + return tmp() + + a_for_check = os.path.abspath(os.path.normpath(a)) +- ++ + web2py_apps_root = os.path.abspath(up(request.folder)) + web2py_deposit_root = os.path.join(up(web2py_apps_root), 'deposit') + +@@ -230,7 +230,7 @@ def site(): + class IS_VALID_APPNAME(object): + + def __call__(self, value): +- if not re.compile('^\w+$').match(value): ++ if not re.compile(r'^\w+$').match(value): + return (value, T('Invalid application name')) + if not request.vars.overwrite and \ + os.path.exists(os.path.join(apath(r=request), value)): +@@ -321,7 +321,7 @@ def site(): + session.flash = T(msg, dict(appname=form_update.vars.name)) + redirect(URL(r=request)) + +- regex = re.compile('^\w+$') ++ regex = re.compile(r'^\w+$') + + if is_manager(): + apps = [a for a in os.listdir(apath(r=request)) if regex.match(a) and +@@ -341,7 +341,7 @@ def site(): + def report_progress(app): + import datetime + progress_file = os.path.join(apath(app, r=request), 'progress.log') +- regex = re.compile('\[(.*?)\][^\:]+\:\s+(\-?\d+)') ++ regex = re.compile(r'\[(.*?)\][^\:]+\:\s+(\-?\d+)') + if not os.path.exists(progress_file): + return [] + matches = regex.findall(open(progress_file, 'r').read()) +@@ -609,7 +609,7 @@ def test(): + if len(request.args) > 1: + file = request.args[1] + else: +- file = '.*\.py' ++ file = r'.*\.py' + + controllers = listdir( + apath('%s/controllers/' % app, r=request), file + '$') +@@ -869,12 +869,12 @@ def todolist(): + app_path = apath('%(app)s' % {'app': app}, r=request) + dirs = ['models', 'controllers', 'modules', 'private'] + +- def listfiles(app, dir, regexp='.*\.py$'): ++ def listfiles(app, dir, regexp=r'.*\.py$'): + files = sorted(listdir(apath('%(app)s/%(dir)s/' % {'app': app, 'dir': dir}, r=request), regexp)) + files = [x.replace(os.path.sep, '/') for x in files if not x.endswith('.bak')] + return files + +- pattern = '#\s*(todo)+\s+(.*)' ++ pattern = r'#\s*(todo)+\s+(.*)' + regex = re.compile(pattern, re.IGNORECASE) + + output = [] +@@ -1126,7 +1126,7 @@ def design(): + redirect(URL('site')) + + # Get all models +- models = listdir(apath('%s/models/' % app, r=request), '.*\.py$') ++ models = listdir(apath('%s/models/' % app, r=request), r'.*\.py$') + models = [x.replace('\\', '/') for x in models] + defines = {} + for m in models: +@@ -1136,7 +1136,7 @@ def design(): + + # Get all controllers + controllers = sorted( +- listdir(apath('%s/controllers/' % app, r=request), '.*\.py$')) ++ listdir(apath('%s/controllers/' % app, r=request), r'.*\.py$')) + controllers = [x.replace('\\', '/') for x in controllers] + functions = {} + for c in controllers: +@@ -1149,7 +1149,7 @@ def design(): + + # Get all views + views = sorted( +- listdir(apath('%s/views/' % app, r=request), '[\w/\-]+(\.\w+)+$')) ++ listdir(apath('%s/views/' % app, r=request), r'[\w/\-]+(\.\w+)+$')) + views = [x.replace('\\', '/') for x in views if not x.endswith('.bak')] + extend = {} + include = {} +@@ -1164,17 +1164,17 @@ def design(): + include[c] = [i[1] for i in items] + + # Get all modules +- modules = listdir(apath('%s/modules/' % app, r=request), '.*\.py$') ++ modules = listdir(apath('%s/modules/' % app, r=request), r'.*\.py$') + modules = modules = [x.replace('\\', '/') for x in modules] + modules.sort() + + # Get all private files +- privates = listdir(apath('%s/private/' % app, r=request), '[^\.#].*') ++ privates = listdir(apath('%s/private/' % app, r=request), r'[^\.#].*') + privates = [x.replace('\\', '/') for x in privates] + privates.sort() + + # Get all static files +- statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*', ++ statics = listdir(apath('%s/static/' % app, r=request), r'[^\.#].*', + maxnum=MAXNFILES) + statics = [x.replace(os.path.sep, '/') for x in statics] + statics.sort() +@@ -1267,7 +1267,7 @@ def plugin(): + redirect(URL('site')) + + # Get all models +- models = listdir(apath('%s/models/' % app, r=request), '.*\.py$') ++ models = listdir(apath('%s/models/' % app, r=request), r'.*\.py$') + models = [x.replace('\\', '/') for x in models] + defines = {} + for m in models: +@@ -1277,7 +1277,7 @@ def plugin(): + + # Get all controllers + controllers = sorted( +- listdir(apath('%s/controllers/' % app, r=request), '.*\.py$')) ++ listdir(apath('%s/controllers/' % app, r=request), r'.*\.py$')) + controllers = [x.replace('\\', '/') for x in controllers] + functions = {} + for c in controllers: +@@ -1290,7 +1290,7 @@ def plugin(): + + # Get all views + views = sorted( +- listdir(apath('%s/views/' % app, r=request), '[\w/\-]+\.\w+$')) ++ listdir(apath('%s/views/' % app, r=request), r'[\w/\-]+\.\w+$')) + views = [x.replace('\\', '/') for x in views] + extend = {} + include = {} +@@ -1304,17 +1304,17 @@ def plugin(): + include[c] = [i[1] for i in items] + + # Get all modules +- modules = listdir(apath('%s/modules/' % app, r=request), '.*\.py$') ++ modules = listdir(apath('%s/modules/' % app, r=request), r'.*\.py$') + modules = modules = [x.replace('\\', '/') for x in modules] + modules.sort() + + # Get all private files +- privates = listdir(apath('%s/private/' % app, r=request), '[^\.#].*') ++ privates = listdir(apath('%s/private/' % app, r=request), r'[^\.#].*') + privates = [x.replace('\\', '/') for x in privates] + privates.sort() + + # Get all static files +- statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*', ++ statics = listdir(apath('%s/static/' % app, r=request), r'[^\.#].*', + maxnum=MAXNFILES) + statics = [x.replace(os.path.sep, '/') for x in statics] + statics.sort() +@@ -1331,7 +1331,7 @@ def plugin(): + safe_write(crontab, '#crontab') + + def filter_plugins(items): +- regex = re.compile('^plugin_' + plugin + '(/.*|\..*)?$') ++ regex = re.compile(r'^plugin_' + plugin + r'(/.*|\..*)?$') + return [item for item in items if item and regex.match(item)] + + return dict(app=app, +@@ -1363,14 +1363,14 @@ def create_file(): + request.vars.location += request.vars.dir + '/' + app = get_app(name=request.vars.location.split('/')[0]) + path = apath(request.vars.location, r=request) +- filename = re.sub('[^\w./-]+', '_', request.vars.filename) ++ filename = re.sub(r'[^\w./-]+', '_', request.vars.filename) + if path[-7:] == '/rules/': + # Handle plural rules files + if len(filename) == 0: + raise SyntaxError + if not filename[-3:] == '.py': + filename += '.py' +- lang = re.match('^plural_rules-(.*)\.py$', filename).group(1) ++ lang = re.match(r'^plural_rules-(.*)\.py$', filename).group(1) + langinfo = read_possible_languages(apath(app, r=request))[lang] + text = dedent(""" + #!/usr/bin/env python +@@ -1518,7 +1518,7 @@ def create_file(): + redirect(request.vars.sender + anchor) + + +-def listfiles(app, dir, regexp='.*\.py$'): ++def listfiles(app, dir, regexp=r'.*\.py$'): + files = sorted( + listdir(apath('%(app)s/%(dir)s/' % {'app': app, 'dir': dir}, r=request), regexp)) + files = [x.replace('\\', '/') for x in files if not x.endswith('.bak')] +@@ -1533,12 +1533,12 @@ def editfile(path, file, vars={}, app=None): + + def files_menu(): + app = request.vars.app or 'welcome' +- dirs = [{'name': 'models', 'reg': '.*\.py$'}, +- {'name': 'controllers', 'reg': '.*\.py$'}, +- {'name': 'views', 'reg': '[\w/\-]+(\.\w+)+$'}, +- {'name': 'modules', 'reg': '.*\.py$'}, +- {'name': 'static', 'reg': '[^\.#].*'}, +- {'name': 'private', 'reg': '.*\.py$'}] ++ dirs = [{'name': 'models', 'reg': r'.*\.py$'}, ++ {'name': 'controllers', 'reg': r'.*\.py$'}, ++ {'name': 'views', 'reg': r'[\w/\-]+(\.\w+)+$'}, ++ {'name': 'modules', 'reg': r'.*\.py$'}, ++ {'name': 'static', 'reg': r'[^\.#].*'}, ++ {'name': 'private', 'reg': r'.*\.py$'}] + result_files = [] + for dir in dirs: + result_files.append(TAG[''](LI(dir['name'], _class="nav-header component", _onclick="collapse('" + dir['name'] + "_files');"), +@@ -1559,7 +1559,7 @@ def upload_file(): + path = apath(request.vars.location, r=request) + + if request.vars.filename: +- filename = re.sub('[^\w\./]+', '_', request.vars.filename) ++ filename = re.sub(r'[^\w\./]+', '_', request.vars.filename) + else: + filename = os.path.split(request.vars.file.filename)[-1] + +@@ -1628,7 +1628,7 @@ def errors(): + + hash2error = dict() + +- for fn in listdir(errors_path, '^[a-fA-F0-9.\-]+$'): ++ for fn in listdir(errors_path, r'^[a-fA-F0-9.\-]+$'): + fullpath = os.path.join(errors_path, fn) + if not os.path.isfile(fullpath): + continue +@@ -1727,7 +1727,7 @@ def errors(): + func = lambda p: os.stat(apath('%s/errors/%s' % + (app, p), r=request)).st_mtime + tickets = sorted( +- listdir(apath('%s/errors/' % app, r=request), '^\w.*'), ++ listdir(apath('%s/errors/' % app, r=request), r'^\w.*'), + key=func, + reverse=True) + +diff --git a/gluon/compileapp.py b/gluon/compileapp.py +index 45fa8a0e..be0446e1 100644 +--- a/gluon/compileapp.py ++++ b/gluon/compileapp.py +@@ -14,7 +14,7 @@ Note: + + import copy + import fnmatch +-import imp ++from importlib import import_module + import marshal + import os + import py_compile +@@ -345,7 +345,7 @@ def local_import_aux(name, reload_force=False, app="welcome"): + """ + items = name.replace("/", ".") + name = "applications.%s.modules.%s" % (app, items) +- module = __import__(name) ++ module = import_module(name) + for item in name.split(".")[1:]: + module = getattr(module, item) + if reload_force: +diff --git a/gluon/contrib/appconfig.py b/gluon/contrib/appconfig.py +index 1160e08a..2bf81841 100644 +--- a/gluon/contrib/appconfig.py ++++ b/gluon/contrib/appconfig.py +@@ -120,7 +120,7 @@ class AppConfigLoader(object): + self.read_config() + + def read_config_ini(self): +- config = configparser.SafeConfigParser() ++ config = configparser.RawConfigParser() + config.read(self.file) + settings = {} + for section in config.sections(): +-- +2.45.1 + diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index bb455dfa7a8..e4308634a0a 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -17,6 +17,12 @@ if BR2_PACKAGE_PYTHON_WEB2PY config BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN bool "install admin panel application" default y + select BR2_PACKAGE_HOST_PYTHON3 + # web2py will use pydal to generate the password (below), and that + # uses hashlib.pbkdf2_hmac(), which is only available when python + # is built with openssl since 3.12 (previously, there was a slow + # pure-python fallback, dropped in 3.12). + select BR2_PACKAGE_HOST_PYTHON3_SSL help This option install web2py admin panel application. It can be removed to save space on embedded systems. @@ -25,7 +31,7 @@ if BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD string "admin panel password" - default web2py + default "web2py" help Set the admin panel password. From 9959277125ee34c7d778b00e8b83ea78dc74e6e0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 12 Jun 2024 20:00:48 +0200 Subject: [PATCH 1199/3013] package/python-pydantic-core: bump for fixes with python 3.12 The package is not yet available on PyPI, so go fetch it at the source. Signed-off-by: Yann E. MORIN --- package/python-pydantic-core/python-pydantic-core.hash | 2 +- package/python-pydantic-core/python-pydantic-core.mk | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index b5d975cb3bc..d11b3bfbb40 100644 --- a/package/python-pydantic-core/python-pydantic-core.hash +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 23f5e10872d9c3d49ebc1fcbd317612eb63d65a7afd88dbef8d23cb63d830cb4 python-pydantic-core-2.14.6-cargo2.tar.gz +sha256 3359b437ca74c8f7e1b8ec477b1ff1e39f0fff08abb0eb171953f9bc3e8773c6 python-pydantic-core-v2.19.0-git4-cargo2.tar.gz # Locally computed sha256 checksums sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk index 38128ebe465..79d06deab2a 100644 --- a/package/python-pydantic-core/python-pydantic-core.mk +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -4,10 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_CORE_VERSION = 2.14.6 -PYTHON_PYDANTIC_CORE_SOURCE_PYPI = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz -PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/b2/7d/8304d8471cfe4288f95a3065ebda56f9790d087edc356ad5bd83c89e2d79 -PYTHON_PYDANTIC_CORE_SITE = $(PYTHON_PYDANTIC_CORE_SITE_PYPI)/$(PYTHON_PYDANTIC_CORE_SOURCE_PYPI)?buildroot-path=filename +PYTHON_PYDANTIC_CORE_VERSION = v2.19.0 +PYTHON_PYDANTIC_CORE_SITE = https://github.com/pydantic/pydantic-core +PYTHON_PYDANTIC_CORE_SITE_METHOD = git PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE From 76cd14167f5eb3ffe22e131ddbbecf9bc61f2ef1 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sat, 8 Jun 2024 22:44:44 -0500 Subject: [PATCH 1200/3013] package/python3: bump python to 3.12.4 Along with the version bump, a number of the patches have been dropped or reworked. Compiled shared module builds are now disabled via py_cv_module_* = n/a when possible (see PY_STDLIB_MOD_SET_NA). Leveraging this method allows dropping numerous patches. Note: this method does not work when access to a compiled module is wrapped by a python-based module such as sqlite, tkinter, etc. In these cases, configure knobs are still required to disable these modules and their wrappers. Both setup.py and distutils are no longer utilized upstream, so patches have been dropped or adjusted accordingly. Patch 0007 has been dropped, the Xtensa architecture can avoid compile errors by using a toolchain with kernel headers newer than 3.17 [0]. That would require a new, non-trivial dependency to be added, but it would also need to be propagated to all packages that select python3; as we consider xtensa with old headers to be a corner case, we decide to not address the issue, and rather add an exclusion in genrandconfig to avoid the issue in autobuilders. Patch 0026 has been dropped, the issue is fixed in uClibc v1.0.37+ [1]. Note: uClibc is not generally supported by upstream CPython. While we're making assumptions about uClibc, ac_cv_func_wcsftime=no is no longer set as it was fixed in v1.0.0 [2]. Co-developed-by: Adam Duskett Co-developed-by: Thomas Petazzoni [See 36e635d2d5c0166476858aa239ccbe78e8f2af14] Co-developed-by: Roy Kollen Svendsen [See 687b96db4d3518eadd16f74f7defdc05b1cfb736] [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f61bf8e7d19e0a3456a7a9ed97c399e4353698dc [1]: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/libcrypt/crypt.c?id=2f6076cdaada2132b670b5ef25ad80c76a916c5a [2]: https://lists.uclibc.org/pipermail/uclibc/2014-November/048723.html Signed-off-by: Vincent Fazio [yann.morin.1998@free.fr; - extend the commit log for the xtensa headers case ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 33 ++---- ...e-the-build-of-pyc-files-conditional.patch | 32 +++--- ...taddrinfo-configure-test-when-cross-.patch | 8 +- .../0003-Add-an-option-to-disable-pydoc.patch | 84 ++++++++++++++ ...re-to-disable-the-build-of-certain-e.patch | 108 ------------------ ...04-Add-an-option-to-disable-lib2to3.patch} | 93 +++++++-------- ...ook-in-usr-lib-termcap-for-libraries.patch | 31 ----- ... 0005-Add-an-option-to-disable-IDLE.patch} | 63 +++++----- .../0005-Don-t-add-multiarch-paths.patch | 37 ------ .../0006-Abort-on-failed-module-build.patch | 30 ----- ...move-PY_STDLIB_MOD_SET_NA-further-up.patch | 44 +++++++ ...ption-to-disable-the-sqlite3-module.patch} | 35 +++--- .../0007-Serial-ioctl-workaround.patch | 33 ------ .../0008-Add-an-option-to-disable-pydoc.patch | 102 ----------------- ...d-an-option-to-disable-the-tk-module.patch | 81 +++++++++++++ ...option-to-disable-the-curses-module.patch} | 39 +++---- ...0010-Add-an-option-to-disable-expat.patch} | 59 +++++----- ...d-an-option-to-disable-the-tk-module.patch | 77 ------------- ...p-CC-print-multiarch-output-for-mus.patch} | 10 +- ...ss-compiles-when-host-and-target-us.patch} | 28 ++--- ...-Add-an-option-to-disable-CJK-codecs.patch | 30 ----- .../0015-Add-an-option-to-disable-NIS.patch | 33 ------ ...Add-an-option-to-disable-unicodedata.patch | 30 ----- ...018-Add-an-option-to-disable-decimal.patch | 54 --------- ...on-to-disable-the-ossaudiodev-module.patch | 30 ----- ...an-option-to-disable-openssl-support.patch | 30 ----- ...ption-to-disable-the-readline-module.patch | 30 ----- ...to-disable-zlib-bzip2-and-xz-modules.patch | 42 ------- ...Add-an-option-to-disable-uuid-module.patch | 33 ------ ...ion-to-disable-the-berkeleydb-module.patch | 30 ----- ...-ng-doesn-t-set-errno-when-encryptio.patch | 42 ------- package/python3/python3.hash | 6 +- package/python3/python3.mk | 79 +++++++------ utils/genrandconfig | 7 ++ 34 files changed, 446 insertions(+), 1057 deletions(-) create mode 100644 package/python3/0003-Add-an-option-to-disable-pydoc.patch delete mode 100644 package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch rename package/python3/{0009-Add-an-option-to-disable-lib2to3.patch => 0004-Add-an-option-to-disable-lib2to3.patch} (55%) delete mode 100644 package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch rename package/python3/{0017-Add-an-option-to-disable-IDLE.patch => 0005-Add-an-option-to-disable-IDLE.patch} (51%) delete mode 100644 package/python3/0005-Don-t-add-multiarch-paths.patch delete mode 100644 package/python3/0006-Abort-on-failed-module-build.patch create mode 100644 package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch rename package/python3/{0010-Add-option-to-disable-the-sqlite3-module.patch => 0007-Add-option-to-disable-the-sqlite3-module.patch} (60%) delete mode 100644 package/python3/0007-Serial-ioctl-workaround.patch delete mode 100644 package/python3/0008-Add-an-option-to-disable-pydoc.patch create mode 100644 package/python3/0008-Add-an-option-to-disable-the-tk-module.patch rename package/python3/{0012-Add-an-option-to-disable-the-curses-module.patch => 0009-Add-an-option-to-disable-the-curses-module.patch} (58%) rename package/python3/{0013-Add-an-option-to-disable-expat.patch => 0010-Add-an-option-to-disable-expat.patch} (63%) delete mode 100644 package/python3/0011-Add-an-option-to-disable-the-tk-module.patch rename package/python3/{0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch => 0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch} (87%) rename package/python3/{0027-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch => 0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch} (91%) delete mode 100644 package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch delete mode 100644 package/python3/0015-Add-an-option-to-disable-NIS.patch delete mode 100644 package/python3/0016-Add-an-option-to-disable-unicodedata.patch delete mode 100644 package/python3/0018-Add-an-option-to-disable-decimal.patch delete mode 100644 package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch delete mode 100644 package/python3/0020-Add-an-option-to-disable-openssl-support.patch delete mode 100644 package/python3/0021-Add-an-option-to-disable-the-readline-module.patch delete mode 100644 package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch delete mode 100644 package/python3/0023-Add-an-option-to-disable-uuid-module.patch delete mode 100644 package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch delete mode 100644 package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3f184fded52..807cee1a08f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1261,30 +1261,15 @@ package/python-web2py/S51web2py Shellcheck lib_sysv.Variables package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch lib_patch.Upstream package/python3/0001-Make-the-build-of-pyc-files-conditional.patch lib_patch.Upstream package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch lib_patch.Upstream -package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch lib_patch.Upstream -package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch lib_patch.Upstream -package/python3/0005-Don-t-add-multiarch-paths.patch lib_patch.Upstream -package/python3/0006-Abort-on-failed-module-build.patch lib_patch.Upstream -package/python3/0007-Serial-ioctl-workaround.patch lib_patch.Upstream -package/python3/0008-Add-an-option-to-disable-pydoc.patch lib_patch.Upstream -package/python3/0009-Add-an-option-to-disable-lib2to3.patch lib_patch.Upstream -package/python3/0010-Add-option-to-disable-the-sqlite3-module.patch lib_patch.Upstream -package/python3/0011-Add-an-option-to-disable-the-tk-module.patch lib_patch.Upstream -package/python3/0012-Add-an-option-to-disable-the-curses-module.patch lib_patch.Upstream -package/python3/0013-Add-an-option-to-disable-expat.patch lib_patch.Upstream -package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch lib_patch.Upstream -package/python3/0015-Add-an-option-to-disable-NIS.patch lib_patch.Upstream -package/python3/0016-Add-an-option-to-disable-unicodedata.patch lib_patch.Upstream -package/python3/0017-Add-an-option-to-disable-IDLE.patch lib_patch.Upstream -package/python3/0018-Add-an-option-to-disable-decimal.patch lib_patch.Upstream -package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch lib_patch.Upstream -package/python3/0020-Add-an-option-to-disable-openssl-support.patch lib_patch.Upstream -package/python3/0021-Add-an-option-to-disable-the-readline-module.patch lib_patch.Upstream -package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch lib_patch.Upstream -package/python3/0023-Add-an-option-to-disable-uuid-module.patch lib_patch.Upstream -package/python3/0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch lib_patch.Upstream -package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch lib_patch.Upstream -package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch lib_patch.Upstream +package/python3/0003-Add-an-option-to-disable-pydoc.patch lib_patch.Upstream +package/python3/0004-Add-an-option-to-disable-lib2to3.patch lib_patch.Upstream +package/python3/0005-Add-an-option-to-disable-IDLE.patch lib_patch.Upstream +package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch lib_patch.Upstream +package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch lib_patch.Upstream +package/python3/0008-Add-an-option-to-disable-the-tk-module.patch lib_patch.Upstream +package/python3/0009-Add-an-option-to-disable-the-curses-module.patch lib_patch.Upstream +package/python3/0010-Add-an-option-to-disable-expat.patch lib_patch.Upstream +package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch lib_patch.Upstream package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch lib_patch.Upstream package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch lib_patch.Upstream package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch lib_patch.Upstream diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 827b99d8e9f..b35b06216c1 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 9dd808909ea18f8e99272cbdf1e39151bff62037 Mon Sep 17 00:00:00 2001 +From 5d0f69ce7fc05adbd3c71e113c11da0aedbca33a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -9,38 +9,40 @@ the compilation of pyc. Signed-off-by: Thomas Petazzoni [ Andrey Smrinov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov +[ Adam Duskett: ported to Python 3.12.0 ] +Signed-off-by: Adam Duskett --- Makefile.pre.in | 2 ++ configure.ac | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4d1921bf435..f90ec2eeb1d 100644 +index 4a957fb004..9c5f3c031a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2139,6 +2139,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi +@@ -2329,6 +2329,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c + $(DESTDIR)$(LIBDEST); \ + $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt + @ # Build PYC files for the 3 optimization levels (0, 1, 2) +ifeq (@PYC_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ + -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST) -f \ +@@ -2338,6 +2339,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -j0 -d $(LIBDEST) -f \ -@@ -2166,6 +2167,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ - -j0 -d $(LIBDEST)/site-packages -f \ + -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index bbe7f891e7d..7b136bd2f0b 100644 +index 8a32cb58f4..611c33949a 100644 --- a/configure.ac +++ b/configure.ac -@@ -1459,6 +1459,12 @@ fi +@@ -1479,6 +1479,12 @@ fi - AC_MSG_CHECKING(LDLIBRARY) + AC_MSG_CHECKING([LDLIBRARY]) +AC_SUBST(PYC_BUILD) + @@ -52,5 +54,5 @@ index bbe7f891e7d..7b136bd2f0b 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.44.0 +2.34.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index e996823c472..e774e442dc7 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 33cd52fb1295a6eb4dd42fbc73e565c5ce01bbd0 Mon Sep 17 00:00:00 2001 +From 3a0d7824f7ddd4dd0336c8419cb4246ba936d711 Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7b136bd2f0b..1e84aa0bb7f 100644 +index 611c33949a..059ac2f883 100644 --- a/configure.ac +++ b/configure.ac -@@ -5137,7 +5137,7 @@ fi])) +@@ -5428,7 +5428,7 @@ fi])) dnl if ac_cv_func_getaddrinfo ]) @@ -23,5 +23,5 @@ index 7b136bd2f0b..1e84aa0bb7f 100644 AS_VAR_IF([ipv6], [yes], [ AC_MSG_ERROR([m4_normalize([ -- -2.44.0 +2.34.1 diff --git a/package/python3/0003-Add-an-option-to-disable-pydoc.patch b/package/python3/0003-Add-an-option-to-disable-pydoc.patch new file mode 100644 index 00000000000..01ce235afd3 --- /dev/null +++ b/package/python3/0003-Add-an-option-to-disable-pydoc.patch @@ -0,0 +1,84 @@ +From f910bdee70b07792c136aaced3850a08eaaafdee Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 22 Feb 2017 17:07:56 -0800 +Subject: [PATCH] Add an option to disable pydoc + +It removes 0.5 MB of data from the target plus the pydoc script +itself. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Samuel Martin +[ Andrey Smirnov: ported to Python 3.6 ] +Signed-off-by: Andrey Smirnov +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett +[ Adam Duskett: ported to Python 3.12.1 ] +Signed-off-by: Adam Duskett +--- + Makefile.pre.in | 9 ++++++++- + configure.ac | 6 ++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 9c5f3c031a..2243a658a9 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -2050,7 +2050,9 @@ bininstall: commoninstall altbininstall + -rm -f $(DESTDIR)$(BINDIR)/idle3 + (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) + -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ++ifeq (@PYDOC@,yes) + (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) ++endif + -rm -f $(DESTDIR)$(BINDIR)/2to3 + (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) + if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ +@@ -2102,7 +2104,6 @@ LIBSUBDIRS= asyncio \ + lib2to3 lib2to3/fixes lib2to3/pgen2 \ + logging \ + multiprocessing multiprocessing/dummy \ +- pydoc_data \ + re \ + site-packages \ + sqlite3 \ +@@ -2257,6 +2258,10 @@ TESTSUBDIRS= idlelib/idle_test \ + + COMPILEALL_OPTS=-j0 + ++ifeq (@PYDOC@,yes) ++LIBSUBDIRS += pydoc_data ++endif ++ + TEST_MODULES=@TEST_MODULES@ + + .PHONY: libinstall +@@ -2471,7 +2476,9 @@ libainstall: all scripts + $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config + $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) + $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) ++ifeq (@PYDOC@,yes) + $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) ++endif + @if [ -s Modules/python.exp -a \ + "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ + echo; echo "Installing support files for building shared extension modules on AIX:"; \ +diff --git a/configure.ac b/configure.ac +index 059ac2f883..1a2dd28d1e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4511,6 +4511,12 @@ AS_VAR_IF([posix_threads], [stub], [ + AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) + ]) + ++AC_SUBST(PYDOC) ++ ++AC_ARG_ENABLE(pydoc, ++ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), ++ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) ++ + # Check for enable-ipv6 + AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) + AC_MSG_CHECKING([if --enable-ipv6 is specified]) +-- +2.34.1 + diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch deleted file mode 100644 index f0c13387e85..00000000000 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 533aa8d7eb7ad27428410371504c6b94183852c1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 16:33:22 -0800 -Subject: [PATCH] Add infrastructure to disable the build of certain extensions - -Some of the extensions part of the Python core have dependencies on -external libraries (sqlite, tk, etc.) or are relatively big and not -necessarly always useful (CJK codecs for example). By extensions, we -mean part of Python modules that are written in C and therefore -compiled to binary code. - -Therefore, we introduce a small infrastructure that allows to disable -some of those extensions. This can be done inside the configure.ac by -adding values to the DISABLED_EXTENSIONS variable (which is a -word-separated list of extensions). - -The implementation works as follow : - - * configure.ac defines a DISABLED_EXTENSIONS variable, which is - substituted (so that when Makefile.pre is generated from - Makefile.pre.in, the value of the variable is substituted). For - now, this DISABLED_EXTENSIONS variable is empty, later patches will - use it. - - * Makefile.pre.in passes the DISABLED_EXTENSIONS value down to the - variables passed in the environment when calling the setup.py - script that actually builds and installs those extensions. - - * setup.py is modified so that the existing "disabled_module_list" is - filled with those pre-disabled extensions listed in - DISABLED_EXTENSIONS. - -Patch ported to python2.7 by Maxime Ripard , and -then extended by Thomas Petazzoni -. - -Signed-off-by: Thomas Petazzoni -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov ---- - Makefile.pre.in | 6 +++++- - configure.ac | 2 ++ - setup.py | 5 ++++- - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index f90ec2eeb1d..5a40b7c5484 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -239,6 +239,8 @@ FILEMODE= 644 - # configure script arguments - CONFIG_ARGS= @CONFIG_ARGS@ - -+# disabled extensions -+DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@ - - # Subdirectories with code - SRCDIRS= @SRCDIRS@ -@@ -743,6 +745,7 @@ sharedmods: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt @LIBMPDEC_INTERNAL@ @LIBEXPA - *) quiet="";; \ - esac; \ - echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ -+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build -@@ -2289,7 +2292,8 @@ libainstall: all python-config - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: all -- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ -+ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ -+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -diff --git a/configure.ac b/configure.ac -index 1e84aa0bb7f..b4d7d2cca6a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3612,6 +3612,8 @@ LIBS="$withval $LIBS" - ], - [AC_MSG_RESULT(no)]) - -+AC_SUBST(DISABLED_EXTENSIONS) -+ - # Check for use of the system expat library - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, -diff --git a/setup.py b/setup.py -index ad8fb81b218..2e15fedeab2 100644 ---- a/setup.py -+++ b/setup.py -@@ -56,7 +56,10 @@ - - - # This global variable is used to hold the list of modules to be disabled. --DISABLED_MODULE_LIST = [] -+try: -+ DISABLED_MODULE_LIST = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") -+except KeyError: -+ DISABLED_MODULE_LIST = list() - - # --list-module-names option used by Tools/scripts/generate_module_names.py - LIST_MODULE_NAMES = False --- -2.44.0 - diff --git a/package/python3/0009-Add-an-option-to-disable-lib2to3.patch b/package/python3/0004-Add-an-option-to-disable-lib2to3.patch similarity index 55% rename from package/python3/0009-Add-an-option-to-disable-lib2to3.patch rename to package/python3/0004-Add-an-option-to-disable-lib2to3.patch index 06f38e92b38..cc21cbd0b58 100644 --- a/package/python3/0009-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0004-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From 3fbd10c59a777c4ef7ee1bd3fb70808e25e11703 Mon Sep 17 00:00:00 2001 +From 572f3164d1dce13db30e897ab0be7c706fa7b731 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -14,19 +14,18 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett [ Bernd Kuhls: ported to Python 3.11.4] Signed-off-by: Bernd Kuhls -[ Vincent Fazio: fix scripts array to reflect upstream ] -Signed-off-by: Vincent Fazio +[ Adam Duskett: ported to Python 3.12.1 ] +Signed-off-by: Adam Duskett --- - Makefile.pre.in | 17 ++++++++++++----- + Makefile.pre.in | 19 ++++++++++++++----- configure.ac | 6 ++++++ - setup.py | 4 +++- - 3 files changed, 21 insertions(+), 6 deletions(-) + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e87bc1fcd3..1a0ab0de42 100644 +index 2243a658a9..3f314d1354 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1881,7 +1881,9 @@ ifeq (@PYDOC@,yes) +@@ -2054,7 +2054,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -36,7 +35,7 @@ index e87bc1fcd3..1a0ab0de42 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1927,7 +1929,6 @@ LIBSUBDIRS= asyncio \ +@@ -2101,7 +2103,6 @@ LIBSUBDIRS= asyncio \ idlelib idlelib/Icons \ importlib importlib/resources importlib/metadata \ json \ @@ -44,34 +43,34 @@ index e87bc1fcd3..1a0ab0de42 100644 logging \ multiprocessing multiprocessing/dummy \ re \ -@@ -1947,10 +1948,6 @@ LIBSUBDIRS= asyncio \ - TESTSUBDIRS= ctypes/test \ - distutils/tests \ - idlelib/idle_test \ -- lib2to3/tests \ -- lib2to3/tests/data \ -- lib2to3/tests/data/fixers \ -- lib2to3/tests/data/fixers/myfixes \ - test \ - test/audiodata \ - test/certdata \ -@@ -2074,6 +2071,14 @@ ifeq (@PYDOC@,yes) +@@ -2207,10 +2208,6 @@ TESTSUBDIRS= idlelib/idle_test \ + test/test_importlib/resources/zipdata02 \ + test/test_importlib/source \ + test/test_json \ +- test/test_lib2to3 \ +- test/test_lib2to3/data \ +- test/test_lib2to3/data/fixers \ +- test/test_lib2to3/data/fixers/myfixes \ + test/test_module \ + test/test_peg_generator \ + test/test_pydoc \ +@@ -2262,6 +2259,14 @@ ifeq (@PYDOC@,yes) LIBSUBDIRS += pydoc_data endif +ifeq (@LIB2TO3@,yes) +LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += lib2to3/tests \ -+ lib2to3/tests/data \ -+ lib2to3/tests/data/fixers \ -+ lib2to3/tests/data/fixers/myfixes ++TESTSUBDIRS += test/test_lib2to3 \ ++ test/test_lib2to3/data \ ++ test/test_lib2to3/data/fixers \ ++ test/test_lib2to3/data/fixers/myfixes +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -2176,10 +2181,12 @@ ifeq (@PYC_BUILD@,yes) - -j0 -d $(LIBDEST)/site-packages -f \ + + .PHONY: libinstall +@@ -2345,10 +2350,12 @@ ifeq (@PYC_BUILD@,yes) + -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif +ifeq (@LIB2TO3@,yes) @@ -83,11 +82,21 @@ index e87bc1fcd3..1a0ab0de42 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. +@@ -2474,7 +2481,9 @@ libainstall: all scripts + $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh + $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py + $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config ++ifeq (@LIB2TO3@,yes) + $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) ++endif + $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) + ifeq (@PYDOC@,yes) + $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) diff --git a/configure.ac b/configure.ac -index d56d8f9d1c..bf91fb2f82 100644 +index 1a2dd28d1e..f0354c580d 100644 --- a/configure.ac +++ b/configure.ac -@@ -7147,6 +7147,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu +@@ -7561,6 +7561,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu # substitute multiline block, must come after last PY_STDLIB_MOD() AC_SUBST([MODULE_BLOCK]) @@ -98,26 +107,8 @@ index d56d8f9d1c..bf91fb2f82 100644 + [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) + # generate output files - AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) - AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) -diff --git a/setup.py b/setup.py -index 25e6f4fc26..78d880f9db 100644 ---- a/setup.py -+++ b/setup.py -@@ -1598,10 +1598,12 @@ class DummyProcess: - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3'] -+ scripts = ['Tools/scripts/idle3'] - - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc3' ] -+ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/2to3' ] - - setup(# PyPI Metadata (PEP 301) - name = "Python", + AC_CONFIG_FILES(m4_normalize([ + Makefile.pre -- 2.34.1 diff --git a/package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch deleted file mode 100644 index 0e3a8443547..00000000000 --- a/package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bd152d01185a371a04680bc772c6454678de34f5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:36:00 +0100 -Subject: [PATCH] Don't look in /usr/lib/termcap for libraries - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 2e15fedeab2..b283ea3aeed 100644 ---- a/setup.py -+++ b/setup.py -@@ -1111,12 +1111,9 @@ def detect_readline_curses(self): - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(self.lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ elif self.compiler.find_library_file(self.lib_dirs, 'termcap'): - readline_libs.append('termcap') - self.add(Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - libraries=readline_libs)) - else: - self.missing.append('readline') --- -2.44.0 - diff --git a/package/python3/0017-Add-an-option-to-disable-IDLE.patch b/package/python3/0005-Add-an-option-to-disable-IDLE.patch similarity index 51% rename from package/python3/0017-Add-an-option-to-disable-IDLE.patch rename to package/python3/0005-Add-an-option-to-disable-IDLE.patch index fe44ef0d054..e9218af1c83 100644 --- a/package/python3/0017-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0005-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From dd4ac2662ae1feaa3a29c4088193e48645b080f7 Mon Sep 17 00:00:00 2001 +From ffa7fbceb54918eb518474c8f821fda0a58cf181 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -11,19 +11,18 @@ Signed-off-by: Maxime Ripard Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett -[ Vincent Fazio: fixup setup array to reflect upstream ] -Signed-off-by: Vincent Fazio +[ Adam Duskett: ported to Python 3.12.1 ] +Signed-off-by: Adam Duskett --- - Makefile.pre.in | 7 ++++++- + Makefile.pre.in | 9 ++++++++- configure.ac | 6 ++++++ - setup.py | 4 +++- - 3 files changed, 15 insertions(+), 2 deletions(-) + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8e5f6762d2..4e407cbcfa 100644 +index 3f314d1354..5fad7f82fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1875,7 +1875,9 @@ bininstall: commoninstall altbininstall +@@ -2048,7 +2048,9 @@ bininstall: commoninstall altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -33,7 +32,7 @@ index 8e5f6762d2..4e407cbcfa 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1925,7 +1927,6 @@ LIBSUBDIRS= asyncio \ +@@ -2100,7 +2102,6 @@ LIBSUBDIRS= asyncio \ ensurepip ensurepip/_bundled \ html \ http \ @@ -41,8 +40,8 @@ index 8e5f6762d2..4e407cbcfa 100644 importlib importlib/resources importlib/metadata \ json \ logging \ -@@ -2090,6 +2091,10 @@ ifeq (@EXPAT@,yes) - LIBSUBDIRS += $(XMLLIBSUBDIRS) +@@ -2267,6 +2268,10 @@ TESTSUBDIRS += test/test_lib2to3 \ + test/test_lib2to3/data/fixers/myfixes endif +ifeq (@IDLE@,yes) @@ -50,13 +49,23 @@ index 8e5f6762d2..4e407cbcfa 100644 +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ + + .PHONY: libinstall +@@ -2484,7 +2489,9 @@ libainstall: all scripts + ifeq (@LIB2TO3@,yes) + $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) + endif ++ifeq (@IDLE@,yes) + $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) ++endif + ifeq (@PYDOC@,yes) + $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) + endif diff --git a/configure.ac b/configure.ac -index cb7e980e5b..fe497ec9df 100644 +index f0354c580d..43086962e9 100644 --- a/configure.ac +++ b/configure.ac -@@ -7206,6 +7206,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -7567,6 +7567,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -67,28 +76,8 @@ index cb7e980e5b..fe497ec9df 100644 + [ IDLE="${enableval}" ], [ IDLE=yes ]) + # generate output files - AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) - AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) -diff --git a/setup.py b/setup.py -index 78d880f9db..ca05faec97 100644 ---- a/setup.py -+++ b/setup.py -@@ -1598,12 +1598,14 @@ class DummyProcess: - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle3'] -+ scripts = [] - - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc3' ] - if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/2to3' ] -+ if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/idle3' ] - - setup(# PyPI Metadata (PEP 301) - name = "Python", + AC_CONFIG_FILES(m4_normalize([ + Makefile.pre -- 2.34.1 diff --git a/package/python3/0005-Don-t-add-multiarch-paths.patch b/package/python3/0005-Don-t-add-multiarch-paths.patch deleted file mode 100644 index 4557fbb31e0..00000000000 --- a/package/python3/0005-Don-t-add-multiarch-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3e953e494570ddb78823d12f66dae1759f4780a3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:36:27 +0100 -Subject: [PATCH] Don't add multiarch paths - -The add_multiarch_paths() function leads, in certain build -environments, to the addition of host header paths to the CFLAGS, -which is not appropriate for cross-compilation. This patch fixes that -by simply removing the call to add_multiarch_paths() when we're -cross-compiling. - -Investigation done by David . - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index b283ea3aeed..585dd43828d 100644 ---- a/setup.py -+++ b/setup.py -@@ -853,10 +853,10 @@ def configure_compiler(self): - if not CROSS_COMPILING: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ self.add_multiarch_paths() - # only change this for cross builds for 3.3, issues on Mageia - if CROSS_COMPILING: - self.add_cross_compiling_paths() -- self.add_multiarch_paths() - self.add_ldflags_cppflags() - - def init_inc_lib_dirs(self): --- -2.44.0 - diff --git a/package/python3/0006-Abort-on-failed-module-build.patch b/package/python3/0006-Abort-on-failed-module-build.patch deleted file mode 100644 index d3ec7c31e8c..00000000000 --- a/package/python3/0006-Abort-on-failed-module-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 60b62c7e2c1fca4dcaf288f747376bfde111283b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:43:24 +0100 -Subject: [PATCH] Abort on failed module build - -When building a Python module fails, the setup.py script currently -doesn't exit with an error, and simply continues. This is not a really -nice behavior, so this patch changes setup.py to abort with an error, -so that the build issue is clearly noticeable. - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.py b/setup.py -index 585dd43828d..53b066cb18b 100644 ---- a/setup.py -+++ b/setup.py -@@ -580,6 +580,7 @@ def print_three_column(lst): - print("Failed to build these modules:") - print_three_column(failed) - print() -+ sys.exit(1) - - if self.failed_on_import: - failed = self.failed_on_import[:] --- -2.44.0 - diff --git a/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch b/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch new file mode 100644 index 00000000000..e594e6cd63c --- /dev/null +++ b/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch @@ -0,0 +1,44 @@ +From 267516c76208e63b5a3ec7d4dead6c329d8763bb Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 22:46:59 +0100 +Subject: [PATCH] configure.ac: move PY_STDLIB_MOD_SET_NA further up + +We will need PY_STDLIB_MOD_SET_NA in next patches further up in the +configure.ac script. + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 43086962e9..561e33f550 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,6 +95,11 @@ AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [ + AS_VAR_POPDEF([py_libs]) + ]) + ++AC_DEFUN([PY_STDLIB_MOD_SET_NA], [ ++ m4_foreach([mod], [$@], [ ++ AS_VAR_SET([py_cv_module_]mod, [n/a])]) ++]) ++ + AC_SUBST([BASECPPFLAGS]) + if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then + # If we're building out-of-tree, we need to make sure the following +@@ -7258,11 +7263,6 @@ AC_ARG_ENABLE([test-modules], + AC_MSG_RESULT([$TEST_MODULES]) + AC_SUBST([TEST_MODULES]) + +-AC_DEFUN([PY_STDLIB_MOD_SET_NA], [ +- m4_foreach([mod], [$@], [ +- AS_VAR_SET([py_cv_module_]mod, [n/a])]) +-]) +- + # stdlib not available + dnl Modules that are not available on some platforms + dnl AIX has shadow passwords, but access is not via getspent() +-- +2.34.1 + diff --git a/package/python3/0010-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch similarity index 60% rename from package/python3/0010-Add-option-to-disable-the-sqlite3-module.patch rename to package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch index 5ed282208bb..f26091ebfba 100644 --- a/package/python3/0010-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch @@ -1,6 +1,6 @@ -From aba9392bf6bf68cfd63b1cecfdd3e96d5de2a0b7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 17:20:45 -0800 +From a8566f6ee2a2b859ba5562f2d9f06cb4d271f277 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 22:12:20 +0100 Subject: [PATCH] Add option to disable the sqlite3 module Signed-off-by: Thomas Petazzoni @@ -9,16 +9,17 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +Signed-off-by: Thomas Petazzoni --- Makefile.pre.in | 5 ++++- - configure.ac | 9 +++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) + configure.ac | 7 +++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 1a0ab0de426..1c7b38ce4f6 100644 +index 5fad7f82fb..7b6c9811a6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1933,7 +1933,6 @@ LIBSUBDIRS= asyncio \ +@@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \ multiprocessing multiprocessing/dummy \ re \ site-packages \ @@ -26,8 +27,8 @@ index 1a0ab0de426..1c7b38ce4f6 100644 tkinter \ tomllib \ turtledemo \ -@@ -2079,6 +2078,10 @@ TESTSUBDIRS += lib2to3/tests \ - lib2to3/tests/data/fixers/myfixes +@@ -2272,6 +2271,10 @@ ifeq (@IDLE@,yes) + LIBSUBDIRS += idlelib idlelib/Icons endif +ifeq (@SQLITE3@,yes) @@ -35,13 +36,13 @@ index 1a0ab0de426..1c7b38ce4f6 100644 +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ + + .PHONY: libinstall diff --git a/configure.ac b/configure.ac -index bf91fb2f824..0013afc9aad 100644 +index 561e33f550..d1c54bd67c 100644 --- a/configure.ac +++ b/configure.ac -@@ -4222,6 +4222,15 @@ AS_VAR_IF([posix_threads], [stub], [ +@@ -4516,6 +4516,13 @@ AS_VAR_IF([posix_threads], [stub], [ AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) ]) @@ -49,14 +50,12 @@ index bf91fb2f824..0013afc9aad 100644 +AC_ARG_ENABLE(sqlite3, + AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), + [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) -+ -+if test "$SQLITE3" = "no" ; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" -+fi ++AS_IF([test "$SQLITE3" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_sqlite3])]) + AC_SUBST(PYDOC) AC_ARG_ENABLE(pydoc, -- -2.44.0 +2.34.1 diff --git a/package/python3/0007-Serial-ioctl-workaround.patch b/package/python3/0007-Serial-ioctl-workaround.patch deleted file mode 100644 index 34072f894ec..00000000000 --- a/package/python3/0007-Serial-ioctl-workaround.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0061a02bbe82c9b3b631d3b820bab0ba18482ebc Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 23 Dec 2015 11:44:02 +0100 -Subject: [PATCH] Serial ioctl() workaround - -The ioctls.h of some architectures (notably xtensa) references structs from -linux/serial.h. Make sure to include this header as well. - -Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct, -but isn't actually referenced in modern kernels. - -Signed-off-by: Baruch Siach ---- - Modules/termios.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Modules/termios.c b/Modules/termios.c -index 23771b2ce99..c1579af435d 100644 ---- a/Modules/termios.c -+++ b/Modules/termios.c -@@ -15,7 +15,9 @@ - #endif - - #include -+#include - #include -+#undef TIOCTTYGSTRUCT - - /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, - * MDTR, MRI, and MRTS (apparently used internally by some things --- -2.44.0 - diff --git a/package/python3/0008-Add-an-option-to-disable-pydoc.patch b/package/python3/0008-Add-an-option-to-disable-pydoc.patch deleted file mode 100644 index ffb6a7796fc..00000000000 --- a/package/python3/0008-Add-an-option-to-disable-pydoc.patch +++ /dev/null @@ -1,102 +0,0 @@ -From e6284624679a525440dc4bfddc1347f8add22fd8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 17:07:56 -0800 -Subject: [PATCH] Add an option to disable pydoc - -It removes 0.5 MB of data from the target plus the pydoc script -itself. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov -[ Adam Duskett: ported to Python 3.10.0 ] -Signed-off-by: Adam Duskett -[ Vincent Fazio: fix scripts array to reflect upstream ] -Signed-off-by: Vincent Fazio ---- - Makefile.pre.in | 7 ++++++- - configure.ac | 6 ++++++ - setup.py | 9 +++++++-- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5a40b7c548..e87bc1fcd3 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1877,7 +1877,9 @@ bininstall: commoninstall altbininstall - -rm -f $(DESTDIR)$(BINDIR)/idle3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 -+ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -+endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) - if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1928,7 +1930,6 @@ LIBSUBDIRS= asyncio \ - lib2to3 lib2to3/fixes lib2to3/pgen2 \ - logging \ - multiprocessing multiprocessing/dummy \ -- pydoc_data \ - re \ - site-packages \ - sqlite3 \ -@@ -2069,6 +2070,10 @@ TESTSUBDIRS= ctypes/test \ - unittest/test \ - unittest/test/testmock - -+ifeq (@PYDOC@,yes) -+LIBSUBDIRS += pydoc_data -+endif -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -diff --git a/configure.ac b/configure.ac -index b4d7d2cca6..d56d8f9d1c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4222,6 +4222,12 @@ AS_VAR_IF([posix_threads], [stub], [ - AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) - ]) - -+AC_SUBST(PYDOC) -+ -+AC_ARG_ENABLE(pydoc, -+ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), -+ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) -diff --git a/setup.py b/setup.py -index 53b066cb18..25e6f4fc26 100644 ---- a/setup.py -+++ b/setup.py -@@ -1597,6 +1597,12 @@ class DummyProcess: - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -+ -+ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3'] -+ -+ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/pydoc3' ] -+ - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], -@@ -1621,8 +1627,7 @@ class DummyProcess: - # If you change the scripts installed here, you also need to - # check the PyBuildScripts command above, and change the links - # created by the bininstall target in Makefile.pre.in -- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", -- "Tools/scripts/2to3"] -+ scripts = scripts - ) - - # --install-platlib --- -2.34.1 - diff --git a/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch new file mode 100644 index 00000000000..97ee2d717c4 --- /dev/null +++ b/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch @@ -0,0 +1,81 @@ +From c1ec9fa46cd7679fd009f66a3ebed8de95d84f10 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 22 Feb 2017 17:23:42 -0800 +Subject: [PATCH] Add an option to disable the tk module + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Samuel Martin +[ Andrey Smirnov: ported to Python 3.6 ] +Signed-off-by: Andrey Smirnov +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls +[ Adam Duskett: ported to Python 3.12.1 ] +Signed-off-by: Adam Duskett +--- + Makefile.pre.in | 8 +++++--- + configure.ac | 7 +++++++ + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 7b6c9811a6..6d9527ddd0 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \ + multiprocessing multiprocessing/dummy \ + re \ + site-packages \ +- tkinter \ + tomllib \ + turtledemo \ + unittest \ +@@ -2212,7 +2211,6 @@ TESTSUBDIRS= idlelib/idle_test \ + test/test_peg_generator \ + test/test_pydoc \ + test/test_sqlite3 \ +- test/test_tkinter \ + test/test_tomllib \ + test/test_tomllib/data \ + test/test_tomllib/data/invalid \ +@@ -2232,7 +2230,6 @@ TESTSUBDIRS= idlelib/idle_test \ + test/test_tomllib/data/valid/dates-and-times \ + test/test_tomllib/data/valid/multiline-basic-str \ + test/test_tools \ +- test/test_ttk \ + test/test_unittest \ + test/test_unittest/testmock \ + test/test_warnings \ +@@ -2253,6 +2250,11 @@ TESTSUBDIRS= idlelib/idle_test \ + test/test_multiprocessing_forkserver \ + test/test_multiprocessing_spawn + ++ifeq (@TK@,yes) ++LIBSUBDIRS += tkinter ++TESTSUBDIRS += test/test_tkinter test/test_ttk ++endif ++ + COMPILEALL_OPTS=-j0 + + ifeq (@PYDOC@,yes) +diff --git a/configure.ac b/configure.ac +index d1c54bd67c..4c5cbe4153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4529,6 +4529,13 @@ AC_ARG_ENABLE(pydoc, + AS_HELP_STRING([--disable-pydoc], [disable pydoc]), + [ PYDOC="${enableval}" ], [ PYDOC=yes ]) + ++AC_SUBST(TK) ++AC_ARG_ENABLE(tk, ++ AS_HELP_STRING([--disable-tk], [disable tk]), ++ [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) ++ + # Check for enable-ipv6 + AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) + AC_MSG_CHECKING([if --enable-ipv6 is specified]) +-- +2.34.1 + diff --git a/package/python3/0012-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch similarity index 58% rename from package/python3/0012-Add-an-option-to-disable-the-curses-module.patch rename to package/python3/0009-Add-an-option-to-disable-the-curses-module.patch index 0b15dfb01ce..139bf1544bf 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From d843bceff915b2a50b36a9db8552e0db5bd90f6d Mon Sep 17 00:00:00 2001 +From d7ea122e8ae506019761b92987b141fe7ea55f76 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -10,52 +10,51 @@ Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett --- - Makefile.pre.in | 4 +++- - configure.ac | 9 +++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) + Makefile.pre.in | 5 ++++- + configure.ac | 7 +++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6ab184fe5f8..09408c3471f 100644 +index 6d9527ddd0..283ca1bd60 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1918,7 +1918,6 @@ LIBSUBDIRS= asyncio \ +@@ -2095,7 +2095,6 @@ LIBSUBDIRS= asyncio \ concurrent concurrent/futures \ csv \ ctypes ctypes/macholib \ - curses \ dbm \ - distutils distutils/command \ email email/mime \ -@@ -2084,6 +2083,9 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk + encodings \ +@@ -2255,6 +2254,10 @@ LIBSUBDIRS += tkinter + TESTSUBDIRS += test/test_tkinter test/test_ttk endif +ifeq (@CURSES@,yes) +LIBSUBDIRS += curses +endif ++ + COMPILEALL_OPTS=-j0 - TEST_MODULES=@TEST_MODULES@ - libinstall: all $(srcdir)/Modules/xxmodule.c + ifeq (@PYDOC@,yes) diff --git a/configure.ac b/configure.ac -index 342b295bcdd..5d52c813ba6 100644 +index 4c5cbe4153..92d663ed40 100644 --- a/configure.ac +++ b/configure.ac -@@ -4240,6 +4240,15 @@ if test "$TK" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi +@@ -4523,6 +4523,13 @@ AC_ARG_ENABLE(sqlite3, + AS_IF([test "$SQLITE3" = "no"], + [PY_STDLIB_MOD_SET_NA([_sqlite3])]) +AC_SUBST(CURSES) +AC_ARG_ENABLE(curses, + AS_HELP_STRING([--disable-curses], [disable curses]), + [ CURSES="${enableval}" ], [ CURSES=yes ]) -+ -+if test "$CURSES" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" -+fi ++AS_IF([test "$CURSES" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_curses], [_curses_panel])]) + AC_SUBST(PYDOC) AC_ARG_ENABLE(pydoc, -- -2.44.0 +2.34.1 diff --git a/package/python3/0013-Add-an-option-to-disable-expat.patch b/package/python3/0010-Add-an-option-to-disable-expat.patch similarity index 63% rename from package/python3/0013-Add-an-option-to-disable-expat.patch rename to package/python3/0010-Add-an-option-to-disable-expat.patch index 03d8271e5d1..2363aeb01dd 100644 --- a/package/python3/0013-Add-an-option-to-disable-expat.patch +++ b/package/python3/0010-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 3ed9d35554631a1e0c438636b60b6b9b699cba4b Mon Sep 17 00:00:00 2001 +From d1701f1c89e9d2319ede200052319183fbb4ae18 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -17,23 +17,23 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett --- Makefile.pre.in | 5 ++++- - configure.ac | 20 ++++++++++++++------ - 2 files changed, 18 insertions(+), 7 deletions(-) + configure.ac | 24 +++++++++++++----------- + 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 09408c3471f..8e5f6762d20 100644 +index 283ca1bd60..13f7512f42 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1938,7 +1938,6 @@ LIBSUBDIRS= asyncio \ +@@ -2113,7 +2113,6 @@ LIBSUBDIRS= asyncio \ urllib \ venv venv/scripts venv/scripts/common venv/scripts/posix \ wsgiref \ - $(XMLLIBSUBDIRS) \ xmlrpc \ + zipfile zipfile/_path \ zoneinfo \ - __phello__ -@@ -2087,6 +2086,10 @@ ifeq (@CURSES@,yes) - LIBSUBDIRS += curses +@@ -2280,6 +2279,10 @@ ifeq (@SQLITE3@,yes) + LIBSUBDIRS += sqlite3 endif +ifeq (@EXPAT@,yes) @@ -41,36 +41,37 @@ index 09408c3471f..8e5f6762d20 100644 +endif + TEST_MODULES=@TEST_MODULES@ - libinstall: all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ + + .PHONY: libinstall diff --git a/configure.ac b/configure.ac -index 5d52c813ba6..6e577f19b8c 100644 +index 92d663ed40..1cb95f41fd 100644 --- a/configure.ac +++ b/configure.ac -@@ -3615,15 +3615,23 @@ LIBS="$withval $LIBS" - AC_SUBST(DISABLED_EXTENSIONS) +@@ -3823,17 +3823,19 @@ LIBS="$withval $LIBS" + [AC_MSG_RESULT([no])]) # Check for use of the system expat library --AC_MSG_CHECKING(for --with-system-expat) --AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), +-AC_MSG_CHECKING([for --with-system-expat]) +-AC_ARG_WITH( +- [system_expat], +- [AS_HELP_STRING( +- [--with-system-expat], +- [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)] +- )], [], [with_system_expat="no"]) +- +-AC_MSG_RESULT([$with_system_expat]) +- +-AS_VAR_IF([with_system_expat], [yes], [ +AC_MSG_CHECKING(for --with-expat) +AC_ARG_WITH(expat, + AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), - [], -- [with_system_expat="no"]) ++ [], + [with_expat="builtin"]) - --AC_MSG_RESULT($with_system_expat) +AC_MSG_RESULT($with_expat) - --AS_VAR_IF([with_system_expat], [yes], [ -+if test "$with_expat" != "none"; then -+ EXPAT=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" -+ EXPAT=no -+fi ++AS_IF([test "$with_expat" != "none"], ++ [EXPAT=yes], ++ [PY_STDLIB_MOD_SET_NA([pyexpat]) ++ EXPAT=no]) +AC_SUBST(EXPAT) + +AS_VAR_IF([with_expat], [system], [ @@ -78,5 +79,5 @@ index 5d52c813ba6..6e577f19b8c 100644 LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"} LIBEXPAT_INTERNAL= -- -2.44.0 +2.34.1 diff --git a/package/python3/0011-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0011-Add-an-option-to-disable-the-tk-module.patch deleted file mode 100644 index 2d5c002e0f3..00000000000 --- a/package/python3/0011-Add-an-option-to-disable-the-tk-module.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 61535b58452a18d6654a02fd25bfbc562bbbdbea Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 17:23:42 -0800 -Subject: [PATCH] Add an option to disable the tk module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov -[ Adam Duskett: ported to Python 3.10.0 ] -Signed-off-by: Adam Duskett -[ Bernd Kuhls: ported to Python 3.11.4] -Signed-off-by: Bernd Kuhls ---- - Makefile.pre.in | 11 +++++++---- - configure.ac | 9 +++++++++ - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 1c7b38ce4f6..6ab184fe5f8 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1933,7 +1933,6 @@ LIBSUBDIRS= asyncio \ - multiprocessing multiprocessing/dummy \ - re \ - site-packages \ -- tkinter \ - tomllib \ - turtledemo \ - unittest \ -@@ -2060,9 +2059,6 @@ TESTSUBDIRS= ctypes/test \ - test/xmltestdata \ - test/xmltestdata/c14n-20 \ - test/ziptestdata \ -- tkinter/test \ -- tkinter/test/test_tkinter \ -- tkinter/test/test_ttk \ - unittest/test \ - unittest/test/testmock - -@@ -2082,6 +2078,13 @@ ifeq (@SQLITE3@,yes) - LIBSUBDIRS += sqlite3 - endif - -+ifeq (@TK@,yes) -+LIBSUBDIRS += tkinter -+TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ -+ tkinter/test/test_ttk -+endif -+ -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -diff --git a/configure.ac b/configure.ac -index 0013afc9aad..342b295bcdd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4231,6 +4231,15 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_SUBST(TK) -+AC_ARG_ENABLE(tk, -+ AS_HELP_STRING([--disable-tk], [disable tk]), -+ [ TK="${enableval}" ], [ TK=yes ]) -+ -+if test "$TK" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.44.0 - diff --git a/package/python3/0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 87% rename from package/python3/0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 1b7b972bdfd..a92f78fe575 100644 --- a/package/python3/0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From a1495856f48a8ce256d972f656184e38baced12e Mon Sep 17 00:00:00 2001 +From 3eccbd53df3c51c1c6ece217d19f1d01eb9575a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -25,15 +25,17 @@ to keep the configure script happy. Signed-off-by: Peter Korsgaard [Peter: updated for 3.10.2] +Signed-off-by: Vincent Fazio +[Vincent: fixup offsets for 3.12.4] --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 6205e6782cf..da884ddf441 100644 +index 1cb95f41fd..d142af404a 100644 --- a/configure.ac +++ b/configure.ac -@@ -1104,7 +1104,11 @@ AC_MSG_CHECKING([for multiarch]) +@@ -1128,7 +1128,11 @@ AC_MSG_CHECKING([for multiarch]) AS_CASE([$ac_sys_system], [Darwin*], [MULTIARCH=""], [FreeBSD*], [MULTIARCH=""], @@ -47,5 +49,5 @@ index 6205e6782cf..da884ddf441 100644 AC_SUBST([MULTIARCH]) AC_MSG_RESULT([$MULTIARCH]) -- -2.44.0 +2.34.1 diff --git a/package/python3/0027-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch b/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch similarity index 91% rename from package/python3/0027-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch rename to package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch index 6c66a3410ba..5a7949b2fdd 100644 --- a/package/python3/0027-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch +++ b/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch @@ -1,4 +1,4 @@ -From ffe5a060a1b24bedc2aac5d60d6b3b7e40f55adc Mon Sep 17 00:00:00 2001 +From e7fa6023be567251b409527bd005b93335914501 Mon Sep 17 00:00:00 2001 From: Vincent Fazio <5265893+vfazio@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:55:04 -0600 Subject: [PATCH] gh-115382: Fix cross compiles when host and target use same @@ -48,10 +48,10 @@ Upstream: https://github.com/python/cpython/pull/116294 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index ebe37118274..ba424236e11 100644 +index 122d441bd1..260aec3127 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -528,7 +528,20 @@ def _init_posix(vars): +@@ -533,7 +533,20 @@ def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() name = _get_sysconfigdata_name() @@ -74,10 +74,10 @@ index ebe37118274..ba424236e11 100644 vars.update(build_time_vars) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py -index a9725fa9673..121e2e73938 100644 +index e41646d2d1..f54e570728 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py -@@ -519,6 +519,7 @@ def _add_cross_compile_opts(self, regrtest_opts): +@@ -576,6 +576,7 @@ def _add_cross_compile_opts(self, regrtest_opts): '_PYTHON_PROJECT_BASE', '_PYTHON_HOST_PLATFORM', '_PYTHON_SYSCONFIGDATA_NAME', @@ -86,7 +86,7 @@ index a9725fa9673..121e2e73938 100644 } old_environ = os.environ diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py -index 74ebb5e5b8a..fa7fbca34e1 100644 +index 6efeaad812..d43e52c9e4 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -326,6 +326,7 @@ def format_groups(groups): @@ -98,7 +98,7 @@ index 74ebb5e5b8a..fa7fbca34e1 100644 # Sanitizer options diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py -index 445a34ae3e8..4077a834245 100644 +index 445a34ae3e..4077a83424 100644 --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py @@ -42,6 +42,7 @@ def main(regrtest_args): @@ -110,23 +110,23 @@ index 445a34ae3e8..4077a834245 100644 } environ = { diff --git a/configure b/configure -index cb3db60f9c2..5fc0cffa977 100755 +index 6dc8a66e48..a69346db8c 100755 --- a/configure +++ b/configure -@@ -3262,7 +3262,7 @@ fi +@@ -3689,7 +3689,7 @@ fi fi ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python PYTHON_FOR_FREEZE="$with_build_python" - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5 - $as_echo "$with_build_python" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5 + printf "%s\n" "$with_build_python" >&6; } diff --git a/configure.ac b/configure.ac -index 852cbaa6e4c..5ca316a948b 100644 +index 1cb95f41fd..de420dde2c 100644 --- a/configure.ac +++ b/configure.ac -@@ -162,7 +162,7 @@ AC_ARG_WITH( +@@ -169,7 +169,7 @@ AC_ARG_WITH([build-python], dnl Build Python interpreter is used for regeneration and freezing. ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python PYTHON_FOR_FREEZE="$with_build_python" @@ -136,5 +136,5 @@ index 852cbaa6e4c..5ca316a948b 100644 ], [ AS_VAR_IF([cross_compiling], [yes], -- -2.44.0 +2.34.1 diff --git a/package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch deleted file mode 100644 index 7e13a07a1d0..00000000000 --- a/package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 494fae96f273517c43c65a5d9ea6b7d968352443 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:49:55 +0100 -Subject: [PATCH] Add an option to disable CJK codecs - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 6e577f19b8c..13ffcf2637e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4239,6 +4239,12 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_ARG_ENABLE(codecs-cjk, -+ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.44.0 - diff --git a/package/python3/0015-Add-an-option-to-disable-NIS.patch b/package/python3/0015-Add-an-option-to-disable-NIS.patch deleted file mode 100644 index ee382ace7e7..00000000000 --- a/package/python3/0015-Add-an-option-to-disable-NIS.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3f4f9bee66236e2052f9ff027e867a61ec56a585 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:50:11 +0100 -Subject: [PATCH] Add an option to disable NIS - -NIS is not necessarily available in uClibc, so we need an option to -not compile support for it. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 13ffcf2637e..2faadb34f65 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4245,6 +4245,12 @@ AC_ARG_ENABLE(codecs-cjk, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" - fi]) - -+AC_ARG_ENABLE(nis, -+ AS_HELP_STRING([--disable-nis], [disable NIS]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.44.0 - diff --git a/package/python3/0016-Add-an-option-to-disable-unicodedata.patch b/package/python3/0016-Add-an-option-to-disable-unicodedata.patch deleted file mode 100644 index f5e57c127e8..00000000000 --- a/package/python3/0016-Add-an-option-to-disable-unicodedata.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 15490e1576d5836a7afc5a3eca75e087bb3f032e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:50:27 +0100 -Subject: [PATCH] Add an option to disable unicodedata - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 2faadb34f65..cb7e980e5b5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4251,6 +4251,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(unicodedata, -+ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.44.0 - diff --git a/package/python3/0018-Add-an-option-to-disable-decimal.patch b/package/python3/0018-Add-an-option-to-disable-decimal.patch deleted file mode 100644 index dc966b915df..00000000000 --- a/package/python3/0018-Add-an-option-to-disable-decimal.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 12b5db4e25182962eb0b8bc21479a743c35a158c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:51:31 +0100 -Subject: [PATCH] Add an option to disable decimal - -This patch replaces the existing --with-system-libmpdec option with a ---with-libmpdec={system,builtin,none} option, which allows to tell -Python whether we want to use the system libmpdec (already installed), -the libmpdec builtin the Python sources, or no libmpdec at all. - -Signed-off-by: Thomas Petazzoni -[aduskett@gmail.com: Update for python 3.7.0] -Signed-off-by: Adam Duskett -[james.hilliard1@gmail.com: adapt to python 3.9] -Signed-off-by: James Hilliard ---- - configure.ac | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fe497ec9dfb..20b3c2459f4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3680,14 +3680,21 @@ fi - AC_SUBST(LIBFFI_INCLUDEDIR) - - # Check for use of the system libmpdec library --AC_MSG_CHECKING(for --with-system-libmpdec) --AC_ARG_WITH(system_libmpdec, -- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]), -+AC_MSG_CHECKING(for --with-libmpdec) -+AC_ARG_WITH(libmpdec, -+ AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), - [], -- [with_system_libmpdec="no"]) --AC_MSG_RESULT($with_system_libmpdec) -+ [with_libmpdec="builtin"]) -+AC_MSG_RESULT($with_libmpdec) -+if test "$with_libmpdec" != "none"; then -+ MPDEC=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _decimal" -+ MPDEC=no -+fi -+AC_SUBST(MPDEC) - --AS_VAR_IF([with_system_libmpdec], [yes], [ -+AS_VAR_IF([with_libmpdec], [system], [ - LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""} - LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS-"-lmpdec"} - LIBMPDEC_INTERNAL= --- -2.44.0 - diff --git a/package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch deleted file mode 100644 index d05e0a8a486..00000000000 --- a/package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 17d7b6d56cf554dcc6fcb263e1fd2b9e3dbf4320 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:51:58 +0100 -Subject: [PATCH] Add an option to disable the ossaudiodev module - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 20b3c2459f4..87853f47329 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3728,6 +3728,12 @@ fi - - AC_MSG_RESULT($with_decimal_contextvar) - -+AC_ARG_ENABLE(ossaudiodev, -+ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" -+ fi]) -+ - # Check for libmpdec machine flavor - AC_MSG_CHECKING(for decimal libmpdec machine) - AS_CASE([$ac_sys_system], --- -2.44.0 - diff --git a/package/python3/0020-Add-an-option-to-disable-openssl-support.patch b/package/python3/0020-Add-an-option-to-disable-openssl-support.patch deleted file mode 100644 index 6e95ae49a44..00000000000 --- a/package/python3/0020-Add-an-option-to-disable-openssl-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 959521c99fed46efab9bf0a1ae4b77b2365cf0d1 Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Wed, 22 Feb 2017 17:55:59 -0800 -Subject: [PATCH] Add an option to disable openssl support. - -Signed-off-by: Nicolas Cavallari ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 87853f47329..3f8f0419767 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4270,6 +4270,12 @@ AC_ARG_ENABLE(unicodedata, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" - fi]) - -+AC_ARG_ENABLE(openssl, -+ AS_HELP_STRING([--disable-openssl], [disable openssl support]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.44.0 - diff --git a/package/python3/0021-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0021-Add-an-option-to-disable-the-readline-module.patch deleted file mode 100644 index 48b7f949adb..00000000000 --- a/package/python3/0021-Add-an-option-to-disable-the-readline-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3ea53d30005a06134a9ef05051493efb9c30712b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 23:29:05 +0100 -Subject: [PATCH] Add an option to disable the readline module - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 3f8f0419767..11a798b25bb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4276,6 +4276,12 @@ AC_ARG_ENABLE(openssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" - fi]) - -+AC_ARG_ENABLE(readline, -+ AS_HELP_STRING([--disable-readline], [disable readline]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.44.0 - diff --git a/package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch deleted file mode 100644 index a1c5856dd77..00000000000 --- a/package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 32dfbdc953a8c992c2b7a5562b899cbc3a7a6e70 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 23:31:11 +0100 -Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 11a798b25bb..bd18ebe7582 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4282,6 +4282,24 @@ AC_ARG_ENABLE(readline, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" - fi]) - -+AC_ARG_ENABLE(bzip2, -+ AS_HELP_STRING([--disable-bzip2], [disable bzip2]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bz2" -+ fi]) -+ -+AC_ARG_ENABLE(zlib, -+ AS_HELP_STRING([--disable-zlib], [disable zlib]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib" -+ fi]) -+ -+AC_ARG_ENABLE(xz, -+ AS_HELP_STRING([--disable-xz], [disable xz]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _lzma" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.44.0 - diff --git a/package/python3/0023-Add-an-option-to-disable-uuid-module.patch b/package/python3/0023-Add-an-option-to-disable-uuid-module.patch deleted file mode 100644 index ef791c5effe..00000000000 --- a/package/python3/0023-Add-an-option-to-disable-uuid-module.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1bf575c16a957dfc5ee6913b462d24a4e882698e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 18 Aug 2018 10:54:56 +0200 -Subject: [PATCH] Add an option to disable uuid module - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/configure.ac b/configure.ac -index bd18ebe7582..6205e6782cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4318,6 +4318,15 @@ if test "$CURSES" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" - fi - -+AC_SUBST(UUID) -+AC_ARG_ENABLE(uuid, -+ AS_HELP_STRING([--disable-uuid], [disable uuid]), -+ [ UUID="${enableval}" ], [ UUID=yes ]) -+ -+if test "$UUID" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.44.0 - diff --git a/package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch deleted file mode 100644 index 80a0077c652..00000000000 --- a/package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7ee16a7096ccf9001f30b9076f562229efb9bcf3 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 11 Apr 2020 22:01:40 +0200 -Subject: [PATCH] Add an option to disable the berkeleydb module - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index da884ddf441..852cbaa6e4c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4331,6 +4331,12 @@ if test "$UUID" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" - fi - -+AC_ARG_ENABLE(berkeleydb, -+ AS_HELP_STRING([--disable-berkeleydb], [disable berkeleydb]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _dbm" -+ fi]) -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.44.0 - diff --git a/package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch deleted file mode 100644 index b55e1a28136..00000000000 --- a/package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d6706e827f703c63ab519d104c53833fa5cebe03 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 12 Nov 2020 00:16:18 +0100 -Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method - is not available - -Since commit [1] in cpython, an exception is raised when an encryption method -is not available. This eception is handled only if errno is set to EINVAL by -crypt() but uClibc-ng doesn't set errno in crypt() [2]. - -Fixes: -https://gitlab.com/buildroot.org/buildroot/-/jobs/830981961 -https://gitlab.com/buildroot.org/buildroot/-/jobs/830981979 - -[1] https://github.com/python/cpython/commit/0d3fe8ae4961bf551e7d5e42559e2ede1a08fd7c -[2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libcrypt/crypt.c?h=v1.0.36#n29 - -Signed-off-by: Romain Naour -[Daniel: updated for 3.10.7] -Signed-off-by: Daniel Lang ---- - Lib/crypt.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Lib/crypt.py b/Lib/crypt.py -index de4a14a3884..ba482487a7a 100644 ---- a/Lib/crypt.py -+++ b/Lib/crypt.py -@@ -98,7 +98,9 @@ def _add_method(name, *args, rounds=None): - result = crypt('', salt) - except OSError as e: - # Not all libc libraries support all encryption methods. -- if e.errno in {errno.EINVAL, errno.EPERM, errno.ENOSYS}: -+ # Not all libc libraries set errno when encryption method is not -+ # available. -+ if e.errno in {errno.EINVAL, errno.EPERM, errno.ENOSYS} or e.errno == 0: - return False - raise - if result and len(result) == method.total_size: --- -2.44.0 - diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 962d32b5d91..598164dca6d 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3118/ -md5 b353b8433e560e1af2b130f56dfbd973 Python-3.11.8.tar.xz +# From https://www.python.org/downloads/release/python-3123/ +md5 d68f25193eec491eb54bc2ea664a05bd Python-3.12.4.tar.xz # Locally computed -sha256 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 Python-3.11.8.tar.xz +sha256 f6d419a6d8743ab26700801b4908d26d97e8b986e14f95de31b32de2b0e79554 Python-3.12.4.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 86fa3b970d0..a82bc47a57d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 +PYTHON3_VERSION_MAJOR = 3.12 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -22,21 +22,25 @@ HOST_PYTHON3_CONF_OPTS += \ --disable-sqlite3 \ --disable-tk \ --with-expat=system \ - --disable-codecs-cjk \ - --disable-nis \ - --enable-unicodedata \ --disable-test-modules \ - --disable-idle3 \ - --disable-uuid \ - --disable-ossaudiodev + --disable-idle3 # Make sure that LD_LIBRARY_PATH overrides -rpath. # This is needed because libpython may be installed at the same time that # python is called. -# Make python believe we don't have 'hg', so that it doesn't try to -# communicate over the network during the build. +# TODO: nis and ossaudiodev modules will be dropped in 3.13: https://peps.python.org/pep-0594/ HOST_PYTHON3_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" + LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ + py_cv_module_unicodedata=yes \ + py_cv_module__codecs_cn=n/a \ + py_cv_module__codecs_hk=n/a \ + py_cv_module__codecs_iso2022=n/a \ + py_cv_module__codecs_jp=n/a \ + py_cv_module__codecs_kr=n/a \ + py_cv_module__codecs_tw=n/a \ + py_cv_module__uuid=n/a \ + py_cv_module_nis=n/a \ + py_cv_module_ossaudiodev=n/a PYTHON3_DEPENDENCIES = host-python3 libffi @@ -50,7 +54,7 @@ HOST_PYTHON3_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_HOST_PYTHON3_BZIP2),y) HOST_PYTHON3_DEPENDENCIES += host-bzip2 else -HOST_PYTHON3_CONF_OPTS += --disable-bzip2 +HOST_PYTHON3_CONF_ENV += py_cv_module__bz2=n/a endif ifeq ($(BR2_PACKAGE_HOST_PYTHON3_CURSES),y) @@ -62,7 +66,9 @@ endif ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) HOST_PYTHON3_DEPENDENCIES += host-openssl else -HOST_PYTHON3_CONF_OPTS += --disable-openssl +HOST_PYTHON3_CONF_ENV += \ + py_cv_module__hashlib=n/a \ + py_cv_module__ssl=n/a endif PYTHON3_INSTALL_STAGING = YES @@ -76,13 +82,14 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_BERKELEYDB),y) PYTHON3_DEPENDENCIES += berkeleydb else -PYTHON3_CONF_OPTS += --disable-berkeleydb +PYTHON3_CONF_ENV += py_cv_module__dbm=n/a endif ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) +PYTHON3_CONF_OPTS += --with-readline PYTHON3_DEPENDENCIES += readline else -PYTHON3_CONF_OPTS += --disable-readline +PYTHON3_CONF_OPTS += --without-readline endif ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y) @@ -93,9 +100,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_DECIMAL),y) PYTHON3_DEPENDENCIES += mpdecimal -PYTHON3_CONF_OPTS += --with-libmpdec=system +PYTHON3_CONF_OPTS += --with-system-libmpdec else -PYTHON3_CONF_OPTS += --with-libmpdec=none +PYTHON3_CONF_ENV += py_cv_module__decimal=n/a endif ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y) @@ -115,51 +122,58 @@ ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y) PYTHON3_DEPENDENCIES += openssl PYTHON3_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr else -PYTHON3_CONF_OPTS += --disable-openssl +PYTHON3_CONF_ENV += \ + py_cv_module__hashlib=n/a \ + py_cv_module__ssl=n/a endif ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y) -PYTHON3_CONF_OPTS += --disable-codecs-cjk +PYTHON3_CONF_ENV += \ + py_cv_module__codecs_cn=n/a \ + py_cv_module__codecs_hk=n/a \ + py_cv_module__codecs_iso2022=n/a \ + py_cv_module__codecs_jp=n/a \ + py_cv_module__codecs_kr=n/a \ + py_cv_module__codecs_tw=n/a endif ifneq ($(BR2_PACKAGE_PYTHON3_UNICODEDATA),y) -PYTHON3_CONF_OPTS += --disable-unicodedata +PYTHON3_CONF_ENV += py_cv_module_unicodedata=n/a endif # Disable auto-detection of uuid.h (util-linux) # which would add _uuid module support, instead # default to the pure python implementation -PYTHON3_CONF_OPTS += --disable-uuid +PYTHON3_CONF_ENV += py_cv_module__uuid=n/a ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y) PYTHON3_DEPENDENCIES += bzip2 else -PYTHON3_CONF_OPTS += --disable-bzip2 +PYTHON3_CONF_ENV += py_cv_module__bz2=n/a endif ifeq ($(BR2_PACKAGE_PYTHON3_XZ),y) PYTHON3_DEPENDENCIES += xz else -PYTHON3_CONF_OPTS += --disable-xz +PYTHON3_CONF_ENV += py_cv_module__lzma=n/a endif ifeq ($(BR2_PACKAGE_PYTHON3_ZLIB),y) PYTHON3_DEPENDENCIES += zlib else -PYTHON3_CONF_OPTS += --disable-zlib +PYTHON3_CONF_ENV += py_cv_module_zlib=n/a endif -ifeq ($(BR2_PACKAGE_PYTHON3_OSSAUDIODEV),y) -PYTHON3_CONF_OPTS += --enable-ossaudiodev -else -PYTHON3_CONF_OPTS += --disable-ossaudiodev +ifneq ($(BR2_PACKAGE_PYTHON3_OSSAUDIODEV),y) +PYTHON3_CONF_ENV += py_cv_module_ossaudiodev=n/a endif PYTHON3_CONF_ENV += \ ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes + ac_cv_working_tzset=yes \ + py_cv_module_nis=n/a # GCC is always compliant with IEEE754 ifeq ($(BR2_ENDIAN),"LITTLE") @@ -168,12 +182,6 @@ else PYTHON3_CONF_ENV += ac_cv_big_endian_double=yes endif -# uClibc is known to have a broken wcsftime() implementation, so tell -# Python 3 to fall back to strftime() instead. -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -PYTHON3_CONF_ENV += ac_cv_func_wcsftime=no -endif - ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) PYTHON3_DEPENDENCIES += gettext endif @@ -186,7 +194,6 @@ PYTHON3_CONF_OPTS += \ --disable-pydoc \ --disable-test-modules \ --disable-tk \ - --disable-nis \ --disable-idle3 \ --disable-pyc-build diff --git a/utils/genrandconfig b/utils/genrandconfig index fb493f3f31e..dbde6564171 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -275,6 +275,13 @@ async def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y\n' in configlines: return False + # On xtensa, python needs headers >= 3.17, but propagating that to all packages + # is a bit tedious, so just catch it here. + if 'BR2_XTENSA_CUSTOM=y\n' in configlines and \ + 'BR2_PACKAGE_PYTHON3=y\n' in configlines and \ + 'BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17=y\n' not in configlines: + return False + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y\n' in configlines: configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""\n') configlines.append('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"\n') From 9135bb95fc480841f3b901285803d0a7b1c2d916 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 22 May 2024 03:51:00 -0700 Subject: [PATCH 1201/3013] package/rtl8812au-aircrack-ng: bump to version 2024-05-22 on branch v5.6.4.2 This version adds support up to Linux version 6.9.1. Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index 6283cb0f87f..ea5ca3c56b2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 752d9ae67140966eddc463238fde1f6b86457db22a45f61c13886c3244eaffe1 rtl8812au-aircrack-ng-f23979f0d20aafb563ac71b56fcbc74268c798c2.tar.gz +sha256 d08bad19680047cb178d8984bfdd09d9ff7765b8c9ee35a9f8f87676f0c41a64 rtl8812au-aircrack-ng-b44d288f423ede0fc7cdbf92d07a7772cd727de4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index d5571b9d5c7..3a7c56a3fc6 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = f23979f0d20aafb563ac71b56fcbc74268c798c2 +RTL8812AU_AIRCRACK_NG_VERSION = b44d288f423ede0fc7cdbf92d07a7772cd727de4 RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From 4ae18c511a2a7e8b0b6cd7a2961ba4c0e395fe2a Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 22 May 2024 04:10:32 -0700 Subject: [PATCH 1202/3013] package/embiggen-disk: bump version to v20240521 Switch to the skiffos fork as the upstream is not maintained. Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/embiggen-disk/embiggen-disk.hash | 2 +- package/embiggen-disk/embiggen-disk.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/embiggen-disk/embiggen-disk.hash b/package/embiggen-disk/embiggen-disk.hash index 86e9346e9bf..02c99add6aa 100644 --- a/package/embiggen-disk/embiggen-disk.hash +++ b/package/embiggen-disk/embiggen-disk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 aa6019311ea869b1f7cbca640462eae6cfa0fef5a65ec5266ca394b261217960 embiggen-disk-9e7b2fc7b99c4dece41a805489a6ca377ce55a62-go2.tar.gz +sha256 25e536bd58969077554927a456cd3cb79e21f126e47545ba511abe64a0f3ba5e embiggen-disk-v20240521-go2.tar.gz sha256 063aedec1652c5a05c2d04c40e032b932453142ee8ef7fd53c04a9acc127fc95 LICENSE diff --git a/package/embiggen-disk/embiggen-disk.mk b/package/embiggen-disk/embiggen-disk.mk index 66f2087dbd1..47b86c072bf 100644 --- a/package/embiggen-disk/embiggen-disk.mk +++ b/package/embiggen-disk/embiggen-disk.mk @@ -4,8 +4,8 @@ # ################################################################################ -EMBIGGEN_DISK_VERSION = 9e7b2fc7b99c4dece41a805489a6ca377ce55a62 -EMBIGGEN_DISK_SITE = $(call github,bradfitz,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) +EMBIGGEN_DISK_VERSION = v20240521 +EMBIGGEN_DISK_SITE = $(call github,skiffos,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) EMBIGGEN_DISK_LICENSE = Apache-2.0 EMBIGGEN_DISK_LICENSE_FILES = LICENSE From fa7607026f3fab04836a2e0deb6de9f467a9cd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Mon, 27 May 2024 10:53:28 +0200 Subject: [PATCH 1203/3013] package/rt-tests: bump version to 2.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Arnout Vandecappelle --- package/rt-tests/rt-tests.hash | 2 +- package/rt-tests/rt-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 017447bce66..9682fde4061 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 761d10c4b7f5b28400f0c301fe0171eaa74f347df64cb359210254b8e6aff19f rt-tests-2.6.tar.xz +sha256 0e5b2fbc98ceb786bd113c9a30f0388d884b2d8c4bd6c569d94ae8b00a702bbb rt-tests-2.7.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 4b1aa317964..419260db3c8 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.6 +RT_TESTS_VERSION = 2.7 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING From 4aff617b9591dc46d965eaa00f9701943e0cd723 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 28 May 2024 10:23:56 +0200 Subject: [PATCH 1204/3013] package/openssh: fix build failure with gcc 11.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch fix the following build failure: output/host/bin/arm-buildroot-linux-uclibcgnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -pipe -Wno-error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleading-indentation -fno-strict-aliasing -D_FORTIFY_SOURCE=2 -ftrapv -fzero-call-used-regs=used -fno-builtin-memset -fstack-protector-strong -fPIC -I. -I.. -I. -I./.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE -DHAVE_CONFIG_H -c port-aix.c sha2.c: In function ‘SHA256Init’: sha2.c:360:1: sorry, unimplemented: ‘-fzero-call-used-regs’ not supported on this target 360 | } | ^ make[3]: *** [Makefile:106: sha2.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [Makefile:199: openbsd-compat/libopenbsd-compat.a] Error 2 This commit applies an upstream patch that improves the detection of -fzero-call-used-regs=used. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...tection-of-fzero-call-used-regs-used.patch | 32 +++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 35 insertions(+) create mode 100644 package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch diff --git a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch new file mode 100644 index 00000000000..1b91b15a798 --- /dev/null +++ b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch @@ -0,0 +1,32 @@ +From f9193f03db0029fc9c31fbdb5c66a2737446bd8f Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Mon, 25 Mar 2024 09:28:02 +1100 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=used. + +Should better detect problems with gcc 13 on m68k. bz#3673 from Colin +Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 + +Signed-off-by: Darren Tucker +Upstream: https://github.com/openssh/openssh-portable/commit/f9193f03db0029fc9c31fbdb5c66a2737446bd8f +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 033df501c3d8..176a8d1c9282 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,7 +20,10 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++int i; ++double d; + const char *f3(int s) { ++ i = (int)d; + return s ? "good" : "gooder"; + } + int main(int argc, char **argv) { +-- +2.43.0 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index d7f4db59ca3..5a568d5fd17 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-Improve-detection-of-fzero-call-used-regs-used.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From 6701a91e69a1dd1d5afdf627565936cf7df5cf70 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Thu, 30 May 2024 09:52:16 +0200 Subject: [PATCH 1205/3013] package/libgit2: bump version to 1.8.1 Upstream notes that libhttp-parser is unmaintained and suggest llhttp as a replacement. This version bundles llhttp (and includes its license in COPYING) but still allows to use a system-provided libhttp-parser. llhttp (https://github.com/nodejs/llhttp) is a C library that depends on a nodejs interpreter and more than 10 npm dependencies to generate its parser code. The bundled version contains the generated sources and could be built without nodejs. But distributing this generated code as part of libgit2 would probably be legally dubious because of the GPL's original source code provision, even if llhttp is MIT-licensed. Packaging llhttp would be a daunting task and its build will require considerable time and space, so for now, keep using libhttp-parser. Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 20e69292653..c02a149a683 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9e1d6a880d59026b675456fbb1593c724c68d73c34c0d214d6eb848e9bbd8ae4 libgit2-1.8.0.tar.gz -sha256 08041a7e9c4d0e5e84f9711c824a0bd0366ee782ec29c6d7275fdab73e2ca115 COPYING +sha256 8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e libgit2-1.8.1.tar.gz +sha256 e3712465634e97cfd850822a4eb5ac7d2f8a10f753189366d5a2060046f28288 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 3364841e8f2..e817a5916aa 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.8.0 +LIBGIT2_VERSION = 1.8.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ @@ -22,7 +22,7 @@ LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ - -DUSE_HTTP_PARSER=system \ + -DUSE_HTTP_PARSER=http-parser \ -DUSE_NTLMCLIENT=OFF \ -DUSE_XDIFF=builtin \ -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) From 853b7661bf5ddca5d4b81964ef1a19a133beac85 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 2 Jun 2024 16:43:43 +0200 Subject: [PATCH 1206/3013] package/riscv-isa-sim: bump to git version 00dfa28cd7 riscv-isa-sim (Spike) has not received any tag or release in the past years. As of the time of this commit, the latest release is still v1.1.0 (2021-12-17), see [1]. This commit bumps to the latest commit 00dfa28cd7. For the commit log, see [2]. This bump includes many RISC-V spec and extension updates. Also, when host gcc >= 13, riscv-isa-sim compilation fails with output: In file included from ./fesvr/syscall.h:6, from ./fesvr/syscall.cc:3: ./fesvr/device.h:15:30: error: 'uint64_t' was not declared in this scope 15 | typedef std::function callback_t; | ^~~~~~~~ This bump includes commits for fix those issues. For example, see [3]. Fixes: [4] and few others. [1] https://github.com/riscv-software-src/riscv-isa-sim/releases/tag/v1.1.0 [2] https://github.com/riscv-software-src/riscv-isa-sim/commits/00dfa28cd71326a9b553052bf0160cb76f0e7e07 [3] https://github.com/riscv-software-src/riscv-isa-sim/commit/0a7bb5403d0290cea8b2356179d92e4c61ffd51d [4] http://autobuild.buildroot.org/results/c30/c300f1c84033aec1d265b682e4c1da5362d25f8b/ Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/riscv-isa-sim/riscv-isa-sim.hash | 2 +- package/riscv-isa-sim/riscv-isa-sim.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/riscv-isa-sim/riscv-isa-sim.hash b/package/riscv-isa-sim/riscv-isa-sim.hash index d787a03e4c4..a935cdcf80d 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.hash +++ b/package/riscv-isa-sim/riscv-isa-sim.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9b29c220fed1e867e3bea4b5c565f2629237d525a4d9fe1668699c4406003a1f riscv-isa-sim-1.1.0.tar.gz +sha256 fb4420fbc8fe88799e5cd3195920afab99a18bc919e6c675a5e55c7c90079cb4 riscv-isa-sim-00dfa28cd71326a9b553052bf0160cb76f0e7e07.tar.gz sha256 c65e436d18972c9c4bd192494fe4870bd2e158179474975b80a3559f27631632 LICENSE diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index 90eed93c36d..a31192da0a8 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -4,8 +4,8 @@ # ################################################################################ -RISCV_ISA_SIM_VERSION = 1.1.0 -RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) +RISCV_ISA_SIM_VERSION = 00dfa28cd71326a9b553052bf0160cb76f0e7e07 +RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc From d6b635db9bddd4ca7d4463c9c36d03bafe1ba71f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:21:25 +0200 Subject: [PATCH 1207/3013] package/libdrm: bump version to 2.4.121 Release notes: https://lists.x.org/archives/xorg-announce/2024-June/003516.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 6 +++--- package/libdrm/libdrm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index dd43a89d680..8b0f7c0d743 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2024-January/003441.html -sha256 3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a libdrm-2.4.120.tar.xz -sha512 6dc16e5134a669eeb59debb1dc2d15b857483ab7476dc2b94bd05a32d8953f046f5656f6cf9e1a63e97e7156fb65ebb58b6a29fe45cb6326058baaf820626e70 libdrm-2.4.120.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-June/003516.html +sha256 909084a505d7638887f590b70791b3bbd9069c710c948f5d1f1ce6d080cdfcab libdrm-2.4.121.tar.xz +sha512 cc8816d61884caa0e404348d1caeb0b2952fb50e1dc401716adfe08121096e2a67826db0bda0d8b163d67c5ee048870177670d5eac28a5abe5792d09ba77ab2e libdrm-2.4.121.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index e0c1217b38e..c87a225515b 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.120 +LIBDRM_VERSION = 2.4.121 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From c8057515a429d531f735c72042656c3bd0efa700 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:22:22 +0200 Subject: [PATCH 1208/3013] package/{mesa3d, mesa3d-headers}: bump version to 24.0.9 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-May/000761.html https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html Removed two patches which are included in this version 24.0.8. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- .../0006-drisw-fix-build-without-dri3.patch | 58 ------------------- ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 -------------- package/mesa3d/mesa3d.hash | 6 +- package/mesa3d/mesa3d.mk | 2 +- 5 files changed, 5 insertions(+), 105 deletions(-) delete mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch delete mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index e35774a9429..33c60b285f9 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.7 +MESA3D_HEADERS_VERSION = 24.0.9 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch deleted file mode 100644 index ab27d384cf8..00000000000 --- a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3ab46dcfda9edf5c9bc27c8f5031146d9d9d8ade Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 18 Jan 2024 22:50:16 +0100 -Subject: [PATCH] drisw: fix build without dri3 - -commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") -added dri3_priv.h header and dri3_check_multibuffer() function in drisw that -can be build without dri3. - - i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': - drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' - collect2: error: ld returned 1 exit status - -Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using -dri3_check_multibuffer(). - -Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") - -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 - -Signed-off-by: Romain Naour ---- - src/glx/drisw_glx.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c -index 3d3f75259bc..4b19e2d7707 100644 ---- a/src/glx/drisw_glx.c -+++ b/src/glx/drisw_glx.c -@@ -32,7 +32,9 @@ - #include - #include "dri_common.h" - #include "drisw_priv.h" -+#ifdef HAVE_DRI3 - #include "dri3_priv.h" -+#endif - #include - #include - #include -@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, - goto handle_error; - } - -+#ifdef HAVE_DRI3 - if (pdpyp->zink) { - bool err; - psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); -@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, - goto handle_error; - } - } -+#endif - - glx_config_destroy_list(psc->base.configs); - psc->base.configs = configs; --- -2.43.0 - diff --git a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch deleted file mode 100644 index f9e4d50fd79..00000000000 --- a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 83b4ff6616708bd7ba5981d22cd5211ca6787d58 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 24 Jan 2024 14:28:32 +0100 -Subject: [PATCH] glxext: don't try zink if not enabled in mesa - -Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") -added an automatic zink fallback even when the zink gallium is not -enabled at build time. - -It leads to unexpected error log while loading drisw driver and -zink is not installed on the rootfs: - - MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so - -Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") - -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 - -Signed-off-by: Romain Naour ---- - src/glx/glxext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/glx/glxext.c b/src/glx/glxext.c -index 39d5f08bdcf..e106eb40046 100644 ---- a/src/glx/glxext.c -+++ b/src/glx/glxext.c -@@ -904,9 +904,11 @@ __glXInitialize(Display * dpy) - #endif /* HAVE_DRI3 */ - if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) - dpyPriv->dri2Display = dri2CreateDisplay(dpy); -+#if defined(HAVE_ZINK) - if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) - try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && - !getenv("GALLIUM_DRIVER"); -+#endif /* HAVE_ZINK */ - } - #endif /* GLX_USE_DRM */ - if (glx_direct) --- -2.43.0 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index f2c25464f42..d506d398b88 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-May/000758.html -sha256 7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a mesa-24.0.7.tar.xz -sha512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c mesa-24.0.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html +sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz +sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 6bccdaed047..ce460c44758 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.7 +MESA3D_VERSION = 24.0.9 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From b0fe6d1be9b306addf45e3722f45daa2de4ac4e5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:22:46 +0200 Subject: [PATCH 1209/3013] package/tor: bump version to 0.4.8.12 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes https://forum.torproject.org/t/stable-release-0-4-8-12/13060 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 4052f11736c..bea590b133a 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.11.tar.gz.sha256sum -sha256 8f2bdf90e63380781235aa7d604e159570f283ecee674670873d8bb7052c8e07 tor-0.4.8.11.tar.gz +# From https://dist.torproject.org/tor-0.4.8.12.tar.gz.sha256sum +sha256 ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874 tor-0.4.8.12.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 9986a5f472a..4d7fabc79f4 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.11 +TOR_VERSION = 0.4.8.12 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 50bdb2a3b7ace71065dc0b8a81bebc173f84a8c4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:23:17 +0200 Subject: [PATCH 1210/3013] package/libcurl: bump version to 8.8.0 Changelog: https://curl.se/changes.html#8_8_0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 7fcad973c3c..7ba45b79d7a 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.7.1.tar.xz.asc +# https://curl.se/download/curl-8.8.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd curl-8.7.1.tar.xz +sha256 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 curl-8.8.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 99320c13157..172dd220715 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.7.1 +LIBCURL_VERSION = 8.8.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 127ddbe5118f68395c0305fb9ff44342bfc1d64b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Jun 2024 09:25:24 +0200 Subject: [PATCH 1211/3013] package/uclibc: update to 1.0.49 git shortlog v1.0.49...v1.0.48 Dmitry Chestnykh (6): Correct uClibc compilation. Fix uClibc build for nds32 with gcc-14. Fix riscv32 build with gcc-14. riscv32: Fix `struct ucontext` definition. Fix wrong `struct ucontext_t` typedef for all arches. Cast to proper types inside atomic macroses. Fabrice Fontaine (1): libc/sysdeps/linux/common/utime.c: fix riscv32 build Joe Damato (1): epoll.h: Add epoll ioctls Max Filippov (9): iconv: fix type mismatches ldso: FDPIC: fix type mismatches ldso: arm: fix build with gcc-14 malloc/memalign: avoid integer overflow fix kernel_stat64 definition linuxthreads: enable unwinding over signal frames xtensa: use compiler-provided XCHAL macros xtensa: make _init and _fini hidden xtensa: add FDPIC support Waldemar Brodkorb (9): futimesat: add missing header sparc64: Fix incorrect sigreturn stub function implementation csky: allow time64 m68k: fix noMMU ELF compile with gcc 14.x Revert "nds32: sync with binutils 2.37, gcc 11.2 and linux 5.10.93 changes" m68k: fix for m68000 cpu config: make ctor/dtor visible again config: enable TIME64 by default bump version for 1.0.49 release Yuriy Kolerov (1): libc: cast free() argument to void * in wchar.c Patches applied upstream. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../0001-futimesat-add-missing-header.patch | 26 -------------- .../0002-fix-kernel_stat64-definition.patch | 35 ------------------- package/uclibc/uclibc.hash | 4 +-- package/uclibc/uclibc.mk | 2 +- 4 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 package/uclibc/0001-futimesat-add-missing-header.patch delete mode 100644 package/uclibc/0002-fix-kernel_stat64-definition.patch diff --git a/package/uclibc/0001-futimesat-add-missing-header.patch b/package/uclibc/0001-futimesat-add-missing-header.patch deleted file mode 100644 index f8af3290fa9..00000000000 --- a/package/uclibc/0001-futimesat-add-missing-header.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4bcf25e75df857806623ff80924675bf849a60d2 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 8 May 2024 10:08:08 +0200 -Subject: [PATCH] futimesat: add missing header - -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=4bcf25e75df857806623ff80924675bf849a60d2 ---- - libc/sysdeps/linux/common/futimesat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libc/sysdeps/linux/common/futimesat.c b/libc/sysdeps/linux/common/futimesat.c -index fd19fea7c..bf36550dd 100644 ---- a/libc/sysdeps/linux/common/futimesat.c -+++ b/libc/sysdeps/linux/common/futimesat.c -@@ -7,6 +7,7 @@ - */ - - #include -+#include - #include - - #ifdef __NR_futimesat --- -2.30.2 - diff --git a/package/uclibc/0002-fix-kernel_stat64-definition.patch b/package/uclibc/0002-fix-kernel_stat64-definition.patch deleted file mode 100644 index 5a87586af89..00000000000 --- a/package/uclibc/0002-fix-kernel_stat64-definition.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 186878405324e96f61d896a149f623e0c792c972 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 14 May 2024 23:18:56 -0700 -Subject: [PATCH] fix kernel_stat64 definition - -The commit 74ca8d6f5d2e ("remove UCLIBC_HAS_LFS") removed conditional -compilation dependent on __UCLIBC_HAS_LFS__, assuming it to be always -defined, but removed the wrong branch in the definition of -kernel_stat64. -Fix kernel_stat64 definition to be stat64. - -Signed-off-by: Max Filippov -Tested-by: Chris Packham -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=186878405324e96f61d896a149f623e0c792c972 ---- - libc/sysdeps/linux/common-generic/bits/kernel_stat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h -index 7a97bb4d7..e874a4a9f 100644 ---- a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h -+++ b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h -@@ -18,7 +18,7 @@ - * However that requires more #ifndef in relevant wrappers, - * further uglifying them - */ --#define kernel_stat64 stat -+#define kernel_stat64 stat64 - - #endif /* _BITS_STAT_STRUCT_H */ - --- -2.30.2 - diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 7097bbf99a5..1067ea9b0fe 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.47/uClibc-ng-1.0.48.tar.xz.sha256 -sha256 3bf5fc6cc5cbc454b6c478424755c6f71e7c15578a2c966f02606aa5c5596e21 uClibc-ng-1.0.48.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.49/uClibc-ng-1.0.49.tar.xz.sha256 +sha256 340f9d5dd1159c69c3380654e39e567cbb304afcd3f9dfa2e9833f0fa13f5bbe uClibc-ng-1.0.49.tar.xz # Locally calculated sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index b7aba27b003..31f9899f009 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.48 +UCLIBC_VERSION = 1.0.49 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From fd5623150dcc23441c4f0bd586378daeb91d66ea Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Mon, 17 Jun 2024 09:55:03 +0200 Subject: [PATCH 1212/3013] package/waf: bump to v2.1.1 Signed-off-by: Titouan Christophe Signed-off-by: Thomas Petazzoni --- package/waf/waf.hash | 6 +++--- package/waf/waf.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/waf/waf.hash b/package/waf/waf.hash index 1ad535febb4..543bea5d7bc 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,7 +1,7 @@ # Locally computed -sha1 e310e29a44f23f80591f2aa6c2d4c30e5f1a26a8 waf-2.0.26 -sha256 dcec3e179f9c33a66544f1b3d7d91f20f6373530510fa6a858cddb6bfdcde14b waf-2.0.26 +sha1 9ee587d802ffd15a2e7cae579560d00754db4fad waf-2.1.1 +sha256 2e66e01fd564f09106419389119c78143327c89a35f26ee3ed376f0ee410a14d waf-2.1.1 # The waf script also contains its license, but is renamed `waf` in the extract # step, so this is a synonym for the above, to check WAF_LICENSE -sha256 dcec3e179f9c33a66544f1b3d7d91f20f6373530510fa6a858cddb6bfdcde14b waf +sha256 2e66e01fd564f09106419389119c78143327c89a35f26ee3ed376f0ee410a14d waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index bffa27a926c..a12d15a2284 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.26 +WAF_VERSION = 2.1.1 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause From 61a7edc0c89b336d63551469f5a2291418fdbc19 Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Mon, 17 Jun 2024 09:55:38 +0200 Subject: [PATCH 1213/3013] package/redis: bump to v7.2.5 From the release notes: ================================================================================ Redis 7.2.5 Released Thu 16 May 2024 12:00:00 IST ================================================================================ Upgrade urgency MODERATE: Program an upgrade of the server, but it's not urgent. Bug fixes ========= * A single shard cluster leaves failed replicas in CLUSTER SLOTS instead of removing them (#12824) * Crash in LSET command when replacing small items and exceeding 4GB (#12955) * Blocking commands timeout is reset due to re-processing command (#13004) * Conversion of numbers in Lua args to redis args can fail. Bug introduced in 7.2.0 (#13115) Bug fixes in CLI tools ====================== * redis-cli: --count (for --scan, --bigkeys, etc) was ignored unless --pattern was also used (#13092) * redis-check-aof: incorrectly considering data in manifest format as MP-AOF (#12958) Signed-off-by: Titouan Christophe Signed-off-by: Thomas Petazzoni --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 378b9303744..5c3a5ea4d8e 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59 redis-7.2.4.tar.gz +sha256 5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d redis-7.2.5.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 2680b11b74b..852bf31ca03 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.2.4 +REDIS_VERSION = 7.2.5 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 9ce214acc4a32d154c4ba75db35c0cea566ee3df Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 12 Jun 2024 17:07:30 +0200 Subject: [PATCH 1214/3013] package/rdma-core: bump to version v52.0 For change log since v51.0, see: https://github.com/linux-rdma/rdma-core/releases/tag/v52.0 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/rdma-core/rdma-core.hash | 2 +- package/rdma-core/rdma-core.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index f8b01e882dc..0f28b5609f7 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a4065b0454249839dc75b61c6ee428e917d9cddf964ff7a33d479f00d1264ba0 rdma-core-51.0.tar.gz +sha256 05e111f560b7c5bef1a208880a3d94eb2e7f1ad484bf916a81780d2fde5d3dcc rdma-core-52.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 834d9ea3efe..3ad3ad59546 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 51.0 +RDMA_CORE_VERSION = 52.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md From d40e57e945e8348f74d0228e00c9424ce3bfb68a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 12 Jun 2024 19:06:03 +0200 Subject: [PATCH 1215/3013] package/libgtk3: bump to version 3.24.42 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 0fa4873443a..a1d8b1694d1 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.41.sha256sum -sha256 47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa gtk+-3.24.41.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.sha256sum +sha256 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2 gtk+-3.24.42.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 7e5882f830e..547fd194a5a 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).41 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).42 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From 65c66c2ba170d75bf0a00ff832232c523e62de91 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Jun 2024 18:21:53 +0200 Subject: [PATCH 1216/3013] package/sentry-cli: needs pkgconf and openssl Signed-off-by: Yann E. MORIN (cherry picked from commit 2bf45fa99c09302c4d313b79ae7b165a958e354e) Signed-off-by: Peter Korsgaard --- package/sentry-cli/sentry-cli.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk index df419f81e19..3ddf5e44fc0 100644 --- a/package/sentry-cli/sentry-cli.mk +++ b/package/sentry-cli/sentry-cli.mk @@ -9,6 +9,6 @@ SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) SENTRY_CLI_LICENSE = BSD-3-clause SENTRY_CLI_LICENSE_FILES = LICENSE -HOST_SENTRY_CLI_DEPENDENCIES = host-zlib +HOST_SENTRY_CLI_DEPENDENCIES = host-pkgconf host-openssl host-zlib $(eval $(host-cargo-package)) From 118c824b565442bfe1d4ae1c0a39d330e624b854 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 18 Jun 2024 15:14:39 +0000 Subject: [PATCH 1217/3013] support/scripts/apply-patches: fallback $TAR to `tar` Commit f77d698f83b230f7efcb7d28af3aacfa9589cc89 changed apply-patches to use $TAR instead of `tar`, but did not define a fallback if $TAR is not defined. This results in an error when calling apply-patches.sh from outside Buildroot's Makefile. Our team uses this script to setup local checkouts of Buildroot package's with patches for development. Signed-off-by: Brandon Maier Signed-off-by: Peter Korsgaard --- support/scripts/apply-patches.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 4e633b23bef..73aa6c8e5fe 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -46,6 +46,8 @@ patchdir=${2-../kernel-patches} shift 2 patchpattern=${@-*} +export TAR=${TAR:-tar} + # use a well defined sorting order export LC_COLLATE=C From 74b0e7ebabc3cbe33b28d899cba169657762ad52 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sun, 9 Jun 2024 22:53:45 +0200 Subject: [PATCH 1218/3013] package/ltp-testsuite: Bump version to 20240524 Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/ltp-testsuite/ltp-testsuite.hash | 4 ++-- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 1562f346b43..03aa5861565 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20240129/ltp-full-20240129.tar.xz.sha256 -sha256 c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025 ltp-full-20240129.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20240524/ltp-full-20240524.tar.xz.sha256 +sha256 2b7c07bb281b7ec49981eeb06c4b66f147b103977254632678d384034f6e9663 ltp-full-20240524.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 0996b77e586..bbeb80c732d 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20240129 +LTP_TESTSUITE_VERSION = 20240524 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) From 50ff485793dc34cef38876bb65c0c100702ef92b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Jun 2024 13:30:46 +0200 Subject: [PATCH 1219/3013] {linux, linux-headers}: bump 6.{1, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 7dd7a6820551278d6c002d2bda394364f9932946) Signed-off-by: Peter Korsgaard --- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index b972557fc00..9374af71b0d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz -sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz -sha256 9019f427bfdc9ced5bc954d760d37ac08c0cdffb45ad28087fc45a73e64336c9 linux-6.1.92.tar.xz +sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz +sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 linux-5.15.160.tar.xz sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 48101783b94..487d941a16f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -419,8 +419,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.277" if BR2_KERNEL_HEADERS_5_4 default "5.10.218" if BR2_KERNEL_HEADERS_5_10 default "5.15.160" if BR2_KERNEL_HEADERS_5_15 - default "6.1.92" if BR2_KERNEL_HEADERS_6_1 - default "6.6.32" if BR2_KERNEL_HEADERS_6_6 + default "6.1.93" if BR2_KERNEL_HEADERS_6_1 + default "6.6.33" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From b39286acfc134d66d56b78720c4a6a7547e16b16 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:44 +0200 Subject: [PATCH 1220/3013] package/libopenssl: use $(RM) instead of rm Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index d209bb8e96b..88debf114a3 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -135,8 +135,8 @@ endef define LIBOPENSSL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install - rm -rf $(TARGET_DIR)/usr/lib/ssl - rm -f $(TARGET_DIR)/usr/bin/c_rehash + $(RM) -rf $(TARGET_DIR)/usr/lib/ssl + $(RM) -f $(TARGET_DIR)/usr/bin/c_rehash endef # libdl has no business in a static build @@ -166,7 +166,7 @@ endif ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES - rm -rf $(TARGET_DIR)/usr/lib/engines-1.1 + $(RM) -rf $(TARGET_DIR)/usr/lib/engines-1.1 endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES endif From 7f9291bfe4db9f840fe0e3c4b0df2ff4acd9560c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:45 +0200 Subject: [PATCH 1221/3013] package/libopenssl: replace engines-1.1 to engines-3 The bump to version 3.0.9 in commit 3c66f65a6a54 (package/libopenssl: bump version to 3.0.9), and all subsequent updates, forgot to change the directory name, which remained that of version 1.1. The patch fixes the directory name to be consistent with the version. In the case the library was not built with engine support, this resulted in the presence of files in the root file system that should have been removed. Fixes: 3c66f65a6a549930870f2c0d98abb5ca9321d2a5 Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 88debf114a3..14313a80fe7 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -166,7 +166,7 @@ endif ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES - $(RM) -rf $(TARGET_DIR)/usr/lib/engines-1.1 + $(RM) -rf $(TARGET_DIR)/usr/lib/engines-3 endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES endif From c2761b52663155e9247dc23350f7159493837d0e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:46 +0200 Subject: [PATCH 1222/3013] package/libopenssl: use consistent logic The patch expresses the same condition in positive logic, consistent with what has been coded in other parts of the module and generally in Buildroot. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 14313a80fe7..ed36fb593dd 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -164,7 +164,7 @@ endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_BIN endif -ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES $(RM) -rf $(TARGET_DIR)/usr/lib/engines-3 endef From e0bdc5ddb8a64e89709db72ad550334618cc0c0c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:47 +0200 Subject: [PATCH 1223/3013] package/libopenssl: use `no-apps' configuration option With version 3.2.0 of OpenSSL, the "no-apps" configuration option was added, which does not build apps, e.g. the openssl program. This is handy for minimization. This option also disables tests. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index ed36fb593dd..fe472e2c7a1 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -84,6 +84,7 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-libfuzzer \ no-fuzz-afl \ no-afalgeng \ + $(if $(BR2_PACKAGE_LIBOPENSSL_BIN),,no-apps) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ @@ -156,14 +157,6 @@ endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_PERL_SCRIPTS endif -ifeq ($(BR2_PACKAGE_LIBOPENSSL_BIN),) -define LIBOPENSSL_REMOVE_BIN - $(RM) -f $(TARGET_DIR)/usr/bin/openssl - $(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.*,c_*} -endef -LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_BIN -endif - ifeq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES $(RM) -rf $(TARGET_DIR)/usr/lib/engines-3 From 623d3bbe43e9193aa8e3395367d01af59071b859 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:48 +0200 Subject: [PATCH 1224/3013] package/libopenssl: no-engine Even though the "no-engine" option effectively disables the compilation of the engine, it still creates the installation directory, which ends up being empty. For this reason, the patch does not remove the hook for removing the directory if the BR2_PACKAGE_LIBOPENSSL_ENGINES option is not enabled. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fe472e2c7a1..89a9189bb85 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -85,6 +85,7 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-afl \ no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_BIN),,no-apps) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENGINES),,no-engine) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ From 60fc945734ddc5b1caafea8f148cd89649a36f31 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 20 Jun 2024 20:21:44 +0200 Subject: [PATCH 1225/3013] package/go: ensure the toolchain is available The toolchain is needed to build the final-stage go compiler, when it should have CGO support. However, in commit 0290c543dec8 (package/go: new subdirectory for go variants), the HOST_GO_DEPENDENCIES assignment was only partially split off to the new location; part of it was left in the ole go.mk to act as common variables. With that commit, the go package had not been renamed, which meant that the dependencies were still correct. But in commit fa2536ec9401 (package/go: make host package a virtual package), the 'go' package was renamed to 'go-src', and replaced by a 'go' virtual package. The variables in the go-src package were properly renamed, and the variables in the go virtual package were properly _not_ renamed. As a consequence, the go-src package lost its dependency on the toolchain when needed, while the go virtual package still had it. However, that was not correct when CGO is enabled (i.e. when the target has threads): go-src then fails to build: Building Go cmd/dist using [...]/host/lib/go-1.21.8. (go1.21.8 linux/amd64) go tool dist: cannot invoke C compiler ["[...]/host/bin/aarch64-linux-gcc"]: fork/exec [...]/host/bin/aarch64-linux-gcc: no such file or directory Go needs a system C compiler for use with cgo. To set a C compiler, set CC=the-compiler. To disable cgo, set CGO_ENABLED=0. After some retro-thinking, the reasoning behind this was that the toolchain would _also_ be needed when using the prebuilt go-bin, which is indeed correct, so by having it as a dependency of the virtual package, it would ensure the toolchain be present in both cases, when building from scratch or when using a prebuilt go. The oversight being that the toolchain is _also_ needed to actually build go when CGO is enabled. We fix this by handling the toolchain dependency for CGO by exposing it in a variable, that can be used as a dependency in go-src, like is done to actually enable or disable CGO support. We still ensure that host-go still depends on it, for a future go-bin provider. Signed-off-by: Yann E. MORIN --- package/go/go-src/go-src.mk | 4 +++- package/go/go.mk | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/go/go-src/go-src.mk b/package/go/go-src/go-src.mk index 1e061e20bc1..0d1a9b3187d 100644 --- a/package/go/go-src/go-src.mk +++ b/package/go/go-src/go-src.mk @@ -12,7 +12,9 @@ GO_SRC_LICENSE_FILES = LICENSE GO_SRC_CPE_ID_VENDOR = golang HOST_GO_SRC_PROVIDES = host-go -HOST_GO_SRC_DEPENDENCIES = host-go-bootstrap-stage3 +HOST_GO_SRC_DEPENDENCIES = \ + host-go-bootstrap-stage3 \ + $(HOST_GO_DEPENDENCIES_CGO) ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) diff --git a/package/go/go.mk b/package/go/go.mk index 6f928932046..91a8fb828f5 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -83,7 +83,7 @@ HOST_GO_TARGET_ENV = \ # any target package needing cgo support must include # 'depends on BR2_TOOLCHAIN_HAS_THREADS' in its config file. ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -HOST_GO_DEPENDENCIES += toolchain +HOST_GO_DEPENDENCIES_CGO += toolchain HOST_GO_CGO_ENABLED = 1 else HOST_GO_CGO_ENABLED = 0 @@ -95,6 +95,9 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +# Ensure the toolchain is available, whatever the provider +HOST_GO_DEPENDENCIES += $(HOST_GO_DEPENDENCIES_CGO) + # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ From 9edaaea06f76f49156a296124450a9c393eebc47 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 15 Jun 2024 12:23:31 +0200 Subject: [PATCH 1226/3013] package/octave: add optional libcurl support Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 913a6c7788ef2dcc76860e45d2abe70cce812b9d) Signed-off-by: Peter Korsgaard --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 6a21bef7b87..f3caac3d3a4 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -36,6 +36,13 @@ else OCTAVE_CONF_OPTS += --without-magick endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +OCTAVE_CONF_OPTS += --with-curl +OCTAVE_DEPENDENCIES += libcurl +else +OCTAVE_CONF_OPTS += --without-curl +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From 583ecdb8b433190e82ea4497b6b75a3f74b8b173 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Jun 2024 20:20:23 +0200 Subject: [PATCH 1227/3013] package/nut: needs threads threads are mandantory since bump to version 2.8.2 in commit 4edd837ac0193db83202030ee2997ac811e6bc45 and https://github.com/networkupstools/nut/commit/ff401e538bcbead62a3532887135518ef9e779df: In file included from nutipc.cpp:38: ../include/nutipc.hpp:455:3: error: 'pthread_t' does not name a type 455 | pthread_t m_impl; | ^~~~~~~~~ Fixes: 4edd837ac0193db83202030ee2997ac811e6bc45 - http://autobuild.buildroot.org/results/d16a24d60b298d7616a516ec0c6c30696ed93a58 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ddc46ee1a2024ec9eb38718e34ab9aca38a7302b) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 5 +++-- package/nut/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index e6d549f81f1..5f39507cffd 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -430,13 +430,14 @@ config BR2_PACKAGE_COLLECTD_NTPD config BR2_PACKAGE_COLLECTD_NUT bool "nut" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_NUT help The NUT plugin collects uninterruptible power supply (UPS) statistics using the Network UPS Tools (NUT). -comment "nut needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "nut needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_COLLECTD_OLSRD bool "olsrd" diff --git a/package/nut/Config.in b/package/nut/Config.in index df647b9b48d..0ecd33d583a 100644 --- a/package/nut/Config.in +++ b/package/nut/Config.in @@ -1,11 +1,12 @@ -comment "nut needs a toolchain w/ C++" +comment "nut needs a toolchain w/ C++, threads" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_NUT bool "nut" depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help Network UPS tools From 40240ac30afc4c6af765794f38e6815162ca61fa Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 Jun 2024 15:57:23 +0200 Subject: [PATCH 1228/3013] package/xz: bump version to 5.4.7 - add key hint for download signature check - update COPYING hash due to [1] (change of home page URL) For details see [2]. This version was released after the backdoor, but never included the backdoor code (it's from the older stable branch). [1] https://github.com/tukaani-project/xz/commit/c5c091332c6953a0ce940cb355ea9e99491429fc [2] https://github.com/tukaani-project/xz/releases/tag/v5.4.7 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle --- package/xz/xz.hash | 8 +++++--- package/xz/xz.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index e8025a80650..ff070f67757 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,11 @@ # Locally calculated after checking pgp signature -# https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.bz2.sig -sha256 913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49 xz-5.4.6.tar.bz2 +# https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5.4.7.tar.bz2.sig +# using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin + +sha256 9976ed9cd0764e962d852d7d519ee1c3a7f87aca3b86e5d021a45650ba3ecb41 xz-5.4.7.tar.bz2 # Hash for license files -sha256 29a1e305b2e34eefe5d4602d00cde1d528b71c5d9f2eec5106972cf6ddb6f73f COPYING +sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 40fa59ca7c6..d5dceb0eae0 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.4.6 +XZ_VERSION = 5.4.7 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES From d1d77eb274761d1f2d24ee4b55a374e917c67a8e Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 Jun 2024 15:57:24 +0200 Subject: [PATCH 1229/3013] package/xz: bump version to 5.6.2 - bump version to 5.6.2 - add BSD-0-Clause and update license file hash accordingly (see [1], [2], [3], [4], [5], [6], [7] and [8]) For details see [9]. This version skips the 5.6.0 and 5.6.1 releases which had the backdoor. [1] https://github.com/tukaani-project/xz/commit/b1ee6cf259bb49ce91abe9f622294524e37edf4c [2] https://github.com/tukaani-project/xz/commit/689e0228baeb95232430e90d628379db89583d71 [3] https://github.com/tukaani-project/xz/commit/28ce45e38fbed4b5f54f2013e38dab47d22bf699 [4] https://github.com/tukaani-project/xz/commit/17aa2e1a796d3f758802df29afc89dcf335db567 [5] https://github.com/tukaani-project/xz/commit/bfd0c7c478e93a1911b845459549ff94587b6ea2 [6] https://github.com/tukaani-project/xz/commit/fd7faa4c338a42a6a40e854b837d285ae2e8c609 [7] https://github.com/tukaani-project/xz/commit/62733592a1cc6f0b41f46ef52e06d1a6fe1ff38a [8] https://github.com/tukaani-project/xz/commit/6bbec3bda02bf87d24fa095074456e723589921f [9] https://github.com/tukaani-project/xz/releases/tag/v5.6.2 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle --- package/xz/xz.hash | 8 ++++---- package/xz/xz.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index ff070f67757..6012e1001b5 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,11 +1,11 @@ # Locally calculated after checking pgp signature -# https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5.4.7.tar.bz2.sig +# https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.bz2.sig # using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin - -sha256 9976ed9cd0764e962d852d7d519ee1c3a7f87aca3b86e5d021a45650ba3ecb41 xz-5.4.7.tar.bz2 +sha256 e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171 xz-5.6.2.tar.bz2 # Hash for license files -sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING +sha256 ee3b35b82f7bb0ba5fd9f13ca34ebbe757a59c05bfde5ab9d50ff4188ed33396 COPYING +sha256 0b01625d853911cd0e2e088dcfb743261034a091bb379246cb25a14cc4c74bf1 COPYING.0BSD sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index d5dceb0eae0..10590f6be81 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,13 +4,13 @@ # ################################################################################ -XZ_VERSION = 5.4.7 +XZ_VERSION = 5.6.2 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ -XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 +XZ_LICENSE = Public Domain, BSD-0-Clause, GPL-2.0+, GPL-3.0+, LGPL-2.1+ +XZ_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) From 25254458bde6befcbf93b746d994f94665741c42 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 Jun 2024 15:57:25 +0200 Subject: [PATCH 1230/3013] package/xz: explicitly specify all autoconf options Explicitly specify all autoconf options with their default values, with the following special cases: - sandbox: use 'auto' (which will compile detect landlock in case kernel headers >= 5.13) - unaligned-access: use 'auto' (which will default to yes for x86, x86-64, powerpc, powerpc64 and powcerpc64le and use compile detection for arm, aarch64 and riscv, see xz-5.6.0/configure line 21323 ff) Since there are so many options, we reuse the target options for the host. The options that are set dynamically need to be explicitly overridden in that case. Signed-off-by: Peter Seiderer [Arnout: - fix type Z_CONF_OPTS, detected by check-package; - move setting of HOST_XZ_CONF_OPTS after all the target options.] Signed-off-by: Arnout Vandecappelle --- package/xz/xz.mk | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 10590f6be81..dff4ec4be96 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -13,12 +13,51 @@ XZ_LICENSE = Public Domain, BSD-0-Clause, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani +XZ_CONF_OPTS = \ + --enable-encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ + --enable-decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ + --enable-match-finders=hc3,hc4,bt2,bt3,bt4 \ + --enable-checks=crc32,crc64,sha256 \ + --disable-external-sha256 \ + --enable-microlzma \ + --enable-lzip-decoder \ + --enable-assembler \ + --enable-clmul-crc \ + --enable-arm64-crc32 \ + --disable-small \ + --enable-assume-ram=128 \ + --enable-xz \ + --enable-xzdec \ + --enable-lzmadec \ + --enable-lzmainfo \ + --enable-lzma-links \ + --enable-scripts \ + --enable-sandbox=auto \ + --enable-symbol-versions \ + --enable-rpath \ + --enable-largfile \ + --enable-unaligned-access=auto \ + --disable-unsafe-type-punning \ + --disable-werror \ + --disable-year2038 + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +XZ_CONF_OPTS += --enable-nls +else +XZ_CONF_OPTS += --disable-nls +endif + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XZ_CONF_OPTS += --enable-threads else XZ_CONF_OPTS += --disable-threads endif +HOST_XZ_CONF_OPTS = \ + $(XZ_CONF_OPTS) \ + --enable-nls \ + --enable-threads + # we are built before ccache HOST_XZ_CONF_ENV = \ CC="$(HOSTCC_NOCCACHE)" \ From ffd1ca4ad5c1ac481ff5844591000b39b05cd6f8 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 Jun 2024 15:57:26 +0200 Subject: [PATCH 1231/3013] package/xz: enable year2038 option All our up-to-date libc variants now support Y2038, so we can turn this on unconditionally. Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle --- package/xz/xz.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index dff4ec4be96..fa4f6dbda99 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -39,7 +39,7 @@ XZ_CONF_OPTS = \ --enable-unaligned-access=auto \ --disable-unsafe-type-punning \ --disable-werror \ - --disable-year2038 + --enable-year2038 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) XZ_CONF_OPTS += --enable-nls From 3f464c2e2826f02d9ee6f738df67c078e37cb327 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 Jun 2024 15:57:27 +0200 Subject: [PATCH 1232/3013] package/xz: convert to cmake build Use direct equivalents where available. The following autoconf options don't have a direct equivalent in CMakeLists.txt. - '--enable-checks=crc32': CRC32 is always enabled; the equivalent CMake option is therefore calles ADDITIONAL_CHECK_TYPES. - '--disable-external-sha256': external sha256 is not supported with CMake. - '--enable-assembler': No direct equivalent, though there is an option ENABLE_X86_ASM which must be enabled explicitly (no auto-detection). Since this only works on x86 and we're not sure if it works on all x86 variants, leave it disabled. - '--enable-assume-ram=128': hard coded in the CMakeLists.txt file 1732 target_compile_definitions(xz PRIVATE ASSUME_RAM=128) - '--enable-xz', '--enable-xzdec', '--enable-lzmadec', '--enable-lzmainfo', --enable-lzma-links': The decoder programs are always enabled if they're enabled in the library. The symlinks are controlled by two separate options: CREATE_XZ_SYMLINKS and CREATE_LZMA_SYMLINKS. - '--enable-scripts' (see [1]: 'CMake: xzdiff, xzgrep, xzless, xzmore, and their symlinks are now installed') - '--enable-symbol-versions': hard coded in the CMakeLists.txt file 1297 target_compile_definitions(liblzma PRIVATE HAVE_SYMBOL_VERSIONS_LINUX=1) - '--enable-rpath': There is no CMake equivalent for this. - '--enable-largefile': see CMakeLists.txt 245 # Check for large file support. It's required on some 32-bit platforms and 246 # even on 64-bit MinGW-w64 to get 64-bit off_t. This can be forced off on 247 # the CMake command line if needed: -DLARGE_FILE_SUPPORT=OFF 248 tuklib_large_file_support(ALL) - '--enable-unaligned-access=auto': see CMakeLists.txt and cmake/tuklib_integer.cmake 250 # This is needed by liblzma and xz. 251 tuklib_integer(ALL) - '--disable-unsafe-type-punning' see CMakeLists.txt and cmake/tuklib_integer.cmake 250 # This is needed by liblzma and xz. 251 tuklib_integer(ALL) - '--disable-werror': There is no option to _enable_ -Werror in CMakeLists.txt. - '--enable-year2038': There is no option to enable Y2038 support in CMakeLists.txt, but we anyway do that globally. host-xz is itself a dependency of host-ccache, so we can't use ccache for building host-xz. For autotools, this was handled by setting CC and CXX in the environment for the configure script. This doesn't work for CMake, however. Instead, we must override the CMAKE_C_COMPILER_LAUNCHER option. Xz doesn't use C++, but for completeness also override CMAKE_CXX_COMPILER_LAUNCHER. [1] https://github.com/tukaani-project/xz/releases/tag/v5.6.0 Signed-off-by: Peter Seiderer [Arnout: fix ccache bypass for host-xz] Signed-off-by: Arnout Vandecappelle --- package/xz/xz.mk | 65 +++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 40 deletions(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index fa4f6dbda99..b22b96849d0 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -8,60 +8,45 @@ XZ_VERSION = 5.6.2 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES -XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, BSD-0-Clause, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani XZ_CONF_OPTS = \ - --enable-encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ - --enable-decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ - --enable-match-finders=hc3,hc4,bt2,bt3,bt4 \ - --enable-checks=crc32,crc64,sha256 \ - --disable-external-sha256 \ - --enable-microlzma \ - --enable-lzip-decoder \ - --enable-assembler \ - --enable-clmul-crc \ - --enable-arm64-crc32 \ - --disable-small \ - --enable-assume-ram=128 \ - --enable-xz \ - --enable-xzdec \ - --enable-lzmadec \ - --enable-lzmainfo \ - --enable-lzma-links \ - --enable-scripts \ - --enable-sandbox=auto \ - --enable-symbol-versions \ - --enable-rpath \ - --enable-largfile \ - --enable-unaligned-access=auto \ - --disable-unsafe-type-punning \ - --disable-werror \ - --enable-year2038 + -DENCODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \ + -DDECODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \ + -DMATCH_FINDERS="hc3;hc4;bt2;bt3;bt4" \ + -DADDITIONAL_CHECK_TYPES="crc64;sha256" \ + -DMICROLZMA_ENCODER=ON \ + -DMICROLZMA_DECODER=ON \ + -DLZIP_DECODER=ON \ + -DALLOW_CLMUL_CRC=ON \ + -DALLOW_ARM64_CRC32=ON \ + -DENABLE_SMALL=OFF \ + -DENABLE_SANDBOX=ON \ + -DCREATE_XZ_SYMLINKS=ON \ + -DCREATE_LZMA_SYMLINKS=ON \ + -DBUILD_SHARED_LIBS=OFF ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -XZ_CONF_OPTS += --enable-nls +XZ_CONF_OPTS += -DENABLE_NLS=ON else -XZ_CONF_OPTS += --disable-nls +XZ_CONF_OPTS += -DENABLE_NLS=OFF endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XZ_CONF_OPTS += --enable-threads +XZ_CONF_OPTS += -DENABLE_THREADS=ON else -XZ_CONF_OPTS += --disable-threads +XZ_CONF_OPTS += -DENABLE_THREADS=OFF endif +# we are built before ccache HOST_XZ_CONF_OPTS = \ $(XZ_CONF_OPTS) \ - --enable-nls \ - --enable-threads - -# we are built before ccache -HOST_XZ_CONF_ENV = \ - CC="$(HOSTCC_NOCCACHE)" \ - CXX="$(HOSTCXX_NOCCACHE)" + -DENABLE_NLS=ON \ + -DENABLE_THREADS=ON \ + -DCMAKE_C_COMPILER_LAUNCHER="" \ + -DCMAKE_CXX_COMPILER_LAUNCHER=="" -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From c452e5ac11a83cc130edfbe6ffccc8101142d378 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 20 May 2024 21:41:35 +0200 Subject: [PATCH 1233/3013] package/rtl8189es: bump to version 2024-05-19 With this version we can build with Linux 6.9. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8189es/rtl8189es.hash | 2 +- package/rtl8189es/rtl8189es.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash index 1ef46436fb1..1b1aefdd5c9 100644 --- a/package/rtl8189es/rtl8189es.hash +++ b/package/rtl8189es/rtl8189es.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28c15f4631f4151ea6fca96d59aec931766af49ccb7a0d5e1080fc41a323713 rtl8189es-eb51e021b0e1b6f94a4b49da3f4ee5c5fb20b715.tar.gz +sha256 5ab565057ac81527ac579edfdd2a1e42b9ceb2f2924b2ade88a11849443789e4 rtl8189es-30a52f789a0b933c4a7eb06cbf4a4d21c8e581aa.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index 8bac0a125fb..11735ba112a 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189ES_VERSION = eb51e021b0e1b6f94a4b49da3f4ee5c5fb20b715 +RTL8189ES_VERSION = 30a52f789a0b933c4a7eb06cbf4a4d21c8e581aa RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) RTL8189ES_LICENSE = GPL-2.0 From 4f21835ff05f1707b45edf90cca2ac2501b3033f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 20 May 2024 21:41:36 +0200 Subject: [PATCH 1234/3013] package/rtl8189fs: bump to version 2024-05-19 With this version we can build with Linux 6.9. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 2746194f434..5ed0bbd3768 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28c15f4631f4151ea6fca96d59aec931766af49ccb7a0d5e1080fc41a323713 rtl8189fs-eb51e021b0e1b6f94a4b49da3f4ee5c5fb20b715.tar.gz +sha256 a5063b1554acd08bcc084926d1ff80148fe8521a6aefb7061cae68b7c4a7cdb1 rtl8189fs-9a82349c2c40515f9d20b9f6721670f76b4e1c7a.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 174bb346ca6..afb8685bac7 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = eb51e021b0e1b6f94a4b49da3f4ee5c5fb20b715 +RTL8189FS_VERSION = 9a82349c2c40515f9d20b9f6721670f76b4e1c7a RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 8beda6f2210e19e2fd10ff16c1ffa49b4760df11 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 21 May 2024 16:36:15 +0200 Subject: [PATCH 1235/3013] package/fluent-bit: bump to v3.0.4 Release Notes: - https://fluentbit.io/announcements/v3.0.4 Fixes: - CVE-2024-4323 (https://www.tenable.com/security/research/tra-2024-17) Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index a53f6dba517..6fcf4fac3e7 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2f3b82e8b7802fe92625009531592f12d500ff61a02ecf4cd27e0f138a6dc566 fluent-bit-3.0.3.tar.gz +sha256 b439f89e879e538849e9106fe450bcf58da5034dfc316af4d2a837423786ed11 fluent-bit-3.0.4.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index b235c3abf46..13bd4ddecb1 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 3.0.3 +FLUENT_BIT_VERSION = 3.0.4 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From 462fe09bd19f5b085bf9b06268fe4b763addb4a7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:20 +0200 Subject: [PATCH 1236/3013] board/orangepi/orangepi-zero: make the patches to be applied with fuzz 0 This commit allows the Linux kernel patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...RM-dts-orange-pi-zero-enable-spi-nor.patch | 41 ++++++++++--------- ...ARM-dts-orange-pi-zero-enable-spidev.patch | 23 +++++++---- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch index ff0a1db223e..ff350d68b4c 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch @@ -1,4 +1,4 @@ -From 068c3baff3048a3db4ef2518ff917ce749cd8169 Mon Sep 17 00:00:00 2001 +From ddc295a04269437e5c726f63239689786354d44b Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 11:24:26 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable SPI NOR @@ -9,34 +9,37 @@ For more information see: - http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + .../boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index 4e1a9050c6b4..cdf19821b1f3 100644 +index 6b74cc923e16..4012f8712cd7 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -161,3 +161,19 @@ - /* USB VBUS is always on */ - status = "okay"; - }; -+ -+&spi0 { +@@ -167,14 +167,18 @@ &ohci1 { + + &spi0 { + /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */ +- status = "disabled"; + status = "okay"; -+ -+ flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; +- compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; + compatible = "mxicy,mx25l1606e", "winbond,w25q128"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; + reg = <0>; + spi-max-frequency = <40000000>; + + partition@00000000 { + reg = <0x00000000 0x200000>; /* 2Mb */ + }; -+ }; -+}; + }; + }; + -- -2.11.0 +2.43.0 diff --git a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch index 04d43c344f2..61dc97fd8b4 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch @@ -1,4 +1,4 @@ -From 8dd1b2a696bb7e9914abd11cc6f5c0f54c33d626 Mon Sep 17 00:00:00 2001 +From 208b13119fc0f709935fc2fc13c0295b19edbbf5 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 15:36:51 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable spidev @@ -7,27 +7,28 @@ On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port. This patch enables spidev driver for SPI1. Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ + .../dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index cdf19821b1f3..7242aaecb14f 100644 +index 4012f8712cd7..3552eb312747 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -59,6 +59,7 @@ - serial0 = &uart0; +@@ -59,6 +59,7 @@ aliases { /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet0 = &emac; ethernet1 = &xr819; + spi1 = &spi1; }; chosen { -@@ -177,3 +178,13 @@ - }; +@@ -182,6 +183,16 @@ partition@00000000 { }; }; -+ + +&spi1 { + status = "okay"; + @@ -37,6 +38,10 @@ index cdf19821b1f3..7242aaecb14f 100644 + spi-max-frequency = <10000000>; + }; +}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pa_pins>; -- -2.11.0 +2.43.0 From 0be7dc36881457ffb44b418c49587ac34a3fab03 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:21 +0200 Subject: [PATCH 1237/3013] board/pine64/rock64: make the patches to be applied with fuzz 0 This commit allows the U-Boot patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...3328-needs-itb-image-to-boot-properly.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch index 2d35b78daaf..7c847360345 100644 --- a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch +++ b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch @@ -1,4 +1,4 @@ -From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001 +From d312c4e40bf816823bdcfd066dd2511b23e83c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= Date: Tue, 5 Feb 2019 22:08:54 +0100 Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly @@ -7,16 +7,18 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Łyszczek +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile -index 8086f3c93e..a6425b5b03 100644 +index 149f83994814..ebbdf2596b9b 100644 --- a/Makefile +++ b/Makefile -@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),) - ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +@@ -923,6 +923,11 @@ ifeq ($(CONFIG_SYS_COREBOOT)$(CONFIG_SPL),yy) + ALL-$(CONFIG_BINMAN) += u-boot-x86-with-spl.bin endif +# rk3328 needs itb image to boot properly @@ -24,9 +26,9 @@ index 8086f3c93e..a6425b5b03 100644 +ALL-y += u-boot.itb +endif + - # enable combined SPL/u-boot/dtb rules for tegra - ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) - ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin + # Build a combined spl + u-boot image for sunxi + ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy) + ALL-y += u-boot-sunxi-with-spl.bin -- -2.18.1 +2.43.0 From d2c26c125e6b78ecefe0d97bbc487fb47dcb729d Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:22 +0200 Subject: [PATCH 1238/3013] boot/syslinux: update the patches to be applied with fuzz 0 This commit allows the syslinux patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../syslinux/0015-efi-main.c-include-efisetjmp.h.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch index 2fd61ecbc8f..15adfc49f33 100644 --- a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch +++ b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch @@ -1,4 +1,4 @@ -From 7d68fa68cd9f2987bd85339f3391913a8b0e58c7 Mon Sep 17 00:00:00 2001 +From 26979f738518404b1d3dc9ecdcf4fa5811412c49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 24 Mar 2020 10:21:27 +0100 Subject: [PATCH] efi/main.c: include @@ -38,13 +38,15 @@ This is due to gnu-efi commit 486ba3c3bdd147b7d98159b9e650be60bce0f027 So we act as specified, and include from efi/main.c. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: https://www.syslinux.org/archives/2020-March/026621.html --- efi/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/efi/main.c b/efi/main.c -index 6a748412..e924cfb1 100644 +index 71d31a5c1f13..7dc7bca7aeba 100644 --- a/efi/main.c +++ b/efi/main.c @@ -12,6 +12,7 @@ @@ -54,7 +56,7 @@ index 6a748412..e924cfb1 100644 +#include #include "fio.h" #include "version.h" - #include "efi_pxe.h" + -- -2.25.1 +2.43.0 From e04faea50f5554ab24f8b756860b9a7922094a6f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:23 +0200 Subject: [PATCH 1239/3013] package/alsa-lib: update the patch to be applied with fuzz 0 This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...01-Don-t-use-fork-on-noMMU-platforms.patch | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch index 0d2b479534a..87add9ff566 100644 --- a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch +++ b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch @@ -1,4 +1,4 @@ -From 41c029755502acf01ed634db437ac06d09be6c41 Mon Sep 17 00:00:00 2001 +From ffc567b790005850c561f9f6590b069b61f5ba20 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 13 Apr 2018 09:02:37 +0200 Subject: [PATCH] Don't use fork() on noMMU platforms @@ -12,18 +12,21 @@ Signed-off-by: Jörg Krause Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html [Bernd: update patch for 1.2.4 & 1.2.7] Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi + --- configure.ac | 2 ++ src/pcm/pcm_direct.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cce195ae..0c852434 100644 +index 7a152a4abd20..3cf88c37db56 100644 --- a/configure.ac +++ b/configure.ac -@@ -52,6 +52,8 @@ dnl Checks for library functions. - AC_CHECK_FUNCS([uselocale]) - AC_CHECK_FUNCS([eaccess]) +@@ -56,6 +56,8 @@ AC_CHECK_FUNCS([eaccess]) + dnl Enable largefile support + AC_SYS_LARGEFILE +AC_CHECK_FUNC([fork]) + @@ -31,10 +34,10 @@ index cce195ae..0c852434 100644 AC_SUBST(LIBTOOL_VERSION_INFO) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c -index 2b07eff9..4dc3ea26 100644 +index e53e59238119..cf94c7c1dbf0 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c -@@ -437,13 +437,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) +@@ -442,13 +442,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) close(dmix->server_fd); return ret; } @@ -58,5 +61,5 @@ index 2b07eff9..4dc3ea26 100644 server_job(dmix); _exit(EXIT_SUCCESS); -- -2.14.3 +2.43.0 From 47e497eaeec01733ba8edbb5a7c01d1b53281cce Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:24 +0200 Subject: [PATCH 1240/3013] package/bzip2: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- package/bzip2/0001-build-objects-twice.patch | 14 ++++++++------ package/bzip2/0002-improve-build-system.patch | 12 +++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/package/bzip2/0001-build-objects-twice.patch b/package/bzip2/0001-build-objects-twice.patch index 9bde0f6488c..52b234f65a8 100644 --- a/package/bzip2/0001-build-objects-twice.patch +++ b/package/bzip2/0001-build-objects-twice.patch @@ -8,14 +8,16 @@ and build the shared objects as *.sho instead of *.o. Then, we use these objects to create the shared library. Signed-off-by: Markos Chandras +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: bzip2-1.0.6/Makefile-libbz2_so =================================================================== --- bzip2-1.0.6.orig/Makefile-libbz2_so +++ bzip2-1.0.6/Makefile-libbz2_so -@@ -25,13 +25,13 @@ SHELL=/bin/sh - CC=gcc - override CFLAGS += -fpic -fPIC -Wall +@@ -26,13 +26,13 @@ CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 + CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -OBJS= blocksort.o \ - huffman.o \ @@ -33,10 +35,10 @@ Index: bzip2-1.0.6/Makefile-libbz2_so + bzlib.sho all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -@@ -45,17 +45,5 @@ install: + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) +@@ -43,17 +43,5 @@ all: $(OBJS) clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared -blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c diff --git a/package/bzip2/0002-improve-build-system.patch b/package/bzip2/0002-improve-build-system.patch index 2d6e2cf900d..11a856e49c9 100644 --- a/package/bzip2/0002-improve-build-system.patch +++ b/package/bzip2/0002-improve-build-system.patch @@ -20,12 +20,14 @@ This patch makes a number of improvements to the bzip2 build system: appropriate symbolic links. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -20,8 +20,7 @@ +@@ -20,8 +20,7 @@ AR=ar RANLIB=ranlib LDFLAGS= @@ -35,7 +37,7 @@ Index: b/Makefile # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -90,14 +89,14 @@ +@@ -90,14 +89,14 @@ install: bzip2 bzip2recover cp -f libbz2.a $(PREFIX)/lib chmod a+r $(PREFIX)/lib/libbz2.a cp -f bzgrep $(PREFIX)/bin/bzgrep @@ -66,9 +68,9 @@ Index: b/Makefile-libbz2_so -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) +override CFLAGS += -fpic -fPIC -Wall - OBJS= blocksort.o \ - huffman.o \ -@@ -37,8 +36,11 @@ + OBJS= blocksort.sho \ + huffman.sho \ +@@ -37,8 +36,11 @@ OBJS= blocksort.sho \ all: $(OBJS) $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 From f5226cd6b72a7b47edbc3220b3e1279526c75b31 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:25 +0200 Subject: [PATCH 1241/3013] package/elfutils: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...lly-make-Werror-conditional-to-BUILD_WERROR.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch index 565a3c1bbb0..f35c2d48aad 100644 --- a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch +++ b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch @@ -1,4 +1,4 @@ -From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001 +From 064b74d5e19847794072781405eafe8dfbfca331 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 29 May 2017 23:24:42 +0300 Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR @@ -13,26 +13,28 @@ cc1: all warnings being treated as errors [Vincent: tweak patch for 0.166] [Bernd: rebased patch for 0.177 & 0.189] +[Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: "Yann E. MORIN" Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls +Signed-off-by: Dario Binacchi --- config/eu.am | 1 - 1 file changed, 1 deletion(-) diff --git a/config/eu.am b/config/eu.am -index c2cc349ce876..99b368e09060 100644 +index e6c241f9d88a..cad1baa27a5f 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ $(USE_AFTER_FREE3_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ + $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -- -2.17.1 +2.43.0 From 06b5ce9f04123a985e7543d5aadae60e14399401 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:26 +0200 Subject: [PATCH 1242/3013] package/ffmpeg: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../ffmpeg/0003-libavutil-Fix-mips-build.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index ee2d1db8bdf..a52d7fc347b 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -1,4 +1,4 @@ -From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001 +From e9d97f9d29ce57d7a5a62607c2a08e091a06de6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Jun 2021 08:54:53 +0200 Subject: [PATCH] libavutil: Fix mips build @@ -11,16 +11,18 @@ Patch sent upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure | 2 ++ libavutil/mips/cpu.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 6bfd98b384..773a7d516c 100755 +index a89cfa6d959d..6ec00df75312 100755 --- a/configure +++ b/configure -@@ -2191,6 +2191,7 @@ HEADERS_LIST=" +@@ -2227,6 +2227,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,8 +30,8 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6361,6 +6361,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa - check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox +@@ -6472,6 +6473,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa + check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox check_headers windows.h check_headers asm/types.h +check_headers sys/auxv.h @@ -37,7 +39,7 @@ index 6bfd98b384..773a7d516c 100755 # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c -index 59619d54de..19196de50b 100644 +index 59619d54dee3..19196de50b59 100644 --- a/libavutil/mips/cpu.c +++ b/libavutil/mips/cpu.c @@ -19,7 +19,7 @@ @@ -68,5 +70,5 @@ index 59619d54de..19196de50b 100644 return cpu_flags_cpucfg(); else -- -2.29.2 +2.34.1 From edb5589aebbd63999d0c2595dc31bf18db52fe9a Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:27 +0200 Subject: [PATCH 1243/3013] package/giflib: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...dd-targets-to-manage-static-building.patch | 18 +++++++++-------- ...veral-defects-found-by-Coverity-scan.patch | 20 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch index ba8d426bea1..31d7542e60c 100644 --- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -1,4 +1,4 @@ -From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001 +From 409af8210f2256eed4d2c73083aa75975f03424b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Jul 2019 12:20:38 +0200 Subject: [PATCH] Makefile: add targets to manage static building @@ -8,16 +8,18 @@ targets to allow the user to build giflib when dynamic library support is not available or enable on the toolchain Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7 --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index b2bf6de..111f52f 100644 +index 87966a96cd4f..4a93aace54b8 100644 --- a/Makefile +++ b/Makefile -@@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) +@@ -87,13 +87,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) endif @@ -40,7 +42,7 @@ index b2bf6de..111f52f 100644 $(LIBGIFSO): $(OBJECTS) $(HEADERS) ifeq ($(UNAME), Darwin) -@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) +@@ -116,7 +123,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) $(AR) rcs libutil.a $(UOBJECTS) clean: @@ -48,8 +50,8 @@ index b2bf6de..111f52f 100644 + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o rm -f $(LIBGIFSOVER) rm -f $(LIBGIFSOMAJOR) - rm -fr doc/*.[17] *.html doc/staging -@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE) + rm -fr doc/*.1 *.html doc/staging +@@ -141,12 +148,15 @@ install-bin: $(INSTALLABLE) install-include: $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" @@ -64,8 +66,8 @@ index b2bf6de..111f52f 100644 ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-lib: install-static-lib install-shared-lib install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7" - $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1" -- 2.43.0 diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch index f6816d07530..77f21b402e9 100644 --- a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch +++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch @@ -1,4 +1,4 @@ -From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From 7c3bce4add77944e5b479ef5da81ae7fd71a7e95 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 5 Dec 2023 16:38:48 -0700 Subject: [PATCH] Fix several defects found by Coverity scan @@ -10,15 +10,17 @@ Signed-off-by: Sandro Mani Signed-off-by: Adam Duskett [Fabrice: updated for 5.2.2] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - gif2rgb.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) + gif2rgb.c | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/gif2rgb.c b/gif2rgb.c -index d9a469f..02cea41 100644 +index d51226d65d3d..50c43ae44ee2 100644 --- a/gif2rgb.c +++ b/gif2rgb.c -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -165,6 +165,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, /* Open stdout for the output file: */ if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { PrintGifError(Error); @@ -27,8 +29,8 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, - EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == +@@ -173,6 +175,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == GIF_ERROR) { PrintGifError(Error); + free(OutputBuffer); @@ -36,7 +38,7 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } -@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -182,6 +186,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, for (i = 0; i < Height; i++) { if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { @@ -45,7 +47,7 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } GifQprintf("\b\b\b\b%-4d", Height - i - 1); -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -191,6 +197,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { PrintGifError(Error); From 8a90c1b7e268d1a8b22ab4043c3f4e6c788aca0c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:28 +0200 Subject: [PATCH 1244/3013] package/libabseil-cpp: update the patch to be applied with fuzz 0 This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../0001-force-position-independent-code.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/libabseil-cpp/0001-force-position-independent-code.patch b/package/libabseil-cpp/0001-force-position-independent-code.patch index 6bf46bf0cb1..a6ca9c0f0e9 100644 --- a/package/libabseil-cpp/0001-force-position-independent-code.patch +++ b/package/libabseil-cpp/0001-force-position-independent-code.patch @@ -1,4 +1,4 @@ -From d170b19e500d85381369e379771be8d7816bcc92 Mon Sep 17 00:00:00 2001 +From 832765d12879fabf799dd80af6e8fee9cd298934 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 21 Jul 2020 13:08:50 -0700 Subject: [PATCH] force position independent code @@ -16,17 +16,19 @@ cause relocation errors when shared libraries link against the built static libraries. Signed-off-by: Adam Duskett +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- CMake/AbseilHelpers.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake -index 86ff9eb..bdb7a89 100644 +index 3bd33ce8718d..7f269bd20c21 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake -@@ -209,6 +209,8 @@ function(absl_cc_library) - set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD}) - set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) +@@ -292,6 +292,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") + target_compile_features(${_NAME} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE}) + endif() + # Without this setting, other programs such as GRPC will fail when linking. + set_property(TARGET ${_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -34,5 +36,5 @@ index 86ff9eb..bdb7a89 100644 # to have properly named lib files. This is a no-op when we are not being # installed. -- -2.26.2 +2.43.0 From 1cbbe1d6e3142e3b34cb9262ffd826a385f3a28d Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:29 +0200 Subject: [PATCH 1245/3013] package/libglib2: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...dd-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index fb990572427..8f87671167f 100644 --- a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -1,4 +1,4 @@ -From ff3db531608eb0f9de8a88c1bc34fe0f1d93121c Mon Sep 17 00:00:00 2001 +From 03e9cae3f3a7e2bbd5110f1ce2739601571bc024 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Nov 2021 18:01:05 +0100 Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc @@ -14,6 +14,8 @@ Fixes: - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7 Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: Never submitted --- gio/meson.build | 1 + @@ -21,22 +23,22 @@ Upstream: Never submitted 2 files changed, 2 insertions(+) diff --git a/gio/meson.build b/gio/meson.build -index 29473d26b..112d4ada9 100644 +index 462606f3b56c..e6b736167b8d 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -841,6 +841,7 @@ pkg.generate(libgio, +@@ -880,6 +880,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), + 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + join_paths('${bindir}', 'gio'), - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), + 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), diff --git a/glib/meson.build b/glib/meson.build -index f78f32969..6c5486699 100644 +index da76fc005e46..cde2edb197c7 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -384,6 +384,7 @@ pkg.generate(libglib, +@@ -441,6 +441,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -45,5 +47,5 @@ index f78f32969..6c5486699 100644 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], -- -2.33.0 +2.43.0 From 7e1800c7e477548117a39717c42d06c884046419 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:30 +0200 Subject: [PATCH 1246/3013] package/libnl: update the patch to be applied with fuzz 0 This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. While we're at it, also fix the upstream status to the proper Upstream: tag. Signed-off-by: Dario Binacchi [Arnout: add proper Upstream: tag and update checkpackageignore] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...workaround-to-the-libc-compat.h-copy.patch | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 807cee1a08f..b28846cd557 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -869,7 +869,6 @@ package/libmpeg2/0004-fix-sparc.patch lib_patch.Upstream package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch lib_patch.Upstream package/libnfc/0001-autotools-make-example-build-optional.patch lib_patch.Upstream package/libnids/0001-libpcap-use-pkg-config.patch lib_patch.Upstream -package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch lib_patch.Upstream package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch lib_patch.Upstream package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch lib_patch.Upstream package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch lib_patch.Upstream diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch index 57d1c8747de..227769da28e 100644 --- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch +++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch @@ -1,4 +1,4 @@ -From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001 +From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Mar 2017 08:52:20 +0200 Subject: [PATCH] Add musl workaround to the libc-compat.h copy @@ -12,26 +12,27 @@ definitions will be needed. See the Buildroot iproute2 patch package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch. Signed-off-by: Baruch Siach ---- -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper -musl fix must go to the kernel first. +Upstream: libc-compat.h is a local copy of a kernel headers. A proper + musl fix must go to the kernel first. +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- include/linux-private/linux/libc-compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h -index 9bed5b6ae4d9..e2562a819464 100644 +index a1599911e7a9..f6df7193b8b4 100644 --- a/include/linux-private/linux/libc-compat.h +++ b/include/linux-private/linux/libc-compat.h -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */ -#if defined(__GLIBC__) +#if 1 - /* Coordinate with glibc netinet/in.h header. */ - #if defined(_NETINET_IN_H) + /* Coordinate with glibc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) -- -2.11.0 +2.43.0 From 1b6144a9adba4f46d6a64ac7d698bfb64359eb74 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:31 +0200 Subject: [PATCH 1247/3013] package/libopenssl: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../0003-Revert-Fix-static-builds.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/libopenssl/0003-Revert-Fix-static-builds.patch b/package/libopenssl/0003-Revert-Fix-static-builds.patch index 149ad54fc53..b4b78c97fc4 100644 --- a/package/libopenssl/0003-Revert-Fix-static-builds.patch +++ b/package/libopenssl/0003-Revert-Fix-static-builds.patch @@ -1,4 +1,4 @@ -From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 Mon Sep 17 00:00:00 2001 +From a048522f64dbbe90cf77aea0c3f47cccdad50742 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 21 Jul 2023 19:30:40 +0200 Subject: [PATCH] Revert "Fix -static builds" @@ -8,17 +8,19 @@ This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d. Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configure b/Configure -index 2c17f4186b..94cab4c3c4 100755 +index 2a5e58805c3b..0e8c1ce5cc74 100755 --- a/Configure +++ b/Configure -@@ -1377,10 +1377,6 @@ foreach (keys %useradd) { - # At this point, we can forget everything about %user and %useradd, - # because it's now all been merged into the corresponding $config entry +@@ -1466,10 +1466,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) { + unless file_name_is_absolute($config{prefix}); + } -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) { - disable('static', 'pic', 'threads'); @@ -27,7 +29,7 @@ index 2c17f4186b..94cab4c3c4 100755 # Allow overriding the build file name $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile"; -@@ -1671,6 +1667,10 @@ if ($strict_warnings) +@@ -1764,6 +1760,10 @@ if ($strict_warnings) } } @@ -39,5 +41,5 @@ index 2c17f4186b..94cab4c3c4 100755 ? @strict_warnings_collection : ( $_ ) } -- -2.39.2 +2.43.0 From dc3f703913fb726a782079f7570b573272492dbf Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:32 +0200 Subject: [PATCH 1248/3013] package/openocd: update the patch to be applied with fuzz 0 This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../0001-configure-enable-build-on-uclinux.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/openocd/0001-configure-enable-build-on-uclinux.patch b/package/openocd/0001-configure-enable-build-on-uclinux.patch index 2f2d3208405..d5f1e329582 100644 --- a/package/openocd/0001-configure-enable-build-on-uclinux.patch +++ b/package/openocd/0001-configure-enable-build-on-uclinux.patch @@ -1,19 +1,21 @@ -From 11ea78c4d253bb90296e2dd8c3f7fbf59ba397b6 Mon Sep 17 00:00:00 2001 +From 86dd032d77166b7ed59d08c99fbe47b8b7667406 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2017 06:30:31 +0200 Subject: [PATCH] configure: enable build on uclinux Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index c680bda7..1a7980a0 100644 +index eee42d4240f8..b0445f92e0b5 100644 --- a/configure.ac +++ b/configure.ac -@@ -327,7 +327,7 @@ AC_ARG_ENABLE([sysfsgpio], - [build_sysfsgpio=$enableval], [build_sysfsgpio=no]) +@@ -342,7 +342,7 @@ AC_ARG_ENABLE([xlnx_pcie_xvc], + [build_xlnx_pcie_xvc=$enableval], [build_xlnx_pcie_xvc=no]) AS_CASE([$host_os], - [linux*], [], @@ -22,5 +24,5 @@ index c680bda7..1a7980a0 100644 AS_IF([test "x$build_sysfsgpio" = "xyes"], [ AC_MSG_ERROR([sysfsgpio is only available on linux]) -- -2.11.0 +2.43.0 From 2d23a97a791e874bee86bc5dbcf9949aa467fc3c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:33 +0200 Subject: [PATCH 1249/3013] package/patchelf: update the patch to be applied with fuzz 0 This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...ke-the-rpath-relative-under-a-specif.patch | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch index 8710bfb629a..c29fac7d9fb 100644 --- a/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch +++ b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch @@ -1,4 +1,4 @@ -From 618220bfb55c875d6a4d197cb24fe632ac93ec85 Mon Sep 17 00:00:00 2001 +From 6e8915572db65cf63b7a82f9b24af6f9cad92ba7 Mon Sep 17 00:00:00 2001 From: Wolfgang Grandegger Date: Mon, 20 Feb 2017 16:29:24 +0100 Subject: [PATCH] Add option to make the rpath relative under a specified root @@ -43,15 +43,17 @@ pending. Signed-off-by: Wolfgang Grandegger [Fabrice: update for 0.13] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - src/patchelf.cc | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 175 insertions(+), 21 deletions(-) + src/patchelf.cc | 199 +++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 171 insertions(+), 28 deletions(-) diff --git a/src/patchelf.cc b/src/patchelf.cc -index 1d9a772..35b4a33 100644 +index fd1e7b7b61c3..f3b7ba8867bf 100644 --- a/src/patchelf.cc +++ b/src/patchelf.cc -@@ -46,6 +46,10 @@ static bool debugMode = false; +@@ -45,6 +45,10 @@ static bool debugMode = false; static bool forceRPath = false; @@ -62,8 +64,8 @@ index 1d9a772..35b4a33 100644 static std::vector fileNames; static std::string outputFileName; static bool alwaysWrite = false; -@@ -77,6 +81,49 @@ static unsigned int getPageSize(){ - return pageSize; +@@ -81,6 +85,49 @@ static bool hasAllowedPrefix(const std::string & s, const std::vector class ElfFile -@@ -183,9 +230,13 @@ public: +@@ -197,9 +244,13 @@ public: - void setInterpreter(const string & newInterpreter); + void setInterpreter(const std::string & newInterpreter); - typedef enum { rpPrint, rpShrink, rpSet, rpAdd, rpRemove } RPathOp; + typedef enum { rpPrint, rpShrink, rpMakeRelative, rpSet, rpAdd, rpRemove} RPathOp; -+ + +- void modifyRPath(RPathOp op, const std::vector & allowedRpathPrefixes, std::string newRPath); + bool libFoundInRPath(const std::string & dirName, + const std::vector neededLibs, + std::vector & neededLibFound); - -- void modifyRPath(RPathOp op, const std::vector & allowedRpathPrefixes, std::string newRPath); ++ + void modifyRPath(RPathOp op, std::string rootDir, const std::vector & allowedRpathPrefixes, std::string newRPath, const std::string & fileName); - void addNeeded(set libs); + void addNeeded(const std::set & libs); -@@ -1041,8 +1092,28 @@ static void concatToRPath(string & rpath, const string & path) +@@ -1267,8 +1318,28 @@ static void concatToRPath(std::string & rpath, const std::string & path) template @@ -157,9 +159,9 @@ index 1d9a772..35b4a33 100644 +void ElfFile::modifyRPath(RPathOp op, std::string rootDir, + const std::vector & allowedRpathPrefixes, std::string newRPath, const std::string & fileName) { - Elf_Shdr & shdrDynamic = findSection(".dynamic"); + auto shdrDynamic = findSection(".dynamic"); -@@ -1096,6 +1167,11 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) +@@ -1314,6 +1385,11 @@ void ElfFile::modifyRPath(RPathOp op, return; } @@ -171,7 +173,7 @@ index 1d9a772..35b4a33 100644 if (op == rpShrink && !rpath) { debug("no RPATH to shrink\n"); return; -@@ -1120,31 +1196,80 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) +@@ -1343,31 +1419,80 @@ void ElfFile::modifyRPath(RPathOp op, continue; } @@ -271,7 +273,7 @@ index 1d9a772..35b4a33 100644 if (op == rpRemove) { if (!rpath) { debug("no RPATH to delete\n"); -@@ -1413,7 +1543,9 @@ static bool shrinkRPath = false; +@@ -1736,7 +1861,9 @@ static bool removeRPath = false; static bool setRPath = false; static bool addRPath = false; static bool printRPath = false; @@ -281,7 +283,7 @@ index 1d9a772..35b4a33 100644 static std::set neededLibsToRemove; static std::map neededLibsToReplace; static std::set neededLibsToAdd; -@@ -1438,16 +1570,18 @@ static void patchElf2(ElfFile & elfFile) +@@ -1760,16 +1887,18 @@ static void patchElf2(ElfFile && elfFile, const FileContents & fileContents, con elfFile.setInterpreter(newInterpreter); if (printRPath) @@ -305,7 +307,7 @@ index 1d9a772..35b4a33 100644 if (printNeeded) elfFile.printNeededLibs(); -@@ -1508,6 +1642,9 @@ void showHelp(const string & progName) +@@ -1821,6 +1950,9 @@ void showHelp(const std::string & progName) [--remove-rpath]\n\ [--shrink-rpath]\n\ [--allowed-rpath-prefixes PREFIXES]\t\tWith '--shrink-rpath', reject rpath entries not starting with the allowed prefix\n\ @@ -315,8 +317,8 @@ index 1d9a772..35b4a33 100644 [--print-rpath]\n\ [--force-rpath]\n\ [--add-needed LIBRARY]\n\ -@@ -1564,6 +1701,17 @@ int main(int argc, char * * argv) - setRPath = true; +@@ -1889,6 +2021,17 @@ int mainWrapped(int argc, char * * argv) + addRPath = true; newRPath = argv[i]; } + else if (arg == "--make-rpath-relative") { @@ -334,5 +336,5 @@ index 1d9a772..35b4a33 100644 printRPath = true; } -- -1.9.1 +2.43.0 From db589f9df5587e37f1ba2c2654e8e693f88f4d74 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:34 +0200 Subject: [PATCH 1250/3013] package/qemu: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- ...-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch index b7e41d6f232..f9e523a6278 100644 --- a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch +++ b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch @@ -1,4 +1,4 @@ -From b4a692f46135af1011bf0adbfeb19abf354ca191 Mon Sep 17 00:00:00 2001 +From d6fea3c321c7eb18e6dd151f5d4b0cc46b77bcc0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 30 Apr 2024 09:40:55 +0200 Subject: [PATCH] tests/fp/meson: don't build fp-bench test if fenv.h is @@ -14,18 +14,19 @@ find at the following link. Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html Suggested-by: Paolo Bonzini Signed-off-by: Dario Binacchi +[Dario: make the patch to be applied with fuzz factor 0] Upstream: https://patchwork.ozlabs.org/project/qemu-devel/patch/20240430164752.645521-1-dario.binacchi@amarulasolutions.com/ --- tests/fp/meson.build | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/fp/meson.build b/tests/fp/meson.build -index cbc17392d678..cd052667e940 100644 +index 114b4b483ea7..0e1237be54ed 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -126,12 +126,14 @@ test('fp-test-mulAdd', fptest, ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], - suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 90) + suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 180) -executable( - 'fp-bench', @@ -45,5 +46,5 @@ index cbc17392d678..cd052667e940 100644 fptestlog2 = executable( 'fp-test-log2', -- -2.43.0 +2.34.1 From eb8606348fe338cd8cef7538b1440e8a67887845 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:35 +0200 Subject: [PATCH 1251/3013] package/qt5/qt5base: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../qt5base/0006-Fix-build-on-riscv32.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch index 5561acb9ae0..ff24fbff830 100644 --- a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch +++ b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch @@ -1,7 +1,7 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 +From 25a0057e8d7afaab3492e03efb3f85581f1cf9b2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 +Subject: [PATCH] Fix build on riscv32 riscv32 fails to build because __NR_futex is not defined on this architecture: @@ -21,15 +21,17 @@ Reviewed-by: Thiago Macieira [Retrieved from: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/corelib/thread/qfutex_p.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 +index f287b752d75f..fd7d09ac8572 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE +@@ -81,6 +81,11 @@ QT_END_NAMESPACE // if not defined in linux/futex.h # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 @@ -38,9 +40,9 @@ index 40482b6fc1..037207a5c0 100644 +# define __NR_futex __NR_futex_time64 +# endif + - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } + # if __has_feature(thread_sanitizer) || defined(__SANITIZE_THREAD__) + # include + inline void _q_tsan_acquire(void *addr, void *addr2) -- -cgit v1.2.1 +2.43.0 From 93a75717dcee3b095de57d12dff83789298c255e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:36 +0200 Subject: [PATCH 1252/3013] package/vboot-utils: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../0005-include-sys-sysmacros.h-for-major.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch index 5d76428eb69..3ab201fc3a2 100644 --- a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch +++ b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch @@ -1,4 +1,4 @@ -From 435fbcee218b37a87368e2b22fa33366875d458c Mon Sep 17 00:00:00 2001 +From 0495287f062a0cef989e02e0aee4f4329ab155b0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 19 Apr 2016 13:58:49 -0400 Subject: [PATCH] include sys/sysmacros.h for major() @@ -17,13 +17,15 @@ Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger Reviewed-by: Bill Richardson Signed-off-by: Giulio Benetti +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- cgpt/cgpt_wrapper.c | 1 + futility/dump_kernel_config_lib.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c -index dcfaab9c..1716cdde 100644 +index 4d07aadac72d..6fbfb235ba7b 100644 --- a/cgpt/cgpt_wrapper.c +++ b/cgpt/cgpt_wrapper.c @@ -18,6 +18,7 @@ @@ -35,17 +37,17 @@ index dcfaab9c..1716cdde 100644 #include diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c -index 4fe990c3..abf37ae1 100644 +index c2d59433ba71..448a2f6a831f 100644 --- a/futility/dump_kernel_config_lib.c +++ b/futility/dump_kernel_config_lib.c @@ -10,6 +10,7 @@ - #include #include + #include #include +#include #include #include -- -2.17.1 +2.43.0 From 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:37 +0200 Subject: [PATCH 1253/3013] support/scripts/apply-patches.sh: set the maximum fuzz factor to 0 This patch was created as a fix to a problem that occurred during the compilation of QEMU: >>> qemu 8.1.1 Patching Applying 0001-tests-fp-disable-fp-bench-build-by-default.patch using patch: patching file tests/fp/meson.build Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines). Applying 0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch using patch: patching file softmmu/qemu-seccomp.c Applying 0004-tracing-install-trace-events-file-only-if-necessary.patch using patch: patching file trace/meson.build With the bump to version 8.1.1, the patch that disabled the compilation of the fp-bench test does not report any errors, even though the patch itself is no longer applicable. The only noticeable message is: "Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines)." As reported by the patch man page: "With context diffs, and to a lesser extent with normal diffs, patch can detect when the line numbers mentioned in the patch are incorrect, and attempts to find the correct place to apply each hunk of the patch. As a first guess, it takes the line number mentioned for the hunk, plus or minus any offset used in applying the previous hunk. If that is not the correct place, patch scans both forwards and backwards for a set of lines matching the context given in the hunk. First patch looks for a place where all lines of the context match. If no such place is found, and it's a context diff, and the maximum fuzz factor is set to 1 or more, then another scan takes place ignoring the first and last line of context. If that fails, and the maximum fuzz factor is set to 2 or more, the first two and last two lines of context are ignored, and another scan is made. The default maximum fuzz factor is 2. If the hunk is installed at a different line from the line number specified in the diff, you are told the offset. A single large offset may indicate that a hunk was installed in the wrong place. You are also told if a fuzz factor was used to make the match, in which case you should also be slightly suspicious." By setting the maximum fuzz factor to 0, we avoid that patches which cannot be applied are incorrectly reported as valid, with positive side-effects on version bumps. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- support/scripts/apply-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 73aa6c8e5fe..2acaa63e9fd 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -116,7 +116,7 @@ function apply_patch { exit 1 fi echo "${path}/${patch}" >> ${builddir}/.applied_patches_list - ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent + ${uncomp} "${path}/$patch" | patch -F0 -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 From 410921cceb745dcdd824a7287ada12ac74d9c6dd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 25 Jun 2024 16:52:02 +0200 Subject: [PATCH 1254/3013] package/riscv-isa-sim: update the patch to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, host-riscv-isa-sim fail to build with output: Applying 0001-riscv-disable-precompiled-headers.patch using patch: patching file riscv/riscv.mk.in Hunk #1 FAILED at 35. 1 out of 1 hunk FAILED -- saving rejects to file riscv/riscv.mk.in.rej This commit rebased the package patch on the package version, bumped in commit 853b7661bf "package/riscv-isa-sim: bump to git version 00dfa28cd7". Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .../0001-riscv-disable-precompiled-headers.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch index 461f34e3a10..9ce32e3b768 100644 --- a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch @@ -1,4 +1,4 @@ -From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001 +From 12e0257495de41202827fabd5935f2e5a92ae8a6 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 9 Jan 2022 13:38:48 +0100 Subject: [PATCH] riscv: disable precompiled headers @@ -16,12 +16,12 @@ Signed-off-by: Julien Olivain 1 file changed, 3 deletions(-) diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in -index 2347ce6..4f56eaf 100644 +index 469c48dc..c61cadaf 100644 --- a/riscv/riscv.mk.in +++ b/riscv/riscv.mk.in -@@ -35,9 +35,6 @@ riscv_hdrs = \ - - riscv_install_hdrs = mmio_plugin.h +@@ -45,9 +45,6 @@ riscv_install_hdrs = \ + triggers.h \ + vector_unit.h \ -riscv_precompiled_hdrs = \ - insn_template.h \ @@ -30,5 +30,5 @@ index 2347ce6..4f56eaf 100644 processor.cc \ execute.cc \ -- -2.34.1 +2.45.2 From 4f1b7d0ef00af527f6a5c1fcfd18ce204a7d78e8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 25 Jun 2024 13:46:43 +0200 Subject: [PATCH 1255/3013] package/slang: fix patch fuzz Since commit 8f88a644ed7d (support/scripts/apply-patches.sh: set the maximum fuzz factor to 0), we no longer accept fuzz in patches. Before 8f88a644ed7d was applied, alot of patches were fixed in preparatory commits, but slang was missed (although the patch has been present since 2017. Fix the fuzz: - leading TABs in Makefile commands - fix context Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 Signed-off-by: Yann E. MORIN Cc: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/slang/0001-slsh-libs.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/slang/0001-slsh-libs.patch b/package/slang/0001-slsh-libs.patch index fad16d1b2f0..100399e818a 100644 --- a/package/slang/0001-slsh-libs.patch +++ b/package/slang/0001-slsh-libs.patch @@ -12,10 +12,10 @@ Signed-off-by: Fabrice Fontaine +++ b/slsh/Makefile.in @@ -92,7 +92,7 @@ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o - $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) + $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o - $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS) + $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile - cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c + cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile From de278d626b63f69557d13a5fb330b6bdc5b71f6b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 26 Jun 2024 20:15:20 +0200 Subject: [PATCH 1256/3013] Revert "package/xz: convert to cmake build" The conversion to cmake was supposed to be an RFC, and was not supposed to be applied [0], as the cmake support is not yet complete, while the autotools buildsystem is still functional [1]. The host-xz uses the target options, which is plain wrong. The target options forcubly disable shared libraries for no apparent reason, which causes the host build to also disable shared libs, which in turn causes host-python3 to fails to build. host-python3 has no dependency on host-xz, but it autodetects its presence, so if the build order caused host-xz to be built before host-python3, its presence will be detected (this needs to be fixed in host-python3 anyway, though) [2]. It also creates build issues in our reference envirnoment [3] Finally, there was a typo in the CXX override: -DCMAKE_CXX_COMPILER_LAUNCHER=="" This reverts commit 3f464c2e2826f02d9ee6f738df67c078e37cb327. Fixes: #5 [0] https://lore.kernel.org/buildroot/20240626103623.7d7412c0@gmx.net/ [1] https://tukaani.org/xz/#_building_from_xz_git [2] https://gitlab.com/buildroot.org/buildroot/-/issues/5 [3] https://lore.kernel.org/buildroot/ZnqUPBAcDbB7ND64@tl-lnx-nyma7486-2/ Signed-off-by: Yann E. MORIN --- package/xz/xz.mk | 65 +++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index b22b96849d0..fa4f6dbda99 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -8,45 +8,60 @@ XZ_VERSION = 5.6.2 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES +XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, BSD-0-Clause, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani XZ_CONF_OPTS = \ - -DENCODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \ - -DDECODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \ - -DMATCH_FINDERS="hc3;hc4;bt2;bt3;bt4" \ - -DADDITIONAL_CHECK_TYPES="crc64;sha256" \ - -DMICROLZMA_ENCODER=ON \ - -DMICROLZMA_DECODER=ON \ - -DLZIP_DECODER=ON \ - -DALLOW_CLMUL_CRC=ON \ - -DALLOW_ARM64_CRC32=ON \ - -DENABLE_SMALL=OFF \ - -DENABLE_SANDBOX=ON \ - -DCREATE_XZ_SYMLINKS=ON \ - -DCREATE_LZMA_SYMLINKS=ON \ - -DBUILD_SHARED_LIBS=OFF + --enable-encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ + --enable-decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ + --enable-match-finders=hc3,hc4,bt2,bt3,bt4 \ + --enable-checks=crc32,crc64,sha256 \ + --disable-external-sha256 \ + --enable-microlzma \ + --enable-lzip-decoder \ + --enable-assembler \ + --enable-clmul-crc \ + --enable-arm64-crc32 \ + --disable-small \ + --enable-assume-ram=128 \ + --enable-xz \ + --enable-xzdec \ + --enable-lzmadec \ + --enable-lzmainfo \ + --enable-lzma-links \ + --enable-scripts \ + --enable-sandbox=auto \ + --enable-symbol-versions \ + --enable-rpath \ + --enable-largfile \ + --enable-unaligned-access=auto \ + --disable-unsafe-type-punning \ + --disable-werror \ + --enable-year2038 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -XZ_CONF_OPTS += -DENABLE_NLS=ON +XZ_CONF_OPTS += --enable-nls else -XZ_CONF_OPTS += -DENABLE_NLS=OFF +XZ_CONF_OPTS += --disable-nls endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XZ_CONF_OPTS += -DENABLE_THREADS=ON +XZ_CONF_OPTS += --enable-threads else -XZ_CONF_OPTS += -DENABLE_THREADS=OFF +XZ_CONF_OPTS += --disable-threads endif -# we are built before ccache HOST_XZ_CONF_OPTS = \ $(XZ_CONF_OPTS) \ - -DENABLE_NLS=ON \ - -DENABLE_THREADS=ON \ - -DCMAKE_C_COMPILER_LAUNCHER="" \ - -DCMAKE_CXX_COMPILER_LAUNCHER=="" + --enable-nls \ + --enable-threads + +# we are built before ccache +HOST_XZ_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" -$(eval $(cmake-package)) -$(eval $(host-cmake-package)) +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From a6fabd961058a77622a725e7d58ac3ffb05ce5b6 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 27 Jun 2024 15:04:05 +0200 Subject: [PATCH 1257/3013] package/asterisk: update patches to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, asterisk fails to build with output: Applying 0004-install-samples-need-the-data-files.patch using patch: patching file Makefile Hunk #1 FAILED at 779. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej This commit rebase the package patches on the current package version. Note: the patch 0005 is unchanged, as it is correct in its current state. Fixes: - http://autobuild.buildroot.org/results/92d/92d58ecb67f11a6eb74695bc1efcc672f69a57a9 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- ...001-sounds-do-not-download-and-check-sha1s.patch | 10 ++++++---- .../0002-configure-fix-detection-of-libcrypt.patch | 13 +++++++------ ...ensure-target-directory-for-modules-exists.patch | 10 ++++++---- .../0004-install-samples-need-the-data-files.patch | 12 +++++++----- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch b/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch index 8412843d13b..ce0bf2d3307 100644 --- a/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch +++ b/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch @@ -1,4 +1,4 @@ -From 3e8a9e9a1c7eae515eb628778c3c8a04338b3bb3 Mon Sep 17 00:00:00 2001 +From 63f685e468bef94d8938b7a9c1a18c6c00840219 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 27 Dec 2016 11:21:09 +0100 Subject: [PATCH] sounds: do not download and check sha1s @@ -20,16 +20,18 @@ However, that poses at least two problems: So we just do without the sha1 download and checks. +Signed-off-by: Julien Olivain +[Julien: rebase patch on tag 20.7.0] Signed-off-by: "Yann E. MORIN" --- sounds/Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sounds/Makefile b/sounds/Makefile -index 84d0f45..7a80d56 100644 +index 288b8139a9..260434e504 100644 --- a/sounds/Makefile +++ b/sounds/Makefile -@@ -100,17 +100,7 @@ ifneq ($(SOUNDS_CACHE_DIR),) +@@ -101,17 +101,7 @@ ifneq ($(SOUNDS_CACHE_DIR),) if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@"; then \ (cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@); \ fi; \ @@ -48,5 +50,5 @@ index 84d0f45..7a80d56 100644 else $(CMD_PREFIX) \ -- -2.7.4 +2.45.2 diff --git a/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch b/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch index d82f5084ef1..7a0de603e48 100644 --- a/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch +++ b/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch @@ -1,4 +1,4 @@ -From 8996503f6c55e55f326ab11c18278954ad7abaf3 Mon Sep 17 00:00:00 2001 +From e959097b00357a2fd5f140daf3114c2245cd6b95 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 27 Dec 2016 11:21:57 +0100 Subject: [PATCH] configure: fix detection of libcrypt @@ -15,17 +15,18 @@ and thus concludes that crypt is missing when it was successfully found. Fix that by also storing the result of either check in the 'CRYPT' scheme. +Signed-off-by: Julien Olivain +[Julien: rebase patch on tag 20.7.0] Signed-off-by: "Yann E. MORIN" --- - configure | 2 ++ configure.ac | 2 ++ - 2 files changed, 4 insertions(+) + 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 121dd93..d459ff5 100644 +index 639bcd9df3..16f4297634 100644 --- a/configure.ac +++ b/configure.ac -@@ -2406,10 +2406,12 @@ AC_CHECK_FUNC([crypt], [SYSCRYPT=true], [SYSCRYPT=""]) +@@ -2694,10 +2694,12 @@ AC_CHECK_FUNC([crypt], [SYSCRYPT=true], [SYSCRYPT=""]) if test "x$LIBCRYPT_LIB" != "x" ; then CRYPT_LIB="$LIBCRYPT_LIB" CRYPT_INCLUDE="$LIBCRYPT_INCLUDE" @@ -39,5 +40,5 @@ index 121dd93..d459ff5 100644 fi -- -2.7.4 +2.45.2 diff --git a/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch b/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch index 20cfc93892b..3080ef991be 100644 --- a/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch +++ b/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch @@ -1,4 +1,4 @@ -From 933b2554a40f932571bdbdbb5217cda3e35fd61f Mon Sep 17 00:00:00 2001 +From 93edc41d3ae60e6ee9b9bbb7cdcc592133521fa3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 27 Nov 2017 12:52:52 +0100 Subject: [PATCH] build: ensure target directory for modules exists @@ -9,16 +9,18 @@ modules fails because the target directory does not exist yet. We fix that by instructing $(INSTALL) to create the destination directory first. +Signed-off-by: Julien Olivain +[Julien: rebase patch on tag 20.7.0] Signed-off-by: "Yann E. MORIN" --- Makefile.moddir_rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules -index 59190bece9..b73153a9a5 100644 +index 795b32c716..7d5e5d241a 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules -@@ -110,7 +110,7 @@ clean:: +@@ -106,7 +106,7 @@ clean:: install:: all @echo "Installing modules from `basename $(CURDIR)`..." @@ -28,5 +30,5 @@ index 59190bece9..b73153a9a5 100644 @if [ -f .moduleinfo ] ; then \ declare -A DISABLED_MODS ;\ -- -2.11.0 +2.45.2 diff --git a/package/asterisk/0004-install-samples-need-the-data-files.patch b/package/asterisk/0004-install-samples-need-the-data-files.patch index a9560e82e08..d863f637091 100644 --- a/package/asterisk/0004-install-samples-need-the-data-files.patch +++ b/package/asterisk/0004-install-samples-need-the-data-files.patch @@ -1,4 +1,4 @@ -From 05680ea9899c2246c23d11860c2c8e10aa8f80c7 Mon Sep 17 00:00:00 2001 +From d347deb0376a3254d7cd8bbfe46dd645d1bf1061 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 1 Dec 2017 11:08:16 +0100 Subject: [PATCH] install: samples need the data files @@ -12,24 +12,26 @@ installed at the time we try to generate the voicemail data. Ensure the needed dependency. +Signed-off-by: Julien Olivain +[Julien: rebase patch on tag 20.7.0] Signed-off-by: "Yann E. MORIN" --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index f29c07f680..b58f707b61 100644 +index 7ef73342cc..bb60f5e380 100644 --- a/Makefile +++ b/Makefile -@@ -779,7 +779,7 @@ adsi: +@@ -819,7 +819,7 @@ adsi: $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ done -samples: adsi +samples: adsi datafiles @echo Installing other config files... - $(call INSTALL_CONFIGS,samples,.sample) + $(call INSTALL_CONFIGS,configs/samples,.sample) $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" -- -2.11.0 +2.45.2 From 15e5c5109a01e8c1a5130ed758db938ccda2d14c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 27 Jun 2024 16:59:17 +0200 Subject: [PATCH 1258/3013] package/libgsm: update patches to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, libgsm fails to build with output: Applying 0001-misc-fixes-from-archlinux.patch using patch: patching file Makefile Hunk #2 FAILED at 96. Hunk #7 FAILED at 424. 2 out of 8 hunks FAILED -- saving rejects to file Makefile.rej This commit refreshes the package patch on the current package version. Fixes: - http://autobuild.buildroot.org/results/b27/b271ade6069fd25c1877e1e74648d92e88c459c4 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- ...h => 0001-Misc-fixes-from-Archlinux.patch} | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) rename package/libgsm/{0001-misc-fixes-from-archlinux.patch => 0001-Misc-fixes-from-Archlinux.patch} (88%) diff --git a/.checkpackageignore b/.checkpackageignore index b28846cd557..313201b0e68 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -834,7 +834,7 @@ package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_pat package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch lib_patch.Upstream package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch lib_patch.Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream -package/libgsm/0001-misc-fixes-from-archlinux.patch lib_patch.Upstream +package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch lib_patch.Upstream package/libhdhomerun/0001-dont-strip.patch lib_patch.Upstream diff --git a/package/libgsm/0001-misc-fixes-from-archlinux.patch b/package/libgsm/0001-Misc-fixes-from-Archlinux.patch similarity index 88% rename from package/libgsm/0001-misc-fixes-from-archlinux.patch rename to package/libgsm/0001-Misc-fixes-from-Archlinux.patch index 11c529b5097..6702a920aff 100644 --- a/package/libgsm/0001-misc-fixes-from-archlinux.patch +++ b/package/libgsm/0001-Misc-fixes-from-Archlinux.patch @@ -1,4 +1,4 @@ -From e8f43832d401ad1e071e6860b2bf4a1e796d4356 Mon Sep 17 00:00:00 2001 +From ef88ee98855008cd8c8de807a12917a556e2ce7d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 28 Jul 2017 08:18:22 -0400 Subject: [PATCH] Misc fixes from Archlinux @@ -11,12 +11,15 @@ Signed-off-by: Adam Duskett Refresh for 1.0.17 [Fabrice: refresh for 1.0.22] Signed-off-by: Fabrice Fontaine +Signed-off-by: Julien Olivain +[Julien: regenerate with git format-patch for 1.0.22, +as Fabrice refresh is incomplete for applying with fuzz 0] --- - Makefile | 84 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 42 insertions(+), 42 deletions(-) + Makefile | 49 ++++++++++++++++++++++++------------------------- + 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile -index d5c0c90..ef61bd5 100644 +index 2ad5e5d..2cb0b06 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ WAV49 = -DWAV49 @@ -36,7 +39,7 @@ index d5c0c90..ef61bd5 100644 +LN = ln -s -f BASENAME = basename AR = ar - ARFLAGS = cr + ARFLAGS = cr @@ -139,7 +139,7 @@ LFLAGS = $(LDFLAGS) $(LDINC) # Targets @@ -97,16 +100,16 @@ index d5c0c90..ef61bd5 100644 # The local bin and lib directories -@@ -425,7 +425,7 @@ semi-clean: +@@ -425,7 +424,7 @@ semi-clean: -print | xargs rm $(RMFLAGS) clean: semi-clean - -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ + -rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add \ $(TOAST) $(TCAT) $(UNTOAST) \ - $(ROOT)/gsm-1.0.tar.Z + $(ROOT)/gsm-1.0.tar.gz -@@ -473,22 +473,22 @@ $(ADDTST)/add: $(ADDTST)/add_test.o +@@ -473,22 +472,22 @@ $(ADDTST)/add: $(ADDTST)/add_test.o $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run ( cd $(TST); ./run ) @@ -140,5 +143,5 @@ index d5c0c90..ef61bd5 100644 - $(TST)/cod2lin.o $(LIBGSM) $(LDLIB) + $(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB) -- -2.13.3 +2.45.2 From 20973140c14d528d91ecea12ebac6428d78d3340 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:25:47 +0200 Subject: [PATCH 1259/3013] package/exim: update patches to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, exim fails to build with output: Applying 0004-exim_lock-fix-lstat-related-build-errors.patch using patch: patching file src/exim_lock.c Hunk #1 FAILED at 13. Hunk #2 succeeded at 27 (offset 1 line). 1 out of 2 hunks FAILED -- saving rejects to file src/exim_lock.c.rej This commit rebases the package patches on the current package version when needed. Fixes: http://autobuild.buildroot.net/results/ff27d5ebd7f24ac8cb236b83c67c2c75255e51c6/ Signed-off-by: Bernd Kuhls Reviewed-by: Luca Ceresoli Reviewed-by: Yann E. MORIN Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/exim/0001-Build-buildconfig-for-the-host.patch | 4 +++- ...0002-Don-t-make-backup-copies-of-installed-files.patch | 4 +++- ...0003-Skip-version-check-and-symlink-installation.patch | 8 ++++---- .../0004-exim_lock-fix-lstat-related-build-errors.patch | 8 +++++--- package/exim/0005-sieve-fix-build-errors.patch | 4 +++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package/exim/0001-Build-buildconfig-for-the-host.patch b/package/exim/0001-Build-buildconfig-for-the-host.patch index 87eb527974a..e9da80765ac 100644 --- a/package/exim/0001-Build-buildconfig-for-the-host.patch +++ b/package/exim/0001-Build-buildconfig-for-the-host.patch @@ -2,6 +2,8 @@ buildconfig is meant to be executed on the host, so it has to be compiled using $(HOSTCC), not $(CC). Signed-off-by: Luca Ceresoli +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- OS/Makefile-Base | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) @@ -10,7 +12,7 @@ diff --git a/OS/Makefile-Base b/OS/Makefile-Base index 29a6ad3..420ba60 100644 --- a/OS/Makefile-Base +++ b/OS/Makefile-Base -@@ -114,8 +114,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ +@@ -258,8 +258,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ # Targets for special-purpose configuration header builders buildconfig: buildconfig.c diff --git a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch index 0cdaa744bcc..3c115f8d020 100644 --- a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch +++ b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch @@ -5,6 +5,8 @@ This leads to useless duplicated files on the target, so disable this piece of code. Signed-off-by: Luca Ceresoli +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- scripts/exim_install | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) @@ -13,7 +15,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install index 616ab3c..e68e7d5 100755 --- a/scripts/exim_install +++ b/scripts/exim_install -@@ -344,15 +344,15 @@ while [ $# -gt 0 ]; do +@@ -348,15 +348,15 @@ while [ $# -gt 0 ]; do else if ../scripts/newer ${name} ${BIN_DIRECTORY}/${name}; then diff --git a/package/exim/0003-Skip-version-check-and-symlink-installation.patch b/package/exim/0003-Skip-version-check-and-symlink-installation.patch index a342d6ed347..55166f108b9 100644 --- a/package/exim/0003-Skip-version-check-and-symlink-installation.patch +++ b/package/exim/0003-Skip-version-check-and-symlink-installation.patch @@ -9,8 +9,8 @@ Inspired by: http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch Signed-off-by: Luca Ceresoli -(rebased against exim 4.89) -Signed-off-by: Bernd Kuhls +[Bernd: rebased for version 4.89 & 4.97.1] +Signed-off-by: Bernd Kuhls --- scripts/exim_install | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) @@ -19,7 +19,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install index e68e7d5..487a4e1 100755 --- a/scripts/exim_install +++ b/scripts/exim_install -@@ -58,6 +58,8 @@ +@@ -61,6 +61,8 @@ shift done @@ -28,7 +28,7 @@ index e68e7d5..487a4e1 100755 # Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK, # SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build # directory). EXE is empty except in the Cygwin environment. In each case, keep -@@ -217,9 +219,7 @@ +@@ -220,9 +223,7 @@ # The exim binary is handled specially if [ $name = exim${EXE} ]; then diff --git a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch index a0a279fc43f..616ada50264 100644 --- a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch +++ b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch @@ -22,6 +22,8 @@ Fixes: Signed-off-by: Luca Ceresoli Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- src/exim_lock.c | 3 +++ 1 file changed, 3 insertions(+) @@ -30,8 +32,8 @@ diff --git a/src/exim_lock.c b/src/exim_lock.c index 068216816054..cb140aff6436 100644 --- a/src/exim_lock.c +++ b/src/exim_lock.c -@@ -13,6 +13,8 @@ Argument: the name of the lock file - Copyright (c) The Exim Maintainers 2016 +@@ -14,6 +14,8 @@ Copyright (c) The Exim Maintainers 2016 - 2021 + SPDX-License-Identifier: GPL-2.0-or-later */ +#define _XOPEN_SOURCE @@ -39,7 +41,7 @@ index 068216816054..cb140aff6436 100644 #include "os.h" #include -@@ -26,6 +28,7 @@ Copyright (c) The Exim Maintainers 2016 +@@ -27,6 +29,7 @@ Copyright (c) The Exim Maintainers 2016 #include #include #include diff --git a/package/exim/0005-sieve-fix-build-errors.patch b/package/exim/0005-sieve-fix-build-errors.patch index f4b95d50bcd..20323c17cd7 100644 --- a/package/exim/0005-sieve-fix-build-errors.patch +++ b/package/exim/0005-sieve-fix-build-errors.patch @@ -21,6 +21,8 @@ buildsystem. Signed-off-by: Luca Ceresoli Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- src/sieve.c | 2 ++ 1 file changed, 2 insertions(+) @@ -29,7 +31,7 @@ diff --git a/src/sieve.c b/src/sieve.c index 5e8d1e6f4776..9632f2d43810 100644 --- a/src/sieve.c +++ b/src/sieve.c -@@ -12,6 +12,8 @@ +@@ -14,6 +14,8 @@ /* Sieve mail filter. */ From 4928032d6c58ff64b0aa4af1874aed7c3aa43842 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 00:06:53 +0200 Subject: [PATCH 1260/3013] package/rrdtool: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, rrdtool fails to build with output: patching file src/rrd_tool.c Hunk #2 FAILED at 42. Hunk #3 succeeded at 435 (offset -8 lines). Hunk #4 succeeded at 518 (offset -8 lines). Hunk #5 succeeded at 564 (offset -8 lines). Hunk #6 succeeded at 879 (offset -8 lines). 1 out of 6 hunks FAILED -- saving rejects to file src/rrd_tool.c.rej Because this was caused by an upstream patch we do not change it but add another upstream patch to be applied before our current patch to avoid the problem. Fixes: http://autobuild.buildroot.net/results/6996dbd764b0066da49dd009f1385196342c89dc/ Signed-off-by: Bernd Kuhls Reviewed-by: Yann E. MORIN Tested-by: Yann E. MORIN [yann.morin.1998@free.fr: - add comment as suggested by yann.morin@orange.com ] Signed-off-by: Yann E. MORIN --- ...ix-BUILD_DATE-in-rrdtool-help-output.patch | 57 +++++++++++++++++++ ... => 0002-Constify-argv-fix-warnings.patch} | 0 package/rrdtool/rrdtool.mk | 5 +- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 package/rrdtool/0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch rename package/rrdtool/{0001-Constify-argv-fix-warnings.patch => 0002-Constify-argv-fix-warnings.patch} (100%) diff --git a/package/rrdtool/0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch b/package/rrdtool/0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch new file mode 100644 index 00000000000..9e5af9c1486 --- /dev/null +++ b/package/rrdtool/0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch @@ -0,0 +1,57 @@ +From e59f703bbcc0af949ee365206426b6394c340c6f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= +Date: Wed, 23 Mar 2022 17:58:45 +0100 +Subject: [PATCH] Fix BUILD_DATE in rrdtool help output + +- This is a followup to #1102 +- Fixes segfault when running "rrdtool --help" +- Change DATE_FMT to the same date format as the __DATE__ macro [1]: + mmm dd yyyy + +[1] https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html + +Upstream: https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 2 +- + src/rrd_tool.c | 8 ++++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4d2345855..5169b0d49 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -695,7 +695,7 @@ AC_MSG_RESULT(${COMP_PERL:-No Perl Modules will be built}) + + # Use reproducible build date and time + if test "$SOURCE_DATE_EPOCH"; then +- DATE_FMT="%d %b %Y %H:%M:%S" ++ DATE_FMT="%b %d %Y %H:%M:%S" + BUILD_DATE=$(LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT") + AC_DEFINE_UNQUOTED([BUILD_DATE], ["$BUILD_DATE"], [Use reproducible build date]) + fi +diff --git a/src/rrd_tool.c b/src/rrd_tool.c +index 930d08272..cc6119d9a 100644 +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -45,11 +45,19 @@ static void PrintUsage( + char *cmd) + { + ++#ifdef BUILD_DATE ++ const char *help_main = ++ N_("RRDtool %s" ++ " Copyright by Tobias Oetiker \n" ++ " Compiled %s\n\n" ++ "Usage: rrdtool [options] command command_options\n"); ++#else + const char *help_main = + N_("RRDtool %s" + " Copyright by Tobias Oetiker \n" + " Compiled %s %s\n\n" + "Usage: rrdtool [options] command command_options\n"); ++#endif + + const char *help_list = + N_ diff --git a/package/rrdtool/0001-Constify-argv-fix-warnings.patch b/package/rrdtool/0002-Constify-argv-fix-warnings.patch similarity index 100% rename from package/rrdtool/0001-Constify-argv-fix-warnings.patch rename to package/rrdtool/0002-Constify-argv-fix-warnings.patch diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 24d84c79c3d..f0cffd01626 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -9,10 +9,13 @@ RRDTOOL_SITE = https://github.com/oetiker/rrdtool-1.x/releases/download/v$(RRDTO RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) -# autoreconf needed to avoid link failure due to missing -lintl, + +# 0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch +# autoreconf also needed to avoid link failure due to missing -lintl, # autopoint needed as a consequence of autoreconf RRDTOOL_AUTORECONF = YES RRDTOOL_AUTOPOINT = YES + RRDTOOL_INSTALL_STAGING = YES RRDTOOL_CONF_OPTS = \ --disable-examples \ From d09597bbaeaff551d8968dd17f85f2f65ffa515e Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 28 Jun 2024 01:53:59 -0700 Subject: [PATCH 1261/3013] package/cpulimit: Refresh patch Make sure that /0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch applies cleanly without any fuzz by refreshing it. Signed-off-by: Florian Fainelli Tested-by: Yann E. MORIN Reviewed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- ...Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch b/package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch index fa32e3ede22..c0a457cdfd2 100644 --- a/package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch +++ b/package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch @@ -35,8 +35,8 @@ index 06d73a6f3541..d4f6fab3385c 100644 #include +#include - #include - + #if defined(__APPLE__) || defined(__FREEBSD__) + #include -- 2.25.1 From b5080088ceda1e4873e5408e1961dec7b844a607 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Jun 2024 09:31:02 +0200 Subject: [PATCH 1262/3013] package/libyuv: update patches to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, libyuv fails to build with output: Applying 0001-i386-sse2.patch using patch: patching file include/libyuv/scale_row.h Hunk #1 FAILED at 33. 1 out of 1 hunk FAILED -- saving rejects to file include/libyuv/scale_row.h.rej Rebase the patch to fix the problem. Fixes: http://autobuild.buildroot.net/results/8ca446ee4bd657a661894dec66f45aa02b6a7325/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/libyuv/0001-i386-sse2.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyuv/0001-i386-sse2.patch b/package/libyuv/0001-i386-sse2.patch index b8ecb34d0f4..2380bbc9734 100644 --- a/package/libyuv/0001-i386-sse2.patch +++ b/package/libyuv/0001-i386-sse2.patch @@ -5,7 +5,7 @@ Signed-off-by: Bernd Kuhls diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/scale_row.h --- libyuv-1411.org/include/libyuv/scale_row.h 2015-05-22 23:39:21.000000000 +0200 +++ libyuv-1411/include/libyuv/scale_row.h 2015-05-25 12:35:17.000000000 +0200 -@@ -33,7 +33,7 @@ +@@ -55,7 +55,7 @@ // The following are available on all x86 platforms: #if !defined(LIBYUV_DISABLE_X86) && \ @@ -13,4 +13,4 @@ diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/ + (defined(_M_IX86) || defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__))) #define HAS_FIXEDDIV1_X86 #define HAS_FIXEDDIV_X86 - #define HAS_SCALEADDROWS_SSE2 + #define HAS_SCALEADDROW_SSE2 From e1c86e1cac9f41f930d915cdca03608b57b83182 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Jun 2024 10:27:45 +0200 Subject: [PATCH 1263/3013] package/crda: update patches to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, crda fails to build with output: Applying 0001-crda-support-python-3-in-utils-key2pub.py.patch using patch: patching file Makefile Hunk #1 FAILED at 112. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej Rebase patch to fix the problem, problem was not yet caught by autobuilders. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../crda/0001-crda-support-python-3-in-utils-key2pub.py.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch index f2b9cca2d67..00b5a52ea77 100644 --- a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch +++ b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch @@ -33,6 +33,8 @@ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Seiderer [Romain: Use pycryptodomex] Signed-off-by: Romain Naour +[Bernd: rebased for version 4.15] +Signed-off-by: Bernd Kuhls --- Makefile | 2 +- utils/key2pub.py | 146 ++++++++++++++++++++++++----------------------- @@ -49,7 +51,7 @@ index a3ead30..8da38d0 100644 - $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ + $(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ - $(LIBREG): regdb.h reglib.h reglib.c + $(LIBREG): reglib.c regdb.h reglib.h $(NQ) ' CC ' $@ diff --git a/utils/key2pub.py b/utils/key2pub.py index 9bb04cd..8a0ba2a 100755 From ddd79103cfdef63b078933477ae5781166ffdab5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 29 Jun 2024 14:13:49 +0200 Subject: [PATCH 1264/3013] package/eigen: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, eigen fails to build with output: Applying 0001-Adds-new-CMake-Options-for-controlling-build-components.patch using patch: patching file CMakeLists.txt Hunk #1 succeeded at 495 (offset 18 lines). Hunk #2 succeeded at 615 (offset 1 line). Hunk #3 succeeded at 652 (offset -8 lines). patching file blas/CMakeLists.txt patching file lapack/CMakeLists.txt Hunk #1 FAILED at 1. Hunk #2 succeeded at 450 (offset -7 lines). 1 out of 2 hunks FAILED -- saving rejects to file lapack/CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Since the patch file name changed in the regeneration, the ".checkpackageignore" entry is updated accordingly. Fixes: http://autobuild.buildroot.org/results/6fd059b4e7f83a38683341ea1ea02e13d1a92449 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- ...tions-for-controlling-build-compone.patch} | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) rename package/eigen/{0001-Adds-new-CMake-Options-for-controlling-build-components.patch => 0001-Adds-new-CMake-Options-for-controlling-build-compone.patch} (80%) diff --git a/.checkpackageignore b/.checkpackageignore index 313201b0e68..9d441eb4276 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -564,7 +564,7 @@ package/ecryptfs-utils/0003-fix-parallel-build-issue.patch lib_patch.Upstream package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch lib_patch.Upstream package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch lib_patch.Upstream package/efl/0003-ecore_fb-fix-build-with-tslib.patch lib_patch.Upstream -package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch lib_patch.Upstream +package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-compone.patch lib_patch.Upstream package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch lib_patch.Upstream package/ejabberd/0002-fix-ejabberdctl.patch lib_patch.Upstream package/ejabberd/0003-correct-includes.patch lib_patch.Upstream diff --git a/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch b/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-compone.patch similarity index 80% rename from package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch rename to package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-compone.patch index 693e610d0a8..737e7d39b71 100644 --- a/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch +++ b/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-compone.patch @@ -1,4 +1,4 @@ -From cf82186416d04ea5df2a397d8fe09dc78d40ca65 Mon Sep 17 00:00:00 2001 +From f49d5c1a6b7c22be359189cd0b1e2e766bd05365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= Date: Sat, 5 Mar 2022 05:49:45 +0000 Subject: [PATCH] Adds new CMake Options for controlling build components. @@ -6,6 +6,8 @@ Subject: [PATCH] Adds new CMake Options for controlling build components. [Retrieved from: https://gitlab.com/libeigen/eigen/-/commit/cf82186416d04ea5df2a397d8fe09dc78d40ca65] Signed-off-by: Fabrice Fontaine +[Julien: rebased patch on 3.4.0] +Signed-off-by: Julien Olivain --- CMakeLists.txt | 6 ++++++ blas/CMakeLists.txt | 3 ++- @@ -13,10 +15,10 @@ Signed-off-by: Fabrice Fontaine 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index de1c23e91..0af36a53a 100644 +index f3e69b845..74ff755f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -477,6 +477,9 @@ if(EIGEN_BUILD_TESTING) +@@ -495,6 +495,9 @@ if(BUILD_TESTING) add_subdirectory(failtest) endif() @@ -26,7 +28,7 @@ index de1c23e91..0af36a53a 100644 if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) add_subdirectory(blas) add_subdirectory(lapack) -@@ -611,6 +614,8 @@ set_target_properties (eigen PROPERTIES EXPORT_NAME Eigen) +@@ -612,6 +615,8 @@ set_target_properties (eigen PROPERTIES EXPORT_NAME Eigen) install (TARGETS eigen EXPORT Eigen3Targets) @@ -35,7 +37,7 @@ index de1c23e91..0af36a53a 100644 configure_package_config_file ( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Eigen3Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake -@@ -655,6 +660,7 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake +@@ -647,6 +652,7 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UseEigen3.cmake # Add uninstall target add_custom_target ( uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EigenUninstall.cmake) @@ -44,7 +46,7 @@ index de1c23e91..0af36a53a 100644 if (EIGEN_SPLIT_TESTSUITE) ei_split_testsuite("${EIGEN_SPLIT_TESTSUITE}") diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt -index 8d3cb86dc..c530957fb 100644 +index f3a94ec4a..d07090f69 100644 --- a/blas/CMakeLists.txt +++ b/blas/CMakeLists.txt @@ -1,6 +1,7 @@ @@ -55,17 +57,18 @@ index 8d3cb86dc..c530957fb 100644 include(CheckLanguage) check_language(Fortran) if(CMAKE_Fortran_COMPILER) -@@ -59,4 +60,4 @@ if(EIGEN_BUILD_TESTING) +@@ -59,4 +60,4 @@ if(BUILD_TESTING) endif() endif() - +endif() diff --git a/lapack/CMakeLists.txt b/lapack/CMakeLists.txt -index c8ca64001..8d6d75401 100644 +index e48497fda..71255d96d 100644 --- a/lapack/CMakeLists.txt +++ b/lapack/CMakeLists.txt -@@ -1,5 +1,7 @@ +@@ -1,6 +1,8 @@ + project(EigenLapack CXX) +if(EIGEN_BUILD_LAPACK AND EIGEN_BUILD_BLAS) @@ -73,7 +76,7 @@ index c8ca64001..8d6d75401 100644 include(CheckLanguage) check_language(Fortran) if(CMAKE_Fortran_COMPILER) -@@ -457,3 +459,6 @@ if(EXISTS ${eigen_full_path_to_testing_lapack}) +@@ -450,3 +452,6 @@ if(EXISTS ${eigen_full_path_to_testing_lapack}) endif() @@ -81,5 +84,5 @@ index c8ca64001..8d6d75401 100644 + message(FATAL_ERROR "EIGEN_BUILD_LAPACK requires EIGEN_BUILD_BLAS") +endif() #EIGEN_BUILD_LAPACK -- -GitLab +2.45.2 From e336a037e9c04263b58a2278e0d6f545eb9b1914 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 29 Jun 2024 14:18:28 +0200 Subject: [PATCH 1265/3013] package/sox: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, sox fails to build with output: Applying 0001-uclibc.patch using patch: patching file src/formats.c Hunk #1 FAILED at 409. Hunk #2 succeeded at 477 (offset 60 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/formats.c.rej This commit refreshes the package patch on the current package version. Note 1: the failing patch 0001 was regenerated with "git format-patch". Since the patch file 0001 name changed in the regeneration, the ".checkpackageignore" entry is also updated accordingly. Note 2: patch 0002 did not require any update. Fixes: http://autobuild.buildroot.org/results/1bc396386aa3321fe48101caf9635ae41feb057b Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- ...-SoX-support-uclibc-based-toolchains.patch | 40 +++++++++++++++++++ package/sox/0001-uclibc.patch | 26 ------------ ...re.ac-fix-static-linking-with-id3tag.patch | 10 +++-- ...ure.ac-fix-static-linking-with-magic.patch | 10 +++-- ...e.ac-fix-static-linking-with-sndfile.patch | 10 +++-- 6 files changed, 59 insertions(+), 39 deletions(-) create mode 100644 package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch delete mode 100644 package/sox/0001-uclibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index 9d441eb4276..ec95652000d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1401,7 +1401,7 @@ package/softether/0008-librt.patch lib_patch.Upstream package/softether/0009-uclibc-ai-addrconfig.patch lib_patch.Upstream package/solarus/0001-cmake-remove-Werror.patch lib_patch.Upstream package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch lib_patch.Sob lib_patch.Upstream -package/sox/0001-uclibc.patch lib_patch.Upstream +package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch lib_patch.Upstream package/sox/0002-configure.ac-put-back-disable-stack-protector.patch lib_patch.Upstream package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch lib_patch.Upstream package/sox/0004-configure.ac-fix-static-linking-with-magic.patch lib_patch.Upstream diff --git a/package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch b/package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch new file mode 100644 index 00000000000..3d21b570f18 --- /dev/null +++ b/package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch @@ -0,0 +1,40 @@ +From 5d51acafe9c38fb05939b4d2d6a9dcde12476458 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Sat, 29 Jun 2024 12:28:54 +0200 +Subject: [PATCH] Make SoX support uclibc-based toolchains + +From: +http://sourceforge.net/p/sox/bugs/179/ + +Signed-off-by: Gustavo Zacarias +[Julien: rebased patch on package git version 7524160, +and regenerated with git format-patch] +Signed-off-by: Julien Olivain +--- + src/formats.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/formats.c b/src/formats.c +index 3fcf4382..9fc001bd 100644 +--- a/src/formats.c ++++ b/src/formats.c +@@ -466,7 +466,7 @@ static void UNUSED rewind_pipe(FILE * fp) + #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ + fp->_p -= PIPE_AUTO_DETECT_SIZE; + fp->_r += PIPE_AUTO_DETECT_SIZE; +-#elif defined __GLIBC__ ++#elif defined __GLIBC__ && ! defined __UCLIBC__ + fp->_IO_read_ptr = fp->_IO_read_base; + #elif defined _MSC_VER && _MSC_VER >= 1900 + #define NO_REWIND_PIPE +@@ -477,7 +477,6 @@ static void UNUSED rewind_pipe(FILE * fp) + /* To fix this #error, either simply remove the #error line and live without + * file-type detection with pipes, or add support for your compiler in the + * lines above. Test with cat monkey.wav | ./sox --info - */ +- #error FIX NEEDED HERE + #define NO_REWIND_PIPE + (void)fp; + #endif +-- +2.45.2 + diff --git a/package/sox/0001-uclibc.patch b/package/sox/0001-uclibc.patch deleted file mode 100644 index 5c118fa4dca..00000000000 --- a/package/sox/0001-uclibc.patch +++ /dev/null @@ -1,26 +0,0 @@ -Make SoX support uclibc-based toolchains, from: -http://sourceforge.net/p/sox/bugs/179/ - -Signed-off-by: Gustavo Zacarias - -Index: sox-14.4.1/src/formats.c -=================================================================== ---- sox-14.4.1.orig/src/formats.c -+++ sox-14.4.1/src/formats.c -@@ -409,7 +409,7 @@ static void UNUSED rewind_pipe(FILE * fp - #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ - fp->_p -= PIPE_AUTO_DETECT_SIZE; - fp->_r += PIPE_AUTO_DETECT_SIZE; --#elif defined __GLIBC__ -+#elif defined __GLIBC__ && ! defined __UCLIBC__ - fp->_IO_read_ptr = fp->_IO_read_base; - #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H - fp->_ptr = fp->_base; -@@ -417,7 +417,6 @@ static void UNUSED rewind_pipe(FILE * fp - /* To fix this #error, either simply remove the #error line and live without - * file-type detection with pipes, or add support for your compiler in the - * lines above. Test with cat monkey.wav | ./sox --info - */ -- #error FIX NEEDED HERE - #define NO_REWIND_PIPE - (void)fp; - #endif diff --git a/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch b/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch index 32d6f83b0cd..2bb574b319f 100644 --- a/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch +++ b/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch @@ -1,4 +1,4 @@ -From 8df3a56cfb104c84d4701562ae2e3c9dc4686798 Mon Sep 17 00:00:00 2001 +From 06e5cc069dbdfa060c3d9e75a798ec121ecc9349 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Feb 2021 11:08:45 +0100 Subject: [PATCH] configure.ac: fix static linking with id3tag @@ -23,6 +23,8 @@ util.c:(.text+0x240): undefined reference to `uncompress' Fixes: - http://autobuild.buildroot.org/results/73efdacf237e3d567fa66f3b3f68e624f5e35bc7 +Signed-off-by: Julien Olivain +[Julien: rebased patch on package git version 7524160] Signed-off-by: Fabrice Fontaine [Upstream status: https://sourceforge.net/p/sox/patches/123] --- @@ -30,10 +32,10 @@ Signed-off-by: Fabrice Fontaine 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 39306398..896714f5 100644 +index a1665467..8f47a978 100644 --- a/configure.ac +++ b/configure.ac -@@ -83,7 +83,7 @@ dnl Various libraries +@@ -88,7 +88,7 @@ dnl Various libraries SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open]) SOX_CHECK_LIB([ZLIB], [zlib.h], [z], [uncompress]) SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS]) @@ -43,5 +45,5 @@ index 39306398..896714f5 100644 dnl Optional formats -- -2.29.2 +2.45.2 diff --git a/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch b/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch index 7d2e390df11..ad36ecad57c 100644 --- a/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch +++ b/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch @@ -1,4 +1,4 @@ -From 4630e574e6c0269b94fd910e7c72b8ad1ee62ce7 Mon Sep 17 00:00:00 2001 +From 76b78cb89cf8fc36b4ced568f3b34f778df53411 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Mar 2021 16:48:57 +0100 Subject: [PATCH] configure.ac: fix static linking with magic @@ -24,6 +24,8 @@ compress.c:(.text+0x1d0): undefined reference to `inflateInit_' Fixes: - http://autobuild.buildroot.org/results/d96f27cd96926060046e2e1115777f5bceda3741 +Signed-off-by: Julien Olivain +[Julien: rebased patch on package git version 7524160] Signed-off-by: Fabrice Fontaine [Upstream status: not sent yet (waiting for feedback on third patch)] --- @@ -31,10 +33,10 @@ Signed-off-by: Fabrice Fontaine 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 896714f5..8ae3202c 100644 +index 8f47a978..20454ed5 100644 --- a/configure.ac +++ b/configure.ac -@@ -80,7 +80,7 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA]) +@@ -85,7 +85,7 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA]) dnl Various libraries @@ -44,5 +46,5 @@ index 896714f5..8ae3202c 100644 SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS]) SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open], [], [], [], [$ZLIB_LIBS]) -- -2.30.1 +2.45.2 diff --git a/package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch b/package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch index 22334593317..46e5ca0ea13 100644 --- a/package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch +++ b/package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch @@ -1,4 +1,4 @@ -From 06109c84ab6930265287049c4bf9405e7ebc4986 Mon Sep 17 00:00:00 2001 +From 7a2e270989037663e740487a8248db1227697c92 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 10:27:16 +0200 Subject: [PATCH] configure.ac: fix static linking with sndfile @@ -20,6 +20,8 @@ flac.c:(.text+0xfc): undefined reference to `FLAC__StreamDecoderErrorStatusStrin Fixes: - http://autobuild.buildroot.org/results/4bc58ed68b29642876bb02710d0cd4f31540de86 +Signed-off-by: Julien Olivain +[Julien: rebased patch on package git version 7524160] Signed-off-by: Fabrice Fontaine [Upstream status: not sent yet (waiting for feedback on third patch)] --- @@ -27,10 +29,10 @@ Signed-off-by: Fabrice Fontaine 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 8ae3202c..26510769 100644 +index 20454ed5..4330360b 100644 --- a/configure.ac +++ b/configure.ac -@@ -117,7 +117,7 @@ SOX_FMT_REQ([mp3], [MAD LAME TWOLAME]) +@@ -122,7 +122,7 @@ SOX_FMT_REQ([mp3], [MAD LAME TWOLAME]) SOX_FMT_PKG([oggvorbis], [ogg vorbis vorbisenc vorbisfile]) SOX_FMT_PKG([opus], [opusfile]) @@ -40,5 +42,5 @@ index 8ae3202c..26510769 100644 SOX_FMT_LIB([wavpack], [wavpack/wavpack.h], [wavpack], [WavpackGetSampleRate]) -- -2.30.2 +2.45.2 From 525695a4459f7c367dd29f138d0c9a7485c5afce Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 28 Jun 2024 16:21:05 +0100 Subject: [PATCH 1266/3013] boot/xilinx-prebuilt/xilinx-prebuilt.mk: simplify variables This patch reduces the xilinx-prebuilt package to a single install variable that changes depending on device family variant. Signed-off-by: Neal Frager Signed-off-by: Arnout Vandecappelle --- boot/xilinx-prebuilt/xilinx-prebuilt.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk index eb78ed10cd6..0c5456f5779 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -20,7 +20,7 @@ ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) # We need the *.pdi glob, because the file has different names for the # different boards, but htere is only one, and it has to be named # vpl_gen_fixed.pdi when installed. -define XILINX_PREBUILT_INSTALL_VERSAL +define XILINX_PREBUILT_INSTALL $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/plm.elf \ $(BINARIES_DIR)/plm.elf $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf \ @@ -29,15 +29,14 @@ define XILINX_PREBUILT_INSTALL_VERSAL $(BINARIES_DIR)/vpl_gen_fixed.pdi endef else # BR2_TARGET_XILINX_PREBUILT_VERSAL -define XILINX_PREBUILT_INSTALL_OTHERS +define XILINX_PREBUILT_INSTALL $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/pmufw.elf \ $(BINARIES_DIR)/pmufw.elf endef endif # BR2_TARGET_XILINX_PREBUILT_VERSAL define XILINX_PREBUILT_INSTALL_IMAGES_CMDS - $(XILINX_PREBUILT_INSTALL_VERSAL) - $(XILINX_PREBUILT_INSTALL_OTHERS) + $(XILINX_PREBUILT_INSTALL) endef $(eval $(generic-package)) From 50e1be79da7efec28b169c7cac9f80cd4e87dae8 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 28 Jun 2024 09:09:32 -0700 Subject: [PATCH 1267/3013] package/docker-engine: bump version to v27.0.2 https://github.com/moby/moby/releases/tag/v27.0.2 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index e13527944e7..86de5ca7855 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f1cf6a2e69607daa0e2ae9b5be752dc269ab30dee16f5f2180f7ff7f29270606 docker-engine-26.0.2-go2.tar.gz +sha256 2705abdd7a8a47ec88c0d2f0f31eede01ba4aa5ae8b5ab0e2c4ee25e7c314521 docker-engine-27.0.2-go2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index f8dc87050f1..1de112e4de1 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 26.0.2 +DOCKER_ENGINE_VERSION = 27.0.2 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From b6b4c4a2730430e0433effc015c505de62c2b97b Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 28 Jun 2024 09:09:33 -0700 Subject: [PATCH 1268/3013] package/docker-cli: bump version to v27.0.2 https://github.com/docker/cli/releases/tag/v27.0.2 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index a2bed4aaed3..af26294378f 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b047e180c94452b4375f7e43997286e5a5712e66b1280574974b2e117b4e43bd docker-cli-26.0.2-go2.tar.gz +sha256 a2b31d4c8143c8b126e98a359639f51727fc83fc1e61670efbdeaa7dea92fd5a docker-cli-27.0.2-go2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 69c6f12f3c1..1e29f008b65 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 26.0.2 +DOCKER_CLI_VERSION = 27.0.2 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From 4e01942d83c57ce4973e549afa4735a52394de35 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 28 Jun 2024 09:12:27 -0700 Subject: [PATCH 1269/3013] package/containerd: bump version to v1.7.18 https://github.com/containerd/containerd/releases/tag/v1.7.18 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 1b2609e880d..03964ace3f1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 containerd-1.7.14-go2.tar.gz +sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 containerd-1.7.18-go2.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 81875f763c0..b8225169389 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.14 +CONTAINERD_VERSION = 1.7.18 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From b752d0e4cc78a921ba08cd891f68ef80fc251128 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:46:32 +0200 Subject: [PATCH 1270/3013] package/vlc: security bump to version 3.0.21 Fixes http://www.videolan.org/security/sb-vlc3021.html Release notes: https://code.videolan.org/videolan/vlc/-/blob/3.0.21/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/vlc/vlc.hash | 8 ++++---- package/vlc/vlc.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 40529bd6648..b3d9a083b98 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha256 -sha256 adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5 vlc-3.0.20.tar.xz -# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha1 -sha1 b834516ab701bf6311980ed5d67b77c834fdebe7 vlc-3.0.20.tar.xz +# From https://get.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.sha256 +sha256 24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0 vlc-3.0.21.tar.xz +# From https://get.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.sha1 +sha1 be8557fc2f4be58caebe4a8b1d70f03dc6b95792 vlc-3.0.21.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index d0fc1744c01..a597616470e 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.20 +VLC_VERSION = 3.0.21 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ From cd83b50bdca87c74dfd4a4860de52eb645b76394 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:47:04 +0200 Subject: [PATCH 1271/3013] package/xmrig: bump version to 6.21.3 Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 116855fdbaa..d7fdbe0d0be 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68b4be51e99687bad15d5bf4ac9eed79a080ba89141f7363457a957ce9304e4d xmrig-6.21.2.tar.gz +sha256 5d76fb19190956c564b405119315bc93db4ed8062b251d5e96bed70c5fa8033c xmrig-6.21.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 45538fa77e1..d01b0018178 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.2 +XMRIG_VERSION = 6.21.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From a3233807d202f2b055373f82f6e0254cb8dee878 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:47:40 +0200 Subject: [PATCH 1272/3013] package/dav1d: bump version to 1.4.3 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index a62193810ed..e0ca8f1e882 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.4.1/dav1d-1.4.1.tar.xz.sha256 -sha256 8d407dd5fe7986413c937b14e67f36aebd06e1fa5cfec679d10e548476f2d5f8 dav1d-1.4.1.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.4.3/dav1d-1.4.3.tar.xz.sha256 +sha256 42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19 dav1d-1.4.3.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 18cb81868aa..4e3e8fe1cf5 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.4.1 +DAV1D_VERSION = 1.4.3 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From 189429f4480417518ca059451735a12f7c060cc6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:48:02 +0200 Subject: [PATCH 1273/3013] package/alsa-lib: bump version to 1.2.12 Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.11_v1.2.12#alsa-lib Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 830643dea80..9c993c05ae3 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d alsa-lib-1.2.11.tar.bz2 +sha256 4868cd908627279da5a634f468701625be8cc251d84262c7e5b6a218391ad0d2 alsa-lib-1.2.12.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 246761d4e6b..1dc25ea4a84 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.11 +ALSA_LIB_VERSION = 1.2.12 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) From bcf7d85b28988fff3b814743ce56bdb86baafd15 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:48:03 +0200 Subject: [PATCH 1274/3013] package/alsa-utils: bump version to 1.2.12 Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.11_v1.2.12#alsa-utils Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index bf98f578cd2..bff223f9426 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7 alsa-utils-1.2.11.tar.bz2 +sha256 98bc6677d0c0074006679051822324a0ab0879aea558a8f68b511780d30cd924 alsa-utils-1.2.12.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 3ece7ddca43..e77e36fc55a 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.11 +ALSA_UTILS_VERSION = 1.2.12 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 From 2932e71901bca931b72863cfe24cb4ad9e03cdf7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:48:23 +0200 Subject: [PATCH 1275/3013] package/libva: bump version to 2.22.0 Release notes: https://github.com/intel/libva/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libva/libva.hash | 2 +- package/libva/libva.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 24825ddc1fc..b1358b99a78 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7c3fffef3f04eb146e036dad2587d852bfb70e4926d014bf437244915ef7425 libva-2.21.0.tar.gz +sha256 467c418c2640a178c6baad5be2e00d569842123763b80507721ab87eb7af8735 libva-2.22.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 79dbe577c8b..46f42afba8f 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.21.0 +LIBVA_VERSION = 2.22.0 LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING From e0ea4c280c62245525500cc76f53d57b04b8d0a7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:48:24 +0200 Subject: [PATCH 1276/3013] package/libva-utils: bump version to 2.22.0 Release notes: https://github.com/intel/libva-utils/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 2c80435ca6c..049781810af 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15ca12bd11c7001c04af5079512754fea6ba8d79151b9f07908c99b27622714e libva-utils-2.21.0.tar.gz +sha256 7b57615c130427ec134bb5d2b80af516ce5bb19a40e89b1dab46a0d59760d96c libva-utils-2.22.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index f58685e51be..0536f022d25 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.21.0 +LIBVA_UTILS_VERSION = 2.22.0 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From 93868c35e9829c13083fd7e954ac7e4909925758 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 28 Jun 2024 22:46:17 +0200 Subject: [PATCH 1277/3013] package/cgic: drop package The upstream site for cgic is now a parking/phishing site, so we can't download cgic anymore. The last version was 2.07, released 7 years ago, and nothing uses cgic in Buildroot. Drop the package. Signed-off-by: Yann E. MORIN Cc: David Bender Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 3 - Config.in.legacy | 6 ++ DEVELOPERS | 1 - package/Config.in | 1 - package/cgic/0001-prepare_makefile.patch | 44 --------------- package/cgic/0002-file_enhancements.patch | 56 ------------------- ...3-restore-cgiFormFileGetTempfileName.patch | 43 -------------- package/cgic/Config.in | 6 -- package/cgic/cgic.hash | 3 - package/cgic/cgic.mk | 25 --------- 10 files changed, 6 insertions(+), 182 deletions(-) delete mode 100644 package/cgic/0001-prepare_makefile.patch delete mode 100644 package/cgic/0002-file_enhancements.patch delete mode 100644 package/cgic/0003-restore-cgiFormFileGetTempfileName.patch delete mode 100644 package/cgic/Config.in delete mode 100644 package/cgic/cgic.hash delete mode 100644 package/cgic/cgic.mk diff --git a/.checkpackageignore b/.checkpackageignore index ec95652000d..b2964517789 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -455,9 +455,6 @@ package/cdrkit/0001-no-rcmd.patch lib_patch.Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch lib_patch.Upstream package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch lib_patch.Upstream package/cfm/S65cfm lib_sysv.Indent lib_sysv.Variables -package/cgic/0001-prepare_makefile.patch lib_patch.Upstream -package/cgic/0002-file_enhancements.patch lib_patch.Upstream -package/cgic/0003-restore-cgiFormFileGetTempfileName.patch lib_patch.Upstream package/cgroupfs-mount/S30cgroupfs Shellcheck lib_sysv.Indent lib_sysv.Variables package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 29c386bec43..9dd5bdd2ebd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_CGIC + bool "cgic has been removed" + select BR2_LEGACY + help + the cgic upstream no longer exists. + config BR2_PACKAGE_VERSAL_FIRMWARE bool "versal-firmware has been replaced by xilinx-prebuilt" select BR2_TARGET_XILINX_PREBUILT diff --git a/DEVELOPERS b/DEVELOPERS index 8a5cceba78e..6d9fcd97dfe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -788,7 +788,6 @@ F: package/libmnl/ N: David Bender F: package/benejson/ -F: package/cgic/ F: package/freeradius-client/ F: package/openldap/ diff --git a/package/Config.in b/package/Config.in index 550fdc1f411..48ef1a6fdce 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1948,7 +1948,6 @@ menu "Networking" source "package/belle-sip/Config.in" source "package/bluez5_utils-headers/Config.in" source "package/c-ares/Config.in" - source "package/cgic/Config.in" source "package/cni-plugins/Config.in" source "package/cppzmq/Config.in" source "package/curlpp/Config.in" diff --git a/package/cgic/0001-prepare_makefile.patch b/package/cgic/0001-prepare_makefile.patch deleted file mode 100644 index 15adc4cda2d..00000000000 --- a/package/cgic/0001-prepare_makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -Makefile: fix for cross-compilation - -Probably-Signed-off-by: Dave Bender -[yann.morin.1998@free.fr: patch was made by Dave, but he - forgot his SoB line, so I added it] -Signed-off-by: "Yann E. MORIN" -diff -rupN cgic206/Makefile cgic206-br/Makefile ---- cgic206/Makefile 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206-br/Makefile 2015-01-16 11:18:03.714874000 -0500 -@@ -1,15 +1,14 @@ --CFLAGS=-g -Wall --CC=gcc --AR=ar --RANLIB=ranlib - LIBS=-L./ -lcgic - - all: libcgic.a cgictest.cgi capture - - install: libcgic.a -- cp libcgic.a /usr/local/lib -- cp cgic.h /usr/local/include -- @echo libcgic.a is in /usr/local/lib. cgic.h is in /usr/local/include. -+ cp libcgic.a $(PREFIX)/usr/lib -+ cp cgic.h $(PREFIX)/usr/include -+ @echo libcgic.a is in $(PREFIX)/usr/lib. cgic.h is in $(PREFIX)/usr/include. -+ -+cgi.o: cgic.c cgic.h -+ $(CC) $(CFLAGS) cgic.c -o cgic.o - - libcgic.a: cgic.o cgic.h - rm -f libcgic.a -@@ -19,10 +18,10 @@ libcgic.a: cgic.o cgic.h - #mingw32 and cygwin users: replace .cgi with .exe - - cgictest.cgi: cgictest.o libcgic.a -- gcc cgictest.o -o cgictest.cgi ${LIBS} -+ $(CC) cgictest.o -o cgictest.cgi ${LIBS} - - capture: capture.o libcgic.a -- gcc capture.o -o capture ${LIBS} -+ $(CC) capture.o -o capture ${LIBS} - - clean: - rm -f *.o *.a cgictest.cgi capture diff --git a/package/cgic/0002-file_enhancements.patch b/package/cgic/0002-file_enhancements.patch deleted file mode 100644 index a6f82fce33d..00000000000 --- a/package/cgic/0002-file_enhancements.patch +++ /dev/null @@ -1,56 +0,0 @@ -Create better temporary files. - -Probably-Signed-off-by: Dave Bender -[yann.morin.1998@free.fr: patch was made by Dave, but he - forgot his SoB line, so I added it; split the patch in two - independent fixes] -Signed-off-by: "Yann E. MORIN" - -diff -rupN cgic206/cgic.c cgic206_tempfile/cgic.c ---- cgic206/cgic.c 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206_tempfile/cgic.c 2015-01-21 11:58:45.436384908 -0500 -@@ -22,6 +22,8 @@ - #define CGICDEBUGEND - #endif /* CGICDEBUG */ - -+#define _GNU_SOURCE -+ - #include - #include - #include -@@ -34,11 +36,11 @@ - #include - - /* cgic 2.01 */ --#include - - #else - #include - #endif /* WIN32 */ -+#include - #include "cgic.h" - - #define cgiStrEq(a, b) (!strcmp((a), (b))) -@@ -636,16 +638,17 @@ static cgiParseResultType getTempFileNam - window between the file's creation and the - chmod call (glibc 2.0.6 and lower might - otherwise have allowed this). */ -+ mode_t umode; - int outfd; -+ umode = umask(0600); - strcpy(tfileName, cgicTempDir "/cgicXXXXXX"); -- outfd = mkstemp(tfileName); -+ outfd = mkostemp(tfileName, O_CLOEXEC | O_NOATIME); -+ umask(umode); - if (outfd == -1) { - return cgiParseIO; - } -- close(outfd); -- /* Fix the permissions */ -- if (chmod(tfileName, 0600) != 0) { -- unlink(tfileName); -+ -+ if (close(outfd)) { - return cgiParseIO; - } - #else diff --git a/package/cgic/0003-restore-cgiFormFileGetTempfileName.patch b/package/cgic/0003-restore-cgiFormFileGetTempfileName.patch deleted file mode 100644 index f66227b6a6b..00000000000 --- a/package/cgic/0003-restore-cgiFormFileGetTempfileName.patch +++ /dev/null @@ -1,43 +0,0 @@ -Restore lost functionality - -Probably-Signed-off-by: Dave Bender -[yann.morin.1998@free.fr: patch was made by Dave, but he - forgot his SoB line, so I added it] -Signed-off-by: "Yann E. MORIN" - -diff -rupN cgic206/cgic.c cgic206_tempfile/cgic.c ---- cgic206/cgic.c 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206_tempfile/cgic.c 2015-01-21 11:58:45.436384908 -0500 -@@ -1278,6 +1278,20 @@ cgiFormResultType cgiFormFileContentType - } - } - -+const char* cgiFormFileGetTempfileName( -+ char* name) -+{ -+ cgiFormEntry *e; -+ e = cgiFormEntryFindFirst(name); -+ if (!e) { -+ return NULL; -+ } else if (!strlen(e->tfileName)) { -+ return NULL; -+ } else { -+ return e->tfileName; -+ } -+} -+ - cgiFormResultType cgiFormFileSize( - char *name, int *sizeP) - { -diff -rupN cgic206/cgic.h cgic206_tempfile/cgic.h ---- cgic206/cgic.h 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206_tempfile/cgic.h 2015-01-21 11:53:02.915148026 -0500 -@@ -141,6 +141,8 @@ extern cgiFormResultType cgiFormRadio( - char *name, char **valuesText, int valuesTotal, - int *result, int defaultV); - -+extern const char* cgiFormFileGetTempfileName(char* name); -+ - /* The paths returned by this function are the original names of files - as reported by the uploading web browser and shoult NOT be - blindly assumed to be "safe" names for server-side use! */ diff --git a/package/cgic/Config.in b/package/cgic/Config.in deleted file mode 100644 index 402460d0394..00000000000 --- a/package/cgic/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_CGIC - bool "cgic" - help - C CGI library - - http://www.boutell.com/cgic/ diff --git a/package/cgic/cgic.hash b/package/cgic/cgic.hash deleted file mode 100644 index 2c680671286..00000000000 --- a/package/cgic/cgic.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 1e8834642a4b89528bb7bde2f287e133c6b07e210e68681a34137c436d59d320 cgic207.tar.gz -sha256 6a7de92593d64dbf7630d8f66f97e04a899769bef1e055f2434bc06b87b9de62 license.txt diff --git a/package/cgic/cgic.mk b/package/cgic/cgic.mk deleted file mode 100644 index cd0841302db..00000000000 --- a/package/cgic/cgic.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# cgic -# -################################################################################ - -CGIC_VERSION = 2.07 -CGIC_SOURCE = cgic207.tar.gz -CGIC_SITE = http://boutell.com/cgic -CGIC_LICENSE = Custom -CGIC_LICENSE_FILES = license.txt - -# Installs only a static library and a header file -CGIC_INSTALL_STAGING = YES -CGIC_INSTALL_TARGET = NO - -define CGIC_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) libcgic.a -endef - -define CGIC_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) PREFIX=$(STAGING_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) From 53bda6d12f073f6afce35a516b84c1f8d3d272ad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Jun 2024 10:21:52 +0200 Subject: [PATCH 1278/3013] package/libgcrypt: bump version to 1.11.0 Release notes: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS https://dev.gnupg.org/T7166 Rebased patch. Updated license hash due to update of FSF address and whitespace changes in upstream commit: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=2538430a35b02b9ac002a84930650bf4767fc473 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...0001-configure.ac-add-an-option-to-disable-tests.patch | 8 +++++--- package/libgcrypt/libgcrypt.hash | 6 +++--- package/libgcrypt/libgcrypt.mk | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch index 5ddde9df1b4..bc0f9ebe7fb 100644 --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch @@ -15,6 +15,8 @@ Fixes: - http://autobuild.buildroot.org/results/50a8ba572e3fafd3c6a39bd54bcfcaf78b5ad325 Signed-off-by: Fabrice Fontaine +[Bernd: rebased for version 1.11.0] +Signed-off-by: Bernd Kuhls --- Makefile.am | 7 ++++++- configure.ac | 10 ++++++++++ @@ -38,13 +40,13 @@ index 7fa4fa4d..f0bd90e4 100644 -SUBDIRS = compat mpi cipher random src $(doc) tests +SUBDIRS = compat mpi cipher random src $(doc) $(tests) - EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ - ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \ + EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ + ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \ diff --git a/configure.ac b/configure.ac index e8c8cd39..1a6b61e5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3231,6 +3231,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], +@@ -3777,6 +3777,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index ffe30e1455d..ced8087ca98 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 359e1d01ad2eb9cd2db964ea96ef3712d0c2c649 libgcrypt-1.10.3.tar.bz2 -sha256 8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa libgcrypt-1.10.3.tar.bz2 +sha1 dd2c68e0685bb99249efeeb06046fae15b5214ba libgcrypt-1.11.0.tar.bz2 +sha256 09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c libgcrypt-1.11.0.tar.bz2 # Locally calculated -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 2e4bf7448e9..7a68a95c98f 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.10.3 +LIBGCRYPT_VERSION = 1.11.0 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From b4d69001b25124e2fe8262f6088ae32d542245e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Jun 2024 11:57:18 +0200 Subject: [PATCH 1279/3013] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 972db9300ec..225123a5f00 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e3f05da73596097757fb4c0f9306e415b1772f26a52b5b86c50d63811e7e65af tvheadend-c63115464d8f6556fb4cac93ce8740afea1b00d5.tar.gz +sha256 8454c696e9987ae77d1bc6e1fe45536bd9ef69192b6e568840fe8994ca2a5c2b tvheadend-d2e41b553e7cc6eb06fd21b42bbed4b3a1f28bc0.tar.gz sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 8f2e37b1220..0453e08f4b4 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = c63115464d8f6556fb4cac93ce8740afea1b00d5 +TVHEADEND_VERSION = d2e41b553e7cc6eb06fd21b42bbed4b3a1f28bc0 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From 7630cc8759a926e3ce098bd9a76e4ef8004cfb38 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Sat, 29 Jun 2024 14:55:21 +0200 Subject: [PATCH 1280/3013] package/python-docker: bump version to 7.1.0 Important upstream changes: * Support for Python 3.12 has been added (in 7.0.0). * Websocket support is no longer included by default, and thus the dependency on "websocket-client" (since 7.0.0). * Build has been switched to hatchling and hatch-vcs (in 7.1.0), so Buildroot needs to use pep517 build. * Dependency on "packaging" has been removed (in 7.1.0). Upstream changelogs: https://github.com/docker/docker-py/releases/tag/7.0.0 https://github.com/docker/docker-py/releases/tag/7.1.0 Signed-off-by: Fiona Klute Signed-off-by: Arnout Vandecappelle --- package/python-docker/Config.in | 2 -- package/python-docker/python-docker.hash | 4 ++-- package/python-docker/python-docker.mk | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index 944992f2519..669b9e34330 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -2,10 +2,8 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" # docker-engine may be running on another host, so no other dependency select BR2_PACKAGE_PYTHON3_SSL # runtime - select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_URLLIB3 # runtime - select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime help A Python library for the Docker Engine API. diff --git a/package/python-docker/python-docker.hash b/package/python-docker/python-docker.hash index 8e561e93a78..c8f8e7501aa 100644 --- a/package/python-docker/python-docker.hash +++ b/package/python-docker/python-docker.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/docker/json -md5 c319e75054a226776f32797e56ec82da docker-6.1.3.tar.gz -sha256 aa6d17830045ba5ef0168d5eaa34d37beeb113948c413affe1d5991fc11f9a20 docker-6.1.3.tar.gz +md5 04e92a7b6dc8b88dde3c7cca6850b277 docker-7.1.0.tar.gz +sha256 ad8c70e6e3f8926cb8a92619b832b4ea5299e2831c14284663184e200546fa6c docker-7.1.0.tar.gz # Locally computed sha256 checksums sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE diff --git a/package/python-docker/python-docker.mk b/package/python-docker/python-docker.mk index ab03ac6af0b..55ba405f7c4 100644 --- a/package/python-docker/python-docker.mk +++ b/package/python-docker/python-docker.mk @@ -4,14 +4,14 @@ # ################################################################################ -PYTHON_DOCKER_VERSION = 6.1.3 +PYTHON_DOCKER_VERSION = 7.1.0 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz -PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/f0/73/f7c9a14e88e769f38cb7fb45aa88dfd795faa8e18aea11bababf6e068d5e -PYTHON_DOCKER_SETUP_TYPE = setuptools +PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/91/9b/4a2ea29aeba62471211598dac5d96825bb49348fa07e906ea930394a83ce +PYTHON_DOCKER_SETUP_TYPE = pep517 PYTHON_DOCKER_LICENSE = Apache-2.0 PYTHON_DOCKER_LICENSE_FILES = LICENSE PYTHON_DOCKER_CPE_ID_VENDOR = docker PYTHON_DOCKER_CPE_ID_PRODUCT = docker-py -PYTHON_DOCKER_DEPENDENCIES = host-python-setuptools-scm +PYTHON_DOCKER_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) From 51cbdb03194d2226988d3f3bce5559ba1b271ac7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 29 Jun 2024 23:13:28 +0200 Subject: [PATCH 1281/3013] package/nmap: bump to version 7.95 For change log, see: https://nmap.org/changelog.html#7.95 A notable change is the switch from pcre to pcre2. This change is reflected in Config.in and nmap.mk. This commit also adds the sha256 hash, published at: https://nmap.org/dist/sigs/nmap-7.95.tar.bz2.digest.txt The package patches are also rebased on this new version. The nmap package was failing to build since commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0". The patch 0001 was regenerated with "git format-patch". This operation renamed the patch file. This change is reflected in the ".checkpackageignore" entry. Fixes: http://autobuild.buildroot.org/results/417ef0b2a80e8ec5859813a9f16f773881899025 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 +- ...ibdnet-always-build-a-static-library.patch | 25 +++++++++++++++++++ .../nmap/0001-libdnet-wrapper-configure.patch | 11 -------- ...pto.cc-fix-build-with-libressl-3.5.0.patch | 14 ++++++----- package/nmap/Config.in | 2 +- package/nmap/nmap.hash | 5 ++-- package/nmap/nmap.mk | 4 +-- 7 files changed, 40 insertions(+), 23 deletions(-) create mode 100644 package/nmap/0001-libdnet-always-build-a-static-library.patch delete mode 100644 package/nmap/0001-libdnet-wrapper-configure.patch diff --git a/.checkpackageignore b/.checkpackageignore index b2964517789..c73e0433b12 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1094,7 +1094,7 @@ package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch lib_patch.Upstre package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream package/nginx/S50nginx lib_sysv.Indent lib_sysv.Variables package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch lib_patch.Upstream -package/nmap/0001-libdnet-wrapper-configure.patch lib_patch.Upstream +package/nmap/0001-libdnet-always-build-a-static-library.patch lib_patch.Upstream package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch lib_patch.Upstream package/nodejs/nodejs-src/0002-check-if-uclibc-has-backtrace-support.patch lib_patch.Upstream package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch lib_patch.Upstream diff --git a/package/nmap/0001-libdnet-always-build-a-static-library.patch b/package/nmap/0001-libdnet-always-build-a-static-library.patch new file mode 100644 index 00000000000..b34e44e389d --- /dev/null +++ b/package/nmap/0001-libdnet-always-build-a-static-library.patch @@ -0,0 +1,25 @@ +From aeadf40bc0ebbb9fea8de8bc6786a2eccf02fa34 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 29 Jun 2024 16:50:36 +0200 +Subject: [PATCH] libdnet: always build a static library + +Signed-off-by: Yann E. MORIN +[Julien: rebased patch on version 7.95] +Signed-off-by: Julien Olivain +--- + libdnet-stripped/configure.gnu | 3 +++ + 1 file changed, 3 insertions(+) + create mode 100644 libdnet-stripped/configure.gnu + +diff --git a/libdnet-stripped/configure.gnu b/libdnet-stripped/configure.gnu +new file mode 100644 +index 0000000..989fee4 +--- /dev/null ++++ b/libdnet-stripped/configure.gnu +@@ -0,0 +1,3 @@ ++#!/bin/sh ++ ++exec "${0%.gnu}" "${@}" --enable-static --disable-shared +-- +2.45.2 + diff --git a/package/nmap/0001-libdnet-wrapper-configure.patch b/package/nmap/0001-libdnet-wrapper-configure.patch deleted file mode 100644 index a85242ad941..00000000000 --- a/package/nmap/0001-libdnet-wrapper-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -libdnet: always build a static library - -Signed-off-by: "Yann E. MORIN" - -diff --git a/libdnet-stripped/configure.gnu b/libdnet-stripped/configure.gnu ---- /dev/null -+++ b/libdnet-stripped/configure.gnu -@@ -0,0 +1,3 @@ -+#!/bin/sh -+ -+exec "${0%.gnu}" "${@}" --enable-static --disable-shared diff --git a/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch b/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch index f2bdf5904dd..700b8585f13 100644 --- a/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch +++ b/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch @@ -1,4 +1,4 @@ -From 4ebea5c1d1a10be0d0165da3b9c0e1fa82c3db3c Mon Sep 17 00:00:00 2001 +From 0a79771c302bf398150da78cd18b67cb9b67f47a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 21 May 2022 17:51:37 +0200 Subject: [PATCH] nping/Crypto.cc: fix build with libressl >= 3.5.0 @@ -15,15 +15,17 @@ Fixes: Signed-off-by: Fabrice Fontaine Upstream: https://github.com/nmap/nmap/pull/2480 +[Julien: rebased patch on version 7.95] +Signed-off-by: Julien Olivain --- nping/Crypto.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nping/Crypto.cc b/nping/Crypto.cc -index 850438352..9f7c88686 100644 +index 6f05db6..1d11d55 100755 --- a/nping/Crypto.cc +++ b/nping/Crypto.cc -@@ -70,7 +70,9 @@ +@@ -69,7 +69,9 @@ #include #include @@ -32,8 +34,8 @@ index 850438352..9f7c88686 100644 + ((!defined LIBRESSL_VERSION_NUMBER) || \ + (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) #define HAVE_OPAQUE_EVP_PKEY 1 - #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_reset - #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_reset + #else + #define EVP_MD_CTX_new EVP_MD_CTX_create -- -2.35.1 +2.45.2 diff --git a/package/nmap/Config.in b/package/nmap/Config.in index 6e097a9884c..c9fcf9771df 100644 --- a/package/nmap/Config.in +++ b/package/nmap/Config.in @@ -34,7 +34,7 @@ comment "a symlink from ncat to 'nc' will be installed" config BR2_PACKAGE_NMAP_NMAP bool "install nmap" - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help This option installs 'nmap' itself. diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 99c5d5fb07d..4f6ea20731a 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,5 +1,6 @@ -# From https://nmap.org/dist/sigs/nmap-7.94.tar.bz2.digest.txt (lowercase) -sha512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c nmap-7.94.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.95.tar.bz2.digest.txt (lowercase) +sha256 e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778 nmap-7.95.tar.bz2 +sha512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e nmap-7.95.tar.bz2 # Locally calculated sha256 9d9a9a763c0e6145172cfe7d8483e23b38ce60b6c79a82e4894242917bdae6d3 LICENSE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 6cd9d961198..077840b1923 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.94 +NMAP_VERSION = 7.95 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap @@ -62,7 +62,7 @@ NMAP_CONF_OPTS += --without-ncat endif ifeq ($(BR2_PACKAGE_NMAP_NMAP),y) -NMAP_DEPENDENCIES += pcre +NMAP_DEPENDENCIES += pcre2 NMAP_CONF_OPTS += --with-libpcre="$(STAGING_DIR)/usr" NMAP_MAKE_OPTS += nmap NMAP_INSTALL_TARGET_OPTS += install-nmap From 29102f524dd76cc3de363f58c8ee7a2c97726178 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 29 Jun 2024 23:47:31 +0200 Subject: [PATCH 1282/3013] package/libnss: bump version to 3.101.1 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 1a69398f0d3..ccc59519293 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_100_RTM/src/SHA256SUMS -sha256 1e35373ce9cb5b776f678bb341b0625c437520d09ebd91d1abd622e072e38d88 nss-3.100.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_101_1_RTM/src/SHA256SUMS +sha256 f20e8c5daafd89419d229ec8c54100a5c320dce1467377c9dfcd5e4d8446b468 nss-3.101.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 944089ae092..a7d8db01111 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.100 +LIBNSS_VERSION = 3.101.1 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From cef0948f8245904fbca25a9194d77f3105c1c861 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Sun, 30 Jun 2024 13:36:22 +0100 Subject: [PATCH 1283/3013] boot/xilinx-prebuilt: fix comment typo Correct the spelling of the word 'there' in the comment. Signed-off-by: Neal Frager Signed-off-by: Arnout Vandecappelle --- boot/xilinx-prebuilt/xilinx-prebuilt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk index 0c5456f5779..d09f4b13e20 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -18,7 +18,7 @@ XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAM ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) # We need the *.pdi glob, because the file has different names for the -# different boards, but htere is only one, and it has to be named +# different boards, but there is only one, and it has to be named # vpl_gen_fixed.pdi when installed. define XILINX_PREBUILT_INSTALL $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/plm.elf \ From 4253979a35c1ebccce3f1d0b2bc7c30fc12156e1 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Sat, 8 Jun 2024 11:42:44 +0200 Subject: [PATCH 1284/3013] package/eza: bump to version 0.18.17 Release notes: https://github.com/eza-community/eza/releases/tag/v0.18.17 Signed-off-by: Saeed Kazemi Signed-off-by: Arnout Vandecappelle --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 8765261e7ed..3bc55b26ef2 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 709507bd46c1e1c4c14d6e34266355d78ae21fe2525f8bf42089cab36ebf0134 eza-0.18.8-cargo2.tar.gz +sha256 c01f11ba19956108e42244f0b094bbb6bc74c13ea2c68feecf6f0ff2f127df97 eza-0.18.17-cargo2.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index 506e515566c..5a44fd78264 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.18.8 +EZA_VERSION = 0.18.17 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE From 7794356576d49a614a0de789f3d7413696409c4b Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 8 Jun 2024 12:25:25 +0200 Subject: [PATCH 1285/3013] package/libinput: bump to 1.26.0 Announce: https://lists.freedesktop.org/archives/wayland-devel/2024-June/043657.html Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- package/libinput/libinput.hash | 2 +- package/libinput/libinput.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 643cb162132..2ab56e48272 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 193bd592298bd9e369c0ef3e5d83a6a9d68ddc4cd3dfc84bbe77920a8d0d57df libinput-1.25.0.tar.bz2 +sha256 8c582b86c6865aaee2516ee96b299cef60c98e113d1391bbd2683eac08221a07 libinput-1.26.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 499ed5ff4b2..3b5070c85ed 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.25.0 +LIBINPUT_VERSION = 1.26.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 224067105db10ad00ad1e7b2eb6444732323eb65 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 8 Jun 2024 12:25:26 +0200 Subject: [PATCH 1286/3013] package/weston: bump to 13.0.3 Announce: https://lists.freedesktop.org/archives/wayland-devel/2024-June/043655.html Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- package/weston/weston.hash | 6 +++--- package/weston/weston.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 5fa0c9d2bef..62322ac639e 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html -sha256 ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a weston-13.0.1.tar.xz -sha512 4a0fd0b1aec823219421d701030bc534576be64b71ede70c7d33f131e9e64c0e0dc209e62f75cecb9368df7604c1d5b2321932eccc818b529d246ec2e3114122 weston-13.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-June/043655.html +sha256 27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093 weston-13.0.3.tar.xz +sha512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb weston-13.0.3.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b708d037431..bd5a0550b12 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 13.0.1 +WESTON_VERSION = 13.0.3 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT From 020c7bd205fcbb4a8eb27b52f24c0c9f030fe6de Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 8 Jun 2024 12:25:27 +0200 Subject: [PATCH 1287/3013] package/wayland: bump to 1.23.0 Announce: https://lists.freedesktop.org/archives/wayland-devel/2024-May/043636.html https://lists.freedesktop.org/archives/wayland-devel/2024-May/043625.html https://lists.freedesktop.org/archives/wayland-devel/2024-May/043614.html https://lists.freedesktop.org/archives/wayland-devel/2024-April/043580.html Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- package/wayland/wayland.hash | 6 +++--- package/wayland/wayland.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index 5da527e3188..627cb5a1b08 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-April/042647.html -sha256 1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842 wayland-1.22.0.tar.xz -sha512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12 wayland-1.22.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-May/043636.html +sha256 05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2 wayland-1.23.0.tar.xz +sha512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81 wayland-1.23.0.tar.xz # Locally calculated sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index 1a764d55802..06adafc3e10 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.22.0 +WAYLAND_VERSION = 1.23.0 WAYLAND_SITE = https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(WAYLAND_VERSION)/downloads WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT From 80f38918b1b01da6ae3be9c58824915027a6457c Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 8 Jun 2024 15:02:58 +0200 Subject: [PATCH 1288/3013] package/erlang-jiffy: bump version to 1.1.2 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/erlang-jiffy/erlang-jiffy.hash | 2 +- package/erlang-jiffy/erlang-jiffy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index f172d1476ef..7c314694e76 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz +sha256 f43bafc1ae5c9c1a7843a4c6b2d0b7ef57188e567381bf734035ef9701a7458f erlang-jiffy-1.1.2.tar.gz sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index de2e4749fb4..b3f7cf82c75 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 1.1.1 +ERLANG_JIFFY_VERSION = 1.1.2 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ From 55c8c2328e73725e9ab41c8dc566b09f49f2aad5 Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Sun, 9 Jun 2024 10:04:25 +0000 Subject: [PATCH 1289/3013] package/shadow: bump to version 4.15.1 Signed-off-by: Raphael Pavlidis Signed-off-by: Arnout Vandecappelle --- package/shadow/shadow.hash | 4 ++-- package/shadow/shadow.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 23c292d6594..1d83272cecb 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,4 +1,4 @@ # Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc -# with key A9348594CE31283A826FBDD8D57633D441E25BB5 -sha256 cba74bc7b05d89c015afe23131f9159ece38779d40a8af4cf162852e6e85ca23 shadow-4.14.5.tar.xz +# with key 66D0387DB85D320F8408166DB175CFA98F192AF2 +sha256 bb5f70639a0581f9d626f227ce45b31ac137daa7c451c0f672ce14f2731a96ee shadow-4.15.1.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index e4d8b67b8a7..59771b91821 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.14.5 +SHADOW_VERSION = 4.15.1 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause From 8e58b22a5e323341bd74ade39fdd6642fa497f67 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Jun 2024 17:31:26 +0200 Subject: [PATCH 1290/3013] package/llvm-project/clang: update patch to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, host-clang fails to build with output: Applying 0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch using patch: patching file lib/Driver/ToolChains/Gnu.cpp Hunk #1 FAILED at 1725. Hunk #2 succeeded at 2011 (offset 277 lines). 1 out of 2 hunks FAILED -- saving rejects to file lib/Driver/ToolChains/Gnu.cpp.rej Rebase the patch to fix the problem. Fixes: http://autobuild.buildroot.net/results/75b/75baa62275d64c699d9757f7c756fc03ea717877/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...1-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch index 08371154d5c..ffdd5d187f9 100644 --- a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch +++ b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch @@ -44,7 +44,7 @@ index 2ad45097dc..90d6b5b748 100644 +++ b/lib/Driver/ToolChains/Gnu.cpp @@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( - Prefixes.push_back(GCCToolchainDir); + Prefixes.push_back(std::string(GCCToolchainDir)); } else { + StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; + From 720177da9cd7532f2e5e8484ff7f2cfe2a324242 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Jul 2024 19:03:30 +0200 Subject: [PATCH 1291/3013] package/rt-tests: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, rt-tests fails to build with output: Applying 0001-Fix-a-build-issue-with-uClibc-ng.patch using patch: patching file src/cyclictest/cyclictest.c Hunk #1 FAILED at 58. 1 out of 1 hunk FAILED -- saving rejects to file src/cyclictest/cyclictest.c.rej This commit refreshes the package patches on the current package version. The patch 0002 had an "Upstream:" tag in brackets. The tag was not detected as such by check-package. This commit removes those brackets and also removes the ".checkpackageignore" entry. Fixes: http://autobuild.buildroot.org/results/3e0a3b8d8c42d8e82ecf47b80bca875de739af5b Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../0001-Fix-a-build-issue-with-uClibc-ng.patch | 12 +++++++----- ...op-explicit-undefine-PYLIB-for-compatibil.patch | 14 ++++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index c73e0433b12..a122f74bb8c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1325,7 +1325,6 @@ package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch lib_patc package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch lib_patch.Upstream package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch lib_patch.Upstream package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch lib_patch.Upstream -package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch lib_patch.Upstream package/rtmpdump/0001-include-limits.h.patch lib_patch.Upstream package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patch.Upstream package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream diff --git a/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch b/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch index 785d93c9be0..ae89761ecde 100644 --- a/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch +++ b/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch @@ -1,4 +1,4 @@ -From 21e0c16a85c2e028a963703511d750d1751bc254 Mon Sep 17 00:00:00 2001 +From a621d8ee2a27ba44845f5232a3b2bf9b581623b1 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Wed, 13 Jul 2016 23:46:38 +0200 Subject: [PATCH] Fix a build issue with uClibc-ng @@ -11,16 +11,18 @@ Signed-off-by: Peter Korsgaard rebase on v1.0 remove uClibc legacy support, uClibc-ng provide utmpx.h] Signed-off-by: Romain Naour +[Julien: rebased patch on version 2.7] +Signed-off-by: Julien Olivain --- src/cyclictest/cyclictest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c -index 00e5f3d..92fa3dd 100644 +index c5c3389..5ae1dd9 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c -@@ -58,7 +58,7 @@ - #define gettid() syscall(__NR_gettid) +@@ -51,7 +51,7 @@ + #define sigev_notify_thread_id _sigev_un._tid -#ifdef __UCLIBC__ @@ -29,5 +31,5 @@ index 00e5f3d..92fa3dd 100644 ((~(clockid_t) (pid) << 3) | (clockid_t) (clock)) #define CPUCLOCK_SCHED 2 -- -2.5.5 +2.45.2 diff --git a/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch b/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch index f71ba09a791..9212b8eee07 100644 --- a/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch +++ b/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch @@ -1,4 +1,4 @@ -From 84fea5d784e010f84c860b34e55ea2c855c17b3b Mon Sep 17 00:00:00 2001 +From 063972eece2fb8157f0feb98a4608c2984c7c5ff Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 12 May 2021 09:18:33 +0200 Subject: [PATCH] Makefile: drop explicit undefine PYLIB for compatibility with @@ -22,18 +22,20 @@ Fixes: http://autobuild.buildroot.net/results/cf7c4f360f5464c700788cc8299fd086544c80e8/build-end.log Signed-off-by: Peter Korsgaard -[Upstream: https://marc.info/?l=linux-rt-users&m=162080462211139&w=2] +Upstream: https://marc.info/?l=linux-rt-users&m=162080462211139&w=2 +[Julien: rebased patch on version 2.7] +Signed-off-by: Julien Olivain --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile -index b17ac09..ec85ac8 100644 +index e2f8579..62c906f 100644 --- a/Makefile +++ b/Makefile -@@ -36,11 +36,6 @@ LDFLAGS ?= +@@ -37,11 +37,6 @@ LDFLAGS ?= - PYLIB ?= $(shell python3 -c 'import distutils.sysconfig; print (distutils.sysconfig.get_python_lib())') + PYLIB ?= $(shell python3 -m get_pylib) -# Check for errors, such as python3 not available -ifeq (${PYLIB},) @@ -44,5 +46,5 @@ index b17ac09..ec85ac8 100644 src/pi_tests/pi_stress.8 \ src/ptsematest/ptsematest.8 \ -- -2.20.1 +2.45.2 From bf24725ee3fad62c389eb3219b19cddb74044c0c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Jul 2024 20:09:30 +0200 Subject: [PATCH 1292/3013] package/sylpheed: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, sylpheed fails to build with output: Applying 0001-harden-link-checker-before-accepting-click.patch using patch: patching file src/textview.c Hunk #1 FAILED at 2885. Hunk #2 FAILED at 2922. 2 out of 2 hunks FAILED -- saving rejects to file src/textview.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- ...n-link-checker-before-accepting-click.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch index fe3375bc91b..46b45058372 100644 --- a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch +++ b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch @@ -1,4 +1,4 @@ -From ac286a71ed78429e16c612161251b9ea90ccd431 Mon Sep 17 00:00:00 2001 +From 876c54b2927e48ab6900e5e6b9395742f75e840e Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 23 May 2021 12:16:40 +0100 Subject: [PATCH] harden link checker before accepting click @@ -6,25 +6,27 @@ Subject: [PATCH] harden link checker before accepting click [Retrieved from: https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431] Signed-off-by: Fabrice Fontaine +[Julien: rebased patch on version 3.7.0] +Signed-off-by: Julien Olivain --- src/textview.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/textview.c b/src/textview.c -index 62ad46eaf..3cdf5d911 100644 +index e55eea9..6fbb8a1 100644 --- a/src/textview.c +++ b/src/textview.c -@@ -2885,7 +2885,7 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri) +@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri) gboolean retval = TRUE; if (is_uri_string(uri->uri) == FALSE) - return TRUE; + return FALSE; - visible_str = textview_get_visible_uri(textview, uri); - if (visible_str == NULL) -@@ -2922,6 +2922,8 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri) - if (aval == G_ALERTALTERNATE) + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text)); + gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start); +@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri) + if (aval == G_ALERTDEFAULT) retval = TRUE; } + if (strlen(uri->uri) > get_uri_len(uri->uri)) @@ -33,5 +35,5 @@ index 62ad46eaf..3cdf5d911 100644 g_free(visible_str); -- -2.25.1 +2.45.2 From cea0cf39d4e477e97f7ae21eeca9853d04fd3e6b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 2 Jul 2024 09:09:16 +0300 Subject: [PATCH 1293/3013] package/empty: fix patch fuzz Update patch to apply with fuzz 0. Modify upstream status information to match current practice. Fixes: http://autobuild.buildroot.net/results/dc119fed6ae341bc4b581e64148be414eedf4ef4/ http://autobuild.buildroot.net/results/3daba0971f422f2085bb152c0e97859ab980a9e3/ http://autobuild.buildroot.net/results/8353079e7b8ee8e2d431f99026c93ec3b0bcc239/ Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - package/empty/0001-respect-LDFLAGS.patch | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index a122f74bb8c..949b7467cfe 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -571,7 +571,6 @@ package/elftosb/0001-fixes-includes.patch lib_patch.Upstream package/elftosb/0002-force-cxx-compiler.patch lib_patch.Upstream package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch lib_patch.Upstream package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch lib_patch.Upstream -package/empty/0001-respect-LDFLAGS.patch lib_patch.Upstream package/erlang-p1-sip/0001-correct-include.patch lib_patch.Upstream package/erlang-p1-xmpp/0001-fix-includes.patch lib_patch.Upstream package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch lib_patch.Upstream diff --git a/package/empty/0001-respect-LDFLAGS.patch b/package/empty/0001-respect-LDFLAGS.patch index b98af07eac8..64e8b5ca30a 100644 --- a/package/empty/0001-respect-LDFLAGS.patch +++ b/package/empty/0001-respect-LDFLAGS.patch @@ -4,15 +4,14 @@ http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-misc/empty/files/emp Reported on the Gentoo bug tracker https://bugs.gentoo.org/show_bug.cgi?id=429664 -and reported upstream -https://sourceforge.net/tracker/?func=detail&aid=3554236&group_id=136798&atid=736886 +Upstream: https://sourceforge.net/tracker/?func=detail&aid=3554236&group_id=136798&atid=736886 Signed-off-by: Bernd Kuhls --- empty-0.6.18b/Makefile +++ empty-0.6.18b/Makefile -@@ -16,7 +16,7 @@ - PREFIX = /usr/local +@@ -22,7 +22,7 @@ + UnixWare-gcc OpenUNIX-gcc HP-UX-gcc SunOS-gcc all: - ${CC} ${CFLAGS} -Wall ${LIBS} -o empty empty.c From 8fae1e7f5f513e360a57c777e341a270fd353c88 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 23:55:54 -0600 Subject: [PATCH 1294/3013] package/libblockdev: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, libblockdev fails to build with output: Applying 0001-Provide-replacement-function-for-strerror_l.patch using patch: patching file configure.ac patching file src/utils/module.c Hunk #1 FAILED at 28. This commit fixes the Provide replacement function for strerror_l() patch so that it applies. Fixes: http://autobuild.buildroot.net/results/df5/df54118cc7057ba8dd566515281b77c49a596a04 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../0001-Provide-replacement-function-for-strerror_l.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index f7f75c9c14d..d073e16ac52 100644 --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -41,8 +41,8 @@ index 6557c3ab..5893f0ac 100644 #include "logging.h" +#include "utils.h" - #define UNUSED __attribute__((unused)) + /** diff --git a/src/utils/utils.h b/src/utils/utils.h index 801a8b6e..b2bdf0d0 100644 --- a/src/utils/utils.h From 7d64864ab209bc996470eb0f8f538b404ca946d8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 23:18:05 -0600 Subject: [PATCH 1295/3013] package/libsoup: fix set c_std to gnu99 patch Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, libsoup fails to build with output: Applying 0001-meson.build-set-c_std-to-gnu99.patch using patch: patching file meson.build Hunk #1 FAILED at 2. This commit fixes the set c_std to gnu99 patch so that it applies. Fixes: http://autobuild.buildroot.net/results/4ee/4ee68145143df02c46034b4ca291fea469a6f58a Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch b/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch index f2e8f7701d8..a999f5964ef 100644 --- a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch +++ b/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch @@ -26,9 +26,9 @@ diff --git a/meson.build b/meson.build index 4dfd8c15..a5ebc63a 100644 --- a/meson.build +++ b/meson.build -@@ -2,6 +2,6 @@ project('libsoup', 'c', - version: '2.74.0', - meson_version : '>= 0.50', +@@ -2,7 +2,7 @@ project('libsoup', 'c', + version: '2.74.3', + meson_version : '>=0.50', license : 'LGPL2', - default_options : 'c_std=c99') + default_options : 'c_std=gnu99') From 4ac2cc5beec0eac4991fb28f286707a5659fa67e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 2 Jul 2024 06:44:01 +0300 Subject: [PATCH 1296/3013] package/openssh: security bump to version 9.8p1 Fixes CVE-2024-6387: Unauthenticated root login because of signal handler race condition. Drop upstream patch and autoreconf. Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle --- ...tection-of-fzero-call-used-regs-used.patch | 32 ------------------- package/openssh/openssh.hash | 4 +-- package/openssh/openssh.mk | 5 +-- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch diff --git a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch deleted file mode 100644 index 1b91b15a798..00000000000 --- a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f9193f03db0029fc9c31fbdb5c66a2737446bd8f Mon Sep 17 00:00:00 2001 -From: Darren Tucker -Date: Mon, 25 Mar 2024 09:28:02 +1100 -Subject: [PATCH] Improve detection of -fzero-call-used-regs=used. - -Should better detect problems with gcc 13 on m68k. bz#3673 from Colin -Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 - -Signed-off-by: Darren Tucker -Upstream: https://github.com/openssh/openssh-portable/commit/f9193f03db0029fc9c31fbdb5c66a2737446bd8f ---- - m4/openssh.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/m4/openssh.m4 b/m4/openssh.m4 -index 033df501c3d8..176a8d1c9282 100644 ---- a/m4/openssh.m4 -+++ b/m4/openssh.m4 -@@ -20,7 +20,10 @@ char *f2(char *s, ...) { - va_end(args); - return strdup(ret); - } -+int i; -+double d; - const char *f3(int s) { -+ i = (int)d; - return s ? "good" : "gooder"; - } - int main(int argc, char **argv) { --- -2.43.0 - diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 58297aa6949..44f9645035c 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.7 -sha256 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd openssh-9.7p1.tar.gz +# From https://www.openssh.com/txt/release-9.8 +sha256 dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3 openssh-9.8p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 5a568d5fd17..6d846f64df5 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.7 +OPENSSH_VERSION_MAJOR = 9.8 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) @@ -13,9 +13,6 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE -# 0001-Improve-detection-of-fzero-call-used-regs-used.patch -OPENSSH_AUTORECONF = YES - OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From f0558268671bc6533d076381dfd3652c8b23536f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 14:07:05 -0600 Subject: [PATCH 1297/3013] package/python-websockets: bump to version 12.0 License hash changed due to formatting changes: https://github.com/python-websockets/websockets/commit/9c1430379bcb42120e45ee0e9f9dca142b1d7560 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-websockets/python-websockets.hash | 6 +++--- package/python-websockets/python-websockets.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index 62c7cb8467e..8d0bda501cb 100644 --- a/package/python-websockets/python-websockets.hash +++ b/package/python-websockets/python-websockets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websockets/json -md5 d6b1a2cb5e194ae43f849c125b71c8db websockets-10.4.tar.gz -sha256 eef610b23933c54d5d921c92578ae5f89813438fded840c2e9809d378dc765d3 websockets-10.4.tar.gz +md5 49d033c8236aa56ba2524f65570a27c5 websockets-12.0.tar.gz +sha256 81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b websockets-12.0.tar.gz # Locally computed sha256 checksums -sha256 daeca11bf3608da35e546ea0c32be18958a8be1441fa3de9cbd20e4c8bc718e6 LICENSE +sha256 3d6a0c050d8bec52fabad502e45fb25bd02bcadbd70dea34d447b6a0ff4e6da8 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 7f721220a5a..2b8761c0290 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 10.4 +PYTHON_WEBSOCKETS_VERSION = 12.0 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/85/dc/549a807a53c13fd4a8dac286f117a7a71260defea9ec0c05d6027f2ae273 +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/2e/62/7a7874b7285413c954a4cca3c11fd851f11b2fe5b4ae2d9bee4f6d9bdb10 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE From 69e302892c71c1e48480be228d291d7c942c7b49 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 10:46:20 -0600 Subject: [PATCH 1298/3013] package/python-poetry-core: bump to version 1.9.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-poetry-core/python-poetry-core.hash | 4 ++-- package/python-poetry-core/python-poetry-core.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash index c6b180c852e..2dc1198a76e 100644 --- a/package/python-poetry-core/python-poetry-core.hash +++ b/package/python-poetry-core/python-poetry-core.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/poetry-core/json -md5 7461547cac0e0e9c8cd7463aa87e7470 poetry_core-1.7.0.tar.gz -sha256 8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 poetry_core-1.7.0.tar.gz +md5 eb8730e30aec5f644754b29587b47122 poetry_core-1.9.0.tar.gz +sha256 fa7a4001eae8aa572ee84f35feb510b321bd652e5cf9293249d62853e1f935a2 poetry_core-1.9.0.tar.gz # Locally computed sha256 checksums sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk index 4ca587b11d2..5b9b8a15d5b 100644 --- a/package/python-poetry-core/python-poetry-core.mk +++ b/package/python-poetry-core/python-poetry-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POETRY_CORE_VERSION = 1.7.0 +PYTHON_POETRY_CORE_VERSION = 1.9.0 PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz -PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/cb/1c/af7f886e723b2dfbaea9b8a739153f227b386dd856cf956f9fd0ed0a502b +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/f2/db/20a9f9cae3f3c213a8c406deb4395698459fd96962cea8f2ccb230b1943c PYTHON_POETRY_CORE_SETUP_TYPE = pep517 PYTHON_POETRY_CORE_LICENSE = MIT PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE From 478a329c3b34027fcb58faba42779abc03e04927 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 11:00:30 -0600 Subject: [PATCH 1299/3013] package/python-certifi: bump to version 2024.6.2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-certifi/python-certifi.hash | 4 ++-- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index 48e25119e5e..0bb4a4fbc4c 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 5a41f94d681748e76675f3cb4a7d517e certifi-2023.11.17.tar.gz -sha256 9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1 certifi-2023.11.17.tar.gz +md5 d138c6217784e19cda28770b003ab23b certifi-2024.6.2.tar.gz +sha256 3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516 certifi-2024.6.2.tar.gz # Locally computed sha256 checksums sha256 e93716da6b9c0d5a4a1df60fe695b370f0695603d21f6f83f053e42cfc10caf7 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 90aabaa1ace..1c5d4d262d6 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2023.11.17 +PYTHON_CERTIFI_VERSION = 2024.6.2 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/d4/91/c89518dd4fe1f3a4e3f6ab7ff23cb00ef2e8c9adf99dacc618ad5e068e28 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/07/b3/e02f4f397c81077ffc52a538e0aec464016f1860c472ed33bd2a1d220cc5 PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE From e8a4b2e638f0e27248eb63093a4b2b97cc973c09 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 11:53:19 -0600 Subject: [PATCH 1300/3013] package/python-hatchling: bump to version 1.25.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index d49bee8bfcf..b01d3df254c 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 63a3c6480c0805c55ce396e1ad246e78 hatchling-1.22.4.tar.gz -sha256 8a2dcec96d7fb848382ef5848e5ac43fdae641f35a08a3fab5116bd495f3416e hatchling-1.22.4.tar.gz +md5 ac265366ccd17365db319dc95a9e5bc5 hatchling-1.25.0.tar.gz +sha256 7064631a512610b52250a4d3ff1bd81551d6d1431c4eb7b72e734df6c74f4262 hatchling-1.25.0.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index 91f6597dfca..2ca2caf67c8 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.22.4 +PYTHON_HATCHLING_VERSION = 1.25.0 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/4f/2a/c34d71531d1e1c9a5029bb73eb3816285befd0fffd7c63ffa0544253dca8 +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/a3/51/8a4a67a8174ce59cf49e816e38e9502900aea9b4af672d0127df8e10d3b0 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From a397edda4222e382c4899c09cb4945c17dcd1c72 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:01:46 -0600 Subject: [PATCH 1301/3013] package/python-httpx: bump to version 0.27.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-httpx/python-httpx.hash | 4 ++-- package/python-httpx/python-httpx.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httpx/python-httpx.hash b/package/python-httpx/python-httpx.hash index 26e39fcc6db..381439f464e 100644 --- a/package/python-httpx/python-httpx.hash +++ b/package/python-httpx/python-httpx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpx/json -md5 3785c8a8930a7c7280206f79c170658f httpx-0.26.0.tar.gz -sha256 451b55c30d5185ea6b23c2c793abf9bb237d2a7dfb901ced6ff69ad37ec1dfaf httpx-0.26.0.tar.gz +md5 d6035d561136590900678ec6c78698cb httpx-0.27.0.tar.gz +sha256 a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5 httpx-0.27.0.tar.gz # Locally computed sha256 checksums sha256 4ec59d544f12b5f539a3a716fd321ac58ccd8030b465221f2c880200cdf28d8d LICENSE.md diff --git a/package/python-httpx/python-httpx.mk b/package/python-httpx/python-httpx.mk index cbc9c9298be..edba2dbb04a 100644 --- a/package/python-httpx/python-httpx.mk +++ b/package/python-httpx/python-httpx.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPX_VERSION = 0.26.0 +PYTHON_HTTPX_VERSION = 0.27.0 PYTHON_HTTPX_SOURCE = httpx-$(PYTHON_HTTPX_VERSION).tar.gz -PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/bd/26/2dc654950920f499bd062a211071925533f821ccdca04fa0c2fd914d5d06 +PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/5c/2d/3da5bdf4408b8b2800061c339f240c1802f2e82d55e50bd39c5a881f47f0 PYTHON_HTTPX_SETUP_TYPE = pep517 PYTHON_HTTPX_LICENSE = BSD-3-Clause PYTHON_HTTPX_LICENSE_FILES = LICENSE.md From b640482ace5727f08bad2459778c47a277a3943b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:07:46 -0600 Subject: [PATCH 1302/3013] package/python-aiofiles: bump to version 24.1.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aiofiles/python-aiofiles.hash | 4 ++-- package/python-aiofiles/python-aiofiles.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiofiles/python-aiofiles.hash b/package/python-aiofiles/python-aiofiles.hash index 3dc9281de77..f68b0b55b50 100644 --- a/package/python-aiofiles/python-aiofiles.hash +++ b/package/python-aiofiles/python-aiofiles.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiofiles/json -md5 ab5dfab3180f56a21b46e1e90b16c6e6 aiofiles-23.2.1.tar.gz -sha256 84ec2218d8419404abcb9f0c02df3f34c6e0a68ed41072acfb1cef5cbc29051a aiofiles-23.2.1.tar.gz +md5 530273426ff7ee50283e52186e185c81 aiofiles-24.1.0.tar.gz +sha256 22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c aiofiles-24.1.0.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index 954647bf766..9eae73d3c17 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOFILES_VERSION = 23.2.1 +PYTHON_AIOFILES_VERSION = 24.1.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz -PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/af/41/cfed10bc64d774f497a86e5ede9248e1d062db675504b41c320954d99641 +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/0b/03/a88171e277e8caa88a4c77808c20ebb04ba74cc4681bf1e9416c862de237 PYTHON_AIOFILES_SETUP_TYPE = pep517 PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE From 6c2dd4443c480f2338d1f8da63b39acfcbfb2cc8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 10:51:10 -0600 Subject: [PATCH 1303/3013] package/python-pymodbus: bump to version 3.6.9 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pymodbus/python-pymodbus.hash | 4 ++-- package/python-pymodbus/python-pymodbus.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 4595246efc9..37c44f6a060 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 809260ecaaef548c7ac327755d7d2d25 pymodbus-3.6.8.tar.gz -sha256 abb214716b56fc62bc0d5d9d964e2249439341746287e918d175f0e3ee241407 pymodbus-3.6.8.tar.gz +md5 5201e93420b9ac9dc5e3e64a656101cc pymodbus-3.6.9.tar.gz +sha256 f4223b72c20cd00a2cf25f6ddb31ecb2c0587309111a55283b2f4a1ac115e4cc pymodbus-3.6.9.tar.gz # Locally computed sha256 checksums sha256 47f904249172e795a6b32de91f471073297befffd74e17cafc288d348a55972e LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index a96edecc547..cba94896bb0 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.6.8 +PYTHON_PYMODBUS_VERSION = 3.6.9 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/62/c1/f18b090dcc45d34b6a0e3563acde71b407ef96a36fa965c508a84f755355 +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/b4/a4/5322c8e3be3bb2db7ab3eb7c2160fd2ec325083d7e60a76cd9cc896dd7bd PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE From 24e2d5f435118e3f37b4d3f5fa22f5fd90c720f6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 10:37:26 -0600 Subject: [PATCH 1304/3013] package/python-sentry-sdk: bump to version 2.7.1 License hash changed due to year update: https://github.com/getsentry/sentry-python/commit/f98f77f0a4078cc4f87e82d3a899b8a54d55a535 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- package/python-sentry-sdk/python-sentry-sdk.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 2534a482212..6060b6cab76 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 94ba9002bbfaf8c443c496b05bbc32eb sentry-sdk-1.39.2.tar.gz -sha256 24c83b0b41c887d33328a9166f5950dc37ad58f01c9f2fbff6b87a6f1094170c sentry-sdk-1.39.2.tar.gz +md5 98621433d1f8565f1f00576d47be30ce sentry_sdk-2.7.1.tar.gz +sha256 25006c7e68b75aaa5e6b9c6a420ece22e8d7daec4b7a906ffd3a8607b67c037b sentry_sdk-2.7.1.tar.gz # Locally computed sha256 checksums -sha256 2a140d660f462812fa290bc740d04633126c5ec45d84b79b569e127b0eeddd0b LICENSE +sha256 6d7ec62dc20e8b92cb88b89fb3b55ee8576505f3e1afa57952548f6eea5d008e LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index f1c5648f076..50ca854330e 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.39.2 -PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/66/90/9deac5c137e9f0ede908757d886af77938ef28f94b24decedbdf98f1ca4d +PYTHON_SENTRY_SDK_VERSION = 2.7.1 +PYTHON_SENTRY_SDK_SOURCE = sentry_sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/b8/63/310d89868a0dab17f6d7c1f35eba9c304dd06c2a17d0d26905738763b614 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = MIT PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From 07a53340a7ad10d39b9e818501777e140f9e0772 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 11:23:40 -0600 Subject: [PATCH 1305/3013] package/python-cython: bump to version 0.29.37 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 08ad8f6d84a..42c063014e4 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz +md5 d9a1e8416f2278857a189347858ed9d0 Cython-0.29.37.tar.gz +sha256 f813d4a6dd94adee5d4ff266191d1d95bf6d4164a4facc535422c021b2504cfb Cython-0.29.37.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 47e105c0650..024c8c1e506 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.36 +PYTHON_CYTHON_VERSION = 0.29.37 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/2a/97/8cc3fe7c6de4796921236a64d00ca8a95565772e57f0d3caae68d880b592 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From 1016cba17dce9fb05beb8894b47b2e97f14a2e76 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 11:38:14 -0600 Subject: [PATCH 1306/3013] package/python-pdm-backend: new host package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pdm-backend/python-pdm-backend.hash | 5 +++++ package/python-pdm-backend/python-pdm-backend.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-pdm-backend/python-pdm-backend.hash create mode 100644 package/python-pdm-backend/python-pdm-backend.mk diff --git a/package/python-pdm-backend/python-pdm-backend.hash b/package/python-pdm-backend/python-pdm-backend.hash new file mode 100644 index 00000000000..cc26e584622 --- /dev/null +++ b/package/python-pdm-backend/python-pdm-backend.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pdm-backend/json +md5 b2805090bbe41c86eb051b1311c7ba34 pdm_backend-2.3.1.tar.gz +sha256 c03cfb3a803325c049b57ba2502b409479ebb22b6a4ee3746c1f688b939764e8 pdm_backend-2.3.1.tar.gz +# Locally computed sha256 checksums +sha256 1da058ed0440fea5df1765b19a1418800439b18fd6f1c13c7d429cb81e9c6d47 LICENSE diff --git a/package/python-pdm-backend/python-pdm-backend.mk b/package/python-pdm-backend/python-pdm-backend.mk new file mode 100644 index 00000000000..a95024ec9bb --- /dev/null +++ b/package/python-pdm-backend/python-pdm-backend.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pdm-backend +# +################################################################################ + +PYTHON_PDM_BACKEND_VERSION = 2.3.1 +PYTHON_PDM_BACKEND_SOURCE = pdm_backend-$(PYTHON_PDM_BACKEND_VERSION).tar.gz +PYTHON_PDM_BACKEND_SITE = https://files.pythonhosted.org/packages/70/f4/eaa4da6e3eaa32d902177e0b81563bb5526b2c387aa312d0dfbecf3c7109 +PYTHON_PDM_BACKEND_SETUP_TYPE = pep517 +PYTHON_PDM_BACKEND_LICENSE = MIT +PYTHON_PDM_BACKEND_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) From 628bc633f3457520d044b0c5487f694ae834538b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:10:57 -0600 Subject: [PATCH 1307/3013] package/python-aiosqlite: bump to version 0.20.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aiosqlite/python-aiosqlite.hash | 4 ++-- package/python-aiosqlite/python-aiosqlite.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash index e06061346c4..52c78a76308 100644 --- a/package/python-aiosqlite/python-aiosqlite.hash +++ b/package/python-aiosqlite/python-aiosqlite.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosqlite/json -md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz -sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.0.tar.gz +md5 22620fe09bc9d9df3bffef19919eed7f aiosqlite-0.20.0.tar.gz +sha256 6d35c8c256637f4672f843c31021464090805bf925385ac39473fb16eaaca3d7 aiosqlite-0.20.0.tar.gz # Locally computed sha256 checksums sha256 ab0c171dc3ef8bf325a84bb77d855421f2611335ddf6e08816b2922c4edc0f76 LICENSE diff --git a/package/python-aiosqlite/python-aiosqlite.mk b/package/python-aiosqlite/python-aiosqlite.mk index e513d53c02f..a48d676c695 100644 --- a/package/python-aiosqlite/python-aiosqlite.mk +++ b/package/python-aiosqlite/python-aiosqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOSQLITE_VERSION = 0.19.0 +PYTHON_AIOSQLITE_VERSION = 0.20.0 PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz -PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/0d/3a/22ff5415bf4d296c1e92b07fd746ad42c96781f13295a074d58e77747848 PYTHON_AIOSQLITE_SETUP_TYPE = flit PYTHON_AIOSQLITE_LICENSE = MIT PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE From a75dd97fd815f4060c1421cdbe07dacd2dfb4fd5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:13:38 -0600 Subject: [PATCH 1308/3013] package/python-annotated-types: bump to version 0.7.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-annotated-types/python-annotated-types.hash | 4 ++-- package/python-annotated-types/python-annotated-types.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-annotated-types/python-annotated-types.hash b/package/python-annotated-types/python-annotated-types.hash index 1663bcb51f3..fc92476edaa 100644 --- a/package/python-annotated-types/python-annotated-types.hash +++ b/package/python-annotated-types/python-annotated-types.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/annotated-types/json -md5 5fe2125b08851f0d05a8efad6456861c annotated_types-0.6.0.tar.gz -sha256 563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d annotated_types-0.6.0.tar.gz +md5 5c943b7c51b0b7dcadf46da4a99c84a1 annotated_types-0.7.0.tar.gz +sha256 aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89 annotated_types-0.7.0.tar.gz # Locally computed sha256 checksums sha256 fe1049884b1a0d9342901e88e07f32925d24b3121d9972b6a6805fb9824b095d LICENSE diff --git a/package/python-annotated-types/python-annotated-types.mk b/package/python-annotated-types/python-annotated-types.mk index 8bc617069d3..e7a3b7e64bd 100644 --- a/package/python-annotated-types/python-annotated-types.mk +++ b/package/python-annotated-types/python-annotated-types.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ANNOTATED_TYPES_VERSION = 0.6.0 +PYTHON_ANNOTATED_TYPES_VERSION = 0.7.0 PYTHON_ANNOTATED_TYPES_SOURCE = annotated_types-$(PYTHON_ANNOTATED_TYPES_VERSION).tar.gz -PYTHON_ANNOTATED_TYPES_SITE = https://files.pythonhosted.org/packages/67/fe/8c7b275824c6d2cd17c93ee85d0ee81c090285b6d52f4876ccc47cf9c3c4 +PYTHON_ANNOTATED_TYPES_SITE = https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5 PYTHON_ANNOTATED_TYPES_SETUP_TYPE = pep517 PYTHON_ANNOTATED_TYPES_LICENSE = MIT PYTHON_ANNOTATED_TYPES_LICENSE_FILES = LICENSE From 6945181c0474cc22e19a543453efaabf518dadb9 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:17:16 -0600 Subject: [PATCH 1309/3013] package/python-anyio: bump to version 4.4.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-anyio/python-anyio.hash | 4 ++-- package/python-anyio/python-anyio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-anyio/python-anyio.hash b/package/python-anyio/python-anyio.hash index e77d30249c6..c1edeca10c8 100644 --- a/package/python-anyio/python-anyio.hash +++ b/package/python-anyio/python-anyio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/anyio/json -md5 22e660fff1a584e72281f0d6a083e4e0 anyio-4.2.0.tar.gz -sha256 e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f anyio-4.2.0.tar.gz +md5 04346dd3631f405d0786ca0f441dace1 anyio-4.4.0.tar.gz +sha256 5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94 anyio-4.4.0.tar.gz # Locally computed sha256 checksums sha256 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0 LICENSE diff --git a/package/python-anyio/python-anyio.mk b/package/python-anyio/python-anyio.mk index 32c22861577..4f9cbb78f79 100644 --- a/package/python-anyio/python-anyio.mk +++ b/package/python-anyio/python-anyio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ANYIO_VERSION = 4.2.0 +PYTHON_ANYIO_VERSION = 4.4.0 PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz -PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/2d/b8/7333d87d5f03247215d86a86362fd3e324111788c6cdd8d2e6196a6ba833 +PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/e6/e3/c4c8d473d6780ef1853d630d581f70d655b4f8d7553c6997958c283039a2 PYTHON_ANYIO_SETUP_TYPE = setuptools PYTHON_ANYIO_LICENSE = MIT PYTHON_ANYIO_LICENSE_FILES = LICENSE From 32448f18a0876767f15e386e7cf70afa194e53e5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:21:28 -0600 Subject: [PATCH 1310/3013] package/python-beautifulsoup4: bump to version 4.12.3 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-beautifulsoup4/python-beautifulsoup4.hash | 4 ++-- package/python-beautifulsoup4/python-beautifulsoup4.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.hash b/package/python-beautifulsoup4/python-beautifulsoup4.hash index 0387af8a650..149eeff67d3 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.hash +++ b/package/python-beautifulsoup4/python-beautifulsoup4.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/beautifulsoup4/json -md5 b49a6696a762e946c2be97c36a5adaa8 beautifulsoup4-4.12.2.tar.gz -sha256 492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da beautifulsoup4-4.12.2.tar.gz +md5 4ecf1fb561e84adfb3146650e3d51394 beautifulsoup4-4.12.3.tar.gz +sha256 74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051 beautifulsoup4-4.12.3.tar.gz # Locally computed sha256 checksums sha256 55b4d8d4b1e5bc86d10efac91b74c87bcb77526b0f5b9edaf8b9cd2adc7397b2 LICENSE diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.mk b/package/python-beautifulsoup4/python-beautifulsoup4.mk index 4c8b996d078..bb02807cdb5 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.mk +++ b/package/python-beautifulsoup4/python-beautifulsoup4.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BEAUTIFULSOUP4_VERSION = 4.12.2 +PYTHON_BEAUTIFULSOUP4_VERSION = 4.12.3 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz -PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/af/0b/44c39cf3b18a9280950ad63a579ce395dda4c32193ee9da7ff0aed547094 +PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/b3/ca/824b1195773ce6166d388573fc106ce56d4a805bd7427b624e063596ec58 PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = pep517 PYTHON_BEAUTIFULSOUP4_LICENSE = MIT PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = LICENSE From 33de60dbff80e44062ba57aea2489cf4dbd26d02 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 1 Jul 2024 20:27:34 +0200 Subject: [PATCH 1311/3013] package/apache: security bump version to 2.4.60 Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.60 Fixes CVE-2024-36387, CVE-2024-38472 (Windows-only), CVE-2024-38473, CVE-2024-38474, CVE-2024-38475, CVE-2024-38476, CVE-2024-38477 & CVE-2024-39573. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/apache/apache.hash | 4 ++-- package/apache/apache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 84248761b97..bd503d84f91 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ # From https://downloads.apache.org/httpd/httpd-2.4.59.tar.bz2.{sha256,sha512} -sha256 ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323 httpd-2.4.59.tar.bz2 -sha512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 httpd-2.4.59.tar.bz2 +sha256 7b1ec7ec5635da7cb01550513215a90f8b2f52bb7c90cf3e97ede936d3e55b0f httpd-2.4.60.tar.bz2 +sha512 c1591389f76699beaa5d32b019729e25f1ed5b828311c82b52f1a4edd5d28b73e697958df384d7628b314521a831dbb0af418bc37cdf031cfe133e53c195d8ad httpd-2.4.60.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 1b095c5eb10..39ccc3cf967 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.59 +APACHE_VERSION = 2.4.60 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 From b411dc60181c50d0ac2d9eb506a8fd5bd1a4ac4f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 11:38:13 -0600 Subject: [PATCH 1312/3013] package/python-starlette: bump to version 0.37.2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-starlette/python-starlette.hash | 4 ++-- package/python-starlette/python-starlette.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index 03d77cf5be3..f04aaea7c05 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz -sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz +md5 b0ba8178dd4bf2cdff53c8702212be52 starlette-0.37.2.tar.gz +sha256 9af890290133b79fc3db55474ade20f6220a364a0402e0b556e7cd5e1e093823 starlette-0.37.2.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index 9d137f5f5a4..af2c2d4ac78 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.36.3 +PYTHON_STARLETTE_VERSION = 0.37.2 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/61/b5/6bceb93ff20bd7ca36e6f7c540581abb18f53130fabb30ba526e26fd819b PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From f33b2227416ccefe7aff4f612644cd932af1f110 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 11:38:15 -0600 Subject: [PATCH 1313/3013] package/python-fastapi: bump to version 0.111.0 Switch from hatchling to pdm-backend pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 224eccbccdc..2be006a97d8 100644 --- a/package/python-fastapi/python-fastapi.hash +++ b/package/python-fastapi/python-fastapi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fastapi/json -md5 5e9226e70e1553a630599cf584ed53de fastapi-0.110.0.tar.gz -sha256 266775f0dcc95af9d3ef39bad55cff525329a931d5fd51930aadd4f428bf7ff3 fastapi-0.110.0.tar.gz +md5 32df7b178fb59e180d34729be33d5024 fastapi-0.111.0.tar.gz +sha256 b9db9dd147c91cb8b769f7183535773d8741dd46f9dc6676cd82eab510228cd7 fastapi-0.111.0.tar.gz # Locally computed sha256 checksums sha256 4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e LICENSE diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk index c1844960b9e..262b166907b 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,14 +4,14 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.110.0 +PYTHON_FASTAPI_VERSION = 0.111.0 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/61/53/326977db62bf34bbdfc64acb9414e1881af7ea14e8a062fd1c11a8697616 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/0e/1f/f4a99e92c583780787e04b05aa9d8a8db9ec76d091d81545948a006f5b44 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE PYTHON_FASTAPI_CPE_ID_VENDOR = fastapi_project PYTHON_FASTAPI_CPE_ID_PRODUCT = fastapi -PYTHON_FASTAPI_DEPENDENCIES = host-python-hatchling +PYTHON_FASTAPI_DEPENDENCIES = host-python-pdm-backend $(eval $(python-package)) From d47ae17adfca2f07a6a575d84e1137d87afd961c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:02:32 +0200 Subject: [PATCH 1314/3013] package/gpm: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, gpm fails to build with output: Applying 0003-src-Makefile.in-Really-install-unversioned-solibrary.patch using patch: patching file src/Makefile.in Hunk #1 FAILED at 115. 1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej This commit refreshes the package patch on the current package version. While we're at it, change to use a proper Upstream: tag and remove from .checkpackageignore. Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...ile.in-Really-install-unversioned-solibrary.patch | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 949b7467cfe..8fc0f4e7985 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -694,7 +694,6 @@ package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch. package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch lib_patch.Upstream package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch lib_patch.Upstream package/gpm/0002-Install-unversioned-solibrary.patch lib_patch.Upstream -package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch lib_patch.Upstream package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch lib_patch.Upstream package/gpm/0005-fix-building-w-newer-glibc.patch lib_patch.Upstream package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch lib_patch.Upstream diff --git a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch index 25918019769..3806fe7e89c 100644 --- a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch +++ b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch @@ -1,4 +1,4 @@ -From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001 +From 5b83edaa20f6ecf97d16e323be1ed555d8fa2c01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 17:59:52 +0100 Subject: [PATCH] src/Makefile.in: Really install unversioned solibrary @@ -7,25 +7,27 @@ This commit is a follow-up to https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa which created libgpm.so but failed to include it in the install target. -Patch sent upstream: https://github.com/telmich/gpm/pull/11 +Upstream: https://github.com/telmich/gpm/pull/11 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.in b/src/Makefile.in -index 7e9e2ef..bca226f 100644 +index b63e4f4489bd..a1838c300312 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -115,6 +115,7 @@ install: check if test "x@SHLIB@" != "x" ; then \ - $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ + $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ + cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \ echo "WARNING: We installed a lib, you should now call ldconfig" ; \ echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ echo "Or to update everything just type ldconfig" ; \ -- -2.7.0 +2.43.0 From 7a75aca39dfbe6ca468a5cfd20604bd6d97b755f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 11:58:21 -0600 Subject: [PATCH 1315/3013] package/python-httpcore: bump to version 1.0.5 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-httpcore/python-httpcore.hash | 4 ++-- package/python-httpcore/python-httpcore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httpcore/python-httpcore.hash b/package/python-httpcore/python-httpcore.hash index 1623573b655..e773374c050 100644 --- a/package/python-httpcore/python-httpcore.hash +++ b/package/python-httpcore/python-httpcore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpcore/json -md5 155fbd7794ce7351b607d408cb8182bf httpcore-1.0.2.tar.gz -sha256 9fc092e4799b26174648e54b74ed5f683132a464e95643b226e00c2ed2fa6535 httpcore-1.0.2.tar.gz +md5 17916ce84db1c0705af60a61bbec9061 httpcore-1.0.5.tar.gz +sha256 34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 httpcore-1.0.5.tar.gz # Locally computed sha256 checksums sha256 fdcb59154c74cbaba16a11242f7740bea9f23d6feb5547917d8c5f94a80392a5 LICENSE.md diff --git a/package/python-httpcore/python-httpcore.mk b/package/python-httpcore/python-httpcore.mk index f1b3b810d77..ae29d8dc8af 100644 --- a/package/python-httpcore/python-httpcore.mk +++ b/package/python-httpcore/python-httpcore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPCORE_VERSION = 1.0.2 +PYTHON_HTTPCORE_VERSION = 1.0.5 PYTHON_HTTPCORE_SOURCE = httpcore-$(PYTHON_HTTPCORE_VERSION).tar.gz -PYTHON_HTTPCORE_SITE = https://files.pythonhosted.org/packages/18/56/78a38490b834fa0942cbe6d39bd8a7fd76316e8940319305a98d2b320366 +PYTHON_HTTPCORE_SITE = https://files.pythonhosted.org/packages/17/b0/5e8b8674f8d203335a62fdfcfa0d11ebe09e23613c3391033cbba35f7926 PYTHON_HTTPCORE_SETUP_TYPE = pep517 PYTHON_HTTPCORE_LICENSE = BSD-3-Clause PYTHON_HTTPCORE_LICENSE_FILES = LICENSE.md From 9ebf00882df8ed9d8aaaaea3bd219e22781f1d84 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:30:03 -0600 Subject: [PATCH 1316/3013] package/python-dateutil: bump to version 2.9.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-dateutil/python-dateutil.hash | 4 ++-- package/python-dateutil/python-dateutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash index a52fb30a0fa..c127582376b 100644 --- a/package/python-dateutil/python-dateutil.hash +++ b/package/python-dateutil/python-dateutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-dateutil/json -md5 5970010bb72452344df3d76a10281b65 python-dateutil-2.8.2.tar.gz -sha256 0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 python-dateutil-2.8.2.tar.gz +md5 f4888298c0f2d5239c85c6457455a975 python-dateutil-2.9.0.tar.gz +sha256 78e73e19c63f5b20ffa567001531680d939dc042bf7850431877645523c66709 python-dateutil-2.9.0.tar.gz # Locally computed sha256 checksums sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk index b75f510bce8..a2f1620b9fb 100644 --- a/package/python-dateutil/python-dateutil.mk +++ b/package/python-dateutil/python-dateutil.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DATEUTIL_VERSION = 2.8.2 -PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/4c/c4/13b4776ea2d76c115c1d1b84579f3764ee6d57204f6be27119f13a61d0a9 +PYTHON_DATEUTIL_VERSION = 2.9.0 +PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/d9/77/bd458a2e387e98f71de86dcc2ca2cab64489736004c80bc12b70da8b5488 PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_DATEUTIL_LICENSE = BSD-3-Clause PYTHON_DATEUTIL_LICENSE_FILES = LICENSE From 38812e50436d9c6b54da8711f9bdfca14ff0d8d1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:39:58 -0600 Subject: [PATCH 1317/3013] package/python-idna: bump to version 3.7 License hash changed due to date update: https://github.com/kjd/idna/commit/1d365e17e10d72d0b7876316fc7b9ca0eebdd38d Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-idna/python-idna.hash | 6 +++--- package/python-idna/python-idna.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 5e6ac716a28..7b22841d885 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 70f4beef4feb196ac64b75a93271f53c idna-3.6.tar.gz -sha256 9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca idna-3.6.tar.gz +md5 31cc572cb7a6519159c927c998c64c79 idna-3.7.tar.gz +sha256 028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc idna-3.7.tar.gz # Locally computed sha256 checksums -sha256 cb2faf0ca18c6d387ec7cb66f321939fba6e67e9dac09d31477cb9d8d3fe6899 LICENSE.md +sha256 a59f0b0ef3635874109a4461ca44ff7a70d50696e814767bfaf721d4c9b0db0f LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index eb92432bd34..b3c012ed0d3 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.6 +PYTHON_IDNA_VERSION = 3.7 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/bf/3f/ea4b9117521a1e9c50344b909be7886dd00a519552724809bb1f486986c2 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/21/ed/f86a79a07470cb07819390452f178b3bef1d375f2ec021ecfc709fc7cf07 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = flit From c61bc7fe7cb328efa01584faef419349d0ff2848 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:47:14 -0600 Subject: [PATCH 1318/3013] package/python-itsdangerous: bump to version 2.2.0 License hash changed due to include format change: https://github.com/pallets/itsdangerous/commit/9a25d989cd65c4991c2c8ac46ef55e0e8dfe49ab Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-itsdangerous/python-itsdangerous.hash | 8 ++++---- package/python-itsdangerous/python-itsdangerous.mk | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/python-itsdangerous/python-itsdangerous.hash b/package/python-itsdangerous/python-itsdangerous.hash index 071544e5bd9..1cac9a56077 100644 --- a/package/python-itsdangerous/python-itsdangerous.hash +++ b/package/python-itsdangerous/python-itsdangerous.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/itsdangerous/json -md5 c1bc730ddf53b8374eaa823f24eb6438 itsdangerous-2.1.2.tar.gz -sha256 5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a itsdangerous-2.1.2.tar.gz +md5 a901babde35694c3577f7655010cd380 itsdangerous-2.2.0.tar.gz +sha256 e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173 itsdangerous-2.2.0.tar.gz # Locally computed sha256 checksums -sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.rst -sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst +sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.txt +sha256 1e07e9c25f2618a040560b70e63f42259eab24e558d0f3532e6163d751cb4eea docs/license.rst diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk index d7a1344e0ad..5fb2919c977 100644 --- a/package/python-itsdangerous/python-itsdangerous.mk +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 2.1.2 +PYTHON_ITSDANGEROUS_VERSION = 2.2.0 PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz -PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/7f/a1/d3fb83e7a61fa0c0d3d08ad0a94ddbeff3731c05212617dff3a94e097f08 -PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/9c/cb/8ac0172223afbccb63986cc25049b154ecfb5e85932587206f42317be31d +PYTHON_ITSDANGEROUS_SETUP_TYPE = flit PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause -PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst docs/license.rst +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.txt docs/license.rst $(eval $(python-package)) From ab96856e9c79f5026f94bb473ef5d610b6ad9301 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:51:50 -0600 Subject: [PATCH 1319/3013] package/python-jinja2: bump to version 3.1.4 Migrate from setuptools to flit build backend. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-jinja2/python-jinja2.hash | 6 +++--- package/python-jinja2/python-jinja2.mk | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index 2ab343cce61..2b32f5cce4e 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 d31148abd89c1df1cdb077a55db27d02 Jinja2-3.1.2.tar.gz -sha256 31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 Jinja2-3.1.2.tar.gz +md5 02ca9a6364c92e83d14b037bef4732bc jinja2-3.1.4.tar.gz +sha256 4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 jinja2-3.1.4.tar.gz # Locally computed sha256 checksums -sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.txt diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 209ca2e25a0..780b6932814 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 3.1.2 -PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/7a/ff/75c28576a1d900e87eb6335b063fab47a8ef3c8b4d88524c4bf78f670cce -PYTHON_JINJA2_SETUP_TYPE = setuptools +PYTHON_JINJA2_VERSION = 3.1.4 +PYTHON_JINJA2_SOURCE = jinja2-$(PYTHON_JINJA2_VERSION).tar.gz +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/ed/55/39036716d19cab0747a5020fc7e907f362fbf48c984b14e62127f7e68e5d +PYTHON_JINJA2_SETUP_TYPE = flit PYTHON_JINJA2_LICENSE = BSD-3-Clause -PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst +PYTHON_JINJA2_LICENSE_FILES = LICENSE.txt PYTHON_JINJA2_CPE_ID_VENDOR = pocoo PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 From 978c48499dbf0a934ede69562d11b2e8cac214d8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:54:49 -0600 Subject: [PATCH 1320/3013] package/python-markupsafe: bump to version 2.1.5 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-markupsafe/python-markupsafe.hash | 4 ++-- package/python-markupsafe/python-markupsafe.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash index ec357a83ce0..c6f9cd47028 100644 --- a/package/python-markupsafe/python-markupsafe.hash +++ b/package/python-markupsafe/python-markupsafe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markupsafe/json -md5 ca33f119bd0551ce15837f58bb180214 MarkupSafe-2.1.3.tar.gz -sha256 af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad MarkupSafe-2.1.3.tar.gz +md5 8fe7227653f2fb9b1ffe7f9f2058998a MarkupSafe-2.1.5.tar.gz +sha256 d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b MarkupSafe-2.1.5.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index 0dca997f87e..b54a77365f7 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKUPSAFE_VERSION = 2.1.3 +PYTHON_MARKUPSAFE_VERSION = 2.1.5 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz -PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/6d/7c/59a3248f411813f8ccba92a55feaac4bf360d29e2ff05ee7d8e1ef2d7dbf +PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst From bedfd8243cb8baf9784cce54b9dd2f08d2790a6f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 12:59:22 -0600 Subject: [PATCH 1321/3013] package/python-multidict: bump to version 6.0.5 License hash changed due to changing team to contributors: https://github.com/aio-libs/multidict/commit/fecf3d43983a121ca44bfb11415c0110d7da4408 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-multidict/python-multidict.hash | 6 +++--- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 568c320c538..d23a3de3eb7 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 ec06a613d871dadfb66f2be3a1f2f3fa multidict-6.0.4.tar.gz -sha256 3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49 multidict-6.0.4.tar.gz +md5 abcf9bf19365d06aa784de07da02115d multidict-6.0.5.tar.gz +sha256 f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da multidict-6.0.5.tar.gz # Locally computed sha256 checksums -sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE +sha256 93d11a968e2f0f36373c40811ff6d20e173f58c3cab5884cd6617bbfd795492a LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index cd35dcb4cb5..3c9a21f1dce 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.4 +PYTHON_MULTIDICT_VERSION = 6.0.5 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/4a/15/bd620f7a6eb9aa5112c4ef93e7031bcd071e0611763d8e17706ef8ba65e0 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/f9/79/722ca999a3a09a63b35aac12ec27dfa8e5bb3a38b0f857f7a1a209a88836 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From 4f8c5efd709c7b224f954f2e1955f643a6285dcb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 13:03:36 -0600 Subject: [PATCH 1322/3013] package/python-multipart: bump to version 0.0.9 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-multipart/python-multipart.hash | 4 ++-- package/python-multipart/python-multipart.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multipart/python-multipart.hash b/package/python-multipart/python-multipart.hash index 9b2b6d3d824..29f7f2bc887 100644 --- a/package/python-multipart/python-multipart.hash +++ b/package/python-multipart/python-multipart.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-multipart/json -md5 a61a045b7f5e64d44dc53c73522ac4d2 python_multipart-0.0.6.tar.gz -sha256 e9925a80bb668529f1b67c7fdb0a5dacdd7cbfc6fb0bff3ea443fe22bdd62132 python_multipart-0.0.6.tar.gz +md5 0339000d92e78abbaac815954da6b826 python_multipart-0.0.9.tar.gz +sha256 03f54688c663f1b7977105f021043b0793151e4cb1c1a9d4a11fc13d622c4026 python_multipart-0.0.9.tar.gz # Locally computed sha256 checksums sha256 a8e833176cd617daf00b9d6d39fa15ca8edebc6d1643079cd2f4893c0c289be2 LICENSE.txt diff --git a/package/python-multipart/python-multipart.mk b/package/python-multipart/python-multipart.mk index 7ffb05fa927..62ae37d7490 100644 --- a/package/python-multipart/python-multipart.mk +++ b/package/python-multipart/python-multipart.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIPART_VERSION = 0.0.6 +PYTHON_MULTIPART_VERSION = 0.0.9 PYTHON_MULTIPART_SOURCE = python_multipart-$(PYTHON_MULTIPART_VERSION).tar.gz -PYTHON_MULTIPART_SITE = https://files.pythonhosted.org/packages/2d/23/abcfad10c3348cb6358400f8adbc21b523bbc6c954494fd0974428068672 +PYTHON_MULTIPART_SITE = https://files.pythonhosted.org/packages/5c/0f/9c55ac6c84c0336e22a26fa84ca6c51d58d7ac3a2d78b0dfa8748826c883 PYTHON_MULTIPART_SETUP_TYPE = pep517 PYTHON_MULTIPART_LICENSE = Apache-2.0 PYTHON_MULTIPART_LICENSE_FILES = LICENSE.txt From b628443ad89b6c3ca2c5304613d66d0bb72d193c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 13:22:52 -0600 Subject: [PATCH 1323/3013] package/python-pybind: bump to version 2.13.1 Fix patch to apply against 2.13.1. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../0001-pybind11-commands.py-support-STAGING_DIR.patch | 5 +++-- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch index 009f43cdbc2..255c484099f 100644 --- a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch @@ -21,7 +21,8 @@ diff --git a/pybind11/commands.py b/pybind11/commands.py index a29c8ca..de8a27c 100644 --- a/pybind11/commands.py +++ b/pybind11/commands.py -@@ -1,6 +1,7 @@ +@@ -2,7 +2,8 @@ from __future__ import annotations + import os -DIR = os.path.abspath(os.path.dirname(__file__)) @@ -29,7 +30,7 @@ index a29c8ca..de8a27c 100644 + os.path.abspath(os.path.dirname(__file__)) - def get_include(user: bool = False) -> str: # pylint: disable=unused-argument + def get_include(user: bool = False) -> str: # noqa: ARG001 -- 2.31.1 diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index 9d2f43ce0de..c831007d4d5 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d475978da0cdc2d43b73f30910786759d593a9d8ee05b1b6846d1eb16c6d2e0c python-pybind-2.11.1.tar.gz +sha256 51631e88960a8856f9c497027f55c9f2f9115cafb08c0005439838a05ba17bfc python-pybind-2.13.1.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index 5a5d1203218..a1cc02ee040 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.11.1 +PYTHON_PYBIND_VERSION = 2.13.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From a050c71aa65137ebb82b867df8e75c2eb6ccded4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 13:26:14 -0600 Subject: [PATCH 1324/3013] package/python-pycparser: bump to version 2.22 License hash changed due to date update: https://github.com/eliben/pycparser/commit/0f6ef1efeee8c5fd5a7d1cde9117edeba2a08b82 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pycparser/python-pycparser.hash | 6 +++--- package/python-pycparser/python-pycparser.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pycparser/python-pycparser.hash b/package/python-pycparser/python-pycparser.hash index 34401a319a7..3ec1862b755 100644 --- a/package/python-pycparser/python-pycparser.hash +++ b/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 48f7d743bf018f7bb2ffc5fb976d1492 pycparser-2.21.tar.gz -sha256 e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 pycparser-2.21.tar.gz +md5 8922b0b1b53b419e3a38fba4aa43a348 pycparser-2.22.tar.gz +sha256 491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 pycparser-2.22.tar.gz # Locally computed sha256 checksums -sha256 3e7df25b8dfb658c9a91501930d4d943b05087a8347c7e2b4325616af535047b LICENSE +sha256 0c846399369ea76ddd7b5c44fe6d16497415fcf015f5cbb508c24bf98b81c5b1 LICENSE diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 1737c99a32e..6d01844fb3a 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCPARSER_VERSION = 2.21 +PYTHON_PYCPARSER_VERSION = 2.22 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE From 6a8f8d83a8261971725f61b1207d7aa5ebca7234 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 13:36:22 -0600 Subject: [PATCH 1325/3013] package/python-pydantic-core: bump to version 2.20.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pydantic-core/python-pydantic-core.hash | 2 +- package/python-pydantic-core/python-pydantic-core.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index d11b3bfbb40..1703fcff3d7 100644 --- a/package/python-pydantic-core/python-pydantic-core.hash +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 3359b437ca74c8f7e1b8ec477b1ff1e39f0fff08abb0eb171953f9bc3e8773c6 python-pydantic-core-v2.19.0-git4-cargo2.tar.gz +sha256 a3597bcb7a6c9aabee543ba5797ba4997eb5a91b36bc6c596be4640bccf98daf pydantic_core-2.20.0.tar.gz # Locally computed sha256 checksums sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk index 79d06deab2a..2e37c370040 100644 --- a/package/python-pydantic-core/python-pydantic-core.mk +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_CORE_VERSION = v2.19.0 -PYTHON_PYDANTIC_CORE_SITE = https://github.com/pydantic/pydantic-core -PYTHON_PYDANTIC_CORE_SITE_METHOD = git +PYTHON_PYDANTIC_CORE_VERSION = 2.20.0 +PYTHON_PYDANTIC_CORE_SOURCE = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz +PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/7d/fa/9802d053f33dbcf110d46e3f28667b06cd764b164f1e3f4189848cdd6e78 PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE From 72bf335212a6ce0470756cac733383904c04f104 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 13:40:29 -0600 Subject: [PATCH 1326/3013] package/python-pydantic: bump to version 2.8.0 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pydantic/python-pydantic.hash | 4 ++-- package/python-pydantic/python-pydantic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 75ecb230532..caac7f89578 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 4651fb3374d2a0d74442c2cc780770d0 pydantic-2.5.3.tar.gz -sha256 b3ef57c62535b0941697cce638c08900d87fcb67e29cfa99e8a68f747f393f7a pydantic-2.5.3.tar.gz +md5 38edaad5e8687f1b238577ee05a4c968 pydantic-2.8.0.tar.gz +sha256 d970ffb9d030b710795878940bd0489842c638e7252fc4a19c3ae2f7da4d6141 pydantic-2.8.0.tar.gz # Locally computed sha256 checksums sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 0cce5a153fb..4c2becc9c9d 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 2.5.3 +PYTHON_PYDANTIC_VERSION = 2.8.0 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/aa/3f/56142232152145ecbee663d70a19a45d078180633321efb3847d2562b490 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/8b/7b/23dc30fba5793d7be3307f33bebb36e08f78f8af9c03fce608833f01bebd PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From 2282d9ed901ae48d7a88fdaaed5af3d7536e46d8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 13:58:09 -0600 Subject: [PATCH 1327/3013] package/python-typing-extensions: bump to version 4.12.2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../python-typing-extensions/python-typing-extensions.hash | 4 ++-- package/python-typing-extensions/python-typing-extensions.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-typing-extensions/python-typing-extensions.hash b/package/python-typing-extensions/python-typing-extensions.hash index 778b2d57715..8e2c405929b 100644 --- a/package/python-typing-extensions/python-typing-extensions.hash +++ b/package/python-typing-extensions/python-typing-extensions.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typing-extensions/json -md5 2bcafbd6817cb0d7a29ed7a7f1bb1e5d typing_extensions-4.9.0.tar.gz -sha256 23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783 typing_extensions-4.9.0.tar.gz +md5 cf64c2313f5fa5eb04c1deb3fc93abe9 typing_extensions-4.12.2.tar.gz +sha256 1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8 typing_extensions-4.12.2.tar.gz # Locally computed sha256 checksums sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 89ed75bda79..66f8872bf5b 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_EXTENSIONS_VERSION = 4.9.0 +PYTHON_TYPING_EXTENSIONS_VERSION = 4.12.2 PYTHON_TYPING_EXTENSIONS_SOURCE = typing_extensions-$(PYTHON_TYPING_EXTENSIONS_VERSION).tar.gz -PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/0c/1d/eb26f5e75100d531d7399ae800814b069bc2ed2a7410834d57374d010d96 +PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557 PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = flit PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0 PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE From 6524a5966454181fd879a492fc4815520a5d0514 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 14:02:08 -0600 Subject: [PATCH 1328/3013] package/python-uvicorn: bump to version 0.30.1 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index f002304c3d5..318fc65e21c 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 88b8d2090026fff2bca6f9f561a07ecb uvicorn-0.29.0.tar.gz -sha256 6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0 uvicorn-0.29.0.tar.gz +md5 a000939f41470e55bad5cec475489b4c uvicorn-0.30.1.tar.gz +sha256 d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8 uvicorn-0.30.1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 04ec4b20d2c..092c640abd3 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.29.0 +PYTHON_UVICORN_VERSION = 0.30.1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/49/8d/5005d39cd79c9ae87baf7d7aafdcdfe0b13aa69d9a1e3b7f1c984a2ac6d2 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/37/16/9f5ccaa1a76e5bfbaa0c67640e2db8a5214ca08d92a1b427fa1677b3da88 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md From b2c5c608a366faed8af312a59e9ad22eec69be5f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:20:24 +0200 Subject: [PATCH 1329/3013] package/libtheora: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, theora fails to build with output: Applying 0002-fix-autoreconf.patch using patch: patching file Makefile.am Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej patching file configure.ac Hunk #1 FAILED at 68. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. While we're at it, fix the usage of the Upstream: tag and update .checkpackageignore accordingly. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - package/libtheora/0002-fix-autoreconf.patch | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 8fc0f4e7985..d4a4b472745 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -910,7 +910,6 @@ package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch lib_pa package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch lib_patch.Upstream package/libtelnet/0001-fix-compilation-without-zlib.patch lib_patch.Upstream package/libtheora/0001-link-libtheoradec.patch lib_patch.Upstream -package/libtheora/0002-fix-autoreconf.patch lib_patch.Upstream package/libtomcrypt/0001-fix-CVE-2019-17362.patch lib_patch.Upstream package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch lib_patch.Upstream package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch lib_patch.Upstream diff --git a/package/libtheora/0002-fix-autoreconf.patch b/package/libtheora/0002-fix-autoreconf.patch index dd3f4732223..27fc379ad40 100644 --- a/package/libtheora/0002-fix-autoreconf.patch +++ b/package/libtheora/0002-fix-autoreconf.patch @@ -1,9 +1,10 @@ Fix broken autoreconf -Downloaded from upstream git -https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 +Upstream: https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi From: Tim Terriberry @@ -22,9 +23,8 @@ diff --git a/Makefile.am b/Makefile.am index 89fd753..1783857 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -4,6 +4,8 @@ - #AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2 - AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz +@@ -2,5 +2,7 @@ + AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 +ACLOCAL_AMFLAGS=-I m4 + @@ -35,7 +35,7 @@ diff --git a/configure.ac b/configure.ac index 1cbec1a..456b603 100644 --- a/configure.ac +++ b/configure.ac -@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL +@@ -61,7 +61,7 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl Add parameters for aclocal @@ -43,4 +43,4 @@ index 1cbec1a..456b603 100644 +AC_CONFIG_MACRO_DIR([m4]) dnl Check for doxygen - AC_ARG_ENABLE([doc], + AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) From 3fb44cc367b47e9d3eb15eba5e77d624f709d60e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:28:56 +0200 Subject: [PATCH 1330/3013] package/flite: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, flite fails to build with output: Applying 0001-fix-alsa-static.patch using patch: patching file configure.in Hunk #1 FAILED at 275. 1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- package/flite/0001-fix-alsa-static.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/flite/0001-fix-alsa-static.patch b/package/flite/0001-fix-alsa-static.patch index 7ed4899cc4f..83f0a86e4d1 100644 --- a/package/flite/0001-fix-alsa-static.patch +++ b/package/flite/0001-fix-alsa-static.patch @@ -1,12 +1,14 @@ Use pkg-config to determine alsa link flags. This fixes static linking. Signed-off-by: Baruch Siach +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in --- flite-1.4-release.orig/configure.in 2009-08-14 23:46:38.000000000 +0300 +++ flite-1.4-release/configure.in 2014-04-30 18:52:33.253297236 +0300 -@@ -275,7 +275,10 @@ - #endif], +@@ -383,7 +383,10 @@ AC_CHECK_HEADER(sys/audioio.h, + AC_CHECK_HEADER(alsa/asoundlib.h, [AUDIODRIVER="alsa" AUDIODEFS=-DCST_AUDIO_ALSA - AUDIOLIBS=-lasound]) From e987d16478a87f9a7cd0c376b977459b28661486 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:35:12 +0200 Subject: [PATCH 1331/3013] package/ficl: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, ficl fails to build with output: Applying 0002-Makefile.linux-pass-LDFLAGS.patch using patch: patching file Makefile.linux Hunk #1 FAILED at 14. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.linux.rej This commit refreshes the package patch on the current package version. While we're at it, fix the usage of the Upstream: tag and update .checkpackageignore accordingly. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index d4a4b472745..76b1c3c49ba 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -615,7 +615,6 @@ package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch li package/ffmpeg/0003-libavutil-Fix-mips-build.patch lib_patch.Upstream package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch lib_patch.Upstream package/ficl/0001-fix-Makefile.patch lib_patch.Upstream -package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch lib_patch.Upstream package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch lib_patch.Upstream package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch lib_patch.Upstream package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch lib_patch.Upstream diff --git a/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch index 2138089b0e9..dd9e16412c6 100644 --- a/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch +++ b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch @@ -12,7 +12,9 @@ Fixes: - http://autobuild.buildroot.org/results/bf041723ed813746c61892262630a3ac2bc43b14 Signed-off-by: Fabrice Fontaine -[Upstream status: upstream is dead] +Upstream: upstream is dead +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21,8 +23,7 @@ diff --git a/Makefile.linux b/Makefile.linux index 5f1a41f..df887e6 100644 --- a/Makefile.linux +++ b/Makefile.linux -@@ -14,7 +14,7 @@ MAJOR = 4 - MINOR = 0.31 +@@ -14,6 +14,6 @@ MINOR = 1.0 ficl: main.o $(HEADERS) libficl.a - $(CC) main.o -o ficl -L. -lficl -lm From 93a52a7410292148eda9e1dc6e700f3b0032fb76 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:39:26 +0200 Subject: [PATCH 1332/3013] package/freerdp: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, freerdp fails to build with output: Applying 0001-Fix-variable-declaration-in-loop.patch using patch: patching file client/X11/xf_graphics.c Hunk #1 FAILED at 386. Hunk #2 succeeded at 456 (offset 61 lines). 1 out of 2 hunks FAILED -- saving rejects to file client/X11/xf_graphics.c.rej Applying 0002-Fixed-variable-declaration-in-loop.patch using patch: patching file client/X11/xf_graphics.c Hunk #1 succeeded at 246 (offset 6 lines). Hunk #2 FAILED at 255. 1 out of 2 hunks FAILED -- saving rejects to file client/X11/xf_graphics.c.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../0001-Fix-variable-declaration-in-loop.patch | 17 +++++++++++------ ...002-Fixed-variable-declaration-in-loop.patch | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index 799a92734be..ec1795364af 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -1,27 +1,29 @@ -From ddde652460350b962d32036981ff8ed77ed2f1ed Mon Sep 17 00:00:00 2001 +From 48f25939f4a48b01072f3cd2ece1e36a41c0ad44 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- client/X11/xf_graphics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c -index 76fbef5bd6..bf71b563c3 100644 +index 5aa1fd48b5a3..c8f24362aec7 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c -@@ -386,6 +386,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) - static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) - { +@@ -447,6 +447,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) + WLog_DBG(TAG, "%s: %p", __func__, pointer); + #ifdef WITH_XCURSOR + UINT32 i; xfContext* xfc = (xfContext*)context; xfPointer* xpointer = (xfPointer*)pointer; -@@ -395,7 +396,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) +@@ -456,7 +457,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) free(xpointer->cursorWidths); free(xpointer->cursorHeights); @@ -30,3 +32,6 @@ index 76fbef5bd6..bf71b563c3 100644 { XFreeCursor(xfc->display, xpointer->cursors[i]); } +-- +2.43.0 + diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 1a4e8994307..838844d6352 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -1,19 +1,21 @@ -From 4f8a48d96e472e43a5f856c449f61669792ce9fa Mon Sep 17 00:00:00 2001 +From b0b856590b523869358875594841f3e6c2919569 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- client/X11/xf_graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c -index bf71b563c3..c50726c8e4 100644 +index c8f24362aec7..c8b604cc6ad4 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c -@@ -240,7 +240,7 @@ static BOOL _xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpP +@@ -246,7 +246,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpPo double xscale; double yscale; size_t size; @@ -22,12 +24,15 @@ index bf71b563c3..c50726c8e4 100644 if (!context || !pointer || !context->gdi) return FALSE; -@@ -255,7 +255,7 @@ static BOOL _xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpP - xTargetSize = pointer->width * xscale; - yTargetSize = pointer->height * yscale; +@@ -264,7 +264,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpPo + WLog_DBG(TAG, "%s: scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32, __func__, + xfc->scaledWidth, xfc->savedHeight, settings->DesktopWidth, settings->DesktopHeight); - for (int i = 0; i < xpointer->nCursors; i++) + for (i = 0; i < xpointer->nCursors; i++) { if (xpointer->cursorWidths[i] == xTargetSize && xpointer->cursorHeights[i] == yTargetSize) { +-- +2.43.0 + From b2c2c485310c9f5d392cb247eddf4dce35c87e09 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:44:23 +0200 Subject: [PATCH 1333/3013] package/freescale-imx/imx-kobs: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, imx-kobs fails to build with output: Applying 0001-Fix-musl-build.patch using patch: patching file src/mtd.c Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file src/mtd.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch index ce123de9cc4..373b34ffce0 100644 --- a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch +++ b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch @@ -1,6 +1,8 @@ [PATCH] Fix musl build Signed-off-by: Gary Bisson +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/mtd.c | 1 + src/mtd.h | 5 +++++ @@ -17,6 +19,7 @@ index 1edc441..6d2264c 100644 +#include #include #include + #include diff --git a/src/mtd.h b/src/mtd.h index bd21add..debfc84 100644 From 11d2ad31046263d80da5ff6b36c3d25b1bbc0d82 Mon Sep 17 00:00:00 2001 From: Niklas Yann Wettengel Date: Tue, 2 Jul 2024 14:36:16 +0200 Subject: [PATCH 1334/3013] packages/openssh: install sshd-session In OpenSSH 9.8 the server is split into two processes: sshd and sshd-session which results in the following error, when trying to start sshd: Starting sshd: /usr/libexec/sshd-session does not exist or is not executable This patch installs the sshd-session binary. Fixes: https://gitlab.com/buildroot.org/buildroot/-/issues/11 Fixes: 4ac2cc5beec0eac4991fb28f286707a5659fa67e Signed-off-by: Niklas Yann Wettengel Reviewed-by: Nevo Hed Tested-by: Fiona Klute (WIWA) Signed-off-by: Arnout Vandecappelle --- package/openssh/openssh.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 6d846f64df5..7065c3ae4f8 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -117,6 +117,7 @@ endif ifeq ($(BR2_PACKAGE_OPENSSH_SERVER),y) define OPENSSH_INSTALL_SERVER_PROGRAMS $(INSTALL) -D -m 0755 $(@D)/sshd $(TARGET_DIR)/usr/sbin/sshd + $(INSTALL) -D -m 0755 $(@D)/sshd-session $(TARGET_DIR)/usr/libexec/sshd-session $(INSTALL) -D -m 0755 $(@D)/sftp-server $(TARGET_DIR)/usr/libexec/sftp-server endef OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS From 31135a07b6ca5d305d1c3f0010bfe838c4cdc0c6 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 21:29:41 +0200 Subject: [PATCH 1335/3013] package/libhid: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libhid fails to build with output: Applying 0003-uclinux.patch using patch: patching file configure.ac Hunk #1 FAILED at 80. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- package/libhid/0003-uclinux.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libhid/0003-uclinux.patch b/package/libhid/0003-uclinux.patch index cb3c45216a0..9f4502ada93 100644 --- a/package/libhid/0003-uclinux.patch +++ b/package/libhid/0003-uclinux.patch @@ -1,13 +1,15 @@ Good old 'uclinux is also linux' Signed-off-by: Gustavo Zacarias +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -Nura libhid-0.2.16.orig/configure.ac libhid-0.2.16/configure.ac --- libhid-0.2.16.orig/configure.ac 2014-06-22 09:35:50.277261742 -0300 +++ libhid-0.2.16/configure.ac 2014-06-22 09:36:10.688951947 -0300 -@@ -80,6 +80,7 @@ +@@ -79,6 +79,7 @@ + AC_C_STRINGIZE - MD_CONF_DEBUGGING MD_CONF_COMPILER +AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "uclinux") AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux") From 328721a6e053043043309ddc8eb23f9aae36bb72 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 21:13:11 +0200 Subject: [PATCH 1336/3013] package/libnfs: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libnfs fails to build with output: Applying 0001-Fix-include-sys-time.h.patch using patch: patching file include/nfsc/libnfs.h Hunk #1 FAILED at 24. 1 out of 1 hunk FAILED -- saving rejects to file include/nfsc/libnfs.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- package/libnfs/0001-Fix-include-sys-time.h.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libnfs/0001-Fix-include-sys-time.h.patch b/package/libnfs/0001-Fix-include-sys-time.h.patch index c3779f13a26..03193d6d71a 100644 --- a/package/libnfs/0001-Fix-include-sys-time.h.patch +++ b/package/libnfs/0001-Fix-include-sys-time.h.patch @@ -16,6 +16,8 @@ Upstream: https://github.com/sahlberg/libnfs/issues/272 Signed-off-by: Jörg Krause [Fabrice: update for 5.0.2] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- include/nfsc/libnfs.h | 5 ----- 1 file changed, 5 deletions(-) @@ -24,8 +26,8 @@ diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h index 09dcf1c..b6db58c 100755 --- a/include/nfsc/libnfs.h +++ b/include/nfsc/libnfs.h -@@ -24,12 +24,7 @@ - #define _LIBNFS_H_ +@@ -28,12 +28,7 @@ + #endif #include -#if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \ From d285e9efae37219dec7e5a4dfd013d611439c6a9 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 15:39:25 +0200 Subject: [PATCH 1337/3013] package/sdl_mixer: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, sdl_mixer fails to build with output: Applying 0002-configure__set_macro_directory.patch using patch: patching file configure.ac Hunk #1 FAILED at 2. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../sdl_mixer/0002-configure__set_macro_directory.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/sdl_mixer/0002-configure__set_macro_directory.patch b/package/sdl_mixer/0002-configure__set_macro_directory.patch index 9802333a1d4..cad9baa9c31 100644 --- a/package/sdl_mixer/0002-configure__set_macro_directory.patch +++ b/package/sdl_mixer/0002-configure__set_macro_directory.patch @@ -20,13 +20,15 @@ Fixes: libtool: and run autoconf again. Signed-off-by: Yann E. MORIN +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac -@@ -1,6 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(README) +@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script. + AC_INIT + AC_CONFIG_SRCDIR([mixer.c]) AC_CONFIG_AUX_DIR(build-scripts) +AC_CONFIG_MACRO_DIR([acinclude]) From b21184a87733f2f2ccee69cade6875c507e439dc Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 15:36:54 +0200 Subject: [PATCH 1338/3013] package/libmad: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libmad fails to build with output: Applying mips-gcc4.4.diff using series: patching file fixed.h Hunk #1 FAILED at 297. 1 out of 1 hunk FAILED -- saving rejects to file fixed.h.rej The package applied the patches in two steps, first the local ones and then the official ones downloaded from the repository. The commit fixes the issue by reversing the order of patch application steps. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- package/libmad/libmad.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 084a533cc00..9f3396b1a4e 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -19,7 +19,7 @@ define LIBMAD_APPLY_DEBIAN_PATCHES fi endef -LIBMAD_POST_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES +LIBMAD_PRE_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES # debian/patches/md_size.diff LIBMAD_IGNORE_CVES += CVE-2017-8372 CVE-2017-8373 From 89ba9c5a0b05f119d8f748f52244ebcb6a0dd008 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 15:36:55 +0200 Subject: [PATCH 1339/3013] package/libmad: drop GCC's "-fforce-mem" option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit fixes the following compilation error: i686-buildroot-linux-gnu-gcc.br_real: error: unrecognized command-line option ‘-fforce-mem’ From GCC 4.3 release notes [1]: The -fforce-mem option has been removed because it has had no effect in the last few GCC releases. [1] https://gcc.gnu.org/gcc-4.3/changes.html Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .../0003-drop-GCC-fforce-mem-option.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/libmad/0003-drop-GCC-fforce-mem-option.patch diff --git a/package/libmad/0003-drop-GCC-fforce-mem-option.patch b/package/libmad/0003-drop-GCC-fforce-mem-option.patch new file mode 100644 index 00000000000..25b685efd01 --- /dev/null +++ b/package/libmad/0003-drop-GCC-fforce-mem-option.patch @@ -0,0 +1,18 @@ +configure.ac: drop GCC "-fforce-mem" option + +As reported at [1], the option has been removed from version 4.3 of GCC. + +[1] https://ez.analog.com/dsp/software-and-development-tools/linux-blackfin/linux-bug-archive/w/documents/7460/5626-build-lib-mad-fail-at-option--fforce-mem-with-gcc-4-3 +Signed-off-by: Dario Binacchi +Upstream: Dead + +--- libmad-0.15.1b-orig/configure.ac 2024-07-02 14:26:40.657984791 +0200 ++++ libmad-0.15.1b/configure.ac 2024-07-02 14:27:07.098198997 +0200 +@@ -140,7 +140,6 @@ + case "$optimize" in + -O|"-O "*) + optimize="-O" +- optimize="$optimize -fforce-mem" + optimize="$optimize -fforce-addr" + : #x optimize="$optimize -finline-functions" + : #- optimize="$optimize -fstrength-reduce" From 1907ae86eabb942e30fa73c0f5127b2258ae610e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 2 Jul 2024 13:32:19 +0200 Subject: [PATCH 1340/3013] package/xfsprogs: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, xfsprogs fails to build with output: Applying 0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch using patch: patching file mdrestore/Makefile Hunk #1 FAILED at 10. 1 out of 1 hunk FAILED -- saving rejects to file mdrestore/Makefile.rej patching file scrub/Makefile Hunk #1 FAILED at 70. 1 out of 1 hunk FAILED -- saving rejects to file scrub/Makefile.rej This commit refreshes the package patches on the current package version. Note: the patch 0001 file name is changed because it was regenerated with the "git format-patch" command. The patch 0001 had an "Upstream:" tag in brackets. The tag was not detected as such by check-package. This commit updates this tag. The patch 0002 is also marked with an alternative upstream commit, so it can be easily dropped at the next bump. With those changes, the ".checkpackageignore" entries are no longer needed, so this commit removes those. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 -- ...o-not-do-dynamic-linking-of-libtool.patch} | 20 ++++++++++-------- ...-do-not-try-to-run-the-crc32selftest.patch | 21 +++++++++++-------- 3 files changed, 23 insertions(+), 20 deletions(-) rename package/xfsprogs/{0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch => 0001-mdrestore-scrub-do-not-do-dynamic-linking-of-libtool.patch} (74%) diff --git a/.checkpackageignore b/.checkpackageignore index 76b1c3c49ba..b7725077d3f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1576,8 +1576,6 @@ package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch lib_patch.Upstream package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch lib_patch.Upstream package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch lib_patch.Upstream package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch lib_patch.Upstream -package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch lib_patch.Upstream -package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch lib_patch.Upstream package/xinetd/0001-ar.patch lib_patch.Upstream package/xinetd/0002-destdir.patch lib_patch.Upstream package/xinetd/0003-rpc-fix.patch lib_patch.Upstream diff --git a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/package/xfsprogs/0001-mdrestore-scrub-do-not-do-dynamic-linking-of-libtool.patch similarity index 74% rename from package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch rename to package/xfsprogs/0001-mdrestore-scrub-do-not-do-dynamic-linking-of-libtool.patch index 9030a2aac32..cb30e68db48 100644 --- a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch +++ b/package/xfsprogs/0001-mdrestore-scrub-do-not-do-dynamic-linking-of-libtool.patch @@ -1,4 +1,4 @@ -From d5cbb4f43cc9c30100fbf18a3e0d1fb95e1c1b0a Mon Sep 17 00:00:00 2001 +From fa3a4e036c8c78325216ed21eff6145aeb186686 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 10:50:00 +0000 Subject: [PATCH] mdrestore, scrub: do not do dynamic linking of libtool @@ -11,23 +11,25 @@ linking for libuuid only. Otherwise the build will fail like this: ld: attempted static link of dynamic object `/usr/lib/libuuid.so' Signed-off-by: Vicente Olivert Riera -[Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html] +Upstream: Proposed: https://www.spinics.net/lists/xfs/msg36149.html [baruch: update for v4.15.1; extend to include scrub] Signed-off-by: Baruch Siach [matt: update for v4.16.1; adjusted libunistring -> libicu] Signed-off-by: Matt Weber +[Julien: rebased on v6.4.0] +Signed-off-by: Julien Olivain --- mdrestore/Makefile | 2 +- scrub/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mdrestore/Makefile b/mdrestore/Makefile -index 136ae716d691..75ff1bad78e9 100644 +index 4a932efb..7ea1fd45 100644 --- a/mdrestore/Makefile +++ b/mdrestore/Makefile @@ -10,7 +10,7 @@ CFILES = xfs_mdrestore.c - LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) + LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBUUID) $(LIBURCU) $(LIBPTHREAD) LTDEPENDENCIES = $(LIBXFS) $(LIBFROG) -LLDFLAGS = -static +LLDFLAGS = -static-libtool-libs @@ -35,12 +37,12 @@ index 136ae716d691..75ff1bad78e9 100644 default: depend $(LTCOMMAND) diff --git a/scrub/Makefile b/scrub/Makefile -index 063279400262..949f6fd8ba94 100644 +index aba14ed2..f0ef492f 100644 --- a/scrub/Makefile +++ b/scrub/Makefile -@@ -70,7 +70,7 @@ xfs_scrub.c - - LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBICU_LIBS) $(LIBRT) +@@ -71,7 +71,7 @@ xfs_scrub.c + LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBICU_LIBS) $(LIBRT) $(LIBURCU) \ + $(LIBPTHREAD) LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) -LLDFLAGS = -static +LLDFLAGS = -static-libtool-libs @@ -48,5 +50,5 @@ index 063279400262..949f6fd8ba94 100644 ifeq ($(HAVE_MALLINFO),yes) LCFLAGS += -DHAVE_MALLINFO -- -2.16.2 +2.45.2 diff --git a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch index 6778d069a1d..77bdc191270 100644 --- a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch +++ b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch @@ -1,4 +1,4 @@ -From 3a77dfc54271059dcac305384bf6ace34fe1f3d3 Mon Sep 17 00:00:00 2001 +From 94ae5db7d017480e103aa6f07cc86648b613d114 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 18 Dec 2016 15:37:27 +0100 Subject: [PATCH] libxfs: do not try to run the crc32selftest @@ -19,17 +19,20 @@ generator is natively built, but with the target CFLAGS. Signed-off-by: "Yann E. MORIN" Signed-off-by: "Fabrice Fontaine" [Update for 4.18.0: crc32 has been moved from libxfs to libfrog] +[Julien: rebased on v6.4.0] +Signed-off-by: Julien Olivain +Upstream: patch to be superseded by https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e51b89e657af7843d8c7aea3df49fe1f0f1d4ac2 --- - libxfs/Makefile | 4 ++-- + libfrog/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/libfrog/Makefile b/libxfs/Makefile -index 62608bd..e021625 100644 +diff --git a/libfrog/Makefile b/libfrog/Makefile +index f292afe3..1d0d2083 100644 --- a/libfrog/Makefile +++ b/libfrog/Makefile -@@ -112,9 +112,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) - # don't try linking xfs_repair with a debug libxfs. - DEBUG = -DNDEBUG +@@ -57,9 +57,9 @@ ifeq ($(HAVE_GETMNTENT),yes) + LCFLAGS += -DHAVE_GETMNTENT + endif -LDIRT = gen_crc32table crc32table.h crc32selftest +LDIRT = gen_crc32table crc32table.h @@ -37,8 +40,8 @@ index 62608bd..e021625 100644 -default: crc32selftest ltdepend $(LTLIBRARY) +default: ltdepend $(LTLIBRARY) - crc32table.h: gen_crc32table.c + crc32table.h: gen_crc32table.c crc32defs.h @echo " [CC] gen_crc32table" -- -2.7.4 +2.45.2 From 700c394b1765fd70cafeb3b59a280f1d75e822e5 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 11:29:45 +0200 Subject: [PATCH 1341/3013] package/grpc: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, grpc fails to build with output: Applying 0003-host-grpc-only-cpp-plugin.patch using patch: patching file CMakeLists.txt Hunk #2 succeeded at 567 (offset 8 lines). Hunk #3 succeeded at 580 (offset 7 lines). Hunk #4 succeeded at 1315 (offset 79 lines). Hunk #5 succeeded at 1368 (offset 79 lines). Hunk #6 FAILED at 1462. Hunk #7 succeeded at 2515 (offset 131 lines). Hunk #8 succeeded at 2631 (offset 107 lines). Hunk #9 succeeded at 3117 (offset 186 lines). Hunk #10 succeeded at 3202 (offset 198 lines). Hunk #11 succeeded at 3654 (offset 172 lines). Hunk #12 succeeded at 3909 (offset 184 lines). Hunk #13 succeeded at 4203 (offset 158 lines). Hunk #14 succeeded at 4263 (offset 158 lines). Hunk #15 succeeded at 4347 (offset 158 lines). Hunk #16 FAILED at 4281. Hunk #17 succeeded at 11110 (offset -143 lines). Hunk #18 succeeded at 11140 (offset -143 lines). Hunk #19 succeeded at 23153 (offset 3325 lines). Hunk #20 succeeded at 23250 (offset 3325 lines). 2 out of 20 hunks FAILED -- saving rejects to file CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - .../grpc/0003-host-grpc-only-cpp-plugin.patch | 59 ++++++++++--------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index b7725077d3f..dca72534535 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -700,7 +700,6 @@ package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch lib_patch.Upstream -package/grpc/0003-host-grpc-only-cpp-plugin.patch lib_patch.Upstream package/grpc/0004-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream diff --git a/package/grpc/0003-host-grpc-only-cpp-plugin.patch b/package/grpc/0003-host-grpc-only-cpp-plugin.patch index c68b096df65..bfb87130534 100644 --- a/package/grpc/0003-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0003-host-grpc-only-cpp-plugin.patch @@ -1,4 +1,4 @@ -From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 Mon Sep 17 00:00:00 2001 +From 0f2c73b62bdc612f9d5cdd8e0c765995470d4f8b Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 25 May 2021 14:55:23 +0200 Subject: [PATCH] Add option to restrict building of (host-)grpc to @@ -7,7 +7,7 @@ Subject: [PATCH] Add option to restrict building of (host-)grpc to This avoids unnecessary dependencies on big packages like libabseil-cpp and others. -Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) +Upstream: not accepted (see https://github.com/grpc/grpc/issues/25322) Signed-off-by: Thomas De Schampheleire Signed-off-by: Fabrice Fontaine @@ -15,11 +15,11 @@ Signed-off-by: Fabrice Fontaine Updated for 1.48.0: Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- - 1 file changed, 35 insertions(+), 8 deletions(-) + CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++++---- + 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d3963b074b..51cef83141 100644 +index 0dcae6b1aee5..57b3963a43b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,12 +49,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) @@ -39,7 +39,7 @@ index d3963b074b..51cef83141 100644 set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL "Generate installation target") -@@ -555,6 +559,8 @@ add_custom_target(plugins +@@ -563,6 +567,8 @@ add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) @@ -48,7 +48,7 @@ index d3963b074b..51cef83141 100644 add_custom_target(tools_c DEPENDS ) -@@ -567,6 +573,8 @@ add_custom_target(tools_cxx +@@ -574,6 +580,8 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -57,7 +57,7 @@ index d3963b074b..51cef83141 100644 protobuf_generate_grpc_cpp_with_import_path_correction( src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto ) -@@ -1228,6 +1236,7 @@ if(gRPC_BUILD_TESTS) +@@ -1307,6 +1315,7 @@ if(gRPC_BUILD_TESTS) DEPENDS buildtests_c buildtests_cxx) endif() @@ -65,7 +65,7 @@ index d3963b074b..51cef83141 100644 add_library(address_sorting third_party/address_sorting/address_sorting.c -@@ -1280,6 +1289,8 @@ if(gRPC_INSTALL) +@@ -1359,6 +1368,8 @@ if(gRPC_INSTALL) ) endif() @@ -74,16 +74,16 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) add_library(end2end_tests -@@ -1451,6 +1462,8 @@ endforeach() +@@ -1512,6 +1523,8 @@ target_link_libraries(end2end_tests endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + add_library(gpr - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c -@@ -2373,6 +2386,8 @@ if(gRPC_INSTALL) + src/core/lib/gpr/alloc.cc + src/core/lib/gpr/atm.cc +@@ -2504,6 +2517,8 @@ if(gRPC_INSTALL) ) endif() @@ -92,7 +92,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) add_library(grpc_test_util -@@ -2511,6 +2526,8 @@ endif() +@@ -2618,6 +2633,8 @@ endif() endif() @@ -101,7 +101,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc_unsecure src/core/ext/filters/census/grpc_context.cc src/core/ext/filters/channel_idle/channel_idle_filter.cc -@@ -2916,6 +2933,8 @@ if(gRPC_INSTALL) +@@ -3102,6 +3119,8 @@ if(gRPC_INSTALL) ) endif() @@ -110,7 +110,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) if(gRPC_BUILD_CODEGEN) -@@ -2987,6 +3006,8 @@ endif() +@@ -3185,6 +3204,8 @@ endif() endif() @@ -119,7 +119,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc++ src/core/ext/transport/binder/client/binder_connector.cc src/core/ext/transport/binder/client/channel_create.cc -@@ -3463,6 +3484,7 @@ if(gRPC_INSTALL) +@@ -3635,6 +3656,7 @@ if(gRPC_INSTALL) ) endif() @@ -127,7 +127,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_CODEGEN) add_library(grpc++_reflection -@@ -3705,6 +3727,8 @@ target_link_libraries(grpc++_test_util +@@ -3889,6 +3911,8 @@ target_link_libraries(grpc++_test_util endif() @@ -136,7 +136,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc++_unsecure src/cpp/client/channel_cc.cc src/cpp/client/client_callback.cc -@@ -4023,6 +4047,7 @@ if(gRPC_INSTALL) +@@ -4181,6 +4205,7 @@ if(gRPC_INSTALL) ) endif() @@ -144,7 +144,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc_plugin_support src/compiler/cpp_generator.cc -@@ -4082,7 +4107,7 @@ foreach(_hdr +@@ -4240,7 +4265,7 @@ foreach(_hdr endforeach() @@ -153,7 +153,7 @@ index d3963b074b..51cef83141 100644 install(TARGETS grpc_plugin_support EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -4166,6 +4191,8 @@ endif() +@@ -4324,6 +4349,8 @@ endif() endif() @@ -162,16 +162,16 @@ index d3963b074b..51cef83141 100644 add_library(upb third_party/upb/third_party/utf8_range/naive.c third_party/upb/third_party/utf8_range/range2-neon.c -@@ -4256,6 +4283,8 @@ target_link_libraries(gen_hpack_tables - gpr - ) +@@ -4393,6 +4420,8 @@ if(gRPC_INSTALL) + ) + endif() +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + if(gRPC_BUILD_TESTS) -@@ -11228,7 +11257,7 @@ target_link_libraries(grpc_cli +@@ -11085,7 +11114,7 @@ target_link_libraries(grpc_completion_queue_test endif() @@ -180,7 +180,7 @@ index d3963b074b..51cef83141 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc -@@ -11258,7 +11287,7 @@ target_link_libraries(grpc_cpp_plugin +@@ -11115,7 +11144,7 @@ target_link_libraries(grpc_cpp_plugin @@ -189,7 +189,7 @@ index d3963b074b..51cef83141 100644 install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -19803,7 +19832,7 @@ endif() +@@ -23128,7 +23157,7 @@ endif() @@ -198,9 +198,12 @@ index d3963b074b..51cef83141 100644 if(gRPC_INSTALL) install(EXPORT gRPCTargets -@@ -19900,3 +19929,5 @@ generate_pkgconfig( +@@ -23225,3 +23254,5 @@ generate_pkgconfig( "-lgrpc++_unsecure" "" "grpc++_unsecure.pc") + +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY +-- +2.43.0 + From 9e00cceb60e9ac8ec36ec7eb43eb9ef5534b705d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 2 Jul 2024 20:59:43 +0200 Subject: [PATCH 1342/3013] package/daq: workaround for upstream changing the archive Upstream has changed the archive for the 2.0.7 release since we bumped in c1f820bd88a5 (package/daq: bump version to 2.0.7). Comparing the old archive as it is on s.b.o. with the one currently available on upstream, gives a few deltas, mostly; - (C) years changed in comments - version string changed from 2.0.6 to 2.0.7 - changes (that look legit) to autostuff - a file dropped (Visual Studio related) Of course, that means the hashes changed, and no longer match what we have. Downloading the file manually and letting wget set the timestamp on it, reveals the archive is dated 2022-06-08T13:51:59. So, for more than two years now, we've been relying on the archive we cached on s.b.o. So, we can't just change the hashes to the new ones, nor can we replace the archive on s.b.o. Instead, we use the same trick as was used in c617ebbc977d (package/python-*: fix hashes for cargo-vendored python packages): we use the actual, real URL with a query parameter as the _SITE, and we set _SOURCE to a different name so as not to conflict with the previous archive. Signed-off-by: Yann E. MORIN Cc: Yoann Congal Signed-off-by: Arnout Vandecappelle --- package/daq/daq.hash | 4 ++-- package/daq/daq.mk | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/daq/daq.hash b/package/daq/daq.hash index 0fa1edecc2c..82323ed4044 100644 --- a/package/daq/daq.hash +++ b/package/daq/daq.hash @@ -1,7 +1,7 @@ # From https://www.snort.org/downloads/snort/md5s -md5 ea796f001d1b00302e4e69e337ab2460 daq-2.0.7.tar.gz +md5 60e5ddcafb985fac7374884d28f299d1 daq-2.0.7-modified.tar.gz # Locally computed: -sha256 bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e daq-2.0.7.tar.gz +sha256 d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279 daq-2.0.7-modified.tar.gz # Hash for license files: sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING diff --git a/package/daq/daq.mk b/package/daq/daq.mk index 8a5394a63c0..27abd4d2f51 100644 --- a/package/daq/daq.mk +++ b/package/daq/daq.mk @@ -5,7 +5,11 @@ ################################################################################ DAQ_VERSION = 2.0.7 -DAQ_SITE = https://www.snort.org/downloads/snort +# Upstream re-published a modified archive for the same 2.0.7 version, so change +# its name locally, to avoid conflict with older BR versions which had a hash +# for the previous archive. +DAQ_SOURCE = daq-2.0.7-modified.tar.gz +DAQ_SITE = https://www.snort.org/downloads/snort/daq-$(DAQ_VERSION).tar.gz?buildroot-path=filename DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES From 32aacc4737e106a7ddb2f2129d4ab9f2279dcf92 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 Jul 2024 22:45:18 +0200 Subject: [PATCH 1343/3013] gitlab: add default issue template This introduces the default issue template, to help users provide issues that are meaningful, and that will help reproduce the issue. If needed, we can add more templates in the future. Signed-off-by: Yann E. MORIN [Arnout: - add link to mailing list; - rephrase "pristine Buildroot"; - add a checklist item for "I'm using latest commit"; - add a checklist item for "make clean; make"; - add formal items for Buildroot commit sha1 and distro.] Signed-off-by: Arnout Vandecappelle --- .gitlab/issue_templates/default.md | 60 ++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .gitlab/issue_templates/default.md diff --git a/.gitlab/issue_templates/default.md b/.gitlab/issue_templates/default.md new file mode 100644 index 00000000000..c3f23e54ba7 --- /dev/null +++ b/.gitlab/issue_templates/default.md @@ -0,0 +1,60 @@ +Thank you for opening a new issue. To help solve it faster and more easily, +please review this check-list, and fill in the sections below. Adapt as +needed. + +Do not open an issue to request a new feature; instead, post a message to +[the mailing list](https://lists.buildroot.org/mailman/listinfo/buildroot). + +_Note: issues missing any information may get closed without further ado._ + +--- +### Check-list + +- [ ] I did not find the issue in the existing issues +- [ ] I can reproduce the issue with unmodified Buildroot from [this + repository](https://gitlab.com/buildroot.org/buildroot), not from a + fork somewhere else +- [ ] I can reproduce the issue on the latest commit of the branch I'm using: + - [ ] master + - [ ] stable (i.e. 20NN.MM.x - please specify) + - [ ] LTS (i.e. 20NN.02.x - please specify) +- [ ] I can reproduce the issue after running `make clean; make` +- [ ] I attached the full build log file (e.g. `make 2>&1 |tee build.log`) +- [ ] I attached a **minimal** defconfig file that can reproduce the + issue (`make BR2_DEFCONFIG=$(pwd)/issue_defconfig savedefconfig`) +- [ ] I also attached the configuration for kconfig-based packages that + are enabled (and necessary to reproduce the issue), most notably: + - [ ] busybox + - [ ] linux + - [ ] uclibc + - [ ] uboot + - [ ] … + +--- +### What I did + +**Buildroot commit sha1**: _get this with `git describe HEAD`_ +**Distribution of the build machine**: _get this with `NAME` and `VERSION` from `/etc/os-release`_ + +_Here, describe what you did:_ +- _any special environment variables: CC, CXX, TARGET, CROSS_COMPILE, etc…_ +- _the commands you ran:_ + ```sh + $ make [...] + ``` +- _anything else that you might think is important…_ + +--- +### What happens + +_Here, describe what happens that you believe was incorrect._ + +--- +### What was expected + +_Here, describe the behaviour you expected._ + +--- +### Extra information + +_Here, you may write additional information that does not fit above_ From 0ca30887794c0e9d333df7bcbb162f926bce3ca0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 3 Jul 2024 14:52:11 +0200 Subject: [PATCH 1344/3013] package/libfcgi: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libfcgi fails to build with output: Applying 0001-link-against-math.patch using patch: patching file libfcgi/Makefile.am Hunk #1 FAILED at 18. 1 out of 1 hunk FAILED -- saving rejects to file libfcgi/Makefile.am.rej Applying 0002-disable-examples.patch using patch: patching file Makefile.am Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .checkpackageignore | 2 +- package/libfcgi/0001-link-against-math.patch | 4 +++- package/libfcgi/0002-disable-examples.patch | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dca72534535..ca94fb56b09 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -809,7 +809,7 @@ package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch lib_ package/libedit/0001-check-bsd-functions-in-libbsd.patch lib_patch.Upstream package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch lib_patch.Upstream package/libfcgi/0001-link-against-math.patch lib_patch.Upstream -package/libfcgi/0002-disable-examples.patch lib_patch.Sob lib_patch.Upstream +package/libfcgi/0002-disable-examples.patch lib_patch.Upstream package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch lib_patch.Upstream package/libfm/0001-modules-fix-cross-compilation.patch lib_patch.Upstream package/libfreeimage/0001-no-root-install.patch lib_patch.Upstream diff --git a/package/libfcgi/0001-link-against-math.patch b/package/libfcgi/0001-link-against-math.patch index efba67123e2..909a295bd61 100644 --- a/package/libfcgi/0001-link-against-math.patch +++ b/package/libfcgi/0001-link-against-math.patch @@ -3,12 +3,14 @@ Link libfcgi against the math library. Signed-off-by: Thomas Claveirole [Louis: rebase on top of 2.4.2] Signed-off-by: Louis Rannou +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: b/libfcgi/Makefile.am =================================================================== --- a/libfcgi/Makefile.am +++ b/libfcgi/Makefile.am -@@ -18,4 +18,5 @@ +@@ -19,6 +19,7 @@ os_@SYSTEM@.c libfcgi_la_CC = @PTHREAD_CC@ libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/package/libfcgi/0002-disable-examples.patch b/package/libfcgi/0002-disable-examples.patch index 4a9916f02af..ccd01c0ce03 100644 --- a/package/libfcgi/0002-disable-examples.patch +++ b/package/libfcgi/0002-disable-examples.patch @@ -1,3 +1,5 @@ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Common subdirectories: libfcgi-2.4.0.orig/cgi-fcgi and libfcgi-2.4.0/cgi-fcgi Common subdirectories: libfcgi-2.4.0.orig/doc and libfcgi-2.4.0/doc Common subdirectories: libfcgi-2.4.0.orig/examples and libfcgi-2.4.0/examples @@ -8,9 +10,9 @@ Common subdirectories: libfcgi-2.4.0.orig/libfcgi and libfcgi-2.4.0/libfcgi diff -du libfcgi-2.4.0.orig/Makefile.am libfcgi-2.4.0/Makefile.am --- libfcgi-2.4.0.orig/Makefile.am 2001-12-22 14:05:39.000000000 +0100 +++ libfcgi-2.4.0/Makefile.am 2014-07-19 16:56:21.935216540 +0200 -@@ -4,7 +4,7 @@ - # $Id: Makefile.am,v 1.7 2001/12/22 13:05:39 robs Exp $ - # +@@ -10,7 +10,7 @@ + aclocal.m4 m4/libtool.m4 m4/lt*.m4 Makefile.in install-sh missing ltmain.sh \ + COPYING INSTALL -SUBDIRS = libfcgi cgi-fcgi examples include +SUBDIRS = libfcgi cgi-fcgi include From 3b3cb4e5a71aac0e1133a0f2d51984671ee958ae Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 3 Jul 2024 11:06:30 +0200 Subject: [PATCH 1345/3013] package/leveldb: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, leveldb fails to build with output: Applying 0002-CMake-install-libmemenv.a.patch using patch: patching file CMakeLists.txt Hunk #1 succeeded at 209 (offset 22 lines). Hunk #2 succeeded at 469 (offset 27 lines). Hunk #3 FAILED at 495. 1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej Applying 0004-cmake-Use-find_package-to-find-Snappy.patch using patch: patching file CMakeLists.txt Hunk #2 FAILED at 34. Hunk #3 succeeded at 301 (offset 22 lines). 1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .../0002-CMake-install-libmemenv.a.patch | 24 ++++++++++--------- ...make-Use-find_package-to-find-Snappy.patch | 18 +++++++------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/package/leveldb/0002-CMake-install-libmemenv.a.patch b/package/leveldb/0002-CMake-install-libmemenv.a.patch index ea742b0c497..25e050eaff8 100644 --- a/package/leveldb/0002-CMake-install-libmemenv.a.patch +++ b/package/leveldb/0002-CMake-install-libmemenv.a.patch @@ -1,4 +1,4 @@ -From 2fa960098e5b6f9daa9f7d6cab27188566859be8 Mon Sep 17 00:00:00 2001 +From ef03beb64f5e8028f6b5d65f75ee60e8b2eec594 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 12 Oct 2019 14:43:46 +0200 Subject: [PATCH] CMake: install libmemenv.a @@ -10,15 +10,17 @@ https://git.busybox.net/buildroot/commit/?id=16f847340d07dce620e4c3fc0a099aa7989 Signed-off-by: Bernd Kuhls [Fabrice : updated for 1.23] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - CMakeLists.txt | 26 +++++++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) + CMakeLists.txt | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a65afbf..83b2425 100644 +index f8285b82c6a4..ffce93b01ed6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -187,6 +187,30 @@ target_sources(leveldb +@@ -209,6 +209,30 @@ target_sources(leveldb "${LEVELDB_PUBLIC_INCLUDE_DIR}/write_batch.h" ) @@ -49,7 +51,7 @@ index a65afbf..83b2425 100644 if (WIN32) target_sources(leveldb PRIVATE -@@ -418,7 +436,7 @@ endif(LEVELDB_BUILD_BENCHMARKS) +@@ -445,7 +469,7 @@ int main() { endif(LEVELDB_BUILD_BENCHMARKS) if(LEVELDB_INSTALL) @@ -58,8 +60,8 @@ index a65afbf..83b2425 100644 EXPORT leveldbTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -444,6 +462,12 @@ if(LEVELDB_INSTALL) - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb +@@ -471,6 +495,12 @@ if(LEVELDB_INSTALL) + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/leveldb" ) + install( @@ -69,8 +71,8 @@ index a65afbf..83b2425 100644 + ) + include(CMakePackageConfigHelpers) - write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" + configure_package_config_file( + "cmake/${PROJECT_NAME}Config.cmake.in" -- -2.20.1 +2.43.0 diff --git a/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch b/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch index 714e1b08274..e254a26b9af 100644 --- a/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch +++ b/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch @@ -1,4 +1,4 @@ -From 450c1d88b3e1af34614294830b4dc0612d198d26 Mon Sep 17 00:00:00 2001 +From aa658d96f59d0e29f0d9208b8fbb3cce42e57edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Wed, 8 May 2019 10:42:03 +0200 Subject: [PATCH] cmake: Use find_package() to find Snappy @@ -9,6 +9,8 @@ in static link configurations] Signed-off-by: Thomas Petazzoni [Fabrice : updated for 1.23] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- CMakeLists.txt | 12 ++++++++---- cmake/FindSnappy.cmake | 31 +++++++++++++++++++++++++++++++ @@ -16,7 +18,7 @@ Signed-off-by: Fabrice Fontaine create mode 100644 cmake/FindSnappy.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78fead6..2efccda 100644 +index 436a9fe5513f..bbd179d3be59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,9 @@ cmake_minimum_required(VERSION 3.9) @@ -29,9 +31,9 @@ index 78fead6..2efccda 100644 # C standard can be overridden when this is used as a sub-project. if(NOT CMAKE_C_STANDARD) # This project can use C11, but will gracefully decay down to C89. -@@ -31,13 +34,14 @@ option(LEVELDB_INSTALL "Install LevelDB's header and library" ON) - include(TestBigEndian) - test_big_endian(LEVELDB_IS_BIG_ENDIAN) +@@ -34,13 +37,14 @@ option(LEVELDB_BUILD_TESTS "Build LevelDB's unit tests" ON) + option(LEVELDB_BUILD_BENCHMARKS "Build LevelDB's benchmarks" ON) + option(LEVELDB_INSTALL "Install LevelDB's header and library" ON) +find_package(Snappy) + @@ -45,7 +47,7 @@ index 78fead6..2efccda 100644 check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) include(CheckCXXSymbolExists) -@@ -276,9 +280,9 @@ endif(HAVE_ATOMIC) +@@ -298,9 +302,9 @@ endif(HAVE_ATOMIC) if(HAVE_CRC32C) target_link_libraries(leveldb crc32c) endif(HAVE_CRC32C) @@ -60,7 +62,7 @@ index 78fead6..2efccda 100644 endif(HAVE_TCMALLOC) diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake new file mode 100644 -index 0000000..88c1de9 +index 000000000000..88c1de98f228 --- /dev/null +++ b/cmake/FindSnappy.cmake @@ -0,0 +1,31 @@ @@ -96,5 +98,5 @@ index 0000000..88c1de9 + ) +endif() -- -2.26.2 +2.43.0 From b751a7b90f313188bd1b8d425a8a8082d60be712 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 3 Jul 2024 00:04:11 +0200 Subject: [PATCH 1346/3013] package/poke: fix patch fuzz Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, poke fails to build with output: Applying 0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch using patch: patching file configure.ac Hunk #1 FAILED at 90. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patches on the current package version. The patch 0002 was described as specific to Buildroot. This commit adds the "Upstream:" tag and removes the corresponding ".checkpackageignore" entry. Fixes: http://autobuild.buildroot.org/results/ace4a0efffb66dcebf873a2baa33b5edfe670093 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- .checkpackageignore | 1 - ...ac-HELP2MAN-replace-by-true-when-cross-com.patch | 12 +++++++----- ...b-getrandom.c-fix-build-with-uclibc-1.0.35.patch | 13 ++++++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index ca94fb56b09..9a7a3af757d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1207,7 +1207,6 @@ package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch li package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch lib_patch.Upstream package/pkgconf/pkg-config.in Shellcheck package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch lib_patch.Upstream -package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch lib_patch.Upstream package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch lib_patch.Upstream package/postgresql/S50postgresql lib_sysv.Variables diff --git a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index 85a76e068e6..fb5604d80ef 100644 --- a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -1,4 +1,4 @@ -From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001 +From a7e29f73dab5f9bd4fc7a2407f1ed2022c4ff109 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 30 Apr 2021 15:43:59 +0200 Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when @@ -12,15 +12,17 @@ Avoid: ../run: line 51: exec: :: not found Signed-off-by: Romain Naour +[Julien: refreshed the patch to be applied with fuzz factor 0] +Signed-off-by: Julien Olivain --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index a1943b57..c633f719 100644 +index 71b4d86..6487b57 100644 --- a/configure.ac +++ b/configure.ac -@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -88,7 +88,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else @@ -28,7 +30,7 @@ index a1943b57..c633f719 100644 + HELP2MAN=true fi - dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to + dnl The following Automake conditional is used in some Makefile.am files -- -2.31.1 +2.45.2 diff --git a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch index bd20b5d2c6f..db1250810d2 100644 --- a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -1,4 +1,4 @@ -From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001 +From 09758ebb191da659563b4c33334295ce21ecae71 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 1 Apr 2021 07:49:46 +0200 Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 @@ -25,6 +25,9 @@ Fixes: - http://autobuild.buildroot.org/results/30105094e39374ec6d4e47e2fb5e99696f7f7981 Signed-off-by: Fabrice Fontaine +Upstream: Not applicable (Buildroot specific) +[Julien: refreshed the patch to be applied with fuzz factor 0] +Signed-off-by: Julien Olivain --- gl-libpoke/getrandom.c | 1 + gl/getrandom.c | 1 + @@ -32,7 +35,7 @@ Signed-off-by: Fabrice Fontaine 3 files changed, 3 insertions(+) diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c -index e146873..3948d8d 100644 +index 19bb342..0251e0f 100644 --- a/gl-libpoke/getrandom.c +++ b/gl-libpoke/getrandom.c @@ -19,6 +19,7 @@ @@ -44,7 +47,7 @@ index e146873..3948d8d 100644 #include diff --git a/gl/getrandom.c b/gl/getrandom.c -index e146873..3948d8d 100644 +index 19bb342..0251e0f 100644 --- a/gl/getrandom.c +++ b/gl/getrandom.c @@ -19,6 +19,7 @@ @@ -56,7 +59,7 @@ index e146873..3948d8d 100644 #include diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c -index e146873..3948d8d 100644 +index 19bb342..0251e0f 100644 --- a/jitter/gnulib-local/getrandom.c +++ b/jitter/gnulib-local/getrandom.c @@ -19,6 +19,7 @@ @@ -68,5 +71,5 @@ index e146873..3948d8d 100644 #include -- -2.31.1 +2.45.2 From a45d68b3c40ddcefd14b4346fc42649e433e90ff Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 21:55:55 +0200 Subject: [PATCH 1347/3013] package/libsvg: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libsvg fails to build with output: Applying 0001-fix-expat-static-declaration.patch using patch: patching file src/svg_parser_expat.c Hunk #2 FAILED at 44. 1 out of 2 hunks FAILED -- saving rejects to file src/svg_parser_expat.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- package/libsvg/0001-fix-expat-static-declaration.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libsvg/0001-fix-expat-static-declaration.patch b/package/libsvg/0001-fix-expat-static-declaration.patch index 58ef286729f..1086785d0f0 100644 --- a/package/libsvg/0001-fix-expat-static-declaration.patch +++ b/package/libsvg/0001-fix-expat-static-declaration.patch @@ -12,6 +12,8 @@ Patch based on http://oe-lite.org/redmine/projects/xorg/repository/revisions/c4df7951e846e1be718f37f2455696a1d0861f3d/entry/recipes/cairo/libsvg-0.1.4/gcc4_and_expat.patch Signed-off-by: Carsten Schoenert +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_expat.c --- libsvg-0.1.4~orig/src/svg_parser_expat.c 2005-02-14 11:26:26.000000000 -0600 @@ -31,3 +33,4 @@ diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_e +#endif static void + _svg_parser_sax_warning (void *closure, From 4dbfae96b9232eb5aae8d9ce9cc583b02607246d Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 21 Jun 2024 09:12:55 +0200 Subject: [PATCH 1348/3013] docs/website: update Mind logo The Mind logo changed more than a year ago, it is time to move with the times and update it on the Buildroot website as well! Signed-off-by: Arnout Vandecappelle --- docs/website/images/mind-logo.png | Bin 10214 -> 39378 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/website/images/mind-logo.png b/docs/website/images/mind-logo.png index ecc3fa09e6a1d888b87ea573faeb2dc8bc0becae..5570d8f45e3852a32aa82ca90a66add3c03b68d8 100644 GIT binary patch literal 39378 zcmYg&c_7pOAODaLA(bOC(;P)q%8@gYNscZ@awSx*oHN%}u1aOiohzwSZgZO>a?Du@ zF~n*&0)gx|MqIoGfpE4% zAnaGT_k!Q_lo)D)e|R1uZ2TY)rDLowwxIXAfe?rk#Q5Tc8$sy{qozd?R+(}$@q>@| z2N`tBS@a}%?jI^uo7!)arRUMu$%`!)ZB~fo?7ec6r_At0)Zfe%{d|`}#fx8%<3Bqv zYKC7FLQWeBpB@gR9OUB(I^EcwcDMteFt65yUf*G^x?<_*3;i`V&p4hx#+q& zas5pL^<)QgM_HPt91OL{ScN*o2&y`Xk1epTjiS+84(3fj7!ZgxK}yPvpUOcgUceF- zd}<*(E$isUmVhCs0~&#*NVraY-Cg!C;I$$tp9MB<$3r8JJPzhMo7o9gwD zkM1E~KX%$3lXU5GY4d%GtPin=*fipiLRc;sYQ9C2PFD}A2otDW^$I-W^x{SFCSn%UM%Vg zPHM>wyYw~1*uG>@LU`#)s4T7C<56$!P(xNdkMgCXJgk9uX>d|z>=Y?@mJ_0W^-SdQ zMIK?+2X`#)M4_Ht^?HAYbhWb}eZkGP&vLsezC-bTqOHcPrTt@<_+-cGjISSAgHzya z8ms*4gQKbr+d1hFd0&M{=?q}!kN5#6IlzyB$Y zbGHhgrh$!kmFDaLV;pa=`_8yM!D{u_kma1+!C|Jg$^16so)A!j+A06}WVU+}Tzkk} z*T-R~mWsKPV?zX{SQI(cT%UWKr-OCizvQIc>LbY^!!hKme~NPrEcn4M8$*Dm6rDZ$ z_c%PR0?f+Lj3U1hUdpFcMgIE~*qlIJ6uCrr>G?>K_V~S6$}9C~{QMr#BK{3}%g|JvFf-wLff7#`|cWfQ9dS6NJuq zi)P&7W6G==G^+Og{{5_RzrgnUe#20o1Bm9W6({d2{6){eP&2HzL|N3EIqv$JH9fr^ zj~7R9R@4Ix1*FN0?zRdHR*QUrraKaPC=-0?{5S9-T*_^0IJ#AzqP=K9NmUv{EyM~I z&d2LsakmDmLHuD-ZjzB?=Qk&^krls;Tx_o*8Xi;y%|2q&r_6Cp zXT=EG%h$5h>69Hf#awAPw48i-9vhAsBHQUx-nM9JJ`a%&bg}y1C~Yw6lXS{aZMbU27?cD)O|RhPXVsue=mO943T+qlC}YkE7vui>GfzmKZ+CKoW2ac!L`0CXl^;$PpEIkDSLNrE<6*A3Yk*Z7R2^gvZGg}F^?nS2>RclDK@7I=7|e(0HB5vPjG$ps@87u~wO+ijOQo4NqoxZY>?c8Qmh_XQo`G zZ5vnPE*FB45Iz$i1b-Vs=}ce-ILbGK2PNNz!@hcVW_p*kXu9iofpyzW3bk(fa)Qy0 zqF_@lAY?7!6zm=^zomZ0hJ*i2SII4e*JE;V3alx$4}#Y#(WgB2RB*EtIDo6%|AMYm zeeE!AP-3G=WT|VU!+;XP^L%%{3YNj=>-A4&KwsZ-xP5QeFLbxR5NsMB4?QH=OBrIx z77k1%l!us88DLAm(|$#g2kUES@>`1e7bcV5d~QNS23aT8CDiRtv36y_fk zWd+Da51>a;GSTGkK+ZqVxmc~f$&7PQwPQAR6cOPimMEV9P4Ku8{nJyVLTjwz;c&k7;w zzS6_-N}nPsqVr)^GZx9xNPpn9lJ@ctc`Fu$`ve4mI1<|U!5&eHwuIIDw+wc*Rv37p z^54LaB1a=4$%f#>MJut}!#inlg(6Ga>W@mmM35^lG3j&jGT===zx)6Fhb+7yP;L*5 zWi)!?P*i_PRR8_fn)s*+(py3`+2_6I{tC}=rfQ_;)uYKc#>=!}owg*;_q~;6af|o2 z?3_JnjXcD4yj;DeVYCQVxN@cOu|bYl7ZsHfIVx9;MzmMkXKCnh57lHwI6H>Z*3(_i z2K&KwoS{LF*bo?uP|(OQF<-Cn+)w>c&%}M|b=f)h2N+XMTvEKJ6)^ocQc_vshMKrH zUKykB3vs+ZFrQb85)4-pX!SlD%3~k%a7XP1b&2NcM z@Dua4@<)xfRbe#wNHU~RI)Bh=L!Y}AZOXB7!h6+brdKu1gg1wy@j1|XLOe$6Mod;+ zuk6yvcX6lE2t~7!$K;{s;YB}mOov2j@<%%GHaeOR#}Z24aRGg90R!$VzP0mr(Y7vV zEA254CAA(MNQww6Wl)tG7sHb;d&9zdVJH{o;&8A4F>W{~F(tLafw5+KYKjMvLeLUL zr!Zr+Z3$1It8Z?DaGvs%mkUR? zIrvfmlN)RYx~HE{N>?y84;w98>iGP6e{<-oE=`^|P2RB+ZCtvDe*!omrJsd=u$N1LRkq)=`aTC8Fh@Kb-BPy2=WAEw% z*BA!q6+2N=)mm;JKlp~V7%Gbe~z_&DbYDjS*RF#?#R%`E|9T3gd z=nw3>sPtQv^!7p>>$rB>VW@FDu@=}-0MXfQGewxS@8?<)Xq{}_iJO0UiENJNf!}ce zVLF6&?pPE#tm_?A8eSRXW@m#4M;mMp4fbem4L|V>-C(mCgAPSFSeeH56Hvg z%7WYyX3yI7f+$w$M(cuL$ldA^<3xR5uynipEFbmy)zRRv=|XJ?A_W+=`=O5@aatez7`N%^9LdUV%;Ul0q6We*(WO`` zhE4bdkep+I27LUiUFZFL*M}``c|&nVz$2P6f$QEIixl3eB4D@Yx{bbws6pN!!P!m; zHf3&k9w&-O8P%{Ol+biT~Ivs18X6u1X(*Y$h|<}P{q5~KLrF-m9mOkYz51nyi{ zA1u@~xg?L?y2>7bF|%wFn10~c^8)JWjA&chf^5JUHcY*uhE#YdIB$}NlIbN- z9oVSXzpJh3K^1=8hyV7`mHH)+^cBV>%5Hy>S z7AL&Zav1X4*#4Hw@qo5o;^hJ@GjD51u?M@aYtGf~1!s^n4m#xMOje%TM?3~%$h3xO zFL1z3%{JP{K>iBEd43PtAyTlu-GLV(b%5RXL(!ssY}@~}6EEPkp`^zK6mM^xeF8$F zT#!=&ajRlKQw;eb#s@$a3c|<^FL7S0@cSsw>ONxDNNCw+%XtXqB}MGVM%~M$QQM*- z9kaWNkm4W^W^+!!y{{z`iVNP|e*{A%d<#mzhT49!9AmN@P&|?bSJUDilQ3);rLGj6 zgq;`DWQmjgz7=LXbFsJf z+x95h%IRpu-~?@P>ekBwgRO59O?vrQ!aa|hu&^ONrA6Iqh%w)hgT4w(cDD})A>V## zm$&uSl-oOu0*CAXS678tgHrKIV-};Og<*(sqaS0)F=xVp>gkpC1x*U_m~Md4v9GyO%% znRQ$1EzMR9_3f^SOkmQ=%_l;k`avO7L+iwM)iMXW%wJ!wSj_RfS<&0asAL6P+oRsY zR1MQ+ukSr^a?C3bOg&G#0*EH|#~`AqV&q~AF!if$Ncd|eZx&-QYiTA{epFMwt+YLr zJYj$vby?}5^}s9d$w4e)mMe!BKXcOAFyW~e_-}`-r^U_|h5M~6_j@aq-g<==)8D+w zJ+U6(+<%3F+t%vn`jh0j=!T2=0Ss?S_-wqEZP|4_en^6b9Y>6FWt}wSloFf9!%6V8 zJz=Z6CBCkB8|hRYcJw{@vI7josyhS|;tt@V(D1(`f_~ME!|hWzAIwk;fd$u50^3{z+*N__K1J zt+9O%S$Zs(x9EY{Q+-=@k#yneFU_e_PSv8@mDyRd>OsZde_(x`(>?e}xv z7qJJUaS+S#q7Lja&8oppJ8YfQzc_C*4GTpV$JMYZ)cgH1<4I+Qb-iG)>R?vI)d&aM zGqc|bT;J~Zwz5&*iqq$IXi#pDhU;!-@mdp9@{9_jWx>Ex$Ju?Qo`G3i@Ey>Gt;Ii6 zgzXM@7>XFT%1gutlY3dd1LSg^U|0?KsP_DH-sBst;jTYd|MTcR{h_|1BcN7f6*0jVXjZK9l;=6C-g$$=Nc8+UJht2Mnd$aWP&a?Y#aEuDKAA6K4Q*KC-c~A3c!UcCo|Z878{30LQeSs zq49uewb5W&1>#Dc-B9Aa|5pa48zBl=Qzs97?oI1m%flaV-D9j|gScU(3;l8k2 zES-Z6{-&87lec=n2}v^EwC#4^133otfk^Bu9O>*VB=Da$puD9%D@LthLx=H1{51uE zgDi)i?`FSrO<66?BsP_OSMN$oOBG;|Bv|Bllx((7vL5OQmM~N0RuMD{PR0&u0&#?? zrge6Em2$XgZZB3!~PHcS-i4<>6p5MS-T0?HIADK1&(B2}700q_^6{&Mc-7I8}@ zoSJNo8en0M10BiyG@c1{2wWe`*psJhH6-$klqYC^2_zPVww1e?#>rOgQgPNnPi~H) zJGz1)h)9e?$~z!7RUm0Q<$p8+5t1O;c^#K_0TIpw(3sjI9|(lwmxof;t^C!-`RVho zAs#u1^0;~(#0=M8+AA%Zcuq|y{1iXL5#su)VdFgdBm{F2JYW;FKK;i~631L-(AEw` z8u7B?_|S~c)1W(F%s>ngY3r8c!jQqpA=b!l@U|P4u+XsOblLJCw^fFm1kQ~&Q0EHp zI*kxY4M|sVvpoDhRha%)vMNWtgVO&@G~yi z3ak8Plez#@JIOw*I=Cj-%Gc#B4E1iel)meAZZ9SZ2xVOHtUMzaUmg0YQ5}Lg21Zv< zYRHuUdl0KW$xF;RIcBr!bC8d?1ZrTf-N_+o-7Xc4TZ6p81^B)bvU?zUZ}*TJ^Xs;J z%ZVaO3%c;QasbyLfHgbk37i*ILh z%m(@`2a9Y-ceJC7d#WaboYB}(5u(QdI*7LboeqRD*U`k^XTZyWqRg>X(XtG24)OpE|}| zTCrrl8bk^OQqx62eajxQJ@-T_W@-l(x$FTJ|D(v}s08ZAdA_?7Tx;$s?QHxm4i)y7 z(rmOl0PaXP_m@Sf#%}+0tYd=^JO9Lct0oWGxeghwIk+MrGt*{wLegR;ZJ^A1_-cZj z1Q!N%CPLz$cCf1*^+>FpVO@DyDp^kVrEdIoTUPx690z2Yk~%#!&R4mLt~^4xYa_~# zW>yjz{9PjZI59RV5!=Iq?7kQkot^o`MJ;$keSq5Kds;yVN&X1RTr|01b1uzsMFH}r zWPR)Nf_{jq_|6Nf!_fK(NejIFPy48-cuaNJ^$kE#GxnfqUbBE9~zeB;WIggb0KTu>iGVYaq4P z6hln`{o#Kj*{(ZLddvb+H{LF>5I<{0uw9O}*ucL4&}7wwGgFuNh>12Vtm^FnEXUad zM_Iz)G3LZbj@)iY5`xiQq{RWi24pfw z@CHhjvnBr-nj=Tb8kEoPW`|L2S!;mVkSJWRBK> z6v@Uq3VJ!>PZP95_4$vaC>EFpApS@CzAl!miOj$_AA&;p84!s6!{FYwSw61?aSD9= z`=TDd;Fo|;iFS_S3UF_6`M9Gvfy$s+Igs;^UO-t$Bo^%CqOaWpnMi2i#sC}u*Gjbi zfa?tjoUX?rPw~8pe!t^w{$uIL)R^`i(z4HCF97-f-B~jYvRqAt z90L%{z!3V#^M6_Z8rFJRyf-*3pwem98~8F2zu^6lYu_eUe=S*vTEsT^A-5M3F#Q#Q z=h^k_ztc7#LgiOgCelgAVC zlFYWLH3$o4H-?}$1S|KwrY`e^&M34Dev{; z^jmuT-y+PJu4y}u=rQrygZlxPvpzhAqW@4EM5jYIIvcviM|o|W!!LZCcVV=^=u-@U z23Gq>rgt^qFX#?~aIVh}UB}zGI-aehg%6^QSJrOK zoG)44TpSy(t2O4zaLwXvFXCxu+oH^kd*DlC=U0A|rW=(@oG=LRJ%*&~Ve~*ue zY=!VJVLRuUeJsCudttW8UaFq1X1Uq-wX?2qySh;#B{q~gS6A0dKCNtFN%L9S_*g2? zHGGk2e}1;Dt|9A)-EZKgfC{ZmgHEd}nw!}?G}^{Z%p0a>nvSW$bsxmtxN|A>@LQXr zq8UotcjY@>dqA=OcQIpSp<9B-=!fg$+C!M3KKH zjChUiC!Gc>T(sGLM(W9HG2sD^2AK9i9Il7a&AEp5V$n zkhuiBM3c6Q<(sZYcRz*Kv~z)FN5Z<7?L?Y<3x)K zajHI}*!UZSHamHpS(_AkgAu-Q(O5ExE+K17v%{L~Yl#g#v%z!hG}uY-+8;F$Z=D^I zt{aRtrwF>QaT2)kPV^ARelorVI)heMHWaQ1uLS54vEd)x)FzSb?WBLWcr`6&7hDas z!HH$gwDsouI$DI_TYAl-Q!CA>O1Hw5J&qk#so^bEo>lU9IjAgb4pba()leO@JvYvv zUHDbl)7yRs2aO~T5A<1Nw%I;I@4{!k<-S2ST(;6>~)m)Eb zttD#u^3XhmE327LhG{!Dp}#aKRm!U@ugA3CnUSvL+zznzY+i4W=A@z2y-o}jUbnp( z-VnS|loY@C61Vhv%4;oDw@mk=#%1gDeEunbeI#aYn*DR@o=Ac>g_kFyvwopq(8>lf zWnGTvy_Y%bB&;Vl^n7JOMTYKi;N@T`Q-c7~qSTZHLWfEIPR#a_>V$d*u+r$&%`kJ& zMm`DEMC{h`V^vYGhj3n=Rb?t#*`r|bl6}s03l`=s+2I{J6svE+?_Vm?v~%^;*k$VL z9Ruo-8I`c?____UuDs7hfa+l$5wZ;H4=TWwhbs&ObwFv1XU2DTK#}t^IgTIp5#qz1 z2D!G{%2iUZ>o!>qf8$&?cw482Ij7CL@9udpJW4zk89Nmo?l#b@p(PeAC+fxx=5*55 z`F-*d0<`&m!)RYBNI$4YcGN=ah36xY^_}x)evHnBg;tN(dX6tJ7%mPU9mv@tda243 zP1F;)+D*D=xK*!bkwU;iV#dMeKQ!4i8Zi_bvbR8RdI%!CG;7Sjx3Z5T>=)B_{JyL& zBWmd>iOPkvbJj^KC|cOpC|^2`Li?BCPSD;(zKFfa2U6ct1UWfv03B=py{o@PYva+z z=!_EGq$^*WW+q-IN@n$1+?B`zrETWNSl(05iYNg(3H6hD^?_zoWM5@R&uPFVXk5-r z?~)b(S_E3-6>|;Ocgy>?P;)49YKEx@=L#-QGqtZ(Md`S2r}~~Srb##ann3PtT=tsI z`XWG}lF@S7-Ge>V<(ndrU%)Z$rLyczpS!n*`Z|hicmdVYlmt%o-+=vWR$&1WU7TlX zzm*za>HRa(yw6LunzX|foox4zp(Jq0=HvF?niuD%o*RRgi@q6jTXL_Fe084;xAKFc zeRH63rn?OV`MbPY2m1hFU=unbo32$!=XgFF&JfFA=zlCRYB#$Cza%5YCHf`L!Qrk| zJ6aSD_ZItq4cW)%7li9LqNz9QF|+H*bj5q!?)N^Q1Fh+V+iarU1>1%BB>peki`_?% z$fL#}t9d>z>S~qgQD4VBNQ&}?z-p9w|F`ta(W7hy!cLrT;ulml zt82)sN#k~I1L^?v<#0F>)6=$P@bp-_H(zUs+sA4~}PEt742Z|7L})y(J$|9C>g!)3b7d zF=XX*)3@FQMyvQoC6DaGWm+2}0_YZ?wyq2amrH-{8B%k?jaJny#U=H@4zzsm)oYbU z8;eV^+ub1T`Zk~WA@p=l?w=Pb=b%x7_2%vBGlJ8CkWn^)KHXu2OYYjAM3ow`#^*&g57fNHq4YuOew z?KFL>TEY@a;|_r0cIRxc!1!h?QzoCe(?A*G(>ts0i&+URv3IBgNI|!(c^3;@zP;@= zSH$t-#_c=PWa|3s%8HmDBX2(z+;}%!^9G-uAFNaqd&qIhq-XJ^nt`2nx-A{6 z^%EtKXTY!Lz*5_G9ds6L`)KmR^lEj*l0H8~IAsd7Na>Jv56bZ;!nloaq<%q#IIWAK z8&0KXWud{hQGHcE7D{j9xm8)~W`oiZ8Otbsp#s{)z(n2^)rh|s|(+Lk9 zy5>4@cG8?VIcW;2ve?X*Si;|MGksqtPKd#QJ_z4ZbTE0Rqj{x?$L^HNk}KAVGt|?7 zRT*=ydy}~I^eK05?D1g5gX%b{$m<6cM{5pPPAuutHSt6@vP~|pZj@&%KQYmo%~9UQ zSZf_*2Fd-$(7yxXlpB`miVcEn_|@#MmxsFk;F(5ONsR!(DKY%RB-8eF#9JJY7ZAc3 zRcmGwfALq)rE6c)hsHmd>ToO-c7V2mh*lt0NFT7l2776i5!w(vt1RC8kV`8;b@gX7 zWb0>XoQ^5)W8>w{`6BE!G557W(L`Fhj>votHh-b#Q;oCcufLX-&9{h&_vt?xs)7yx zRCNcwwU6iwobYGnvx>La`afRSKAnmQWl04*d*hqPvykT638l;`;3#utB~BxA0k7e{ zYXEfm_^r5tssfUtF${HP3lt+2M^)fV3*VOf_xI@*qykT#?2cHCV=?5gURm9p=fc+@ zr{J*tjq0V>6l7l*0B z{EsSy_gV2|TLX?Iw%*RR6Fb7^3yJ<9snn>RdFxblTIkiDr4QQ@Zwe8ZJ6j`PRiOLbZ;a}^s=V;2UjU%F>nbrSaB?G5Y9%Q3Hy2c?CNrd{dJTybxzct^GzY zrDiHF_mt(6xlulfYvso*dX}80OPu(-XutWA#0>|!&vW+#oI(g`-3O_kj@^#!W&EAx zI#=l$I?aY^DFKu#7P|~6`34~St$ATb975~X+fGBAX?N@Dh0a6xdfmLk%uN;VJk?3C z7L$Q5Rcjft%s61*oY+7L%eer`?|2ySSc$Jw9^W*6niv+ADEN%^7DD=VfA_Lse6+hn zbT}Na#n~b-~~Q6EwF5=1?;J>&{%3 z1A!-Rxn@9~egbw#0lt(IX;C{nFW?MmP3Z0j`OOXC>rtc#q3$OZ;f_kJE%?9c`CL31 zM0yJaRjuvITF*4B7EFbQ7@};xa)CO%U{i2Xj3hf?s0TPtdP4Oq6oa3$@lBVsvRek9 z@ZwoOrO^b~8L9XxE#%5-x(<2t{7pz;5@jcE$H$tuD_%3GO|}yq`wVhrDaN zatSj*V}!JV_*bWd#EFaY{g%FFIyDIu?@u}U=3hAxTMqVJZyczJUi}3_trKYl!DJ%c zBIY)WH`lECJ_>^P5(aSAy&KiNV+OPuQKjM1AmEYO_7P+Cr!JjyHR2{7+j9o&X6=x? z5uk9%0CcF&Dl6UV{bkaOqyM^6Xy~t93LRmi_She72ecpu_8Hg9J&pfFeu>E>%UC;o z2M71`050a)w;&9b5I{T#qY=PlEH8u-I44F5_;lFeo6veLI(%hvp&jHzv5zUAc}>ef zyiFS4PcbHDvN<9IR#QVDe6yLoV@OJr#!~JnVNsIPehL{_Oy_lALJ_L1{pjlGy|en= z=jpJ4kdMS)P4T_qOuVj8-}=@jcpi=M#r!Tn3f|nin3+^C-c-Y=@)4h>#9dK=4^=>f#IC%Dt za!DO#FxW-MCUrvw0cA^gCQ`r*I2&_TgcXIMB8QUnDNkPmlA<5#SxnXr!)-nF$J*PX z-sy-B!0aY27gpJ_V{U{3;zlZw`&7Oy3iV1xB}9UnF3@i9l{5%ciPS^z)K-;+RbvUW zwZ~pprW$4zstq1X3qjZq83}koPU!%AFS_zq@7Vg*iIBgQLZbWNQ*SG6LS#tg4dvmO zBR!_AmxNAq8hlm%V8`B4gC~MX%}LOYhMDhXm$+o$ao;P}hNL0yru|r9*Ncc;(lT@8 z!zO_IBZeC&!TcrI4&+?={L2F3mEd4CP$YgE`xLz@2t)1cyf)O~RM}4qA!trknR2t~ zJ?N6=5*?5>xjl_<(=~RK$0jrjDHx2@kExcuJcJwMcf1w%;xr(SknA^q7mzQ%SbS@D z?}X*}wqk(-CkmDg#)cy|NO9q3_CS1bqiwZ|9r z*!LWK?pMcm&kIbA8U%S(b$Q)gk{4SRHvKxDn<&0EZh-I-zJA9tZ@J>(#S#`#Q!`QU zh&0?=C*FR)FXYg3KKcp^S0$|m#dS;})FAfIx9%9y3^qw3@O&3`- z__NpCzS9b@l6`7!()U=g>G_5!cbDlo!$xbOF6tVmU32h7}aC!>P`T1N=aM-!|+T7LI zS-N(@=I^i{O6tGDH&>)O)M>iXWr+(@|Fq?lBx}7r{La-b9C2C3Z>C~_D zjP)zIYWt+BH9K${ZQjx%^jV6Wf2M#E3He}wS#26vDuV+qpim@=x2;CUp!N>J5F0^i* z=*@jQHA-$811k9Cm)YxKrkT))9=cSS&Ae1O6*L#WCqLpaa@dB>IL&i7%v@Sk)r~e6 zmuMD2Vf~IOk+Zw&wgbIHv|gW%kVu*f2=~b+x-H2Hj0I-ZL6^d)TOpOHBwp_Jxj|AL zuk9dn6tp;h&aK=lee!hgF^&E0&47_t#vsLzv%MgGUb^pKmI%qotR>Klcm zd!}@CVOpzoBz71KxIVuniWJ4Xl^I(y zd`sCsD1EJeq?hQrE{Ux5fb%`L9xxK@Kv*S5s9Q2mjyLabol%hpUU60>zK?qt>Ohro z0)151S4?SvLr>(=XluzfdOwWR!~G?)W-0}k|7_l*Y>0H(1`hTw);Fz$(F`wV)tw`& z6wD&@B-==#`d@U10TRs@kZZ+2K2$Xb%V3_|o)X+q`rfkcCkZ4c)P8ZU;R0ZyoKO{0 zYZk%{4x7jFnyTs0D|L%HFEu&p{FIhZ`M*R~8Be|I^k;E@+n(mA)D{dVcEk=0bsIAR8*2>rpLN4c$)X_`3}rPM6Y#D11Z1 z>YMF#>#3By*p1#i6NLTRFKd-8ke<_1P@O^NBgy3v6i^s7Q9YSRBZB)uY%cKkBXD?3 z{mz**4VBisboB9RkPLY&^GeVuHt`J-IZIDB;SKMPq$C%$ZS9DKQU^}AiIF#iM4J>H{{i1`?@ z0J5^HuJIcOacM0HCtxTa!1COp1dPkv{LD?%q=$E5T;+7*_MB@;uz7@{1wR3F)lh1Z z5EdUF)zi=+cMx7Hi(sVslE%OKkbz?_xIdD=7zDk#C4%d;+Yzq709iHSwZr?VJ^$18HzMLjGFk1LSK+M}Z}LJHRb34dKzZ@*jXxr+!La5+f7Zgl^h zy{LU#^01%N5?Z01S6B7fEKAl`fRp;5oWlLS$;>?>VUX$g}IgT z^vI{KuOGop7RKn&(+5Bzd_)TF4ebK};bdsEsN}mFAwF_U_V})R!dDp-pP!O{dg)%i zE90cE20(+2C^mzBPH$~hhB72Kgc!D;`T*3UsQY(p@Z{}uox8yG|FNO2fX4p8x3|qm zuV&jQ0`jkei-?W4%&CM=n>U{!gUenqyFqxGxT06D;tP0=18=dRU%)M1d(~=Ir2*xf;wU6uJ z0`ZX7x$Xw;(5yy_YinU0Dxz^I#40yX|HevuaKD`8rV}!2q-Wo|L3>+{2e$kd)IHWP z6v=nL0WcqfEyVP3QS+OP14jF2r*woWD4(MHdHkzSo}^LVKU?s_xOD^vE0itH7T?<6ol zm1%{_q~7*@|E1;KuxH8TLT=)$8(=)|D)WfO{uiOT@1vek9`<`q#)PMTTUg1k8J!t< zg^~DheCQnXa#g$5LDbHQc@pFNjiBlTN+?jkP9Qfz^AU0YN5yB)Hb5L(AOA}`L-=A) zktE{rdhImu0xIv2!R8kM1yKOGdG=33aY6H_luRur|CJTq`iJY^4spaC&qRh@y~Fw8 z{rXv|%SzDtv{L2jtgzHz2VHbmSINH% zDrN?$e1Bb#+`+2>IwBH3I?mIbW60Wsm`ArV&6izXPo~h%R)gkw(}NN-$Ite&Dynia zQ2ZGM*od(spWX3KSO0$5vs4&6k$om`nw5b&G^(;PGBk{K2!LpRuOoC!%Oif{Qv0*p zKr*%_+{a7I=2Fg8$G3`Xa}>#KbAF5Bcl`Wen|7|+F$>=%rA%!G?bUY8eoDi<$W_Y^ z1t0=`d|f^m?ix@AuJh!#fKJ3E8F*2(IgEDp-1%|EF`IcGy#o%*x!xT`5t!|xFs>_c zz4ooDF*eI#LA7fbb%&x^BoCjAu}FsNBFIKI9=fB;u(yBX;4oBom}>PmL*RX7JoSB_ z-0KJs<0LO#p#@l9vHP}9crJ1-mEu-3o^>!;`5O^sE`00O^e<qacl5}{&F1PE zo#C;Yr`t!Ro`3%CHt?lFpK>dXBSi%N4zf2X`4pyvyS?`y_tFqxwcQojj}x8thVvjF2gKyv z*N#sf)Xg71_a;J$h_CRm{`-jY)a>Zh8y`*V{j&ZnXGg6 zUh1#8!rLPpd;C@$duzqWVco;x((t8hMgcbT@ev7c*6E(l`q58SnNI;179frk08QfC z%u``@cR&X0RMI2BZ<5b<^+%Nl)Nq>Pb5pP6pYcmPb7Et^fKy?W!QO+yi(Z0#th%CM zRSaC<%ZNMLcaWX(z&>Z>{(cGo-d@x1-*B#s*{b}m9~=$h&Mt3tHdq-Mfqe%$8dMtV z?h7R46dNrYnrQWDnzpA^{mE*qKmXN2SU;9f#1OLtY>nmgLW2AmUxZE&@i6X2pi>d? z^djJb&>7GAbpdyG`*?{jV%aus@HkRO3NZEMA03=}@Gu=$U@~?c1uH8nEOIlwBsdzl~`q?gFsD_qgv~_hhu>%?gyCAYTxwjU*rD&-V8iR_bxYY1*P&h z5Co)HepX~o;yt-zEbtshPkeWDRe8hjHd&RvIfuxpQ2++!MEflQZ+33qoH4lRV#fr} zbiEQIcPrL^y)4hSo9jm~jChEhTXIKV=~D(|BDVlEQ4wj8kIi%npm`{4bv^KP@_v38 zClvZWE&$8Bf1&ZQR{s;HRy=fD2^_*88|vEh5m_Oe)p~F7UiC2|xLA2jAMsIL+wL-V z`A(PCufiArg7r-7-C>b$(*3R;R=jc?9D$A=LPytxpQr$oOZLVU>;Lv0`3>^#Awblr z06+HKrDc-VK)9EMq1IF%-Dzs&BQ_&sto~TAju&$8pW?kJb2i&~+j-D;Jl1vVuA@HX zwg*da`QY;kh8?lPryOOxjc5t;l$+uP%;_VX#kM(5F;P1Na3TPE#AJ_CJ^IzA;|< z!e`y*3b^|OgmX6*04Gi$kMOUK2788{3*?N6|7p@LtN@4N$sG`tIWcR8+2HSPuJL{# z^BZX~0gBMonzuZbak2IE;n*x6=m`!A_90^I4G10EFOK5mY?DJVscU@sMS9hXZZp8+ zBnbZT<*yt9SF0U^_mD$a{k=00#^aM56bl6@fmI%&d$NGw5wpG&aNFXR@B5aiR(nGH zfq-fb#|3O?7fzwa4Xi06xHV9@Ie6kHz;U1bPtJFZlduF&=1G#MRqt#FxQ7X@f?wta zEU&InJEN*wIzJfkKif1SV>>8MFEh(v@w)un*-H1@oI(k!geg7;>-}g}$c}*BMs5RysNv>;%5xY5;E%wh_EXzS* zo>sl*N1bG+j9hq{D9_6b;7;J;A;xxa`SUb!o-uw9hSYx-D-AjXr(NSUv*e5cX#hQY z3dmkjcup%oxtvX=-916`(*>PC)2Vy^9>JOWf9C&20!P(^tPYUh;(__S&*NvjY6jdkN=D&cw&ALL2NlCEL2pGSU;ihf&@JbE~i0RC)i+C|rSzcexI1l$O4s!b* z$DVv2RCn`5#>{s)3o3cU(=PxF#^}--iergdN{Eeyy8Lv3s4O~S?yC0`H0Okl-JQ>7 zc;?#91Mn?M>Hd*p@FJ8FH*roe8@o+50{8SFjo&guT6(uS6e%38aalgMB0`_+>ec?% zK%q@;JE6p1O=yrig^lmm2Ps8?=puJgd`Uvn206UY1yImwrz9C3|6xRetMt&xwKlj_$smQUm)$`oa z=X*P;Lsp2t5@1tF6H!yQf6sw-y3bqZd2rot{Z!;bw;6MMdF*%hBfP}9KV)n8jl%3N zD4f5YZ{O*Q2+4`irIT=PTm5z#P@Jx;^W+vCn+Kl~343eLsK|_UONoG5y4P6s*h7}< z?VpMyA7n+|pxVsd4KrBv?)7Wa)C=~1V}Uoa@8DP<;su*t*y!L90HmH1ymS%Jzg(E_ z;}kr`Rl$$HjUJio%1{oT^$d|^bC}fXHSh0qbysU6#mN1cGqE?7n!v`-Mm}^u-dkA! za%dMk^@OYV%l}xWI+5h3=QYfu$N`dI5*!FEa=QCi*XG}Xn|kAsg7zUUCZpDuwJC(Z zn>(y5oE4W#mK|(tuZARJ!=JEH#FqdoPMUp~&fuyNk9-AExrH`XC{V=Oko!x;`g><3 za7BYw;I8ht?5PA}b?`Sw9_dp~UoJd!eqZ{7z3G%>mOtk0{gl}=F~uM)qA|4>L@jN2 zviFL3fc7x>vm3HfMQ#-^l;lfva-)Up)SWfo{ks@=a>Mg{>dKff*L2uuhTw5lDam`- z?R|cvMFg*E4!AzLqgG9CW$ndcI@Ri9#ZVNvX(e#?7?uE6;#$sBff6dCjpy(|%RuB; z;ISiXPnfBSOTm$5ARzfA55mxMdV{KI*xTx3W1z|bf5<_fVl0G9F5@A($z4O(SKW7z ziM$i_uNORYI+l>C2uFj?|7d34n+?FBGLM>CJUSq?blfo({Ar6$hV9~Nm4wkdO#J49 z!L!1+%HVXp(@qEUDW6S&Ik`8)m{X_Hf#Rtf=#7oY(XLRqt{+(o4l4)9lzpV&U%6B1 z#PfFV@FyJSLk8?YJ7E4u57^JWL%8IqXXiHXW!Ut{jP%|`9X!x<^Kc2N-LxvNd*%%9 z6$j167o+X2PT(MVKUny>fQ!b--J!j1jX%EJ*OUA+a%+4wzb+G`cE_uw;pPLzjh1xl z7vQdYz2m_g^rJ~Q0IT&`YE^vE^;P8tDlh}qKSZYGuPkgb!X*Fv_-RKF-}jvRoO500c|EV^b=_G%9MnnK;&iJxFJEGHBXjWO-D|Ol z@Gw=7Gdab2ALjEC%i?D2afNH$GgmLh_t~13l(3;Ie#>dTQmJr(2Fa`>{{~C^1tI(s zJm~%L^RY>g@NhEz4?O@#8O;jh`>V}e7nso^z~_j)(feL^MPa`!>EVIN{U%C?|C=#y zfA)2J(gl0OcY8D4SXRq-?bSR|`~gNbpc2?=eC+VRM555vvF95;s-w#+50-AfcQRm! zeoWZY>Z!IquJNN2DGX99lQu#}^*u2R8YnE^)0)}-o?m1=t$REUWl9?WTT|NLMwDRV zP3^V!IKUfoPuew18a1s{v;p(=q?iMu@^r06Q}%VNu?mO^6magW7wqRGpBKU!qoZ6_ zs{Pd6Xu6&#)KJMmgHf5Uf-XMv{&4~vA9!%j<|BDFC2c7OipJ>t15Iq|F-0>Gi1`ZJGSr~KQ8{t8k7$>(PXU_S4DRudh(ynfY8GE3 z74n58S9C4jU!jks>O$v$oFz?v&8%v1CFM$rQH(puOnUGf8Cy@A9T$lkSYIHv^dyQ< z4S1Q=(aSt!Qc}z}axeV}rMh!y(pX_@|HeVdz$!6>QJqzD_^*&5Xw~CQ%U-kVEW77S z+lfIQq!#|5{Kt)U{~TBCP|*1$-4~XIRgx3$YD^mji|qP_Q-1cr$&dOku%TX0-1@6S1a%V2;hA*0gnKJn<9We^$3nJak8mkv47o$x=dug zD0(XcuniW31`M&>dal`_vl|!9WB`|COJK7ti(UoEUol@gc6+ox=?LL8EEEaegtyV6 zjYTQ_NMUPN?alN4+Lp6=jt%3Y<|?y!fkPwz<@eb+gHQdP15d@-3&2Y`IY-okVl&wr z`aug^98NXt45aV}oPlGf=j?mX&tX83Lhiwm^J-~(H;BhtEckj9M>d*`4S{F)bQ+Be zjVe=SR%0{AK)h||E&*WiFITAN+T6&0p;;4%g|vv(Iy6>?*LeM!9mQJ?hc|xEyS&XaiRz%1la9Qu*LSRe-~b z7F=#562YQj{K;h4J1W9UxR|1|!BEA-SwsK42LKHHE8*Y~f(@I)c<6{Z`=|wDkTx zQ+H0f9`?oVCtMRE1+_hx9ADq~uoTVLSAXZi95C_#0D^wGf>dlBI5%k=O$9-J1X7t? z!f_lA=)_RXbsQI^4La-q?Z~ntJpf%7fZ|I6D7RVdcwT0SDEt}Y-$MzJaYwzVkNDdo z1`0{&Hjh>eJ}u1rGg{V5|K9JZtez$yT4gW2n(?T;-dh65VDW6WGl31_xuW1rr2*jw z@CKa;ZNeI04LN~i^0>y{;>9_3tRvvnID=E$dKeaxJOSJmIC8HW9LXY9JM?>jk-L=x z5iDGofAn-#_Z_J1gdsjjYx8Lw9C|7y?iv#H(q^YEv4F~v-AfnvH-0T3a<}MA&wfz& z5EOqQA7gC?{MYBaGhVwWxQ1TEB;mCcey;m1drPB1M>=^dsnoHhpB+BL|99nf8elOH z|BHSdrj}=tAO~I1;672n6WHpYNiTD2gSV=cA?+e6v(vzjkm3Ob{T}zx1$eO{ZJ!Sd z4tFX+qPIt(BbjhHRa zRnoO3V8^%G{5OQup@_mO=zb~qlgA4XG2l)vkecylRM=1Z(GhDjaEqOUG5-q->`0ZP zb@W9tN`0{Srm%|uEWM*~nfuW*bD8{RFzOA-NXPAg8N4#BeuY*mp-|gu0%pB<)3VN+ zyY1t(SY=5hP|O)CE&sqHpgGxMGh9j3sn)>iA=DnVTt=e}J833&%1 z4PLQ%Dk03;^(lyvMmf>X32ylh4ZCEg!gkgfv1?ajJCmN!0W;MCD^Ioi$KYd}(t{9` z1Hq}3{czNC$u7=f>ej!AXX)P`65)+uPkw`44-(q#m%2#)m<;|0^Eq&R^vwq8)UW~+ zY#}&#Ko2i&8xq5U*Kl{9q{{fiIlI%-U z>-?L{3oC$bIxwLpIksLywpb(;q|xK&*A$>32oFWg9J2dtX^`lx|AGMaLr41G!}yKh z7febZfrT)!ww)o-GakTe3*x?_6kIJAD@m(l5~zNdYxSA&B*LQ+tP;6EokB8r=Ruqi zNSfCK(v7nku8V^kFM;kp&=Pt#*MQH!ir^>7JDLNx?;S}fsIa|Rav+7FS4IgTi5DF@ z3Cjx`A71=NmE6h)0ZbBQLpOY{EnY>z>>bn(WMFw`e|U!c1Kcl9LLs<0IiRlI^k zSJ=S{{RXC%tKhmcZ@w8q%#Zy9!2SD9y)kD?nKz*RIi~*2*YIk<1KZv}Z3HJfTsyA8 z+!>m=rG5zJ^qUYw%I)*OEhqNUNMJ57m1eONf5&_P*O=^YhWL7bOS9x`uEY+Q4tOc= z04a9e<{i>ns0^8?IL>Ks*_E`bcC`jxtFQrl%@?D&m%7%|%03^t2-rKM{w`ik+^57(EN|!9ndO? z?Cl6BTulMp1fyvgbzEHT_vahclrTU2Y|CPAg2ioCCkxitDl{P|Jjb?#RK5WE>gS>EmrF<{T@QX zZI?Il|2vpCiZ<+VO@Kc`I~ShNRW>l62U9nP0`;6B^Z|=+xItd1kfKX%D)^%g{XJ1f z`e);`yFh-~Nc1Gw2TD*-h6C>iG@~Tn7TR=rvl*CoO|woy=_>y%+tCP3mtreP9lu)?DR4WbqLJ+KC z9+XBOrtC?D4#h}AMYRx+^Q-!uXfqV1_bdwg zoseL5R?$#An0NqdzXQQT2uPK1fKY5tXuEnBw2%S%U=L&)#}C|gIS}J8C_qC{aMNY5 z_g=Y!0|6*t8dDODebztRkKg0e^93rTmHO@fA2c+6O5koPk%o| z<(JuFk9)YG@pF=~f_Uz9@AHCg3x$dlr2XTuxs2#&IUyuf>DR5B#Koj0bzAD`vkf1! zKL!fERICE-fEfyKr<>GE734n>m?Db>G_ouWq;UHX^&YncWFLCH)fz_~UBuze|F@dr zK<7(czqcvgFhOu^r2)X*2hT8!#zhkbOs{i`kKs8SfkB`wC!@so_yPEa*C`4D@;BxAe zbS|^Z1`7Iok7d=hsb+<^w#`Wi^S5LRd^|2Ap&=gOo}Tb=D6k95L3-tc3yY9oex5*( zg9h?o8EVM1>&W+g+2Bplf-`bK=%GK#>a80lXTt^FY4*8DtW;WJln9b{=Re!IC}< zN2Y0c*>@lwQ>}nGPRjECy}b=0Uo+6=<9@ zwE(5s7b8%c&eaa4$*J#~UiA~z{YaEDMUl=+ znHs#*2GCXkinODS9`vbU_u_7^cgs{Gog%;Nfu9h>9ir&=T5%0jpfQbjihF84 zJhY_g7vBYTK`7M3L~J;ppu?H%HXmoq+FL`G%uH<_)~sLqSgeCl7+@H*G`MK_u)4dEw& zTY<;J#Gx*UQX-ys6g^2k#omvf;<%1TKh78>@Jic;mGj>i$C8}c9cXuKdJNSbYcPMaNHE77-(I z;PoQn2Lu8?j|(9C?wevSEMXpXmpAr@ri9H+2AZNQxZitm>VXL5Z@13Kv~rOvca_57 zA#7|T1H>qsf7K{6Wd%fa@yKG(x$g3nOI?Z>z@`8J_9+(oR@}GbTEX;$#Xq^rjn~DOOX_Oa{zq=CViuu0KS@OZic)U0ysDX&OGs??a(X zR?0?{h&sU-aUs|iT{0dH6%R1Ar-sRWhxy@+~{ej08&V7teG1t72q zdl48W8Do*mtrArR07L&5e%8I_R0mO`w!qO-4i0Xi{}jbC98UH3z~!YBqoB_;6Hmr@ ze}^8Oku^|JC?J`de)(+mUqJM};rd=FRQwgF(~*iEonvN(;Eq>#fvMT=CJpyeFWy!H z@_G!=BZtZwzjubH2~PnhQL#QZI2LKV5&VBl^F9&LkitWo;#3!bcrW^c$`pzVhk|^`8 zU8%%SDq`|G%@aCd;oF;Yv|j#?WTL+osw!~2C1auZN8X7%^XhSiU(A3}u^9;QF2~cI zPhE}8sM)Exayw_Y_YO2GBQw;kx4sOj7K}<8w)$C7LIZ4v>;~*!S^3wPMqzJmZgo4I zJGra@#RclhAv+=?&TI{iLeLe1XkG`ng)bH%p}3uPhhsbxO!Zsp;>Y9+VZtFOgKnKi z{H7`aq2*BT8&XB+is9L)55$I_7Cb&P6T!ThF5zyLQ49)hji=kxsIuS(i`i0)jO~Gf z>tlPO8dX>HiLOe(Q63gg;OIglLZ!P3TbVxz$C2F+D?rJcuc0k{ssi2t#=cx*a#rK|>7W#R zAyS|NUU<)c!>1+96i9i~JsMKP^$&92&9V|Jho{m1W%NxDQd3Dk{AROOUv@L`dhEc- zH^8Tm)m}GMEqqPYB@)ckp@4e^?=r~9jH%x_>1P}o&}x%fbmPz8Ycc7Sy$9NsYh+{w z$83v%yXfauTa&W5aF}WvyLK~AV*K!~G?NO4H@bD&3z-Yb+*Q&YHv2zsCmlPG zz`(yXV^&zph`jkLS>E9s_)9^KW}XiA#z#-3QL$}-*vO)B8p<$XYwvOrza zhXe!3YQ0Ch-X1;rS^8Rqt;!#A@W#*%Joo@CVw8cz(ih+U2h$lLzH!`rZeTH{K%S6n zaKT;PM4g}RuSmv-%}UAG084B|Aw%ZYD##Bm@|urD`Ycj(h2d9XAwKQ6Q?6E?R$r)O zj62be=UQwozLB*K{EnWz^}l9&$Z;=33IpN5o+P=EVmSI0J31W0yY`8JFPB!(qzoEg zxwA^TH$OjHtX&)84oBc-Um!!$OzpUPLEktpF*Fn6FqwkR319{hRuVnRmsrwg+e%}lZtaqkZJZ^kMEg8^qU z*{7{K@&hdullpO!ycmD?CuER=C7O%&RAZv)^s!bxAZV16Q^09&lUml0ktsGMytr{G zQjMHJaa-^*P)-f>fVZOxLxp#?&O_?Nn>0w*hWieZ_JdJs!4JVku(=>Hyo|A4y}300 z=NI|P!9V1(P;k%%qFF$s$!(+_~@$MOS#2grL64 z>}ZZKw0Gspy{v(qZxJ3hFLk-4R$KzrIz1T+|Lxd$-Lx|Y+Oa@62Y(9jNl32|>al{F zpRJy!Gr66^+J8q45E016SqZXa9H)Lx<*qrrYhheH1+W`rcw_auJE3D@>}aV%qUp$U!BT6A4X~CgsyrYj40l zOur|Zeuo2lXrBk7!6qq(U)9UM0`nlp!8Lb3hM@`*WBfJSg9J!pp4TOC>XnE5z6{x2 z))MrYIZVtDAIOpBVftOz{rwzK32Ob(pk`yB4<}9$@x*aJ5#rN{q?NV42|uc|S#b(_ z{@?DcEI6j?XN_e)#+*H!V*Uc4tT33>_+U^IH1LLU!zEJ|m}*Y-d1 zhm5QK!O^xov_Jw>`P?&AX(DaG%mINLu~vql=$eWvvTxz4^%<%UnC({AL zgbL8C>iGK22FK$bP18{D{9x1_^vXI(qw=i{&4vQM#pyfCRf1@#93jn{hR)gQ{uPmU z`ny+S{iNp`DZ7;Wb^J(cqOt$doRbSo@S4`ZDj4(pqR{#K1w!zo3pWCVlqDy`( zDCh99`u_~wQ$_{dt$_QRX@aZY6_o3d;dSat|9KhSR8f^@1ndf?#}$Ig_KVZB!Q?^U z;vmaPMlDJErvNy{Io#DQ%oz0E-7Kcx{B|p@G;VUf-em#EUW|ZXu?1vz%T+CK1yp5qhp*IxTW_bF#_42wYxbo?Rj0f#B6NP zsEk-@-1t57gTmoZ1suNT|a-FyD5=#Yk zb|v}(UjtGtmz zc}*YnQ~|eRVZ8?S28hnUw__%OgHe3v8Wqc@qk#Jifw}s8kZM(4sscHz|K?krw2W`v zJdA?;S7MHS3iur1B0^B%07+?O#x#oXu-lWowp0|UofDblm0a?b)H@vP(2NTTz~>IA zWy(vbb$wyr49=;Xiyt82+Fy^;z<#@-fctsS3%~{mSSh^2@k4x8gH8!7GP0fey9}k* zKrh_HTon_Egc0Uv=&4+ixseVy(n8AT0^i9*(KT#$m#Rz369{_RaaMGv-wpUj4ItpN zyByJZYO=mJLhK~z1Oic_mLA~{pF<&0&l%Dv|M?p$U9ji0mF(mvzPn*7$z8&%R#zEw zv}}5c49Mn$u3q>X=0gzPhvtdat(mR7^ zMH@@Z&FA+r#Ckntr(WsAa|vFH^_w6Knrw7*?HnaScX|e#FEk-i2_GXjig-?_s=UvC|d49;YTN zg!$dr59Nq{(R6A+WTD2;{YQE4h=(~Iqt5A-;OyxDg9&_k>g~zsj949_7|s#Z^X6D8 zj>s*4&dGSrBqhciwGjJor`V9Je-NCTkrZ8t{B;c1{tpkvkMDUZuu6GbE!hM?e9${L zR4HsoUVzLfX84Sc*dX|@MIev#JrXRJxzLlJveAKFRyX+`JgB82S4}#ijr>lBe%75F zC2dEV0)Phm)WT3|2}ZoS3M&8oZ!Zlw>I*Pt;C#iDRhq`?QQ6>ku%zEfEps{JqYKcP z(kY;Op|=v_Z%q`u@&C{VnS=c7#gDMe`6klafvu4!$RTG(!Vuc0vck7&dsXBILlB?w zop(c*Bf?M$9Ucs^(a9iwK7Eh!Fit&Ju&>R$68goIa$1gt-AJ!00!n=rGmO-7U<| z?=&{8J((WH80+fR=<329la~bhECT%Kgk&l|XpQd<=jS`#KFM-eC}A>nDVJo8(O1AF z#Wco3iaWKOaA10Lb0kPm+-~OgX^iu$1B^~rS65EiAIsh*NBoI7RM*ulNzOUY>EY!I zo-b)t{G{9vvJS1RwMkyW%QVBpkzgRO_Fnq|5!X@ET*=#bb=Lh7cXeRyuk+`6%by|K zZH+fS9N61zYJi~&=opV9$2^W9!Ypz-jrsX<3Ij%$z;7xwq_yD#+|7B{&qW|H^-(LV zG)#-zx6%~fnHRT6E1wug*$jg)=wOMmYwwgm{V8u;TGeFs<>8ny44vf+$s=nAX)TC3&|CxFAr|QJO*L`bugHgE` z4MHM3J$4oW+P~7a!4Hrgz-}0I?XJwNV6Z{8n(AYwgGdfkgDMkK@F_((ZOPTdJ^uL( z9FDq4`n3m3jQ$NpT$3w}+8Af_rG{bOS>Y1E?M2O^LKJZQi*&N3rzqHYsG@zaD&lQp zDyChkfRc_}gB+!s6Vv$8g|zA)Vp2P(Ls4n(aPn!#05%M9>Yt(-e?0%Tr?*`L@khy=dfP;SYVw1W9Gj@tu^gLOarN!*$4E8gH%>A2Vf=ZbnCoS1 zO3v25v$QNULk5MRZUZvk6;>Is;SJ1d830%{YV>oQ{&ydEjV1HPdqmt4lgg}s;dPsqteB}r-XjpI&*NT z626OgCZVefTYZsIEpQ~5c{S>x&Rnq5#<|ic>Qb7?}QRZtw$WHlAP z7)?Vu<=*Pr0Y{Mzl2>-&Ul_z9I};40k_P_rC-T=YfPI5i3%G1hTo2%Co;vB|asJ)p zvpK3a7T5TI-={o09mRjw-1Mr=u#_)AUV-56WWyo)vdz>d?iwY2YymZ!4=|JC-i4S$ z#O6(GlX}43735;cAeEiRYJHRJi`*i|ZF1xSi|HA;vXT?~y5q{d@2)A?(hO@4}oq2QVQ7jdD9@B7|Z+D454&jMp=LLl%NMab#UluuT3 z(sJvEv!iV=f>{lXYap?d&g9Wi*ZSNAZ{zU+eABQNGYsAysj{EmuxnpK_z^WwMcfW> z^0P7?2aY0@!r_6Kx|{n^lnl536oJ;sEg)=&HtKU6a_gU800lY>QRg_Jn1W<&L+<$( zC(m6^pU&}Jf*!~qMX+7X>Sl6lQ6V!z$Fi5?4&1gBIrMTx)!kisAc{ZC_A+)e zqU)Fr|jLgLJ1TmO}t#fXL!3r z5dtEL$kdVJI`#l!G_mC$xd=h-B!k!ty&fP}H}d(N(`Wqjc)I!fWrlSr92Vp+4zSnm zkUyqk(k?l4+E=e%6__2Iewy_C9hUNM)~9rEKVO(PRA>!rYuVmk}pXcBhdF{b9|4FPOWeRsHqqp>Ex{ zi)zYEAuMY9=z|Y8Q9NYf(4({L{-IZ)1>7W`P#OU^PLjTU+eS+`k>Cu>41y)ndm*OjmN?__9!ng!=HOOJ6YcCvNT7apPf8B(1-t zL^FPGGgsU0V3Ih-ysBQy_VHQ(){)EPiY1(_FsEc(u)(c66@eR^t!j@5#$?0T+xEIV z*`kl&Cpbg#xx-~x?TPdayk_mV{qfEI6y;`!e%fvr1}-qdt^d=?MQSy697=pp>ezva zjkq+?JG!lx!0{)_k|#NZ z$hik>32)521E+%*d{sAHY@5a*zX%TVQa>&QW*j$`c?s;p%z2I^S?mHs$(>SModYt; zS@WG`YC3n>9S~F9RZ6@N`IGBH1nqV1RLpOdis;+@5kd}o3oljQ2U~0mP>%;2l#sW< z+TwQ)rKSV<@eO+8yFHt%0sWiITd%P)O%pz@^Sjyv!yTuvz2G^PL$g-6{uIhKGX^TSei|aO&vlNW1o@p{@#>LQc}`2jeEX z61w7-6DRD#)4wvxM}lIU+NuXGNWjt~@%kdKp@Y?-fmO`qpH`Q-|eTu~3vB zfzRq+ogak=?`HS)*Qw)F z2?2f66XZ)pT+l(`T@LnSy6x_(v7j+wiv$xRZ5LWL^h{H#a+A^d#l}*CgA&4PwIC}j zy|7W)zBnaPwt*btHoJcuzw+G|{iHv}->D%Hx7~}79#`+}*R)#|x{3GeI^NZh+wPSSISgYX=J(VPYP(cTs*}Los8VI+n=sY&0{Yh=CgKF+DxzqEOe6unM-tHdIyZN zPtAK=A}95Pnx!pdnF-R>-r;3~IjW`^kHSzF`ir71B{iBSFh=p)FIVDkr#u5j|)Nl$f4}g=hvAqEJUex<7m-kkGihC?cY}Z?CkHLYE*kt`TXl= zSH`(TlsneDX;&0N5WhqWKgW2opQf?LM2P;J+nCE$I>X!>Om;9#4=+`}{^#$pp2U zIWOR3PtwiOs!!zcyYJH?(orAhUZ0XqCZX}kO9$4YGnxthrSbQFz5Ez&f|KC$PO%a>$K|MP z?WYF)<3D_261lcmhicn?5`f|&J%-k|-{Ozw@L}KLt~-ZoI_Nl$ib&M|I(Ktd zU~X??F#%~rLnoE!UGN$ieQ^is8ffoHjvAG>mZ9fi608%x8p|EFV>A5vBb6#_Q)q+{ zFIO*rnl@=)JV!m@`s5S%J|UA+?F-Yk6td`nZzJ8yDM)9x*r6+x@GYVr2*rW}PsD=t z%bJjzG()kS>TBhJdHJh>4#_$2`oqNh{1b8d*{lRT1I3bgfE%s3SjXIl4f0r+wLZAiU^W&q(Q(Zo9hj+TPJsM=mF@i<#L3+Q+y8ZZrkjgdq+Q@CB~Lx!&EU7?|qQ zSDOLN&s8a!ps{yaQn#%J9F<<#B7iHxBn*s2V@0ATeP_y!_%x#g*n6o#KIX*6NmEoLoeL{*z5#qS584b_ef* zg$MS?V>k8ZHeddA1e0rKw2IG|E)CxwsPlE#TsdwsB+ht@c==&6ga-&h#Olrur*<5($)+-g{aE?xN=I8BY zWs5Mq{Wde;^xt zGq<`!or1!I`}~9T3xtZ`l$;k11MNDH*^|C$bp=EFapH;=-M`?{0-De1_>ideCJGFU zxomdbt{TZmD}pFRFNVL#3N;-a>QoQTU6+-*#uh^KggMWug3PWC+wtP#85c_NWCpx~!1un?OMi0R&)3Pi&`!Vf`SN1j3b#a?}HMW%m9P-lAvf%Y$2Loo(o2yQUg9>c`2O5?*sP^?ZKnRB=%V^U ze^xTab$Aee)o049g59B6J8eKDCdq7?Z@*_Mu(C8&(K-r$u3ov{5r5?)RFnU}Q%{xPq?lzzMHEO&Nh0USo$84f zcVBg~z_&2=n99sv$S__Yt3>~B?vJ=z^b7{`6I)C^a8h)#Tt9o{yuo)nmEA%*YdXZu z#mSEXiFKmH99zr@F$YLpjzS_DPSkeyiq{$NXhF*DW4s#;4mA8C5pBYeZ;U~;MD0<# z4Vh`jtf>D@zspwzl8UdKtr+@k((6<-{(4Q_4N+jTbHQQXeyz{Hi}}E`vq_^KQYMV z1-aogYujJC6Y4RaA>-OSqPUEtt)FKNRKN*ApNW~iI?M2ZM(=S3CO@nh?$nC7%eyX< zb8oie$Ru<(<)$}d;)|L?WBm{A)~#Z(ZyS+6jv097l2V3J_WuT~?*$(eWjCs>A>KqQ zXf6>ivr)5GH8}UH9R%=p?g&zj`)6~|>_5O8u{5EPR}!>Wjig=(3;5T>hizh&Q$?Jf zZE!Y&9O+%UGN*7?K3&lI;Wl`^9Vu|`W8-?Y|e#7*-(c+Ca z{o?lPUr}cK#%I|H9%3R#axO{W$_T=XV#LJHB@blp?mXBxwx7XjRdZC|i&~jsaRUwG z+Hct*Y5BRAa;l#@t<_xaJVvy?J5GpUVA(jj?rT32jP;MZ{%9kDX5ratPz~gO{d3^9 zd&`3@P?+*uBTIQr=q9YV0JpOoAysmGLzTXx_s&vg&od{h>{QJk0s3uXLp^_PBJ8fW zd+CM0(VN{kCg$NgyFW-3k3Bbe(=F8qyMNSJjM4OK_R?w6Un{!?%~AFXD8?N2wF{lE zZ@>80$s9RvqqyMg_`&DfVddbtuVr-dPFJe;{wYQ~A0Zzngg3|*Ka>?`;S<_K#*^5C z0gxdsGVE=;P_9Oo7Xl>Pw;t|9`p$#TYF+wcA;^MsLRs#-?h0f3!G3kkj>t8AtHY=? zuttKyR-ojHokMdJFgdmd?J`N;Cd-x%xzA&+x=lZ&3Ac))uTRA--;(kE;+ihA_3yRH z(1D~3&&T8bv$(Lwd*@{!c%wAm;*`5fhyR|aMowI}_#MP^3x9J(-Q4=RG{qYa8;?Ih zNmIMytVFrd3OKp0(6(V8vo7R*6g)tBM^c82m{*M1gYallzP5-i8X4Tv&9p0?*wu6( zm-xH@`Lg;@7QZLA$O83527G|)H9R;lwOD1{Q#UL}sm^Sdz%V(X+g#Z-xs(oO#2-{3 zbCj=^?sxN-_meYEYU`q5Ma}Vj!Cs%u1wZEQ+z&rSFfgq>!LXkV`B@(iYk8yavrd=) z{GbWY&pdzf=;8Ap(J3LVjl8Z2&urU*kgN44+s_Za^yZu&D+?@W@7DhdJww-ikxvbp z!~^|hTzIdtMXKbpIeTSlP!jT(@UXfqC06Qz)O2F9Do;a20`9J~)H#A@!->ezY=;R| z2irh}@pj}@kAT$8l(LWH!$2 zxvS8{;?PABUB|6)PC$33&%KtN?A_W`;WvSWX3UPTV~NF7zq_H#<6d8_8mPLR z8ZPe0K*aA$hHY;#s?#)@?^SG%x|)}K&ROGgvZkhZ__DX|aPkjq-{tj(L;iB39zxZz zXQ(h|9r-{Y%f-?FL+8ei_e{4rz35dbQWIHrWR!ZF!Z-X~zObxz_ejOQBzir|8vc}WG?=wRW zC5Pd+LW)9z-Yp67!6sHIB<9as|DtnxxzsOY9~+*`S3go|YLOUDcsAdc!7%=~q81CP zZ8VKf_B%vM01wQmTKq{kn;S}&=-7>!Gz_dFFqo?6D%Tz~3Ao?cw|;H?uchy>kL~Iw z|Jt*Ox4CWw3YU`~AU=am-gkPc3X2-M;e!Ro^;#>Rxo1OPJP#*lPk~8pWw&>Ok2NcM zbj2me1#I=&bpaOor@(>rlxU1VHDDfJZ9TIUbLxnP)p@@XDZ|(JcC*+h;&N=Js*ly) z6>VETD%zfS>p$G-oK?kAp?3ZP+cK=Wz1l0XQke3M-bL~(>NnNDgX@KY44VwyO3<5@ z-NR=WJMy(kpqT3{%*{(`C-6v~ztszoKcL7pq8f9lnDOMafGBgE@;EdD^Hsd|sNcp+ zLFD$Nbkaajpt=!u)+Sy*OC5aoC~nGK-%sPXNxNq}=bc6w6IMq+Yxg~00lbbNWllNJ zx_rWGj(8Y8`$$t~iP?ASH+88l&9w6)I+f?OxuxSV+_rX=046+OVIL6bKlCvk7ZeHQ z5-K@le<}0H?p*YTcRl?pdkf;_Osf?kzTan+8jAzCV znW{{?cgDrf1b8l3&KYPy6`l>r6cCXfvU#BU8*37Bu*feYf)+zw7eaR`ucyd|qwmx8 zbL}r}YI?!7;uPRz87U0bdf}Po1GtJ16u+{HtfP;14^ZQCcU<&{zM~lFm&yGkyx!aY znqS2chl{BR_q2U{?dL$L@5&pze>2TZzuj=mw{VPiOv&k*s`z-+%C{`IS|4z2YO3PT zY>;tr!}~b=i^3l!kjCbffWM;Z&nYhZW_5(Bak9Bau8uODjY@6l8!{gVb9lSEeip7R z_sD(^zaHU6?P`9mC=2$*HPU^qY6ao8?DTc1D$vo-?+K{Itfg(FT}<@^p1Wj{oi4bw zjP8;thsiel>3)ikd4F`nu1Xy~!Z;B6XV1t({m(O3P8Y3T=3=RSOP6&Wm995wD5>sK zKkX6ownB?8>b>=#glO5r>wlVbLZ(&L^Lkb0xU!a;o*tz%C`jPe`}9X570nI(<>p0% zkXWBqz6!eF!Gs%?=s#c&njqI@2_WID|H zaM;8q&#r{K`PZN%*on6}WiVm;Wq8Xm*GGrFzl8jM*r7>Po{AwWqId7^E$7ii-TKOL z+x2rt;PK)IB_Ngd^~G>K_9b_9kOm^}PJWQ0WVPx=lu&wS6!+y~7q_M@ZYv!S_{AEK$aW$_F_Usro4NJ^1`Hwf6{@D{RC@2_~^8xe*4Bi%E((kFB3z= zzktju57*9>O~7`m2eCtSJ%1Gm!zbsC+AX%@)pyuRFo)Hc7LY=5qHD#)hY7>Rt#~^R zF=gZab4Kolo9mXj56ysOIURbzZap7=Km%^QWJJ#jZ0)5GlPcqm=wE3^`!9cF-gTn68&V_nr1 zZ9D7?=w!E0EEvQbd19qy#^Yp4=xvW{sjd;C!tq~rwCZ=KxuppWbt23@rRbFR z>pxL$JyL^y@)?o9($hD}4&#h?33U#MK@fLlZxAEQ{WEf5W;UrgWAGXgz|i0MBhhVs z`sj5C9r4+oF7}`fYSI><%DXamW(9pLEY>UQah$S{{ATxz&py-|F^g4n5DQ*(h&ib- z>e2MyuWVStzzpADee)izZ~0N8JMYR+5Zu}io1aqe$%U?~ZdSE_jA`@(4SF43en)jv zbf{7+UIJ3CS1(pW{1IyT@Ik-2z%nMsey3JUT-`-&^VAXM-|THle#}jk@CO;8$NTp4 zO^qpYU`F2UTT#3746COLZb*a0tmzPLGK!V%dSI{t9YSC+D~@1GB^|I$d^!2!?} zWl03I9{ALh6w?LhBd~kQ=7baPx!q1|NX^R}6Vuc~SjN;juiZu6R*%jTY|8))-sNT9 z*>D~5h6ufsd9sm=ZCJ&e%gyT?W56^AI!>gu5kK$0lH4`&sAi)bGBE$vmNdY4!`cP) zD~)_xDmlA_TEB2*Mc8q(U%My5K-PI{%DJQ%;}w2pe!)1p{ZGpx&n@cfK37b1qj!0x z?`MZv=T7%}|JXk+<~I3VecerD|L%Dmq4Z$p?C80iqc#)ce$1vXZqQ{C|NMw=$MW_J z;)+C8bX!}Z=G^aX{Qaa$P`J78+bGIv6ZPwFH++_AJZB&6sHm;i;U&wg2$msd43OM- zHVvr0+~lswCyEzN3<=xbCFHw^K>^R623jX=YMQg&NDN&57Sp{pv1fSX=%?+e`aCDz z^uw9d2V~3nfe~$r^B!3A-|s^>K5vJ5`q!FhQabowGY z@DVs{lHohtosgcQr-lJ@u6&9;Cq z;a_6*_`>wX!ak1O)L}0Hje8a4tGK&<3-;~a@z?nN4Ui4~Wr?cUCigkywO-<&Ngow5F35#b}Q z_9(H>!^lQX_h+k8jaaN|ubVda?@1nq5vPay>eKdEv~z$FZVJ<1Wm*GdPC&;t{=ggE zQqLNKdf&DSgbV|s-d0mM@+PO%Ag;G(_-g;$`H^E|!oQ>UtD$tQDA~Q@vhNoEmh=3N zsmi}g0u~I{&IZdn=2geLQ-{3@?4ozk!MCD0*)*DO=vZbS)|)1J?Azj7%5e;BjIgz{|)B6LJ4LwLzHZkhD{AYWX`*h z{)JpxW~UpoGiTWE%zMXB?A^4H(0$F^>g==d6@)- zJghUfU+NSk`}d-~y1sg7dSjWRmvbl1_e5Z|f-?cR2lHEU6YWXDsyMQ@hUj-TS^KVj zinrDYA1=Sw{7Z=X{x|ra0?eV}Pe{^(SYp3%?J_Lkz9jvP%IupUVNV17kh3wM$gb#= zIr6aR8Jq?h<=QBIRNVgUyI-ev!%Xvl6qbIq$vsF^-P`cr18NgJaBvCo?yk{Qm3$iq z99wFfTTQlR=CPG@s3O9Nh;_PRwadkVwnFkjQv=fhcE0P6oL;1#<)Cdmlt*abS8vD- zG)7G#%qbg&BKU>>|v!h9aaNF^2#iz)pEC!&yRfS2L*Z{B;iiU*~Z z1dQT1634JUGM(vOX=%Li15A<&*cUZa33!&DO@ zECX*=_z^Qs5}Ua`vCznK%_$tNwEtV~+tBT)FCLXJ9W1V~pU4mt4z^#XIl^#azK4EW zvZ3I4#@2L|ZqIA+O6x1{5@Gv2uepm|RnHzn24T!>s6~qI3b|hsRNHP<*_x31_gtyN z91g80b}eeqxuwS&in)jHO`@skL`}oA&>ihD)=bmtw7==bT$ozvuV+p68t3_xpPeiy|e~tY}!`Idvb5X!12|o2eDeo_$~48QYs~%$OBr zKU)`=8L?#PPdP};7G+2$BRbS8flLY#NpAy}`5$h-q+Q5aN*Qz4*HruPoS~1jt=Lsl zM{fUQHPQ;X{mD_$W?1kxIIxJ}Nw)tVpmX z3V2D*D_!KhU(bA?(N`;z`h_DV@0$CYf%j)sgr=1YYW@T5N5w~7{ zMH^|nXkcVM`XYWY^r_aOg4^iDY&{?UDN?#Xv#_A+4$o|}ux6A51^8*rh)+&S*pITi z|K-~n`*LP>8M$Mg6V!iUUjNjkQeGn`U{Ly96<0LG|IjtoA?J1`SR`L*SXW0bylt|b zU=-=TYP49<(I51S!m4E~L)7}QIa$ZBg|yPF+b4$j@2S5?8G>_*G*%&LHsyB$>soNu z*_(tliJ}RCPDwW{r8hWrVgIKJcO%{TRJk;WE*P zc}2tF|1fh400Ri(GT0Iuj`k^kgW7sXvL1KUO~jN!NPC4o%A8!9*r_^qaKxB>=Ldr? z{)#eykovDETy`8v*u9%|Pt0}ou(3c1naJ)9zzYLDFUkm4@3~3_VG(+{-FNXw@X2kP zq?&nZNj|m)xm($&Mg?itpeS74Q_o%fZP?7{-FyHQgiq-8G*89L^d)0;VFrt{B%C=x_4Z}F3E=1|jxk>hN>A`>$al_e;{U}8kId(0| zky4?RUUWw(P_SQxd3t|ia8EY-ZRw&Qz+)_~zbWcm7t3#U$7-)vZ7kpCKbV`+~f^$3`E(c(h9o)LgdO zYIkfR1U@>Q_hDwWOrsq@YMzYfO@8fC-{G{j0Au>LpK{hOKZ>Rk@!xqv&-X)R7@S6( z_SgVT@%7E7hgHMw5N~n|a27UF6n#xkdjJTyOA#B6gl^#MIB{J102?A7)qj8^0L?a+ zZ<@TV9Geg75a?ohAoHFQcXz4hg$Y|YiQP{3HEc|x3D4MlwviZb5-v<%|0KjdQFyvrzajN#_oz#&#~1Q zuKZ%hh$9|CojgKK6HX>hvmqR)dAb_y&bIQPdK-CO396X|^Sp@BlJU^~48*AVGc2An zhRw$s2CzzW2x5;)vOuJ-!NbODFST^oSz>2B0X`Ck z+VU}Nd;sCY1#7kf)p(+0>grw@>lTyBeK@ySHM;N@>3Wk~Vs*6+a5k*jYX;w<9CcvD z?RM}GgUwoSo8=|gLADwVwU#%k;doAK{;?I<;!n{3BlX{KQJZBSTaTSKhHL}DW#(kS zAfckxW|M9nX3B8k5Wjwx!%o8$d8Xi{McsQ)*~QGlP!V?1ac1(Yiy>5_@jZ>ji)4ct z1#68y4$C7Tk4SR-1F#rDDq5=G1(0rvS`8(c$D&se>_I5#);x?SRyYJ!r}}uc8Fft$1YfS#@SUAZaWv zi>WZ?M2%8CgzU&GU)*WxO~(lAVA-^bE~d)kR9&_SjMvVgRQ@~;asslE4n7mn=)?B3 zDrDs#`hZ98pDJ@kH0x;=wJw+HTYcm%JU0U>G1@x~jEIl)4}nOAd?JzJk+QQkbX_6p zc9tq=7&FX2RtO3^%_n#E{@oCUO|kQB_@s#*Z)4)~X57zB3aSqXi$V#Rb4gcmr@o{x zoRmQQFW`{wz~ly0PkZIjp@^K*x4uKLEi4 z5POX@d*(OeD7q3J(3YVdZQKqgwcg5oObjuQVF|c=){5Irx=_fiAwP#cV9%sVC!0BGue*rFX<9k$|CN6U_uA9PUJk(VlhqdHW^{sK;=8UeR zFoR(|InJlOaqumiNaNhtO&3oyRH1x*pgE0m+yaA>i7*x9p{ym#SdWM|@=0_t zKmO7U`_oY61Zx{o3^^22-V}gL)>7-IY_}T0bQl@^po#t*euN1c1B+D9QMSdQl~3Uq zwzW1E6`E}lO^u`VeF0+x4QZTxOVwHK{&v;EL)}_}-E<&KkVo zdTaSVWL4nnK=^$|EmJ()0`j3JH~?*l+7tNrt0((R7?7hiEnq9}A8~2MJ((IS1Ln2= zE#};P5T^9sV(wpUgF6C0&u*E#-|GLM(y6Eb36NWpU-HYp6n{3{$-c7GI&h;-5+@QF t^jEN|ew?#&_f-7!G8Z?cm$$caZDQfZy2T~`-_b#R=XS`IwU_$y{{W@cbSVG; literal 10214 zcmX9^2RIzx*Ve7odx>6R^)ABdo#;f3E(lSg3u3iIi?;YhLbTO8(OXvUEK#EO7OWO+ z@ooO!GtbQ2xpVK#nRD))^SP?9qUv%b)sz`$U| z&{R=04*Y$T9TaHttL0Jtr-QH_Z3;RMQAX)jzjnTjQw3(UBDW9D?l@ZjE$ zs-|hSvB4xcP61%2U-Co1f*RA{3%8;IrV|N)rpEZf-Tl3{t`Y@>6gTDz+t8d{F#Y)N z_hYM{!C6!DZv(#7X1pCZLOKsX1%Iy z?F?AWS)+&D1vaTg)DH^l_D)A}xwhwhdoRu+X@mEC_+dh~#`6egtSKX+&#;GFMUB5O zvDH`KC3=#~dCR1v{$F8~>Ud~U5CvPDi^Qtt7z@J4D|N7OPqu8nugQrs##HOGI3Rop%eAfg+L3KWt`Rgyc@2w$WbaIwo zig0a$=*m&UOVA#<&SKuPp#N2-lNxu#RJWRb!*d~gR^bVU6^|E8 z=?Q_rer4@@FRC~kIgFKYxuG)Z{on(`YCb+-#`*BtHpQX*5Vb|;IibLmMV*Pwpt3pl zu#8;bhcIF@8C$fNZgeSJIs^!vXsRd=(AyR%=ErkQxf%moY?8xz$r>Z>@_?4vQfgdn zD(sTMPtgrN=~M=-(W<$c0;3u^@Yg1@1@2~b(RzZ;2|tEqL!eWy93S zIB%P|vXAX1H<2u@8``aLT?hEvl<6w{lk9|akb40jJ5$isZ8Fmt8ECvN1{v#C6Y4JN zGXa}+$3<+{Q9zB%@^;dSDrR3a1OkkTrHI27uft zd+@Agsb}pD>tudR&Q_rnW!}u8%+OC~L6;ZZ+@Rn>zCt=#+87%i!3Xz;5dUO7jL>v% zWdEmt&zSTSt23}#sfO-JMC1;ZKmx)r?>U*}drMAcBmwhbLJ!`6)AV+uE?OuUQ4g(V zsNX)8xFHMziQyF|b17lCH7}P5jqb;gk+sY2#(S2LsC^QL+OmtMj@CBB;Zz`{ZsoX8 zaP=W@HYF#?4JnIxwNW=sYPnx^YYgSquU=Y7kph*hcKo6&Yh(P5r7qiDUvGaiz*&);nWbe3gUO&{toHN9n# z?Z+j)>e(cpvZmd{{C;gC)G9$%6>4*rSBb)^N%{A8ie1gh-H2z)7=BG*vnOALrrPN% z-BLO}7)ITL7J%I0?%3R3gCx8Q2k+K?7%-OX6Gk~sj!Ka*hf<{j9HV9Gy%XRCVma1KdKEAD1FH@rAT@_pL?4W@VGLBciENi)En`! zj<6?q&WXE5ritKtb@L6JiOZul-z&(lgp_?oK0twc|ENo@M)Go~%R2P*HRhk*8te2+ z+#C1cO}Vjp>euL|>vt;>}@@|@e%+-u>^G=vF+F!e`>n!XwMd2 zr)~GO+uvcn(+lVB=&vo>;8~L1W-@H7L(~4)*&MCiL(43*>eGOV@B%fnlb^30=EK@C zzgv9F?Tb^Y{GyDMWXJ<(EAW!)4WDIIV0zW}RbO4V zpF^u+oS`O3NSl^!JcwU(j2~=O&b`*mpybF1pyR`J)ABw1;h9Sl5W6pDDO>dQnf1WB z{6>wao77^3e7C*ox*<)BKw4)qj}fz-b#@->J^W=P>#^>E=aTnf^MYslb4B@jE~ip* zG3z#M#JdH_hvN?}3N^L{j*y#rkFX8TOyw53MR9(bcxv4EK6|t`sa5G$4G8grP z+4)qB8FL#*XEhXUE0`QFv|i&8T=ILw8@8;s`Kfv_A$JaAQ@oojNkb4~D|r1*Lknd! zrwf>Wios4#@`^;VhowS2`IfHo^#Yt7$3wC(n8b#4#B1 zQ*k`VbJ9pv)m^51tE)8Ro!n$1>Js{=Ks?jxk#iMrA=&y@O>z%Oan*M^KHyb>Tx;u8TD8CgZ@jcdL>dg7YjA9pqJ*I$$?PElIeA zid=4$C#))%bGMvYGzwb!%DaU*<;mK&fq5R}^FfQKtA*71jPkFu^`H9>EPy#H5gKz^ zTQL3B7xx-X@vKx*wpvD$NC10{5?2?G3t5x+qN5vtj-+ zSV`%z8^bn|xw@l)8!d#?__1F4fVYpG)W0mBlMiNY?Gqxg&ixjz-U*e_6~2g7JY3c> z)#*#?H(*R=XIr0?1aUO;?vwqD_+Z(#2EV1U_uhg`7yNAq+rrsp&GMfmzgud2VKk|^ zwL6wxHE}6)Zj$7@sCm{vOZFw^&BU9+WzwuT2kVroY0p;QKMKLazb5=-->K}Qu zxm8l(Vpw?PO~9#-LKRhtUogIo@O{vku(0XL$Ghk!WJy{YHJKjBnX~kN(9y%%396Y@ zd`laxjU#dWZAjGR^*4d|Pnwy~{m}6Vs9i8i$ap=Hn#s`(?V$*Wp9i}CClKRO6cAz) zJccwqlw1y5#AA`?+Mq1w-%X3}2z13CBmv)Jap;8e=~n^XM@%>$E@7>BsF1L3thr(v zw{raM1R8x6NfqVNex@fV?FP~#<*0+Djw498I%EEBag;O>Y!ilz6M&zQOI(uasKM^d z=b*;!b`nqJA0^i=d0|C!MDjUzMEXo0rWBJyKkZ;VXBEj!R4^1wW*LrCy2y|^6yD)l z2D`qBCSEVw#j{^JiD;;J$Am*C#VER(Ppwz&oM`0zESf;vzp#*a3qu> zMW&n;|Ay|S#p6ASktqPdyrz!u`yB~bO~_BV0%w9|*q=ON9LSbi=Ae+@`fg7P-Pe*3 zn@xOx<}NG-6*|o)sl}I3+;X3Jo${zlT@7aMd6LaF#<7-t{oQmW#&G3u37;3 zU6RZelcm3-Wj%J-rHD!eTFS5~oU2Wc2kV&oCc@J{`kim41pI!hhr&%K%_nQh$Sr90mRspNGGQW+iM=9wSs6&!)N zRBOBuFQd2&X0($^-qbF7E@C`W@zx~C0T({uep}g^&FJ<_4{04^S#5OqQCmA{jW*6Dv!!4*Df(j(-&1MBFKJ6wJE&Rf?(i!uyTP`yhG8! z-+`+|K`ToYMPyk}q%5s-aAk_6D8WPFNJs5n(SRJs2C*eWPi;gDxk(R{2e0R?0bsn# zZ?mw;{i^bBePZ{#*Ac0lg3QhwF9qRDv(>in=8sE+eCfsCI(H z$yURCik8Ve`L|qXuO3dkG=F|nAX)VZb$Pkbr$SffLzQ2%@G=68cy-{rTi;Dzc|5q= zUmF)|DA7)xZRuJPprNNktU^kF^~v14E4k|4{jac!H?{e;rTgs4J%iYXnwGZcCYjQo zX>Wq4*;^XBD?ny~p(dYVrApp(3J9UWuQv0uvkp3Tg2wiLxBT+IQp^`DpowT22mv5TL29v=9XF8>}c-0H6+r?GX%)4Ts#dkhVi zQ%&)N&U^$C0*VEM|GlG=I?F}!xnDcy%F;gq_?&O*DCFX%Qy{YF+PxM{g{;bYxsO@1 ze4bA^cD~4RAsk0PgF+SUn%DLbC4v+>X;ssR^2?$_N^bXcOEhybv-e|*c#{@lIwOI%rcL-7L#WD?#mbu zBb)slfhHrhQT^Vk1P4N7B#VguT}Ij6rKtlBRE+%>{#WshCWh{cTqgbBO?3HEZ+lAo z>aGM8Tk;aD)~jip^8@ye$1O(L^=;*Pgoco4KD<}h!Gye75e+{J=ncjAu+-KVHNp8? zJyk{@I6<$KANbWrHL#V`@s*05yu1EoW?J(xL9Yr;Qu8mm()MNY{c0Co=-3^dlH>l> z(zy>solqmj+$&nUJ%?Q##+S0G*zK&#k4WC*($2sO#fE3eREqC?6&pAA-+X#iX2~K4 zWL>r{iBvNS+xt19N~Q8kuIa}NqF=@-&dyp1f5tUJpGAaNU+4lTokV#($i`}8_{`gA zPnh=qQCldGCLTSI`s|-4&6ISIM!wdvx|b$WaY>OdeDu%TpwD1q>dPY)Jfwl`XAHv= z2UD3DwzAl-?+#sWo%}Z1LmN5!`$W3Q83Y(%J_TAQ6s3Hacz~H9hSD!Ks>@3f>I~QR z`<_&faD&!)e6eFAR(QliWLDgoJm zKd1h_lFIuBNH725vFxD#blMcE3G5L3_}P1o(N#F4s^JIPI%ae^JRG4SqiiuxDnKeS z5$S()66LHo=U(nUNN`ydUbWKgcg$bimYw-BZ@BQTSykoJU2+Vexu}r~oih{y98-}h z8E)g&J!?X9V<4*^1k9;K3cUebVU8J)l&?#0FrHhfVOK)j$#-)|^NeE0f_4G}wYzVP=!A0rtnGih2 zR_d`wtdJDWp)j652F_3W#W(Kkvwp>U9S_b4lhx^BJj>#|);-0T#CM58Mi-;rKZ@*B zXXip{SawJ_z?c=|46sL|Z!vjaQa2*;ja^xeUEf<>pQom@wp_ngzk$H*IR5B2Q}-EN z_lk@TGUmPS@mn1#Myc4wDgnKil*pWnCY>M?c2Y{D-HJDZ)u>gJxPUpMgm0<1q-uy| zZX0iGw_Frgyn3A#fyCJi?wMtjRYAzwPXKuq=0~a>L59*1xLyAf4U?|myut>_cM55j}I2JFsiEet6fampn8nQd2A zylbUg@?m8TTCEerDQL!E{Y|<)or%X3>j%0ZnTtvhc^nf|Cz|u zj8Tvk9O)&br5(j#2YF*A-T8BbtMSWvK({UQDF7c=nxHq+``SrE{X0@US4b-b9tIib zMFsX^(HoW3|5g2ucTxw3MM==hL`AnR`dvXQih=8S;qR@FxOo+^Z3<7*$K{pUd7Gp} zP~N^V;-emL^(eJA-JVth!%m&GLtrKK-;SIjo6qCPfi`Si_%R?(wm<`iYCTQAtzsL)Vjg)J_peWG_G>3H^ZI=5*;hA2GPC8?5r-J9i<_)mfuBBQ&f#YmhUp5x zH)ti&*=ZEbwlwQ>fy(_SVK_h`w`dcUM3clGItA)r3B>Of*i|r++PZ3fKc$hqhO0?? zZJe9J!_H(o2;PUB*(l`EI)==GLN8Pt)Uf#=t==)-7|LQ>G)kXqL-ej6@>3E^s`rA*mB4+rr5*Hah4uIPqRzfA ze-fu&QP%_l988xg6eajc2uHGEXTnt7gsGTh;t9&Gu$oekh;i}8W=_qISvQrKi|Wyf zm+N*4`a6A~E9YnS-?;g4dQF~Y5KnYca<>GaRUlsyqHQNcRxTKj+2;LO3Y;uq$Q=Z) zj{B;jA0*{gsQYf&D@eIo(KA-)4^F6Y-e-X4EmQ{z-~~vRu||)cbpOzhzRi5TK~nX2Z{U6QVERRL!FQ! zrq+|qMa||;WIE{FxAP6i64T{jENGyLj^bk2p3=$Y!n=A-1MrbI@O?6WdY0uFq2$E_ zmUS9pb54yweY|B|krRKhqeDZ|rUEplO!s|katMIa{3 zOYrAH!L`F4+QGLu>JHJAps=|-WwwUMNuxw1r{j&hEW))&pB(O$!Gd}aF?l;2YiC?< zI&D2-LXf+$_}s=<`q3_)h6eMA7X%$?lITh{(VDO(&uj4 z@ZMmjO@OpJabM*@Ydh`u2cJWGV)7&DXvuXf6hofgyokYBC~TbmqnO@+SWLLuyOO2> z5}X%iV5;95dzp@aFAM9w>6#yl8Kxmsot@ zT?Wk6xETM2(IV!fO zvh6gkjh3EISQPh9V&O(P#DC0L;fGE~$zCRHV4eK8`xYnz>G6)p)sH%pJ^kKdIYWR9 z>dsR?9TeM=&@>CqRBI<65Zn4PnKLn4AjbJREQ`j3PH-zwCHg}=WfmTkr+WHE{oYZN zTv?XxsS@_uU~Eh~uCTmLydkYdjslb3P338QC92~L%lKN&F7b@Wk^^_{$jU;O9|d7*@WGd~p-seay%3j(U=at$2^>1NJovRNdq;sGsZS z&hKL+w#~7|sg(43SkzWByuT)#9j`##7Z~IeSmaIt`1J1W^UX8Q<_o2L`?&v}*+W7q z^qc0N>4VEiCZL)6%!Ywpfki}W3!F-P(Jv!2N9LUZ-mGuDzgR=!o{_HkV^bQ5(PziG zi!;=*j;rkemcM54cz*2IOEVO^dCgmA4*I&Xfzob4Jrlc73G9%1&7*-w9?Omb(PB@IXfb;n0G8o_kguvO*3ihD_yFeV zOI@>4PoNCjTyPk(V2<-YxMfSOSB8{~h(oADEy;TMwkIt`Rgwak_4q;<{-)ZXm$%4= z|2UXQSv8d*DV3%vzbko0)A0o0n9XXuDuf%a0krtm{Pp(Z>VC;+#u`-$r|gnvU_^t6 zaXs|sX*K&Dz(u7sV6cvB!aG^`F07{l{YJX&Qn51@-g+_S?*fcfU&$IB%wC2`*GuUH zlnqbY9-B%$qHP%b6AX<1j$!=Y6?z?vRR69O*SE>&)+#L^ATlB6{)b%Qb}6!hzq%P77-2o7>0f<|(IJUSj`kYYDuGxsZ!J$!UA*T5zX>8W zqdF7U<*DS$1pf*sWFw2v5eAwOm_p}Se__%^fHPrzNKG%Z^yqKhu)nB3J(C5Kov&c$ z_?EuvXz5qH`D_H<{Er)20Dok6S@W4nhlQCvJRTqquG4S-{^>-FM=wHFx}A9|${nuN ze`^T@)>dD5MOi|qOd9zro^)BP2DVgRTmgh~x zp8_iwn=EW{rnD(G7(M1DTY)Ta>50wCyScsM`r9F+GGE^i6z5*9;h-4%AEqWPZT}CQ zGd5M!Ndy2-ST&+W>~5GtK@{F_VY05O-(4a1t^jydrn1KjL1zaz|H}nHPMnteDmran zY+ND`IM)R5RF$4M6l>Qh_;r#^c{v~O(U7G@DT>AJ+T`}GwHS3(f2VCq$}ABxbk$M( z(OtVCLn-lREQh9TE?`K(;B;Vj{dJ*60{3Y0B&NWELR`04kk|I89AXI|R3`c&ouiu= zFDIMb-YU=aI_K^1(sZs|rZg5duG;q1b}?7_$)uTWE|3Y+o~g4EDHioKpAH(^FD%W7 zdIN!w^!mg}K_DR6k-a1Y2=%zp@stN^j<6kxNJQYQ!NO82;PqJ8i8-NqS_$e(QcKjB zAElyn`}4eE99E$3+2Cq>^_<|Dfr7Nd6kE%@A5?+>u{&+csMhxm3(`T+cw&Z}MY)2e znwU0-Z{V?_U-Q45L#x^)LVw6v+_Kc)jwpb$uopGfzFbge-M_PO^)35^)uo(eU~hb* zckKPJo1)i%6uK|Gbezo8vXDcoe%28s;JfC>M0Yk z;8^*7=<=*J7j&m6dDod3%0htZM6F9~50QBTZ>MGVHmE#rkt`fSW|_sXaG}TGN~`^( zyp>~_1@WM|V6i(*ZrrZ^^A@2&%AdA_B2DOF8W!}4DsgkN)TBHYP&rl{J+H#(|A_cOHGm z*5~UO@i}(u(~Skr1#ujU@ju+=`{fth=}TpYqn&3TV1F82b9(SLQ#icRsgOGra&_~G z>wN^}mwTg_bqtxgfTpJs8)KQb!y%i_G-X=yJUN0(;CjzeWmS?>+1(4dzDov+VHC3B z;ax7Og@U)8Z`jM=0bKsQB2l7U+#~T}7d&5Zvf(YONCUXmdZ-FtxZetHA~o`g6@y7e zZ1*GP4Xmfkti6Z^Om4gvyTrW5<(=X|=Qu0AdbP$(4{HH|Z^jiCXuQl>!~C_wUkY8N zJ$}|^)l7dRek~@)p(?pGx4qk~5H0&QbLtPQYvg->SM@n+SS8vHZRj@8+%~Q4gQP-# zh|hL(5ROYRX(om$v!Y26ZR=7#{4QTS@idy`7Lb&{9iqfgW3V>99m&<0N^T5b(xJuf z4HVpY2#}Z~_NwN6#IYwk_Qx81e`?|SrPHt}CF&oVkcZ1%Buxx-mUg+3{8)7cG5B$GSl2qqUz`pGVe(qvKr96b(BKN5 z`_M2ZwfrSPT!ANl(s#TU&v0s%vhEL`@@b+Kc2*_^p5_ASp6Z$ z>AJ*ludF24#QuViD`kBT zTH2-St5JL*lW$3*LL8I^cGGvpoh&q31eTpGbjuJn50RqC?M}o3b?ZyXH@J*DQiA*4 z)LuI`nI0rM#)DpKHiGS}d6`J)pU;Efsgpfo1 zFkU5Eq7m`N3Ulih5$n4EF|dX{TP4nB^~)Qil`|ML zg>5g$DfmQRMW`~i?Hw&1r#6@gGHwTG{ylz*y-oGKa-sCQ`upmQSE+q`46CbFr@_Q- zJZAhfhekDKZwRfEBOu1b}XZN&cp{OX_& From 99b4d8e5db37580f88cd89323868ae3948e22d55 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 3 Jul 2024 17:14:03 +0200 Subject: [PATCH 1349/3013] docs/website/news.html: announce LTS Sponsoring Although the next commits will also add more information about the LTS sponsoring in other places on the website, link directly to the landing page on the Mind website. Signed-off-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- docs/website/news.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 9abdf8f7208..7e66d023314 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          LTS Sponsoring announced

          +
          +
          +

          We are excited to share that we have launched the Buildroot Long + Term Support (LTS) Sponsoring Project!

          +

          This initiative comes from a place where we understand the critical + need for extended support which is beyond volunteering. That's why + we are calling all Buildroot users and enthusiasts to come together + and join this initiative that's shaping the future of Buildroot.

          +

          +

          Find more information on the + Buildroot LTS Sponsoring + page.

          +
          +
          +
          • +
        • From 62d03fe0d7a5920612caf49da0213366a5efc229 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 3 Jul 2024 17:14:04 +0200 Subject: [PATCH 1350/3013] docs/website/contribute.html: mention sponsoring opportunities Include sponsoring the Buildroot Association, sponsoring in kind, and sponsoring Buildroot LTS (through Mind). This may create a somewhat muddled image so we may need to revisit in the future how this is formulated. Signed-off-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- docs/website/contribute.html | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/docs/website/contribute.html b/docs/website/contribute.html index 95028ee788c..52c30d60d32 100644 --- a/docs/website/contribute.html +++ b/docs/website/contribute.html @@ -7,9 +7,9 @@
          Contribute
          -

          Buildroot is an open source project and you are very welcome to contribute to - it.
          - There are many different ways to contribute:

          +

          Buildroot is an open source project and we warmly welcome your + contributions.
          + There are different ways you can get involved:

          • Reproducing, analyzing and fixing bugs from our @@ -37,6 +37,30 @@
          +
          +
          Sponsor
          +
          +

          Besides technical contributions, you can also support the project + financially.
          + There are various ways make a financial contribution:

          + +
            +
          • Sponsor the Buildroot Association. + The association helps Buildroot with infrastructure (servers, domain + name, ...) and organising meetings. It relies on money from sponsors + to organise those.
            • +
          • Practical help: providing a meeting room for developer meetings, + providing autobuilder instances, etc.
            • +
          • Buildroot LTS Sponsoring, + a specific effort to finance the maintenance of the Long Term Support + branch of Buildroot.
            • +
          + +

          All of these sponsors are thanked by listing them on the sponsors page.

          +
          +
          +
    From 9b5ad726619d9c23b07bcf9295efbf1db28a6b0c Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 3 Jul 2024 17:14:05 +0200 Subject: [PATCH 1351/3013] docs/website/support.html: mention sponsoring opportunities Add an entry for the sponsored LTS. Signed-off-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- docs/website/support.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/website/support.html b/docs/website/support.html index 0bcf365332b..a94e5ef780b 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -94,6 +94,29 @@

    Search the List Archives

+
+
Buildroot LTS
+
+

Buildroot's Long Term Support (LTS) branch is maintained thanks to the + LTS Sponsoring program. Its + goal is to provide three or more years of stable support for your + Buildroot deployments. The success of this venture depends on the + generosity of sponsors like you, willing to make a change and ensuring + the longevity of Buildroot's reliability.

+

Prior to this initiative, LTS maintenance was handled by volunteers. + As a result, it was limited to just one year. In addition, it diverted + maintainer time away from mainline development, slowing down the overall + progress of the project.

+

Thanks to LTS sponsoring, the entire community gets access to a better + and longer maintained LTS branch. The sponsors get access to some + additional perks, such as selecting which packages to focus on, reports + with information that is relevant for you, and direct contact with the + LTS maintainers.

+

Ready + to sponsor?

+
+
+
Commercial support
From 7f387103d86294c65cbca6eb859df6ff2429b255 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 3 Jul 2024 17:14:06 +0200 Subject: [PATCH 1352/3013] docs/website/sponsors.html: mention LTS sponsors Since the LTS sponsoring program hasn't started yet (it will hopefully start in September), this is just placeholder text. The first paragraph will stay however. Signed-off-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- docs/website/sponsors.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index a90ca6c8df0..bfb83663c6a 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -4,6 +4,17 @@
+
+
LTS sponsors
+
+

The maintenance of the Long Term Support branch of Buildroot is + possible thanks to the sponsors of the + Buildroot LTS Sponsoring + Program.

+

When the Buildroot LTS Sponsoring program will be operational + later in 2024, those sponsors will be mentioned here.

+
+
Current sponsors
From b1dcf1dbfdc2f95e1763892b947b4eab6d9f4da8 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 3 Jul 2024 17:14:07 +0200 Subject: [PATCH 1353/3013] docs/website: update link to mind support website The Mind website changed more than a year ago, and the link on the support page no longer works. Link to a different page instead. Signed-off-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- docs/website/support.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/support.html b/docs/website/support.html index a94e5ef780b..96b9a60b18e 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -130,7 +130,7 @@

Search the List Archives

- + From 4ac1b91806cbafa4819adb249305557352452884 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 3 Jul 2024 20:50:48 +0200 Subject: [PATCH 1354/3013] package/libssh2: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libssh2 fails to build with output: Applying 0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch using patch: patching file src/kex.c Hunk #1 succeeded at 3037 (offset 5 lines). Hunk #2 succeeded at 3062 (offset 5 lines). Hunk #3 succeeded at 3315 (offset 5 lines). Hunk #4 succeeded at 3406 (offset 5 lines). Hunk #5 succeeded at 3440 (offset 5 lines). Hunk #6 succeeded at 3476 (offset 5 lines). Hunk #7 succeeded at 3489 (offset 5 lines). Hunk #8 succeeded at 3523 (offset 5 lines). Hunk #9 succeeded at 3569 (offset 5 lines). Hunk #10 succeeded at 3591 (offset 5 lines). Hunk #11 succeeded at 3633 (offset 5 lines). Hunk #12 succeeded at 3654 (offset 5 lines). Hunk #13 succeeded at 3687 (offset 5 lines). Hunk #14 succeeded at 3709 (offset 5 lines). Hunk #15 succeeded at 3892 (offset 5 lines). Hunk #16 succeeded at 3918 (offset 5 lines). Hunk #17 succeeded at 3967 (offset 5 lines). patching file src/libssh2_priv.h Hunk #1 succeeded at 699 (offset -37 lines). Hunk #2 succeeded at 873 (offset -38 lines). Hunk #3 succeeded at 914 (offset -38 lines). Hunk #4 succeeded at 1149 (offset -38 lines). patching file src/packet.c Hunk #1 succeeded at 605 (offset -19 lines). Hunk #2 succeeded at 656 (offset -19 lines). Hunk #3 succeeded at 1404 (offset -23 lines). Hunk #4 succeeded at 1474 (offset -23 lines). patching file src/packet.h Hunk #1 FAILED at 72. 1 out of 1 hunk FAILED -- saving rejects to file src/packet.h.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- ...o-fix-CVE-2023-48795-Terrapin-Attack.patch | 85 ++++++++++--------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch b/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch index 2ccedee19e9..8187719477e 100644 --- a/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch +++ b/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch @@ -1,4 +1,4 @@ -From d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Mon Sep 17 00:00:00 2001 +From 3a80751dce7b7d98b9d9006fb37213a1e4af7ac5 Mon Sep 17 00:00:00 2001 From: Michael Buckley Date: Thu, 30 Nov 2023 15:08:02 -0800 Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" @@ -15,6 +15,8 @@ Closes #1291 Upstream: https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/kex.c | 63 +++++++++++++++++++++++------------ src/libssh2_priv.h | 18 +++++++--- @@ -25,10 +27,10 @@ Signed-off-by: Fabrice Fontaine 6 files changed, 149 insertions(+), 32 deletions(-) diff --git a/src/kex.c b/src/kex.c -index 8e7b7f0af3..a7b301e157 100644 +index d4034a0a953e..b4b748cac4ee 100644 --- a/src/kex.c +++ b/src/kex.c -@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = { +@@ -3037,6 +3037,13 @@ kex_method_extension_negotiation = { 0, }; @@ -42,7 +44,7 @@ index 8e7b7f0af3..a7b301e157 100644 static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { #if LIBSSH2_ED25519 &kex_method_ssh_curve25519_sha256, -@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { +@@ -3055,6 +3062,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { &kex_method_diffie_helman_group1_sha1, &kex_method_diffie_helman_group_exchange_sha1, &kex_method_extension_negotiation, @@ -50,7 +52,7 @@ index 8e7b7f0af3..a7b301e157 100644 NULL }; -@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session) +@@ -3307,13 +3315,13 @@ static int kexinit(LIBSSH2_SESSION * session) return 0; } @@ -68,7 +70,7 @@ index 8e7b7f0af3..a7b301e157 100644 { unsigned char *s; unsigned char *end_haystack; -@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, +@@ -3398,7 +3406,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, while(s && *s) { unsigned char *p = (unsigned char *) strchr((char *) s, ','); size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); @@ -77,7 +79,7 @@ index 8e7b7f0af3..a7b301e157 100644 const LIBSSH2_HOSTKEY_METHOD *method = (const LIBSSH2_HOSTKEY_METHOD *) kex_get_method_by_name((char *) s, method_len, -@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, +@@ -3432,9 +3440,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, } while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { @@ -90,7 +92,7 @@ index 8e7b7f0af3..a7b301e157 100644 if(s) { /* So far so good, but does it suit our purposes? (Encrypting vs Signing) */ -@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, +@@ -3468,6 +3476,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, { const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; unsigned char *s; @@ -103,7 +105,7 @@ index 8e7b7f0af3..a7b301e157 100644 if(session->kex_prefs) { s = (unsigned char *) session->kex_prefs; -@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, +@@ -3475,7 +3489,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, while(s && *s) { unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); @@ -112,7 +114,7 @@ index 8e7b7f0af3..a7b301e157 100644 if(q) { const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) kex_get_method_by_name((char *) s, method_len, -@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, +@@ -3509,9 +3523,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, } while(*kexp && (*kexp)->name) { @@ -125,7 +127,7 @@ index 8e7b7f0af3..a7b301e157 100644 if(s) { /* We've agreed on a key exchange method, * Can we agree on a hostkey that works with this kex? -@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, +@@ -3555,7 +3569,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, unsigned char *p = (unsigned char *) strchr((char *) s, ','); size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); @@ -134,7 +136,7 @@ index 8e7b7f0af3..a7b301e157 100644 const LIBSSH2_CRYPT_METHOD *method = (const LIBSSH2_CRYPT_METHOD *) kex_get_method_by_name((char *) s, method_len, -@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, +@@ -3577,9 +3591,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, } while(*cryptp && (*cryptp)->name) { @@ -147,7 +149,7 @@ index 8e7b7f0af3..a7b301e157 100644 if(s) { endpoint->crypt = *cryptp; return 0; -@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, +@@ -3619,7 +3633,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, unsigned char *p = (unsigned char *) strchr((char *) s, ','); size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); @@ -156,7 +158,7 @@ index 8e7b7f0af3..a7b301e157 100644 const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) kex_get_method_by_name((char *) s, method_len, (const LIBSSH2_COMMON_METHOD **) -@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, +@@ -3640,8 +3654,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, } while(*macp && (*macp)->name) { @@ -168,7 +170,7 @@ index 8e7b7f0af3..a7b301e157 100644 if(s) { endpoint->mac = *macp; return 0; -@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, +@@ -3672,7 +3687,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, unsigned char *p = (unsigned char *) strchr((char *) s, ','); size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); @@ -177,7 +179,7 @@ index 8e7b7f0af3..a7b301e157 100644 const LIBSSH2_COMP_METHOD *method = (const LIBSSH2_COMP_METHOD *) kex_get_method_by_name((char *) s, method_len, -@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, +@@ -3694,8 +3709,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, } while(*compp && (*compp)->name) { @@ -189,7 +191,7 @@ index 8e7b7f0af3..a7b301e157 100644 if(s) { endpoint->comp = *compp; return 0; -@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, +@@ -3876,6 +3892,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, session->local.kexinit = key_state->oldlocal; session->local.kexinit_len = key_state->oldlocal_len; key_state->state = libssh2_NB_state_idle; @@ -197,7 +199,7 @@ index 8e7b7f0af3..a7b301e157 100644 session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; return -1; -@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, +@@ -3901,6 +3918,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, session->local.kexinit = key_state->oldlocal; session->local.kexinit_len = key_state->oldlocal_len; key_state->state = libssh2_NB_state_idle; @@ -205,7 +207,7 @@ index 8e7b7f0af3..a7b301e157 100644 session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; return -1; -@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, +@@ -3949,6 +3967,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, session->remote.kexinit = NULL; } @@ -214,10 +216,10 @@ index 8e7b7f0af3..a7b301e157 100644 session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h -index 7660366954..18d9ab2130 100644 +index 82c3afe250b0..ee1d8b5c2b9b 100644 --- a/src/libssh2_priv.h +++ b/src/libssh2_priv.h -@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION +@@ -699,6 +699,9 @@ struct _LIBSSH2_SESSION /* key signing algorithm preferences -- NULL yields server order */ char *sign_algo_prefs; @@ -227,7 +229,7 @@ index 7660366954..18d9ab2130 100644 /* (remote as source of data -- packet_read ) */ libssh2_endpoint_data remote; -@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION +@@ -870,6 +873,7 @@ struct _LIBSSH2_SESSION int fullpacket_macstate; size_t fullpacket_payload_len; int fullpacket_packet_type; @@ -235,7 +237,7 @@ index 7660366954..18d9ab2130 100644 /* State variables used in libssh2_sftp_init() */ libssh2_nonblocking_states sftpInit_state; -@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION +@@ -910,10 +914,11 @@ struct _LIBSSH2_SESSION }; /* session.state bits */ @@ -251,7 +253,7 @@ index 7660366954..18d9ab2130 100644 /* session.flag helpers */ #ifdef MSG_NOSIGNAL -@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, +@@ -1144,6 +1149,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, key_exchange_state_t * state); @@ -264,10 +266,10 @@ index 7660366954..18d9ab2130 100644 const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); diff --git a/src/packet.c b/src/packet.c -index eccb8c56a8..6da14e9fa1 100644 +index b5b41981a108..35d4d39eff87 100644 --- a/src/packet.c +++ b/src/packet.c -@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session, +@@ -605,14 +605,13 @@ authagent_exit: * layer when it has received a packet. * * The input pointer 'data' is pointing to allocated data that this function @@ -284,7 +286,7 @@ index eccb8c56a8..6da14e9fa1 100644 { int rc = 0; unsigned char *message = NULL; -@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +@@ -657,6 +656,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, break; } @@ -355,7 +357,7 @@ index eccb8c56a8..6da14e9fa1 100644 if(session->packAdd_state == libssh2_NB_state_allocated) { /* A couple exceptions to the packet adding rule: */ switch(msg) { -@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, +@@ -1341,6 +1404,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, return 0; } @@ -371,7 +373,7 @@ index eccb8c56a8..6da14e9fa1 100644 packet = _libssh2_list_next(&packet->node); } return -1; -@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, +@@ -1402,7 +1474,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, } while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { @@ -384,22 +386,22 @@ index eccb8c56a8..6da14e9fa1 100644 return ret; else if(ret < 0) { diff --git a/src/packet.h b/src/packet.h -index 1d90b8af12..955351e5f6 100644 +index 79018bcf1d55..6ea100a5cfb3 100644 --- a/src/packet.h +++ b/src/packet.h -@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, +@@ -71,6 +71,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, unsigned long data_len); int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - size_t datalen, int macstate); + size_t datalen, int macstate, uint32_t seq); - #endif /* LIBSSH2_PACKET_H */ + #endif /* __LIBSSH2_PACKET_H */ diff --git a/src/session.c b/src/session.c -index 35e7929fe7..9d89ade8ec 100644 +index a4d602bad002..f4bafb57b2a6 100644 --- a/src/session.c +++ b/src/session.c -@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), +@@ -464,6 +464,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), session->abstract = abstract; session->api_timeout = 0; /* timeout-free API by default */ session->api_block_mode = 1; /* blocking API by default */ @@ -408,7 +410,7 @@ index 35e7929fe7..9d89ade8ec 100644 session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; session->flag.quote_paths = 1; /* default behavior is to quote paths for the scp subsystem */ -@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, +@@ -1186,6 +1188,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, const char *desc, const char *lang) { int rc; @@ -417,10 +419,10 @@ index 35e7929fe7..9d89ade8ec 100644 BLOCK_ADJUST(rc, session, session_disconnect(session, reason, desc, lang)); diff --git a/src/transport.c b/src/transport.c -index 21be9d2b80..a8bb588a4b 100644 +index 6d902d3372b4..3b30ff848726 100644 --- a/src/transport.c +++ b/src/transport.c -@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) +@@ -187,6 +187,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) struct transportpacket *p = &session->packet; int rc; int compressed; @@ -428,7 +430,7 @@ index 21be9d2b80..a8bb588a4b 100644 if(session->fullpacket_state == libssh2_NB_state_idle) { session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; -@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) +@@ -318,7 +319,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) if(session->fullpacket_state == libssh2_NB_state_created) { rc = _libssh2_packet_add(session, p->payload, session->fullpacket_payload_len, @@ -437,7 +439,7 @@ index 21be9d2b80..a8bb588a4b 100644 if(rc == LIBSSH2_ERROR_EAGAIN) return rc; if(rc) { -@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) +@@ -329,6 +330,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) session->fullpacket_state = libssh2_NB_state_idle; @@ -449,7 +451,7 @@ index 21be9d2b80..a8bb588a4b 100644 return session->fullpacket_packet_type; } -@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, +@@ -1091,6 +1097,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, session->local.seqno++; @@ -460,3 +462,6 @@ index 21be9d2b80..a8bb588a4b 100644 ret = LIBSSH2_SEND(session, p->outbuf, total_length, LIBSSH2_SOCKET_SEND_FLAGS(session)); if(ret < 0) +-- +2.43.0 + From 145adee2445835c76d59b7c8b8ac2f3ae54fddba Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 3 Jul 2024 21:12:28 +0200 Subject: [PATCH 1355/3013] package/lxc: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, lxc fails to build with output: Applying 0001-src-lxc-syscall_numbers.h-drop-define-1.patch using patch: patching file src/lxc/syscall_numbers.h Hunk #1 FAILED at 53. Hunk #2 FAILED at 92. Hunk #3 FAILED at 129. Hunk #4 FAILED at 166. Hunk #5 FAILED at 203. Hunk #6 FAILED at 272. Hunk #7 FAILED at 309. Hunk #8 FAILED at 346. Hunk #9 FAILED at 383. Hunk #10 FAILED at 440. Hunk #11 FAILED at 477. Hunk #12 FAILED at 518. Hunk #13 FAILED at 759. 13 out of 13 hunks FAILED -- saving rejects to file src/lxc/syscall_numbers.h.rej This commit refreshes the package patch on the current package version. As you can see from [1], the patch was created for version v6.0.0 but has been backported in Buildroot without being rebased on lxc v5.0.0, where loongarch64 support was not yet merged. This is further evidence of the importance of applying patches with fuzz 0. [1] https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- ...-lxc-syscall_numbers.h-drop-define-1.patch | 87 ++++++++++--------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch index 4a944e35b12..d6eb7476dc7 100644 --- a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch +++ b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch @@ -1,4 +1,4 @@ -From 82fe01821cd5cb8548598d7d93b07d6ef3f6b604 Mon Sep 17 00:00:00 2001 +From 964740d28c9a0da52a75d579d7fdfa53df67e925 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 16:50:46 +0100 Subject: [PATCH] src/lxc/syscall_numbers.h: drop define -1 @@ -19,115 +19,120 @@ Fixes: Signed-off-by: Fabrice Fontaine Upstream: https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/lxc/syscall_numbers.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h -index 58840a5981..5e659d1b81 100644 +index ae5fdd0641c6..5dc1259fef1c 100644 --- a/src/lxc/syscall_numbers.h +++ b/src/lxc/syscall_numbers.h -@@ -53,7 +53,6 @@ - #elif defined __loongarch64 - #define __NR_keyctl 219 +@@ -51,7 +51,6 @@ + #define __NR_keyctl 5241 + #endif #else - #define -1 #warning "__NR_keyctl not defined for your architecture" #endif #endif -@@ -92,7 +91,6 @@ - #elif defined __loongarch64 - #define __NR_memfd_create 279 +@@ -88,7 +87,6 @@ + #define __NR_memfd_create 5314 + #endif #else - #define -1 #warning "__NR_memfd_create not defined for your architecture" #endif #endif -@@ -129,7 +127,6 @@ - #elif defined __loongarch64 - #define __NR_pivot_root 41 +@@ -123,7 +121,6 @@ + #define __NR_pivot_root 5151 + #endif #else - #define -1 #warning "__NR_pivot_root not defined for your architecture" #endif #endif -@@ -166,7 +163,6 @@ - #elif defined __loongarch64 - #define __NR_setns 268 +@@ -158,7 +155,6 @@ + #define __NR_setns 5303 + #endif #else - #define -1 #warning "__NR_setns not defined for your architecture" #endif #endif -@@ -203,7 +199,6 @@ - #elif defined __loongarch64 - #define __NR_sethostname 161 +@@ -193,7 +189,6 @@ + #define __NR_sethostname 5165 + #endif #else - #define -1 #warning "__NR_sethostname not defined for your architecture" #endif #endif -@@ -272,7 +267,6 @@ - #elif defined __loongarch64 - #define __NR_signalfd4 74 +@@ -260,7 +255,6 @@ + #define __NR_signalfd4 5283 + #endif #else - #define -1 #warning "__NR_signalfd4 not defined for your architecture" #endif #endif -@@ -309,7 +303,6 @@ - #elif defined __loongarch64 - #define __NR_unshare 97 +@@ -295,7 +289,6 @@ + #define __NR_unshare 5262 + #endif #else - #define -1 #warning "__NR_unshare not defined for your architecture" #endif #endif -@@ -346,7 +339,6 @@ - #elif defined __loongarch64 - #define __NR_bpf 280 +@@ -330,7 +323,6 @@ + #define __NR_bpf 5315 + #endif #else - #define -1 #warning "__NR_bpf not defined for your architecture" #endif #endif -@@ -383,7 +375,6 @@ - #elif defined __loongarch64 - #define __NR_faccessat 48 +@@ -365,7 +357,6 @@ + #define __NR_faccessat 5259 + #endif #else - #define -1 #warning "__NR_faccessat not defined for your architecture" #endif #endif -@@ -440,7 +431,6 @@ - #elif defined __loongarch64 - #define __NR_seccomp 277 +@@ -420,7 +411,6 @@ + #define __NR_seccomp 5312 + #endif #else - #define -1 #warning "__NR_seccomp not defined for your architecture" #endif #endif -@@ -477,7 +467,6 @@ - #elif defined __loongarch64 - #define __NR_gettid 178 +@@ -455,7 +445,6 @@ + #define __NR_gettid 5178 + #endif #else - #define -1 #warning "__NR_gettid not defined for your architecture" #endif #endif -@@ -518,7 +507,6 @@ - #elif defined __loongarch64 - #define __NR_execveat 281 +@@ -494,7 +483,6 @@ + #define __NR_execveat 5316 + #endif #else - #define -1 #warning "__NR_execveat not defined for your architecture" #endif #endif -@@ -759,7 +747,6 @@ - #elif defined __loongarch64 - #define __NR_personality 92 +@@ -733,7 +721,6 @@ + #define __NR_personality (132 + 5000) + #endif #else - #define -1 #warning "__NR_personality not defined for your architecture" #endif #endif +-- +2.43.0 + From a82ad53371e4d4181e2ba1fa3842a4f3d036a4ea Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 3 Jul 2024 21:24:52 +0200 Subject: [PATCH 1356/3013] package/memstat: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, memstat fails to build with output: Applying 0001-PATH_MAX.patch using patch: patching file memstat.c Hunk #1 FAILED at 19. 1 out of 1 hunk FAILED -- saving rejects to file memstat.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- package/memstat/0001-PATH_MAX.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/memstat/0001-PATH_MAX.patch b/package/memstat/0001-PATH_MAX.patch index 0c3617a61b5..14ca6a0078e 100644 --- a/package/memstat/0001-PATH_MAX.patch +++ b/package/memstat/0001-PATH_MAX.patch @@ -1,6 +1,8 @@ Add missing #include for PATH_MAX Signed-off-by: Maarten ter Huurne +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- memstat-0.8.org/memstat.c 2009-06-08 14:38:05.000000000 +0200 +++ memstat-0.8/memstat.c 2014-09-12 03:55:43.096035374 +0200 @@ -11,4 +13,4 @@ Signed-off-by: Maarten ter Huurne +#include /* blacklist devices that just map physical memory */ - char *blacklist[] = { "/dev/mem", + char *blacklist[] = { From 99423ee495ee28789edcc98ff8f92876a294dc37 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 3 Jul 2024 21:58:32 +0200 Subject: [PATCH 1357/3013] package/ncmpc: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, ncmpc fails to build with output: Applying 0001-meson.build-add-atomic-dependency-for-sparc.patch using patch: patching file meson.build Hunk #1 succeeded at 232 (offset 58 lines). Hunk #2 FAILED at 355. 1 out of 2 hunks FAILED -- saving rejects to file meson.build.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .checkpackageignore | 1 - ...n.build-add-atomic-dependency-for-sparc.patch | 16 +++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 9a7a3af757d..0a1d2627455 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1053,7 +1053,6 @@ package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream -package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream package/neard/S53neard Shellcheck lib_sysv.Indent lib_sysv.Variables diff --git a/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch b/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch index fd245897605..2b726b74375 100644 --- a/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch +++ b/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch @@ -1,4 +1,4 @@ -From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001 +From 72ef4c1c3c11fc05c057f2b40b87de92a573f2eb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 Feb 2019 21:42:01 +0100 Subject: [PATCH] meson.build: add atomic dependency for sparc @@ -11,16 +11,18 @@ Fixes: - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45] +Upstream: https://github.com/MusicPlayerDaemon/ncmpc/pull/45 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meson.build b/meson.build -index 2e6defc..b393e39 100644 +index fa0eff9408b6..819674cbede4 100644 --- a/meson.build +++ b/meson.build -@@ -174,6 +174,9 @@ else +@@ -232,6 +232,9 @@ else pcre_dep = declare_dependency() endif @@ -30,14 +32,14 @@ index 2e6defc..b393e39 100644 inc = include_directories( 'src', -@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc', +@@ -445,6 +448,7 @@ ncmpc = executable('ncmpc', sources, include_directories: inc, dependencies: [ + atomic_dep, thread_dep, - boost_dep, + event_dep, pcre_dep, -- -2.14.1 +2.43.0 From 3ebc7c69d56430c34eba4c869d1d4fe4d1e8de55 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 2 Jul 2024 15:19:25 +0200 Subject: [PATCH 1358/3013] support/testing: new rt-tests runtime test Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- DEVELOPERS | 1 + .../testing/tests/package/test_rt_tests.py | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 support/testing/tests/package/test_rt_tests.py diff --git a/DEVELOPERS b/DEVELOPERS index 6d9fcd97dfe..90d1a111ab4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1893,6 +1893,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_python_sympy.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_rt_tests.py F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py F: support/testing/tests/package/test_socat.py diff --git a/support/testing/tests/package/test_rt_tests.py b/support/testing/tests/package/test_rt_tests.py new file mode 100644 index 00000000000..0795d7afd2f --- /dev/null +++ b/support/testing/tests/package/test_rt_tests.py @@ -0,0 +1,39 @@ +import os + +import infra.basetest + + +class TestRtTests(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_RT_TESTS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We cannot easily test realtime properties in a CI/emulator + # environment. Instead, this test runs few rt-tests programs + # in small scenario configurations (to make sure the execution + # will remain short). It just makes sure the execution returns + # a success code. Also, to avoid making the logs too big, we + # generally pass the "--quiet" option to have a summary at the + # end of the execution. + test_cmds = [ + "cyclictest --quiet --loops=200", + "hackbench --fds=2 --groups=3 --loops=5", + "pi_stress --inversions=100", + "ptsematest --quiet --loops=100", + "rt-migrate-test --quiet --loops=5", + "signaltest --quiet --loops=200", + "sigwaittest --quiet --loops=100" + ] + + for cmd in test_cmds: + self.assertRunOk(cmd) From 4ef5ca26a5ac57af0f835d69e8ce3c406e5dde0a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Jun 2024 22:28:24 +0200 Subject: [PATCH 1359/3013] package/avro-c: fix build with gcc 14 Fix the following build failure with gcc 14: In file included from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro/legacy.h:33, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro/io.h:31, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro/consumer.h:30, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/src/avro.h:28, from /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/examples/quickstop.c:18: /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/examples/quickstop.c: In function 'print_person': /home/autobuild/autobuild/instance-6/output-1/build/avro-c-1.11.3/examples/quickstop.c:123:61: error: passing argument 3 of 'first_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] 123 | avro_value_get_string(&first_value, &p, &size); | ^~ | | | int32_t ** {aka int **} Fixes: - http://autobuild.buildroot.org/results/fdbc6a888ba8bb51f4e076a450919477d1378eb3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b39dfdde338bb254b958fbfbe6c7f0fb4e447e34) Signed-off-by: Peter Korsgaard --- ...-Fix-typos-in-docs-and-examples-2795.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch diff --git a/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch b/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch new file mode 100644 index 00000000000..72faaa0abe7 --- /dev/null +++ b/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch @@ -0,0 +1,59 @@ +From 52f051dbeefad0b7e73187becad6c33747b047d3 Mon Sep 17 00:00:00 2001 +From: Sahil Kang +Date: Mon, 11 Mar 2024 03:01:21 -0700 +Subject: [PATCH] AVRO-3957: [C] Fix typos in docs and examples (#2795) + +* AVRO-3957: [C] Fix misformatted type in docs + +Signed-off-by: Sahil Kang +Signed-off-by: Sahil Kang + +* AVRO-3957: [C] Fix type in quickstop example + +This removes the following warning: + + avro/lang/c/examples/quickstop.c:123:40: warning: incompatible pointer types passing 'int32_t **' (aka 'int **') to parameter of type + 'const char **' [-Wincompatible-pointer-types] + avro_value_get_string(&first_value, &p, &size); + +Signed-off-by: Sahil Kang +Signed-off-by: Sahil Kang + +--------- + +Signed-off-by: Sahil Kang +Signed-off-by: Sahil Kang + +Upstream: https://github.com/apache/avro/commit/52f051dbeefad0b7e73187becad6c33747b047d3 +Signed-off-by: Fabrice Fontaine +--- + lang/c/docs/index.txt | 2 +- + lang/c/examples/quickstop.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/index.txt b/docs/index.txt +index a439a052631..df16f9d9678 100644 +--- a/docs/index.txt ++++ b/docs/index.txt +@@ -178,7 +178,7 @@ different versions of the Avro library. That means that it's really + only safe to use these hash values internally within the context of a + single execution of a single application. + +-The +reset+ method “clears out” an +avro_value_t instance, making sure ++The +reset+ method “clears out” an +avro_value_t+ instance, making sure + that it's ready to accept the contents of a new value. For scalars, + this is usually a no-op, since the new value will just overwrite the old + one. For arrays and maps, this removes any existing elements from the +diff --git a/examples/quickstop.c b/examples/quickstop.c +index ff9e9700590..b26dad10c04 100644 +--- a/examples/quickstop.c ++++ b/examples/quickstop.c +@@ -107,7 +107,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema) + if (rval == 0) { + int64_t id; + int32_t age; +- int32_t *p; ++ const char *p; + size_t size; + avro_value_t id_value; + avro_value_t first_value; From c35da0196387968dd86ecb39a2c254d3b376ae51 Mon Sep 17 00:00:00 2001 From: Lance Fredrickson Date: Thu, 13 Jun 2024 07:44:51 -0600 Subject: [PATCH 1360/3013] package/linux-firmware: Add additional firmware fo Intel iwlwifi 9xxx Intel Wireless-AC 9560 looks for iwlwifi-so-a0-jf-b0-*.ucode. Signed-off-by: Lance Fredrickson Signed-off-by: Yann E. MORIN (cherry picked from commit acf158125b7f391a37b3c93ee08dbc6a269ff284) Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 8dcd57fb7c2..13dbc6d98c8 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -583,6 +583,7 @@ endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX),y) LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode +LINUX_FIRMWARE_FILES += iwlwifi-so-a0-jf-b0*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif From 18a7440bb86e9a34641899523e9754d084419666 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 16 Jun 2024 14:43:21 +0200 Subject: [PATCH 1361/3013] package/glibc: drop ignores for 2.38 specific CVEs Commit b5680f53d60 (package/glibc: bump to 2.39) forgot to drop the ignores for the 2.38 specific CVEs. Do that now. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 722804c4a1307e4d2eeae7496c4645da2bb63329) Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 96a850516f5..8bc4cd46664 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -24,34 +24,6 @@ GLIBC_CPE_ID_VENDOR = gnu # allow proper matching with the CPE database. GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) -# Fixed by b25508dd774b617f99419bdc3cf2ace4560cd2d6, which is between -# 2.38 and the version we're really using -GLIBC_IGNORE_CVES += CVE-2023-4527 - -# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between -# 2.38 and the version we're really using -GLIBC_IGNORE_CVES += CVE-2023-4806 - -# Fixed by 750a45a783906a19591fb8ff6b7841470f1f5710, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-4911 - -# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-5156 - -# Fixed by 23514c72b780f3da097ecf33a793b7ba9c2070d2, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-6246 - -# Fixed by d0338312aace5bbfef85e03055e1212dd0e49578, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-6779 - -# Fixed by d37c2b20a4787463d192b32041c3406c2bd91de0, which is between -# 2.38 and the version we're really using. -GLIBC_IGNORE_CVES += CVE-2023-6780 - # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 From b54a3e5a3d4ad3e248f97625c9018e44e641c1f6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 16 Jun 2024 14:43:22 +0200 Subject: [PATCH 1362/3013] package/glibc: security bump to 2.39-74 for post-2.39 security fixes Fixes the following security issues: GLIBC-SA-2024-0004: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) GLIBC-SA-2024-0005: nscd: Stack-based buffer overflow in netgroup cache (CVE-2024-33599) GLIBC-SA-2024-0006: nscd: Null pointer crash after notfound response (CVE-2024-33600) GLIBC-SA-2024-0007: nscd: netgroup cache may terminate daemon on memory allocation failure (CVE-2024-33601) GLIBC-SA-2024-0008: nscd: netgroup cache assumes NSS callback uses in-buffer strings (CVE-2024-33602) In addition, the following bugs are fixed: [19622] network: Support aliasing with struct sockaddr [30701] time: getutxent misbehaves on 32-bit x86 when _TIME_BITS=64 [30994] REP MOVSB performance suffers from page aliasing on Zen 4 [31339] libc: arm32 loader crash after cleanup in 2.36 [31325] mips: clone3 is wrong for o32 [31335] math: Compile glibc with -march=x86-64-v3 should disable FMA4 multi-arch version [31402] libc: clone (NULL, NULL, ...) clobbers %r7 register on s390{,x} [31479] libc: Missing #include in sched_getcpu.c may result in a loss of rseq acceleration [31316] build: Fails test misc/tst-dirname "Didn't expect signal from child: got `Illegal instruction'" on non SSE CPUs [31371] x86-64: APX and Tile registers aren't preserved in ld.so trampoline [31372] dynamic-link: _dl_tlsdesc_dynamic doesn't preserve all caller- saved registers [31429] build: Glibc failed to build with -march=x86-64-v3 [31501] dynamic-link: _dl_tlsdesc_dynamic_xsavec may clobber %rbx [31640] dynamic-link: POWER10 ld.so crashes in elf_machine_load_address with GCC 14 [31676] Configuring with CC="gcc -march=x86-64-v3" --with-rtld-early-cflags=-march=x86-64 results in linker failure [31677] nscd: nscd: netgroup cache: invalid memcpy under low memory/storage conditions [31678] nscd: nscd: Null pointer dereferences after failed netgroup cache insertion [31679] nscd: nscd: netgroup cache may terminate daemon on memory allocation failure [31680] nscd: nscd: netgroup cache assumes NSS callback uses in-buffer strings [31686] dynamic-link: Stack-based buffer overflow in parse_tunables_string [31719] dynamic-link: --enable-hardcoded-path-in-tests doesn't work with -Wl,--enable-new-dtags [31782] Test build failure with recent GCC trunk (x86/tst-cpu-features-supports.c:69:3: error: parameter to builtin not valid: avx5124fmaps) [31798] pidfd_getpid.c is miscompiled by GCC 6.4 [31867] build: "CPU ISA level is lower than required" on SSE2-free CPUs [31883] build: ISA level support configure check relies on bashism / is otherwise broken for arithmetic Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 7bfea9372f1842279a8f57b5fc4428bbae822e91) Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 14 +++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 94b7819a30c..aaf7848a7cf 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 2ba018b344e0e8330dcadd6130f4174f0fc2502b2e032210345e0e5a2f7ed12e glibc-2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e.tar.gz +sha256 2858e8e47c4c0df32b526c56d5590ec939e8178201ee9526bb070999ce4aa1f2 glibc-2.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 8bc4cd46664..db6fa55819f 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e +GLIBC_VERSION = 2.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -24,6 +24,18 @@ GLIBC_CPE_ID_VENDOR = gnu # allow proper matching with the CPE database. GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) +# Fixed by glibc-2.39-31-g31da30f23cddd36db29d5b6a1c7619361b271fb4 +GLIBC_IGNORE_CVES += CVE-2024-2961 + +# Fixed by glibc-2.39-35-g1263d583d2e28afb8be53f8d6922f0842036f35d +GLIBC_IGNORE_CVES += CVE-2024-33599 + +# Fixed by glibc-2.39-37-gc99f886de54446cd4447db6b44be93dabbdc2f8b +GLIBC_IGNORE_CVES += CVE-2024-33600 + +# Fixed by glibc-2.39-38-ga9a8d3eebb145779a18d90e3966009a1daa63cd +GLIBC_IGNORE_CVES += CVE-2024-33601 CVE-2024-33602 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index f304ba8021b..6940900f8da 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.39-5-ge0910f1d3278f05439fb434ee528fc9be1b6bd5e +LOCALEDEF_VERSION = 2.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From 5bdb98d5373086f3a831d5b7a540ea4bafc25230 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 5 Jun 2024 08:31:58 +0200 Subject: [PATCH 1363/3013] package/uuu: bump to version 1.5.182 This is a hot fix for version 1.5.181. Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.182 Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit ecb7a9fd660cff6e9bbae42c7eea179c7c207497) Signed-off-by: Peter Korsgaard --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 787bf7d4870..9dc286c41ff 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,3 +1,3 @@ # locally computed -sha256 5e3bab017cf1b7a6a85d0cd46c0de6660de9b93fb24b0a21d8ecc4fb9f663e2c uuu_source-uuu_1.5.181.tar.gz +sha256 723d3da358e6af974a056e3adbcb105fac9dad4b87544de0d22b8c974a8037aa uuu_source-uuu_1.5.182.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 056b2a8c52d..63556b9938a 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.181 +UUU_VERSION = 1.5.182 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From 94808d630df4f6f3437a3e3bb3d490ee8375e48f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Jun 2024 10:15:51 +0200 Subject: [PATCH 1364/3013] package/ntp: bump to version 4.2.8p18 diff COPYRIGHT: -* Copyright (c) Network Time Foundation 2011-2023 * +* Copyright (c) Network Time Foundation 2011-2024 * Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (cherry picked from commit 49bd6bb638ff73eae3b486b207201382d46a6c05) Signed-off-by: Peter Korsgaard --- package/ntp/ntp.hash | 6 +++--- package/ntp/ntp.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index 96e21bf2df7..44f3486d7ab 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,4 +1,4 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.8p17.tar.gz.sha256 -sha256 103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866 ntp-4.2.8p17.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.8p18.tar.gz.sha256 +sha256 cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5 ntp-4.2.8p18.tar.gz # Locally computed -sha256 06246b8c15ccc1a1873c78525c810f0802e68f383e79ee041e06d1ab9cbf80a4 COPYRIGHT +sha256 45b6e5a0a5f0ac4afdd9e23caa2241779e4da463e4dba32a41b4dbd61577b2a3 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index e64f6308ece..1a7c7e79376 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -6,7 +6,7 @@ NTP_VERSION_MAJOR = 4.2 NTP_VERSION_MINOR = 8 -NTP_VERSION_POINT = 17 +NTP_VERSION_POINT = 18 NTP_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR)p$(NTP_VERSION_POINT) NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent From db309fb4faec1cffb491f87daf7ec7cece8d512a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 9 Jun 2024 19:21:48 +0200 Subject: [PATCH 1365/3013] support/testing: add ntp runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit c986928affc59f5bbefae8c7af963eaf45fdc8c8) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_ntp.py | 86 +++++++++++++++++++ .../test_ntp/rootfs-overlay/etc/ntp.conf | 10 +++ 3 files changed, 98 insertions(+) create mode 100644 support/testing/tests/package/test_ntp.py create mode 100644 support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf diff --git a/DEVELOPERS b/DEVELOPERS index 805b8215ec5..bb346b3619a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1870,6 +1870,8 @@ F: support/testing/tests/package/test_netsnmp/ F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_ntp.py +F: support/testing/tests/package/test_ntp/ F: support/testing/tests/package/test_numactl.py F: support/testing/tests/package/test_numactl/ F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_ntp.py b/support/testing/tests/package/test_ntp.py new file mode 100644 index 00000000000..13fff6419be --- /dev/null +++ b/support/testing/tests/package/test_ntp.py @@ -0,0 +1,86 @@ +import os +import re +import time + +import infra.basetest + + +class TestNtp(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_ntp/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_NTP=y + BR2_PACKAGE_NTP_NTPD=y + BR2_PACKAGE_NTP_NTPQ=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def dict_from_ntpq_output(self, output): + d = {} + for line in output: + if ':' not in line: + continue + fields = re.split(r":", line, maxsplit=2) + name = fields[0].strip() + value = fields[1].strip() + d[name] = value + return d + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check our binaries can execute. + self.assertRunOk("ntpd --version") + self.assertRunOk("ntpq --version") + + # The ntp daemon is expected to be started from init startup + # scripts, for the Buildroot package recipe. We wait a bit + # here to let the daemon settle. The next test step checks for + # the local peer to be the system peer (by checking the + # '*'). If querying the peers too soon after startup the peer + # will not be marked as such. + time.sleep(3 * self.timeout_multiplier) + + # We query the ntp daemon peers. From our test configuration + # file, we should have exactly one. + out, ret = self.emulator.run("ntpq --peers") + self.assertEqual(ret, 0) + # ntpq --peers produces two lines of headers. So we check we + # have at least 3 lines of output. + self.assertGreaterEqual(len(out), 3) + # We check we see our undisciplined local clock and it's the + # system peer. + self.assertTrue(out[2].startswith("*LOCAL(0)")) + + # We query the refid variable. We expect to see our + # undisciplined local clock. + out, ret = self.emulator.run("ntpq -c 'readvar 0 refid'") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "refid=LOCAL(0)") + + # We query the ntp system info. We check the reference ID is + # the same as in the test configuration file. + out, ret = self.emulator.run("ntpq -c sysinfo") + self.assertEqual(ret, 0) + sysinfo = self.dict_from_ntpq_output(out) + refid = "reference ID" + self.assertIn(refid, sysinfo) + self.assertEqual(sysinfo[refid], "127.127.1.0") + + # Finally, we query the ntp system statistics. We check we can + # see some uptime. We waited a bit at the beginning of this + # test, plus the few queries we previously did should have + # accumulated some uptime. + out, ret = self.emulator.run("ntpq -c sysstats") + self.assertEqual(ret, 0) + sysstats = self.dict_from_ntpq_output(out) + up = "uptime" + self.assertIn(up, sysstats) + self.assertGreater(int(sysstats[up]), 0) diff --git a/support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf b/support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf new file mode 100644 index 00000000000..2ead3deb6ab --- /dev/null +++ b/support/testing/tests/package/test_ntp/rootfs-overlay/etc/ntp.conf @@ -0,0 +1,10 @@ +# Set an undisciplined local clock for testing without the need of +# network connectivity. +server 127.127.1.0 iburst prefer +fudge 127.127.1.0 stratum 10 + +# Keep standard access control setup. The test is doing local queries +# from 127.0.0.1. +restrict default nomodify nopeer noquery limited kod +restrict 127.0.0.1 +restrict [::1] From 327a5c349da64b697bb1e94425741b50eefe8f50 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Jun 2024 21:52:08 +0200 Subject: [PATCH 1366/3013] package/php: security bump version to 8.3.8 Fixes CVE-2024-4577, CVE-2024-5458, CVE-2024-5585 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/429 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit ecf060a2ff93626fb5fbe1c52b8d42b6ee0fbb5b) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 9b25eabd32b..cd5f8a1c1bd 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 d53433c1ca6b2c8741afa7c524272e6806c1e895e5912a058494fea89988570a php-8.3.7.tar.xz +sha256 aea358b56186f943c2bbd350c9005b9359133d47e954cfc561385319ae5bb8d7 php-8.3.8.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index ad2d901dfd7..268b8e0a62e 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.7 +PHP_VERSION = 8.3.8 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 07ead503de6da876182460176cd2ad439c064266 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 28 May 2024 10:23:56 +0200 Subject: [PATCH 1367/3013] package/openssh: fix build failure with gcc 11.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch fix the following build failure: output/host/bin/arm-buildroot-linux-uclibcgnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -pipe -Wno-error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleading-indentation -fno-strict-aliasing -D_FORTIFY_SOURCE=2 -ftrapv -fzero-call-used-regs=used -fno-builtin-memset -fstack-protector-strong -fPIC -I. -I.. -I. -I./.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE -DHAVE_CONFIG_H -c port-aix.c sha2.c: In function ‘SHA256Init’: sha2.c:360:1: sorry, unimplemented: ‘-fzero-call-used-regs’ not supported on this target 360 | } | ^ make[3]: *** [Makefile:106: sha2.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [Makefile:199: openbsd-compat/libopenbsd-compat.a] Error 2 This commit applies an upstream patch that improves the detection of -fzero-call-used-regs=used. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit 4aff617b9591dc46d965eaa00f9701943e0cd723) Signed-off-by: Peter Korsgaard --- ...tection-of-fzero-call-used-regs-used.patch | 32 +++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 35 insertions(+) create mode 100644 package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch diff --git a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch new file mode 100644 index 00000000000..1b91b15a798 --- /dev/null +++ b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch @@ -0,0 +1,32 @@ +From f9193f03db0029fc9c31fbdb5c66a2737446bd8f Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Mon, 25 Mar 2024 09:28:02 +1100 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=used. + +Should better detect problems with gcc 13 on m68k. bz#3673 from Colin +Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 + +Signed-off-by: Darren Tucker +Upstream: https://github.com/openssh/openssh-portable/commit/f9193f03db0029fc9c31fbdb5c66a2737446bd8f +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 033df501c3d8..176a8d1c9282 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,7 +20,10 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++int i; ++double d; + const char *f3(int s) { ++ i = (int)d; + return s ? "good" : "gooder"; + } + int main(int argc, char **argv) { +-- +2.43.0 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index d7f4db59ca3..5a568d5fd17 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-Improve-detection-of-fzero-call-used-regs-used.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From 2ebca64aabda9f84356a2822e4275c22863b5815 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:22:22 +0200 Subject: [PATCH 1368/3013] package/{mesa3d, mesa3d-headers}: bump version to 24.0.9 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-May/000761.html https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html Removed two patches which are included in this version 24.0.8. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c8057515a429d531f735c72042656c3bd0efa700) Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- .../0006-drisw-fix-build-without-dri3.patch | 58 ------------------- ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 -------------- package/mesa3d/mesa3d.hash | 6 +- package/mesa3d/mesa3d.mk | 2 +- 5 files changed, 5 insertions(+), 105 deletions(-) delete mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch delete mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index e35774a9429..33c60b285f9 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.7 +MESA3D_HEADERS_VERSION = 24.0.9 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch deleted file mode 100644 index ab27d384cf8..00000000000 --- a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3ab46dcfda9edf5c9bc27c8f5031146d9d9d8ade Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 18 Jan 2024 22:50:16 +0100 -Subject: [PATCH] drisw: fix build without dri3 - -commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") -added dri3_priv.h header and dri3_check_multibuffer() function in drisw that -can be build without dri3. - - i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': - drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' - collect2: error: ld returned 1 exit status - -Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using -dri3_check_multibuffer(). - -Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") - -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 - -Signed-off-by: Romain Naour ---- - src/glx/drisw_glx.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c -index 3d3f75259bc..4b19e2d7707 100644 ---- a/src/glx/drisw_glx.c -+++ b/src/glx/drisw_glx.c -@@ -32,7 +32,9 @@ - #include - #include "dri_common.h" - #include "drisw_priv.h" -+#ifdef HAVE_DRI3 - #include "dri3_priv.h" -+#endif - #include - #include - #include -@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, - goto handle_error; - } - -+#ifdef HAVE_DRI3 - if (pdpyp->zink) { - bool err; - psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); -@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, - goto handle_error; - } - } -+#endif - - glx_config_destroy_list(psc->base.configs); - psc->base.configs = configs; --- -2.43.0 - diff --git a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch deleted file mode 100644 index f9e4d50fd79..00000000000 --- a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 83b4ff6616708bd7ba5981d22cd5211ca6787d58 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 24 Jan 2024 14:28:32 +0100 -Subject: [PATCH] glxext: don't try zink if not enabled in mesa - -Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") -added an automatic zink fallback even when the zink gallium is not -enabled at build time. - -It leads to unexpected error log while loading drisw driver and -zink is not installed on the rootfs: - - MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so - -Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") - -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 - -Signed-off-by: Romain Naour ---- - src/glx/glxext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/glx/glxext.c b/src/glx/glxext.c -index 39d5f08bdcf..e106eb40046 100644 ---- a/src/glx/glxext.c -+++ b/src/glx/glxext.c -@@ -904,9 +904,11 @@ __glXInitialize(Display * dpy) - #endif /* HAVE_DRI3 */ - if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) - dpyPriv->dri2Display = dri2CreateDisplay(dpy); -+#if defined(HAVE_ZINK) - if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) - try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && - !getenv("GALLIUM_DRIVER"); -+#endif /* HAVE_ZINK */ - } - #endif /* GLX_USE_DRM */ - if (glx_direct) --- -2.43.0 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index f2c25464f42..d506d398b88 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-May/000758.html -sha256 7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a mesa-24.0.7.tar.xz -sha512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c mesa-24.0.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html +sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz +sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 6bccdaed047..ce460c44758 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.7 +MESA3D_VERSION = 24.0.9 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 9d22642eb1f5789f7df9652490733562f1e57330 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:22:46 +0200 Subject: [PATCH 1369/3013] package/tor: bump version to 0.4.8.12 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes https://forum.torproject.org/t/stable-release-0-4-8-12/13060 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b0fe6d1be9b306addf45e3722f45daa2de4ac4e5) Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 4052f11736c..bea590b133a 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.11.tar.gz.sha256sum -sha256 8f2bdf90e63380781235aa7d604e159570f283ecee674670873d8bb7052c8e07 tor-0.4.8.11.tar.gz +# From https://dist.torproject.org/tor-0.4.8.12.tar.gz.sha256sum +sha256 ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874 tor-0.4.8.12.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 9986a5f472a..4d7fabc79f4 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.11 +TOR_VERSION = 0.4.8.12 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 99e58bdad0f5a1e3c82ee2b03c4f211d4033ae8f Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Mon, 17 Jun 2024 09:55:38 +0200 Subject: [PATCH 1370/3013] package/redis: bump to v7.2.5 From the release notes: ================================================================================ Redis 7.2.5 Released Thu 16 May 2024 12:00:00 IST ================================================================================ Upgrade urgency MODERATE: Program an upgrade of the server, but it's not urgent. Bug fixes ========= * A single shard cluster leaves failed replicas in CLUSTER SLOTS instead of removing them (#12824) * Crash in LSET command when replacing small items and exceeding 4GB (#12955) * Blocking commands timeout is reset due to re-processing command (#13004) * Conversion of numbers in Lua args to redis args can fail. Bug introduced in 7.2.0 (#13115) Bug fixes in CLI tools ====================== * redis-cli: --count (for --scan, --bigkeys, etc) was ignored unless --pattern was also used (#13092) * redis-check-aof: incorrectly considering data in manifest format as MP-AOF (#12958) Signed-off-by: Titouan Christophe Signed-off-by: Thomas Petazzoni (cherry picked from commit 61a7edc0c89b336d63551469f5a2291418fdbc19) Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 378b9303744..5c3a5ea4d8e 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59 redis-7.2.4.tar.gz +sha256 5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d redis-7.2.5.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 2680b11b74b..852bf31ca03 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.2.4 +REDIS_VERSION = 7.2.5 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From e1c896b10f56666c172e87a1aa18907862e6c178 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 18 Jun 2024 15:14:39 +0000 Subject: [PATCH 1371/3013] support/scripts/apply-patches: fallback $TAR to `tar` Commit f77d698f83b230f7efcb7d28af3aacfa9589cc89 changed apply-patches to use $TAR instead of `tar`, but did not define a fallback if $TAR is not defined. This results in an error when calling apply-patches.sh from outside Buildroot's Makefile. Our team uses this script to setup local checkouts of Buildroot package's with patches for development. Signed-off-by: Brandon Maier Signed-off-by: Peter Korsgaard (cherry picked from commit 118c824b565442bfe1d4ae1c0a39d330e624b854) Signed-off-by: Peter Korsgaard --- support/scripts/apply-patches.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 4e633b23bef..73aa6c8e5fe 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -46,6 +46,8 @@ patchdir=${2-../kernel-patches} shift 2 patchpattern=${@-*} +export TAR=${TAR:-tar} + # use a well defined sorting order export LC_COLLATE=C From 14e82c1f17a18a6d9ccb299662688e3293b87d18 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:44 +0200 Subject: [PATCH 1372/3013] package/libopenssl: use $(RM) instead of rm Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit b39286acfc134d66d56b78720c4a6a7547e16b16) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index d209bb8e96b..88debf114a3 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -135,8 +135,8 @@ endef define LIBOPENSSL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install - rm -rf $(TARGET_DIR)/usr/lib/ssl - rm -f $(TARGET_DIR)/usr/bin/c_rehash + $(RM) -rf $(TARGET_DIR)/usr/lib/ssl + $(RM) -f $(TARGET_DIR)/usr/bin/c_rehash endef # libdl has no business in a static build @@ -166,7 +166,7 @@ endif ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES - rm -rf $(TARGET_DIR)/usr/lib/engines-1.1 + $(RM) -rf $(TARGET_DIR)/usr/lib/engines-1.1 endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES endif From 124b8f724e339ed132eec12bdcae41740752f826 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:45 +0200 Subject: [PATCH 1373/3013] package/libopenssl: replace engines-1.1 to engines-3 The bump to version 3.0.9 in commit 3c66f65a6a54 (package/libopenssl: bump version to 3.0.9), and all subsequent updates, forgot to change the directory name, which remained that of version 1.1. The patch fixes the directory name to be consistent with the version. In the case the library was not built with engine support, this resulted in the presence of files in the root file system that should have been removed. Fixes: 3c66f65a6a549930870f2c0d98abb5ca9321d2a5 Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 7f9291bfe4db9f840fe0e3c4b0df2ff4acd9560c) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 88debf114a3..14313a80fe7 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -166,7 +166,7 @@ endif ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES - $(RM) -rf $(TARGET_DIR)/usr/lib/engines-1.1 + $(RM) -rf $(TARGET_DIR)/usr/lib/engines-3 endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES endif From 0eccc6d090d17309c836885b785cf133a6950bb0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:46 +0200 Subject: [PATCH 1374/3013] package/libopenssl: use consistent logic The patch expresses the same condition in positive logic, consistent with what has been coded in other parts of the module and generally in Buildroot. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit c2761b52663155e9247dc23350f7159493837d0e) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 14313a80fe7..ed36fb593dd 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -164,7 +164,7 @@ endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_BIN endif -ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES $(RM) -rf $(TARGET_DIR)/usr/lib/engines-3 endef From 34b358bf2cb093ebb9a1e72f8cdce07f87917cf0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:47 +0200 Subject: [PATCH 1375/3013] package/libopenssl: use `no-apps' configuration option With version 3.2.0 of OpenSSL, the "no-apps" configuration option was added, which does not build apps, e.g. the openssl program. This is handy for minimization. This option also disables tests. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit e0bdc5ddb8a64e89709db72ad550334618cc0c0c) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index ed36fb593dd..fe472e2c7a1 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -84,6 +84,7 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-libfuzzer \ no-fuzz-afl \ no-afalgeng \ + $(if $(BR2_PACKAGE_LIBOPENSSL_BIN),,no-apps) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ @@ -156,14 +157,6 @@ endef LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_PERL_SCRIPTS endif -ifeq ($(BR2_PACKAGE_LIBOPENSSL_BIN),) -define LIBOPENSSL_REMOVE_BIN - $(RM) -f $(TARGET_DIR)/usr/bin/openssl - $(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.*,c_*} -endef -LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_BIN -endif - ifeq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),) define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES $(RM) -rf $(TARGET_DIR)/usr/lib/engines-3 From c366ecb95e154ef7cc84179915d68654c8c96737 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 21 Jun 2024 18:10:48 +0200 Subject: [PATCH 1376/3013] package/libopenssl: no-engine Even though the "no-engine" option effectively disables the compilation of the engine, it still creates the installation directory, which ends up being empty. For this reason, the patch does not remove the hook for removing the directory if the BR2_PACKAGE_LIBOPENSSL_ENGINES option is not enabled. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 623d3bbe43e9193aa8e3395367d01af59071b859) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fe472e2c7a1..89a9189bb85 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -85,6 +85,7 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-afl \ no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_BIN),,no-apps) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENGINES),,no-engine) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ From eba94bc4d2178e78f4abd8942db680b4d2b6ae6f Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 21 May 2024 16:36:15 +0200 Subject: [PATCH 1377/3013] package/fluent-bit: bump to v3.0.4 Release Notes: - https://fluentbit.io/announcements/v3.0.4 Fixes: - CVE-2024-4323 (https://www.tenable.com/security/research/tra-2024-17) Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle (cherry picked from commit 8beda6f2210e19e2fd10ff16c1ffa49b4760df11) Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index a53f6dba517..6fcf4fac3e7 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2f3b82e8b7802fe92625009531592f12d500ff61a02ecf4cd27e0f138a6dc566 fluent-bit-3.0.3.tar.gz +sha256 b439f89e879e538849e9106fe450bcf58da5034dfc316af4d2a837423786ed11 fluent-bit-3.0.4.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index b235c3abf46..13bd4ddecb1 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 3.0.3 +FLUENT_BIT_VERSION = 3.0.4 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From 3805820d550467121d74320a8fb76663fb57b698 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 6 Jul 2024 12:31:11 +0200 Subject: [PATCH 1378/3013] package/janus-gateway: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, janus-gateway fails to build with output: Applying 0002-Add-test-for-Wunused-but-set-variable.patch using patch: patching file src/Makefile.am Hunk #1 succeeded at 132 (offset -19 lines). patching file configure.ac Hunk #1 succeeded at 12 (offset -1 lines). Hunk #2 FAILED at 67. 1 out of 2 hunks FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...Add-test-for-Wunused-but-set-variable.patch | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0a1d2627455..9e9c493711e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -767,7 +767,6 @@ package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch package/iucode-tool/S00iucode-tool lib_sysv.Variables package/iwd/S40iwd Shellcheck lib_sysv.Variables package/janus-gateway/0001-disable-ssp.patch lib_patch.Upstream -package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch lib_patch.Upstream package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch lib_patch.Upstream package/jose/0002-man-add-option-to-skip-building-man-pages.patch lib_patch.Upstream package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index 31796d6e28e..4596577af39 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -20,8 +20,10 @@ Signed-off-by: Bernd Kuhls Signed-off-by: Adam Duskett [rebased against v1.0.3) Signed-off-by: Fabrice Fontaine -[Upstream status: rejected -(https://github.com/meetecho/janus-gateway/pull/1789)] +Upstream: rejected (https://github.com/meetecho/janus-gateway/pull/1789) +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi + --- Makefile.am | 1 + configure.ac | 6 ++- @@ -30,10 +32,10 @@ Signed-off-by: Fabrice Fontaine create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/src/Makefile.am b/src/Makefile.am -index f961fdb..3ddbe59 100644 +index 96d361e53be0..a8bfd17c930c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -151,6 +151,7 @@ janus_CFLAGS = \ +@@ -132,6 +132,7 @@ janus_CFLAGS = \ -DEVENTDIR=\"$(eventdir)\" \ -DLOGGERDIR=\"$(loggerdir)\" \ -DCONFDIR=\"$(confdir)\" \ @@ -42,10 +44,10 @@ index f961fdb..3ddbe59 100644 $(NULL) diff --git a/configure.ac b/configure.ac -index ca17a29..beef91a 100644 +index c37c85b7ab06..5afe0ef0bbff 100644 --- a/configure.ac +++ b/configure.ac -@@ -13,6 +13,9 @@ AM_SILENT_RULES([yes]) +@@ -12,6 +12,9 @@ AM_SILENT_RULES([yes]) AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC @@ -55,7 +57,7 @@ index ca17a29..beef91a 100644 LT_PREREQ([2.2]) LT_INIT -@@ -64,8 +67,7 @@ clang*) +@@ -65,8 +68,7 @@ cc*) CFLAGS="$CFLAGS \ -Wcast-align \ -Wno-override-init \ @@ -64,7 +66,7 @@ index ca17a29..beef91a 100644 + -Wunsafe-loop-optimizations" esac - JANUS_VERSION=103 + JANUS_VERSION=1102 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 From 2898d7bef63adf677bdb8c0d0d4d7da93bddc7e8 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 6 Jul 2024 15:57:31 +0200 Subject: [PATCH 1379/3013] package/dahdi-tools: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, dahdi-tools fails to build with output: Applying 0002-no-perl-manpages.patch using patch: patching file xpp/Makefile.am Hunk #2 FAILED at 58. Hunk #3 succeeded at 149 (offset 3 lines). 1 out of 3 hunks FAILED -- saving rejects to file xpp/Makefile.am.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/dahdi-tools/0002-no-perl-manpages.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/dahdi-tools/0002-no-perl-manpages.patch b/package/dahdi-tools/0002-no-perl-manpages.patch index dae1b6c3c0f..5f24c819948 100644 --- a/package/dahdi-tools/0002-no-perl-manpages.patch +++ b/package/dahdi-tools/0002-no-perl-manpages.patch @@ -6,6 +6,8 @@ so the install step fails. Just disable them. Signed-off-by: "Yann E. MORIN" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -durN dahdi-tools-2.11.0.orig/xpp/Makefile.am dahdi-tools-2.11.0/xpp/Makefile.am --- dahdi-tools-2.11.0.orig/xpp/Makefile.am 2015-12-22 21:19:12.000000000 +0100 @@ -25,8 +27,8 @@ diff -durN dahdi-tools-2.11.0.orig/xpp/Makefile.am dahdi-tools-2.11.0/xpp/Makefi -man_MANS += $(perl_mans) CLEANFILES = $(perl_checks) $(perl_mans) - if PBX_USB -@@ -147,8 +145,6 @@ + dracutconfdir = @prefix@/lib/dracut/dracut.conf.d +@@ -150,8 +148,6 @@ astribank_allow.8 \ astribank_is_starting.8 From 9d8883971da90339d3b9825a9df02139ae0ae268 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 6 Jul 2024 16:20:50 +0200 Subject: [PATCH 1380/3013] package/yajl: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, yajl fails to build with output: Applying 0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch using patch: patching file src/CMakeLists.txt Hunk #1 FAILED at 37. Hunk #2 succeeded at 52 (offset 1 line). Hunk #3 succeeded at 79 (offset 1 line). 1 out of 3 hunks FAILED -- saving rejects to file src/CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...isable-shared-library-build-when-BUILD_SHARED.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch index 53decca6498..e9170772d43 100644 --- a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch @@ -7,6 +7,8 @@ When BUILD_SHARED_LIBS is off, you don't want to build the shared library. Signed-off-by: Samuel Martin +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) @@ -15,15 +17,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99cf9e9..9e9c77d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) - +@@ -38,6 +38,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) + SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl) +IF(BUILD_SHARED_LIBS) ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) #### setup shared library version number -@@ -51,6 +52,7 @@ IF(APPLE) +@@ -52,6 +53,7 @@ IF(APPLE) SET_TARGET_PROPERTIES(yajl PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") ENDIF(APPLE) @@ -31,7 +33,7 @@ index 99cf9e9..9e9c77d 100644 #### build up an sdk as a post build step -@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) +@@ -78,10 +80,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) # at build time you may specify the cmake variable LIB_SUFFIX to handle # 64-bit systems which use 'lib64' From 1dc5fe6050f4b49a2b2b7b0593246bfc5f1eb408 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 6 Jul 2024 17:10:04 +0200 Subject: [PATCH 1381/3013] package/freeradius-server: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, freeradius-server fails to build with output: Applying 0001-jlibtool-cross-with-host-CC.patch using patch: patching file scripts/libtool.mk Hunk #1 FAILED at 43. 1 out of 1 hunk FAILED -- saving rejects to file scripts/libtool.mk.rej Applying 0009-src-modules-rlm_python-fix-build-with-Ofast.patch using patch: patching file src/modules/rlm_python3/configure.ac Hunk #1 succeeded at 44 (offset -15 lines). Hunk #2 FAILED at 73. 1 out of 2 hunks FAILED -- saving rejects to file src/modules/rlm_python3/configure.ac.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .../0001-jlibtool-cross-with-host-CC.patch | 5 +++-- ...9-src-modules-rlm_python-fix-build-with-Ofast.patch | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch index 0cd55071c4e..94205754c2d 100644 --- a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -11,6 +11,8 @@ Signed-off-by: David Gouarin Signed-off-by: Matt Weber [Fabrice: update for 3.2.3] SIgned-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- scripts/libtool.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -19,8 +21,7 @@ diff --git a/scripts/libtool.mk b/scripts/libtool.mk index 57915e1053..c28260dd7e 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk -@@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" - +@@ -48,8 +48,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" # binary! ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) diff --git a/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch index c92b4171d2b..2c1f07cb66a 100644 --- a/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch +++ b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch @@ -18,15 +18,17 @@ Fixes: Signed-off-by: Fabrice Fontaine Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/5263 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - src/modules/rlm_python/configure.ac | 4 ++-- + src/modules/rlm_python3/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac index e2f74574fb..ee30b324d9 100644 --- a/src/modules/rlm_python3/configure.ac +++ b/src/modules/rlm_python3/configure.ac -@@ -59,7 +59,7 @@ else +@@ -44,7 +44,7 @@ else dnl # Convert -I to -isystem to get rid of warnings about issues in Python headers dnl # Strip -systemroot @@ -35,8 +37,8 @@ index e2f74574fb..ee30b324d9 100644 dnl # -D_FORTIFY_SOURCE needs -O. dnl # Strip debug symbol flags (-g[0-9]?). We decide on debugging symbols, not python dnl # Strip -W*, we decide what warnings are important -@@ -73,7 +73,7 @@ else - mod_cflags=`echo " $python_cflags" | sed -e '\ +@@ -56,7 +56,7 @@ else + mod_cflags=`echo " $python3_cflags" | sed -e '\ s/ -I/ -isystem/g;\ s/ -isysroot[[ =]]\{0,1\}[[^-]]*/ /g;\ - s/ -O[[^[[:blank:]]]]*/ /g;\ From 18b1197e9165ac537b19d990091ff85bb22124ad Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 07:50:05 +0200 Subject: [PATCH 1382/3013] package/monit: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, monit fails to build with output: Applying 0001-no-force-static.patch using patch: patching file Makefile.am Hunk #1 FAILED at 85. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej Applying 0002-configure.ac-fixes-missing-config-macro-dir.patch using patch: patching file configure.ac Hunk #1 FAILED at 8. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/monit/0001-no-force-static.patch | 8 +++++--- ...0002-configure.ac-fixes-missing-config-macro-dir.patch | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/monit/0001-no-force-static.patch b/package/monit/0001-no-force-static.patch index edb619b5415..4634a951f3c 100644 --- a/package/monit/0001-no-force-static.patch +++ b/package/monit/0001-no-force-static.patch @@ -5,13 +5,15 @@ still dlopen()s the NSS libraries. Reported-by: Peter Kümmel Signed-off-by: "Yann E. MORIN" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am --- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100 +++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200 -@@ -85,7 +85,7 @@ - src/process/sysdep_@ARCH@.c - +@@ -97,7 +97,7 @@ + src/statistics/Statistics.c + monit_LDADD = libmonit/libmonit.la -monit_LDFLAGS = -static $(EXTLDFLAGS) +monit_LDFLAGS = $(EXTLDFLAGS) diff --git a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch index 325dcc17e13..31b20b3cbc9 100644 --- a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch +++ b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch @@ -8,6 +8,8 @@ so that m4 macros are properly loaded upon autoreconf use. Upstream: N/A (specific to buildroot) Signed-off-by: Jens Maus +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure.ac | 2 +- libmonit/configure.ac | 2 +- @@ -17,9 +19,9 @@ diff --git a/configure.ac b/configure.ac index 3c3d30a2..f4c5ea07 100644 --- a/configure.ac +++ b/configure.ac -@@ -8,7 +8,7 @@ AC_PREREQ([2.53]) +@@ -8,7 +8,7 @@ # Example: 5.0_beta2 - AC_INIT([monit], [5.34.0], [monit-general@nongnu.org]) + AC_INIT([monit], [5.33.0], [monit-general@nongnu.org]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4 config]) From b8fa6769ab16ae421be3c0137edff587668a8101 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 08:10:24 +0200 Subject: [PATCH 1383/3013] package/nushell: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, nushell fails to build with output: Applying 0001-uucore-add-support-for-sparc64.patch using patch: patching file VENDOR/uucore/src/lib/features/fs.rs Hunk #1 FAILED at 121. Hunk #2 FAILED at 137. 2 out of 2 hunks FAILED -- saving rejects to file VENDOR/uucore/src/lib/features/fs.rs.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .../nushell/0001-uucore-add-support-for-sparc64.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/nushell/0001-uucore-add-support-for-sparc64.patch b/package/nushell/0001-uucore-add-support-for-sparc64.patch index 2cc05c172ed..ad7e70a56d6 100644 --- a/package/nushell/0001-uucore-add-support-for-sparc64.patch +++ b/package/nushell/0001-uucore-add-support-for-sparc64.patch @@ -28,6 +28,8 @@ Fixes: Signed-off-by: Fabrice Fontaine Upstream: https://github.com/uutils/coreutils/commit/d158f1a396d19cc2aed68131b80ec3b7325d108e +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/uucore/src/lib/features/fs.rs | 2 ++ 1 file changed, 2 insertions(+) @@ -36,16 +38,16 @@ diff --git a/VENDOR/uucore/src/lib/features/fs.rs b/VENDOR/uucore/src/lib/featur index 20cc9e13d..3b9170bc3 100644 --- a/VENDOR/uucore/src/lib/features/fs.rs +++ b/VENDOR/uucore/src/lib/features/fs.rs -@@ -121,6 +121,7 @@ impl FileInformation { - not(target_os = "solaris"), +@@ -116,6 +116,7 @@ + not(target_os = "freebsd"), not(target_arch = "aarch64"), not(target_arch = "riscv64"), + not(target_arch = "sparc64"), target_pointer_width = "64" ))] return self.0.st_nlink; -@@ -137,6 +138,7 @@ impl FileInformation { - target_os = "solaris", +@@ -127,6 +128,7 @@ + target_os = "freebsd", target_arch = "aarch64", target_arch = "riscv64", + target_arch = "sparc64", From 3597b43b76406741bc0dd177ceeb017a85710ecf Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 11:06:29 +0200 Subject: [PATCH 1384/3013] package/haserl: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, haserl fails to build with output: Applying 0001-add-haserl_lualib.inc.patch using patch: patching file src/haserl_lualib.inc patching file src/Makefile.in Hunk #1 succeeded at 86 (offset 54 lines). Hunk #2 FAILED at 514. 1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.in.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/haserl/0001-add-haserl_lualib.inc.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/haserl/0001-add-haserl_lualib.inc.patch b/package/haserl/0001-add-haserl_lualib.inc.patch index f9e2a95e423..31a11e9512f 100644 --- a/package/haserl/0001-add-haserl_lualib.inc.patch +++ b/package/haserl/0001-add-haserl_lualib.inc.patch @@ -7,6 +7,8 @@ Re-add .inc file from 0.9.33 so we don't need host-lua. Signed-off-by: Peter Korsgaard Signed-off-by: Max Filippov +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/Makefile.in | 3 - src/haserl_lualib.inc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -130,7 +132,7 @@ Index: haserl-0.9.29/src/Makefile.in =================================================================== --- haserl-0.9.29.orig/src/Makefile.in +++ haserl-0.9.29/src/Makefile.in -@@ -32,7 +32,6 @@ +@@ -86,7 +86,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -138,9 +140,9 @@ Index: haserl-0.9.29/src/Makefile.in @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h bin_PROGRAMS = haserl$(EXEEXT) -@@ -515,7 +514,7 @@ - @USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \ - @USE_LUA_TRUE@ -o $@ $^ $(LIBS) +@@ -812,7 +811,7 @@ + @USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \ + @USE_LUA_TRUE@ -o $@ $^ $(LIBS) $(LUA_LIBS) -@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c +@USE_LUA_TRUE@haserl_lualib.inc : From 2be1f2004ed11010c489e03b4230ac298ecc240e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 11:14:37 +0200 Subject: [PATCH 1385/3013] package/libgdiplus: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libgdiplus fails to build with output: Applying 0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch using patch: patching file Makefile.am patching file configure.ac Hunk #1 FAILED at 39. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...ild-unit-tests-only-when-enable-unit-tests-is-pass.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch index 33746872ac0..0ac5ecaad03 100644 --- a/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch +++ b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch @@ -11,6 +11,8 @@ So let's disable the build of unit tests by default and introduce Signed-off-by: Sergio Prado Upstream: https://github.com/mono/libgdiplus/pull/701 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile.am | 8 ++++++-- configure.ac | 4 ++++ @@ -38,8 +40,8 @@ diff --git a/configure.ac b/configure.ac index 098fd0a664bd..c126ff091e58 100644 --- a/configure.ac +++ b/configure.ac -@@ -39,6 +39,10 @@ if test $warnaserror = "yes"; then - GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered -Wno-typedef-redefinition" +@@ -47,6 +47,10 @@ + GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered" fi +AC_ARG_ENABLE(unittests, AS_HELP_STRING([--enable-unittests],[Enable building unit tests.]),[unittests=yes],[unittests=no]) From f7ea606b47935a85f1c8c1599e42bb6169bd8127 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 11:44:28 +0200 Subject: [PATCH 1386/3013] package/mongrel2: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, mongrel2 fails to build with output: Applying 0001-Do-not-run-tests.patch using patch: patching file Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej patching file tools/m2sh/Makefile Hunk #1 FAILED at 9. 1 out of 1 hunk FAILED -- saving rejects to file tools/m2sh/Makefile.rej Applying 0003-fix-build-with-gcc-4.8.patch using patch: patching file Makefile patching file tools/m2sh/Makefile Hunk #1 FAILED at 10. 1 out of 2 hunks FAILED -- saving rejects to file tools/m2sh/Makefile.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/mongrel2/0001-Do-not-run-tests.patch | 16 +++++++++------- .../mongrel2/0003-fix-build-with-gcc-4.8.patch | 10 ++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 9e9c493711e..423046b80e9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1026,7 +1026,6 @@ package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch lib_patch.Upstream package/mongrel2/0001-Do-not-run-tests.patch lib_patch.Upstream package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch lib_patch.Upstream -package/mongrel2/0003-fix-build-with-gcc-4.8.patch lib_patch.Upstream package/monit/0001-no-force-static.patch lib_patch.Upstream package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch lib_patch.Upstream package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch lib_patch.Upstream diff --git a/package/mongrel2/0001-Do-not-run-tests.patch b/package/mongrel2/0001-Do-not-run-tests.patch index 4a75a470b45..3b72aef3c58 100644 --- a/package/mongrel2/0001-Do-not-run-tests.patch +++ b/package/mongrel2/0001-Do-not-run-tests.patch @@ -7,6 +7,8 @@ This patch is specific to cross-compiled environments and avoids running the tests on the host. It is not meant to be applied upstream. Signed-off-by: Lionel Orry +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 2 +- tools/m2sh/Makefile | 2 +- @@ -16,22 +18,22 @@ diff --git a/Makefile b/Makefile index 7dc4089..ca72630 100644 --- a/Makefile +++ b/Makefile -@@ -16,7 +16,7 @@ TEST_SRC=$(wildcard tests/*_tests.c) +@@ -18,7 +18,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC}) - MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" + MAKEOPTS=OPTFLAGS="${CFLAGS} ${NOEXTCFLAGS} ${OPTFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" -all: bin/mongrel2 tests m2sh procer +all: bin/mongrel2 m2sh procer filters config_modules - dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - dev: all + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile index b50d8a0..334e4da 100644 --- a/tools/m2sh/Makefile +++ b/tools/m2sh/Makefile -@@ -9,7 +9,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC}) - LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) - LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) +@@ -12,7 +12,7 @@ + + $(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter -all: ../lemon/lemon tests build/m2sh +all: ../lemon/lemon build/m2sh diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch index eebfce04878..996cd3246b7 100644 --- a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch @@ -15,7 +15,9 @@ Fixes: - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] +Upstream: https://github.com/mongrel2/mongrel2/pull/354 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 1 - tools/m2sh/Makefile | 4 ++-- @@ -37,16 +39,16 @@ diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile index 83e7ae4..86364af 100644 --- a/tools/m2sh/Makefile +++ b/tools/m2sh/Makefile -@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) +@@ -10,7 +10,7 @@ LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) RAGEL_OBJECTS=src/lexer.o src/cli.o -$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter +$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter - all: ../lemon/lemon tests build/m2sh + all: ../lemon/lemon build/m2sh -@@ -20,7 +20,7 @@ dev: all +@@ -20,7 +20,7 @@ install: build/m2sh install build/m2sh ${DESTDIR}${PREFIX}/bin From a1f2e09e042b2db32750bec9537a516d6e40bd76 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 13:57:49 +0200 Subject: [PATCH 1387/3013] package/snort: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, snort fails to build with output: Applying 0005-fix-sparc.patch using patch: patching file configure.in Hunk #1 FAILED at 942. Hunk #2 succeeded at 915 (offset -42 lines). 1 out of 2 hunks FAILED -- saving rejects to file configure.in.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/snort/0005-fix-sparc.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/snort/0005-fix-sparc.patch b/package/snort/0005-fix-sparc.patch index 14792d2c59d..56a294976c6 100644 --- a/package/snort/0005-fix-sparc.patch +++ b/package/snort/0005-fix-sparc.patch @@ -4,20 +4,22 @@ like "let's see if this v9 instruction exists when I force the compiler to think I'm using v9", which is non-sensical. Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -Naurp ./snort-2.9.11.1-orig/configure.in snort-2.9.11.1/configure.in --- ./snort-2.9.11.1-orig/configure.in 2018-05-10 12:20:19.253510678 +0200 +++ snort-2.9.11.1/configure.in 2018-05-10 12:40:18.547584998 +0200 -@@ -942,8 +942,6 @@ fi +@@ -900,8 +900,6 @@ # check for sparc %time register if eval "echo $host_cpu|grep -i sparc >/dev/null"; then - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mcpu=v9 " AC_MSG_CHECKING([for sparc %time register]) - AC_RUN_IFELSE( + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( -@@ -957,8 +955,6 @@ if eval "echo $host_cpu|grep -i sparc >/ +@@ -915,8 +913,6 @@ AC_MSG_RESULT($sparcv9) if test "x$sparcv9" = "xyes"; then AC_DEFINE([SPARCV9],[1],[For sparc v9 with %time register]) From 39d124dd7f169e2e7d4dad9bdd1dfd0eff4f3d24 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 14:06:50 +0200 Subject: [PATCH 1388/3013] package/sane-backends: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, sane-backends fails to build with output: Applying 0001-sane_backend-add-missing-config.h.patch using patch: patching file include/sane/sanei_backend.h Hunk #1 FAILED at 8. 1 out of 1 hunk FAILED -- saving rejects to file include/sane/sanei_backend.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .../0001-sane_backend-add-missing-config.h.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/sane-backends/0001-sane_backend-add-missing-config.h.patch b/package/sane-backends/0001-sane_backend-add-missing-config.h.patch index 8e56b0284b5..f3796933381 100644 --- a/package/sane-backends/0001-sane_backend-add-missing-config.h.patch +++ b/package/sane-backends/0001-sane_backend-add-missing-config.h.patch @@ -28,6 +28,8 @@ Fixes: http://autobuild.buildroot.net/results/9f1/9f1f1cb727b5c5407e69172280a3dee880e55cdf Signed-off-by: Romain Naour +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- include/sane/sanei_backend.h | 1 + 1 file changed, 1 insertion(+) @@ -42,8 +44,8 @@ index 1b5afe2..2a96532 100644 +#include "../include/sane/config.h" - /* - * Compiler related options + /** @name Compatibility macros + * @{ -- 2.5.5 From d584a2e0d593598e61db9ad435f4555c79c71743 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 14:15:56 +0200 Subject: [PATCH 1389/3013] package/vtun: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, vtun fails to build with output: Applying 0002-fix-ssl-headers-checks.patch using patch: patching file configure.in Hunk #1 succeeded at 169 (offset 3 lines). Hunk #2 succeeded at 179 (offset 3 lines). Hunk #3 FAILED at 193. Hunk #4 FAILED at 208. 2 out of 4 hunks FAILED -- saving rejects to file configure.in.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/vtun/0002-fix-ssl-headers-checks.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/vtun/0002-fix-ssl-headers-checks.patch b/package/vtun/0002-fix-ssl-headers-checks.patch index 765411af841..a095a1ba58b 100644 --- a/package/vtun/0002-fix-ssl-headers-checks.patch +++ b/package/vtun/0002-fix-ssl-headers-checks.patch @@ -5,11 +5,13 @@ Do. Not. Do. That. It breaks cross-compilation. Also use the SSL headers dir to look for blowfish headers. Signed-off-by: "Yann E. MORIN" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in --- vtun-3.0.3.orig/configure.in 2009-03-29 12:08:51.000000000 +0200 +++ vtun-3.0.3/configure.in 2013-02-16 23:44:44.004339680 +0100 -@@ -166,7 +166,7 @@ +@@ -169,7 +169,7 @@ AC_MSG_RESULT() AC_CHECKING( for md5 Library and Header files ... ) AC_SEARCH_HEADERS(md5.h, @@ -18,7 +20,7 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in , AC_MSG_ERROR( SSL headers not found. ) ) -@@ -176,7 +176,7 @@ +@@ -179,7 +179,7 @@ AC_MSG_RESULT() AC_CHECKING( for blowfish Library and Header files ... ) AC_SEARCH_HEADERS(blowfish.h, @@ -27,7 +29,7 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in AC_CHECK_LIB(crypto, BF_set_key, [ LIBS="$LIBS -lcrypto" -@@ -193,7 +193,7 @@ +@@ -196,7 +196,7 @@ AC_MSG_RESULT() AC_CHECKING( for AES Library and Header files ... ) AC_SEARCH_HEADERS(aes.h, @@ -35,8 +37,8 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in + $SSL_HDR_DIR , AC_CHECK_LIB(crypto, AES_set_encrypt_key, [ - AC_DEFINE(HAVE_SSL_AES) -@@ -208,7 +208,7 @@ + AC_DEFINE(HAVE_SSL_AES, [1], [Define to 1 if you have AES in openssl]) +@@ -211,7 +211,7 @@ AC_MSG_RESULT() AC_CHECKING( for EVP Library and Header files ... ) AC_SEARCH_HEADERS(evp.h, @@ -44,4 +46,4 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in + $SSL_HDR_DIR , AC_CHECK_LIB(crypto, EVP_EncryptInit, [ - AC_DEFINE(HAVE_SSL_EVP) + AC_DEFINE(HAVE_SSL_EVP, [1], [Define to 1 if you have EVP in openssl]) From 61d67ad32152a54ccbeef70fbecea1ed659e9f87 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 14:31:29 +0200 Subject: [PATCH 1390/3013] package/ympd: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, ympd fails to build with output: Applying 0002-added-forward-declarations.patch using patch: patching file src/mpd_client.c Hunk #1 succeeded at 29 (offset -1 lines). patching file src/mpd_client.h Hunk #1 FAILED at 96. 1 out of 1 hunk FAILED -- saving rejects to file src/mpd_client.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/ympd/0002-added-forward-declarations.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/ympd/0002-added-forward-declarations.patch b/package/ympd/0002-added-forward-declarations.patch index 90ee1eae686..d96307d2a47 100644 --- a/package/ympd/0002-added-forward-declarations.patch +++ b/package/ympd/0002-added-forward-declarations.patch @@ -8,6 +8,8 @@ Subject: [PATCH] added forward declarations from: https://github.com/notandy/ympd/pull/191/commits/2268e0f0f372a61827b912155a1796490968b3ff] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/mpd_client.c | 2 ++ src/mpd_client.h | 6 ++++-- @@ -17,7 +19,7 @@ diff --git a/src/mpd_client.c b/src/mpd_client.c index 2911e461..9f003ab0 100644 --- a/src/mpd_client.c +++ b/src/mpd_client.c -@@ -30,6 +30,8 @@ +@@ -29,6 +29,8 @@ /* forward declaration */ static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev); @@ -30,7 +32,7 @@ diff --git a/src/mpd_client.h b/src/mpd_client.h index 447dd563..9342c550 100644 --- a/src/mpd_client.h +++ b/src/mpd_client.h -@@ -96,6 +96,8 @@ struct t_mpd { +@@ -92,7 +92,9 @@ int song_id; unsigned queue_version; From 2ef2d436d4ada8c37896efdd199dd1d5066c67e5 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 14:41:10 +0200 Subject: [PATCH 1391/3013] package/redis: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, redis fails to build with output: Applying 0002-largefile-conditional-define.patch using patch: patching file src/fmacros.h Hunk #1 FAILED at 42. 1 out of 1 hunk FAILED -- saving rejects to file src/fmacros.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Tested-by: Titouan Christophe Signed-off-by: Thomas Petazzoni --- package/redis/0002-largefile-conditional-define.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/redis/0002-largefile-conditional-define.patch b/package/redis/0002-largefile-conditional-define.patch index 747e0552b37..685a30cc5b7 100644 --- a/package/redis/0002-largefile-conditional-define.patch +++ b/package/redis/0002-largefile-conditional-define.patch @@ -12,13 +12,15 @@ Avoids: :0:0: note: this is the location of the previous definition Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: redis-2.6.11/src/fmacros.h =================================================================== --- redis-2.6.11.orig/src/fmacros.h 2013-03-25 22:09:15.000000000 +0100 +++ redis-2.6.11/src/fmacros.h 2013-03-25 22:09:40.000000000 +0100 -@@ -42,7 +42,12 @@ - #define _XOPEN_SOURCE +@@ -55,8 +55,13 @@ + #define _POSIX_C_SOURCE 199506L #endif +#ifndef _LARGEFILE_SOURCE @@ -29,4 +31,5 @@ Index: redis-2.6.11/src/fmacros.h #define _FILE_OFFSET_BITS 64 +#endif - #endif + /* deprecate unsafe functions + * From c3ac14653b256ad556cdcbd633e1ee9e562e8245 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 14:59:21 +0200 Subject: [PATCH 1392/3013] package/rygel: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, rygel fails to build with output: Applying 0001-meson.build-fix-g_ir_compiler-calls.patch using patch: patching file src/librygel-core/meson.build Hunk #1 succeeded at 73 (offset 3 lines). patching file src/librygel-renderer-gst/meson.build Hunk #1 succeeded at 37 (offset 1 line). patching file src/librygel-renderer/meson.build Hunk #1 FAILED at 43. 1 out of 1 hunk FAILED -- saving rejects to file src/librygel-renderer/meson.build.rej patching file src/librygel-server/meson.build Hunk #1 FAILED at 122. 1 out of 1 hunk FAILED -- saving rejects to file src/librygel-server/meson.build.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...001-meson.build-fix-g_ir_compiler-calls.patch | 16 +++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 423046b80e9..618871f98a1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1321,7 +1321,6 @@ package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patc package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream package/rubix/0001-dont-use-legacy-functions.patch lib_patch.Upstream package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream -package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch lib_patch.Upstream package/rygel/S99rygel Shellcheck lib_sysv.Indent lib_sysv.Variables package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch lib_patch.Upstream package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch lib_patch.Upstream diff --git a/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch index 1d8f4599f4a..7b4d5a904c6 100644 --- a/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch +++ b/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch @@ -20,7 +20,9 @@ Fixes: - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable] +Upstream: probably not upstreamable +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/librygel-core/meson.build | 4 +++- src/librygel-renderer-gst/meson.build | 1 + @@ -32,7 +34,7 @@ diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build index fd43bebe..e6be2b5e 100644 --- a/src/librygel-core/meson.build +++ b/src/librygel-core/meson.build -@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', +@@ -73,7 +73,9 @@ # so we depend on the custom_target from that step and pass the input through # commandline. custom_target('RygelCore-2.8.typelib', @@ -47,7 +49,7 @@ diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/m index ad98a3a7..e8baefe1 100644 --- a/src/librygel-renderer-gst/meson.build +++ b/src/librygel-renderer-gst/meson.build -@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', +@@ -37,6 +37,7 @@ '--output', '@OUTPUT@', '--includedir', core_girdir, '--includedir', renderer_girdir, @@ -59,25 +61,25 @@ diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.bui index 5f401527..821273ff 100644 --- a/src/librygel-renderer/meson.build +++ b/src/librygel-renderer/meson.build -@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', +@@ -44,6 +44,7 @@ command: [g_ir_compiler, '--output', '@OUTPUT@', '--includedir', core_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, join_paths(meson.current_build_dir(), 'RygelRenderer-2.8.gir')], - output: 'RygelRenderer-2.6.typelib', + output: 'RygelRenderer-2.8.typelib', depends: [ renderer_lib, renderer_gir, core_gir ], diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build index a3bd77d9..6b084eb6 100644 --- a/src/librygel-server/meson.build +++ b/src/librygel-server/meson.build -@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', +@@ -125,6 +125,7 @@ command: [g_ir_compiler, '--output', '@OUTPUT@', '--includedir', core_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, join_paths(meson.current_build_dir(), 'RygelServer-2.8.gir')], - output: 'RygelServer-2.6.typelib', + output: 'RygelServer-2.8.typelib', depends: [ server_lib, server_gir, core_gir ], -- 2.35.1 From 3907da674cb3ddefb30314745c9e276a4a3d7487 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 16:17:58 +0200 Subject: [PATCH 1393/3013] package/openvmtools: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, openvmtools fails to build with output: Applying 0007-Use-configure-to-test-for-feature-instead-of-platfor.patch using patch: patching file configure.ac Hunk #1 succeeded at 940 (offset 142 lines). Hunk #2 succeeded at 1150 (offset 86 lines). patching file lib/misc/idLinux.c Hunk #2 succeeded at 1022 (offset 28 lines). patching file lib/nicInfo/nicInfoPosix.c Hunk #1 FAILED at 34. 1 out of 1 hunk FAILED -- saving rejects to file lib/nicInfo/nicInfoPosix.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...ure-to-test-for-feature-instead-of-platfor.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch index abbc5183623..f10e74e1528 100644 --- a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -22,6 +22,8 @@ Signed-off-by: Natanael Copa [Retrieved (and slightly updated) from: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch?h=sumo] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- open-vm-tools/configure.ac | 4 ++++ open-vm-tools/lib/misc/idLinux.c | 30 ++++++++++++++---------------- @@ -32,7 +34,7 @@ Index: open-vm-tools/configure.ac =================================================================== --- open-vm-tools.orig/configure.ac +++ open-vm-tools/configure.ac -@@ -798,6 +798,7 @@ AC_CHECK_FUNCS( +@@ -940,6 +940,7 @@ AC_CHECK_FUNCS([ecvt]) AC_CHECK_FUNCS([fcvt]) @@ -40,7 +42,7 @@ Index: open-vm-tools/configure.ac AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) -@@ -1063,10 +1064,13 @@ AC_PATH_PROG( +@@ -1149,10 +1150,13 @@ ### AC_CHECK_HEADERS([crypt.h]) @@ -72,7 +74,7 @@ Index: open-vm-tools/lib/misc/idLinux.c #ifdef __APPLE__ #include #include -@@ -997,31 +994,32 @@ Id_EndSuperUser(uid_t uid) // IN: +@@ -1025,31 +1022,32 @@ static Bool IdIsSetUGid(void) { @@ -121,8 +123,7 @@ Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c =================================================================== --- open-vm-tools.orig/lib/nicInfo/nicInfoPosix.c +++ open-vm-tools/lib/nicInfo/nicInfoPosix.c -@@ -34,9 +34,13 @@ - #include +@@ -35,9 +35,13 @@ #include #include #include @@ -137,7 +138,7 @@ Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c # include #endif #ifndef NO_DNET -@@ -348,10 +352,7 @@ GuestInfoGetNicInfo(NicInfoV3 *nicInfo) +@@ -499,10 +503,7 @@ * ****************************************************************************** */ From dbf2ca9b5b4ebd26c2d14889ca04f0cd01bb2454 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 6 Jul 2024 21:33:38 +0200 Subject: [PATCH 1394/3013] package/libnss: bump version to 3.102 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index ccc59519293..8c21316b7b9 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_101_1_RTM/src/SHA256SUMS -sha256 f20e8c5daafd89419d229ec8c54100a5c320dce1467377c9dfcd5e4d8446b468 nss-3.101.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_102_RTM/src/SHA256SUMS +sha256 c29b03f24856db18a34fbcde737fcca6407c27b5f3f60baba5111460e6cb307b nss-3.102.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a7d8db01111..6cc60080389 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.101.1 +LIBNSS_VERSION = 3.102 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 1da5466bab46b20a4ebbc28cfdbba9135775ae6d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 6 Jul 2024 13:06:42 +0200 Subject: [PATCH 1395/3013] configs/visionfive2: fix build by adding kernel header version commit d9e6d2d081 "configs/visionfive2: update kernel to upstream 6.8.2" removed the config directive: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y but forgot to add: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y It was most likely generated with a "make savedefconfig", while Linux kernel v6.8 was the default at that time. After commit aa70c331a2 "linux: bump latest version to 6.9", the defconfig failed to build with error: Incorrect selection of kernel headers: expected 6.9.x, got 6.8.x This commit fixes the defconfig by adding back the kernel custom header version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7271150175 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- configs/visionfive2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index dae9608eeb1..18e0997f19d 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -1,4 +1,5 @@ BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y BR2_GLOBAL_PATCH_DIR="board/visionfive2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" From 3c88f5d5edab748e14c9e32d751a2da4017d406e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:46:32 +0200 Subject: [PATCH 1396/3013] package/vlc: security bump to version 3.0.21 Fixes http://www.videolan.org/security/sb-vlc3021.html Release notes: https://code.videolan.org/videolan/vlc/-/blob/3.0.21/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit b752d0e4cc78a921ba08cd891f68ef80fc251128) Signed-off-by: Peter Korsgaard --- package/vlc/vlc.hash | 8 ++++---- package/vlc/vlc.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 40529bd6648..b3d9a083b98 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha256 -sha256 adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5 vlc-3.0.20.tar.xz -# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha1 -sha1 b834516ab701bf6311980ed5d67b77c834fdebe7 vlc-3.0.20.tar.xz +# From https://get.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.sha256 +sha256 24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0 vlc-3.0.21.tar.xz +# From https://get.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.sha1 +sha1 be8557fc2f4be58caebe4a8b1d70f03dc6b95792 vlc-3.0.21.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index d0fc1744c01..a597616470e 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.20 +VLC_VERSION = 3.0.21 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ From 34cc250ff55552f719ef8fdf4a6f945d189c5785 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 6 Jul 2024 17:40:05 +0200 Subject: [PATCH 1397/3013] package/freescale-imx/imx-vpu-hantro: fix patch fuzz Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, imx-vpu-hantro fails to build with output: Applying 0001-Fix-ion.h-header-inclusion-to-be-standard.patch using patch: patching file Makefile_G1G2 patching file Makefile_H1 patching file decoder_sw/software/linux/dwl/dwl_linux.c Hunk #1 FAILED at 50. 1 out of 1 hunk FAILED -- saving rejects to file decoder_sw/software/linux/dwl/dwl_linux.c.rej patching file h1_encoder/software/linux_reference/ewl/ewl_x280_common.c Hunk #1 FAILED at 52. 1 out of 1 hunk FAILED -- saving rejects to file h1_encoder/software/linux_reference/ewl/ewl_x280_common.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...001-Fix-ion.h-header-inclusion-to-be-standard.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch index 7a89dd99e02..cdde7d9ff3e 100644 --- a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch +++ b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch @@ -9,6 +9,8 @@ https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h Signed-off-by: Gary Bisson Signed-off-by: Chris Dimich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile_G1G2 | 4 ++-- Makefile_H1 | 4 ++-- @@ -51,20 +53,20 @@ index 7d5e33b..c0e5727 100755 --- a/decoder_sw/software/linux/dwl/dwl_linux.c +++ b/decoder_sw/software/linux/dwl/dwl_linux.c @@ -50,7 +50,7 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(ENABLE_DMABUF_HEAP) #include #else -#include +#include #endif #ifdef ANDROID - #include + #if !defined(ENABLE_DMABUF_HEAP) diff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c index 312e4cc..70630c3 100755 --- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c +++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c -@@ -52,7 +52,7 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) +@@ -51,7 +51,7 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(ENABLE_DMABUF_HEAP) #include #else -#include From 8974269c3253dab0a2c4db065701d43f7a2e5053 Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 8 Jul 2024 14:30:50 +0200 Subject: [PATCH 1398/3013] package/openlayers: bump to version 9.2.4 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 31496bbfcaf..29261c57ed6 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 73acb923c0ef53c6b6bb34b6dba782e03e1d24279f5aadbec5e787269456a6d8 v9.1.0-package.zip +sha256 f9818591685d2eda779b346425061ddde174931e89ba2412118f68b3779e0c19 v9.2.4-package.zip sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index df29e04e65c..682138c4548 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 9.1.0 +OPENLAYERS_VERSION = 9.2.4 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From 27d64eeaa5db66eaedcd9fb6a9bbfd4773cf5156 Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 8 Jul 2024 14:33:45 +0200 Subject: [PATCH 1399/3013] package/vuejs: bump to version 3.4.31 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs/vuejs.hash | 2 +- package/vuejs/vuejs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index 2785a24eca4..a4011d80005 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5772054f07ee4d86b831b963a889b9b3e60764f4fe909c1ccddd00fd628bc6c7 vue-3.4.21.tgz +sha256 01cb6ef41fdf1e2c1944bce553c254e216f507ed20ec1bd993766bf9554caf0f vue-3.4.31.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index 3ab71820839..e8a21c8c2fb 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.4.21 +VUEJS_VERSION = 3.4.31 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT From 099887702db37c9a9f8615291770aaafa79671f9 Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 8 Jul 2024 14:33:46 +0200 Subject: [PATCH 1400/3013] package/vuejs-router: bump to version 4.4.0 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs-router/vuejs-router.hash | 2 +- package/vuejs-router/vuejs-router.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index 38f0bb5b8bd..e297667f4c8 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 466a762bd6e9fb0e1ec33dca0b0ed3ecf31f25186e7ef03906716d69e9ecf3c7 vue-router-4.3.0.tgz +sha256 ad4999f6c346053d93e9e600a69162c52759b1db3aa9a09ef4e9d2d8ffb2d167 vue-router-4.4.0.tgz sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index 1aa13726381..fb352fd1bdc 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.3.0 +VUEJS_ROUTER_VERSION = 4.4.0 VUEJS_ROUTER_SOURCE = vue-router-$(VUEJS_ROUTER_VERSION).tgz VUEJS_ROUTER_SITE = https://registry.npmjs.org/vue-router/- VUEJS_ROUTER_LICENSE = MIT From 89a2fd6385a5aef60646674d0a6fa91ab9252bad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:47:04 +0200 Subject: [PATCH 1401/3013] package/xmrig: bump version to 6.21.3 Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit cd83b50bdca87c74dfd4a4860de52eb645b76394) Signed-off-by: Peter Korsgaard --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 116855fdbaa..d7fdbe0d0be 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68b4be51e99687bad15d5bf4ac9eed79a080ba89141f7363457a957ce9304e4d xmrig-6.21.2.tar.gz +sha256 5d76fb19190956c564b405119315bc93db4ed8062b251d5e96bed70c5fa8033c xmrig-6.21.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 45538fa77e1..d01b0018178 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.2 +XMRIG_VERSION = 6.21.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 30252c3e0a00fae990624630e70591a5346bc3e9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 18:47:40 +0200 Subject: [PATCH 1402/3013] package/dav1d: bump version to 1.4.3 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit a3233807d202f2b055373f82f6e0254cb8dee878) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index a62193810ed..e0ca8f1e882 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.4.1/dav1d-1.4.1.tar.xz.sha256 -sha256 8d407dd5fe7986413c937b14e67f36aebd06e1fa5cfec679d10e548476f2d5f8 dav1d-1.4.1.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.4.3/dav1d-1.4.3.tar.xz.sha256 +sha256 42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19 dav1d-1.4.3.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 18cb81868aa..4e3e8fe1cf5 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.4.1 +DAV1D_VERSION = 1.4.3 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From cbb76c9ec0258d2bcbd464f0937b2b7baa9165fc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 7 Jul 2024 14:57:45 -0600 Subject: [PATCH 1403/3013] package/python-pypa-build: bump to version 1.2.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pypa-build/python-pypa-build.hash | 4 ++-- package/python-pypa-build/python-pypa-build.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash index 6941f2c0120..a4e207e4e41 100644 --- a/package/python-pypa-build/python-pypa-build.hash +++ b/package/python-pypa-build/python-pypa-build.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/build/json -md5 45f216f02135c6acb486ba325e8f8da3 build-1.0.3.tar.gz -sha256 538aab1b64f9828977f84bc63ae570b060a8ed1be419e7870b8b4fc5e6ea553b build-1.0.3.tar.gz +md5 9675d7b278f4533b9b75701e6e87390b build-1.2.1.tar.gz +sha256 526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d build-1.2.1.tar.gz # Locally computed sha256 checksums sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index 266720a5553..d8a23ddd8b3 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPA_BUILD_VERSION = 1.0.3 +PYTHON_PYPA_BUILD_VERSION = 1.2.1 PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz -PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/98/e3/83a89a9d338317f05a68c86a2bbc9af61235bc55a0c6a749d37598fb2af1 +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/ce/9e/2d725d2f7729c6e79ca62aeb926492abbc06e25910dd30139d60a68bcb19 PYTHON_PYPA_BUILD_LICENSE = MIT PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE PYTHON_PYPA_BUILD_SETUP_TYPE = flit-bootstrap From 18abb7ba655da68ce6cc7233dfb271003111fa06 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 7 Jul 2024 15:08:51 -0600 Subject: [PATCH 1404/3013] package/python-pyparsing: bump to version 3.1.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyparsing/python-pyparsing.hash | 4 ++-- package/python-pyparsing/python-pyparsing.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 4514e2d4023..d029ebda2dc 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyparsing/json -md5 bb8c8c6b8015ca5887ae2c37917ee82e pyparsing-3.1.1.tar.gz -sha256 ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db pyparsing-3.1.1.tar.gz +md5 2bfafdb2d02d19ca4a3dfd02a9dbdfa7 pyparsing-3.1.2.tar.gz +sha256 a1bac0ce561155ecc3ed78ca94d3c9378656ad4c94c1270de543f621420f94ad pyparsing-3.1.2.tar.gz # Locally computed sha256 checksums sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 0538c8df0a8..b7cbbd4262f 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.1.1 +PYTHON_PYPARSING_VERSION = 3.1.2 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/37/fe/65c989f70bd630b589adfbbcd6ed238af22319e90f059946c26b4835e44b +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/46/3a/31fd28064d016a2182584d579e033ec95b809d8e220e74c4af6f0f2e8842 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = flit From 20f72e6af2bbb151f51530441cb6994a215dcbef Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 7 Jul 2024 15:12:40 -0600 Subject: [PATCH 1405/3013] package/python-requests: bump to version 2.32.3 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index c4aeabb25da..2764a0f2d2f 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 941e175c276cd7d39d098092c56679a4 requests-2.31.0.tar.gz -sha256 942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 requests-2.31.0.tar.gz +md5 fa3ee5ac3f1b3f4368bd74ab530d3f0f requests-2.32.3.tar.gz +sha256 55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 requests-2.32.3.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 2c74db37113..fc8f51fd1f0 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.31.0 +PYTHON_REQUESTS_VERSION = 2.32.3 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From 8df68d2bb454ff22a32c598e343e63cd7e3c02f6 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 8 Jul 2024 22:21:17 +0200 Subject: [PATCH 1406/3013] package/network-manager: allow building with musl NetworkManager officially supports building with musl since version 1.30, so the restriction to glibc toolchain is no longer necessary. [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/4f7c04eaf94849d0455e97ba9bcfdd0b84e6459d/NEWS#L615 Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni --- package/network-manager/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 57d7543131a..1d9a02c1d3b 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_DBUS @@ -59,10 +59,11 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS This option enables support for OpenVSwitch endif -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" +comment "NetworkManager needs udev /dev management and a glibc or musl toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 || \ - !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 677c3f2995b4e6acaedcecc699b5f6ddf294f524 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 08:56:29 +0200 Subject: [PATCH 1407/3013] package/php: bump version to 8.3.9 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/432 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index cd5f8a1c1bd..59a82b001d0 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 aea358b56186f943c2bbd350c9005b9359133d47e954cfc561385319ae5bb8d7 php-8.3.8.tar.xz +sha256 bf4d7b8ea60a356064f88485278bd6f941a230ec16f0fc401574ce1445ad6c77 php-8.3.9.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 268b8e0a62e..3fdce8186a1 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.8 +PHP_VERSION = 8.3.9 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 158c2a000404cfcb3a216054c686d11454a5ef7f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 08:59:13 +0200 Subject: [PATCH 1408/3013] package/apache: security bump version to 2.4.61 Fixes CVE-2024-39884. Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.61 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index bd503d84f91..2ed9c17f9a7 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.59.tar.bz2.{sha256,sha512} -sha256 7b1ec7ec5635da7cb01550513215a90f8b2f52bb7c90cf3e97ede936d3e55b0f httpd-2.4.60.tar.bz2 -sha512 c1591389f76699beaa5d32b019729e25f1ed5b828311c82b52f1a4edd5d28b73e697958df384d7628b314521a831dbb0af418bc37cdf031cfe133e53c195d8ad httpd-2.4.60.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.61.tar.bz2.{sha256,sha512} +sha256 ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6 httpd-2.4.61.tar.bz2 +sha512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff httpd-2.4.61.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 39ccc3cf967..0319a968153 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.60 +APACHE_VERSION = 2.4.61 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 2389fb5bbb1adfe37c4b21c4127006dee1dba25a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 09:02:58 +0200 Subject: [PATCH 1409/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 865b7fd2402..34057a48935 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.9.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.9.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 6ebd708bcb8..d412aafa130 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 272800e0d1a7d01a78bce95a3aaf5c80816f50eb15c517d7003e58355760ecc2 linux-6.9.4.tar.xz -sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz -sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz +sha256 f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281 linux-6.9.8.tar.xz +sha256 f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214 linux-6.6.37.tar.xz +sha256 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af linux-6.1.97.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 linux-5.15.160.tar.xz -sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz -sha256 7e1f5b28588e49ddfd18e7772476e4e8b52bdc9c3e19beafcbb7c103e6c01f51 linux-5.4.277.tar.xz +sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz +sha256 da1dd47febac4f7856654038a47703666da3afba348b8e96e39584e0972e2725 linux-5.10.221.tar.xz +sha256 b298436b26395b5c3ace6963836ba70d57cd61e01cff254b0e5443636c324a5e linux-5.4.279.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz +sha256 062b70cc132378e1c685df44ddf7e05bab4752b690ada17b080655a63f993581 linux-4.19.317.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7b7928549c1..8ae267c2c85 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -419,13 +419,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.315" if BR2_KERNEL_HEADERS_4_19 - default "5.4.277" if BR2_KERNEL_HEADERS_5_4 - default "5.10.218" if BR2_KERNEL_HEADERS_5_10 - default "5.15.160" if BR2_KERNEL_HEADERS_5_15 - default "6.1.93" if BR2_KERNEL_HEADERS_6_1 - default "6.6.33" if BR2_KERNEL_HEADERS_6_6 - default "6.9.4" if BR2_KERNEL_HEADERS_6_9 + default "4.19.317" if BR2_KERNEL_HEADERS_4_19 + default "5.4.279" if BR2_KERNEL_HEADERS_5_4 + default "5.10.221" if BR2_KERNEL_HEADERS_5_10 + default "5.15.162" if BR2_KERNEL_HEADERS_5_15 + default "6.1.97" if BR2_KERNEL_HEADERS_6_1 + default "6.6.37" if BR2_KERNEL_HEADERS_6_6 + default "6.9.8" if BR2_KERNEL_HEADERS_6_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 01becd31ca25a6be311544e4f6c7f7131b2f7689 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 11:27:24 +0200 Subject: [PATCH 1410/3013] package/znc: security bump version to 1.9.1 Fixes CVE-2024-39844. Changelog: https://wiki.znc.in/ChangeLog/1.9.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/znc/znc.hash | 2 +- package/znc/znc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/znc/znc.hash b/package/znc/znc.hash index 8d59c7a1dc8..7bac128af90 100644 --- a/package/znc/znc.hash +++ b/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8b99c9dbb21c1309705073460be9bfacb6f7b0e83a15fe5d4b7140201b39d2a1 znc-1.9.0.tar.gz +sha256 e8a7cf80e19aad510b4e282eaf61b56bc30df88ea2e0f64fadcdd303c4894f3c znc-1.9.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/znc/znc.mk b/package/znc/znc.mk index a9106551959..ec6287e6dee 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.9.0 +ZNC_VERSION = 1.9.1 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE From ab9aca21d026bb7e8e9d63f928d97278a4fabceb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 12:23:20 +0200 Subject: [PATCH 1411/3013] package/libdisplay-info: bump version to 0.2.0 Removed patch which is included in this release. Use xz tarball and its sha256 hash, both provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...0001-displayid.c-Include-sys-types.h.patch | 36 ------------------- package/libdisplay-info/libdisplay-info.hash | 3 +- package/libdisplay-info/libdisplay-info.mk | 6 ++-- 3 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch diff --git a/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch b/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch deleted file mode 100644 index 3fa57ee10d4..00000000000 --- a/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 648c1cb66b571b037976b61363654f39448f5fac Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 7 May 2023 14:14:48 +0200 -Subject: [PATCH] displayid.c: Include sys/types.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error -../displayid.c:377:10: error: ‘ssize_t’ undeclared (first use in this function); did you mean ‘size_t’? - -seen with: -arc-linux-gcc.br_real (Buildroot 2021.11-4428-g6b6741b) 10.2.0 - -Upstream: https://gitlab.freedesktop.org/emersion/libdisplay-info/-/commit/5c9801a75f2815790ad1ed5500cec2728a36c6ec - -Signed-off-by: Bernd Kuhls ---- - displayid.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/displayid.c b/displayid.c -index 398772b..f1749c6 100644 ---- a/displayid.c -+++ b/displayid.c -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include "bits.h" - #include "displayid.h" --- -2.39.2 - diff --git a/package/libdisplay-info/libdisplay-info.hash b/package/libdisplay-info/libdisplay-info.hash index a0829479a89..cc93a0cf32e 100644 --- a/package/libdisplay-info/libdisplay-info.hash +++ b/package/libdisplay-info/libdisplay-info.hash @@ -1,3 +1,4 @@ +# From https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.2.0/downloads/libdisplay-info-0.2.0.tar.xz.sha256sum +sha256 5a2f002a16f42dd3540c8846f80a90b8f4bdcd067a94b9d2087bc2feae974176 libdisplay-info-0.2.0.tar.xz # Locally computed -sha256 51cdb0362882ca2af62532ab4d95e60d81e9890b339264719fd55f8e3945d695 libdisplay-info-0.1.1.tar.bz2 sha256 15b396244e58830c5614b9394f4deccfe684970cd507f299383ab57ad339eedd LICENSE diff --git a/package/libdisplay-info/libdisplay-info.mk b/package/libdisplay-info/libdisplay-info.mk index 26a6a9a4d90..b88463849ee 100644 --- a/package/libdisplay-info/libdisplay-info.mk +++ b/package/libdisplay-info/libdisplay-info.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBDISPLAY_INFO_VERSION = 0.1.1 -LIBDISPLAY_INFO_SOURCE = libdisplay-info-$(LIBDISPLAY_INFO_VERSION).tar.bz2 -LIBDISPLAY_INFO_SITE = https://gitlab.freedesktop.org/emersion/libdisplay-info/-/archive/$(LIBDISPLAY_INFO_VERSION) +LIBDISPLAY_INFO_VERSION = 0.2.0 +LIBDISPLAY_INFO_SOURCE = libdisplay-info-$(LIBDISPLAY_INFO_VERSION).tar.xz +LIBDISPLAY_INFO_SITE = https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$(LIBDISPLAY_INFO_VERSION)/downloads LIBDISPLAY_INFO_LICENSE = MIT LIBDISPLAY_INFO_LICENSE_FILES = LICENSE LIBDISPLAY_INFO_INSTALL_STAGING = YES From 4f5790116b42768bd1bd982245e00483440a6311 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 12:23:21 +0200 Subject: [PATCH 1412/3013] package/edid-decode: bump version to 6f117a8 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/edid-decode/edid-decode.hash | 2 +- package/edid-decode/edid-decode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edid-decode/edid-decode.hash b/package/edid-decode/edid-decode.hash index 9a2012f06be..62e6b43a322 100644 --- a/package/edid-decode/edid-decode.hash +++ b/package/edid-decode/edid-decode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45b71227ceb7265da3a314a8d0969dcca584bfa12c36690e911646b58aae0738 edid-decode-2d44e1b01c7ed7d65b20ecdce62d354841832201-git4.tar.gz +sha256 bc166bef5d0d56035b47a1513ed320c262901f97e488c83420760d7f56174dac edid-decode-6f117a8f8c0e76e85f599a8b05c21c5f51c5c3c1-git4.tar.gz sha256 9bc7ab961e9a07dc84eaa0210af388def56d024357e79671fb89fe27d073eed7 LICENSE diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index cc9f2c16293..be0c4f1a0e5 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDID_DECODE_VERSION = 2d44e1b01c7ed7d65b20ecdce62d354841832201 +EDID_DECODE_VERSION = 6f117a8f8c0e76e85f599a8b05c21c5f51c5c3c1 EDID_DECODE_SITE = https://git.linuxtv.org/edid-decode.git EDID_DECODE_SITE_METHOD = git EDID_DECODE_LICENSE = MIT From caaf80dabe244dc8c7515b27a012942aceedcc70 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 12:23:22 +0200 Subject: [PATCH 1413/3013] package/hwdata: bump version to 0.384 Release notes: https://github.com/vcrhonek/hwdata/releases Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 92b7eaab6d8..7d8959990ab 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b98ef646d530d5fd3afa3180efbf7c8e22d3da0088f5836f41ee25380d87b092 hwdata-0.379.tar.gz +sha256 caa496a6203084ee3404c688a75ea05b4b10eec93340c503199647216127f347 hwdata-0.384.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 555fb58f143..3394dbd0152 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.379 +HWDATA_VERSION = 0.384 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From e8f80c24026110390ac9d53829e50f0a95d3206a Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Wed, 26 Jun 2024 16:59:42 +0200 Subject: [PATCH 1414/3013] package/rauc: select BR2_PACKAGE_LIBOPENSSL_ENGINES This fixes link time errors, undefined references to various ENGINE_* functions (paths shortened to the output directory): host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: librauc.a.p/src_signature.c.o: in function `get_pkcs11_engine.constprop.0': signature.c:(.text.get_pkcs11_engine.constprop.0+0x14): undefined reference to `ENGINE_load_builtin_engines' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: signature.c:(.text.get_pkcs11_engine.constprop.0+0x20): undefined reference to `ENGINE_by_id' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: signature.c:(.text.get_pkcs11_engine.constprop.0+0x54): undefined reference to `ENGINE_ctrl_cmd_string' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: signature.c:(.text.get_pkcs11_engine.constprop.0+0x60): undefined reference to `ENGINE_init' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: signature.c:(.text.get_pkcs11_engine.constprop.0+0xe0): undefined reference to `ENGINE_ctrl_cmd_string' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: signature.c:(.text.get_pkcs11_engine.constprop.0+0x128): undefined reference to `ENGINE_free' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: signature.c:(.text.get_pkcs11_engine.constprop.0+0x1a4): undefined reference to `ENGINE_finish' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: librauc.a.p/src_signature.c.o: in function `load_cert': signature.c:(.text.load_cert+0x114): undefined reference to `ENGINE_ctrl_cmd' host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: librauc.a.p/src_signature.c.o: in function `load_key': signature.c:(.text.load_key+0x124): undefined reference to `ENGINE_load_private_key' Before linking there were matching implicit declaration warnings during compile. [Peter: only select if libopenssl backend is used] Signed-off-by: Fiona Klute Tested-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- package/rauc/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 7451b29a55f..01a321e3dda 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_RAUC depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL + # uses ENGINE_* API + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_SQUASHFS # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT From 44a6b7866c95ca5459a53a50eab5ab1d38b6b8e1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Jul 2024 10:50:06 +0200 Subject: [PATCH 1415/3013] configs/qemu_sh4*: switch to initramfs Qemu 9.0.0/9.0.1 has introduced a Bug in sh4/sh4eb emulation so that the system doesn't boot anymore. The issue is already reported by Guenter Roeck: https://lists.nongnu.org/archive/html/qemu-devel/2024-05/msg00606.html Switch to initramfs for sh4/sh4eb emulation. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- board/qemu/sh4-r2d/readme.txt | 2 +- board/qemu/sh4eb-r2d/readme.txt | 2 +- configs/qemu_sh4_r2d_defconfig | 2 +- configs/qemu_sh4eb_r2d_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index b0799e47a87..24c3676d8ac 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig + qemu-system-sh4 -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/board/qemu/sh4eb-r2d/readme.txt b/board/qemu/sh4eb-r2d/readme.txt index 9f3dd8b20b0..577c54cd9d3 100644 --- a/board/qemu/sh4eb-r2d/readme.txt +++ b/board/qemu/sh4eb-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig + qemu-system-sh4eb -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index e5570dcbab3..8d3e96c9c59 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -7,7 +7,7 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem -BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set # Image diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 468d6567aef..10c547e0c4d 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -6,7 +6,7 @@ BR2_sh4eb=y BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem -BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set # Image From d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Jul 2024 10:53:06 +0200 Subject: [PATCH 1416/3013] configs/qemu: Update defconfigs to Linux 6.6.32 Linux version are changed to 6.6.32 (LTS) for all qemu defconfigs. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 42 ------------------- .../arm-trusted-firmware.hash | 2 + board/qemu/patches/binutils/binutils.hash | 2 + board/qemu/patches/gcc-final/gcc-final.hash | 2 + .../qemu/patches/gcc-initial/gcc-initial.hash | 2 + .../patches/linux-headers/linux-headers.hash | 1 + board/qemu/patches/linux/linux.hash | 5 +++ board/qemu/patches/opensbi/opensbi.hash | 2 + board/qemu/patches/uboot/uboot.hash | 3 ++ configs/qemu_aarch64_ebbr_defconfig | 6 ++- configs/qemu_aarch64_sbsa_defconfig | 6 ++- configs/qemu_aarch64_virt_defconfig | 6 ++- configs/qemu_arm_ebbr_defconfig | 6 ++- configs/qemu_arm_versatile_defconfig | 6 ++- configs/qemu_arm_vexpress_defconfig | 6 ++- configs/qemu_arm_vexpress_tz_defconfig | 6 ++- configs/qemu_m68k_mcf5208_defconfig | 6 ++- configs/qemu_m68k_q800_defconfig | 6 ++- configs/qemu_microblazebe_mmu_defconfig | 6 ++- configs/qemu_microblazeel_mmu_defconfig | 6 ++- configs/qemu_mips32r2_malta_defconfig | 6 ++- configs/qemu_mips32r2el_malta_defconfig | 6 ++- configs/qemu_mips32r6_malta_defconfig | 6 ++- configs/qemu_mips32r6el_malta_defconfig | 6 ++- configs/qemu_mips64_malta_defconfig | 6 ++- configs/qemu_mips64el_malta_defconfig | 6 ++- configs/qemu_mips64r6_malta_defconfig | 6 ++- configs/qemu_mips64r6el_malta_defconfig | 6 ++- configs/qemu_nios2_10m50_defconfig | 7 +++- configs/qemu_or1k_defconfig | 6 ++- configs/qemu_ppc64_e5500_defconfig | 6 ++- configs/qemu_ppc64_pseries_defconfig | 6 ++- configs/qemu_ppc64le_powernv8_defconfig | 6 ++- configs/qemu_ppc64le_pseries_defconfig | 6 ++- configs/qemu_ppc_bamboo_defconfig | 6 ++- configs/qemu_ppc_e500mc_defconfig | 6 ++- configs/qemu_ppc_g3beige_defconfig | 6 ++- configs/qemu_ppc_mac99_defconfig | 6 ++- configs/qemu_ppc_mpc8544ds_defconfig | 6 ++- configs/qemu_riscv32_nommu_virt_defconfig | 6 ++- configs/qemu_riscv32_virt_defconfig | 6 ++- configs/qemu_riscv64_nommu_virt_defconfig | 6 ++- configs/qemu_riscv64_virt_defconfig | 6 ++- configs/qemu_riscv64_virt_efi_defconfig | 8 +++- configs/qemu_s390x_defconfig | 6 ++- configs/qemu_sh4_r2d_defconfig | 6 ++- configs/qemu_sh4eb_r2d_defconfig | 6 ++- configs/qemu_sparc64_sun4u_defconfig | 6 ++- configs/qemu_sparc_ss10_defconfig | 6 +-- configs/qemu_x86_64_defconfig | 6 ++- configs/qemu_x86_defconfig | 6 ++- configs/qemu_xtensa_lx60_defconfig | 6 ++- configs/qemu_xtensa_lx60_nommu_defconfig | 6 ++- 53 files changed, 240 insertions(+), 88 deletions(-) create mode 100644 board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 100644 board/qemu/patches/binutils/binutils.hash create mode 100644 board/qemu/patches/gcc-final/gcc-final.hash create mode 100644 board/qemu/patches/gcc-initial/gcc-initial.hash create mode 120000 board/qemu/patches/linux-headers/linux-headers.hash create mode 100644 board/qemu/patches/linux/linux.hash create mode 100644 board/qemu/patches/opensbi/opensbi.hash create mode 100644 board/qemu/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 618871f98a1..f53d7851628 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -259,48 +259,6 @@ configs/pine64_defconfig lib_defconfig.ForceCheckHash configs/pine64_pinecube_defconfig lib_defconfig.ForceCheckHash configs/pine64_sopine_defconfig lib_defconfig.ForceCheckHash configs/pine64_star64_defconfig lib_defconfig.ForceCheckHash -configs/qemu_aarch64_ebbr_defconfig lib_defconfig.ForceCheckHash -configs/qemu_aarch64_sbsa_defconfig lib_defconfig.ForceCheckHash -configs/qemu_aarch64_virt_defconfig lib_defconfig.ForceCheckHash -configs/qemu_arm_ebbr_defconfig lib_defconfig.ForceCheckHash -configs/qemu_arm_versatile_defconfig lib_defconfig.ForceCheckHash -configs/qemu_arm_vexpress_defconfig lib_defconfig.ForceCheckHash -configs/qemu_arm_vexpress_tz_defconfig lib_defconfig.ForceCheckHash -configs/qemu_m68k_mcf5208_defconfig lib_defconfig.ForceCheckHash -configs/qemu_m68k_q800_defconfig lib_defconfig.ForceCheckHash -configs/qemu_microblazebe_mmu_defconfig lib_defconfig.ForceCheckHash -configs/qemu_microblazeel_mmu_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips32r2_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips32r2el_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips32r6_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips32r6el_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips64_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips64el_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips64r6_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_mips64r6el_malta_defconfig lib_defconfig.ForceCheckHash -configs/qemu_nios2_10m50_defconfig lib_defconfig.ForceCheckHash -configs/qemu_or1k_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc64_e5500_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc64_pseries_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc64le_powernv8_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc64le_pseries_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc_bamboo_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc_e500mc_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc_g3beige_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc_mac99_defconfig lib_defconfig.ForceCheckHash -configs/qemu_ppc_mpc8544ds_defconfig lib_defconfig.ForceCheckHash -configs/qemu_riscv32_virt_defconfig lib_defconfig.ForceCheckHash -configs/qemu_riscv64_nommu_virt_defconfig lib_defconfig.ForceCheckHash -configs/qemu_riscv64_virt_defconfig lib_defconfig.ForceCheckHash -configs/qemu_riscv64_virt_efi_defconfig lib_defconfig.ForceCheckHash -configs/qemu_s390x_defconfig lib_defconfig.ForceCheckHash -configs/qemu_sh4_r2d_defconfig lib_defconfig.ForceCheckHash -configs/qemu_sh4eb_r2d_defconfig lib_defconfig.ForceCheckHash -configs/qemu_sparc64_sun4u_defconfig lib_defconfig.ForceCheckHash -configs/qemu_x86_64_defconfig lib_defconfig.ForceCheckHash -configs/qemu_x86_defconfig lib_defconfig.ForceCheckHash -configs/qemu_xtensa_lx60_defconfig lib_defconfig.ForceCheckHash -configs/qemu_xtensa_lx60_nommu_defconfig lib_defconfig.ForceCheckHash configs/riotboard_defconfig lib_defconfig.ForceCheckHash configs/roc_pc_rk3399_defconfig lib_defconfig.ForceCheckHash configs/rock64_defconfig lib_defconfig.ForceCheckHash diff --git a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..74fe35c9bc7 --- /dev/null +++ b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz diff --git a/board/qemu/patches/binutils/binutils.hash b/board/qemu/patches/binutils/binutils.hash new file mode 100644 index 00000000000..6affaadf25b --- /dev/null +++ b/board/qemu/patches/binutils/binutils.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/board/qemu/patches/gcc-final/gcc-final.hash b/board/qemu/patches/gcc-final/gcc-final.hash new file mode 100644 index 00000000000..84bf45ec66b --- /dev/null +++ b/board/qemu/patches/gcc-final/gcc-final.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/board/qemu/patches/gcc-initial/gcc-initial.hash b/board/qemu/patches/gcc-initial/gcc-initial.hash new file mode 100644 index 00000000000..84bf45ec66b --- /dev/null +++ b/board/qemu/patches/gcc-initial/gcc-initial.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/board/qemu/patches/linux-headers/linux-headers.hash b/board/qemu/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/qemu/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/qemu/patches/linux/linux.hash b/board/qemu/patches/linux/linux.hash new file mode 100644 index 00000000000..deb1ad0ce5e --- /dev/null +++ b/board/qemu/patches/linux/linux.hash @@ -0,0 +1,5 @@ +# sha256 locally computed +sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz + +# sha256 locally computed +sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/board/qemu/patches/opensbi/opensbi.hash b/board/qemu/patches/opensbi/opensbi.hash new file mode 100644 index 00000000000..1408f547b8c --- /dev/null +++ b/board/qemu/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz diff --git a/board/qemu/patches/uboot/uboot.hash b/board/qemu/patches/uboot/uboot.hash new file mode 100644 index 00000000000..7762ff3f8f9 --- /dev/null +++ b/board/qemu/patches/uboot/uboot.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 u-boot-2022.04.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 84ab60a60b0..9f187dcc697 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -1,6 +1,10 @@ # Architecture BR2_aarch64=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" @@ -11,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 06cce72b6e8..24b059d6b2b 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -2,6 +2,10 @@ BR2_aarch64=y BR2_cortex_a57=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -22,7 +26,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index fedefd6d79f..30ecf04cacc 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -2,6 +2,10 @@ BR2_aarch64=y BR2_cortex_a53=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index ea732721ad6..7c436449d7f 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -2,6 +2,10 @@ BR2_arm=y BR2_cortex_a15=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" @@ -12,7 +16,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index a48e4372788..17eb7165674 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -2,6 +2,10 @@ BR2_arm=y BR2_arm926t=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 439c299752e..de09400f295 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -5,6 +5,10 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3D16=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -25,7 +29,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 76e2431f288..900bd17fc2e 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -3,6 +3,10 @@ BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_VFPV3D16=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" @@ -22,7 +26,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 64b906b2e58..6a1c99007f0 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -2,6 +2,10 @@ BR2_m68k=y BR2_m68k_cf5208=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 83f3d03c609..18a4090702b 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -2,6 +2,10 @@ BR2_m68k=y BR2_m68k_68040=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 9266b3e4aaa..fd1689b8792 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -2,6 +2,10 @@ BR2_microblaze=y BR2_microblazebe=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index bef418fd51e..88d3b560dbb 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -2,6 +2,10 @@ BR2_microblaze=y BR2_microblazeel=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 29ab7187481..a4145608ade 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -2,6 +2,10 @@ BR2_mips=y BR2_mips_32r2=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 9f963d26df3..6385914a170 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -2,6 +2,10 @@ BR2_mipsel=y BR2_mips_32r2=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index b3fa5f5e111..c3a94210ce8 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -2,6 +2,10 @@ BR2_mips=y BR2_mips_32r6=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index ef98362b5ba..fdd26d18781 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -2,6 +2,10 @@ BR2_mipsel=y BR2_mips_32r6=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index d645f2ffdda..5126b2cc248 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -2,6 +2,10 @@ BR2_mips64=y BR2_MIPS_NABI64=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index b64b577abe8..ad7a76ebdfb 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -2,6 +2,10 @@ BR2_mips64el=y BR2_MIPS_NABI64=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 5f7bc13b848..de671052861 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -3,6 +3,10 @@ BR2_mips64=y BR2_mips_64r6=y BR2_MIPS_NABI64=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 500ec39658d..51097c3a8e3 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -3,6 +3,10 @@ BR2_mips64el=y BR2_mips_64r6=y BR2_MIPS_NABI64=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 327fd991968..67419827dd9 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,12 @@ BR2_nios2=y + +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 3cbe89ce5fd..77ecb555909 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -1,6 +1,10 @@ # Architecture BR2_or1k=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -18,7 +22,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 1f34a50b745..a63bc011cde 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -2,6 +2,10 @@ BR2_powerpc64=y BR2_powerpc_e5500=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -16,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 5f6f51d2580..40016a55241 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -2,6 +2,10 @@ BR2_powerpc64=y BR2_powerpc_power7=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="hvc0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index fd8936a1fa6..763a428ee16 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -2,6 +2,10 @@ BR2_powerpc64le=y BR2_powerpc_power8=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 9c678ec1e57..fbcad654990 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -2,6 +2,10 @@ BR2_powerpc64le=y BR2_powerpc_power8=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index 1ebd2be5dc4..e5d4e055b14 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -2,6 +2,10 @@ BR2_powerpc=y BR2_powerpc_440fp=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 75833000e42..dc9598b5bf7 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -2,6 +2,10 @@ BR2_powerpc=y BR2_powerpc_e500mc=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -16,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 02348270923..85a974586cd 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -2,6 +2,10 @@ BR2_powerpc=y BR2_powerpc_750=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index b03378b34f0..5df26eb5efc 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -2,6 +2,10 @@ BR2_powerpc=y BR2_powerpc_7400=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -11,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 9ae10a9577c..cc0429e098a 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -2,6 +2,10 @@ BR2_powerpc=y BR2_powerpc_8548=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_nommu_virt_defconfig b/configs/qemu_riscv32_nommu_virt_defconfig index 36342608995..38a1cf791ff 100644 --- a/configs/qemu_riscv32_nommu_virt_defconfig +++ b/configs/qemu_riscv32_nommu_virt_defconfig @@ -3,6 +3,10 @@ BR2_riscv=y BR2_RISCV_32=y # BR2_RISCV_USE_MMU is not set +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # Hashes BR2_GLOBAL_PATCH_DIR="board/qemu/riscv32-virt/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y @@ -24,7 +28,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 56341c768ea..631526b6956 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -2,6 +2,10 @@ BR2_riscv=y BR2_RISCV_32=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index f6f1fa1c5b1..81214e54525 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -3,6 +3,10 @@ BR2_riscv=y BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y @@ -20,7 +24,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv64-virt/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 93c65b27274..31ac1d1ed9d 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -2,6 +2,10 @@ BR2_riscv=y BR2_RISCV_64=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_efi_defconfig b/configs/qemu_riscv64_virt_efi_defconfig index 0818b8f3aaf..b789c43d423 100644 --- a/configs/qemu_riscv64_virt_efi_defconfig +++ b/configs/qemu_riscv64_virt_efi_defconfig @@ -1,11 +1,17 @@ +# Architecture BR2_riscv=y + +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-efi/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index a768ca3053e..b22af68b046 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -1,6 +1,10 @@ # Architecture BR2_s390x=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" @@ -18,7 +22,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 8d3e96c9c59..7b7af6f0198 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -2,6 +2,10 @@ BR2_sh=y BR2_sh4=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" @@ -20,7 +24,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 10c547e0c4d..18f3805cfa8 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -2,6 +2,10 @@ BR2_sh=y BR2_sh4eb=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 213083c142a..f72bc5783a7 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -2,6 +2,10 @@ BR2_sparc64=y BR2_sparc_v9=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -19,7 +23,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 67d6cf67f65..ec90a5802c9 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -3,7 +3,7 @@ BR2_sparc=y BR2_sparc_v8=y # Hashes -BR2_GLOBAL_PATCH_DIR="board/qemu/sparc-ss10/patches" +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y # System @@ -18,12 +18,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 030818199bb..2a24533dd44 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -1,6 +1,10 @@ # Architecture BR2_x86_64=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -21,7 +25,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 92764c98528..a8596dae57f 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -2,6 +2,10 @@ BR2_i386=y BR2_x86_pentiumpro=y +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" @@ -22,7 +26,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index d315f2604d9..69f65bf99e7 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -3,6 +3,10 @@ BR2_xtensa=y BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -21,7 +25,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 16a323db94c..ab5aaca8a2c 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -4,6 +4,10 @@ BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" # BR2_XTENSA_USE_MMU is not set +# Hashes +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -22,7 +26,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From 9995ca7caaf75f34e72918218829bc15702432d5 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 15:48:40 +0200 Subject: [PATCH 1417/3013] package/shairport-sync: fix patch fuzz Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, shairport-sync fails to build with output: Applying 0001-configure.ac-find-sndfile-through-pkg-config.patch using patch: patching file configure.ac Hunk #1 FAILED at 304. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...001-configure.ac-find-sndfile-through-pkg-config.patch | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index f53d7851628..d0061485fb0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1314,7 +1314,6 @@ package/setserial/0002-tiocghayesesp-build-fix.patch lib_patch.Upstream package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch lib_patch.Upstream package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch lib_patch.Upstream package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch lib_patch.Upstream -package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch lib_patch.Upstream package/shairport-sync/S99shairport-sync Shellcheck lib_sysv.Indent lib_sysv.Variables package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch lib_patch.Upstream package/shellinabox/0001-Makefile-disable-always-building-statically.patch lib_patch.Upstream diff --git a/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch b/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch index bd97ec0c3d8..b593703a2a6 100644 --- a/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch +++ b/package/shairport-sync/0001-configure.ac-find-sndfile-through-pkg-config.patch @@ -13,7 +13,9 @@ Fixes: - http://autobuild.buildroot.org/results/92ed30a6855ca11800b779718822bcba4a69c9a3 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1263] +Upstream: https://github.com/mikebrady/shairport-sync/pull/1263 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure.ac | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) @@ -22,9 +24,9 @@ diff --git a/configure.ac b/configure.ac index f77087c5..9b982c51 100644 --- a/configure.ac +++ b/configure.ac -@@ -304,7 +304,14 @@ AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP +@@ -303,7 +303,14 @@ + AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])]) if test "x$with_convolution" = "xyes" ; then - AM_INIT_AUTOMAKE([subdir-objects]) AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.]) - AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!)) + if test "x${with_pkg_config}" = xyes ; then From cb25b54c2dd12c9d298a04b78668592b9593cd97 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Fri, 5 Jul 2024 11:44:49 +0200 Subject: [PATCH 1418/3013] docs/manual: allow sponsor mention in author name Unfortunately not all mail providers deliver mails with subaddressing, mention people can acknowledge a sponsor in the author name instead. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni --- docs/manual/contribute.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index c88035597e7..078725ef567 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -264,6 +264,10 @@ separated from it by a plus `+` sign. E.g.: + `Your-Name Your-Surname ` +Alternatively, especially if your email server does not support +subaddressing, you can include the sponsor in your author name in +parentheses, e.g. "Your Name (Sponsor Name)". + When adding new packages, you should submit every package in a separate patch. This patch should have the update to +package/Config.in+, the package +Config.in+ file, the +.mk+ file, the From 8900311b7e5450082cace986533a093d37900efa Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Thu, 4 Jul 2024 12:16:29 +0200 Subject: [PATCH 1419/3013] package/openssh: manage sshd using start-stop-daemon The previously used "killall sshd" stopped all instances of sshd. With OpenSSH before 9.8 that meant not only the listening server, but also instances serving currently open sessions, possibly including the one used to send the restart command, preventing it from completing the "start" part of "restart" and leaving the system unreachable over SSH. start-stop-daemon uses the PID file to target only the intended process, and has built-in capability to check if it is running. This ensures any open SSH sessions are unaffected, as well as unrelated processes (in case a daemon crashed and the PID got reused). Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- package/openssh/S50sshd | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index d0061485fb0..0f33ed0705d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1103,7 +1103,7 @@ package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch lib_pa package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch lib_patch.Upstream package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch lib_patch.Upstream package/openrc/0006-Also-create-run-lock-subsys-directory.patch lib_patch.Upstream -package/openssh/S50sshd lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables +package/openssh/S50sshd lib_sysv.Indent package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch lib_patch.Upstream package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch lib_patch.Upstream package/openvmtools/0001-no_cflags_werror.patch lib_patch.Upstream diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index 22da41d1ca5..8f4fe10153e 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -3,6 +3,9 @@ # sshd Starts sshd. # +DAEMON="sshd" +PIDFILE="/var/run/$DAEMON.pid" + # Make sure the ssh-keygen progam exists [ -f /usr/bin/ssh-keygen ] || exit 0 @@ -12,17 +15,35 @@ start() { # Create any missing keys /usr/bin/ssh-keygen -A - printf "Starting sshd: " - /usr/sbin/sshd - touch /var/lock/sshd - echo "OK" + printf "Starting %s: " "$DAEMON" + start-stop-daemon -S -q -p "$PIDFILE" \ + -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } + stop() { printf "Stopping sshd: " - killall sshd - rm -f /var/lock/sshd - echo "OK" + start-stop-daemon -K -q -p "$PIDFILE" \ + -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + # sshd deletes its PID file on exit, wait for it to be gone + while [ -f "$PIDFILE" ]; do + sleep 0.1 + done + return "$status" } + restart() { stop start @@ -44,4 +65,3 @@ case "$1" in esac exit $? - From df605de1349251687640519fcc2d2147cf146af9 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Thu, 4 Jul 2024 12:16:30 +0200 Subject: [PATCH 1420/3013] package/openssh: fix init script indentation This brings the script in line with .editorconfig settings and other newer init scripts. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/openssh/S50sshd | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0f33ed0705d..505725695c5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1103,7 +1103,6 @@ package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch lib_pa package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch lib_patch.Upstream package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch lib_patch.Upstream package/openrc/0006-Also-create-run-lock-subsys-directory.patch lib_patch.Upstream -package/openssh/S50sshd lib_sysv.Indent package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch lib_patch.Upstream package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch lib_patch.Upstream package/openvmtools/0001-no_cflags_werror.patch lib_patch.Upstream diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index 8f4fe10153e..781aad87153 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -50,18 +50,18 @@ restart() { } case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 esac exit $? From 2c14a55c6cf28ada9f1d3d17d3b11370829372ca Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Thu, 4 Jul 2024 12:16:31 +0200 Subject: [PATCH 1421/3013] package/openssh: implement "reload" using SIGHUP This is the documented "reload configuration" method for OpenSSH. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni --- package/openssh/S50sshd | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index 781aad87153..d16a7ad8fc1 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -49,6 +49,19 @@ restart() { start } +reload() { + printf "Reloading sshd config: " + start-stop-daemon -K --signal HUP -q -p "$PIDFILE" \ + -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + case "$1" in start) start @@ -56,11 +69,14 @@ case "$1" in stop) stop ;; - restart|reload) + restart) restart ;; + reload) + reload + ;; *) - echo "Usage: $0 {start|stop|restart}" + echo "Usage: $0 {start|stop|restart|reload}" exit 1 esac From 2ff544cb629e4f7df293a27318a3c0bde5b46838 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 4 Jul 2024 15:05:22 +0200 Subject: [PATCH 1422/3013] package/wlroots: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, wlroots fails to build with output: Applying 0001-Add-feature-macros-to-more-C-files-.patch using patch: patching file backend/wayland/output.c patching file types/data_device/wlr_data_device.c patching file types/data_device/wlr_drag.c patching file types/wlr_export_dmabuf_v1.c patching file types/wlr_idle.c patching file types/wlr_keyboard_shortcuts_inhibit_v1.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file types/wlr_keyboard_shortcuts_inhibit_v1.c.rej patching file types/wlr_pointer_constraints_v1.c patching file types/wlr_primary_selection.c patching file types/wlr_relative_pointer_v1.c patching file types/wlr_screencopy_v1.c patching file types/wlr_virtual_pointer_v1.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file types/wlr_virtual_pointer_v1.c.rej patching file types/wlr_xdg_decoration_v1.c patching file types/xdg_shell/wlr_xdg_popup.c patching file types/xdg_shell/wlr_xdg_positioner.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file types/xdg_shell/wlr_xdg_positioner.c.rej patching file types/xdg_shell/wlr_xdg_shell.c patching file types/xdg_shell/wlr_xdg_surface.c This commit refreshes the package patch on the current package version. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-Add-feature-macros-to-more-C-files.patch} | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) rename package/wlroots/{0001-Add-feature-macros-to-more-C-files-.patch => 0001-Add-feature-macros-to-more-C-files.patch} (87%) diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files.patch similarity index 87% rename from package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch rename to package/wlroots/0001-Add-feature-macros-to-more-C-files.patch index 0e1ae9d87aa..9467318b314 100644 --- a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch +++ b/package/wlroots/0001-Add-feature-macros-to-more-C-files.patch @@ -1,4 +1,4 @@ -From cf37ba4c0bf31316b698ba23015f91903766871d Mon Sep 17 00:00:00 2001 +From 7854cd141f6f4c896afdc86229671d443ca7ba10 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Thu, 18 Feb 2021 22:31:39 +0000 Subject: [PATCH] Add feature macros to more C files @@ -11,6 +11,8 @@ see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493 Signed-off-by: Paul Cercueil [Retrieved from: https://github.com/swaywm/wlroots/pull/2493] Signed-off-by: Fabrice Fontaine +[Julien: refreshed the patch to be applied with fuzz factor 0] +Signed-off-by: Julien Olivain --- backend/wayland/output.c | 1 + types/data_device/wlr_data_device.c | 1 + @@ -31,7 +33,7 @@ Signed-off-by: Fabrice Fontaine 16 files changed, 16 insertions(+) diff --git a/backend/wayland/output.c b/backend/wayland/output.c -index d5410e0d32..8ff8fa2a00 100644 +index c4b95e1..d5699d3 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -1,3 +1,4 @@ @@ -40,7 +42,7 @@ index d5410e0d32..8ff8fa2a00 100644 #include #include diff --git a/types/data_device/wlr_data_device.c b/types/data_device/wlr_data_device.c -index 6cd84ec0ab..beac496124 100644 +index 7e67479..2db13a6 100644 --- a/types/data_device/wlr_data_device.c +++ b/types/data_device/wlr_data_device.c @@ -1,3 +1,4 @@ @@ -49,7 +51,7 @@ index 6cd84ec0ab..beac496124 100644 #include #include diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c -index 53bf4066a1..e3c1e249b4 100644 +index c1fa801..8981ea0 100644 --- a/types/data_device/wlr_drag.c +++ b/types/data_device/wlr_drag.c @@ -1,3 +1,4 @@ @@ -58,7 +60,7 @@ index 53bf4066a1..e3c1e249b4 100644 #include #include diff --git a/types/wlr_export_dmabuf_v1.c b/types/wlr_export_dmabuf_v1.c -index a8e2a4bde3..98ceae68f1 100644 +index c1d26e6..cd06615 100644 --- a/types/wlr_export_dmabuf_v1.c +++ b/types/wlr_export_dmabuf_v1.c @@ -1,3 +1,4 @@ @@ -67,7 +69,7 @@ index a8e2a4bde3..98ceae68f1 100644 #include #include diff --git a/types/wlr_idle.c b/types/wlr_idle.c -index 4c338931cc..80fd871fab 100644 +index cb3a1cc..5f1fa95 100644 --- a/types/wlr_idle.c +++ b/types/wlr_idle.c @@ -1,3 +1,4 @@ @@ -76,16 +78,16 @@ index 4c338931cc..80fd871fab 100644 #include #include diff --git a/types/wlr_keyboard_shortcuts_inhibit_v1.c b/types/wlr_keyboard_shortcuts_inhibit_v1.c -index fe4e64b04e..8360a9c21c 100644 +index cc9bac1..3924893 100644 --- a/types/wlr_keyboard_shortcuts_inhibit_v1.c +++ b/types/wlr_keyboard_shortcuts_inhibit_v1.c @@ -1,3 +1,4 @@ +#define _POSIX_C_SOURCE 199309L #include #include - #include + #include diff --git a/types/wlr_pointer_constraints_v1.c b/types/wlr_pointer_constraints_v1.c -index eca45984c4..f1db8e3415 100644 +index 7a8d209..70b0984 100644 --- a/types/wlr_pointer_constraints_v1.c +++ b/types/wlr_pointer_constraints_v1.c @@ -1,3 +1,4 @@ @@ -94,7 +96,7 @@ index eca45984c4..f1db8e3415 100644 #include #include diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c -index 0875462c8c..7e0e11ddaa 100644 +index d576bf0..bac4daa 100644 --- a/types/wlr_primary_selection.c +++ b/types/wlr_primary_selection.c @@ -1,3 +1,4 @@ @@ -103,7 +105,7 @@ index 0875462c8c..7e0e11ddaa 100644 #include #include diff --git a/types/wlr_relative_pointer_v1.c b/types/wlr_relative_pointer_v1.c -index 8613f2b91c..3f8dd8b72a 100644 +index 44da791..f6925b8 100644 --- a/types/wlr_relative_pointer_v1.c +++ b/types/wlr_relative_pointer_v1.c @@ -1,3 +1,4 @@ @@ -112,7 +114,7 @@ index 8613f2b91c..3f8dd8b72a 100644 #include #include diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c -index 6feb074274..29864c2364 100644 +index 4ca659a..76c582e 100644 --- a/types/wlr_screencopy_v1.c +++ b/types/wlr_screencopy_v1.c @@ -1,3 +1,4 @@ @@ -121,16 +123,16 @@ index 6feb074274..29864c2364 100644 #include #include diff --git a/types/wlr_virtual_pointer_v1.c b/types/wlr_virtual_pointer_v1.c -index a9d1fd7bc4..5566e9e013 100644 +index b452ff5..661e613 100644 --- a/types/wlr_virtual_pointer_v1.c +++ b/types/wlr_virtual_pointer_v1.c @@ -1,3 +1,4 @@ +#define _POSIX_C_SOURCE 199309L #include #include - #include + #include diff --git a/types/wlr_xdg_decoration_v1.c b/types/wlr_xdg_decoration_v1.c -index 544035b7b8..904474c088 100644 +index fcd97a5..1850665 100644 --- a/types/wlr_xdg_decoration_v1.c +++ b/types/wlr_xdg_decoration_v1.c @@ -1,3 +1,4 @@ @@ -139,7 +141,7 @@ index 544035b7b8..904474c088 100644 #include #include diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c -index 69b4cfe19f..05d6551fc8 100644 +index fa99acd..8361eef 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -1,3 +1,4 @@ @@ -148,16 +150,16 @@ index 69b4cfe19f..05d6551fc8 100644 #include #include diff --git a/types/xdg_shell/wlr_xdg_positioner.c b/types/xdg_shell/wlr_xdg_positioner.c -index f88bf323b8..8881c49916 100644 +index 6a991bb..dae879b 100644 --- a/types/xdg_shell/wlr_xdg_positioner.c +++ b/types/xdg_shell/wlr_xdg_positioner.c @@ -1,3 +1,4 @@ +#define _POSIX_C_SOURCE 199309L #include #include - #include "types/wlr_xdg_shell.h" + #include diff --git a/types/xdg_shell/wlr_xdg_shell.c b/types/xdg_shell/wlr_xdg_shell.c -index 0480d5f354..c93fe7c3fb 100644 +index 70b777d..16d275a 100644 --- a/types/xdg_shell/wlr_xdg_shell.c +++ b/types/xdg_shell/wlr_xdg_shell.c @@ -1,3 +1,4 @@ @@ -166,7 +168,7 @@ index 0480d5f354..c93fe7c3fb 100644 #include #include "types/wlr_xdg_shell.h" diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c -index edf562abcd..c1dfbfba7e 100644 +index a03b90a..a6267cf 100644 --- a/types/xdg_shell/wlr_xdg_surface.c +++ b/types/xdg_shell/wlr_xdg_surface.c @@ -1,3 +1,4 @@ @@ -174,3 +176,6 @@ index edf562abcd..c1dfbfba7e 100644 #include #include #include +-- +2.45.2 + From 17f607e341216d38b6d79a580cf61815313ff238 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:57:05 +0200 Subject: [PATCH 1423/3013] package/dovecot: needs engine support when built with libopenssl Buildroot commit 623d3bbe43e9193aa8e3395367d01af59071b859 disables engine support when BR2_PACKAGE_LIBOPENSSL_ENGINES is not set. Fixes: http://autobuild.buildroot.net/results/7484edfa0b8c45bafb8da051ca839bf174c8f93f/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 034dcc175ff..517040fad6e 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_DOVECOT bool "dovecot" depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB From 3d46d9760b97f1782f0f1f617682c18864b5e2b2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 00:26:57 +0200 Subject: [PATCH 1424/3013] package/apr-util: needs engine support when built with libopenssl Buildroot commit 623d3bbe43e9193aa8e3395367d01af59071b859 disables engine support when BR2_PACKAGE_LIBOPENSSL_ENGINES is not set. Fixes: http://autobuild.buildroot.net/results/e472618ca9ff4a3cf460f607a8dfa317832ca622/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apr-util/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index c1a967bdecf..f7c119db485 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_APR_UTIL depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help The utility library for the apache runtime project From d611acf8e9f9d598f001fec65c974b0c3f20a1f6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 28 Jun 2024 17:24:17 +0300 Subject: [PATCH 1425/3013] package/libcurl: fix build with mbedtls Add upstream patch to fix compatibility with mbedtls version 2.28.x, which is broken since commit 50bdb2a3b7 (package/libcurl: bump version to 8.8.0). Fixes: http://autobuild.buildroot.net/results/66ba878386e4e478645edb6a282e82820b8dad7f http://autobuild.buildroot.net/results/7a4d9595197cf23080a23dfe9bc0e60b8145af6e http://autobuild.buildroot.net/results/9add7283813388daa95b16ef76acb3c4e9ea7c2f [Peter: mention when this issue was introduced] Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...-mbedtls-check-version-for-cipher-id.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch diff --git a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch new file mode 100644 index 00000000000..b7d674acfe3 --- /dev/null +++ b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch @@ -0,0 +1,56 @@ +From 0c4b4c1e93c8e869af230090f32346fdfd548f21 Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Wed, 22 May 2024 14:44:56 +0200 +Subject: [PATCH] mbedtls: check version for cipher id + +mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have been added in +mbedtls 3.2.0. Check for that version. + +Closes #13749 + +Signed-off-by: Baruch Siach +Upstream: https://github.com/curl/curl/commit/0c4b4c1e93c8e869af230090f32346fdfd548f21 +--- + lib/vtls/mbedtls.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +index ec0b10dd9a9f..98a4ea01b183 100644 +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + (struct mbed_ssl_backend_data *)connssl->backend; + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + const mbedtls_x509_crt *peercert; +- char cipher_str[64]; +- uint16_t cipher_id; + #ifndef CURL_DISABLE_PROXY + const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? + data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: +@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + return CURLE_SSL_CONNECT_ERROR; + } + +- cipher_id = (uint16_t) +- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); +- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); +- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); +- ++#if MBEDTLS_VERSION_NUMBER >= 0x03020000 ++ { ++ char cipher_str[64]; ++ uint16_t cipher_id; ++ cipher_id = (uint16_t) ++ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); ++ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); ++ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); ++ } ++#else ++ infof(data, "mbedTLS: Handshake complete"); ++#endif + ret = mbedtls_ssl_get_verify_result(&backend->ssl); + + if(!conn_config->verifyhost) +-- +2.43.0 + From e954e12de2801d1471472239f8719a5f6428c212 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 8 Jul 2024 13:52:12 +0200 Subject: [PATCH 1426/3013] package/fluent-bit: enable engines support in libopenssl Fixes: http://autobuild.buildroot.net/results/c08/c08c00f52b8f42fd408a1e84e41606d75558c3ce/ The embedded librdkafka copy unconditionally enables calls the (deprecated) ENGINE_* logic in openssl: https://github.com/confluentinc/librdkafka/blob/v2.4.0/src/rdkafka_conf.h#L37 Which are now no longer available in !BR2_PACKAGE_LIBOPENSSL_ENGINES builds since commit 623d3bbe43 (package/libopenssl: no-engine), so enable it to fix the build issue. Signed-off-by: Peter Korsgaard --- package/fluent-bit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 53284ee17d8..697cb1bf156 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_FLUENT_BIT select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES # needed by bundled librdkafka select BR2_PACKAGE_LIBYAML help Fast and Lightweight Logs and Metrics processor. From b55b1e893ef7584d32aa8882401918aee7e823c7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Jun 2024 18:56:59 +0200 Subject: [PATCH 1427/3013] package/openvpn: security bump version to 2.6.11 Release notes: https://sourceforge.net/p/openvpn/mailman/message/58786888/ Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Fixes CVE-2024-4877, CVE-2024-5594 & CVE-2024-28882. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 932483507e7..a4ba458bd82 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b openvpn-2.6.10.tar.gz +sha256 d60adf413d37e11e6e63531cacf2655906756046b4edffe88a13b9e2fec40d5e openvpn-2.6.11.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index abcb123eeab..3b39d62519e 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.10 +OPENVPN_VERSION = 2.6.11 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From 61fc8632d389a9464132c40b75eeafa6b1393d44 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Jun 2024 18:56:39 +0200 Subject: [PATCH 1428/3013] package/samba4: bump version to 4.20.2 Removed patch which is included in this release. Renumbered remaining patches. Release notes: - https://www.samba.org/samba/history/samba-4.20.0rc1.html - https://www.samba.org/samba/history/samba-4.20.0rc2.html - https://www.samba.org/samba/history/samba-4.20.0rc3.html - https://www.samba.org/samba/history/samba-4.20.0rc4.html - https://www.samba.org/samba/history/samba-4.20.0.html - https://www.samba.org/samba/history/samba-4.20.1.html - https://www.samba.org/samba/history/samba-4.20.2.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .checkpackageignore | 5 +- ...ilt-heimdal-build-tools-in-case-of-.patch} | 0 ...01-libreplace-disable-libbsd-support.patch | 46 ------------------- ...t.c-include-stdint.h-before-cmoka.h.patch} | 0 package/samba4/samba4.hash | 4 +- package/samba4/samba4.mk | 2 +- 6 files changed, 5 insertions(+), 52 deletions(-) rename package/samba4/{0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch => 0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch} (100%) delete mode 100644 package/samba4/0001-libreplace-disable-libbsd-support.patch rename package/samba4/{0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch => 0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch} (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 505725695c5..471b049ca6c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1281,9 +1281,8 @@ package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream package/rygel/S99rygel Shellcheck lib_sysv.Indent lib_sysv.Variables package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch lib_patch.Upstream package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch lib_patch.Upstream -package/samba4/0001-libreplace-disable-libbsd-support.patch lib_patch.Upstream -package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch lib_patch.Upstream -package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch lib_patch.Upstream +package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch lib_patch.Upstream +package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch lib_patch.Upstream package/samba4/S91smb Shellcheck lib_sysv.Indent lib_sysv.Variables package/sane-backends/0001-sane_backend-add-missing-config.h.patch lib_patch.Upstream package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch lib_patch.Upstream diff --git a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch similarity index 100% rename from package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch rename to package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch deleted file mode 100644 index 8259e91fc65..00000000000 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4df82c9e03b68dc1621fe4c9ac6a29ae3e64e07e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 7 Sep 2016 23:03:43 -0300 -Subject: [PATCH] libreplace: disable libbsd support - -Disable libbsd support, samba4 uses a global config.h for its own -codebase and that of heimdal (when building with builtin). -This causes redefinition conflicts for link(2) when both standard -unistd.h and bsd/unistd.h get included. - -Signed-off-by: Gustavo Zacarias -[Bernd: rebased for versions 4.7.3, 4.8.0, 4.8.5 & 4.11.13] -Signed-off-by: Bernd Kuhls ---- - lib/replace/wscript | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/lib/replace/wscript b/lib/replace/wscript -index 240d730cbee..c6d8df43c74 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -436,21 +436,6 @@ def configure(conf): - - strlcpy_in_bsd = False - -- # 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', -- checklibc=True): -- strlcpy_in_bsd = True -- 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') -- - conf.CHECK_CODE(''' - struct ucred cred; - socklen_t cred_len; --- -2.20.1 - diff --git a/package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch b/package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch similarity index 100% rename from package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch rename to package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 49ce47705db..353736f3b2b 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.6.tar.asc -sha256 653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1 samba-4.19.6.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.20.2.tar.asc +sha256 f969ffed58ccf3e85cbbcc0e33a1726d025c2b40f42a653b1125b82b92d2e0e5 samba-4.20.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 994037c84b9..5536b6b1214 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.6 +SAMBA4_VERSION = 4.20.2 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 515e579567a8e44e8e4c537ba10f49d5b5d732d9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Jun 2024 10:43:22 +0200 Subject: [PATCH 1429/3013] package/ghostscript: security bump version to 10.03.1 Fixes CVE-2024-33869, CVE-2023-52722, CVE-2024-33870, CVE-2024-33871 and CVE-2024-29510. Release notes: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/tag/gs10031 Remove patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Fix-build-without-BUILD_PDF.patch | 34 ------------------- package/ghostscript/ghostscript.hash | 4 +-- package/ghostscript/ghostscript.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch diff --git a/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch deleted file mode 100644 index af69cd36707..00000000000 --- a/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 088f3cd6e58cff5fa51e072d1829f7691a5f6681 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 20 Sep 2023 13:44:28 +0100 -Subject: [PATCH] Fix build without BUILD_PDF - -The PDFSetParams PostScript extension operator was missing a stub function definition -when the PDF interpreter is not built in. - - Author: Fabrice Fontaine -Upstream: https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=088f3cd6e58cff5fa51e072d1829f7691a5f6681 -Signed-off-by: Fabrice Fontaine ---- - psi/zpdfops.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/psi/zpdfops.c b/psi/zpdfops.c -index e7e0a42ee..271687a18 100644 ---- a/psi/zpdfops.c -+++ b/psi/zpdfops.c -@@ -1507,6 +1507,11 @@ static int zPDFdrawannots(i_ctx_t *i_ctx_p) - return_error(gs_error_undefined); - } - -+static int zPDFSetParams(i_ctx_t *i_ctx_p) -+{ -+ return_error(gs_error_undefined); -+} -+ - static int zPDFInit(i_ctx_t *i_ctx_p) - { - return_error(gs_error_undefined); --- -2.34.1 - diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 849f6c64ba6..ed8e4cf7d9b 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS -sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10031/SHA512SUMS +sha512 59e071cd23aed246b51317d3cccd9ccf8e1e84c4ecf9b22fb938e561eff42cec61915b0bdd96a313a3ea27750579c54ca0d0862b65edd306a621731c0063ffd3 ghostscript-10.03.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index da23ebbadbb..80e2543d1c6 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.02.1 +GHOSTSCRIPT_VERSION = 10.03.1 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From 99ec566bcf793d7abf55fd0b7e656abb6a4fcf95 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Jun 2024 12:25:20 +0200 Subject: [PATCH 1430/3013] package/transmission: bump version to 4.0.6 Release notes: https://github.com/transmission/transmission/releases/tag/4.0.6 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/transmission/transmission.hash | 2 +- package/transmission/transmission.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/transmission/transmission.hash b/package/transmission/transmission.hash index ed600c7699e..3e470a002ef 100644 --- a/package/transmission/transmission.hash +++ b/package/transmission/transmission.hash @@ -1,4 +1,4 @@ # From https://transmissionbt.com/download -sha256 fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357 transmission-4.0.5.tar.xz +sha256 2a38fe6d8a23991680b691c277a335f8875bdeca2b97c6b26b598bc9c7b0c45f transmission-4.0.6.tar.xz # Locally calculated sha256 f56732960a61ecf3b9637404eef1a39221d2006336a98792b7b65a79f155449c COPYING diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index f1130aeaddc..1eab839fd3c 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 4.0.5 +TRANSMISSION_VERSION = 4.0.6 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_SITE = https://github.com/transmission/transmission/releases/download/$(TRANSMISSION_VERSION) TRANSMISSION_DEPENDENCIES = \ From a7e270bf65b3c8e6de3b419bd31f1dd8e770ea6b Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 4 Jul 2024 20:56:41 +0200 Subject: [PATCH 1431/3013] package/paxtest: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, paxtest fails to build with output: Applying 0001-genpaxtest-move-log-location.patch using patch: patching file genpaxtest Hunk #1 FAILED at 35. 1 out of 1 hunk FAILED -- saving rejects to file genpaxtest.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/paxtest/0001-genpaxtest-move-log-location.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/paxtest/0001-genpaxtest-move-log-location.patch b/package/paxtest/0001-genpaxtest-move-log-location.patch index 6447d53c96c..fa18815d6da 100644 --- a/package/paxtest/0001-genpaxtest-move-log-location.patch +++ b/package/paxtest/0001-genpaxtest-move-log-location.patch @@ -7,6 +7,8 @@ Move log location to /var/log instead of local directory. (For read-only filesystems) Signed-off-by: David Graziano +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- genpaxtest | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) @@ -16,15 +18,14 @@ index 5a22e15..d62b15e 100644 --- a/genpaxtest +++ b/genpaxtest @@ -35,7 +35,7 @@ - exit 1 + exit 1 fi - + -LOG=\$HOME/paxtest.log +LOG=/var/log/paxtest.log [ -n "\$1" ] && LOG=\$1 touch "\$LOG" if [ ! -e "\$LOG" ]; then - -- 1.9.1 From c87964564e130bb8eb6140c66880e4e489aae8bb Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 4 Jul 2024 20:44:56 +0200 Subject: [PATCH 1432/3013] package/nvidia-driver: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, nvidia-driver fails to build with output: Applying 0001-use-LDFLAGS.patch using patch: patching file kernel/nvidia/nvidia.Kbuild Hunk #1 FAILED at 87. 1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia/nvidia.Kbuild.rej patching file kernel/nvidia-modeset/nvidia-modeset.Kbuild Hunk #1 FAILED at 70. 1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia-modeset/nvidia-modeset.Kbuild.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/nvidia-driver/0001-use-LDFLAGS.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/nvidia-driver/0001-use-LDFLAGS.patch b/package/nvidia-driver/0001-use-LDFLAGS.patch index 7b7df809883..9ce237f9595 100644 --- a/package/nvidia-driver/0001-use-LDFLAGS.patch +++ b/package/nvidia-driver/0001-use-LDFLAGS.patch @@ -17,6 +17,8 @@ Add use of $(LDFLAGS) when doing the link, as the kernel provides the proper emulation in those. Signed-off-by: "Yann E. MORIN" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Issue reported upstream: @@ -25,8 +27,8 @@ Issue reported upstream: diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild --- nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild 2016-08-09 01:57:50.000000000 +0200 +++ nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild 2016-08-20 12:25:02.780233423 +0200 -@@ -87,7 +87,7 @@ - always += $(NVIDIA_INTERFACE) +@@ -93,7 +93,7 @@ + always-y += $(NVIDIA_INTERFACE) $(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS)) - $(LD) -r -o $@ $^ @@ -37,8 +39,8 @@ diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-3 diff -durN nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild --- nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-09 01:43:19.000000000 +0200 +++ nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-20 12:25:39.596772662 +0200 -@@ -70,7 +70,7 @@ - always += $(NVIDIA_MODESET_INTERFACE) +@@ -75,7 +75,7 @@ + always-y += $(NVIDIA_MODESET_INTERFACE) $(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS)) - $(LD) -r -o $@ $^ From 38dbdc18a8bcd348905f326c53e2a891480d755c Mon Sep 17 00:00:00 2001 From: Dongdong Zhang Date: Tue, 9 Jul 2024 09:45:17 +0800 Subject: [PATCH 1433/3013] .github: add github action to automate PR handling This patch updates the Buildroot repository's GitHub configuration to better manage incoming pull requests. - Added a new GitHub Actions workflow (`repo-lockdown.yml`) to automatically handle new pull requests. The new workflow: - Triggers on new pull requests. - Uses the `dessant/repo-lockdown` action to: - Comment on the pull request, guiding contributors to use the mailing list for patch submission. - Lock the pull request to prevent further discussion. - Close the pull request. This change ensures that contributors are properly directed to the preferred method of patch submission via the mailing list, maintaining consistency and streamlining the review process. Signed-off-by: Dongdong Zhang Signed-off-by: Thomas Petazzoni --- .github/workflows/repo-lockdown.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/repo-lockdown.yml diff --git a/.github/workflows/repo-lockdown.yml b/.github/workflows/repo-lockdown.yml new file mode 100644 index 00000000000..45cfd2867d3 --- /dev/null +++ b/.github/workflows/repo-lockdown.yml @@ -0,0 +1,25 @@ +name: 'Repo Lockdown' + +on: + pull_request_target: + types: opened + +permissions: + pull-requests: write + +jobs: + action: + if: github.repository == 'buildroot/buildroot' + runs-on: ubuntu-latest + steps: + - uses: dessant/repo-lockdown@v4 + with: + pr-comment: | + Please do not submit a Pull Request via GitHub. Buildroot makes use of a + [mailing list](http://lists.buildroot.org/mailman/listinfo/buildroot) for patch submission and review. + See [submitting your own patches](http://buildroot.org/manual.html#submitting-patches) for more info. + + Thanks for your help! + lock-pr: true + close-pr: true + From 6b86f076c3fb3683dd9ac0a75457176b1e7c9d5d Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Tue, 9 Jul 2024 09:13:09 +0200 Subject: [PATCH 1434/3013] package/fmt: bump to version 11.0.1 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/fmt/fmt.hash | 2 +- package/fmt/fmt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 5d46b3fe3b3..90d78dd9893 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9 fmt-10.2.1.zip +sha256 62ca45531814109b5d6cef0cf2fd17db92c32a30dd23012976e768c685534814 fmt-11.0.1.zip sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 335efa7edf3..d33b5b1bff6 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 10.2.1 +FMT_VERSION = 11.0.1 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception From 91952568b0b1b3477ae573f8e3277d625965b923 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 30 Jun 2024 15:51:18 +0200 Subject: [PATCH 1435/3013] package/lua-dkjson: bump to 2.8 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-dkjson/Config.in | 2 +- package/lua-dkjson/lua-dkjson.hash | 4 ++-- package/lua-dkjson/lua-dkjson.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-dkjson/Config.in b/package/lua-dkjson/Config.in index 9c5dff19281..e550fdfb857 100644 --- a/package/lua-dkjson/Config.in +++ b/package/lua-dkjson/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUA_DKJSON dkjson is written in Lua without any dependencies, but when LPeg is available dkjson can use it to speed up decoding. - http://dkolf.de/src/dkjson-lua.fsl/ + http://dkolf.de/dkjson-lua/ diff --git a/package/lua-dkjson/lua-dkjson.hash b/package/lua-dkjson/lua-dkjson.hash index 2f210e497dc..710879da0bd 100644 --- a/package/lua-dkjson/lua-dkjson.hash +++ b/package/lua-dkjson/lua-dkjson.hash @@ -1,5 +1,5 @@ # computed by luarocks/buildroot -sha256 f6101a0e77ca857ec20799f6b998a600b04c8dd09b27c445ea09f29695bfffb0 dkjson-2.7-1.src.rock +sha256 3d8de09cd43a60a005ac769ee1cedc515952c892d63cba9ac925ed02afc98091 dkjson-2.8-1.src.rock # locally computed -sha256 9d46e06db7feb8fd68f73bd024c8a2c04807629e16f396880860d151b60a3ed1 dkjson-2.7/readme.txt +sha256 9c60064047b0f41092ee714d205b4b915f1da147fdf9afc4b3ee7bcf028a2238 dkjson-2.8/readme.txt diff --git a/package/lua-dkjson/lua-dkjson.mk b/package/lua-dkjson/lua-dkjson.mk index 2b110f8f1e1..a148fea86be 100644 --- a/package/lua-dkjson/lua-dkjson.mk +++ b/package/lua-dkjson/lua-dkjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_DKJSON_VERSION = 2.7-1 +LUA_DKJSON_VERSION = 2.8-1 LUA_DKJSON_NAME_UPSTREAM = dkjson LUA_DKJSON_LICENSE = MIT LUA_DKJSON_LICENSE_FILES = $(LUA_DKJSON_SUBDIR)/readme.txt From f290f8de2265317daec80e6ae143dcdd74043f59 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 1 Jul 2024 09:46:00 +0200 Subject: [PATCH 1436/3013] package/sdl2: bump version to 2.30.4 Signed-off-by: Michael Fischer Signed-off-by: Thomas Petazzoni --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 3c72d1d6d1f..4f302aaec84 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.3.tar.gz.sig -sha256 820440072f8f5b50188c1dae104f2ad25984de268785be40c41a099a510f0aec SDL2-2.30.3.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.4.tar.gz.sig +sha256 59c89d0ed40d4efb23b7318aa29fe7039dbbc098334b14f17f1e7e561da31a26 SDL2-2.30.4.tar.gz # Locally calculated sha256 9b9e1764f06701bcf7ce21e942c682d5921ba0900c6fca760321b1c8837a9662 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index b5b0fb49e14..01dcf3551ce 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.30.3 +SDL2_VERSION = 2.30.4 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From e7f124e9b632837c9f142831e881abd6795286a8 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 5 Jul 2024 08:09:05 +0200 Subject: [PATCH 1437/3013] package/openssh: disable async-signal-unsafe code in sshsigdie() Import Debian patch[1] for CVE-2024-6387[2]. This disables the unsafe syslog code path triggered by SIGALARM. [1] https://salsa.debian.org/ssh-team/openssh/-/blob/master/debian/patches/sshsigdie-async-signal-unsafe.patch [2] https://marc.info/?l=oss-security&m=171982335024767 Signed-off-by: Joachim Wiberg [Peter: rename, add Upstream tag] Signed-off-by: Peter Korsgaard --- .../0002-sshsigdie-async-signal-unsafe.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/openssh/0002-sshsigdie-async-signal-unsafe.patch diff --git a/package/openssh/0002-sshsigdie-async-signal-unsafe.patch b/package/openssh/0002-sshsigdie-async-signal-unsafe.patch new file mode 100644 index 00000000000..70a890e4694 --- /dev/null +++ b/package/openssh/0002-sshsigdie-async-signal-unsafe.patch @@ -0,0 +1,41 @@ +From 7f4a743171f9e6b283207d448de6562219774fbf Mon Sep 17 00:00:00 2001 +From: Salvatore Bonaccorso +Date: Tue, 25 Jun 2024 12:24:29 +0100 +Subject: Disable async-signal-unsafe code from the sshsigdie() function + +Address signal handler race condition: if a client does not authenticate +within LoginGraceTime seconds (120 by default, 600 in old OpenSSH +versions), then sshd's SIGALRM handler is called asynchronously, but +this signal handler calls various functions that are not +async-signal-safe (for example, syslog()). + +This is a regression from CVE-2006-5051 ("Signal handler race condition +in OpenSSH before 4.4 allows remote attackers to cause a denial of +service (crash), and possibly execute arbitrary code") + +Signed-off-by: Salvatore Bonaccorso +Upstream: https://salsa.debian.org/ssh-team/openssh/-/blob/525bb16e45edac4c03b95e106380d70aecbaf27e/debian/patches/sshsigdie-async-signal-unsafe.patch +Patch-Name: sshsigdie-async-signal-unsafe.patch +--- + log.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/log.c b/log.c +index 6a8b1fc4a..57256660f 100644 +--- a/log.c ++++ b/log.c +@@ -452,12 +452,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#if 0 + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + From d4c11516320f4c221afaccdb449f3fb0a992520e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 1 Jul 2024 20:27:34 +0200 Subject: [PATCH 1438/3013] package/apache: security bump version to 2.4.60 Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.60 Fixes CVE-2024-36387, CVE-2024-38472 (Windows-only), CVE-2024-38473, CVE-2024-38474, CVE-2024-38475, CVE-2024-38476, CVE-2024-38477 & CVE-2024-39573. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 33de60dbff80e44062ba57aea2489cf4dbd26d02) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 4 ++-- package/apache/apache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 84248761b97..bd503d84f91 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ # From https://downloads.apache.org/httpd/httpd-2.4.59.tar.bz2.{sha256,sha512} -sha256 ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323 httpd-2.4.59.tar.bz2 -sha512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 httpd-2.4.59.tar.bz2 +sha256 7b1ec7ec5635da7cb01550513215a90f8b2f52bb7c90cf3e97ede936d3e55b0f httpd-2.4.60.tar.bz2 +sha512 c1591389f76699beaa5d32b019729e25f1ed5b828311c82b52f1a4edd5d28b73e697958df384d7628b314521a831dbb0af418bc37cdf031cfe133e53c195d8ad httpd-2.4.60.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 1b095c5eb10..39ccc3cf967 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.59 +APACHE_VERSION = 2.4.60 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 167680d773a2edc19defe24e50f0af9fc1e9816e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 15:36:54 +0200 Subject: [PATCH 1439/3013] package/libmad: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libmad fails to build with output: Applying mips-gcc4.4.diff using series: patching file fixed.h Hunk #1 FAILED at 297. 1 out of 1 hunk FAILED -- saving rejects to file fixed.h.rej The package applied the patches in two steps, first the local ones and then the official ones downloaded from the repository. The commit fixes the issue by reversing the order of patch application steps. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit b21184a87733f2f2ccee69cade6875c507e439dc) Signed-off-by: Peter Korsgaard --- package/libmad/libmad.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 084a533cc00..9f3396b1a4e 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -19,7 +19,7 @@ define LIBMAD_APPLY_DEBIAN_PATCHES fi endef -LIBMAD_POST_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES +LIBMAD_PRE_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES # debian/patches/md_size.diff LIBMAD_IGNORE_CVES += CVE-2017-8372 CVE-2017-8373 From 8ac7ef56845564715d379a4c0e82339ef9dd61b2 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 15:36:55 +0200 Subject: [PATCH 1440/3013] package/libmad: drop GCC's "-fforce-mem" option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit fixes the following compilation error: i686-buildroot-linux-gnu-gcc.br_real: error: unrecognized command-line option ‘-fforce-mem’ From GCC 4.3 release notes [1]: The -fforce-mem option has been removed because it has had no effect in the last few GCC releases. [1] https://gcc.gnu.org/gcc-4.3/changes.html Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit 89ba9c5a0b05f119d8f748f52244ebcb6a0dd008) Signed-off-by: Peter Korsgaard --- .../0003-drop-GCC-fforce-mem-option.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/libmad/0003-drop-GCC-fforce-mem-option.patch diff --git a/package/libmad/0003-drop-GCC-fforce-mem-option.patch b/package/libmad/0003-drop-GCC-fforce-mem-option.patch new file mode 100644 index 00000000000..25b685efd01 --- /dev/null +++ b/package/libmad/0003-drop-GCC-fforce-mem-option.patch @@ -0,0 +1,18 @@ +configure.ac: drop GCC "-fforce-mem" option + +As reported at [1], the option has been removed from version 4.3 of GCC. + +[1] https://ez.analog.com/dsp/software-and-development-tools/linux-blackfin/linux-bug-archive/w/documents/7460/5626-build-lib-mad-fail-at-option--fforce-mem-with-gcc-4-3 +Signed-off-by: Dario Binacchi +Upstream: Dead + +--- libmad-0.15.1b-orig/configure.ac 2024-07-02 14:26:40.657984791 +0200 ++++ libmad-0.15.1b/configure.ac 2024-07-02 14:27:07.098198997 +0200 +@@ -140,7 +140,6 @@ + case "$optimize" in + -O|"-O "*) + optimize="-O" +- optimize="$optimize -fforce-mem" + optimize="$optimize -fforce-addr" + : #x optimize="$optimize -finline-functions" + : #- optimize="$optimize -fstrength-reduce" From 01aa65bc57c370ee71ace9ab40ed61c48b0eb226 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Tue, 9 Jul 2024 12:18:38 +0200 Subject: [PATCH 1441/3013] package/python-pyasyncore: new package pyasyncore is a compatibility package that provides the asyncore module removed from the standard library in Python 3.12. It is needed to support fail2ban without a bundled copy and should be removed as soon as nothing in Buildroot depends on it. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-pyasyncore/Config.in | 10 ++++++++++ package/python-pyasyncore/python-pyasyncore.hash | 5 +++++ package/python-pyasyncore/python-pyasyncore.mk | 14 ++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/python-pyasyncore/Config.in create mode 100644 package/python-pyasyncore/python-pyasyncore.hash create mode 100644 package/python-pyasyncore/python-pyasyncore.mk diff --git a/DEVELOPERS b/DEVELOPERS index 90d1a111ab4..3f8a42c1d89 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,6 +1088,9 @@ F: configs/freescale_imx6ullevk_defconfig N: Falco Hyfing F: package/python-pymodbus/ +N: Fiona Klute +F: package/python-pyasyncore/ + N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ diff --git a/package/Config.in b/package/Config.in index 48ef1a6fdce..38ebf13dbf8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1253,6 +1253,7 @@ menu "External python modules" source "package/python-pyalsa/Config.in" source "package/python-pyasn1/Config.in" source "package/python-pyasn1-modules/Config.in" + source "package/python-pyasyncore/Config.in" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" diff --git a/package/python-pyasyncore/Config.in b/package/python-pyasyncore/Config.in new file mode 100644 index 00000000000..ad1376a2432 --- /dev/null +++ b/package/python-pyasyncore/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_PYASYNCORE + bool "python-pyasyncore" + help + Make asyncore available for Python 3.12 onwards. + + This is a compatibility package using the code removed from + the standard libary, upstream does not intend any + maintenance. + + https://github.com/simonrob/pyasyncore diff --git a/package/python-pyasyncore/python-pyasyncore.hash b/package/python-pyasyncore/python-pyasyncore.hash new file mode 100644 index 00000000000..ee4665fe5e3 --- /dev/null +++ b/package/python-pyasyncore/python-pyasyncore.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyasyncore/json +md5 f97e2b69f1fa11470867b395c2fabf84 pyasyncore-1.0.4.tar.gz +sha256 2c7a8b9b750ba6260f1e5a061456d61320a80579c6a43d42183417da89c7d5d6 pyasyncore-1.0.4.tar.gz +# Locally computed sha256 checksums +sha256 f4f80c98161f5632004d44713b5cb95e400145b40cbc0297f1f50c27b54befdb LICENSE diff --git a/package/python-pyasyncore/python-pyasyncore.mk b/package/python-pyasyncore/python-pyasyncore.mk new file mode 100644 index 00000000000..4b1e3c98b62 --- /dev/null +++ b/package/python-pyasyncore/python-pyasyncore.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyasyncore +# +################################################################################ + +PYTHON_PYASYNCORE_VERSION = 1.0.4 +PYTHON_PYASYNCORE_SOURCE = pyasyncore-$(PYTHON_PYASYNCORE_VERSION).tar.gz +PYTHON_PYASYNCORE_SITE = https://github.com/simonrob/pyasyncore/releases/download/v$(PYTHON_PYASYNCORE_VERSION) +PYTHON_PYASYNCORE_SETUP_TYPE = setuptools +PYTHON_PYASYNCORE_LICENSE = PSF-2.0 +PYTHON_PYASYNCORE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From fd315306726c0150bbc105f5488711c18557460b Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Tue, 9 Jul 2024 12:18:39 +0200 Subject: [PATCH 1442/3013] package/python-pyasynchat: new package pyasynchat is a compatibility package that provides the asynchat module removed from the standard library in Python 3.12. It is needed to support fail2ban without a bundled copy and should be removed as soon as nothing in Buildroot depends on it. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-pyasynchat/Config.in | 11 +++++++++++ package/python-pyasynchat/python-pyasynchat.hash | 5 +++++ package/python-pyasynchat/python-pyasynchat.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/python-pyasynchat/Config.in create mode 100644 package/python-pyasynchat/python-pyasynchat.hash create mode 100644 package/python-pyasynchat/python-pyasynchat.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3f8a42c1d89..5927a97908a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,6 +1089,7 @@ N: Falco Hyfing F: package/python-pymodbus/ N: Fiona Klute +F: package/python-pyasynchat/ F: package/python-pyasyncore/ N: Flávio Tapajós diff --git a/package/Config.in b/package/Config.in index 38ebf13dbf8..faf8dd7d7e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1253,6 +1253,7 @@ menu "External python modules" source "package/python-pyalsa/Config.in" source "package/python-pyasn1/Config.in" source "package/python-pyasn1-modules/Config.in" + source "package/python-pyasynchat/Config.in" source "package/python-pyasyncore/Config.in" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" diff --git a/package/python-pyasynchat/Config.in b/package/python-pyasynchat/Config.in new file mode 100644 index 00000000000..bf11cc5b391 --- /dev/null +++ b/package/python-pyasynchat/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_PYASYNCHAT + bool "python-pyasynchat" + select BR2_PACKAGE_PYTHON_PYASYNCORE # runtime + help + Make asynchat available for Python 3.12 onwards. + + This is a compatibility package using the code removed from + the standard libary, upstream does not intend any + maintenance. + + https://github.com/simonrob/pyasynchat diff --git a/package/python-pyasynchat/python-pyasynchat.hash b/package/python-pyasynchat/python-pyasynchat.hash new file mode 100644 index 00000000000..232f936bcc9 --- /dev/null +++ b/package/python-pyasynchat/python-pyasynchat.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyasynchat/json +md5 9fa7e3822f689b1236ca59c5f1b71415 pyasynchat-1.0.4.tar.gz +sha256 3f5333df649e46c56d48c57e6a4b7163fd07f626bfd884e22ef373ab3c3a4670 pyasynchat-1.0.4.tar.gz +# Locally computed sha256 checksums +sha256 f4f80c98161f5632004d44713b5cb95e400145b40cbc0297f1f50c27b54befdb LICENSE diff --git a/package/python-pyasynchat/python-pyasynchat.mk b/package/python-pyasynchat/python-pyasynchat.mk new file mode 100644 index 00000000000..6fb460cee15 --- /dev/null +++ b/package/python-pyasynchat/python-pyasynchat.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyasynchat +# +################################################################################ + +PYTHON_PYASYNCHAT_VERSION = 1.0.4 +PYTHON_PYASYNCHAT_SOURCE = pyasynchat-$(PYTHON_PYASYNCHAT_VERSION).tar.gz +PYTHON_PYASYNCHAT_SITE = https://github.com/simonrob/pyasynchat/releases/download/v$(PYTHON_PYASYNCHAT_VERSION) +PYTHON_PYASYNCHAT_SETUP_TYPE = setuptools +PYTHON_PYASYNCHAT_LICENSE = PSF-2.0 +PYTHON_PYASYNCHAT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 8423849576e848fec73d93ba00266d9a4d34d3f7 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 2 Jul 2024 15:18:44 +0000 Subject: [PATCH 1443/3013] package/atftp: add sysvinit script Add a script to launch the atftp daemon at boot. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/atftp/S80atftpd | 50 +++++++++++++++++++++++++++++++++++++++++ package/atftp/atftp.mk | 5 +++++ 2 files changed, 55 insertions(+) create mode 100644 package/atftp/S80atftpd diff --git a/package/atftp/S80atftpd b/package/atftp/S80atftpd new file mode 100644 index 00000000000..523251b77bf --- /dev/null +++ b/package/atftp/S80atftpd @@ -0,0 +1,50 @@ +#!/bin/sh + +DAEMON="atftpd" +PIDFILE="/var/run/$DAEMON.pid" +ATFTPD_ARGS="--user root.root /tftpboot" + +# shellcheck disable=SC1090 +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- \ + --daemon --pidfile="$PIDFILE" $ATFTPD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +restart|reload) + stop + start + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk index d41178cac42..c71a70cd5dc 100644 --- a/package/atftp/atftp.mk +++ b/package/atftp/atftp.mk @@ -36,4 +36,9 @@ else ATFTP_CONF_OPTS += --disable-libpcre endif +define ATFTP_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/atftp/S80atftpd \ + $(TARGET_DIR)/etc/init.d/S80atftpd +endef + $(eval $(autotools-package)) From e912b3bcfaeb2ea6caa2647c75b63b8c5e5ea186 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 2 Jul 2024 15:18:46 +0000 Subject: [PATCH 1444/3013] DEVELOPERS: add myself for package/atftp Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5927a97908a..2c05337f1db 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -542,6 +542,7 @@ F: package/ncdu/ N: Brandon Maier F: board/freescale/ls1046a-frwy/ F: configs/ls1046a-frwy_defconfig +F: package/atftp/ F: package/bats-assert/ F: package/bats-file/ F: package/bats-support/ From 6b625b42aa68a8ab838d0fd9a9d82ca47aa7cf44 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 2 Jul 2024 15:18:45 +0000 Subject: [PATCH 1445/3013] support/testing: add atftp test Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_atftp.py | 28 +++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 support/testing/tests/package/test_atftp.py diff --git a/DEVELOPERS b/DEVELOPERS index 2c05337f1db..f817776474a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -551,6 +551,7 @@ F: package/python-pysensors/ F: package/qoriq-fm-ucode/ F: package/unifdef/ F: package/vmtouch/ +F: support/testing/tests/package/test_atftp.py F: support/testing/tests/package/test_zip.py N: Brock Williams diff --git a/support/testing/tests/package/test_atftp.py b/support/testing/tests/package/test_atftp.py new file mode 100644 index 00000000000..95e76c07cbd --- /dev/null +++ b/support/testing/tests/package/test_atftp.py @@ -0,0 +1,28 @@ +import os + +import infra.basetest + + +class TestAtftp(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ATFTP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_CPIO=y + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + + self.emulator.login() + + self.assertRunOk("mkdir -p /tftpboot") + self.assertRunOk("echo 'Hello World' >/tftpboot/test_atftp.txt") + + # atftpd is launched by /etc/init.d/S80atftpd + self.assertRunOk("atftp -g -r test_atftp.txt -l /tmp/test_atftp.txt localhost") + output, exit_code = self.emulator.run("cat /tmp/test_atftp.txt") + self.assertEqual("".join(output), "Hello World") From 55c916f24b53613e36399ccccf59768abe16b37e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:00:14 +0200 Subject: [PATCH 1446/3013] package/libdrm: bump version to 2.4.122 Release notes: https://lists.x.org/archives/xorg-announce/2024-June/003518.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 6 +++--- package/libdrm/libdrm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 8b0f7c0d743..9d78d5e4376 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2024-June/003516.html -sha256 909084a505d7638887f590b70791b3bbd9069c710c948f5d1f1ce6d080cdfcab libdrm-2.4.121.tar.xz -sha512 cc8816d61884caa0e404348d1caeb0b2952fb50e1dc401716adfe08121096e2a67826db0bda0d8b163d67c5ee048870177670d5eac28a5abe5792d09ba77ab2e libdrm-2.4.121.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-June/003518.html +sha256 d9f5079b777dffca9300ccc56b10a93588cdfbc9dde2fae111940dfb6292f251 libdrm-2.4.122.tar.xz +sha512 ea6bac94416d4ba0e9805e142ae62904236bc49f803d4fc10c92968a4df64c818dd42524ad7a4e988062836783a148e27094050bb2754f751a368627f794ad13 libdrm-2.4.122.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index c87a225515b..ea956de15be 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.121 +LIBDRM_VERSION = 2.4.122 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 54c82a237581dbed74aab2086381ae69b4626cc6 Mon Sep 17 00:00:00 2001 From: Aleksandr Makarov Date: Fri, 26 Apr 2024 21:47:32 +0300 Subject: [PATCH 1447/3013] board/pine64/rockpro64/linux.fragment: integrate stmmac driver Currently, the stmmac driver is configured as a module in the defconfig, which means that the network functionality is not available until the driver module is manually inserted. Use extra config fragment to integrate it directly into the kernel, ensuring that network functionality is available immediately upon boot. Signed-off-by: Aleksandr Makarov Signed-off-by: Thomas Petazzoni --- board/pine64/rockpro64/linux.fragment | 3 +++ configs/rockpro64_defconfig | 1 + 2 files changed, 4 insertions(+) create mode 100644 board/pine64/rockpro64/linux.fragment diff --git a/board/pine64/rockpro64/linux.fragment b/board/pine64/rockpro64/linux.fragment new file mode 100644 index 00000000000..ed7dfd3d3ea --- /dev/null +++ b/board/pine64/rockpro64/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_PLATFORM=y +CONFIG_DWMAC_ROCKCHIP=y diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig index 472b9aded20..0c6cdd477a3 100644 --- a/configs/rockpro64_defconfig +++ b/configs/rockpro64_defconfig @@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64/linux.fragment" # Filesystem BR2_TARGET_GENERIC_HOSTNAME="rockpro64" From fbd9a3f3114ef52d6ff9a14ec2648926909fd46e Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 26 Apr 2024 23:35:51 +0200 Subject: [PATCH 1448/3013] package/raspberrypi-usbboot: bump version to 20221215-105525 The "msd" (mass storage device) firmware files in 2021.07.01 don't work with some newer CM4 based devices, the one I had issues with is a RevPi Connect 4. Updating fixes the issue. Mass storage device mode is required to flash the eMMC of CM4 devices. Signed-off-by: Fiona Klute Signed-off-by: Thomas Petazzoni --- ...1-Makefile-allow-passing-CFLAGS-LDFLAGS.patch | 16 ++++++++++------ .../raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- .../raspberrypi-usbboot/raspberrypi-usbboot.mk | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch index d482b0b9d40..29a9311651b 100644 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -1,4 +1,4 @@ -From 38b730c00f45abf324caf687b5b00662ff4252c2 Mon Sep 17 00:00:00 2001 +From acd175aa53af1f1b8422bf1f1fe57eafc710cdca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Dec 2016 23:09:44 +0100 Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS @@ -10,21 +10,25 @@ Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 Signed-off-by: Thomas Petazzoni [Rebased on 9324fd7] Signed-off-by: Peter Seiderer +[Rebased on 20221215-105525-0-g1afa26c5] +Signed-off-by: Fiona Klute --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 822e714..875e717 100755 +index dc78cfe..c9d4910 100755 --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ +@@ -1,7 +1,7 @@ + PKG_VER=$(shell grep rpiboot debian/changelog | head -n1 | sed 's/.*(\(.*\)).*/\1/g') + GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h -- $(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0 -+ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) +- $(CC) -Wall -Wextra -g -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" $(LDFLAGS) %.h: %.bin ./bin2c ./bin2c $< $@ -- -2.31.1 +2.45.2 diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index cedc5fb7e10..830ead82431 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz +sha256 2f02dbe9a88e9dfad5f05e513e1f30afd47b1575820f7c3b09665dfefc45bbaa raspberrypi-usbboot-20221215-105525.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 2e4194da0b2..24a1f6d906f 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,9 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_VERSION = 20221215-105525 RASPBERRYPI_USBBOOT_SITE = \ - $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) + $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE From 5dcae8480c4a6ba62e80a6080b299b15ee8dbe3e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 2 Jul 2024 18:28:57 +0200 Subject: [PATCH 1449/3013] package/libnvme: bump to version 1.9 Starting with libnvme commit [0] MMU is required so let's add a depends on BR2_USE_MMU accordingly. [0]: https://github.com/linux-nvme/libnvme/commit/7d927f5f38ebd7c90abebb5ebac4701a1bad0993 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libblockdev/Config.in | 1 + package/libnvme/Config.in | 1 + package/libnvme/libnvme.hash | 2 +- package/libnvme/libnvme.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 7494b0f6b77..62ecaa1ac29 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -59,6 +59,7 @@ config BR2_PACKAGE_LIBBLOCKDEV_MDRAID config BR2_PACKAGE_LIBBLOCKDEV_NVME bool "nvme" + depends on BR2_USE_MMU # libnvme select BR2_PACKAGE_LIBNVME config BR2_PACKAGE_LIBBLOCKDEV_PART diff --git a/package/libnvme/Config.in b/package/libnvme/Config.in index f2980465637..bf169f4a90d 100644 --- a/package/libnvme/Config.in +++ b/package/libnvme/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBNVME bool "libnvme" + depends on BR2_USE_MMU # malloc_usable_size() help libnvme provides type definitions for NVMe specification and utilities for nvme devices handling in Linux. diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 469006d6326..99c633882a6 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 d59939a280eec41eb7a716e1681d0d0c612099385204ffb55d07134a6be08d75 libnvme-1.8.tar.gz +sha256 455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206 libnvme-1.9.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index bf131d2a385..da8707db7d1 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.8 +LIBNVME_VERSION = 1.9 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING From 179dd69969a496eec11b31fa2b69398034ca5fc1 Mon Sep 17 00:00:00 2001 From: Yang Li Date: Tue, 2 Jul 2024 20:17:37 +0800 Subject: [PATCH 1450/3013] package/linux-firmware: change Amlogic Bluetooth binary path Since upstream commit 7d931f8afa51d83e9eaee3a3f449bc2f86a5edf3, which first appeared in linux-firmware 20240709, the amlogic bluetooth firmware files have been moved from amlogic/bluetooth/ to directly amlogic/. Signed-off-by: Yang Li Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 13dbc6d98c8..ecf27e16424 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -53,7 +53,7 @@ endif # Amlogic SoC Bluetooth ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AMLOGIC),y) -LINUX_FIRMWARE_FILES += amlogic/bluetooth/*.bin +LINUX_FIRMWARE_FILES += amlogic/*.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.amlogic endif From daa5d775d729efd529ff7ff8c58c0380018f1e42 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Jul 2024 21:39:24 +0200 Subject: [PATCH 1451/3013] package/xfsprogs: update Kconfig package homepage URL The old xfs homepage URL [1] seems defunct at the time of this commit. The http URL redirects to https, the certificate expired on 2024-01-26. If the certificate expiration date is ignored, the site shows a "502 Bad Gateway" error. The package README [2] advertise the homepage as [3]. This commit updates the URL to the new one. [1] http://xfs.org [2] https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/README?h=v6.4.0#n12 [3] https://xfs.wiki.kernel.org Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/xfsprogs/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index d14c3d46986..1a29579d8b8 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -18,4 +18,4 @@ config BR2_PACKAGE_XFSPROGS help The XFS file system utilities and libraries - http://xfs.org + https://xfs.wiki.kernel.org From 14388ca1b695a808c329fac8bd3470f17193785f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 13:54:34 -0600 Subject: [PATCH 1452/3013] package/python-sniffio: bump to version 1.3.1 Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-sniffio/python-sniffio.hash | 4 ++-- package/python-sniffio/python-sniffio.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-sniffio/python-sniffio.hash b/package/python-sniffio/python-sniffio.hash index 00af7c58bb6..989e31d196f 100644 --- a/package/python-sniffio/python-sniffio.hash +++ b/package/python-sniffio/python-sniffio.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/sniffio/json -md5 abb96bcda81817d6c632915c53ac29c8 sniffio-1.3.0.tar.gz -sha256 e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101 sniffio-1.3.0.tar.gz +md5 1673edc4dfeb739130a87bcd7b477864 sniffio-1.3.1.tar.gz +sha256 f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc sniffio-1.3.1.tar.gz # Locally computed sha256 checksums sha256 652c878488d1456361e08c3f8607fd7ba59892a14103d15cce4ff93c85b5cc8b LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 diff --git a/package/python-sniffio/python-sniffio.mk b/package/python-sniffio/python-sniffio.mk index fa369a0e2fd..120794d77c7 100644 --- a/package/python-sniffio/python-sniffio.mk +++ b/package/python-sniffio/python-sniffio.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SNIFFIO_VERSION = 1.3.0 +PYTHON_SNIFFIO_VERSION = 1.3.1 PYTHON_SNIFFIO_SOURCE = sniffio-$(PYTHON_SNIFFIO_VERSION).tar.gz -PYTHON_SNIFFIO_SITE = https://files.pythonhosted.org/packages/cd/50/d49c388cae4ec10e8109b1b833fd265511840706808576df3ada99ecb0ac +PYTHON_SNIFFIO_SITE = https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd PYTHON_SNIFFIO_SETUP_TYPE = setuptools PYTHON_SNIFFIO_LICENSE = Apache-2.0 or MIT PYTHON_SNIFFIO_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT +PYTHON_SNIFFIO_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From f61dccf9a83e305ee8ba897e03fb6a6b90351a36 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 2 Jul 2024 17:19:47 -0600 Subject: [PATCH 1453/3013] package/swupdate: bump to version 2024.05.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 13964351f60..ac28acb1f47 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c8af1e964d0123a7d4bbba981170eff723db87dcd37e5881c584ffee54194d1a swupdate-2024.05.tar.gz +sha256 2736045e885ad6c5dcba8dcc6c7582d0b76ef29a3d6ab7c4080908356e35e3b2 swupdate-2024.05.2.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index b36aabb1e7d..75e4af5db4a 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2024.05 +SWUPDATE_VERSION = 2024.05.2 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ From 390f8262f5c3c40d8c38e44100c1d8e8cd74c41b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 9 Jul 2024 18:54:19 +0200 Subject: [PATCH 1454/3013] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 04e191b449f..f71d2d3a058 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.23" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.36" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 05666fa9856..6546cac0dd2 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.23" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.36" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From e2073a6d2a3851752e54a8f4282cde9dd0481e31 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 9 Jul 2024 18:54:20 +0200 Subject: [PATCH 1455/3013] configs/olimex_a20_olinuxino_lime*: add hashes and enable BR2_DOWNLOAD_FORCE_CHECK_HASHES Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 -- .../a20_olinuxino/patches/linux-headers/linux-headers.hash | 1 + board/olimex/a20_olinuxino/patches/linux/linux.hash | 2 ++ board/olimex/a20_olinuxino/patches/uboot/uboot.hash | 2 ++ configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++++ configs/olimex_a20_olinuxino_lime_defconfig | 4 ++++ 6 files changed, 13 insertions(+), 2 deletions(-) create mode 120000 board/olimex/a20_olinuxino/patches/linux-headers/linux-headers.hash create mode 100644 board/olimex/a20_olinuxino/patches/linux/linux.hash create mode 100644 board/olimex/a20_olinuxino/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 471b049ca6c..8517ede49e3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -234,8 +234,6 @@ configs/odroidc2_defconfig lib_defconfig.ForceCheckHash configs/odroidxu4_defconfig lib_defconfig.ForceCheckHash configs/olimex_a10_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash configs/olimex_a13_olinuxino_defconfig lib_defconfig.ForceCheckHash -configs/olimex_a20_olinuxino_lime2_defconfig lib_defconfig.ForceCheckHash -configs/olimex_a20_olinuxino_lime_defconfig lib_defconfig.ForceCheckHash configs/olimex_a20_olinuxino_micro_defconfig lib_defconfig.ForceCheckHash configs/olimex_a33_olinuxino_defconfig lib_defconfig.ForceCheckHash configs/olimex_a64_olinuxino_defconfig lib_defconfig.ForceCheckHash diff --git a/board/olimex/a20_olinuxino/patches/linux-headers/linux-headers.hash b/board/olimex/a20_olinuxino/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/olimex/a20_olinuxino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/olimex/a20_olinuxino/patches/linux/linux.hash b/board/olimex/a20_olinuxino/patches/linux/linux.hash new file mode 100644 index 00000000000..8ffd3e4fbc9 --- /dev/null +++ b/board/olimex/a20_olinuxino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b9676828b737e8fb8eaa5198303d35d35e8df019550be153c8a42c99afe0cdd5 linux-6.6.36.tar.xz diff --git a/board/olimex/a20_olinuxino/patches/uboot/uboot.hash b/board/olimex/a20_olinuxino/patches/uboot/uboot.hash new file mode 100644 index 00000000000..72699801049 --- /dev/null +++ b/board/olimex/a20_olinuxino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index f71d2d3a058..765504d1fa0 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -10,6 +10,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +# Build +BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 6546cac0dd2..27cd87d9a1b 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -10,6 +10,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +# Build +BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" From 13bd56d5d4f4c565ab52ed4625aa9e4ed6c94118 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:21 +0200 Subject: [PATCH 1456/3013] package/kodi-inputstream-adaptive: bump version to 21.4.10-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 85945c9a541..82325ab014a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 0b3a78763ffebef64ac05bcf55951f26e334f7ee8bbe042f885dff288eed466e kodi-inputstream-adaptive-21.4.7-Omega.tar.gz +sha256 caf71b67cf242c600878718dab8227947062a28485078b8bf68ac72aef51e12c kodi-inputstream-adaptive-21.4.10-Omega.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 5cc02e45c0e..b6825c1ff00 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 21.4.7-Omega +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 21.4.10-Omega KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ From 85d92aeeedaf12666c0799dad34e69759b98ec25 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:22 +0200 Subject: [PATCH 1457/3013] package/kodi-peripheral-joystick: bump version to 21.1.18-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 9cea40965f2..a9d27bd70da 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b152c6f17291ede48850bf307e6d619ff803e1b26217ccec532d5c49a3ef7b84 kodi-peripheral-joystick-21.1.15-Omega.tar.gz +sha256 226366b69536579d1adccb8548ba20c1b094876ce481bab81f744affa71bb305 kodi-peripheral-joystick-21.1.18-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 34ea45855e1..aceefba55a8 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 21.1.15-Omega +KODI_PERIPHERAL_JOYSTICK_VERSION = 21.1.18-Omega KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From 75285d9f0bf50eec4c22aad137fd59b13efeb52d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:23 +0200 Subject: [PATCH 1458/3013] package/kodi-pvr-hts: bump version to 21.2.4-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 27aa9a07290..3c9f7d87b35 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3bb04e48e9eca97fbd72b6285b110f3bebbd842ee7017423aa446259763e0d0b kodi-pvr-hts-21.2.3-Omega.tar.gz +sha256 5c8dd796735d5af7dddfc6fe56c8b2d8268fd43be50098f60b8fa537ff02956d kodi-pvr-hts-21.2.4-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index e1531fa1dfb..7f73c0565ef 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 21.2.3-Omega +KODI_PVR_HTS_VERSION = 21.2.4-Omega KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md From 60683672be360cd0e47651e07065a5db60f7dd98 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:24 +0200 Subject: [PATCH 1459/3013] package/kodi-pvr-stalker: bump version to 21.1.0-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 568a2b3824a..fe5af447df5 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d90b6b5595a820197d097da8ee6698bea786359cfe0bfaeabf4985dbc2af3064 kodi-pvr-stalker-21.0.1-Omega.tar.gz +sha256 9e6fdf2d3654d267135bff45c94d72b4c82b10483dbb46600a8e0df4b0676746 kodi-pvr-stalker-21.1.0-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index ed04eefe9dd..0714dd8d782 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 21.0.1-Omega +KODI_PVR_STALKER_VERSION = 21.1.0-Omega KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md From 0d84b3c7a03e64fbc864e83d6eda3976a7015d3d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:25 +0200 Subject: [PATCH 1460/3013] package/kodi-pvr-waipu: bump version to 21.8.3-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 6377f36e803..1198d657683 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 96c558f02d820c43994da05a89693f3e787c2adb8faa2ff28127a6e97d33525c kodi-pvr-waipu-21.6.1-Omega.tar.gz +sha256 6d47012f43f9a24edb09bc249de9b14cd0adca58fe0633687cd2fc54fe1bf23e kodi-pvr-waipu-21.8.3-Omega.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index 222abcaa1b6..2c2270f3e80 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 21.6.1-Omega +KODI_PVR_WAIPU_VERSION = 21.8.3-Omega KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt From ed7165d9af1eb85106cbbad10eb37ebe71b8e407 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:26 +0200 Subject: [PATCH 1461/3013] package/kodi-pvr-zattoo: bump version to 21.0.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index acffc6a7eed..d97bfce5b36 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5908de86c038b3565d8b3a8d4578d4cac0d37287fc039808542b874d9fb2bffa kodi-pvr-zattoo-21.0.1-Omega.tar.gz +sha256 859a64e152eca06a6210a80ad199e8b545c9fc9b85562eb12f980c1659ace72a kodi-pvr-zattoo-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index d764524fbb0..cba9d0b2ef7 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 21.0.1-Omega +KODI_PVR_ZATTOO_VERSION = 21.0.2-Omega KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From 4c0bdd73fdecdc84693231614a4b6251166f361c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:27 +0200 Subject: [PATCH 1462/3013] package/kodi-skin-confluence: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-skin-confluence/kodi-skin-confluence.hash | 2 +- package/kodi-skin-confluence/kodi-skin-confluence.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash index e8098abed42..482da25cf2d 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 99b243b7ccb9e0f3e1455e8967f99fd7d98d8924be0d9fe82de12448fe2ecc4e kodi-skin-confluence-f8479bece875313049943fba834e551f6b7d2cf5.tar.gz +sha256 d66fe75a261c6c2b9ac2923dc51d469ccc1df45a2462188e6a024a87bbe27311 kodi-skin-confluence-7bd4a396c492adb2d424d7f51d415fb565cda358.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk index 68d25e184c2..03aa4261cdb 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SKIN_CONFLUENCE_VERSION = f8479bece875313049943fba834e551f6b7d2cf5 +KODI_SKIN_CONFLUENCE_VERSION = 7bd4a396c492adb2d424d7f51d415fb565cda358 KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION)) KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt From 254ef2e63fb74ff223378d0d7d8a46607bfcf77a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:03:28 +0200 Subject: [PATCH 1463/3013] package/kodi-vfs-libarchive: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index 1e686715ea3..729a569f9a1 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 22977bd2479244c4b06e2149bae891bc7dbc64649a89813f4e6fc88e78169f68 kodi-vfs-libarchive-a5443a3896b9638018e69d1e4430a7524ac20ffc.tar.gz +sha256 23515c84f4a0cceaf845c1d6c0c39947a28be2d515cff995b384b29e93b11831 kodi-vfs-libarchive-0333aa5e189221e76282eeefb3f573e27b187551.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 069c92cc5ff..257a0d04f67 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = a5443a3896b9638018e69d1e4430a7524ac20ffc +KODI_VFS_LIBARCHIVE_VERSION = 0333aa5e189221e76282eeefb3f573e27b187551 KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md From 8b2b32fba715c321544610b4b37889154ece6b76 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 00:01:01 +0200 Subject: [PATCH 1464/3013] package/stellarium: bump version to 24.2 Release notes: http://stellarium.org/release/2024/03/26/stellarium-24.1.html http://stellarium.org/release/2024/06/23/stellarium-24.2.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/stellarium/stellarium.hash | 2 +- package/stellarium/stellarium.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index a2f511a283d..6f831f2919e 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,4 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha256 179420e9e9f11278b78dc54e14458452c92055cc8923538748c8a0f961714fc2 stellarium-23.3.tar.xz +sha256 f9e8e114e34265194ffff0c2a2806a6fdc998449192749c4ef60b0a5302101af stellarium-24.2.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 94ad4e13520..abbfe72aad5 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLARIUM_VERSION = 23.3 +STELLARIUM_VERSION = 24.2 STELLARIUM_SOURCE = stellarium-$(STELLARIUM_VERSION).tar.xz STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ From 23e6859e1efc16a188411eb3ebd3088a579712cc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 00:03:05 +0200 Subject: [PATCH 1465/3013] package/kodi-pvr-waipu: bump version to 21.8.4-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 1198d657683..0ceb3446571 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6d47012f43f9a24edb09bc249de9b14cd0adca58fe0633687cd2fc54fe1bf23e kodi-pvr-waipu-21.8.3-Omega.tar.gz +sha256 cd394177247bb7ad24160246e0c368e946d0205ce3284a55f0dacd2d31d51bff kodi-pvr-waipu-21.8.4-Omega.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index 2c2270f3e80..2a03bcb2c97 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 21.8.3-Omega +KODI_PVR_WAIPU_VERSION = 21.8.4-Omega KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt From 17fd52babd8d21652912a1197c2be4fb61106005 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 00:03:06 +0200 Subject: [PATCH 1466/3013] package/kodi-pvr-mediaportal-tvserver: bump version to 21.0.3-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-pvr-mediaportal-tvserver.hash | 2 +- .../kodi-pvr-mediaportal-tvserver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index a02ddeb6a56..b6add33bb79 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e8c92b49433f46ae681055762ca4c152481b258c9163a1119c1ca08d7e9fd7c kodi-pvr-mediaportal-tvserver-21.0.2-Omega.tar.gz +sha256 0aedb77bd9f3a36375feec7f3769d596dbc536b66d584eb933fb11ec7cff8514 kodi-pvr-mediaportal-tvserver-21.0.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 62a30e8cfee..8ada1a1eb10 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 21.0.2-Omega +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 21.0.3-Omega KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md From 3466c4bcad59911a099bd1322773f244359f533c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 00:03:07 +0200 Subject: [PATCH 1467/3013] package/kodi-pvr-mythtv: bump version to 21.1.9-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 7095eaf81c5..d445d9cb2cd 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f1d826e11da10a600dd4de0bfd279a0c583aeae387832c6f9f06bb8befbb811 kodi-pvr-mythtv-21.1.8-Omega.tar.gz +sha256 d3a54798f38befeaeaf57dec7ea85e3c8846591298ced3f686ac03d62edeb0f9 kodi-pvr-mythtv-21.1.9-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 597e8018f62..0b54002aba0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 21.1.8-Omega +KODI_PVR_MYTHTV_VERSION = 21.1.9-Omega KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From 1e24c913a109b2a1055bc01ac5523c577629af11 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Wed, 10 Jul 2024 09:44:25 +0200 Subject: [PATCH 1468/3013] package/gnuplot: bump version to 6.0.1 Signed-off-by: Michael Fischer Signed-off-by: Thomas Petazzoni --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index dd587a82206..4072338885b 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/6.0.0/ -md5 10246eb96bbf3a151d6eb9bbcc223e4e gnuplot-6.0.0.tar.gz -sha1 3abea0cccad89b0c8fb6619ad51b83a971ee24b9 gnuplot-6.0.0.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/6.0.1/ +md5 744fde2362fb20db6cfc58de73f96e9c gnuplot-6.0.1.tar.gz +sha1 ce1aaeff632c78cba2b3ca8142cf130bfd411478 gnuplot-6.0.1.tar.gz # Locally computed -sha256 635a28f0993f6ab0d1179e072ad39b8139d07f51237f841d93c6c2ff4b1758ec gnuplot-6.0.0.tar.gz +sha256 e85a660c1a2a1808ff24f7e69981ffcbac66a45c9dcf711b65610b26ea71379a gnuplot-6.0.1.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index e34dd2a60b3..adb9ce6ad1c 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 6.0.0 +GNUPLOT_VERSION = 6.0.1 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From e74059b39ce2f8511bc57c3f829681bf919b4e55 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 10 Jul 2024 10:13:47 +0200 Subject: [PATCH 1469/3013] package/sqlitecpp: new package SQLiteC++ (SQLiteCpp) is a lean and easy to use C++ SQLite3 wrapper. http://srombauts.github.io/SQLiteCpp/ Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/sqlitecpp/Config.in | 13 +++++++++++++ package/sqlitecpp/sqlitecpp.hash | 3 +++ package/sqlitecpp/sqlitecpp.mk | 19 +++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/sqlitecpp/Config.in create mode 100644 package/sqlitecpp/sqlitecpp.hash create mode 100644 package/sqlitecpp/sqlitecpp.mk diff --git a/DEVELOPERS b/DEVELOPERS index f817776474a..c00fab70ed9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2283,6 +2283,7 @@ F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ F: package/spdlog/ +F: package/sqlitecpp/ N: Michael Trimarchi F: board/bsh/ diff --git a/package/Config.in b/package/Config.in index faf8dd7d7e3..dc3806388c2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1613,6 +1613,7 @@ endif source "package/rocksdb/Config.in" source "package/sqlcipher/Config.in" source "package/sqlite/Config.in" + source "package/sqlitecpp/Config.in" source "package/timescaledb/Config.in" source "package/unixodbc/Config.in" endmenu diff --git a/package/sqlitecpp/Config.in b/package/sqlitecpp/Config.in new file mode 100644 index 00000000000..36ee4b73f9c --- /dev/null +++ b/package/sqlitecpp/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_SQLITECPP + bool "sqlitecpp" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA + help + SQLiteC++ (SQLiteCpp) is a lean and easy to use + C++ SQLite3 wrapper. + + https://github.com/SRombauts/SQLiteCpp + +comment "sqlitecpp needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/sqlitecpp/sqlitecpp.hash b/package/sqlitecpp/sqlitecpp.hash new file mode 100644 index 00000000000..1269abf61fe --- /dev/null +++ b/package/sqlitecpp/sqlitecpp.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 71f990f9fb4b004533b6859ce40729af823b87fe691dd99ca084a7fd40db54b9 sqlitecpp-3.3.1.tar.gz +sha256 635de1440f6064c6ca9ca325c163d4d0771e783c6d77783d9470eaf56e346c67 LICENSE.txt diff --git a/package/sqlitecpp/sqlitecpp.mk b/package/sqlitecpp/sqlitecpp.mk new file mode 100644 index 00000000000..5571d325c3e --- /dev/null +++ b/package/sqlitecpp/sqlitecpp.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# SQLiteC++ +# +################################################################################ + +SQLITECPP_VERSION = 3.3.1 +SQLITECPP_SITE = $(call github,SRombauts,SQLiteCpp,$(SQLITECPP_VERSION)) +SQLITECPP_LICENSE = MIT +SQLITECPP_LICENSE_FILES = LICENSE.txt +SQLITECPP_DEPENDENCIES = sqlite +SQLITECPP_INSTALL_STAGING = YES + +SQLITECPP_CONF_OPTS = \ + -DSQLITECPP_INTERNAL_SQLITE=OFF \ + -DSQLITECPP_RUN_CPPLINT=OFF \ + -DSQLITECPP_RUN_CPPCHECK=OFF + +$(eval $(cmake-package)) From 083de00fdfb8587b6c6fbcf40e5c25a1e23d3baa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 14:33:05 +0200 Subject: [PATCH 1470/3013] package/python-paho-mqtt: bump version to 2.1.0 Version 2.1.0 is a major bump, with an API change that should be backward compatible with version up to 1.6.1. The runtime test failed in timeout because the crng init did not have time to complete in the default 5-second timeout; tests showed that the trip-off would be between 6s and 7s here, so increase it enough to leave some margin on less-capable machines. Signed-off-by: Yann E. MORIN Cc: Asaf Kahlon Cc: Davide Viti Cc: James Hilliard Cc: Yegor Yefremov Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-paho-mqtt/python-paho-mqtt.hash | 2 +- package/python-paho-mqtt/python-paho-mqtt.mk | 5 +++-- support/testing/tests/package/test_python_paho_mqtt.py | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash index 81b9dda81d4..5fe91c5c545 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,5 +1,5 @@ # locally computed -sha256 6e35c1be242a901fc9c00bad7d37b5cc4a497f398dfceb4ed0d8018a959be650 python-paho-mqtt-1.6.1.tar.gz +sha256 3602ce9d1ada58b063f2052ff013ff8cdd06d66cef918d5f6d048b6f68ccf049 python-paho-mqtt-2.1.0.tar.gz sha256 66408b049249c3bdb0ba1ed285f5422ce67e371d40151bebd4d806af454ffe7c LICENSE.txt sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 sha256 8c349f80764d0648e645f41ef23772a70c995a0924b5235f735f4a3d09df127c epl-v20 diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk index f255a7847dd..095d6e1f900 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.6.1 +PYTHON_PAHO_MQTT_VERSION = 2.1.0 PYTHON_PAHO_MQTT_SITE = $(call github,eclipse,paho.mqtt.python,v$(PYTHON_PAHO_MQTT_VERSION)) PYTHON_PAHO_MQTT_LICENSE = EPL-2.0, EDLv1.0 PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 -PYTHON_PAHO_MQTT_SETUP_TYPE = setuptools +PYTHON_PAHO_MQTT_SETUP_TYPE = pep517 +PYTHON_PAHO_MQTT_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_paho_mqtt.py b/support/testing/tests/package/test_python_paho_mqtt.py index 0fe7fa59041..217293e4eed 100644 --- a/support/testing/tests/package/test_python_paho_mqtt.py +++ b/support/testing/tests/package/test_python_paho_mqtt.py @@ -18,6 +18,7 @@ def test_run(self): self.check_sample_scripts_exist() cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) - output, exit_code = self.emulator.run(cmd) + # Increase timeout to let the crng init complete + output, exit_code = self.emulator.run(cmd, timeout=15) self.assertEqual(exit_code, 0) self.assertEqual(output[0], "Hello, World!") From eaa801af97b77dbbe1065ccc42ac147749b4e498 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 16:49:02 -0600 Subject: [PATCH 1471/3013] package/cloudflared: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/cloudflared/Config.in | 8 ++++++++ package/cloudflared/cloudflared.hash | 3 +++ package/cloudflared/cloudflared.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/cloudflared/Config.in create mode 100644 package/cloudflared/cloudflared.hash create mode 100644 package/cloudflared/cloudflared.mk diff --git a/DEVELOPERS b/DEVELOPERS index c00fab70ed9..bddd92d133c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1462,6 +1462,7 @@ F: support/testing/tests/package/test_python_scipy.py N: James Hilliard F: package/apcupsd/ F: package/bpftool/ +F: package/cloudflared/ F: package/exfatprogs/ F: package/fxdiv/ F: package/gensio/ diff --git a/package/Config.in b/package/Config.in index dc3806388c2..6406fd410ac 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2385,6 +2385,7 @@ endif source "package/cfm/Config.in" source "package/chrony/Config.in" source "package/civetweb/Config.in" + source "package/cloudflared/Config.in" source "package/connman/Config.in" source "package/connman-gtk/Config.in" source "package/conntrack-tools/Config.in" diff --git a/package/cloudflared/Config.in b/package/cloudflared/Config.in new file mode 100644 index 00000000000..31319c01fd6 --- /dev/null +++ b/package/cloudflared/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CLOUDFLARED + bool "cloudflared" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO + help + Cloudflare Tunnel client (formerly Argo Tunnel). + + https://github.com/cloudflare/cloudflared diff --git a/package/cloudflared/cloudflared.hash b/package/cloudflared/cloudflared.hash new file mode 100644 index 00000000000..1aa959f8b04 --- /dev/null +++ b/package/cloudflared/cloudflared.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 c61ef286962c3bb9c5edb580b89dbf8293083fa09a8f0f59379fe8ec2d04cada cloudflared-2024.6.1-go2.tar.gz +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/cloudflared/cloudflared.mk b/package/cloudflared/cloudflared.mk new file mode 100644 index 00000000000..1796972be64 --- /dev/null +++ b/package/cloudflared/cloudflared.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# cloudflared +# +################################################################################ + +CLOUDFLARED_VERSION = 2024.6.1 +CLOUDFLARED_SITE = $(call github,cloudflare,cloudflared,$(CLOUDFLARED_VERSION)) +CLOUDFLARED_LICENSE = Apache-2.0 +CLOUDFLARED_LICENSE_FILES = LICENSE +CLOUDFLARED_BUILD_TARGETS = cmd/cloudflared +CLOUDFLARED_LDFLAGS = -X main.Version=$(CLOUDFLARED_VERSION) + +$(eval $(golang-package)) From 82730b2077b7d6b8b936359304ea42dd4a7cb8f2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 10 Jul 2024 11:08:47 +0200 Subject: [PATCH 1472/3013] package/lua-livr: bump to version 0.4.0 diff COPYRIGHT: -Copyright (C) 2018-2023 Francois Perrad. +Copyright (C) 2018-2024 Francois Perrad. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-livr/lua-livr.hash | 4 ++-- package/lua-livr/lua-livr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-livr/lua-livr.hash b/package/lua-livr/lua-livr.hash index 314f1d2bf8a..50e4d3c6a7b 100644 --- a/package/lua-livr/lua-livr.hash +++ b/package/lua-livr/lua-livr.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 531c4d56e2ef7906a6075e61fafee9ea265dc1a62698b966f5fc2f3abda23084 lua-livr-0.3.0-1.src.rock -sha256 c6c2ca8e29b8e3b0558b046ffcbd4a5c31800bdca4520002ed4af76985f82d7d lua-LIVR-0.3.0/COPYRIGHT +sha256 7f00fc561c5913bb53a21ec21f060118d9795c65a0d7a37903e311bdedcfff2a lua-livr-0.4.0-1.src.rock +sha256 6840bae0e48c559cc6aa765d7744d920f8a05f608c4d1223fde8e6b8e7c48c5d lua-LIVR-0.4.0/COPYRIGHT diff --git a/package/lua-livr/lua-livr.mk b/package/lua-livr/lua-livr.mk index fb835a1f901..56600c80b2c 100644 --- a/package/lua-livr/lua-livr.mk +++ b/package/lua-livr/lua-livr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LIVR_VERSION = 0.3.0-1 +LUA_LIVR_VERSION = 0.4.0-1 LUA_LIVR_NAME_UPSTREAM = lua-LIVR LUA_LIVR_LICENSE = MIT LUA_LIVR_LICENSE_FILES = $(LUA_LIVR_SUBDIR)/COPYRIGHT From ee5bacaf4d30705ea7793a0a33debaa6bbbea87c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 10 Jul 2024 11:08:48 +0200 Subject: [PATCH 1473/3013] package/lua-livr-extra: bump to version 0.3.0 diff COPYRIGHT: -Copyright (C) 2018-2023 Francois Perrad. +Copyright (C) 2018-2024 Francois Perrad. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-livr-extra/lua-livr-extra.hash | 4 ++-- package/lua-livr-extra/lua-livr-extra.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-livr-extra/lua-livr-extra.hash b/package/lua-livr-extra/lua-livr-extra.hash index 7f8f66f0561..28f71e4f02f 100644 --- a/package/lua-livr-extra/lua-livr-extra.hash +++ b/package/lua-livr-extra/lua-livr-extra.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 363e571d001b2e56eeafe2379c20aca65d67b5197199c957f9bb2a0c169aab5a lua-livr-extra-0.2.0-1.src.rock -sha256 ded97ea3e541833b9c2c9bf9b266f037a83b57e2e2847fecdfbb9397818f5623 lua-LIVR-extra-0.2.0/COPYRIGHT +sha256 3033526912977b3c618090c9f6e610d8dca596d423c9d09446c3507f2cc1f879 lua-livr-extra-0.3.0-1.src.rock +sha256 94306dda50b3db0017b5d4fc31de4b82658153fed00a579f8b53abba43182c8c lua-LIVR-extra-0.3.0/COPYRIGHT diff --git a/package/lua-livr-extra/lua-livr-extra.mk b/package/lua-livr-extra/lua-livr-extra.mk index ce783f519fb..c86da9372f7 100644 --- a/package/lua-livr-extra/lua-livr-extra.mk +++ b/package/lua-livr-extra/lua-livr-extra.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LIVR_EXTRA_VERSION = 0.2.0-1 +LUA_LIVR_EXTRA_VERSION = 0.3.0-1 LUA_LIVR_EXTRA_NAME_UPSTREAM = lua-LIVR-extra LUA_LIVR_EXTRA_LICENSE = MIT LUA_LIVR_EXTRA_LICENSE_FILES = $(LUA_LIVR_EXTRA_SUBDIR)/COPYRIGHT From 4aa7a4ad8a6f729ad6ee6baf16f01d657559b3e6 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Wed, 10 Jul 2024 11:41:38 +0200 Subject: [PATCH 1474/3013] package/rauc-hawkbit-updater: add systemd optional dependency Take the systemd into account if present. Signed-off-by: Bartosz Bilas Signed-off-by: Thomas Petazzoni --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 3836d3c84e3..da1c020bb6c 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -12,4 +12,11 @@ RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl RAUC_HAWKBIT_UPDATER_CFLAGS = $(TARGET_CFLAGS) -std=c99 +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +RAUC_HAWKBIT_UPDATER_DEPENDENCIES += systemd +RAUC_HAWKBIT_UPDATER_CONF_OPTS += -Dsystemd=enabled +else +RAUC_HAWKBIT_UPDATER_CONF_OPTS += -Dsystemd=disabled +endif + $(eval $(meson-package)) From caff4179a4481233257f5f475ca57ce9061af900 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 27 Jun 2024 10:40:39 +0200 Subject: [PATCH 1475/3013] package/gnutls: add tpm2-tss optional dependency tpm2-tss support is available since gnutls 3.7.3 using --{with,without}-tpm2 configure option [1]. Since the option is not handled by gnutls package, tpm2-tss support can be enabled if tpm2-tss package is build before gnutls package. Likewise, tpm2-tss support can be enabled for the gnutls host variant if tpm2-tss libraries are installed on the host. Make sure to disable tpm2-tss support for the host-gnutls. [1] https://lists.gnupg.org/pipermail/gnutls-help/2022-January/004736.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 8a4f3345aa9..83021948126 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -57,6 +57,7 @@ HOST_GNUTLS_CONF_OPTS = \ --without-librt-prefix \ --without-libz-prefix \ --without-tpm \ + --without-tpm2 \ --disable-openssl-compatibility \ --without-libbrotli \ --without-idn \ @@ -98,6 +99,13 @@ else GNUTLS_CONF_OPTS += --without-p11-kit endif +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +GNUTLS_CONF_OPTS += --with-tpm2 +GNUTLS_DEPENDENCIES += tpm2-tss +else +GNUTLS_CONF_OPTS += --without-tpm2 +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) GNUTLS_CONF_OPTS += --with-zlib GNUTLS_DEPENDENCIES += zlib From 8502ac71aad426792aa51923ef0f14b83c4bf2c7 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 Jun 2024 23:00:53 +0300 Subject: [PATCH 1476/3013] package/wpewebkit: add backported patch to fix NEON build Import a patch that has been backported by upstream to the 2.44 release branch that fixes the build when the target is an ARM processor that supports NEON instructions. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- ...-specific-declarations-in-FELighting.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch diff --git a/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch b/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch new file mode 100644 index 00000000000..9e2bc86fef0 --- /dev/null +++ b/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch @@ -0,0 +1,68 @@ +From 8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 27 May 2024 02:09:58 +0300 +Subject: [PATCH] Cherry-pick 279334@main (36d1b5d7c0ef). + + Remove ARM-specific declarations in FELighting.h unneeded after 272873@main + + Unreviewed build fix. + + * Source/WebCore/platform/graphics/filters/FELighting.h: Remove unneeded + declarations for the getPowerCoefficients() and platformApplyNeon() + functions, which are now defined elsewhere; and were causing a build + failure due to usage of the protected LightingData type. + * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp: + (WebCore::FELightingNeonParallelApplier::applyPlatformParallel const): + Add missing LightType:: namespace to uses of LS_POINT and LS_SPOT. + + Canonical link: https://commits.webkit.org/279334@main + +Canonical link: https://commits.webkit.org/274313.261@webkitglib/2.44 + +Signed-off-by: Adrian Perez de Castro +Upstream: https://github.com/WebKit/WebKit/commit/8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 +--- + .../cpu/arm/filters/FELightingNeonParallelApplier.cpp | 4 ++-- + Source/WebCore/platform/graphics/filters/FELighting.h | 5 ----- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp +index 04d855fa6d71..5f4250d87b61 100644 +--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp ++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp +@@ -542,14 +542,14 @@ void FELightingNeonParallelApplier::applyPlatformParallel(const LightingData& da + floatArguments.colorBlue = color.blue; + floatArguments.padding4 = 0; + +- if (data.lightSource->type() == LS_POINT) { ++ if (data.lightSource->type() == LightType::LS_POINT) { + neonData.flags |= FLAG_POINT_LIGHT; + auto& pointLightSource = downcast(*data.lightSource); + floatArguments.lightX = pointLightSource.position().x(); + floatArguments.lightY = pointLightSource.position().y(); + floatArguments.lightZ = pointLightSource.position().z(); + floatArguments.padding2 = 0; +- } else if (data.lightSource->type() == LS_SPOT) { ++ } else if (data.lightSource->type() == LightType::LS_SPOT) { + neonData.flags |= FLAG_SPOT_LIGHT; + auto& spotLightSource = downcast(*data.lightSource); + floatArguments.lightX = spotLightSource.position().x(); +diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h +index 4efab920b1c3..dcd80b6f42b7 100644 +--- a/Source/WebCore/platform/graphics/filters/FELighting.h ++++ b/Source/WebCore/platform/graphics/filters/FELighting.h +@@ -68,11 +68,6 @@ protected: + + std::unique_ptr createSoftwareApplier() const override; + +-#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) +- static int getPowerCoefficients(float exponent); +- inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); +-#endif +- + Color m_lightingColor; + float m_surfaceScale; + float m_diffuseConstant; +-- +2.45.2 + From 39d23ce823bed1ab9db25ec32a924980ef4b91c1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 10 Jul 2024 15:41:34 +0200 Subject: [PATCH 1477/3013] DEVELOPERS: drop Mathieu Audat Mathieu privately informed me that he no longer has access to the TS4900 board, he is therefore unable to maintain this board moving forward. Let's drop his entry from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index bddd92d133c..0e971b9bebb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2215,11 +2215,6 @@ N: Masahiro Yamada F: board/arm/foundation-v8/ F: configs/arm_foundationv8_defconfig -N: Mathieu Audat -F: board/technologic/ts4900/ -F: configs/ts4900_defconfig -F: package/ts4900-fpga/ - N: Matt Silva F: package/rlwrap/ From 8b651fd817a9e0c11ebab12bd558ee6e80b86cd4 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 10 Jul 2024 17:57:54 +0200 Subject: [PATCH 1478/3013] package/sqlitecpp: require C++11 [0] lists gcc 4.8.4 as minimum version. Since we don't have a guard for patch versions depend on gcc 4.9 [0] http://srombauts.github.io/SQLiteCpp/#supported-platforms Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/sqlitecpp/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/sqlitecpp/Config.in b/package/sqlitecpp/Config.in index 36ee4b73f9c..31de9a3904e 100644 --- a/package/sqlitecpp/Config.in +++ b/package/sqlitecpp/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SQLITECPP bool "sqlitecpp" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA help @@ -9,5 +10,5 @@ config BR2_PACKAGE_SQLITECPP https://github.com/SRombauts/SQLiteCpp -comment "sqlitecpp needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "sqlitecpp needs a toolchain w/ C++11, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 1a409fafb0ea24e8e8f07529623d55e8d3435598 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 18:19:27 +0200 Subject: [PATCH 1479/3013] package/exim: security bump version to 4.98 Release notes: https://lists.exim.org/lurker/message/20240710.155945.8823670d.en.html Fixes CVE-2024-39929: https://bugs.exim.org/show_bug.cgi?id=3099#c4 Removed patch 0004 due to removal of codesourcery arm/aarch64 toolchains with commit 53a8c5150e5eeeb6dbbead0275dbf9141f507511. Patch 0005 (renamed to 0004) is still necessary with gcc-13.x, reformatted Upstream trailer. Removed patches 0006, 0007 & 0008 which are included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 - ..._lock-fix-lstat-related-build-errors.patch | 53 ----------------- ...atch => 0004-sieve-fix-build-errors.patch} | 2 +- .../0006-OpenSSL-fix-non-DANE-build.patch | 28 --------- package/exim/0007-typoes.patch | 58 ------------------- ...nssl.c-fix-build-with-libressl-3.5.0.patch | 43 -------------- package/exim/exim.hash | 4 +- package/exim/exim.mk | 2 +- 8 files changed, 4 insertions(+), 188 deletions(-) delete mode 100644 package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch rename package/exim/{0005-sieve-fix-build-errors.patch => 0004-sieve-fix-build-errors.patch} (95%) delete mode 100644 package/exim/0006-OpenSSL-fix-non-DANE-build.patch delete mode 100644 package/exim/0007-typoes.patch delete mode 100644 package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8517ede49e3..9eaf5b996d7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -540,8 +540,6 @@ package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch lib_patch.Upstr package/exim/0001-Build-buildconfig-for-the-host.patch lib_patch.Upstream package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch lib_patch.Upstream package/exim/0003-Skip-version-check-and-symlink-installation.patch lib_patch.Upstream -package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch lib_patch.Upstream -package/exim/0005-sieve-fix-build-errors.patch lib_patch.Upstream package/exim/S86exim lib_sysv.Indent lib_sysv.Variables package/expect/0001-enable-cross-compilation.patch lib_patch.Upstream package/expect/0002-allow-tcl-build-directory.patch lib_patch.Upstream diff --git a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch deleted file mode 100644 index 616ada50264..00000000000 --- a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bbcf4320134efd8a01ce5a02bb9af62019ca05f6 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Tue, 4 Feb 2020 15:57:48 +0100 -Subject: [PATCH] exim_lock: fix lstat-related build errors - -exim_lock fails to cross-compile with the Sourcery CodeBench ARM 2014.05 -toolchain due the a missing include of sys/types.h, needed for the -constants used by fstat() and lstat(). - -Discovered when cross-compiling with the Buildroot embedded Linux -buildsystem. - -Fixes: - - exim_lock.c:427:30: error: 'S_IFMT' undeclared (first use in this function) - if ((statbuf.st_mode & S_IFMT) == S_IFLNK) - ^ - exim_lock.c:427:30: note: each undeclared identifier is reported only once for each function it appears in - exim_lock.c:427:41: error: 'S_IFLNK' undeclared (first use in this function) - if ((statbuf.st_mode & S_IFMT) == S_IFLNK) - ^ - -Signed-off-by: Luca Ceresoli -Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 -[Bernd: rebased for version 4.97.1] -Signed-off-by: Bernd Kuhls ---- - src/exim_lock.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/exim_lock.c b/src/exim_lock.c -index 068216816054..cb140aff6436 100644 ---- a/src/exim_lock.c -+++ b/src/exim_lock.c -@@ -14,6 +14,8 @@ Copyright (c) The Exim Maintainers 2016 - 2021 - SPDX-License-Identifier: GPL-2.0-or-later - */ - -+#define _XOPEN_SOURCE -+ - #include "os.h" - - #include -@@ -27,6 +29,7 @@ Copyright (c) The Exim Maintainers 2016 - #include - #include - #include -+#include - #include - #include - #include --- -2.25.0 diff --git a/package/exim/0005-sieve-fix-build-errors.patch b/package/exim/0004-sieve-fix-build-errors.patch similarity index 95% rename from package/exim/0005-sieve-fix-build-errors.patch rename to package/exim/0004-sieve-fix-build-errors.patch index 20323c17cd7..c1a2c45b8dc 100644 --- a/package/exim/0005-sieve-fix-build-errors.patch +++ b/package/exim/0004-sieve-fix-build-errors.patch @@ -20,7 +20,7 @@ Discovered when cross-compiling with the Buildroot embedded Linux buildsystem. Signed-off-by: Luca Ceresoli -Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +Upstream: https://bugs.exim.org/show_bug.cgi?id=2523 [Bernd: rebased for version 4.97.1] Signed-off-by: Bernd Kuhls --- diff --git a/package/exim/0006-OpenSSL-fix-non-DANE-build.patch b/package/exim/0006-OpenSSL-fix-non-DANE-build.patch deleted file mode 100644 index 8ae63d22266..00000000000 --- a/package/exim/0006-OpenSSL-fix-non-DANE-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 37b849dca4dfd855212a763662825e967a4d77b1 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Tue, 7 Nov 2023 15:02:18 +0000 -Subject: [PATCH] OpenSSL: fix non-DANE build - -Upstream: https://git.exim.org/exim.git/commitdiff/37b849dca4dfd855212a763662825e967a4d77b1 - -Signed-off-by: Bernd Kuhls ---- - src/tls-openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c -index ef11de593..851ac77c5 100644 ---- a/src/tls-openssl.c -+++ b/src/tls-openssl.c -@@ -2605,7 +2605,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) - asking for certificate-status under DANE, so this callback won't run for - that combination. It still will for non-DANE. */ - --#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER -+#if defined(EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER) && defined(SUPPORT_DANE) - X509 * signer; - - if ( tls_out.dane_verified --- -2.30.2 - diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch deleted file mode 100644 index 6bbfc9eecd4..00000000000 --- a/package/exim/0007-typoes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 8 Nov 2023 14:22:37 +0000 -Subject: [PATCH] typoes - -Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3 -Signed-off-by: Fabrice Fontaine ---- - src/src/tls-openssl.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/tls-openssl.c b/src/tls-openssl.c -index 851ac77c5..237303ba9 100644 ---- a/src/tls-openssl.c -+++ b/src/tls-openssl.c -@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */ - # define EXIM_HAVE_OPENSSL_KEYLOG - # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID - # define EXIM_HAVE_SESSION_TICKET --# define EXIM_HAVE_OPESSL_TRACE --# define EXIM_HAVE_OPESSL_GET0_SERIAL --# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS -+# define EXIM_HAVE_OPENSSL_TRACE -+# define EXIM_HAVE_OPENSSL_GET0_SERIAL -+# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS - # define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN - # ifndef DISABLE_OCSP - # define EXIM_HAVE_OCSP -@@ -1756,7 +1756,7 @@ level. */ - DEBUG(D_tls) - { - SSL_CTX_set_info_callback(ctx, info_callback); --#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) -+#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) - /* this needs a debug build of OpenSSL */ - SSL_CTX_set_msg_callback(ctx, SSL_trace); - #endif -@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP; - if (!olist) - return SSL_TLSEXT_ERR_NOACK; - --#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL -+#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL - { - const X509 * cert_sent = SSL_get_certificate(s); - const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent); -@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) - - debug_printf("certs contained in basicresp:\n"); - x509_stack_dump_cert_s_names( --#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS -+#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS - OCSP_resp_get0_certs(bs) - #else - bs->certs --- -2.30.2 - diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index 67d96fc1af0..00000000000 --- a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 11 Feb 2024 21:45:42 +0100 -Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0 - -OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and -https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954 -resulting in the following build failure since version 4.97 and -https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: - -In file included from tls.c:473: -tls-openssl.c: In function 'tls_client_stapling_cb': -tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} - 2652 | bs->certs - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d - -Signed-off-by: Fabrice Fontaine -Upstream: https://bugs.exim.org/show_bug.cgi?id=3074 ---- - src/src/tls-openssl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/tls-openssl.c b/src/tls-openssl.c -index 237303ba9..c7f94c160 100644 ---- a/src/tls-openssl.c -+++ b/src/tls-openssl.c -@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */ - # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID - #endif - -+#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL -+# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS -+#endif -+ - #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L) - # define EXIM_HAVE_EXPORT_CHNL_BNGNG - # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS --- -2.43.0 - diff --git a/package/exim/exim.hash b/package/exim/exim.hash index a3822302fbd..de803bb27bd 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,6 +1,6 @@ # From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt -sha256 bd782057509a793593508528590626d185ea160ce32cb34beda262e99cefdfa9 exim-4.97.1.tar.xz +sha256 0ebc108a779f9293ba4b423c20818f9a3db79b60286d96abc6ba6b85a15852f7 exim-4.98.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc exim-4.97.1.tar.xz +sha512 13dd963dd0899bb4d64bee44c20883e720e469a4d77456b877d6693cfc4419805a045cb561508cdf763dbb37cc84fbdc6177d68acc2183934c3224fbd03caf15 exim-4.98.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index d78b95ad15b..45708d3941b 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.97.1 +EXIM_VERSION = 4.98 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ From 0cde01e17bb03aee44b5ccb1549eaf6dec7f3ca5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 10 Jul 2024 22:03:53 +0200 Subject: [PATCH 1480/3013] package/libjxl: bump to version 0.10.3 For release notes since v0.10.2, see: - https://github.com/libjxl/libjxl/releases/tag/v0.10.3 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index ccd0d4e954d..4eaadf957c6 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 95e807f63143856dc4d161c071cca01115d2c6405b3d3209854ac6989dc6bb91 libjxl-0.10.2.tar.gz +sha256 e0191411cfcd927eebe5392d030fe4283fe27ba1685ab7265104936e0b4283a6 libjxl-0.10.3.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 51b69109d9e..b7fe3e1b52a 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.10.2 +LIBJXL_VERSION = 0.10.3 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS From c1b4c8af0bca62267b29e6ee4759bede0086e28f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Jun 2024 16:57:09 +0200 Subject: [PATCH 1481/3013] package/onevpl-intel-gpu: rename package to intel-vpl-gpu-rt Upstream renamed the package and moved the github repo: https://github.com/intel/vpl-gpu-rt/commit/74dbcc6240e8315ad927f642a5d733e6a515a1d4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 2 +- package/Config.in | 2 +- .../Config.in | 13 +++++++------ .../intel-vpl-gpu-rt.hash} | 2 +- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk | 15 +++++++++++++++ package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 15 --------------- 7 files changed, 33 insertions(+), 24 deletions(-) rename package/{onevpl-intel-gpu => intel-vpl-gpu-rt}/Config.in (69%) rename package/{onevpl-intel-gpu/onevpl-intel-gpu.hash => intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash} (80%) create mode 100644 package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk delete mode 100644 package/onevpl-intel-gpu/onevpl-intel-gpu.mk diff --git a/Config.in.legacy b/Config.in.legacy index 9dd5bdd2ebd..a5f76384152 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_ONEVPL_INTEL_GPU + bool "onevpl-intel-gpu has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_INTEL_VPL_GPU_RT + help + The onevpl-intel-gpu package has been renamed to + intel-vpl-gpu-rt. + config BR2_PACKAGE_CGIC bool "cgic has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0e971b9bebb..abef5810757 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -385,6 +385,7 @@ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ F: package/intel-microcode/ +F: package/intel-vpl-gpu-rt/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ @@ -455,7 +456,6 @@ F: package/mjpg-streamer/ F: package/mpg123/ F: package/ntp/ F: package/nut/ -F: package/onevpl-intel-gpu/ F: package/opus/ F: package/pciutils/ F: package/perl-crypt-openssl-guess/ diff --git a/package/Config.in b/package/Config.in index 6406fd410ac..8dc8b5ed5df 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1664,6 +1664,7 @@ menu "Graphics" source "package/intel-gmmlib/Config.in" source "package/intel-mediadriver/Config.in" source "package/intel-mediasdk/Config.in" + source "package/intel-vpl-gpu-rt/Config.in" source "package/irrlicht/Config.in" source "package/jasper/Config.in" source "package/jbig2dec/Config.in" @@ -1710,7 +1711,6 @@ menu "Graphics" source "package/libvpl/Config.in" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" - source "package/onevpl-intel-gpu/Config.in" source "package/opencl-clhpp/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" diff --git a/package/onevpl-intel-gpu/Config.in b/package/intel-vpl-gpu-rt/Config.in similarity index 69% rename from package/onevpl-intel-gpu/Config.in rename to package/intel-vpl-gpu-rt/Config.in index 740e954ee58..da26ea6aa5c 100644 --- a/package/onevpl-intel-gpu/Config.in +++ b/package/intel-vpl-gpu-rt/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_ONEVPL_INTEL_GPU - bool "onevpl-intel-gpu" +config BR2_PACKAGE_INTEL_VPL_GPU_RT + bool "intel-vpl-gpu-rt" depends on BR2_x86_64 # intel-mediadriver depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS # libvpl depends on BR2_INSTALL_LIBSTDCPP # libvpl @@ -12,12 +12,13 @@ config BR2_PACKAGE_ONEVPL_INTEL_GPU select BR2_PACKAGE_LIBVA select BR2_PACKAGE_LIBVPL help - Intel® oneVPL GPU Runtime is a Runtime implementation of - oneVPL API for Intel Gen GPUs, starting with Tiger Lake. + Intel® Video Processing Library (Intel® VPL) GPU Runtime is a + Runtime implementation of Intel® VPL API for Intel Gen GPUs, + starting with Tiger Lake. - https://github.com/oneapi-src/oneVPL-intel-gpu + https://github.com/intel/vpl-gpu-rt -comment "onevpl-intel-gpu needs a toolchain w/ dynamic library, gcc >= 7, C++, NPTL" +comment "intel-vpl-gpu-rt needs a toolchain w/ dynamic library, gcc >= 7, C++, NPTL" depends on BR2_x86_64 depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_1 diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash similarity index 80% rename from package/onevpl-intel-gpu/onevpl-intel-gpu.hash rename to package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash index 59b1c5a23c5..6b57b4674c0 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b261d87d91a56a6a462f6a129ddd97945a49637995ee6aa67ebd9b26c0a3c1a0 onevpl-intel-gpu-24.2.1.tar.gz +sha256 b261d87d91a56a6a462f6a129ddd97945a49637995ee6aa67ebd9b26c0a3c1a0 intel-vpl-gpu-rt-24.2.1.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk new file mode 100644 index 00000000000..e3ca68926ed --- /dev/null +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# intel-vpl-gpu-rt +# +################################################################################ + +INTEL_VPL_GPU_RT_VERSION = 24.2.1 +INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION)) +INTEL_VPL_GPU_RT_LICENSE = MIT +INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE +INTEL_VPL_GPU_RT_CPE_ID_VENDOR = intel +INTEL_VPL_GPU_RT_CPE_ID_PRODUCT = onevpl_gpu_runtime +INTEL_VPL_GPU_RT_DEPENDENCIES = libva libvpl + +$(eval $(cmake-package)) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk deleted file mode 100644 index a68e628182f..00000000000 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# onevpl-intel-gpu -# -################################################################################ - -ONEVPL_INTEL_GPU_VERSION = 24.2.1 -ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) -ONEVPL_INTEL_GPU_LICENSE = MIT -ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE -ONEVPL_INTEL_GPU_CPE_ID_VENDOR = intel -ONEVPL_INTEL_GPU_CPE_ID_PRODUCT = onevpl_gpu_runtime -ONEVPL_INTEL_GPU_DEPENDENCIES = libva libvpl - -$(eval $(cmake-package)) From 44447d7ac3838e70739ae889b3051c25c63979c8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Jun 2024 16:57:10 +0200 Subject: [PATCH 1482/3013] package/intel-vpl-gpu-rt: bump version to 24.2.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash | 2 +- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash index 6b57b4674c0..9c9f6e720d3 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b261d87d91a56a6a462f6a129ddd97945a49637995ee6aa67ebd9b26c0a3c1a0 intel-vpl-gpu-rt-24.2.1.tar.gz +sha256 ccb76812642d84d4d8a56d28df60ef6d450cbb09969a59ee6c4a819098617b5d intel-vpl-gpu-rt-24.2.5.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk index e3ca68926ed..a4daa8d29c9 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_VPL_GPU_RT_VERSION = 24.2.1 +INTEL_VPL_GPU_RT_VERSION = 24.2.5 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION)) INTEL_VPL_GPU_RT_LICENSE = MIT INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE From 27c723f0d47807c5e5652d9ec891451b1422219d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Jun 2024 16:57:11 +0200 Subject: [PATCH 1483/3013] package/intel-mediadriver: bump version to 24.2.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 8a23f9cd7eb..89aaab8721e 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7d0d43e201706ab2dc62741b7873d52dc3779a7b1187b5a321cd0a37223b2b8c intel-media-24.2.2.tar.gz +sha256 dec2210c1f824a721e4ea6f66f5899e300801b3e7fae232d3f8a94db38c2edd1 intel-media-24.2.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 2bbe4a7a087..943956ec50b 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.2.2 +INTEL_MEDIADRIVER_VERSION = 24.2.5 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 935a5ad4ebdaf18f0be356aac2ab31d9ef02d9c5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Jun 2024 16:57:12 +0200 Subject: [PATCH 1484/3013] package/intel-gmmlib: bump version to 22.4.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index aadf01a1690..66a4088257e 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ea9c418b0fd84a982850f230cb2d783dfe2e1f9923065f54b2fcaad1e9b33417 intel-gmmlib-22.3.19.tar.gz +sha256 7233037c5788966b0b356823149247e4d3bd590480103c48277191da83243d0d intel-gmmlib-22.4.0.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 74e19e93fde..5260b7689ce 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.19 +INTEL_GMMLIB_VERSION = 22.4.0 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 0e2c2810dc25de0cdc2126851061f9feabe66930 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 23 Jun 2024 12:26:15 +0200 Subject: [PATCH 1485/3013] package/octave: add optional openssl support GNU Octave supports the --with-openssl configure option since v4.0.0. For reference, commit 40ea68b4b2 "package/octave: new package" introduced the package at v7.1.0. This commits adds this optional support. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index d879fd67303..0c7c4116921 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -43,6 +43,13 @@ else OCTAVE_CONF_OPTS += --without-curl endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OCTAVE_CONF_OPTS += --with-openssl=yes +OCTAVE_DEPENDENCIES += openssl +else +OCTAVE_CONF_OPTS += --without-openssl +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From 3b9d62dac564b6d1bfa5ba5e0dd72e731fd95d55 Mon Sep 17 00:00:00 2001 From: Lance Fredrickson Date: Sat, 22 Jun 2024 21:38:04 -0600 Subject: [PATCH 1486/3013] boot/syslinux: fix building with GCC 14.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing stdio.h include. Without this includes, the build fails with the following error under GCC 14.x: ../../../com32/lib/syslinux/debug.c: In function ‘syslinux_debug’: ../../../com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration] 91 | printf("Dynamic debug unavailable\n"); Signed-off-by: Lance Fredrickson Signed-off-by: Thomas Petazzoni --- .../0020-pull-in-stdio-h-for-gcc14.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch diff --git a/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch b/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch new file mode 100644 index 00000000000..09a0074b314 --- /dev/null +++ b/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch @@ -0,0 +1,34 @@ +From dfa2705100a893bc017d23406daa9a383fbc3c95 Mon Sep 17 00:00:00 2001 +From: Lance Fredrickson +Date: Wed, 5 Jun 2024 14:31:38 -0600 +Subject: [PATCH] com32/lib/syslinux/debug.c: add missing stdio.h include. + +Fix building syslinux with GCC 14.x + +Add missing stdio.h include. Without it results in the following error under GCC 14.x + +../../../com32/lib/syslinux/debug.c: In function ‘syslinux_debug’: +../../../com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration] + 91 | printf("Dynamic debug unavailable\n"); + +Upstream: dead (last release in 2014) +Signed-off-by: Lance Fredrickson +--- + com32/lib/syslinux/debug.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c +index d9ab863f..e8f53d57 100644 +--- a/com32/lib/syslinux/debug.c ++++ b/com32/lib/syslinux/debug.c +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + + #ifdef DYNAMIC_DEBUG + +-- +2.39.2 + From 8436a5141bca7ec24fc1f85fbce1f6c56faaca7a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 23 Jun 2024 14:35:57 -0600 Subject: [PATCH 1487/3013] utils/update-rust: use urllib.request from stdlib instead of requests We can use urllib.request without adding any addition lines of code compared with requests which is not part of the stdlib. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- utils/update-rust | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/utils/update-rust b/utils/update-rust index 6799324facc..407ef69847a 100755 --- a/utils/update-rust +++ b/utils/update-rust @@ -2,8 +2,8 @@ import argparse import pathlib -import requests import sys +import urllib.request # When updating this list, also update: # - package/rustc/Config.in.host: @@ -87,12 +87,12 @@ def gen_hash_file_src(hash_file, new_version): f_name = f"rustc-{new_version}-src.tar.xz" print(f"\r\033[KUpdating {f_name}", end="") h_url = f"{RUST_DIST_URL}/{f_name}.sha256" - r = requests.get(h_url) - if r.status_code != 200: - raise RuntimeError(f"No hash for {f_name}. Has source been removed?") - # rstrip() content, and explicitly add the \n, in case - # a hash file does not have a trailing \n. - fd.write(f"# From {h_url}\nsha256 {r.content.decode().rstrip()}\n") + with urllib.request.urlopen(h_url) as r: + if r.status != 200: + raise RuntimeError(f"No hash for {f_name}. Has source been removed?") + # rstrip() content, and explicitly add the \n, in case + # a hash file does not have a trailing \n. + fd.write(f"# From {h_url}\nsha256 {r.read().decode().rstrip()}\n") fd.write("# Locally generated\n") for license in LICENSES: fd.write(f"sha256 {LICENSES[license]} LICENSE-{license}\n") @@ -105,22 +105,22 @@ def gen_hash_file_bin(hash_file, new_version): f_name = f"rust-{new_version}-{host}.tar.xz" print(f"\r\033[KUpdating {f_name}", end="") h_url = f"{RUST_DIST_URL}/{f_name}.sha256" - r = requests.get(h_url) - if r.status_code != 200: - raise RuntimeError(f"No hash for {f_name}. Has host {host} been removed?") - # rstrip() content, and explicitly add the \n, in case - # a hash file does not have a trailing \n. - fd.write(f"# From {h_url}\nsha256 {r.content.decode().rstrip()}\n") + with urllib.request.urlopen(h_url) as r: + if r.status != 200: + raise RuntimeError(f"No hash for {f_name}. Has host {host} been removed?") + # rstrip() content, and explicitly add the \n, in case + # a hash file does not have a trailing \n. + fd.write(f"# From {h_url}\nsha256 {r.read().decode().rstrip()}\n") for target in RUST_TARGETS: f_name = f"rust-std-{new_version}-{target}.tar.xz" print(f"\r\033[KUpdating {f_name}", end="") h_url = f"{RUST_DIST_URL}/{f_name}.sha256" - r = requests.get(h_url) - if r.status_code != 200: - raise RuntimeError(f"No hash for {f_name}. Has target {target} been removed?") - # rstrip() content, and explicitly add the \n, in case - # a hash file does not have a trailing \n. - fd.write(f"# From {h_url}\nsha256 {r.content.decode().rstrip()}\n") + with urllib.request.urlopen(h_url) as r: + if r.status != 200: + raise RuntimeError(f"No hash for {f_name}. Has target {target} been removed?") + # rstrip() content, and explicitly add the \n, in case + # a hash file does not have a trailing \n. + fd.write(f"# From {h_url}\nsha256 {r.read().decode().rstrip()}\n") fd.write("# Locally generated\n") for license in LICENSES: fd.write(f"sha256 {LICENSES[license]} LICENSE-{license}\n") From 0fa7343b6bd20938a65dc4d2e41339b8422040d8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 23 Jun 2024 14:58:21 -0600 Subject: [PATCH 1488/3013] utils/update-rust: use pathlib with relative paths This avoids the requirement of running update-rust from TOPDIR and is slightly cleaner. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- utils/update-rust | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/utils/update-rust b/utils/update-rust index 407ef69847a..3301434d703 100755 --- a/utils/update-rust +++ b/utils/update-rust @@ -2,7 +2,6 @@ import argparse import pathlib -import sys import urllib.request # When updating this list, also update: @@ -68,11 +67,11 @@ LICENSES = { def update_mk_file(mk_file, new_version): - with open(mk_file, "r") as fd: + with mk_file.open("r") as fd: lines = fd.readlines() version_var = pathlib.Path(mk_file).stem.upper().replace("-", "_") + "_VERSION" - with open(mk_file, "w") as fd: + with mk_file.open("w") as fd: for line in lines: words = line.split() if len(words) == 3 and words[0] == version_var and words[1] == "=": @@ -82,8 +81,8 @@ def update_mk_file(mk_file, new_version): def gen_hash_file_src(hash_file, new_version): - with open(hash_file, "w") as fd: - fd.write(f"# Generated with {sys.argv[0]}\n# Do not edit manually\n\n") + with hash_file.open("w") as fd: + fd.write("# Generated with utils/update-rust\n# Do not edit manually\n\n") f_name = f"rustc-{new_version}-src.tar.xz" print(f"\r\033[KUpdating {f_name}", end="") h_url = f"{RUST_DIST_URL}/{f_name}.sha256" @@ -99,8 +98,8 @@ def gen_hash_file_src(hash_file, new_version): def gen_hash_file_bin(hash_file, new_version): - with open(hash_file, "w") as fd: - fd.write(f"# Generated with {sys.argv[0]}\n# Do not edit manually\n\n") + with hash_file.open("w") as fd: + fd.write("# Generated with utils/update-rust\n# Do not edit manually\n\n") for host in RUST_HOSTS: f_name = f"rust-{new_version}-{host}.tar.xz" print(f"\r\033[KUpdating {f_name}", end="") @@ -132,13 +131,11 @@ def main(): args = parser.parse_args() - try: - update_mk_file("package/rust/rust.mk", args.version) - update_mk_file("package/rust-bin/rust-bin.mk", args.version) - gen_hash_file_src("package/rust/rust.hash", args.version) - gen_hash_file_bin("package/rust-bin/rust-bin.hash", args.version) - except FileNotFoundError as e: - print(f"{e.filename}: {e.strerror} ({sys.argv[0]} must be run at the root of the Buildroot tree)") + TOPDIR = pathlib.Path(__file__).parent.parent + update_mk_file(TOPDIR / "package/rust/rust.mk", args.version) + update_mk_file(TOPDIR / "package/rust-bin/rust-bin.mk", args.version) + gen_hash_file_src(TOPDIR / "package/rust/rust.hash", args.version) + gen_hash_file_bin(TOPDIR / "package/rust-bin/rust-bin.hash", args.version) print("\r\033[K", end="") From e50c5d54c381195852adf2e18f5c6c423dd90dac Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 22:55:08 +0200 Subject: [PATCH 1489/3013] package/intel-gmmlib: bump version to 22.4.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 66a4088257e..93138bf25ae 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7233037c5788966b0b356823149247e4d3bd590480103c48277191da83243d0d intel-gmmlib-22.4.0.tar.gz +sha256 451fbe2eac26533a896ca0da0356354ecc38680f273fce7d121c6a22251ed21e intel-gmmlib-22.4.1.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 5260b7689ce..a21c3bf1e53 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.4.0 +INTEL_GMMLIB_VERSION = 22.4.1 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 5778d9209c57fd19651f7493a74d20de8ab68ff9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 23:04:48 +0200 Subject: [PATCH 1490/3013] package/leafnode2: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/leafnode2/leafnode2.hash | 2 +- package/leafnode2/leafnode2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/leafnode2/leafnode2.hash b/package/leafnode2/leafnode2.hash index d03ea472b10..8ab57c93c7d 100644 --- a/package/leafnode2/leafnode2.hash +++ b/package/leafnode2/leafnode2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1c74de60c3f91ef6f8a3ec20f0c34a0933658aeac8e3723a5f286c0646319e5c leafnode2-ce7d3b13fb285c9fb7bffc382ea10fd41e12582d.tar.gz +sha256 2a72a405599cd9f01cd44b6655c8986bf589b1f766c32957a70c147e39177a30 leafnode2-c514997a8c50bd28a34893d0436b0330f5719238.tar.gz sha256 59d37f745dc5a2d63a51dff344f4ad89f72e76f8c7b7d877f20880d838b1bec9 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index cba6b1f72a3..71b27f180cb 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEAFNODE2_VERSION = ce7d3b13fb285c9fb7bffc382ea10fd41e12582d +LEAFNODE2_VERSION = c514997a8c50bd28a34893d0436b0330f5719238 LEAFNODE2_SITE = $(call gitlab,leafnode-2,leafnode-2,$(LEAFNODE2_VERSION)) LEAFNODE2_LICENSE = LGPL-2.1 LEAFNODE2_LICENSE_FILES = COPYING COPYING.LGPL From e9f949d4831e9b1568cbfc0ed31a76f5f1fb2372 Mon Sep 17 00:00:00 2001 From: Josua Mayer Date: Wed, 10 Jul 2024 16:42:57 +0200 Subject: [PATCH 1491/3013] package/openocd: add config option for imx_gpio driver imx_gpio driver is used on NXP i.MX family of SoCs and required e.g. for programming noridc microcontrollers on SolidRun SolidSense family of devices. Add new config variable BR2_PACKAGE_OPENOCD_IMXGPIO for imx_gpio driver. Signed-off-by: Josua Mayer Signed-off-by: Thomas Petazzoni --- package/openocd/Config.in | 6 ++++++ package/openocd/openocd.mk | 1 + 2 files changed, 7 insertions(+) diff --git a/package/openocd/Config.in b/package/openocd/Config.in index cef109b5116..a7e068f10db 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -200,6 +200,12 @@ config BR2_PACKAGE_OPENOCD_BCM2835 Enable building support for bitbanging on BCM2835 (as found in Raspberry Pi) +config BR2_PACKAGE_OPENOCD_IMXGPIO + bool "bitbanging on NXP i.MX family" + help + Enable support for bitbanging on NXP i.MX family + (as found in SolidSense N6, N8, etc.) + endif # BR2_arm || BR2_aarch64 config BR2_PACKAGE_OPENOCD_GW16012 diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index b24d1eacf0b..6b9f5541cdd 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -90,6 +90,7 @@ OPENOCD_CONF_OPTS += \ $(if $(BR2_PACKAGE_OPENOCD_AT91RM),--enable-at91rm9200,--disable-at91rm9200) \ $(if $(BR2_PACKAGE_OPENOCD_BCM2835),--enable-bcm2835gpio,--disable-bcm2835gpio) \ $(if $(BR2_PACKAGE_OPENOCD_GW16012),--enable-gw16012,--disable-gw16012) \ + $(if $(BR2_PACKAGE_OPENOCD_IMXGPIO),--enable-imx_gpio,--disable-imx_gpio) \ $(if $(BR2_PACKAGE_OPENOCD_PRESTO),--enable-presto,--disable-presto) \ $(if $(BR2_PACKAGE_OPENOCD_OPENJTAG),--enable-openjtag,--disable-openjtag) \ $(if $(BR2_PACKAGE_OPENOCD_BUSPIRATE),--enable-buspirate,--disable-buspirate) \ From 62103be918e7a155749b1b3b680a9e4ecba6af87 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 9 Jul 2024 22:24:39 +0200 Subject: [PATCH 1492/3013] package/libssh: select BR2_PACKAGE_LIBOPENSSL_ENGINES This fixes link time errors, undefined references to various ENGINE_* functions in case libopenssl backend is used. Fixes: http://autobuild.buildroot.net/results/5bb845be7f861dc3540a8dc618ccd1a0a759f2d5/ Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libssh/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libssh/Config.in b/package/libssh/Config.in index 1f271a692ef..eaec754414f 100644 --- a/package/libssh/Config.in +++ b/package/libssh/Config.in @@ -36,6 +36,7 @@ config BR2_PACKAGE_LIBSSH_LIBGCRYPT config BR2_PACKAGE_LIBSSH_OPENSSL bool "openssl" depends on BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES endchoice From 365ee4b6311f28bb5ee187bce90f27b9a758f280 Mon Sep 17 00:00:00 2001 From: Michel Alex Date: Thu, 20 Jun 2024 09:25:35 +0000 Subject: [PATCH 1493/3013] package/libzenoh-c: bump to version 0.11.0 https://github.com/eclipse-zenoh/zenoh-c/releases/tag/0.11.0 Signed-off-by: Alex Michel Signed-off-by: Thomas Petazzoni --- package/libzenoh-c/libzenoh-c.hash | 2 +- package/libzenoh-c/libzenoh-c.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libzenoh-c/libzenoh-c.hash b/package/libzenoh-c/libzenoh-c.hash index 559c9122ad5..66bb5282f44 100644 --- a/package/libzenoh-c/libzenoh-c.hash +++ b/package/libzenoh-c/libzenoh-c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c86e468527e573d92b01bf454333dda4dc1217f14d5d5f94c24311961313c234 libzenoh-c-0.11.0.3-cargo2.tar.gz +sha256 cf8ca9382a17564ceedadf8fe574cd7c73440cd298d2adfbe88fa452427f8526 libzenoh-c-0.11.0-cargo2.tar.gz sha256 01a44774f7b1a453595c7c6d7f7308284ba6a1059dc49e14dad6647e1d44a338 LICENSE diff --git a/package/libzenoh-c/libzenoh-c.mk b/package/libzenoh-c/libzenoh-c.mk index 07c153e328f..f07206f4f77 100644 --- a/package/libzenoh-c/libzenoh-c.mk +++ b/package/libzenoh-c/libzenoh-c.mk @@ -4,7 +4,10 @@ # ################################################################################ -LIBZENOH_C_VERSION = 0.11.0.3 +# This 0.11.0 version is really newer than 0.11.0.3, so please don't +# update 0.11.0.3 even if release-monitoring.org claims it's a newer +# version. +LIBZENOH_C_VERSION = 0.11.0 LIBZENOH_C_SITE = $(call github,eclipse-zenoh,zenoh-c,$(LIBZENOH_C_VERSION)) LIBZENOH_C_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_C_LICENSE_FILES = LICENSE From cc9c09d18944c14b3544279adb72634128e9d004 Mon Sep 17 00:00:00 2001 From: Michel Alex Date: Thu, 20 Jun 2024 09:25:39 +0000 Subject: [PATCH 1494/3013] package/libzenoh-pico: bump version to 0.11.0 https://github.com/eclipse-zenoh/zenoh-pico/releases/tag/0.11.0 Signed-off-by: Alex Michel Signed-off-by: Thomas Petazzoni --- package/libzenoh-pico/libzenoh-pico.hash | 2 +- package/libzenoh-pico/libzenoh-pico.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libzenoh-pico/libzenoh-pico.hash b/package/libzenoh-pico/libzenoh-pico.hash index 9ea45969aab..3e017b79c82 100644 --- a/package/libzenoh-pico/libzenoh-pico.hash +++ b/package/libzenoh-pico/libzenoh-pico.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a5bc5cae6fd4ade3d69d8a2ed0aef89f4c8f752f79d74b7462f5bb3437680b72 libzenoh-pico-0.11.0.3.tar.gz +sha256 db1eca9d84ca581731cf1f3f88aca785d58fb2b1972f2f07d09a0cf022ee02f9 libzenoh-pico-0.11.0.tar.gz sha256 d386df32cf327bbb25abe894277d3d7e0f447bafc59f4ad362615b0136f30db5 LICENSE diff --git a/package/libzenoh-pico/libzenoh-pico.mk b/package/libzenoh-pico/libzenoh-pico.mk index 9163ba30ad2..9f91926f0eb 100644 --- a/package/libzenoh-pico/libzenoh-pico.mk +++ b/package/libzenoh-pico/libzenoh-pico.mk @@ -4,7 +4,10 @@ # ################################################################################ -LIBZENOH_PICO_VERSION = 0.11.0.3 +# This 0.11.0 version is really newer than 0.11.0.3, so please don't +# update 0.11.0.3 even if release-monitoring.org claims it's a newer +# version. +LIBZENOH_PICO_VERSION = 0.11.0 LIBZENOH_PICO_SITE = $(call github,eclipse-zenoh,zenoh-pico,$(LIBZENOH_PICO_VERSION)) LIBZENOH_PICO_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_PICO_LICENSE_FILES = LICENSE From 3da51c91802d4ff5f071ae92c3bec8eae03802e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Thu, 20 Jun 2024 13:08:20 +0200 Subject: [PATCH 1495/3013] board/ti/am62x-sk: update custom hashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit cc2910a7dbd331ae0ad6a8f06ce7cd0559a1ebe1 ("configs/ti_am62x_sk_defconfig: update U-Boot to v2024.04") updated U-Boot and the ti-k3-r5-loader to 2024.04, but did not update the hash files in board/ti/am62x-sk/. It ended up working for now, because the official versions of boot/uboot and boot/ti-k3-r5-loader/ also use 2024.04 and therefore have this hash, but it would have started failing as soon as boot/uboot and/or boot/ti-k3-r5-loader official version were updated. Signed-off-by: Gero Schwäricke Signed-off-by: Thomas Petazzoni --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 4 ++-- board/ti/am62x-sk/patches/uboot/uboot.hash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8f60864fbf6..7494e04ead5 100644 --- a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ -# Locally computed: +# Locally calculated sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index 0e171c56f59..97a2b4eaf95 100644 --- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am62x-sk/patches/uboot/uboot.hash b/board/ti/am62x-sk/patches/uboot/uboot.hash index 0e171c56f59..97a2b4eaf95 100644 --- a/board/ti/am62x-sk/patches/uboot/uboot.hash +++ b/board/ti/am62x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 From 5654eca137b19e904391cf6e2745c980f6260760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Thu, 20 Jun 2024 13:08:21 +0200 Subject: [PATCH 1496/3013] board/ti/am64x-sk: update custom hashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 7efd75867cd84926b7aa6524e0a41c50c32b20e1 ("configs/ti_am64x_sk_defconfig: update U-Boot to v2024.04") updated U-Boot and the ti-k3-r5-loader to 2024.04, but did not update the hash files in board/ti/am62x-sk/. It ended up working for now, because the official versions of boot/uboot and boot/ti-k3-r5-loader/ also use 2024.04 and therefore have this hash, but it would have started failing as soon as boot/uboot and/or boot/ti-k3-r5-loader official version were updated. Signed-off-by: Gero Schwäricke Signed-off-by: Thomas Petazzoni --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 ++- board/ti/am64x-sk/patches/uboot/uboot.hash | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8f60864fbf6..7494e04ead5 100644 --- a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ -# Locally computed: +# Locally calculated sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index dbb44287388..97a2b4eaf95 100644 --- a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1 +1,2 @@ -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am64x-sk/patches/uboot/uboot.hash b/board/ti/am64x-sk/patches/uboot/uboot.hash index 0e171c56f59..97a2b4eaf95 100644 --- a/board/ti/am64x-sk/patches/uboot/uboot.hash +++ b/board/ti/am64x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 From f5251865413c6a50759d6f48b3300dc1be6122fb Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Tue, 18 Jun 2024 16:04:01 +0300 Subject: [PATCH 1497/3013] package/tbtools: bump to version 0.4.1 Update to the latest release of tbtools. Fixes build on sparc64: http://autobuild.buildroot.net/results/7b533f0dd7cc0c84c831182a4b2c439e84030ba0/ Signed-off-by: Mika Westerberg Signed-off-by: Thomas Petazzoni --- package/tbtools/tbtools.hash | 2 +- package/tbtools/tbtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tbtools/tbtools.hash b/package/tbtools/tbtools.hash index 06705fc19d8..85efbfa4ecd 100644 --- a/package/tbtools/tbtools.hash +++ b/package/tbtools/tbtools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1276ded79276d42c06a16293e26de32566c023383416fb8c91f86d141acce691 tbtools-0.4.0-cargo2.tar.gz +sha256 d35c50063b254a561d567926fe8e5280206f6144c12f3f82e832f87392b67510 tbtools-0.4.1-cargo2.tar.gz sha256 9b16a3add311d607af8d9b348a842a37840d0f47dfcc6cf2a7756ee02c24ed69 LICENSE diff --git a/package/tbtools/tbtools.mk b/package/tbtools/tbtools.mk index fc5ffc4215b..15766b67c77 100644 --- a/package/tbtools/tbtools.mk +++ b/package/tbtools/tbtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBTOOLS_VERSION = 0.4.0 +TBTOOLS_VERSION = 0.4.1 TBTOOLS_SITE = $(call github,intel,tbtools,v$(TBTOOLS_VERSION)) TBTOOLS_LICENSE = MIT TBTOOLS_LICENSE_FILES = LICENSE From 1ceb7b971109f08ec2561d28172a37a61f7249f4 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Tue, 18 Jun 2024 16:04:02 +0300 Subject: [PATCH 1498/3013] package/tbtools: install bash completion files and scripts Add hooks to install the bash completion files and scripts provided by the package. Signed-off-by: Mika Westerberg Signed-off-by: Thomas Petazzoni --- package/tbtools/tbtools.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/tbtools/tbtools.mk b/package/tbtools/tbtools.mk index 15766b67c77..baba0e8a3b4 100644 --- a/package/tbtools/tbtools.mk +++ b/package/tbtools/tbtools.mk @@ -10,4 +10,16 @@ TBTOOLS_LICENSE = MIT TBTOOLS_LICENSE_FILES = LICENSE TBTOOLS_DEPENDENCIES = udev +define TBTOOLS_INSTALL_SCRIPTS + $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr install-scripts +endef +TBTOOLS_POST_INSTALL_TARGET_HOOKS += TBTOOLS_INSTALL_SCRIPTS + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +define TBTOOLS_INSTALL_COMPLETION + $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr install-completion +endef +TBTOOLS_POST_INSTALL_TARGET_HOOKS += TBTOOLS_INSTALL_COMPLETION +endif + $(eval $(cargo-package)) From 04ed3f0aa06b0eb4424f4fbd37c4c5f962eee58c Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Tue, 18 Jun 2024 16:04:03 +0300 Subject: [PATCH 1499/3013] package/tbtools: allow 32-bit builds With the latest tbtools 32-bit builds should work too so drop this limitation. Signed-off-by: Mika Westerberg Signed-off-by: Thomas Petazzoni --- package/tbtools/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/tbtools/Config.in b/package/tbtools/Config.in index 9c27bf0e30e..0f8980decff 100644 --- a/package/tbtools/Config.in +++ b/package/tbtools/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_TBTOOLS depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_HAS_UDEV - # Fails to build on 32-bit systems - depends on BR2_ARCH_IS_64 select BR2_PACKAGE_HOST_RUSTC help tbtools is a collection of tools for Linux Thunderbolt/USB4 @@ -14,5 +12,4 @@ config BR2_PACKAGE_TBTOOLS comment "tbtools needs udev /dev management w/ glibc toolchain" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - depends on BR2_ARCH_IS_64 depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC From dd72e2102d401c4fe7b9d9cf39524a0ab814a816 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 10 Jul 2024 23:32:28 +0200 Subject: [PATCH 1500/3013] package/tcl: bump to version 8.6.14 For release note, see: https://sourceforge.net/projects/tcl/files/Tcl/8.6.14/tcltk-release-notes-8.6.14.txt This commit also drops the package patch, which is no longer needed. The upstream commit [1] completely removed the compatibility layer. The entry in ".checkpackageignore" is also removed. [1] https://github.com/tcltk/tcl/commit/04d66a25716cb7738dad3170cca4d0a4683db08a Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...001-Disable-tcl-compatibility-layers.patch | 35 ------------------- package/tcl/tcl.hash | 2 +- package/tcl/tcl.mk | 2 +- 4 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 package/tcl/0001-Disable-tcl-compatibility-layers.patch diff --git a/.checkpackageignore b/.checkpackageignore index 9eaf5b996d7..e539c0a15f7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1370,7 +1370,6 @@ package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch lib_p package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch lib_patch.Upstream package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch lib_patch.Upstream package/tcf-agent/S55tcf-agent Shellcheck lib_sysv.Variables -package/tcl/0001-Disable-tcl-compatibility-layers.patch lib_patch.Upstream package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch lib_patch.Upstream package/tftpd/S80tftpd-hpa Shellcheck lib_sysv.Indent lib_sysv.Variables package/ti-gfx/0001-newclkapi.patch lib_patch.Upstream diff --git a/package/tcl/0001-Disable-tcl-compatibility-layers.patch b/package/tcl/0001-Disable-tcl-compatibility-layers.patch deleted file mode 100644 index b7b776ad5dd..00000000000 --- a/package/tcl/0001-Disable-tcl-compatibility-layers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c829552921f0c7c8e522f911135ee100742b441b Mon Sep 17 00:00:00 2001 -From: Andrew Ruder -Date: Tue, 8 Apr 2014 15:54:04 -0500 -Subject: [PATCH] Disable tcl compatibility layers - -Turn off building compatibility layers for old/broken versions of -standard functions (strstr, strtoul, strtod) with the assumption that -anything buildroot is using as a standard C library will be good enough -to not have broken behavior. - -Signed-off-by: Andrew Ruder -[Fabrice: Update for 8.6.12] -Signed-off-by: Fabrice Fontaine -[Julien: Update for 8.6.13] -Signed-off-by: Julien Olivain ---- - unix/tcl.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index ca94abd4ad..42eb58d384 100644 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -2646,7 +2646,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ - #include - #include - int main() {]$2[}]]])],[tcl_cv_$1_unbroken=ok], -- [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) -+ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=ok])) - if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then - tcl_ok=1 - else --- -2.41.0 - diff --git a/package/tcl/tcl.hash b/package/tcl/tcl.hash index 109ea3d79c9..9e1f8fcaf51 100644 --- a/package/tcl/tcl.hash +++ b/package/tcl/tcl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 43a1fae7412f61ff11de2cfd05d28cfc3a73762f354a417c62370a54e2caf066 tcl8.6.13-src.tar.gz +sha256 5880225babf7954c58d4fb0f5cf6279104ce1cd6aa9b71e9a6322540e1c4de66 tcl8.6.14-src.tar.gz sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16 license.terms diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 18171aebd72..8968f0f2625 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -5,7 +5,7 @@ ################################################################################ TCL_VERSION_MAJOR = 8.6 -TCL_VERSION = $(TCL_VERSION_MAJOR).13 +TCL_VERSION = $(TCL_VERSION_MAJOR).14 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = TCL From 78cdfdb9cfaccec71582cd5dd8f05a9e04f799f9 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 10 Jul 2024 23:34:06 +0200 Subject: [PATCH 1501/3013] package/tk: bump to version 8.6.14 For release note, see: https://sourceforge.net/projects/tcl/files/Tcl/8.6.14/tcltk-release-notes-8.6.14.txt Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/tk/tk.hash | 2 +- package/tk/tk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tk/tk.hash b/package/tk/tk.hash index 968b351b41d..aee03a152e1 100644 --- a/package/tk/tk.hash +++ b/package/tk/tk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675 tk8.6.13-src.tar.gz +sha256 8ffdb720f47a6ca6107eac2dd877e30b0ef7fac14f3a84ebbd0b3612cee41a94 tk8.6.14-src.tar.gz sha256 2cde822b93ca16ae535c954b7dfe658b4ad10df2a193628d1b358f1765e8b198 license.terms diff --git a/package/tk/tk.mk b/package/tk/tk.mk index dfa7a7c694c..c8dd7bc32c1 100644 --- a/package/tk/tk.mk +++ b/package/tk/tk.mk @@ -5,7 +5,7 @@ ################################################################################ TK_VERSION_MAJOR = 8.6 -TK_VERSION = $(TK_VERSION_MAJOR).13 +TK_VERSION = $(TK_VERSION_MAJOR).14 TK_SOURCE = tk$(TK_VERSION)-src.tar.gz TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION) TK_LICENSE = TCL From cc8d4748937c4ed56c827feac19ed7f8fca55843 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 23:42:45 +0200 Subject: [PATCH 1502/3013] package/cmake: bump version to 3.30.0 Release notes: https://cmake.org/cmake/help/latest/release/3.29.html https://cmake.org/cmake/help/latest/release/3.30.html Updated license hash due to copyright year bump: https://gitlab.kitware.com/cmake/cmake/-/commit/4bc97565d0f97fa1a840d56ab58be46ccad175e0 and updated zlib version: https://gitlab.kitware.com/cmake/cmake/-/commit/6c2bed54f6610405e1a37aa48ff0f8d25f198076 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/cmake/Config.in.host | 10 ++++++++++ package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index c38bb9daaa9..389300f31fb 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -51,10 +51,20 @@ config BR2_HOST_CMAKE_AT_LEAST_3_28 bool select BR2_HOST_CMAKE_AT_LEAST_3_27 +config BR2_HOST_CMAKE_AT_LEAST_3_29 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_28 + +config BR2_HOST_CMAKE_AT_LEAST_3_30 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_29 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_HOST_CMAKE_AT_LEAST string + default "3.30" if BR2_HOST_CMAKE_AT_LEAST_3_30 + default "3.29" if BR2_HOST_CMAKE_AT_LEAST_3_29 default "3.28" if BR2_HOST_CMAKE_AT_LEAST_3_28 default "3.27" if BR2_HOST_CMAKE_AT_LEAST_3_27 default "3.26" if BR2_HOST_CMAKE_AT_LEAST_3_26 diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 74b4a0a3a80..ee6dab551ce 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.28/cmake-3.28.3-SHA-256.txt -sha256 72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1 cmake-3.28.3.tar.gz +# From https://cmake.org/files/v3.30/cmake-3.30.0-SHA-256.txt +sha256 157e5be6055c154c34f580795fe5832f260246506d32954a971300ed7899f579 cmake-3.30.0.tar.gz # Locally calculated -sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt +sha256 0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 49d1f9fea5a..eacecdc0eec 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y -CMAKE_VERSION_MAJOR = 3.28 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 +CMAKE_VERSION_MAJOR = 3.30 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From b0ad7f8dc66fe6e98391a1f9713ab98ecdf3d6f2 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Mon, 24 Jun 2024 12:26:10 -0700 Subject: [PATCH 1503/3013] package/alsa-plugins: bump version to 1.2.12 Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.11_v1.2.12#alsa-plugins Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- package/alsa-plugins/alsa-plugins.hash | 2 +- package/alsa-plugins/alsa-plugins.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash index 5d190e4d7ba..6943be62539 100644 --- a/package/alsa-plugins/alsa-plugins.hash +++ b/package/alsa-plugins/alsa-plugins.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511 alsa-plugins-1.2.7.1.tar.bz2 +sha256 7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2 alsa-plugins-1.2.12.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index d23a81c5eed..25ecc589fce 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_PLUGINS_VERSION = 1.2.7.1 +ALSA_PLUGINS_VERSION = 1.2.12 ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins ALSA_PLUGINS_LICENSE = LGPL-2.1+ From 48790b43296f45aa7f9f8c6701e94fe86269c241 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 25 Jun 2024 00:49:58 +0200 Subject: [PATCH 1504/3013] support/testing: add kmod runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_kmod.py | 97 +++++++++++++++++++ .../test_kmod/linux-virtio-net.fragment | 1 + 3 files changed, 100 insertions(+) create mode 100644 support/testing/tests/package/test_kmod.py create mode 100644 support/testing/tests/package/test_kmod/linux-virtio-net.fragment diff --git a/DEVELOPERS b/DEVELOPERS index abef5810757..6f8c33fb5b0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1845,6 +1845,8 @@ F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ +F: support/testing/tests/package/test_kmod.py +F: support/testing/tests/package/test_kmod/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ F: support/testing/tests/package/test_less.py diff --git a/support/testing/tests/package/test_kmod.py b/support/testing/tests/package/test_kmod.py new file mode 100644 index 00000000000..1d9ea535fc8 --- /dev/null +++ b/support/testing/tests/package/test_kmod.py @@ -0,0 +1,97 @@ +import os + +import infra.basetest + + +class TestKmod(infra.basetest.BRTest): + # This test uses the "virtio_net" driver compiled as a module. We + # need to recompile a Kernel for that. + kernel_fragment = \ + infra.filepath("tests/package/test_kmod/linux-virtio-net.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.35" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_KMOD=y + BR2_PACKAGE_KMOD_TOOLS=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # We check the kmod program can run. Busybox does not have a + # kmod applet, so there is no possible confusion. + self.assertRunOk("kmod --version") + + # We check the "modprobe" is the one from kmod, rather than + # the Busybox applet version. + out, ret = self.emulator.run("modprobe --version") + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith("kmod version")) + + # List modules with "kmod list", the virtio-net module should + # NOT be loaded yet. + out, ret = self.emulator.run("kmod list") + self.assertEqual(ret, 0) + self.assertNotIn("virtio_net", "\n".join(out)) + + # Get module info with modinfo. + out, ret = self.emulator.run("modinfo virtio-net") + self.assertEqual(ret, 0) + lsmod_out = "\n".join(out) + self.assertRegex(lsmod_out, r'name: *virtio_net') + self.assertRegex(lsmod_out, r'description: *Virtio network driver') + + # With this test configuration, we are not supposed to have an + # eth0 Ethernet interface yet. Attempting to show info on this + # interface is expected to fail . + _, ret = self.emulator.run("ip link show dev eth0") + self.assertNotEqual(ret, 0) + + # We try to load the module. + self.assertRunOk("modprobe virtio-net") + + # We should now see the module in the list. This time, we use + # the "lsmod" command. + out, ret = self.emulator.run("lsmod") + self.assertEqual(ret, 0) + self.assertIn("virtio_net", "\n".join(out)) + + # The eth0 interface is supposed to be available, after the + # module loading. We configure the emulator user network to + # test the driver networking functionality. See: + # https://wiki.qemu.org/Documentation/Networking + self.assertRunOk("ip addr add dev eth0 10.0.2.15/24") + self.assertRunOk("ip link set dev eth0 up") + + # We check we can ping the emulator. + ping_cmd = "ping -i 0.3 -c 2 10.0.2.2" + self.assertRunOk(ping_cmd) + + # We check we can unload the driver. + self.assertRunOk("modprobe -r virtio-net") + + # Now the driver is unloaded, we should no longer be able to + # ping the emulator. + _, ret = self.emulator.run(ping_cmd) + self.assertNotEqual(ret, 0) diff --git a/support/testing/tests/package/test_kmod/linux-virtio-net.fragment b/support/testing/tests/package/test_kmod/linux-virtio-net.fragment new file mode 100644 index 00000000000..170da19d65d --- /dev/null +++ b/support/testing/tests/package/test_kmod/linux-virtio-net.fragment @@ -0,0 +1 @@ +CONFIG_VIRTIO_NET=m From 0ffff6106cd2686cb08cfe2a60d7900929270af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Mon, 24 Jun 2024 11:19:39 +0200 Subject: [PATCH 1505/3013] configs/arm_foundationv8: bump to Linux 6.8.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel to v6.8.10. - Bump the FVP in the readme to version 11.25 build 15. Signed-off-by: Vincent Stehlé Cc: Masahiro Yamada Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- .../foundation-v8/patches/linux-headers/linux-headers.hash | 1 + board/arm/foundation-v8/patches/linux/linux.hash | 2 ++ board/arm/foundation-v8/readme.txt | 2 +- configs/arm_foundationv8_defconfig | 7 ++++--- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 120000 board/arm/foundation-v8/patches/linux-headers/linux-headers.hash create mode 100644 board/arm/foundation-v8/patches/linux/linux.hash diff --git a/board/arm/foundation-v8/patches/linux-headers/linux-headers.hash b/board/arm/foundation-v8/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/arm/foundation-v8/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/arm/foundation-v8/patches/linux/linux.hash b/board/arm/foundation-v8/patches/linux/linux.hash new file mode 100644 index 00000000000..559b53be2d3 --- /dev/null +++ b/board/arm/foundation-v8/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b0bb92d982f88380e5b2059349c3a862e0afa712e0646eb0e082b9c2c5cb5176 linux-6.8.10.tar.xz diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index cb0fe08b875..701cf3ceb0a 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,7 +3,7 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz + https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FM_11_25/Foundation_Platform_11.25_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 102fe8fd09b..69266894e16 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,10 +1,11 @@ BR2_aarch64=y -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_GLOBAL_PATCH_DIR="board/arm/foundation-v8/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" From 94daade68dda0a3617702903391f515d2ffdef3b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 2 Jul 2024 20:59:43 +0200 Subject: [PATCH 1506/3013] package/daq: workaround for upstream changing the archive Upstream has changed the archive for the 2.0.7 release since we bumped in c1f820bd88a5 (package/daq: bump version to 2.0.7). Comparing the old archive as it is on s.b.o. with the one currently available on upstream, gives a few deltas, mostly; - (C) years changed in comments - version string changed from 2.0.6 to 2.0.7 - changes (that look legit) to autostuff - a file dropped (Visual Studio related) Of course, that means the hashes changed, and no longer match what we have. Downloading the file manually and letting wget set the timestamp on it, reveals the archive is dated 2022-06-08T13:51:59. So, for more than two years now, we've been relying on the archive we cached on s.b.o. So, we can't just change the hashes to the new ones, nor can we replace the archive on s.b.o. Instead, we use the same trick as was used in c617ebbc977d (package/python-*: fix hashes for cargo-vendored python packages): we use the actual, real URL with a query parameter as the _SITE, and we set _SOURCE to a different name so as not to conflict with the previous archive. Signed-off-by: Yann E. MORIN Cc: Yoann Congal Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9e00cceb60e9ac8ec36ec7eb43eb9ef5534b705d) Signed-off-by: Peter Korsgaard --- package/daq/daq.hash | 4 ++-- package/daq/daq.mk | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/daq/daq.hash b/package/daq/daq.hash index 0fa1edecc2c..82323ed4044 100644 --- a/package/daq/daq.hash +++ b/package/daq/daq.hash @@ -1,7 +1,7 @@ # From https://www.snort.org/downloads/snort/md5s -md5 ea796f001d1b00302e4e69e337ab2460 daq-2.0.7.tar.gz +md5 60e5ddcafb985fac7374884d28f299d1 daq-2.0.7-modified.tar.gz # Locally computed: -sha256 bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e daq-2.0.7.tar.gz +sha256 d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279 daq-2.0.7-modified.tar.gz # Hash for license files: sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING diff --git a/package/daq/daq.mk b/package/daq/daq.mk index 8a5394a63c0..27abd4d2f51 100644 --- a/package/daq/daq.mk +++ b/package/daq/daq.mk @@ -5,7 +5,11 @@ ################################################################################ DAQ_VERSION = 2.0.7 -DAQ_SITE = https://www.snort.org/downloads/snort +# Upstream re-published a modified archive for the same 2.0.7 version, so change +# its name locally, to avoid conflict with older BR versions which had a hash +# for the previous archive. +DAQ_SOURCE = daq-2.0.7-modified.tar.gz +DAQ_SITE = https://www.snort.org/downloads/snort/daq-$(DAQ_VERSION).tar.gz?buildroot-path=filename DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES From 623bd47c26caa72e772d9ccb073eb806fae950ea Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 24 Jun 2024 20:05:19 +0200 Subject: [PATCH 1507/3013] configs/spike_riscv64: remove no longer needed kernel fragment Buildroot commit [1] updated riscv-isa-sim (Spike), which now includes a NS16550 uart emulation. The Kernel config fragment was introduced to work with older HTIF interface from Spike. For more information about the HTIF/NS16550 in Spike, see the commit log [2]. This commit removes this Kernel config fragment, since it is no longer needed. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/853b7661bf5ddca5d4b81964ef1a19a133beac85 [2] https://gitlab.com/buildroot.org/buildroot/-/commit/38c581b05cd8e7967783410b36c14b9b561acd12 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- board/spike/riscv64/linux.fragment | 3 --- configs/spike_riscv64_defconfig | 1 - 2 files changed, 4 deletions(-) delete mode 100644 board/spike/riscv64/linux.fragment diff --git a/board/spike/riscv64/linux.fragment b/board/spike/riscv64/linux.fragment deleted file mode 100644 index b443b0ab364..00000000000 --- a/board/spike/riscv64/linux.fragment +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_RISCV_SBI_V01=y -CONFIG_HVC_RISCV_SBI=y -CONFIG_SERIAL_EARLYCON_RISCV_SBI=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index b4b3d6e3d5a..fa8cba42755 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -4,7 +4,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.26" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/spike/riscv64/linux.fragment" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set From df75cdfe4c372a018f7c2b5d507a7a00cb0d7941 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 Jul 2024 22:45:18 +0200 Subject: [PATCH 1508/3013] gitlab: add default issue template This introduces the default issue template, to help users provide issues that are meaningful, and that will help reproduce the issue. If needed, we can add more templates in the future. Signed-off-by: Yann E. MORIN [Arnout: - add link to mailing list; - rephrase "pristine Buildroot"; - add a checklist item for "I'm using latest commit"; - add a checklist item for "make clean; make"; - add formal items for Buildroot commit sha1 and distro.] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 32aacc4737e106a7ddb2f2129d4ab9f2279dcf92) Signed-off-by: Peter Korsgaard --- .gitlab/issue_templates/default.md | 60 ++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .gitlab/issue_templates/default.md diff --git a/.gitlab/issue_templates/default.md b/.gitlab/issue_templates/default.md new file mode 100644 index 00000000000..c3f23e54ba7 --- /dev/null +++ b/.gitlab/issue_templates/default.md @@ -0,0 +1,60 @@ +Thank you for opening a new issue. To help solve it faster and more easily, +please review this check-list, and fill in the sections below. Adapt as +needed. + +Do not open an issue to request a new feature; instead, post a message to +[the mailing list](https://lists.buildroot.org/mailman/listinfo/buildroot). + +_Note: issues missing any information may get closed without further ado._ + +--- +### Check-list + +- [ ] I did not find the issue in the existing issues +- [ ] I can reproduce the issue with unmodified Buildroot from [this + repository](https://gitlab.com/buildroot.org/buildroot), not from a + fork somewhere else +- [ ] I can reproduce the issue on the latest commit of the branch I'm using: + - [ ] master + - [ ] stable (i.e. 20NN.MM.x - please specify) + - [ ] LTS (i.e. 20NN.02.x - please specify) +- [ ] I can reproduce the issue after running `make clean; make` +- [ ] I attached the full build log file (e.g. `make 2>&1 |tee build.log`) +- [ ] I attached a **minimal** defconfig file that can reproduce the + issue (`make BR2_DEFCONFIG=$(pwd)/issue_defconfig savedefconfig`) +- [ ] I also attached the configuration for kconfig-based packages that + are enabled (and necessary to reproduce the issue), most notably: + - [ ] busybox + - [ ] linux + - [ ] uclibc + - [ ] uboot + - [ ] … + +--- +### What I did + +**Buildroot commit sha1**: _get this with `git describe HEAD`_ +**Distribution of the build machine**: _get this with `NAME` and `VERSION` from `/etc/os-release`_ + +_Here, describe what you did:_ +- _any special environment variables: CC, CXX, TARGET, CROSS_COMPILE, etc…_ +- _the commands you ran:_ + ```sh + $ make [...] + ``` +- _anything else that you might think is important…_ + +--- +### What happens + +_Here, describe what happens that you believe was incorrect._ + +--- +### What was expected + +_Here, describe the behaviour you expected._ + +--- +### Extra information + +_Here, you may write additional information that does not fit above_ From a2f6d71e55e8924f0ae17c5f5050ed3b87ffaec0 Mon Sep 17 00:00:00 2001 From: Lance Fredrickson Date: Sun, 23 Jun 2024 16:03:47 -0600 Subject: [PATCH 1509/3013] package/linux-firmware: add WiFi and BT firmware for MT7925 Signed-off-by: Lance Fredrickson Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 10 ++++++++++ package/linux-firmware/linux-firmware.mk | 14 ++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index fa08b342f1c..1f00afe4e87 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -79,6 +79,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT help Firmware files for MediaTek MT7922 bluetooth support +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7925_BT + bool "MediaTek MT7925" + help + Firmware files for MediaTek MT7925 bluetooth support + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT bool "Qualcomm Atheros Rome 6174A Bluetooth" help @@ -444,6 +449,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922 help MediaTek MT7922 +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7925 + bool "MediaTek MT7925" + help + MediaTek MT7925 + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174 bool "Qualcomm Atheros 6174" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index ecf27e16424..beab3749653 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -404,6 +404,20 @@ LINUX_FIRMWARE_FILES += mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek endif +# MT7925 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7925),y) +LINUX_FIRMWARE_FILES += \ + mediatek/mt7925/WIFI_MT7925_PATCH_MCU_1_1_hdr.bin \ + mediatek/mt7925/WIFI_RAM_CODE_MT7925_1_1.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek +endif + +# Mediatek MT7925 Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7925_BT),y) +LINUX_FIRMWARE_FILES += mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek +endif + # qca6174 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y) LINUX_FIRMWARE_FILES += ath10k/QCA6174 From 74ebd50ccc6681ef2e07896b8f16afb122db099d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 21 Jun 2024 23:09:04 +0200 Subject: [PATCH 1510/3013] package/python-pyalsa: bump to version 1.2.12 For change log since 1.2.7, see: - https://github.com/alsa-project/alsa-python/releases/tag/v1.2.12 This commit also adds a comment about the pgp signature check in the hash file. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/python-pyalsa/python-pyalsa.hash | 6 ++++-- package/python-pyalsa/python-pyalsa.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/python-pyalsa/python-pyalsa.hash b/package/python-pyalsa/python-pyalsa.hash index d4cfe0d61f8..206107d29ad 100644 --- a/package/python-pyalsa/python-pyalsa.hash +++ b/package/python-pyalsa/python-pyalsa.hash @@ -1,2 +1,4 @@ -# Locally computed -sha256 67d8f99f1ccf23e7ebdfa2c3be0b09f147949fd9511d1e6748b7f412ef046e1f pyalsa-1.2.7.tar.bz2 +# Locally computed, after checking pgp signature from: +# https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.2.12.tar.bz2.sig +# with key F04DF50737AC1A884C4B3D718380596DA6E59C91 +sha256 8abeaf41e5f48f617a52d1078932da89ab303d4a1d8f9919f947bdb1b7d03f50 pyalsa-1.2.12.tar.bz2 diff --git a/package/python-pyalsa/python-pyalsa.mk b/package/python-pyalsa/python-pyalsa.mk index 1661fe47b49..19d2c91d237 100644 --- a/package/python-pyalsa/python-pyalsa.mk +++ b/package/python-pyalsa/python-pyalsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYALSA_VERSION = 1.2.7 +PYTHON_PYALSA_VERSION = 1.2.12 PYTHON_PYALSA_SOURCE = pyalsa-$(PYTHON_PYALSA_VERSION).tar.bz2 PYTHON_PYALSA_SITE = https://www.alsa-project.org/files/pub/pyalsa PYTHON_PYALSA_SETUP_TYPE = setuptools From 295ba8991537a26060cd47421240239fb111b694 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 21 Jun 2024 23:44:47 +0200 Subject: [PATCH 1511/3013] package/highway: bump to version 1.2.0 For release note, see: - https://github.com/google/highway/releases/tag/1.2.0 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/highway/highway.hash | 2 +- package/highway/highway.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 270131134ec..5addf50eee7 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz +sha256 7e0be78b8318e8bdbf6fa545d2ecb4c90f947df03f7aadc42c1967f019e63343 highway-1.2.0.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 diff --git a/package/highway/highway.mk b/package/highway/highway.mk index 3eb0d7a4aa2..a74bc90dd36 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.1.0 +HIGHWAY_VERSION = 1.2.0 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 From 916f9bb1a3d1422c80bb37fa096f361fe1e75212 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Wed, 19 Jun 2024 10:55:40 +0300 Subject: [PATCH 1512/3013] package/rtl8822cs: bump driver version to latest - Update driver for kernel 6.9+ - Fix warning/errors on build Fixes: http://autobuild.buildroot.net/results/82dd4d986c0ddfb48e7316473186ef4c9d8ee783 Signed-off-by: Viacheslav Bocharov Signed-off-by: Thomas Petazzoni --- package/rtl8822cs/rtl8822cs.hash | 2 +- package/rtl8822cs/rtl8822cs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8822cs/rtl8822cs.hash b/package/rtl8822cs/rtl8822cs.hash index 34bcc412ce3..53fc06cca51 100644 --- a/package/rtl8822cs/rtl8822cs.hash +++ b/package/rtl8822cs/rtl8822cs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d61fff0ee8b4219a6441791ff26be1b8c49ef8b2ca78345bf12b7a0541f498e9 rtl8822cs-fda6cd263e89567272060e6182a39aee20b894c4.tar.gz +sha256 9aea86233848e9edb497b27614c78680f7bb1962579d4b05333d9c1a189c62fe rtl8822cs-40450f759c8a930d271b5f0a663685f412debc72.tar.gz diff --git a/package/rtl8822cs/rtl8822cs.mk b/package/rtl8822cs/rtl8822cs.mk index dbdc7d84bf4..223d232c8dc 100644 --- a/package/rtl8822cs/rtl8822cs.mk +++ b/package/rtl8822cs/rtl8822cs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8822CS_VERSION = fda6cd263e89567272060e6182a39aee20b894c4 +RTL8822CS_VERSION = 40450f759c8a930d271b5f0a663685f412debc72 RTL8822CS_SITE = $(call github,jethome-ru,rtl88x2cs,$(RTL8822CS_VERSION)) RTL8822CS_LICENSE = GPL-2.0 From f0a024533f2caf74e705850429d07b8df3efae79 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 11 Jul 2024 00:06:44 +0200 Subject: [PATCH 1513/3013] package/pinentry: bump to version 1.3.1 For change log, see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=blob;f=NEWS;h=a07d18953341a4eb65c9873e64c06bc7c642606d Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/pinentry/pinentry.hash | 4 ++-- package/pinentry/pinentry.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pinentry/pinentry.hash b/package/pinentry/pinentry.hash index 9c54520da6c..3f02eec737c 100644 --- a/package/pinentry/pinentry.hash +++ b/package/pinentry/pinentry.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 28effa1722865786cb984f3099a32db40f96ea26 pinentry-1.3.0.tar.bz2 -sha256 9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de pinentry-1.3.0.tar.bz2 +sha1 fb0bbb88211558c8f7e652b4b6a675b1972fba04 pinentry-1.3.1.tar.bz2 +sha256 bc72ee27c7239007ab1896c3c2fae53b076e2c9bd2483dc2769a16902bce8c04 pinentry-1.3.1.tar.bz2 # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk index b49037c91be..7482a93d02a 100644 --- a/package/pinentry/pinentry.mk +++ b/package/pinentry/pinentry.mk @@ -4,7 +4,7 @@ # ################################################################################ -PINENTRY_VERSION = 1.3.0 +PINENTRY_VERSION = 1.3.1 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry PINENTRY_LICENSE = GPL-2.0+ From d19fb80b36b4accd1f1d998e1f4b8742d3e2189e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 6 Jul 2024 13:06:42 +0200 Subject: [PATCH 1514/3013] configs/visionfive2: fix build by adding kernel header version commit d9e6d2d081 "configs/visionfive2: update kernel to upstream 6.8.2" removed the config directive: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y but forgot to add: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y It was most likely generated with a "make savedefconfig", while Linux kernel v6.8 was the default at that time. After commit aa70c331a2 "linux: bump latest version to 6.9", the defconfig failed to build with error: Incorrect selection of kernel headers: expected 6.9.x, got 6.8.x This commit fixes the defconfig by adding back the kernel custom header version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7271150175 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 1da5466bab46b20a4ebbc28cfdbba9135775ae6d) Signed-off-by: Peter Korsgaard --- configs/visionfive2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index dae9608eeb1..18e0997f19d 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -1,4 +1,5 @@ BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y BR2_GLOBAL_PATCH_DIR="board/visionfive2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" From 0660fb5ed89e59bd4ae0f499f0d1054d2b31f1eb Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 8 Jul 2024 22:21:17 +0200 Subject: [PATCH 1515/3013] package/network-manager: allow building with musl NetworkManager officially supports building with musl since version 1.30, so the restriction to glibc toolchain is no longer necessary. [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/4f7c04eaf94849d0455e97ba9bcfdd0b84e6459d/NEWS#L615 Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni (cherry picked from commit 8df68d2bb454ff22a32c598e343e63cd7e3c02f6) Signed-off-by: Peter Korsgaard --- package/network-manager/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 57d7543131a..1d9a02c1d3b 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_DBUS @@ -59,10 +59,11 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS This option enables support for OpenVSwitch endif -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" +comment "NetworkManager needs udev /dev management and a glibc or musl toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 || \ - !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 5777bfc0f72db4de0315b753b2a064f017b3d652 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 11 Jul 2024 10:31:56 +0300 Subject: [PATCH 1516/3013] package/libgeos: bump version to 3.12.2 Changelog: https://github.com/libgeos/geos/releases/tag/3.12.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 37fe7d6d231..362f1c10b66 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03 geos-3.12.1.tar.bz2 +sha256 34c7770bf0090ee88488af98767d08e779f124fa33437e0aabec8abd4609fec6 geos-3.12.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 491168324ff..05b74b60a2c 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.12.1 +LIBGEOS_VERSION = 3.12.2 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From 9a71dd347a3ab1b21960455aff097b34536fb725 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 08:56:29 +0200 Subject: [PATCH 1517/3013] package/php: bump version to 8.3.9 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/432 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 677c3f2995b4e6acaedcecc699b5f6ddf294f524) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index cd5f8a1c1bd..59a82b001d0 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 aea358b56186f943c2bbd350c9005b9359133d47e954cfc561385319ae5bb8d7 php-8.3.8.tar.xz +sha256 bf4d7b8ea60a356064f88485278bd6f941a230ec16f0fc401574ce1445ad6c77 php-8.3.9.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 268b8e0a62e..3fdce8186a1 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.8 +PHP_VERSION = 8.3.9 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 077861ec24a63a4d71444c439e72cb6cac936134 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 08:59:13 +0200 Subject: [PATCH 1518/3013] package/apache: security bump version to 2.4.61 Fixes CVE-2024-39884. Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.61 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 158c2a000404cfcb3a216054c686d11454a5ef7f) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index bd503d84f91..2ed9c17f9a7 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.59.tar.bz2.{sha256,sha512} -sha256 7b1ec7ec5635da7cb01550513215a90f8b2f52bb7c90cf3e97ede936d3e55b0f httpd-2.4.60.tar.bz2 -sha512 c1591389f76699beaa5d32b019729e25f1ed5b828311c82b52f1a4edd5d28b73e697958df384d7628b314521a831dbb0af418bc37cdf031cfe133e53c195d8ad httpd-2.4.60.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.61.tar.bz2.{sha256,sha512} +sha256 ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6 httpd-2.4.61.tar.bz2 +sha512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff httpd-2.4.61.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 39ccc3cf967..0319a968153 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.60 +APACHE_VERSION = 2.4.61 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 7b3d3e52ac51acd774bd9d7ae189a56cda131e5c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 11 Jul 2024 12:21:50 +0200 Subject: [PATCH 1519/3013] Revert "package/libopenssl: no-engine" This reverts commit c366ecb95e154ef7cc84179915d68654c8c96737. While the change is correct, it causes quite some fallout from packages using the ENGINE_* API functions without selecting BR2_PACKAGE_LIBOPENSSL_ENGINES, so drop it from the stable branch. Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 89a9189bb85..fe472e2c7a1 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -85,7 +85,6 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-afl \ no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_BIN),,no-apps) \ - $(if $(BR2_PACKAGE_LIBOPENSSL_ENGINES),,no-engine) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ From b4008cf9a61a953c0b7c13d5bbb7931f251f7295 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Mon, 17 Jun 2024 16:10:17 +0100 Subject: [PATCH 1520/3013] package/pahole: bump to version 1.27 https://git.kernel.org/pub/scm/devel/pahole/pahole.git/tree/NEWS?h=v1.27 Signed-off-by: Francis Laniel Signed-off-by: Thomas Petazzoni --- package/pahole/pahole.hash | 2 +- package/pahole/pahole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pahole/pahole.hash b/package/pahole/pahole.hash index 9dc676d9f4d..a2d3d044da8 100644 --- a/package/pahole/pahole.hash +++ b/package/pahole/pahole.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 db31d13c3dad8d9f4e38296bd35c4586e98b9c950e07dabba212985e6d051631 pahole-1.25.tar.gz +sha256 87223298d4f8f9ada9b3cc5cef1bedd7aeb447cd8295abc466e009a26accff13 pahole-1.27.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pahole/pahole.mk b/package/pahole/pahole.mk index 1a3e156ebbb..ffbe4ff9258 100644 --- a/package/pahole/pahole.mk +++ b/package/pahole/pahole.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHOLE_VERSION = 1.25 +PAHOLE_VERSION = 1.27 PAHOLE_SITE = https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot HOST_PAHOLE_DEPENDENCIES = \ host-elfutils \ From 77c62cfc75f0fe2779ecb108bbc2b3e41639b042 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Mon, 17 Jun 2024 16:10:18 +0100 Subject: [PATCH 1521/3013] package/tbb: bump to version 2021.12.0 Signed-off-by: Francis Laniel Signed-off-by: Thomas Petazzoni --- package/tbb/tbb.hash | 2 +- package/tbb/tbb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tbb/tbb.hash b/package/tbb/tbb.hash index 4d2cb10da88..14c86068eec 100644 --- a/package/tbb/tbb.hash +++ b/package/tbb/tbb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363 tbb-2021.11.0.tar.gz +sha256 c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f tbb-2021.12.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/tbb/tbb.mk b/package/tbb/tbb.mk index 1b0afbb8896..40fcb66d388 100644 --- a/package/tbb/tbb.mk +++ b/package/tbb/tbb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBB_VERSION = 2021.11.0 +TBB_VERSION = 2021.12.0 TBB_SITE = $(call github,01org,tbb,v$(TBB_VERSION)) TBB_INSTALL_STAGING = YES TBB_LICENSE = Apache-2.0 From bb1987940edffc068cccf01c4dddbf7f01a1e535 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Thu, 11 Jul 2024 16:48:10 +0200 Subject: [PATCH 1522/3013] package/ltris: bump version to 1.3.2 As requested by Buildroot's autobuilder tracking outdated packages. Build tested with: $ ./utils/test-pkg -c ltris.config -p ltris -a arm-aarch64 [ 1/41]: OK bootlin-aarch64-glibc [ 2/41]: OK bootlin-arcle-hs38-uclibc [ 3/41]: OK bootlin-armv5-uclibc [ 4/41]: OK bootlin-armv7-glibc [ 5/41]: OK bootlin-armv7m-uclibc [ 6/41]: SKIPPED bootlin-armv7-musl [ 7/41]: OK bootlin-m68k-5208-uclibc [ 8/41]: SKIPPED bootlin-m68k-68040-uclibc [ 9/41]: OK bootlin-microblazeel-uclibc [10/41]: OK bootlin-mipsel32r6-glibc [11/41]: OK bootlin-mipsel-uclibc [12/41]: OK bootlin-nios2-glibc [13/41]: OK bootlin-openrisc-uclibc [14/41]: OK bootlin-powerpc64le-power8-glibc [15/41]: OK bootlin-powerpc-e500mc-uclibc [16/41]: OK bootlin-riscv32-glibc [17/41]: OK bootlin-riscv64-glibc [18/41]: OK bootlin-riscv64-musl [19/41]: OK bootlin-s390x-z13-glibc [20/41]: OK bootlin-sh4-uclibc [21/41]: OK bootlin-sparc64-glibc [22/41]: OK bootlin-sparc-uclibc [23/41]: OK bootlin-x86-64-glibc [24/41]: OK bootlin-x86-64-musl [25/41]: OK bootlin-x86-64-uclibc [26/41]: OK bootlin-x86-i686-musl [27/41]: OK bootlin-xtensa-uclibc [28/41]: OK br-arm-basic [29/41]: OK br-arm-full-nothread [30/41]: OK br-arm-full-static [31/41]: OK br-i386-pentium4-full [32/41]: OK br-mips64-n64-full [33/41]: OK br-mips64r6-el-hf-glibc [34/41]: OK br-powerpc-603e-basic-cpp [35/41]: OK br-powerpc64-power7-glibc [36/41]: OK linaro-aarch64-be [37/41]: OK linaro-aarch64 [38/41]: OK linaro-arm [39/41]: OK sourcery-mips64 [40/41]: OK sourcery-mips [41/41]: OK 41 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed $ cat ltris.config BR2_PACKAGE_LTRIS=y BR2_PACKAGE_LTRIS_AUDIO=y Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni --- package/ltris/ltris.hash | 2 +- package/ltris/ltris.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ltris/ltris.hash b/package/ltris/ltris.hash index abe6853d9b5..3b2043a2c86 100644 --- a/package/ltris/ltris.hash +++ b/package/ltris/ltris.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1291c6a642d06b9ee153ac0a2e7855a2c983e839c618f1a294df04d829525cb0 ltris-1.2.7.tar.gz +sha256 ff28c55a18c61f28a86ba7f30f13222dfed0f7fbeb492acd95c97de9c659cec9 ltris-1.3.2.tar.gz sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index b34ac142ce1..6ebaa74294d 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -5,7 +5,7 @@ ################################################################################ LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris -LTRIS_VERSION = 1.2.7 +LTRIS_VERSION = 1.3.2 LTRIS_LICENSE = GPL-2.0+ LTRIS_LICENSE_FILES = COPYING From 01f35f8875acc98adb670d789b256790e2418be8 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 11 Jul 2024 19:51:03 +0200 Subject: [PATCH 1523/3013] package/snappy: fix compilation error raised by vqtbl1q_u8 instruction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The package compilation for the raspberrypi3_qt5we_defconfig raises the following error: In file included from buildroot/output/build/snappy-1.1.10/snappy.cc:29: buildroot/output/build/snappy-1.2.1/snappy-internal.h: In function ‘snappy::internal::V128 snappy::internal::V128_Shuffle(V128, V128)’: buildroot/output/build/snappy-1.2.1/snappy-internal.h:109:10: error: ‘vqtbl1q_u8’ was not declared in this scope; did you mean ‘vtbl1_u8’? 109 | return vqtbl1q_u8(input, shuffle_mask); | ^~~~~~~~~~ | vtbl1_u8 make[4]: *** [CMakeFiles/snappy.dir/build.make:118: CMakeFiles/snappy.dir/snappy.cc.o] Error 1 The issue was raised by commit b3fb0b5b4b076 ("Enable vector byte shuffle optimizations on ARM NEON") contained in version 1.1.10. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...error-raised-by-vqtbl1q_u8-instructi.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch diff --git a/package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch b/package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch new file mode 100644 index 00000000000..b10ea7ecdfb --- /dev/null +++ b/package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch @@ -0,0 +1,52 @@ +From 284d5a6f267d4962b2b88540f218c10740a6c053 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sat, 8 Jun 2024 18:42:16 +0200 +Subject: [PATCH] Fix compilation error raised by vqtbl1q_u8 instruction +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The compilation in Buildroot for the raspberrypi3_qt5we_defconfig +configuration: + +make raspberrypi3_qt5we_defconfig +make + +raises the following error: + +In file included from buildroot/output/build/snappy-1.2.1/snappy.cc:29: +buildroot/output/build/snappy-1.2.1/snappy-internal.h: In function ‘snappy::internal::V128 snappy::internal::V128_Shuffle(V128, V128)’: +buildroot/output/build/snappy-1.2.1/snappy-internal.h:109:10: error: ‘vqtbl1q_u8’ was not declared in this scope; did you mean ‘vtbl1_u8’? + 109 | return vqtbl1q_u8(input, shuffle_mask); + | ^~~~~~~~~~ + | vtbl1_u8 +make[4]: *** [CMakeFiles/snappy.dir/build.make:118: CMakeFiles/snappy.dir/snappy.cc.o] Error 1 + +As reported by [1], the vqtbl1q_u8 instruction is supported by A64 +architectures. For this reason, the patch enables the use of the +instruction only for NEON of such architecture. + +[1] https://developer.arm.com/architectures/instruction-sets/intrinsics/vqtbl1q_u8 + +Signed-off-by: Dario Binacchi +Upstream: https://github.com/google/snappy/pull/185 +--- + snappy-internal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snappy-internal.h b/snappy-internal.h +index ae78247dbbc9..256d32344d1a 100644 +--- a/snappy-internal.h ++++ b/snappy-internal.h +@@ -46,7 +46,7 @@ + #include + #endif + +-#if SNAPPY_HAVE_SSSE3 || SNAPPY_HAVE_NEON ++#if SNAPPY_HAVE_SSSE3 || (SNAPPY_HAVE_NEON && defined(__aarch64__)) + #define SNAPPY_HAVE_VECTOR_BYTE_SHUFFLE 1 + #else + #define SNAPPY_HAVE_VECTOR_BYTE_SHUFFLE 0 +-- +2.43.0 + From a2b7e3c40321a8c7e78a2ef652dcc0d9d881a414 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 11 Jul 2024 19:51:04 +0200 Subject: [PATCH 1524/3013] package/snappy: bump to version 1.2.1 Release notes: https://github.com/google/snappy/releases/tag/1.2.1 https://github.com/google/snappy/releases/tag/1.2.0 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/snappy/snappy.hash | 2 +- package/snappy/snappy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index 729d696d7e6..0439ca8a7ef 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90 snappy-1.1.10.tar.gz +sha256 736aeb64d86566d2236ddffa2865ee5d7a82d26c9016b36218fcc27ea4f09f86 snappy-1.2.1.tar.gz sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index c96dff35fa0..21c76cd50da 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.10 +SNAPPY_VERSION = 1.2.1 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING From 2598a0cffcc6c1c607720d436337bafc68a2dac0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 09:02:58 +0200 Subject: [PATCH 1525/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2389fb5bbb1adfe37c4b21c4127006dee1dba25a) [Peter: drop 6.9.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 9374af71b0d..37e1a590325 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz -sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz -sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz +sha256 f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214 linux-6.6.37.tar.xz +sha256 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af linux-6.1.97.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 linux-5.15.160.tar.xz -sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz -sha256 7e1f5b28588e49ddfd18e7772476e4e8b52bdc9c3e19beafcbb7c103e6c01f51 linux-5.4.277.tar.xz +sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz +sha256 da1dd47febac4f7856654038a47703666da3afba348b8e96e39584e0972e2725 linux-5.10.221.tar.xz +sha256 b298436b26395b5c3ace6963836ba70d57cd61e01cff254b0e5443636c324a5e linux-5.4.279.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.315.tar.xz +sha256 062b70cc132378e1c685df44ddf7e05bab4752b690ada17b080655a63f993581 linux-4.19.317.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 487d941a16f..9eff2fec9cd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -415,12 +415,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.315" if BR2_KERNEL_HEADERS_4_19 - default "5.4.277" if BR2_KERNEL_HEADERS_5_4 - default "5.10.218" if BR2_KERNEL_HEADERS_5_10 - default "5.15.160" if BR2_KERNEL_HEADERS_5_15 - default "6.1.93" if BR2_KERNEL_HEADERS_6_1 - default "6.6.33" if BR2_KERNEL_HEADERS_6_6 + default "4.19.317" if BR2_KERNEL_HEADERS_4_19 + default "5.4.279" if BR2_KERNEL_HEADERS_5_4 + default "5.10.221" if BR2_KERNEL_HEADERS_5_10 + default "5.15.162" if BR2_KERNEL_HEADERS_5_15 + default "6.1.97" if BR2_KERNEL_HEADERS_6_1 + default "6.6.37" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From a11afff771736eacfadbbbc002c39896e0831c9c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Jul 2024 11:27:24 +0200 Subject: [PATCH 1526/3013] package/znc: security bump version to 1.9.1 Fixes CVE-2024-39844. Changelog: https://wiki.znc.in/ChangeLog/1.9.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 01becd31ca25a6be311544e4f6c7f7131b2f7689) Signed-off-by: Peter Korsgaard --- package/znc/znc.hash | 2 +- package/znc/znc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/znc/znc.hash b/package/znc/znc.hash index 8d59c7a1dc8..7bac128af90 100644 --- a/package/znc/znc.hash +++ b/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8b99c9dbb21c1309705073460be9bfacb6f7b0e83a15fe5d4b7140201b39d2a1 znc-1.9.0.tar.gz +sha256 e8a7cf80e19aad510b4e282eaf61b56bc30df88ea2e0f64fadcdd303c4894f3c znc-1.9.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/znc/znc.mk b/package/znc/znc.mk index a9106551959..ec6287e6dee 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.9.0 +ZNC_VERSION = 1.9.1 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE From e77fa97f599ffa85648a0b6fa741db37de5c0430 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Jul 2024 10:50:06 +0200 Subject: [PATCH 1527/3013] configs/qemu_sh4*: switch to initramfs Qemu 9.0.0/9.0.1 has introduced a Bug in sh4/sh4eb emulation so that the system doesn't boot anymore. The issue is already reported by Guenter Roeck: https://lists.nongnu.org/archive/html/qemu-devel/2024-05/msg00606.html Switch to initramfs for sh4/sh4eb emulation. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 44a6b7866c95ca5459a53a50eab5ab1d38b6b8e1) Signed-off-by: Peter Korsgaard --- board/qemu/sh4-r2d/readme.txt | 2 +- board/qemu/sh4eb-r2d/readme.txt | 2 +- configs/qemu_sh4_r2d_defconfig | 2 +- configs/qemu_sh4eb_r2d_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index b0799e47a87..24c3676d8ac 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig + qemu-system-sh4 -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/board/qemu/sh4eb-r2d/readme.txt b/board/qemu/sh4eb-r2d/readme.txt index 9f3dd8b20b0..577c54cd9d3 100644 --- a/board/qemu/sh4eb-r2d/readme.txt +++ b/board/qemu/sh4eb-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig + qemu-system-sh4eb -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index e5570dcbab3..8d3e96c9c59 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -7,7 +7,7 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem -BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set # Image diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 468d6567aef..10c547e0c4d 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -6,7 +6,7 @@ BR2_sh4eb=y BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem -BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set # Image From 622957a2adb224b8a666472c3a58bc1ade8a2040 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Jul 2024 11:52:17 +0200 Subject: [PATCH 1528/3013] package/asterisk: update to 20.8.1 See here for a ChangeLog: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md 20.8.1 contains a fix for CVE-2024-35190. However, the vulnerability was introduced in commit 68a49128253f677f9e1b235c70d2316342372f7d between 20.7.0 and 20.8.0, and Buildroot was using 20.7.0, so we were not affected by this vulnerability. Patch 0005 is applied upstream. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...es-stasis-control.c-include-signal.h.patch | 43 ------------------- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 package/asterisk/0005-res-stasis-control.c-include-signal.h.patch diff --git a/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch b/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch deleted file mode 100644 index fc615c4a191..00000000000 --- a/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8391dc3891337ecff8becefe1927a30d3922b848 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 1 May 2024 16:50:50 +0200 -Subject: [PATCH] res/stasis/control.c: include signal.h - -Include signal.h to avoid the following build failure with uclibc-ng -raised since -https://github.com/asterisk/asterisk/commit/2694792e13c7f3ab1911c4a69fba0df32c544177: - -stasis/control.c: In function 'exec_command_on_condition': -stasis/control.c:313:3: warning: implicit declaration of function 'pthread_kill'; did you mean 'pthread_yield'? [-Wimplicit-function-declaration] - 313 | pthread_kill(control->control_thread, SIGURG); - | ^~~~~~~~~~~~ - | pthread_yield -stasis/control.c:313:41: error: 'SIGURG' undeclared (first use in this function) - 313 | pthread_kill(control->control_thread, SIGURG); - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d16e4ca4bd26234f84d17da24c04a8c19faba6c5 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/asterisk/asterisk/pull/728 ---- - res/stasis/control.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/res/stasis/control.c b/res/stasis/control.c -index 360f20790..4ed0e2af1 100644 ---- a/res/stasis/control.c -+++ b/res/stasis/control.c -@@ -41,6 +41,8 @@ - #include "asterisk/musiconhold.h" - #include "asterisk/app.h" - -+#include -+ - AST_LIST_HEAD(app_control_rules, stasis_app_control_rule); - - /*! --- -2.43.0 - diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 8cb54682493..bff34b37bb2 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 62adff44f5bc415627e16957e6bd528e1782a892e116ff261c46f96ca87c342b asterisk-20.7.0.tar.gz +sha256 bea2978c41d0f69f7197536c35c2d80cbfdf7db826f48c0741b6f66462981d2f asterisk-20.8.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index be275094411..3d41285c78f 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.7.0 +ASTERISK_VERSION = 20.8.1 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From 1697eca98644e1a3234fd4add397fb6cb140bb9a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Jun 2024 18:56:59 +0200 Subject: [PATCH 1529/3013] package/openvpn: security bump version to 2.6.11 Release notes: https://sourceforge.net/p/openvpn/mailman/message/58786888/ Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Fixes CVE-2024-4877, CVE-2024-5594 & CVE-2024-28882. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b55b1e893ef7584d32aa8882401918aee7e823c7) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 932483507e7..a4ba458bd82 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b openvpn-2.6.10.tar.gz +sha256 d60adf413d37e11e6e63531cacf2655906756046b4edffe88a13b9e2fec40d5e openvpn-2.6.11.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index abcb123eeab..3b39d62519e 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.10 +OPENVPN_VERSION = 2.6.11 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From 26226496c0a80bcca4efa745673491a251a8ddc2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Jun 2024 10:43:22 +0200 Subject: [PATCH 1530/3013] package/ghostscript: security bump version to 10.03.1 Fixes CVE-2024-33869, CVE-2023-52722, CVE-2024-33870, CVE-2024-33871 and CVE-2024-29510. Release notes: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/tag/gs10031 Remove patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 515e579567a8e44e8e4c537ba10f49d5b5d732d9) Signed-off-by: Peter Korsgaard --- .../0001-Fix-build-without-BUILD_PDF.patch | 34 ------------------- package/ghostscript/ghostscript.hash | 4 +-- package/ghostscript/ghostscript.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch diff --git a/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch deleted file mode 100644 index af69cd36707..00000000000 --- a/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 088f3cd6e58cff5fa51e072d1829f7691a5f6681 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 20 Sep 2023 13:44:28 +0100 -Subject: [PATCH] Fix build without BUILD_PDF - -The PDFSetParams PostScript extension operator was missing a stub function definition -when the PDF interpreter is not built in. - - Author: Fabrice Fontaine -Upstream: https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=088f3cd6e58cff5fa51e072d1829f7691a5f6681 -Signed-off-by: Fabrice Fontaine ---- - psi/zpdfops.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/psi/zpdfops.c b/psi/zpdfops.c -index e7e0a42ee..271687a18 100644 ---- a/psi/zpdfops.c -+++ b/psi/zpdfops.c -@@ -1507,6 +1507,11 @@ static int zPDFdrawannots(i_ctx_t *i_ctx_p) - return_error(gs_error_undefined); - } - -+static int zPDFSetParams(i_ctx_t *i_ctx_p) -+{ -+ return_error(gs_error_undefined); -+} -+ - static int zPDFInit(i_ctx_t *i_ctx_p) - { - return_error(gs_error_undefined); --- -2.34.1 - diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 849f6c64ba6..ed8e4cf7d9b 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS -sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10031/SHA512SUMS +sha512 59e071cd23aed246b51317d3cccd9ccf8e1e84c4ecf9b22fb938e561eff42cec61915b0bdd96a313a3ea27750579c54ca0d0862b65edd306a621731c0063ffd3 ghostscript-10.03.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index da23ebbadbb..80e2543d1c6 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.02.1 +GHOSTSCRIPT_VERSION = 10.03.1 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From 460f716c446799d6de64568db514d759c73e3bb3 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 11 Jul 2024 14:54:12 +0200 Subject: [PATCH 1531/3013] configs/stm32f769_disco_sd: bump Linux to 5.15.162 and U-Boot to 2024.04 The patch bumps the Linux kernel to version 5.15.162 and U-Boot to version 2024.04. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .../stm32f769-disco/patches/linux/linux.hash | 2 +- .../stm32f769-disco/patches/uboot/uboot.hash | 2 +- configs/stm32f769_disco_sd_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash index 49a2ba85a7d..d8e8263e9ef 100644 --- a/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8beb69ada46f1cbca2f4cf901ec078846035c1cd925d9471422f65aff74243ba linux-5.15.108.tar.xz +sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz diff --git a/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash index 7cef5b688ec..97a2b4eaf95 100644 --- a/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash +++ b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 u-boot-2023.04.tar.bz2 +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 952d22cc60d..c9140d089a3 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f769-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162" BR2_LINUX_KERNEL_DEFCONFIG="stm32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0xc0000000.config board/stmicroelectronics/stm32f769-disco/linux-sd.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f769-disco" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 0a0e48cd59570c67dfa270ece6e839403ce2b808 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 11 Jul 2024 11:05:25 +0200 Subject: [PATCH 1532/3013] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162 The patch bumps the Linux kernel to version 5.15.162 for both configurations and U-Boot to version 2024.04 for the SD one. Using the same kernel will subsequently allow adding the hash files in a single location. Furthermore, now even the xip configuration uses the same headers as the used Linux kernel. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/stm32f469_disco_sd_defconfig | 7 ++++--- configs/stm32f469_disco_xip_defconfig | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 66840a77423..689a1294163 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -1,12 +1,13 @@ BR2_arm=y BR2_cortex_m4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh board/stmicroelectronics/stm32f469-disco/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f469-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162" BR2_LINUX_KERNEL_DEFCONFIG="stm32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0x00000000.config board/stmicroelectronics/stm32f469-disco/linux-sd.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -21,7 +22,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 6e6ead0fdeb..000265d8315 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -1,12 +1,13 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From 609856858dba1aac850eab0bc768abbc3db48cfc Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 11 Jul 2024 11:05:26 +0200 Subject: [PATCH 1533/3013] configs/stm32f469_disco_{sd, xip}: add hashes The patch adds .hash files for Linux, Linux headers and U-Boot and then enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 -- .../stm32f469-disco/patches/linux-headers/linux-headers.hash | 1 + .../stmicroelectronics/stm32f469-disco/patches/linux/linux.hash | 2 ++ .../stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash | 2 ++ configs/stm32f469_disco_sd_defconfig | 1 + configs/stm32f469_disco_xip_defconfig | 1 + 6 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash create mode 100644 board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash create mode 100644 board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index e539c0a15f7..9a468404229 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -286,8 +286,6 @@ configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash -configs/stm32f469_disco_sd_defconfig lib_defconfig.ForceCheckHash -configs/stm32f469_disco_xip_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157a_dk1_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash new file mode 100644 index 00000000000..d8e8263e9ef --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz diff --git a/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash new file mode 100644 index 00000000000..97a2b4eaf95 --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 689a1294163..d440d6d2017 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_m4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh board/stmicroelectronics/stm32f469-disco/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f469-disco/genimage.cfg" diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 000265d8315..5a9d3e8afc7 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -4,6 +4,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From b57f48e131e94a2fafc31e3ca6cb3c11553a5930 Mon Sep 17 00:00:00 2001 From: Alexander Wellbrock Date: Mon, 17 Jun 2024 20:01:57 +0200 Subject: [PATCH 1534/3013] package/c-ares: update site url Download URLs changed after hosting of the c-ares website changed ownership: https://daniel.haxx.se/blog/2024/06/06/bye-bye-hosting-c-ares-web/ This cannot be fixed upstream as github pages does not support .htaccess files according to: https://github.com/c-ares/c-ares.github.io/issues/2 Signed-off-by: Alexander Wellbrock Signed-off-by: Thomas Petazzoni --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index c4441255a2d..c2403b9c4cb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -5,7 +5,7 @@ ################################################################################ C_ARES_VERSION = 1.27.0 -C_ARES_SITE = http://c-ares.haxx.se/download +C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/cares-1_27_0 C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT From 60c8807c69be60a8f1c35ed9f992850b009126be Mon Sep 17 00:00:00 2001 From: Jan Havran Date: Sun, 16 Jun 2024 16:19:14 +0200 Subject: [PATCH 1535/3013] package/ubus: remove obsolete systemd option ENABLE_SYSTEMD option has been removed from ubus by upstream commit: 96ab0b3032f5 ubusd: remove systemd socket activation support From a Buildroot perspective, this means that this systemd socket activation feature no longer exists since Buildroot commit 130be80d34905d3e79ff6b8f8fb31b3c3765eb96 ("ubus: bump version"), as we bumped ubus from 259450f414d8c9ee41896e8e6d6bc57ec00e2b63 to 34c6e818e431cc53478a0f7c7c1eca07d194d692 in this commit, and the 96ab0b3032f5 ("ubusd: remove systemd socket activation support") commit is in this range. It was therefore dropped upstream in 2016, and in Buildroot in 2017. Signed-off-by: Jan Havran Signed-off-by: Thomas Petazzoni --- package/ubus/ubus.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk index 1f9891411ac..cc2ed817869 100644 --- a/package/ubus/ubus.mk +++ b/package/ubus/ubus.mk @@ -25,13 +25,6 @@ else UBUS_CONF_OPTS += -DBUILD_LUA=OFF endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -UBUS_DEPENDENCIES += systemd -UBUS_CONF_OPTS += -DENABLE_SYSTEMD=ON -else -UBUS_CONF_OPTS += -DENABLE_SYSTEMD=OFF -endif - ifeq ($(BR2_PACKAGE_UBUS_EXAMPLES),y) UBUS_CONF_OPTS += -DBUILD_EXAMPLES=ON else From 63b4cbacb1bb22ead0a6351d4aa2fc9b85f0bbde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Mon, 17 Jun 2024 10:03:09 +0200 Subject: [PATCH 1536/3013] package/systemd: fix compiling with headers < 4.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In commit 360a7cd738a85067ba60b029ca88eb7c874bfe4f ("package/systemd: bump linux-headers dependency to 4.14"), the headers requirements were bumped to 4.14 because of new build failures due to LOOP_SET_BLOCK_SIZE. Even though systemd does not recommend using it with headers < 4.15 (see [1]), it is still possible to build it and use some of its features (after fixing the build failure). Note that this was build-tested with 4.4 headers only, and not all the way back to 3.15 (which is the version requirement that was used before 360a7cd738a85067ba60b029ca88eb7c874bfe4f). [1]: https://github.com/systemd/systemd/blob/main/README Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni --- ...g_loop.h-fix-missing-LOOP_SET_BLOCK_.patch | 38 +++++++++++++++++++ package/systemd/Config.in | 7 ++-- system/Config.in | 6 +-- 3 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch diff --git a/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch b/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch new file mode 100644 index 00000000000..7d520f81d42 --- /dev/null +++ b/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch @@ -0,0 +1,38 @@ +From e358793a796f8c742af4ea3f4fe398731ca46649 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Fri, 14 Jun 2024 14:37:29 +0200 +Subject: [PATCH] src/basic/missing_loop.h: fix missing LOOP_SET_BLOCK_SIZE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Builds with kernels headers < 4.14 fail with: + +../src/shared/loop-util.c: In function ‘loop_configure_fallback’: +../src/shared/loop-util.c:237:31: error: ‘LOOP_SET_BLOCK_SIZE’ undeclared (first use in this function); did you mean ‘LOOP_SET_DIRECT_IO’? + if (ioctl(fd, LOOP_SET_BLOCK_SIZE, (unsigned long) c->block_size) < 0) + ^~~~~~~~~~~~~~~~~~~ + LOOP_SET_DIRECT_IO + +Fixes: https://github.com/systemd/systemd/issues/33341 +Upstream: https://github.com/systemd/systemd/commit/56ab1c54497d9fac74380ff9e11aaf931a917d2b +Signed-off-by: Raphaël Mélotte +--- + src/basic/missing_loop.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h +index 7141544b64..b1505f678b 100644 +--- a/src/basic/missing_loop.h ++++ b/src/basic/missing_loop.h +@@ -22,3 +22,7 @@ struct loop_config { + #ifndef LOOP_SET_STATUS_SETTABLE_FLAGS + #define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN | LO_FLAGS_DIRECT_IO) + #endif ++ ++#ifndef LOOP_SET_BLOCK_SIZE ++# define LOOP_SET_BLOCK_SIZE 0x4C09 ++#endif +-- +2.25.1 + diff --git a/package/systemd/Config.in b/package/systemd/Config.in index a94e9b73b89..82c0e30474c 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # LOOP_SET_BLOCK_SIZE + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -239,6 +239,7 @@ config BR2_PACKAGE_SYSTEMD_HOMED depends on BR2_USE_MMU # cryptsetup -> lvm2 depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # fscrypt_key select BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL @@ -249,11 +250,11 @@ config BR2_PACKAGE_SYSTEMD_HOMED https://www.freedesktop.org/software/systemd/man/systemd-homed.service.html -comment "homed support needs a toolchain w/ threads, dynamic library" +comment "homed support needs a toolchain w/ threads, dynamic library, kernel headers >= 4.12" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 config BR2_PACKAGE_SYSTEMD_HOSTNAMED bool "enable hostname daemon" diff --git a/system/Config.in b/system/Config.in index 3fb17ed1c67..bc0c6eb6bc8 100644 --- a/system/Config.in +++ b/system/Config.in @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 4.14, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 From 70cd92cae176dd878171a53138ef903242526ccb Mon Sep 17 00:00:00 2001 From: Aleksandr Makarov Date: Fri, 26 Apr 2024 21:47:32 +0300 Subject: [PATCH 1537/3013] board/pine64/rockpro64/linux.fragment: integrate stmmac driver Currently, the stmmac driver is configured as a module in the defconfig, which means that the network functionality is not available until the driver module is manually inserted. Use extra config fragment to integrate it directly into the kernel, ensuring that network functionality is available immediately upon boot. Signed-off-by: Aleksandr Makarov Signed-off-by: Thomas Petazzoni (cherry picked from commit 54c82a237581dbed74aab2086381ae69b4626cc6) Signed-off-by: Peter Korsgaard --- board/pine64/rockpro64/linux.fragment | 3 +++ configs/rockpro64_defconfig | 1 + 2 files changed, 4 insertions(+) create mode 100644 board/pine64/rockpro64/linux.fragment diff --git a/board/pine64/rockpro64/linux.fragment b/board/pine64/rockpro64/linux.fragment new file mode 100644 index 00000000000..ed7dfd3d3ea --- /dev/null +++ b/board/pine64/rockpro64/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_PLATFORM=y +CONFIG_DWMAC_ROCKCHIP=y diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig index 472b9aded20..0c6cdd477a3 100644 --- a/configs/rockpro64_defconfig +++ b/configs/rockpro64_defconfig @@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64/linux.fragment" # Filesystem BR2_TARGET_GENERIC_HOSTNAME="rockpro64" From 0263c9be2cd811ffc29a6116502af966101849e4 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 10 Jun 2024 14:49:17 +0900 Subject: [PATCH 1538/3013] package/flannel: Bump to version 0.25.3 Signed-off-by: Geoff Levand Signed-off-by: Arnout Vandecappelle --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 367c4f6ecfa..b3caf907dbf 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 565dedf012a358d87d6bb89a4b7118a4a7ab9a3aada9b9bf76349ca5e451d954 flannel-0.25.2-go2.tar.gz +sha256 73c832ab860ceae15d6f890fae7c71e265af4825f885b5c367a91bd884eb2c09 flannel-0.25.3-go2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 317ad14ba39..ffbfad888f4 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANNEL_VERSION = 0.25.2 +FLANNEL_VERSION = 0.25.3 FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 From ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 10 Jun 2024 11:38:33 +0200 Subject: [PATCH 1539/3013] package/tftpd: bump to latest git commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following error when compiled against GCC 14.x: tftp.c: In function ‘tftp_sendfile’: tftp.c:88:5: error: implicit declaration of function ‘bsd_signal’; did you mean ‘ssignal’? [-Wimplicit-function-declaration] 88 | bsd_signal(SIGALRM, timer); | ^~~~~~~~~~ | ssignal tftp.c:88:5: warning: nested extern declaration of ‘bsd_signal’ [-Wnested-externs] main.c: In function ‘main’: main.c:308:5: error: implicit declaration of function ‘bsd_signal’; did you mean ‘ssignal’? [-Wimplicit-function-declaration] 308 | bsd_signal(SIGINT, intr); | ^~~~~~~~~~ | ssignal main.c:308:5: warning: nested extern declaration of ‘bsd_signal’ [-Wnested-externs] Remove an upstreamed patch. tftpd/tftpd.c has changed, hence, change its checksum. Signed-off-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...tern-qualifier-to-fix-gcc-10.x-build.patch | 29 ------------------- package/tftpd/tftpd.hash | 4 +-- package/tftpd/tftpd.mk | 2 +- 4 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index 9a468404229..4d4fbd340f6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1368,7 +1368,6 @@ package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch lib_p package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch lib_patch.Upstream package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch lib_patch.Upstream package/tcf-agent/S55tcf-agent Shellcheck lib_sysv.Variables -package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch lib_patch.Upstream package/tftpd/S80tftpd-hpa Shellcheck lib_sysv.Indent lib_sysv.Variables package/ti-gfx/0001-newclkapi.patch lib_patch.Upstream package/ti-gfx/0002-fix-build-omaplfb-linux.patch lib_patch.Upstream diff --git a/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch b/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch deleted file mode 100644 index c964555347c..00000000000 --- a/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f994166d8571961a08479736ae86c5baa2bb47f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 7 Aug 2020 12:07:45 +0200 -Subject: [PATCH] Use "extern" qualifier to fix gcc 10.x build - -Patch from -https://src.fedoraproject.org/rpms/tftp/raw/master/f/tftp-hpa-5.2-gcc10.patch. - -Signed-off-by: Thomas Petazzoni ---- - tftp/tftp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tftp/tftp.c b/tftp/tftp.c -index d15da22..d067f96 100644 ---- a/tftp/tftp.c -+++ b/tftp/tftp.c -@@ -48,7 +48,7 @@ extern int maxtimeout; - #define PKTSIZE SEGSIZE+4 - char ackbuf[PKTSIZE]; - int timeout; --sigjmp_buf toplevel; -+extern sigjmp_buf toplevel; - sigjmp_buf timeoutbuf; - - static void nak(int, const char *); --- -2.26.2 - diff --git a/package/tftpd/tftpd.hash b/package/tftpd/tftpd.hash index 66e6b0d26c7..3fab9dba073 100644 --- a/package/tftpd/tftpd.hash +++ b/package/tftpd/tftpd.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0eb23ceca54eac3648ca4254a4664241483ddc6bef36958e1cf23bc994d15863 tftpd-b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7-git4.tar.gz +sha256 9bdb3e2ab2b68e4d8cd057d102395c362baf07c7b052f1d5e40e5190afecc15e tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0-git4.tar.gz # Hash for license file -sha256 67754ebd8f265571d3226ac97e521b1bd6fd8a61363ecd4ab7806a6f90efab92 tftpd/tftpd.c +sha256 5936d0764cb6e8f2f5ce8a11c249d81037b5f275f5983e8538ee4fbe57195369 tftpd/tftpd.c diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index ceac24119eb..81b67f82cec 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TFTPD_VERSION = b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7 +TFTPD_VERSION = e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0 TFTPD_SITE = https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git TFTPD_SITE_METHOD = git TFTPD_CONF_OPTS = --without-tcpwrappers From a8ecf73895d25c9883a160fad3615b138edfb053 Mon Sep 17 00:00:00 2001 From: Woodrow Douglass Date: Mon, 10 Jun 2024 08:45:39 -0400 Subject: [PATCH 1540/3013] package/opencv4: bump to version 4.10.0 https://github.com/opencv/opencv/wiki/ChangeLog#version4100 Signed-off-by: Woodrow Douglass Signed-off-by: Arnout Vandecappelle --- package/opencv4-contrib/opencv4-contrib.hash | 2 +- package/opencv4-contrib/opencv4-contrib.mk | 2 +- package/opencv4/opencv4.hash | 2 +- package/opencv4/opencv4.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/opencv4-contrib/opencv4-contrib.hash b/package/opencv4-contrib/opencv4-contrib.hash index 2e20717c763..05c30ea2504 100644 --- a/package/opencv4-contrib/opencv4-contrib.hash +++ b/package/opencv4-contrib/opencv4-contrib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae opencv4-contrib-4.9.0.tar.gz +sha256 65597f8fb8dc2b876c1b45b928bbcc5f772ddbaf97539bf1b737623d0604cba1 opencv4-contrib-4.10.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index a4d0179472d..ed00a317c9c 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_CONTRIB_VERSION = 4.9.0 +OPENCV4_CONTRIB_VERSION = 4.10.0 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 diff --git a/package/opencv4/opencv4.hash b/package/opencv4/opencv4.hash index 15f5e372786..ae407e4381f 100644 --- a/package/opencv4/opencv4.hash +++ b/package/opencv4/opencv4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c opencv4-4.9.0.tar.gz +sha256 b2171af5be6b26f7a06b1229948bbb2bdaa74fcf5cd097e0af6378fce50a6eb9 opencv4-4.10.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index e50e0f99a9a..989d32b91b8 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_VERSION = 4.9.0 +OPENCV4_VERSION = 4.10.0 OPENCV4_SITE = $(call github,opencv,opencv,$(OPENCV4_VERSION)) OPENCV4_INSTALL_STAGING = YES OPENCV4_LICENSE = Apache-2.0 From f3c1f667dcc300eb7205aa3e1731ba3377a8e48d Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Tue, 11 Jun 2024 19:55:39 +0300 Subject: [PATCH 1541/3013] package/systemd: fix build with recent kernels Backport a patch from upstream that adds the magic number for the bcachefs superblock. Otherwise, systemd 254.13 fails to compile with the latest kernel versions. Signed-off-by: Jarkko Sakkinen Signed-off-by: Thomas Petazzoni --- .../0002-basic-add-bcachefs-magic.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/systemd/0002-basic-add-bcachefs-magic.patch diff --git a/package/systemd/0002-basic-add-bcachefs-magic.patch b/package/systemd/0002-basic-add-bcachefs-magic.patch new file mode 100644 index 00000000000..e7f4b1cbb73 --- /dev/null +++ b/package/systemd/0002-basic-add-bcachefs-magic.patch @@ -0,0 +1,53 @@ +From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Fri, 31 May 2024 09:51:38 +1200 +Subject: [PATCH] basic: Add BCACHEFS magic + +Import magic.h from Linux 6.9 to get the definition of +BCACHEFS_SUPER_MAGIC. Update filesystems-gperf.gperf to add knowledge of +bcachefs. + +This fixes the following error building against a bleeding edge kernel. +``` +src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers: + +Filesystem found in kernel header but not in filesystems-gperf.gperf: BCACHEFS_SUPER_MAGIC +``` + +Upstream: https://github.com/systemd/systemd/commit/201148b08de65de004d10679a8c3d201cc08fb28 +Signed-off-by: Jarkko Sakkinen +--- + src/basic/filesystems-gperf.gperf | 1 + + src/basic/missing_magic.h | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf +index 1cd66b5a5f..c82fe98227 100644 +--- a/src/basic/filesystems-gperf.gperf ++++ b/src/basic/filesystems-gperf.gperf +@@ -28,6 +28,7 @@ afs, {AFS_FS_MAGIC, AFS_SUPER_MAGIC} + anon_inodefs, {ANON_INODE_FS_MAGIC} + autofs, {AUTOFS_SUPER_MAGIC} + balloon-kvm, {BALLOON_KVM_MAGIC} ++bcachefs, {BCACHEFS_SUPER_MAGIC} + bdev, {BDEVFS_MAGIC} + binder, {BINDERFS_SUPER_MAGIC} + binfmt_misc, {BINFMTFS_MAGIC} +diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h +index 82d71c8ad1..b3d2ee9f57 100644 +--- a/src/basic/missing_magic.h ++++ b/src/basic/missing_magic.h +@@ -197,3 +197,10 @@ + #ifndef NTFS3_SUPER_MAGIC + #define NTFS3_SUPER_MAGIC 0x7366746e + #endif ++ ++/* Added in Linux commit e2f48c48090dea172c0c571101041de64634dae5. Remove when next sync'd */ ++#ifndef BCACHEFS_SUPER_MAGIC ++# define BCACHEFS_SUPER_MAGIC 0xca451a4e ++#else ++assert_cc(BCACHEFS_SUPER_MAGIC == 0xca451a4e) ++#endif +-- +2.45.1 + From b2aa09a492cf0b1b481b754dcc5f0168a039bd3c Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 17 Jun 2024 11:36:26 +0200 Subject: [PATCH 1542/3013] package/ncftp: fix GCC 14.x related build errors Patches were taken from Gentoo: https://bugs.gentoo.org/921487 https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch Fixes: http://autobuild.buildroot.net/results/058578eae885ce6e206c25b5a24aa11b625adf88/ Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- .../ncftp/0001-ncftp-3.2.7-fix-gcc14.patch | 19 +++++ .../ncftp/0002-ncftp-3.2.7-fix-clang.patch | 72 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch create mode 100644 package/ncftp/0002-ncftp-3.2.7-fix-clang.patch diff --git a/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch b/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch new file mode 100644 index 00000000000..e2cda631d45 --- /dev/null +++ b/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch @@ -0,0 +1,19 @@ +fix select arg detection + +Reference: + https://bugs.gentoo.org/921487 + +Upstream: N/A, unresponsive contact email address. + +Signed-off-by: Yegor Yefremov +--- a/autoconf_local/aclocal.m4 ++++ b/autoconf_local/aclocal.m4 +@@ -4196,7 +4196,7 @@ + #include + #endif + #include /* MG: always incl */ +-extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl ++extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl + [ac_not_found=no ; break 3],ac_not_found=yes) + done + done diff --git a/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch b/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch new file mode 100644 index 00000000000..bed103609ce --- /dev/null +++ b/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch @@ -0,0 +1,72 @@ +Fix compilation with clang-16 + +aclocal.m4 contains code that no longer compiles: missing headers and missing +return types. + +Reference: + https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch + +Upstream: N/A, unresponsive contact email address. + +Signed-off-by: Yegor Yefremov +--- a/autoconf_local/aclocal.m4 ++++ b/autoconf_local/aclocal.m4 +@@ -3057,6 +3057,7 @@ + #include + #include + #include ++#include + ],[ + struct sockaddr_un uaddr; + +@@ -3285,6 +3286,7 @@ + #ifdef HAVE_RESOLV_H + # include + #endif ++#include + ],[ + /* function-body */ + int len; +@@ -3363,6 +3365,7 @@ + #include + #include + ++ int + main(int argc, char **argv) + { + /* Note: don't actually call readline, +@@ -5145,6 +5148,7 @@ + #ifdef HAVE_STDLIB_H + # include + #endif ++#include + + #ifdef HAVE_NCURSES_H + # define NCURSES_OPAQUE 0 +@@ -5176,6 +5180,7 @@ + #endif + + ++int + main(int argc, char **argv) + { + /* Note: don't actually call curses, since it may block; +@@ -6510,7 +6515,6 @@ + #endif + #endif /* MG */ + +-int + int main(void) + { + char *data, *data2, *data3; +@@ -6607,8 +6611,9 @@ + AC_CACHE_CHECK(whether setvbuf arguments are reversed, + ac_cv_func_setvbuf_reversed, + [AC_TRY_RUN([#include ++ $include + /* If setvbuf has the reversed format, exit 0. */ +- main () { ++ int main (void) { + /* This call has the arguments reversed. + A reversed system may check and see that the address of main + is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ From e8efe3df48b2e7d3216162128fe67c58cbf02324 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Fri, 12 Jul 2024 07:35:59 +0200 Subject: [PATCH 1543/3013] package/mpd: fix build with fmt 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since commit 6b86f07 (package/fmt: bump to version 11.0.1), mpd fails to build: /home/data/buildroot.x86_64/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter’ as ‘this’ argument discards qualifiers [-fpermissive] 1392 | ctx.advance_to(cf.format(*static_cast(arg), ctx)); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ../src/Log.cxx:5: ../src/lib/fmt/ExceptionFormatter.hxx:15:14: note: in call to ‘auto fmt::v11::formatter::format(std::__exception_ptr::exception_ptr, FormatContext&) [with FormatContext = fmt::v11::context]’ 15 | auto format(std::exception_ptr e, FormatContext &ctx) { | ^~~~~~ Adapt an upstream change to restore mpd compatibility with fmt 11. Fixes: http://autobuild.buildroot.net/results/73514ea76a5960f59b4c50e2074571b10e4682d4 http://autobuild.buildroot.net/results/a58ddbdfe35bd19021e65db0b8b8cc4c1c884d51 Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- ...fmt-support-build-with-libfmt-11.0.0.patch | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch diff --git a/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch b/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch new file mode 100644 index 00000000000..e0a361fee28 --- /dev/null +++ b/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch @@ -0,0 +1,93 @@ +From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 5 Jul 2024 14:27:45 +0000 +Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0 + +Upstream libfmt commit fmtlib/fmt@d707292 +now requires the format function to be const. + +Adjust the function prototype so it is const and can compile. + +Signed-off-by: Rudi Heitbaum + +Context: https://github.com/MusicPlayerDaemon/MPD/issues/2071 +Pull request: https://github.com/MusicPlayerDaemon/MPD/pull/2069 + +Fixes: http://autobuild.buildroot.net/results/73514ea76a5960f59b4c50e2074571b10e4682d4 +Fixes: http://autobuild.buildroot.net/results/a58ddbdfe35bd19021e65db0b8b8cc4c1c884d51 + +Rebase for mpd-0.23.15 + +Upstream: https://github.com/MusicPlayerDaemon/MPD/commit/3648475f871c33daa9e598c102a16e5a1a4d4dfc +Signed-off-by: Andreas Ziegler +--- + src/lib/ffmpeg/LibFmt.hxx | 2 +- + src/lib/fmt/AudioFormatFormatter.hxx | 4 ++-- + src/lib/fmt/ExceptionFormatter.hxx | 2 +- + src/lib/fmt/PathFormatter.hxx | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx +index aa068711f..dee83ed2d 100644 +--- a/src/lib/ffmpeg/LibFmt.hxx ++++ b/src/lib/ffmpeg/LibFmt.hxx +@@ -29,7 +29,7 @@ + struct fmt::formatter : formatter + { + template +- auto format(const AVSampleFormat format, FormatContext &ctx) { ++ auto format(const AVSampleFormat format, FormatContext &ctx) const { + const char *name = av_get_sample_fmt_name(format); + if (name == nullptr) + name = "?"; +diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx +index e0ffb6216..8da98efd4 100644 +--- a/src/lib/fmt/AudioFormatFormatter.hxx ++++ b/src/lib/fmt/AudioFormatFormatter.hxx +@@ -39,7 +39,7 @@ + struct fmt::formatter : formatter + { + template +- auto format(const SampleFormat format, FormatContext &ctx) { ++ auto format(const SampleFormat format, FormatContext &ctx) const { + return formatter::format(sample_format_to_string(format), + ctx); + } +@@ -49,7 +49,7 @@ + struct fmt::formatter : formatter + { + template +- auto format(const AudioFormat &af, FormatContext &ctx) { ++ auto format(const AudioFormat &af, FormatContext &ctx) const { + return formatter::format(ToString(af).c_str(), + ctx); + } +diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx +index 3f342df67..f08b3bb22 100644 +--- a/src/lib/fmt/ExceptionFormatter.hxx ++++ b/src/lib/fmt/ExceptionFormatter.hxx +@@ -38,7 +38,7 @@ + struct fmt::formatter : formatter + { + template +- auto format(std::exception_ptr e, FormatContext &ctx) { ++ auto format(std::exception_ptr e, FormatContext &ctx) const { + return formatter::format(GetFullMessage(e), ctx); + } + }; +diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx +index e5ae89dec..add06df81 100644 +--- a/src/lib/fmt/PathFormatter.hxx ++++ b/src/lib/fmt/PathFormatter.hxx +@@ -29,7 +29,7 @@ + struct fmt::formatter : formatter + { + template +- auto format(Path path, FormatContext &ctx) { ++ auto format(Path path, FormatContext &ctx) const { + return formatter::format(path.ToUTF8(), ctx); + } + }; +-- +2.43.0 + From 99e1b07c4e840ab5b727c48cad107d3e605aad00 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 11 Jul 2024 23:22:52 +0200 Subject: [PATCH 1544/3013] package/pciutils: bump version to 3.13.0 For change log since 3.10.0, see: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/tree/ChangeLog?h=v3.13.0 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/pciutils/pciutils.hash | 2 +- package/pciutils/pciutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pciutils/pciutils.hash b/package/pciutils/pciutils.hash index 2ac28d327b5..f6a3f9eef69 100644 --- a/package/pciutils/pciutils.hash +++ b/package/pciutils/pciutils.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc -sha256 238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9fbb0e9 pciutils-3.10.0.tar.xz +sha256 77f11f78298502634d1af50308f15a5788629f6cf45cba376f5009aea4cb4926 pciutils-3.13.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index a6708ce94b9..ea3c21db6a7 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCIUTILS_VERSION = 3.10.0 +PCIUTILS_VERSION = 3.13.0 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz PCIUTILS_INSTALL_STAGING = YES From 484b4370cc92debfa49969b490464cb57c938610 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 11 Jul 2024 23:01:51 +0200 Subject: [PATCH 1545/3013] package/opencsd: bump to version 1.5.3 For change log, see: https://github.com/Linaro/OpenCSD/blob/v1.5.3/README.md?plain=1#L329 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/opencsd/opencsd.hash | 2 +- package/opencsd/opencsd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opencsd/opencsd.hash b/package/opencsd/opencsd.hash index 43a5a38683e..9800d213773 100644 --- a/package/opencsd/opencsd.hash +++ b/package/opencsd/opencsd.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 ef27fe6afa6402b051aeae5c2827fa6d8c2d174170a5dc244f7f721db6908219 opencsd-1.5.2.tar.gz +sha256 86ee4248f26d768f60f4f4a09f62acaf63989a6448fe1f65a1539478123d95df opencsd-1.5.3.tar.gz sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk index 8aafeeaad57..42712133a39 100644 --- a/package/opencsd/opencsd.mk +++ b/package/opencsd/opencsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCSD_VERSION = 1.5.2 +OPENCSD_VERSION = 1.5.3 OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) OPENCSD_LICENSE = BSD-3-Clause OPENCSD_LICENSE_FILES = LICENSE From 55235919f87e984f78cd52b5be45d94c44c74dee Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 11 Jul 2024 22:52:37 +0200 Subject: [PATCH 1546/3013] package/ed: bump to version 1.20.2 See release announce: https://lists.gnu.org/archive/html/bug-ed/2024-04/msg00003.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ed/ed.hash | 4 ++-- package/ed/ed.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ed/ed.hash b/package/ed/ed.hash index 5deb5e74efc..d1d99309c6e 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2024-01/msg00000.html -sha256 c6030defe6ae172f1687906d7354054c75a6a9130af319d4e73c50a91959c5a6 ed-1.20.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2024-04/msg00003.html +sha256 65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523 ed-1.20.2.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index edfadf02a64..704744359a3 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,7 +4,7 @@ # ################################################################################ -ED_VERSION = 1.20 +ED_VERSION = 1.20.2 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-2.0+ From e76d131e7cc6cf34514d19eaa86ee556813353ab Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 10:59:56 -0700 Subject: [PATCH 1547/3013] package/freescale-imx/firmware-imx: bump to version 8.22 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/firmware-imx/firmware-imx.hash | 6 +++--- package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index 0b3561a927e..d9443374c56 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f6dc6a5c8fd9b913a15360d3ccd53d188db05a08a8594c518e57622478c72383 firmware-imx-8.20.bin -sha256 913ba38d4be97361c3d0fa9bf2f6dbe7b1c0c41213dd268fb6738db9704dbe32 COPYING -sha256 4fd8bb45a2ec22117d20cfea84370e2a3a2cd99e8e177138bed0938137b1aeb3 EULA +sha256 94c8bceac56ec503c232e614f77d6bbd8e17c7daa71d4e651ea8fd5034c30350 firmware-imx-8.22.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA sha256 40d02f6d6b4e94d9307529408f372f5a9908cf3d156ec533a4e54274b40f271e SCR.txt diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 2a74f58aa60..c131558c37f 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.20 +FIRMWARE_IMX_VERSION = 8.22 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin From ed889c918a2195af07f72d4d4667f0961b28261f Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 10:59:57 -0700 Subject: [PATCH 1548/3013] package/freescale-imx/imx-codec: bump to version 4.8.2 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/imx-codec/imx-codec.hash | 6 +++--- package/freescale-imx/imx-codec/imx-codec.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-codec/imx-codec.hash b/package/freescale-imx/imx-codec/imx-codec.hash index 8dab5a5c4c5..666d38d0013 100644 --- a/package/freescale-imx/imx-codec/imx-codec.hash +++ b/package/freescale-imx/imx-codec/imx-codec.hash @@ -1,4 +1,4 @@ # locally computed -sha256 6bb54f91c3ca18567e14d95d3858022dc9be00dc86e9edfdb544d1240a3b2b04 imx-codec-4.3.5.bin -sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING -sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA +sha256 b0744a91c265202a79a019c72f17cae01fd5b63a3ba451592b6c8349d95719e0 imx-codec-4.8.2.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index 2b7c346a6e9..54ba6f126e9 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_CODEC_VERSION = 4.3.5 +IMX_CODEC_VERSION = 4.8.2 IMX_CODEC_SITE = $(FREESCALE_IMX_SITE) IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin IMX_CODEC_INSTALL_STAGING = YES From 4a3766dc4e0160ea7866ae92a9409faeb1b8f8bb Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 10:59:58 -0700 Subject: [PATCH 1549/3013] package/freescale-imx/imx-gpu-g2d: bump to version 6.4.11.p2.2 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash | 8 ++++---- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 580b31e453e..d15287ebc7e 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1ed29a4818161198b658ffc428dff7c154c38f5ba48d7358ed9b0be261d72b99 imx-gpu-g2d-6.4.11.p1.2-arm.bin -sha256 cdf096c9b15c773ad600b24ec8888c1c4a33711c195c655e9411d4b66a992c25 imx-gpu-g2d-6.4.11.p1.2-aarch64.bin -sha256 913ba38d4be97361c3d0fa9bf2f6dbe7b1c0c41213dd268fb6738db9704dbe32 COPYING -sha256 4fd8bb45a2ec22117d20cfea84370e2a3a2cd99e8e177138bed0938137b1aeb3 EULA +sha256 bc168b19096a997251e7137f82ffcff404c61709cf5f227c53a099f631569f76 imx-gpu-g2d-6.4.11.p2.2-arm-fd0148d.bin +sha256 1cedc606be965b01300613ccea81b4fd589d940306bb1caa30a37c41928616ec imx-gpu-g2d-6.4.11.p2.2-aarch64-fd0148d.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 87fe08ebe34..51a49b6972e 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.11.p1.2-aarch64 +IMX_GPU_G2D_VERSION = 6.4.11.p2.2-aarch64-fd0148d else -IMX_GPU_G2D_VERSION = 6.4.11.p1.2-arm +IMX_GPU_G2D_VERSION = 6.4.11.p2.2-arm-fd0148d endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin From d653e8edcf2df3380a9f38845f6e507d767ddf19 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 10:59:59 -0700 Subject: [PATCH 1550/3013] package/freescale-imx/imx-gpu-viv: bump to version 6.4.11.p2.2 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 8 ++++---- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index a380e1b7120..b350443a512 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 491ac012d691e27856769296e2334ad1b6f45e31ffe7313fcdb028c75b3b69ae imx-gpu-viv-6.4.11.p1.2-aarch32-1e0c396.bin -sha256 d5904cbbe33a3c1160e9cd15c44d78df25d0dbd7b251add796673af53d3046f6 imx-gpu-viv-6.4.11.p1.2-aarch64-1e0c396.bin -sha256 913ba38d4be97361c3d0fa9bf2f6dbe7b1c0c41213dd268fb6738db9704dbe32 COPYING -sha256 4fd8bb45a2ec22117d20cfea84370e2a3a2cd99e8e177138bed0938137b1aeb3 EULA +sha256 15efe6da5d4bac2a6067c2a898190be8754df6f14128c3db4756cff59c6da049 imx-gpu-viv-6.4.11.p2.2-aarch32-fd0148d.bin +sha256 6e34f3718925ba37c362cd09a3228cc56d03cfad323ebae0932f64449dbaeb2e imx-gpu-viv-6.4.11.p2.2-aarch64-fd0148d.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 5a13419e3e5..3cfbfe3cccd 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.11.p1.2-aarch64-1e0c396 +IMX_GPU_VIV_VERSION = 6.4.11.p2.2-aarch64-fd0148d else -IMX_GPU_VIV_VERSION = 6.4.11.p1.2-aarch32-1e0c396 +IMX_GPU_VIV_VERSION = 6.4.11.p2.2-aarch32-fd0148d endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin From 37d5d126e292fd5694b048106e0d9adda2d163e6 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:00 -0700 Subject: [PATCH 1551/3013] package/freescale-imx/imx-seco: bump to version 5.9.2 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/imx-seco/imx-seco.hash | 6 +++--- package/freescale-imx/imx-seco/imx-seco.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-seco/imx-seco.hash b/package/freescale-imx/imx-seco/imx-seco.hash index e02e30886f7..40963a81be0 100644 --- a/package/freescale-imx/imx-seco/imx-seco.hash +++ b/package/freescale-imx/imx-seco/imx-seco.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df imx-seco-5.9.0.bin -sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA -sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 81601f73d1b2c1d051760e6f6174e084256a1a10ed21a5c616c139e630c4e709 imx-seco-5.9.2.bin +sha256 b158adaac5e2d1c7fa6e739ff168ab498957e3303070f1c0b0e66d9a8f02a354 EULA +sha256 de37a0bcbf1717b910c1a53ea6eab853c404e61e8143bb6c081d39f532571e54 COPYING diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 3788f1e404e..4261602a8c7 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SECO_VERSION = 5.9.0 +IMX_SECO_VERSION = 5.9.2 IMX_SECO_SITE = $(FREESCALE_IMX_SITE) IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin From be95c350c210a85143a7a3194b081181cc0f626e Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:01 -0700 Subject: [PATCH 1552/3013] package/freescale-imx/imx-vpu-hantro: bump to version 1.31.0 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash | 6 +++--- package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index 879b82f7bd1..069700fc5f0 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 2fc836e0ca9a5994c6237ee20b91ccc327fb2529a4ea057e4aedbce3326b6c97 imx-vpu-hantro-1.29.0.bin -sha256 913ba38d4be97361c3d0fa9bf2f6dbe7b1c0c41213dd268fb6738db9704dbe32 COPYING -sha256 4fd8bb45a2ec22117d20cfea84370e2a3a2cd99e8e177138bed0938137b1aeb3 EULA +sha256 21fb3288f6f44631ebf6479284c5c081ff829a3068811eebbacc510f14300ab4 imx-vpu-hantro-1.31.0.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index 0987551c422..64df16e21b8 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.29.0 +IMX_VPU_HANTRO_VERSION = 1.31.0 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux From a5c1a9980679c1c9ea8d1287082cf6359bbeb770 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:04 -0700 Subject: [PATCH 1553/3013] package/freescale-imx/kernel-module-imx-gpu-viv: bump to version 6.4.11.p.2.2 - To match NXP 6.1.55-2.2.0 release. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash | 2 +- .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index 1411c8d3ef5..1a1e89b95ad 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,3 +1,3 @@ # locally computed -sha256 ce32d7f9e16daa0ac87a41bd6da2f96743cd5b28b7bc324ca642e985a29a4e48 kernel-module-imx-gpu-viv-1e65746bb15628ccbe88e3ee7a0a1d2becc48e79.tar.gz +sha256 b174a79042266b5d36c03f7db12036c93acd546f996367dd33233581e64857bb kernel-module-imx-gpu-viv-4d035200e7b15d2713d49979a1d05f201b92cf4c.tar.gz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index 13df35dcc06..d87f5750642 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = 1e65746bb15628ccbe88e3ee7a0a1d2becc48e79 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = 4d035200e7b15d2713d49979a1d05f201b92cf4c KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0 From 90314fdfb0e63b1b49d86addddfc0c957feaa622 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:05 -0700 Subject: [PATCH 1554/3013] package/freescale-imx: add i.MX 8ULP support More details on the platform here: https://www.ezurio.com/system-on-module/nxp-imx8/nitrogen8ulp-som https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-8-applications-processors/i-mx-8ulp-applications-processor-family:i.MX8ULP There have been 3 silicon revisions of this processor (A0, A1, A2) and A2 is the current production version. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/Config.in | 31 +++++++++++++++++-- .../freescale-imx/firmware-ele-imx/Config.in | 3 ++ package/freescale-imx/firmware-imx/Config.in | 1 + 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 32115924685..34ce1d1311d 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -55,6 +55,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP bool "imx8mp" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP + bool "imx8ulp" + config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X bool "imx8x" @@ -70,7 +73,28 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 endchoice choice - prompt "i.MX Silicon Revision" + prompt "i.MX 8ULP Silicon Revision" + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA2 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP + help + Some packages related to the selected i.MX platform need to + know the silicon revision of the platform they will run on. + + Note - mismatches may result in a failure to boot! + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA0 + bool "imx8ulpa0" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA1 + bool "imx8ulpa1" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA2 + bool "imx8ulpa2" + +endchoice + +choice + prompt "i.MX 93 Silicon Revision" default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 help @@ -104,6 +128,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "IMX8ULP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP default "IMX91" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 default "IMX93" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 @@ -130,12 +155,14 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL config BR2_PACKAGE_FREESCALE_IMX_HAS_ELE bool - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 source "package/freescale-imx/imx-alsa-plugins/Config.in" diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in index a99cbc3392c..e8369f01021 100644 --- a/package/freescale-imx/firmware-ele-imx/Config.in +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -15,6 +15,9 @@ if BR2_PACKAGE_FIRMWARE_ELE_IMX config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE string + default "mx8ulpa0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA0 + default "mx8ulpa1-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA1 + default "mx8ulpa2-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA2 default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 default "mx93a1-ahab-container.img" if \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 63990947c80..4a9986448f8 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -25,6 +25,7 @@ config BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP config BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME string From 9a7c709012f9db0f4dcaee02d611e8d1427226a3 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:06 -0700 Subject: [PATCH 1555/3013] package/freescale-imx/firmware-upower: new package This package provides NXP i.MX uPower firmware present on i.MX 8ULP SoC. This version comes from the NXP 6.1.55-2.2.0 release. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/Config.in | 5 ++++ .../freescale-imx/firmware-upower/Config.in | 22 +++++++++++++++ .../firmware-upower/firmware-upower.hash | 4 +++ .../firmware-upower/firmware-upower.mk | 27 +++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 package/freescale-imx/firmware-upower/Config.in create mode 100644 package/freescale-imx/firmware-upower/firmware-upower.hash create mode 100644 package/freescale-imx/firmware-upower/firmware-upower.mk diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 34ce1d1311d..6d196a052da 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -165,6 +165,10 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_ELE BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 +config BR2_PACKAGE_FREESCALE_IMX_HAS_UPOWER + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP + source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" source "package/freescale-imx/imx-kobs/Config.in" @@ -177,6 +181,7 @@ source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" source "package/freescale-imx/firmware-ele-imx/Config.in" source "package/freescale-imx/firmware-imx/Config.in" +source "package/freescale-imx/firmware-upower/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" source "package/freescale-imx/imx-seco/Config.in" source "package/freescale-imx/imx-vpu-hantro-daemon/Config.in" diff --git a/package/freescale-imx/firmware-upower/Config.in b/package/freescale-imx/firmware-upower/Config.in new file mode 100644 index 00000000000..ca7486d2b75 --- /dev/null +++ b/package/freescale-imx/firmware-upower/Config.in @@ -0,0 +1,22 @@ +comment "firmware-upower needs an i.MX platform with uPower" + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_UPOWER + +config BR2_PACKAGE_FIRMWARE_UPOWER + bool "firmware-upower" + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_UPOWER + help + NXP i.MX uPower firmware present on i.MX 8ULP SoC. + + This library is provided by NXP as-is and doesn't have an + upstream. + +if BR2_PACKAGE_FIRMWARE_UPOWER + +config BR2_PACKAGE_FIRMWARE_UPOWER_UPOWER_FIRMWARE_NAME + string + default "upower_a0.bin" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA0 + default "upower_a1.bin" if \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA1 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA2 + +endif # BR2_PACKAGE_FIRMWARE_UPOWER diff --git a/package/freescale-imx/firmware-upower/firmware-upower.hash b/package/freescale-imx/firmware-upower/firmware-upower.hash new file mode 100644 index 00000000000..dc5938ad16c --- /dev/null +++ b/package/freescale-imx/firmware-upower/firmware-upower.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 1df3a03d69feb38a450ee63abc7713d78cf6339988476e4c9f95ebbf63790f66 firmware-upower-1.3.1.bin +sha256 de37a0bcbf1717b910c1a53ea6eab853c404e61e8143bb6c081d39f532571e54 COPYING +sha256 b158adaac5e2d1c7fa6e739ff168ab498957e3303070f1c0b0e66d9a8f02a354 EULA diff --git a/package/freescale-imx/firmware-upower/firmware-upower.mk b/package/freescale-imx/firmware-upower/firmware-upower.mk new file mode 100644 index 00000000000..dfdf75510cf --- /dev/null +++ b/package/freescale-imx/firmware-upower/firmware-upower.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# firmware-ele-imx +# +################################################################################ + +FIRMWARE_UPOWER_VERSION = 1.3.1 +FIRMWARE_UPOWER_SITE = $(FREESCALE_IMX_SITE) +FIRMWARE_UPOWER_SOURCE = firmware-upower-$(FIRMWARE_UPOWER_VERSION).bin + +FIRMWARE_UPOWER_LICENSE = NXP Semiconductor Software License Agreement +FIRMWARE_UPOWER_LICENSE_FILES = COPYING EULA +FIRMWARE_UPOWER_REDISTRIBUTE = NO + +FIRMWARE_UPOWER_INSTALL_IMAGES = YES + +define FIRMWARE_UPOWER_EXTRACT_CMDS + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_UPOWER_DL_DIR)/$(FIRMWARE_UPOWER_SOURCE)) +endef + +FIRMWARE_UPOWER_UPOWER_FIRMWARE_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_UPOWER_UPOWER_FIRMWARE_NAME)) + +define FIRMWARE_UPOWER_INSTALL_IMAGES_CMDS + cp $(@D)/$(FIRMWARE_UPOWER_UPOWER_FIRMWARE_NAME) $(BINARIES_DIR)/upower.bin +endef + +$(eval $(generic-package)) From 86d87085ea2cbbc664715db56eb984ee63a19aa9 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:07 -0700 Subject: [PATCH 1556/3013] board/freescale/common/imx: add support for i.MX 8ULP Signed-off-by: Chris Dimich [Arnout: remove newly introduced shellcheck errors] Signed-off-by: Arnout Vandecappelle --- .../common/imx/imx8-bootloader-prepare.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index b353d506fe4..0f5dff674fe 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -58,6 +58,25 @@ main () rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x920000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULP=y$" "${BR2_CONFIG}"; then + SPL_LOAD_ADDR=0x22020000 + ATF_LOAD_ADDR=0x20040000 + "${HOST_DIR}/bin/mkimage_imx8" -commit > "${BINARIES_DIR}/mkimg.commit" + cat "${BINARIES_DIR}/u-boot.bin" "${BINARIES_DIR}/mkimg.commit" > "${BINARIES_DIR}/u-boot-hash.bin" + rm -f "${BINARIES_DIR}/mkimg.commit" + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -c -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 -ap "${BINARIES_DIR}/tee.bin" a35 0xa6000000 -out "${BINARIES_DIR}/u-boot-atf-container.img" + else + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -c -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 -out "${BINARIES_DIR}/u-boot-atf-container.img" + fi + if [ -e "${BINARIES_DIR}/m33_image.bin" ]; then + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -append "${BINARIES_DIR}/ahab-container.img" -c -upower "${BINARIES_DIR}/upower.bin" -m4 "${BINARIES_DIR}/m33_image.bin" 0 0x1ffc2000 -ap "${BINARIES_DIR}/u-boot-spl.bin" a35 ${SPL_LOAD_ADDR} -out "${BINARIES_DIR}/imx8-boot-sd.bin" + else + "${HOST_DIR}/bin/mkimage_imx8" -soc ULP -append "${BINARIES_DIR}/ahab-container.img" -c -upower "${BINARIES_DIR}/upower.bin" 0 0x1ffc2000 -ap "${BINARIES_DIR}/u-boot-spl.bin" a35 ${SPL_LOAD_ADDR} -out "${BINARIES_DIR}/imx8-boot-sd.bin" + fi + flashbin_size="$(wc -c "${BINARIES_DIR}/imx8-boot-sd.bin" | awk '{print $1}')" + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) + dd if="${BINARIES_DIR}/u-boot-atf-container.img" of="${BINARIES_DIR}/imx8-boot-sd.bin" bs=1K seek=${pad_cnt} else ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin From 552a8cec8cb1a9a66591d075992957ad32547528 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 16:10:41 +0200 Subject: [PATCH 1557/3013] board/chromebook: use global-patch-dir for kernel patch We're going to add hashes soon, so we'll need to have that directory populated with hash files, and it would then be a bit confusing to not have the patch file in the patches directory... Signed-off-by: Yann E. MORIN Cc: Alex Suykov Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - .../linux/0001-linux-4.15-dts-tpm.patch} | 3 +++ configs/chromebook_snow_defconfig | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename board/chromebook/snow/{linux-4.15-dts-tpm.patch => patches/linux/0001-linux-4.15-dts-tpm.patch} (85%) diff --git a/.checkpackageignore b/.checkpackageignore index 4d4fbd340f6..21d1f63f1b6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -26,7 +26,6 @@ board/canaan/k210-soc/post-build.sh Shellcheck board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck board/chromebook/elm/sign.sh Shellcheck board/chromebook/mksd.sh Shellcheck -board/chromebook/snow/linux-4.15-dts-tpm.patch lib_patch.ApplyOrder lib_patch.Upstream board/chromebook/snow/sign.sh Shellcheck board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch lib_patch.Upstream board/cubietech/cubieboard2/post-image.sh Shellcheck diff --git a/board/chromebook/snow/linux-4.15-dts-tpm.patch b/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch similarity index 85% rename from board/chromebook/snow/linux-4.15-dts-tpm.patch rename to board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch index c71ff1b5845..01f452b5638 100644 --- a/board/chromebook/snow/linux-4.15-dts-tpm.patch +++ b/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch @@ -9,6 +9,9 @@ See https://code.google.com/p/chromium/issues/detail?id=220169 and https://lkml.org/lkml/2013/3/4/242 Signed-off-by: Alex Suykov +Upstream: Not Applicable +[yann.morin.1998@free.fr: add Upstream tag] +Signed-off-by: Yann E. MORIN --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index bcb94b716b2..50e355647c6 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_GLOBAL_PATCH_DIR="board/chromebook/snow/patches" BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" @@ -8,7 +9,6 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" -BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.15-dts-tpm.patch" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.15.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 0d91281d7bdfa09be28237bab694e6ac22466541 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 16:10:42 +0200 Subject: [PATCH 1558/3013] board/chromebook-snow: force checking hashes The chromebook-snow config uses a custom kernel version, so add a hash for it. Signed-off-by: Yann E. MORIN Cc: Alex Suykov Signed-off-by: Arnout Vandecappelle --- board/chromebook/snow/patches/linux-headers/linux-headers.hash | 1 + board/chromebook/snow/patches/linux/linux.hash | 2 ++ configs/chromebook_snow_defconfig | 1 + 3 files changed, 4 insertions(+) create mode 120000 board/chromebook/snow/patches/linux-headers/linux-headers.hash create mode 100644 board/chromebook/snow/patches/linux/linux.hash diff --git a/board/chromebook/snow/patches/linux-headers/linux-headers.hash b/board/chromebook/snow/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/chromebook/snow/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/chromebook/snow/patches/linux/linux.hash b/board/chromebook/snow/patches/linux/linux.hash new file mode 100644 index 00000000000..1064af46aa5 --- /dev/null +++ b/board/chromebook/snow/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Localy computed +sha256 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 linux-4.15.tar.xz diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index 50e355647c6..9a5bcce98b1 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_GLOBAL_PATCH_DIR="board/chromebook/snow/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" From 3988f2d9238bc027b5d16219867e8d3c701c0c06 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 16:10:43 +0200 Subject: [PATCH 1559/3013] boards/chromebook-elm: force checking hashes Signed-off-by: Yann E. MORIN Cc: Bilal Wasim Signed-off-by: Arnout Vandecappelle --- board/chromebook/elm/patches/linux-headers/linux-headers.hash | 1 + board/chromebook/elm/patches/linux/linux.hash | 2 ++ configs/chromebook_elm_defconfig | 4 ++++ 3 files changed, 7 insertions(+) create mode 120000 board/chromebook/elm/patches/linux-headers/linux-headers.hash create mode 100644 board/chromebook/elm/patches/linux/linux.hash diff --git a/board/chromebook/elm/patches/linux-headers/linux-headers.hash b/board/chromebook/elm/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/chromebook/elm/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/chromebook/elm/patches/linux/linux.hash b/board/chromebook/elm/patches/linux/linux.hash new file mode 100644 index 00000000000..88aa603ac50 --- /dev/null +++ b/board/chromebook/elm/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 linux-5.10.tar.xz diff --git a/configs/chromebook_elm_defconfig b/configs/chromebook_elm_defconfig index 827d9296314..0e8b6287c3b 100644 --- a/configs/chromebook_elm_defconfig +++ b/configs/chromebook_elm_defconfig @@ -35,3 +35,7 @@ BR2_PACKAGE_HOST_PARTED=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_VBOOT_UTILS=y + +# Misc +BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y From c981800251f984d41594aa86b2fc471511b880ac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 16 Jun 2024 20:07:42 +0200 Subject: [PATCH 1560/3013] package/beecrypt: drop package As advocated by Yann E. Morin [1], drop beecrypt as package is not maintained anymore. This will also avoid the following build failure with gcc 14: blockmode.c: In function 'blockEncryptCTR': blockmode.c:162:42: error: implicit declaration of function 'swapu32' [-Wimplicit-function-declaration] 162 | buf[i] = swapu32(fdback[j]); | ^~~~~~~ [1] https://patchwork.ozlabs.org/project/buildroot/patch/20240615204233.3339310-1-fontaine.fabrice@gmail.com Fixes: - http://autobuild.buildroot.org/results/651e0e31305b1f211071d94ea74f7b7a5793b03e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 3 - Config.in.legacy | 7 + package/Config.in | 1 - .../0001-cppglue.cxx-cplusplus-only.patch | 28 --- package/beecrypt/0002-build-system.patch | 173 ------------------ ...3-don-t-check-for-cplusplus-compiler.patch | 27 --- package/beecrypt/Config.in | 10 - package/beecrypt/beecrypt.hash | 3 - package/beecrypt/beecrypt.mk | 39 ---- 9 files changed, 7 insertions(+), 284 deletions(-) delete mode 100644 package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch delete mode 100644 package/beecrypt/0002-build-system.patch delete mode 100644 package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch delete mode 100644 package/beecrypt/Config.in delete mode 100644 package/beecrypt/beecrypt.hash delete mode 100644 package/beecrypt/beecrypt.mk diff --git a/.checkpackageignore b/.checkpackageignore index 21d1f63f1b6..31be0b99e38 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -366,9 +366,6 @@ package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch lib_patch.Upstre package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch lib_patch.Upstream package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch lib_patch.Upstream package/bearssl/0001-Fix-missing-objdir-dependency.patch lib_patch.Upstream -package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch lib_patch.Upstream -package/beecrypt/0002-build-system.patch lib_patch.Upstream -package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch lib_patch.Upstream package/benejson/0001-c-std.patch lib_patch.Upstream package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch lib_patch.Upstream package/berkeleydb/0001-cwd-db_config.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index a5f76384152..78dcabed637 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -160,6 +160,13 @@ config BR2_PACKAGE_CGIC help the cgic upstream no longer exists. +config BR2_PACKAGE_BEECRYPT + bool "beecrypt package removed" + select BR2_LEGACY + help + The beecrypt package was removed as it is not maintained + anymore (no release since 2015). + config BR2_PACKAGE_VERSAL_FIRMWARE bool "versal-firmware has been replaced by xilinx-prebuilt" select BR2_TARGET_XILINX_PREBUILT diff --git a/package/Config.in b/package/Config.in index 8dc8b5ed5df..9806f6dc256 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1540,7 +1540,6 @@ endmenu menu "Crypto" source "package/bearssl/Config.in" - source "package/beecrypt/Config.in" source "package/botan/Config.in" source "package/ca-certificates/Config.in" source "package/cryptodev-linux/Config.in" diff --git a/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch b/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch deleted file mode 100644 index 298e3eba93c..00000000000 --- a/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch +++ /dev/null @@ -1,28 +0,0 @@ -Makefile.am: Only compile/link cppglue.cxx if --with-cplusplus is used - -Bloats libbeecrypt for no use and breaks build on systems without a C++ -compiler. - -Signed-off-by: Peter Korsgaard ---- - Makefile.am | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -Index: beecrypt-4.2.1/Makefile.am -=================================================================== ---- beecrypt-4.2.1.orig/Makefile.am -+++ beecrypt-4.2.1/Makefile.am -@@ -62,7 +62,12 @@ - - lib_LTLIBRARIES = libbeecrypt.la - --libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx -+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c -+ -+if WITH_CPLUSPLUS -+libbeecrypt_la_SOURCES += cppglue.cxx -+endif -+ - libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) - libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS) - libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) diff --git a/package/beecrypt/0002-build-system.patch b/package/beecrypt/0002-build-system.patch deleted file mode 100644 index 05746899ef8..00000000000 --- a/package/beecrypt/0002-build-system.patch +++ /dev/null @@ -1,173 +0,0 @@ -Fix build with BR2_ENABLE_DEBUG=yes, no need for expert mode anymore - -Otherwise configure issues this error message: -configure: error: --enable-debug cannot be used in conjunction with --enable-expert-mode - -Downloaded from Gentoo: -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch?revision=1.2&view=markup - -This patch also removes the hard-coded CFLAGS provided by beecrypt in favour -of the CFLAGS provided by buildroot. - -Signed-off-by: Bernd Kuhls - ---- beecrypt-4.2.1/configure.ac -+++ beecrypt-4.2.1/configure.ac -@@ -11,7 +11,7 @@ - - # Checks for package options - AC_ARG_ENABLE(expert-mode, [ --enable-expert-mode follow user-defined CFLAGS settings [[default=no]]],[ -- ac_enable_expert_mode=yes -+ ac_enable_expert_mode=$enableval - ],[ - if test "X$CFLAGS" != "X"; then - echo "enabling expert mode" -@@ -25,7 +25,7 @@ - if test "$ac_enable_expert_mode" = yes; then - AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode]) - fi -- ac_enable_debug=yes -+ ac_enable_debug=$enableval - ],[ - ac_enable_debug=no - ]) -@@ -456,7 +456,7 @@ - ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`" - ]) - AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [ -- ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'` -+ ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'` - ]) - fi - fi ---- beecrypt-4.2.1/acinclude.m4 -+++ beecrypt-4.2.1/acinclude.m4 -@@ -498,15 +498,6 @@ AC_DEFUN([BEE_GNU_CC],[ - AC_SUBST(OPENMP_LIBS,"-lgomp") - fi - case $bc_target_arch in -- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona) -- CC="$CC -m64" -- ;; -- i[[3456]]86 | \ -- pentium* | \ -- athlon*) -- CC="$CC -m32" -- CCAS="$CCAS -m32" -- ;; - ia64) - case $target_os in - # HP/UX on Itanium needs to be told that a long is 64-bit! -@@ -525,17 +516,8 @@ AC_DEFUN([BEE_GNU_CC],[ - aix*) - CC="$CC -maix64" - ;; -- linux*) -- CC="$CC -m64" -- ;; - esac - ;; -- sparc | sparcv8*) -- CC="$CC -m32" -- ;; -- sparc64 | sparcv9*) -- CC="$CC -m64" -- ;; - esac - # Certain platforms needs special flags for multi-threaded code - if test "$ac_enable_threads" = yes; then -@@ -646,14 +646,6 @@ dnl BEE_GNU_CXX - AC_DEFUN([BEE_GNU_CXX],[ - AC_REQUIRE([AC_PROG_CXX]) - case $bc_target_arch in -- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona | core2) -- CXX="$CXX -m64" -- ;; -- i[[3456]]86 | \ -- pentium* | \ -- athlon*) -- CXX="$CXX -m32" -- ;; - ia64) - case $target_os in - # HP/UX on Itanium needs to be told that a long is 64-bit! -@@ -672,17 +664,8 @@ AC_DEFUN([BEE_GNU_CXX],[ - aix*) - CXX="$CXX -maix64" - ;; -- linux*) -- CXX="$CXX -m64" -- ;; - esac - ;; -- sparc | sparcv8*) -- CXX="$CXX -m32" -- ;; -- sparc64 | sparcv9*) -- CXX="$CXX -m64" -- ;; - esac - # Certain platforms needs special flags for multi-threaded code - if test "$ac_enable_threads" = yes; then ---- beecrypt-4.2.1/java/Makefile.am -+++ beecrypt-4.2.1/java/Makefile.am -@@ -26,7 +26,7 @@ - - INCLUDES = -I$(top_srcdir)/include - --libaltdir=$(prefix)/lib@LIBALT@ -+libaltdir=$(libdir) - - libalt_LTLIBRARIES = libbeecrypt_java.la - ---- beecrypt-4.2.1/acinclude.m4 -+++ beecrypt-4.2.1/acinclude.m4 -@@ -1589,20 +1589,5 @@ - AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t) - ]) -- --AH_BOTTOM([ --#if ENABLE_THREADS --# ifndef _REENTRANT --# define _REENTRANT --# endif --# if LINUX --# define _LIBC_REENTRANT --# endif --#else --# ifdef _REENTRANT --# undef _REENTRANT --# endif --#endif --]) - - - dnl BEE_THREAD_LOCAL_STORAGE -@@ -1623,7 +1609,5 @@ - ]) - - AH_BOTTOM([ --#if !ENABLE_THREAD_LOCAL_STORAGE --# define __thread --#endif -+#include "config.threads.h" - ]) ---- beecrypt-4.2.1/config.threads.h -+++ beecrypt-4.2.1/config.threads.h -@@ -0,0 +1,16 @@ -+#if ENABLE_THREADS -+# ifndef _REENTRANT -+# define _REENTRANT -+# endif -+# if LINUX -+# define _LIBC_REENTRANT -+# endif -+#else -+# ifdef _REENTRANT -+# undef _REENTRANT -+# endif -+#endif -+ -+#if !ENABLE_THREAD_LOCAL_STORAGE -+# define __thread -+#endif diff --git a/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch b/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch deleted file mode 100644 index 32f167996f2..00000000000 --- a/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -configure.ac: don't check for C++ compiler - -Signed-off-by: Fabrice Fontaine - -diff -durN beecrypt-4.2.1-orig/configure.ac beecrypt-4.2.1/configure.ac ---- beecrypt-4.2.1-orig/configure.ac 2019-03-01 19:58:16.516117640 +0100 -+++ beecrypt-4.2.1/configure.ac 2019-03-01 21:10:17.707391803 +0100 -@@ -119,9 +119,6 @@ - - # Checks for C compiler and preprocessor - AC_PROG_CC --AC_PROG_CPP --AC_PROG_CXX --AC_PROG_CXXCPP - AM_PROG_AS - AC_PROG_LD - AC_PROG_LN_S -@@ -133,9 +130,6 @@ - AC_LANG_PUSH(C) - AC_OPENMP - AC_LANG_POP(C) --AC_LANG_PUSH(C++) --AC_OPENMP --AC_LANG_POP(C++) - - # Checks for compiler characteristics and flags - if test "$ac_enable_expert_mode" = no; then diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in deleted file mode 100644 index 9aec85afdb9..00000000000 --- a/package/beecrypt/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -comment "beecrypt needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_BEECRYPT - bool "beecrypt" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Beecrypt is a general-purpose cryptography library. - - http://beecrypt.sf.net diff --git a/package/beecrypt/beecrypt.hash b/package/beecrypt/beecrypt.hash deleted file mode 100644 index 2f84007b451..00000000000 --- a/package/beecrypt/beecrypt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d beecrypt-4.2.1.tar.gz -sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING.LIB diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk deleted file mode 100644 index 20e1a122d04..00000000000 --- a/package/beecrypt/beecrypt.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# beecrypt -# -################################################################################ - -BEECRYPT_VERSION = 4.2.1 -BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION) -BEECRYPT_AUTORECONF = YES -BEECRYPT_INSTALL_STAGING = YES -BEECRYPT_LICENSE = LGPL-2.1+ -BEECRYPT_LICENSE_FILES = COPYING.LIB -BEECRYPT_CPE_ID_VALID = YES - -BEECRYPT_CONF_OPTS = \ - --disable-expert-mode \ - --without-java \ - --without-python \ - --disable-openmp \ - --without-cplusplus - -# disable optimized m68k assembly as it doesn't compile for coldfire -ifeq ($(BR2_m68k_cf),y) -BEECRYPT_CONF_OPTS += --enable-debug -endif - -# arm asm optimization doesn't work for thumb-only -ifeq ($(BR2_arm):$(BR2_ARM_CPU_HAS_ARM),y:) -BEECRYPT_CONF_OPTS += --enable-debug -endif - -# automake/libtool uses the C++ compiler to link libbeecrypt because of -# (the optional) cppglue.cxx. Force it to use the C compiler instead. -define BEECRYPT_LINK_WITH_CC - $(SED) 's/--tag=CXX/--tag=CC/g' $(@D)/Makefile -endef -BEECRYPT_POST_CONFIGURE_HOOKS += BEECRYPT_LINK_WITH_CC - -$(eval $(autotools-package)) From 1eb7d2b8600e08a553aab84b2767c67e72da7904 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Mon, 24 Jun 2024 16:16:44 -0500 Subject: [PATCH 1561/3013] board/beagleboard: add initial support for the beagleplay Add the initial baseport level support for The BeagleBoard.org Foundation's BeaglePlay board. Signed-off-by: Bryan Brattlof Tested-by: Paresh Bhagat [Romain: use BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x"] Signed-off-by: Romain Naour --- DEVELOPERS | 2 + board/beagleboard/beagleplay/extlinux.conf | 5 ++ board/beagleboard/beagleplay/genimage.cfg | 39 +++++++++++++ .../arm-trusted-firmware.hash | 2 + .../patches/linux-headers/linux-headers.hash | 1 + .../beagleplay/patches/linux/linux.hash | 2 + .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 + .../beagleplay/patches/uboot/uboot.hash | 2 + board/beagleboard/beagleplay/post-build.sh | 5 ++ board/beagleboard/beagleplay/readme.txt | 39 +++++++++++++ configs/beagleplay_defconfig | 55 +++++++++++++++++++ 11 files changed, 154 insertions(+) create mode 100644 board/beagleboard/beagleplay/extlinux.conf create mode 100644 board/beagleboard/beagleplay/genimage.cfg create mode 100644 board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash create mode 100644 board/beagleboard/beagleplay/patches/linux/linux.hash create mode 100644 board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash create mode 100644 board/beagleboard/beagleplay/patches/uboot/uboot.hash create mode 100755 board/beagleboard/beagleplay/post-build.sh create mode 100644 board/beagleboard/beagleplay/readme.txt create mode 100644 configs/beagleplay_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 6f8c33fb5b0..0faad55f97a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -559,8 +559,10 @@ F: package/pdmenu/ N: Bryan Brattlof F: board/ti/ +F: board/beagleboard/beagleplay/ F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-r5-loader/ +F: configs/beagleplay_defconfig F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig diff --git a/board/beagleboard/beagleplay/extlinux.conf b/board/beagleboard/beagleplay/extlinux.conf new file mode 100644 index 00000000000..2b3aa7349e8 --- /dev/null +++ b/board/beagleboard/beagleplay/extlinux.conf @@ -0,0 +1,5 @@ +label beagleplay-buildroot + kernel /Image + fdtdir / + devicetree /k3-am625-beagleplay.dtb + append console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 diff --git a/board/beagleboard/beagleplay/genimage.cfg b/board/beagleboard/beagleplay/genimage.cfg new file mode 100644 index 00000000000..4b516dc7146 --- /dev/null +++ b/board/beagleboard/beagleplay/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "k3-am625-beagleplay.dtb", + "tiboot3.bin", + } + + file tispl.bin { + image = tispl.bin_unsigned + } + + file u-boot.img { + image = u-boot.img_unsigned + } + + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..02714d06a09 --- /dev/null +++ b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz diff --git a/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash b/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/beagleboard/beagleplay/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/beagleboard/beagleplay/patches/linux/linux.hash b/board/beagleboard/beagleplay/patches/linux/linux.hash new file mode 100644 index 00000000000..a53ec1f4e7f --- /dev/null +++ b/board/beagleboard/beagleplay/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 24fa01fb989c7a3e28453f117799168713766e119c5381dac30115f18f268149 linux-6.9.tar.xz diff --git a/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 00000000000..97a2b4eaf95 --- /dev/null +++ b/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/beagleboard/beagleplay/patches/uboot/uboot.hash b/board/beagleboard/beagleplay/patches/uboot/uboot.hash new file mode 100644 index 00000000000..97a2b4eaf95 --- /dev/null +++ b/board/beagleboard/beagleplay/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/beagleboard/beagleplay/post-build.sh b/board/beagleboard/beagleplay/post-build.sh new file mode 100755 index 00000000000..f11dc6c3131 --- /dev/null +++ b/board/beagleboard/beagleplay/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux.conf diff --git a/board/beagleboard/beagleplay/readme.txt b/board/beagleboard/beagleplay/readme.txt new file mode 100644 index 00000000000..eed87e6d3cb --- /dev/null +++ b/board/beagleboard/beagleplay/readme.txt @@ -0,0 +1,39 @@ +BeagleBoard's BeaglePlay + +Description +=========== + +This configuration will build a complete image for the BeaglePlay +board: https://www.beagleboard.org/boards/beagleplay + +How to Build +============ + +Select the default configuration for the target: + + $ make beagleplay_defconfig + +Optional: modify the configuration: + + $ make menuconfig + +NOTE: The AM625x processor has multiple security variants. You must +ensure the matching tiboot3.bin is uses or the board will not boot. +The BeaglePlay uses the General Purpose (GP) variant, ensure you use +the tiboot3-am62x-gp-evm.bin + +Build: + + $ make + +To copy the resultimg output image file to an SD card use dd: + + $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +This configuration has both the boot/ and root/ partitions which is +capable of booting from the bootloaders embedded in the eMMC as well +as when using holding the USR button to boot from the SD card. + diff --git a/configs/beagleplay_defconfig b/configs/beagleplay_defconfig new file mode 100644 index 00000000000..19b12825c5c --- /dev/null +++ b/configs/beagleplay_defconfig @@ -0,0 +1,55 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleplay/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleplay/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/beagleboard/beagleplay/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-beagleplay" +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y +BR2_PACKAGE_WILINK_BT_FIRMWARE=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_beagleplay_r5" +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_beagleplay_a53" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.img_unsigned" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin_unsigned" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 77211ae347d4d9b8efe05822609a7caa0ee9d9b0 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 17 Jun 2024 18:43:24 +0000 Subject: [PATCH 1562/3013] package/mtd: fix tests compiling when disabled Upstream changed the '--enable-tests' switch to '--with-tests' in release 2.2.0 See https://github.com/sigma-star/mtd-utils/commit/edc83b61745e6ee7fa9c9502eb520493832b1e9c Fixes: - http://autobuild.buildroot.net/results/52a289c7033005b7a29b0f2bc6aa5056cbdabb34/ Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- package/mtd/mtd.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index a20e00e9dab..faf4c55eda4 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -56,9 +56,9 @@ MTD_CONF_OPTS += --disable-ubihealthd endif ifeq ($(BR2_PACKAGE_MTD_TESTS),y) -MTD_CONF_OPTS += --enable-tests +MTD_CONF_OPTS += --with-tests else -MTD_CONF_OPTS += --disable-tests +MTD_CONF_OPTS += --without-tests endif # If extended attributes are required, the acl package must @@ -75,7 +75,7 @@ HOST_MTD_CONF_OPTS = \ --with-jffs \ --with-ubifs \ --without-crypto \ - --disable-tests + --without-tests MKFS_JFFS2 = $(HOST_DIR)/sbin/mkfs.jffs2 SUMTOOL = $(HOST_DIR)/sbin/sumtool From 8aa7d057a797bbb60e741889de1d7cc540a1cd87 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 17 Jun 2024 18:43:25 +0000 Subject: [PATCH 1563/3013] package/mtd: make lzo an optional dependency Upstream fixed lzo to be an optional dependency in release 2.2.0[1] See https://github.com/sigma-star/mtd-utils/commit/ab4628e756ab73d8193ed62b591417dad561b298 Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- package/mtd/Config.in | 2 -- package/mtd/mtd.mk | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 3ba48da645f..9e5bb1735be 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -12,12 +12,10 @@ if BR2_PACKAGE_MTD config BR2_PACKAGE_MTD_JFFS_UTILS bool - select BR2_PACKAGE_LZO select BR2_PACKAGE_ZLIB config BR2_PACKAGE_MTD_UBIFS_UTILS bool - select BR2_PACKAGE_LZO select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_ZLIB diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index faf4c55eda4..f790ef5ec42 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -20,17 +20,24 @@ MTD_DEPENDENCIES += libexecinfo MTD_LDFLAGS += -lexecinfo endif +ifeq ($(BR2_PACKAGE_LZO),y) +MTD_DEPENDENCIES += lzo +MTD_CONF_OPTS += --with-lzo +else +MTD_CONF_OPTS += --without-lzo +endif + MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)" ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) -MTD_DEPENDENCIES += zlib lzo host-pkgconf +MTD_DEPENDENCIES += zlib host-pkgconf MTD_CONF_OPTS += --with-jffs else MTD_CONF_OPTS += --without-jffs endif ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) -MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf +MTD_DEPENDENCIES += util-linux zlib host-pkgconf MTD_CONF_OPTS += --with-ubifs # crypto needs linux/hash_info.h ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy) From bb19ffeaab5ba4be0a1033ca326b25d4d4e8203f Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 17 Jun 2024 18:43:26 +0000 Subject: [PATCH 1564/3013] package/mtd: make zlib an optional dependency Upstream changed zlib to be an optional dependency in release 2.2.0[1] See https://github.com/sigma-star/mtd-utils/commit/2465754716634422620b4577e0b7ba79c4ce1a39 Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- package/mtd/Config.in | 2 -- package/mtd/mtd.mk | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 9e5bb1735be..57a562c1084 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -12,13 +12,11 @@ if BR2_PACKAGE_MTD config BR2_PACKAGE_MTD_JFFS_UTILS bool - select BR2_PACKAGE_ZLIB config BR2_PACKAGE_MTD_UBIFS_UTILS bool select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_ZLIB comment "MTD tools selection" diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index f790ef5ec42..fe40cf6c060 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -27,17 +27,24 @@ else MTD_CONF_OPTS += --without-lzo endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +MTD_DEPENDENCIES += zlib +MTD_CONF_OPTS += --with-zlib +else +MTD_CONF_OPTS += --without-zlib +endif + MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)" ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) -MTD_DEPENDENCIES += zlib host-pkgconf +MTD_DEPENDENCIES += host-pkgconf MTD_CONF_OPTS += --with-jffs else MTD_CONF_OPTS += --without-jffs endif ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) -MTD_DEPENDENCIES += util-linux zlib host-pkgconf +MTD_DEPENDENCIES += util-linux host-pkgconf MTD_CONF_OPTS += --with-ubifs # crypto needs linux/hash_info.h ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy) From 94d4ab11fea1b964991ba64e3b2964de467ec9fc Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Fri, 28 Jun 2024 20:17:40 +0800 Subject: [PATCH 1565/3013] package/linux-firmware: add option to install ARM Mali CSF firmwares Arm Mali GPUs that belong to the 10th generation of the hardware architecture need a binary firmware to implement the full specification. For the panthor kernel driver to be able to execute jobs on the GPU it needs this firmware. Signed-off-by: Andy Yan Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 10 ++++++++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 1f00afe4e87..265b72e5622 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -691,4 +691,14 @@ config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_ATOMISP endmenu +menu "GPU Firmware" + +config BR2_PACKAGE_LINUX_FIRMWARE_ARM_MALI_CSF + bool "Arm Mali CSF firmware" + help + Firmware files for Arm Mali 10th generation GPU + needed by the linux panthor kernel driver. + +endmenu + endif diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index beab3749653..895f3952f47 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -897,6 +897,11 @@ LINUX_FIRMWARE_FILES += intel/ipu/shisp_2401a0_v21.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.ivsc endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ARM_MALI_CSF),y) +LINUX_FIRMWARE_FILES += arm/mali/arch*/mali_csffw.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mali_csffw +endif + ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) define LINUX_FIRMWARE_BUILD_CMDS From 00484ef59c190bb20001684590ea02ff613b33ee Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:25 +0200 Subject: [PATCH 1566/3013] package/qt6: bump version to 6.7.2 For details see [1], [2], [3], [4], [5], [6], [7], [8], [9], [10] and [11]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md [3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md [4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md [5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md [6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md [7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md [8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md [9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md [10] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md [11] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.2/release-note.md Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6.mk | 4 ++-- package/qt6/qt6base/qt6base.hash | 4 ++-- package/qt6/qt6core5compat/qt6core5compat.hash | 4 ++-- package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++-- package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- package/qt6/qt6svg/qt6svg.hash | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 1edb252c967..372a92f413a 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -4,8 +4,8 @@ # ################################################################################ -QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).3 +QT6_VERSION_MAJOR = 6.7 +QT6_VERSION = $(QT6_VERSION_MAJOR).2 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index cb111bd405f..b1b81b4992b 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256 -sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz.sha256 +sha256 c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 qtbase-everywhere-src-6.7.2.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash index 0735df3af28..36421b53ca2 100644 --- a/package/qt6/qt6core5compat/qt6core5compat.hash +++ b/package/qt6/qt6core5compat/qt6core5compat.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 -sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qt5compat-everywhere-src-6.7.2.tar.xz.sha256 +sha256 8826b5189efc4d9bdb64fdb1aa89d0fdf4e53c60948ed7995621ed046e38c003 qt5compat-everywhere-src-6.7.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash index 98c89319626..1b854284a38 100644 --- a/package/qt6/qt6serialbus/qt6serialbus.hash +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256 -sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtserialbus-everywhere-src-6.7.2.tar.xz.sha256 +sha256 67641ca99b455746d7d956c516dfaa5f2c48696834c71d5720d63e736d374b2b qtserialbus-everywhere-src-6.7.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 9341978d862..c8708c22312 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 -sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtserialport-everywhere-src-6.7.2.tar.xz.sha256 +sha256 21c34cd1161cb5197bcec662d26a17647b59b6fdff5c364576883c42dbd3b4fc qtserialport-everywhere-src-6.7.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6svg/qt6svg.hash b/package/qt6/qt6svg/qt6svg.hash index bb239cb012a..7adfd7f2fb7 100644 --- a/package/qt6/qt6svg/qt6svg.hash +++ b/package/qt6/qt6svg/qt6svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256 -sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtsvg-everywhere-src-6.7.2.tar.xz.sha256 +sha256 fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01 qtsvg-everywhere-src-6.7.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From e4e4fd4aeaf4bcd8a98d2fec8d59ce66a2dc4b93 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:26 +0200 Subject: [PATCH 1567/3013] package/qt6/qt6base: add blind option to enable GUI support on host We need host-qt6base with Gui support when building host-qt6shadertools, otherwise the build is skipped and no qsb host tool is generated. qt6shadertools fail to build if qsb is not available. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/qt6/Config.in.host | 5 +++++ package/qt6/qt6base/Config.in.host | 4 ++++ package/qt6/qt6base/qt6base.mk | 27 ++++++++++++++++++++++++++- 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 package/qt6/Config.in.host create mode 100644 package/qt6/qt6base/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 9cdca626330..66f3a6fa9d6 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -92,6 +92,7 @@ menu "Host utilities" source "package/python3/Config.in.host" source "package/qemu/Config.in.host" source "package/qoriq-rcw/Config.in.host" + source "package/qt6/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" source "package/riscv-isa-sim/Config.in.host" diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host new file mode 100644 index 00000000000..dfe7865c571 --- /dev/null +++ b/package/qt6/Config.in.host @@ -0,0 +1,5 @@ +if BR2_PACKAGE_QT6 + +source "package/qt6/qt6base/Config.in.host" + +endif diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host new file mode 100644 index 00000000000..326c06278e8 --- /dev/null +++ b/package/qt6/qt6base/Config.in.host @@ -0,0 +1,4 @@ +# Select this if you need host qt6 tools that require the Qt::Gui module (e.g. +# Qt Shader Baker(qsb)). +config BR2_PACKAGE_HOST_QT6BASE_GUI + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 211808d2af7..57f88e7779b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -84,7 +84,6 @@ HOST_QT6BASE_DEPENDENCIES = \ host-pcre2 \ host-zlib HOST_QT6BASE_CONF_OPTS = \ - -DFEATURE_gui=OFF \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ @@ -98,6 +97,32 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_system_pcre2=ON \ -DFEATURE_system_zlib=ON +# We need host-qt6base with Gui support when building host-qt6shadertools, +# otherwise the build is skipped and no qsb host tool is generated. +# qt6shadertools fail to build if qsb is not available. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y) +HOST_QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=OFF \ + -DFEATURE_vulkan=OFF \ + -DFEATURE_linuxfb=ON \ + -DFEATURE_xcb=OFF \ + -DFEATURE_opengl=OFF -DINPUT_opengl=no \ + -DFEATURE_harfbuzz=OFF \ + -DFEATURE_png=OFF \ + -DFEATURE_gif=OFF \ + -DFEATURE_jpeg=OFF \ + -DFEATURE_printsupport=OFF \ + -DFEATURE_kms=OFF \ + -DFEATURE_fontconfig=OFF \ + -DFEATURE_widgets=OFF \ + -DFEATURE_libinput=OFF \ + -DFEATURE_tslib=OFF \ + -DFEATURE_eglfs=OFF +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option. From f7692d6533f377f102a27f11cde23d09b9aca16e Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:27 +0200 Subject: [PATCH 1568/3013] package/qt6/qt6base: add blind option to enable Network support on host The Network module is explicitly required by qt6tools. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 326c06278e8..286da0ff03c 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -2,3 +2,8 @@ # Qt Shader Baker(qsb)). config BR2_PACKAGE_HOST_QT6BASE_GUI bool + +# Select this if you need host qt6 tools that require the Qt::Network module +# (e.g. Qt Tools). +config BR2_PACKAGE_HOST_QT6BASE_NETWORK + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 57f88e7779b..8ab4d408bb2 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -88,7 +88,6 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ -DFEATURE_testlib=OFF \ - -DFEATURE_network=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -123,6 +122,13 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +# The Network module is explicitly required by qt6tools. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option. From bab745cb97fce3b50bae50ab4743e164fd18b77b Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:28 +0200 Subject: [PATCH 1569/3013] package/qt6/qt6base: add blind option to enable Test support on host We need host-qt6base with Testlib support when building host-qt6declarative with QuickTest support. QuickTest support is further required for building the qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is not available. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 286da0ff03c..80bc13c7dc5 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI # (e.g. Qt Tools). config BR2_PACKAGE_HOST_QT6BASE_NETWORK bool + +# Select this if you need host qt6 tools that require the Qt::Test module +# (e.g. qmltestrunner). +config BR2_PACKAGE_HOST_QT6BASE_TEST + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 8ab4d408bb2..c6bd15fec20 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ - -DFEATURE_testlib=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -129,6 +128,16 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +# We need host-qt6base with Testlib support when building host-qt6declarative +# with QuickTest support. QuickTest support is further required for building the +# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is +# not available. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option. From 663c9ead3c00bd4ba1f915ea9b4d7b1785484374 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:29 +0200 Subject: [PATCH 1570/3013] package/qt6/qt6base: add blind option to enable Sql support on host We need host qt6base with Sql support for host-qt6tools to generate the qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not available. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 80bc13c7dc5..46fb6688173 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK # (e.g. qmltestrunner). config BR2_PACKAGE_HOST_QT6BASE_TEST bool + +# Select this if you need host qt6 tools that require the Qt::Sql module +# (e.g. qhelpgenerator). +config BR2_PACKAGE_HOST_QT6BASE_SQL + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c6bd15fec20..6cb82d9a942 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -86,7 +86,6 @@ HOST_QT6BASE_DEPENDENCIES = \ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ - -DFEATURE_sql=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -128,6 +127,15 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +# We need host qt6base with Sql support for host-qt6tools to generate the +# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not +# available. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF +endif + # We need host-qt6base with Testlib support when building host-qt6declarative # with QuickTest support. QuickTest support is further required for building the # qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is From f697bb2f2501e507877952f6c5a816ba8452be69 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:30 +0200 Subject: [PATCH 1571/3013] package/qt6/qt6shadertools: new package The Qt6::Gui module is needed when building the 'Qt Shader Baker' (qsb) host tool. Qsb is needed for converting the Qt6 Vulkan GLSL source code to platform specific shader languages which is then later copied to target. For more details take a look at: https://doc.qt.io/qt-6/qtshadertools-overview.html and https://doc.qt.io/qt-6/qshaderbaker.html We need host-qt6base with Gui support when building host-qt6shadertools, otherwise the build is skipped and no qsb host tool is generated: Skipping the build as the condition "TARGET Qt::Gui" is not met. qt6shadertools fail to build if qsb is not available: Failed to find the host tool "Qt6::qsb". It is part of the Qt6ShaderToolsTools package, but the package could not be found. Make sure you have built and installed the host ShaderTools module, which will ensure the creation of the Qt6ShaderToolsTools package. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6shadertools/Config.in | 17 ++++++++ .../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++ package/qt6/qt6shadertools/qt6shadertools.mk | 42 +++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 package/qt6/qt6shadertools/Config.in create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 276a0217ab2..b7e95a68857 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" +source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" endif diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in new file mode 100644 index 00000000000..7f207c15413 --- /dev/null +++ b/package/qt6/qt6shadertools/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_QT6SHADERTOOLS + bool "qt6shadertools" + # We need host-qt6base with Gui support when building + # host-qt6shadertools (itself a dependency of target + # qt6shadertools), otherwise the build is skipped and no qsb + # host tool is generated. + select BR2_PACKAGE_HOST_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_GUI + help + Qt is a cross-platform application and UI framework for + developers using C++. + + The Qt Shader Tools module builds on the SPIR-V Open + Source Ecosystem as described at the Khronos SPIR-V web + site. + + https://doc.qt.io/qt-6/qtshadertools-index.html diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash new file mode 100644 index 00000000000..9cb423c90f1 --- /dev/null +++ b/package/qt6/qt6shadertools/qt6shadertools.hash @@ -0,0 +1,10 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtshadertools-everywhere-src-6.7.2.tar.xz.sha256 +sha256 edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1 qtshadertools-everywhere-src-6.7.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk new file mode 100644 index 00000000000..660dc5a78d4 --- /dev/null +++ b/package/qt6/qt6shadertools/qt6shadertools.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# qt6shadertools +# +################################################################################ + +QT6SHADERTOOLS_VERSION = $(QT6_VERSION) +QT6SHADERTOOLS_SITE = $(QT6_SITE) +QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz +QT6SHADERTOOLS_INSTALL_STAGING = YES +QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SHADERTOOLS_CMAKE_BACKEND = ninja + +QT6SHADERTOOLS_LICENSE = \ + Apache-2.0 or MIT (SPIRV-Cross), \ + GPL-2.0 or LGPL-3.0 or GPL-3.0, \ + GPL-3.0 (tests), GFDL-1.3 no invariants (docs), \ + GPL-3.0 WITH Qt-GPL-exception-1.0 (tools) + +QT6SHADERTOOLS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6SHADERTOOLS_CONF_OPTS = \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SHADERTOOLS_DEPENDENCIES = \ + host-pkgconf \ + qt6base \ + host-qt6shadertools + +HOST_QT6SHADERTOOLS_DEPENDENCIES = \ + host-qt6base + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 2445c26339fc43ac9cda71ab2af5c3584c1f7945 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:31 +0200 Subject: [PATCH 1572/3013] package/qt6/qt6svg: allow building for host Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6svg/qt6svg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk index 25e87dd2087..a9d7eaef510 100644 --- a/package/qt6/qt6svg/qt6svg.mk +++ b/package/qt6/qt6svg/qt6svg.mk @@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \ qt6base $(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 2ecd58b5c1f65e81b4522310460bf7986e02ddce Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:32 +0200 Subject: [PATCH 1573/3013] package/qt6/qt6languageserver: new package Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6languageserver/Config.in | 9 +++++ .../qt6languageserver/qt6languageserver.hash | 11 ++++++ .../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/qt6/qt6languageserver/Config.in create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index b7e95a68857..81682af476d 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" +source "package/qt6/qt6languageserver/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in new file mode 100644 index 00000000000..cfbad858dfe --- /dev/null +++ b/package/qt6/qt6languageserver/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_QT6LANGUAGESERVER + bool "qt6languageserver" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6languageserver module. + + https://github.com/qt/qtlanguageserver diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash new file mode 100644 index 00000000000..7266474428c --- /dev/null +++ b/package/qt6/qt6languageserver/qt6languageserver.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtlanguageserver-everywhere-src-6.7.2.tar.xz.sha256 +sha256 b659fe655144ffa061e3ae509eadb42ae373230517295a96935434340e101a92 qtlanguageserver-everywhere-src-6.7.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk new file mode 100644 index 00000000000..7ef5b9d92de --- /dev/null +++ b/package/qt6/qt6languageserver/qt6languageserver.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# qt6languageserver +# +################################################################################ + +QT6LANGUAGESERVER_VERSION = $(QT6_VERSION) +QT6LANGUAGESERVER_SITE = $(QT6_SITE) +QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz +QT6LANGUAGESERVER_INSTALL_STAGING = YES +QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6LANGUAGESERVER_CMAKE_BACKEND = ninja + +QT6LANGUAGESERVER_LICENSE = \ + GPL-2.0 or LGPL-3.0 or GPL-3.0, \ + GPL-3.0 (tests) + +QT6LANGUAGESERVER_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6LANGUAGESERVER_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6LANGUAGESERVER_DEPENDENCIES = \ + qt6base + +$(eval $(cmake-package)) From 9e50b643ad9a3afb7d2201faef7ac6385e5c3c52 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:02 -0700 Subject: [PATCH 1574/3013] package/freescale-imx/imx-vpu-hantro-daemon: bump to version 1.1.9 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- .../imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash | 2 +- .../imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash index 2992baead8b..0fd64cdf9d1 100644 --- a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 111cb6d5970f76aa3619cfd1a59a251d590fc474f84aad2d4d4083c2a4264fc8 imx-vpu-hantro-daemon-1.1.7.tar.gz +sha256 80d6620063fd5e5506b05c907677b579d471a9b6daa8b26ffb963110cc680bf9 imx-vpu-hantro-daemon-1.1.9.tar.gz sha256 bb645f02b260955f333348100e40af76253e2cd8b116bac047230439dd53ec5a LICENSE.txt diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk index ab4746beb40..12ec055f928 100644 --- a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_DAEMON_VERSION = 1.1.7 +IMX_VPU_HANTRO_DAEMON_VERSION = 1.1.9 IMX_VPU_HANTRO_DAEMON_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_DAEMON_LICENSE = NXP Semiconductor Software License Agreement IMX_VPU_HANTRO_DAEMON_LICENSE_FILES = LICENSE.txt From f69f957f289fc715ab913629212448d3799dd168 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 11 Jun 2024 11:00:03 -0700 Subject: [PATCH 1575/3013] package/freescale-imx/imx-vpu-hantro-vc: bump to version 1.9.1 - To match NXP 6.1.55-2.2.0 release. - EULA/COPYING: update to LA_OPT_NXP_Software_License v49. Signed-off-by: Chris Dimich Signed-off-by: Arnout Vandecappelle --- .../freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash | 6 +++--- .../freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash index bd9bc37c1f7..7f6193e3970 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa imx-vpu-hantro-vc-1.9.0.bin -sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING -sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA +sha256 84fcefa0619def2f009ca6651c5cffcda57fed29cd7060ef68be48c5d0d7814b imx-vpu-hantro-vc-1.9.1.bin +sha256 de37a0bcbf1717b910c1a53ea6eab853c404e61e8143bb6c081d39f532571e54 COPYING +sha256 b158adaac5e2d1c7fa6e739ff168ab498957e3303070f1c0b0e66d9a8f02a354 EULA diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk index 3d266fb5bd8..de88ebf32c4 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VC_VERSION = 1.9.0 +IMX_VPU_HANTRO_VC_VERSION = 1.9.1 IMX_VPU_HANTRO_VC_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_VC_SOURCE = imx-vpu-hantro-vc-$(IMX_VPU_HANTRO_VC_VERSION).bin IMX_VPU_HANTRO_VC_DEPENDENCIES = linux From b4e6ef2c7ae3c126d7e9af1ddd2be674f382aa06 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:33 +0200 Subject: [PATCH 1576/3013] package/qt6/qt6declarative: new package Add host-qt6svg to dependencies when qt6svg is available to build the required svgtoqml host tool: Failed to find the host tool "Qt6::svgtoqml". It is part of the Qt6QuickTools package, but the package could not be found. Make sure you have built and installed the host Quick module, which will ensure the creation of the Qt6QuickTools package. Select the host-qt6base Testlib module to build the qmltestrunner host tool when the qt6base Testlib module is enabled: Failed to find the host tool "Qt6::qmltestrunner". It is part of the Qt6QmlTools package, but the package did not contain the tool. Make sure that the host module Qml was built with all features enabled (no explicitly disabled tools). Select the host-qt6base Network module to build the qmlprofiler host tool when the qt6base Network module is enabled: Failed to find the host tool "Qt6::qmlprofiler". It is part of the Qt6QmlTools package, but the package did not contain the tool. Make sure that the host module Qml was built with all features enabled (no explicitly disabled tools). Add patch to avoid checking for FEATURE_ssl when FEATURE_network is not available. FEATURE_ssl is defined by the Qt Network module. So we will get the following build failure if the patch is not applied and FEATURE_network=ON: Attempting to evaluate feature ssl but its definition is missing. Either the feature does not exist or a dependency to the module that defines it is missing Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + ...1-Fix-build-with--no-feature-network.patch | 28 ++++++++ package/qt6/qt6declarative/Config.in | 22 ++++++ .../qt6/qt6declarative/qt6declarative.hash | 11 +++ package/qt6/qt6declarative/qt6declarative.mk | 67 +++++++++++++++++++ 5 files changed, 129 insertions(+) create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch create mode 100644 package/qt6/qt6declarative/Config.in create mode 100644 package/qt6/qt6declarative/qt6declarative.hash create mode 100644 package/qt6/qt6declarative/qt6declarative.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 81682af476d..625134d281c 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" +source "package/qt6/qt6declarative/Config.in" source "package/qt6/qt6languageserver/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" diff --git a/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch new file mode 100644 index 00000000000..bef5794229f --- /dev/null +++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch @@ -0,0 +1,28 @@ +From 8377691a0998fd84e6fc8349a5db450bf2d79164 Mon Sep 17 00:00:00 2001 +From: Tasuku Suzuki +Date: Tue, 21 Nov 2023 23:58:43 +0900 +Subject: Fix build with -no-feature-network + +Change-Id: Ib21012301da6afb5458f707b39a9a8079d93eb93 +Reviewed-by: Ulf Hermann +Upstream: https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=8377691a0998fd84e6fc8349a5db450bf2d79164 +Signed-off-by: Roy Kollen Svendsen +--- + src/qml/configure.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake +index 2d0434643a..d1ff90bd54 100644 +--- a/src/qml/configure.cmake ++++ b/src/qml/configure.cmake +@@ -82,7 +82,7 @@ qt_feature("qml-ssl" PUBLIC + SECTION "QML" + LABEL "QML SSL support" + PURPOSE "Provides ssl support in QML." +- CONDITION QT_FEATURE_ssl ++ CONDITION QT_FEATURE_qml_network AND QT_FEATURE_ssl + ) + + # On arm and arm64 we need a specialization of cacheFlush() for each OS to be +-- +cgit v1.2.3 diff --git a/package/qt6/qt6declarative/Config.in b/package/qt6/qt6declarative/Config.in new file mode 100644 index 00000000000..0a977ed808b --- /dev/null +++ b/package/qt6/qt6declarative/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_QT6DECLARATIVE + bool "qt6declarative" + # Enable host test module to ensure that qmltestrunner is built + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6declarative module. + + https://doc.qt.io/qt-6/qtdeclarative-index.html + +if BR2_PACKAGE_QT6DECLARATIVE + +config BR2_PACKAGE_QT6DECLARATIVE_QUICK + bool "quick module" + select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST # qmltestrunner + select BR2_PACKAGE_HOST_QT6BASE_NETWORK if BR2_PACKAGE_QT6BASE_NETWORK # qmlprofiler + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6SHADERTOOLS + +endif diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash new file mode 100644 index 00000000000..006b49e4b1e --- /dev/null +++ b/package/qt6/qt6declarative/qt6declarative.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtdeclarative-everywhere-src-6.7.2.tar.xz.sha256 +sha256 4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999 qtdeclarative-everywhere-src-6.7.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk new file mode 100644 index 00000000000..57a89a3b6e7 --- /dev/null +++ b/package/qt6/qt6declarative/qt6declarative.mk @@ -0,0 +1,67 @@ +################################################################################ +# +# qt6declaratve +# +################################################################################ + +QT6DECLARATIVE_VERSION = $(QT6_VERSION) +QT6DECLARATIVE_SITE = $(QT6_SITE) +QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz +QT6DECLARATIVE_INSTALL_STAGING = YES + +QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6DECLARATIVE_CMAKE_BACKEND = ninja + +QT6DECLARATIVE_LICENSE = \ + LGPL-3.0 or GPL-3.0 or GPL-2.0, \ + BSD-3-Clause (docs), \ + GFDL-1.3 no invariants (docs), \ + BSD-3-Clause (examples), \ + GPL-3.0 (tests), \ + GPL-3.0 WITH Qt-GPL-exception-1.0 (tools) + +QT6DECLARATIVE_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6DECLARATIVE_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +HOST_QT6DECLARATIVE_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +HOST_QT6DECLARATIVE_DEPENDENCIES = \ + host-qt6base + +QT6DECLARATIVE_DEPENDENCIES = \ + host-qt6declarative \ + qt6base + +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE_QUICK),y) +HOST_QT6DECLARATIVE_DEPENDENCIES += \ + host-qt6shadertools +QT6DECLARATIVE_DEPENDENCIES += \ + host-qt6base \ + qt6shadertools + +# We need host-qt6svg, when qt6svg is available to build the required +# svgtoqml host tool +ifeq ($(BR2_PACKAGE_QT6SVG),y) +HOST_QT6DECLARATIVE_DEPENDENCIES += host-qt6svg +endif + +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From d72cea4e6c87bde09b8857946ad688e8e74bc2ba Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:34 +0200 Subject: [PATCH 1577/3013] package/qt6/qt6websockets: new package Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6websockets/Config.in | 10 +++++ package/qt6/qt6websockets/qt6websockets.hash | 11 ++++++ package/qt6/qt6websockets/qt6websockets.mk | 40 ++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 package/qt6/qt6websockets/Config.in create mode 100644 package/qt6/qt6websockets/qt6websockets.hash create mode 100644 package/qt6/qt6websockets/qt6websockets.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 625134d281c..16f792cff36 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" +source "package/qt6/qt6websockets/Config.in" endif diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in new file mode 100644 index 00000000000..7d65a8e65ae --- /dev/null +++ b/package/qt6/qt6websockets/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT6WEBSOCKETS + bool "qt6websockets" + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6websockets module. + + https://doc.qt.io/qt-6/qtwebsockets-index.html diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash new file mode 100644 index 00000000000..5dfeeef01da --- /dev/null +++ b/package/qt6/qt6websockets/qt6websockets.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtwebsockets-everywhere-src-6.7.2.tar.xz.sha256 +sha256 5bde4af6ec9ce8c8632b782ab77b82d910721be2c714e6d38902521bcd1d215f qtwebsockets-everywhere-src-6.7.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk new file mode 100644 index 00000000000..5e6da70e630 --- /dev/null +++ b/package/qt6/qt6websockets/qt6websockets.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# qt6websockets +# +################################################################################ + +QT6WEBSOCKETS_VERSION = $(QT6_VERSION) +QT6WEBSOCKETS_SITE = $(QT6_SITE) +QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz +QT6WEBSOCKETS_INSTALL_STAGING = YES + +QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6WEBSOCKETS_CMAKE_BACKEND = ninja + +QT6WEBSOCKETS_LICENSE = \ + LGPL-3.0 or GPL-2.0 or GPL-3.0, \ + BSD-3-Clause (examples), \ + GPL-3.0 (tests) + +QT6WEBSOCKETS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/BSD-3-Clause.txt + +QT6WEBSOCKETS_CONF_OPTS = \ + -DQT_FEATURE_thread=ON \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6WEBSOCKETS_DEPENDENCIES = qt6base + +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) +QT6WEBSOCKETS_DEPENDENCIES += qt6declarative +endif + +$(eval $(cmake-package)) From e514277a53ca997d0567754035e8b453396e173b Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:35 +0200 Subject: [PATCH 1578/3013] package/qt6/qt6wayland: new package Add host-qt6wayland as dependency to build the qtwaylandscanner host tool: Failed to find the host tool "Qt6::qtwaylandscanner". It is part of the Qt6WaylandScannerTools package, but the package could not be found. Make sure you have built and installed the host WaylandScanner module, which will ensure the creation of the Qt6WaylandScannerTools package. Select the qt6base and host-qt6base Gui modules to avoid skipping the build: Skipping the build as the condition "TARGET Qt::Gui" is not met. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6wayland/Config.in | 28 ++++++++++++ package/qt6/qt6wayland/qt6wayland.hash | 11 +++++ package/qt6/qt6wayland/qt6wayland.mk | 61 ++++++++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 package/qt6/qt6wayland/Config.in create mode 100644 package/qt6/qt6wayland/qt6wayland.hash create mode 100644 package/qt6/qt6wayland/qt6wayland.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 16f792cff36..69ce0b3f6a2 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" +source "package/qt6/qt6wayland/Config.in" source "package/qt6/qt6websockets/Config.in" endif diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in new file mode 100644 index 00000000000..bda13dd12f1 --- /dev/null +++ b/package/qt6/qt6wayland/Config.in @@ -0,0 +1,28 @@ +comment "qt6wayland needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +config BR2_PACKAGE_QT6WAYLAND + bool "qt6wayland" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_QT6BASE_GUI + # needed because we build host-qt6wayland + select BR2_PACKAGE_HOST_QT6BASE_GUI + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6wayland module. + + https://doc.qt.io/qt-6/qtwayland-index.html + +if BR2_PACKAGE_QT6WAYLAND + +config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR + bool "Enable compositor (experimental)" + select BR2_PACKAGE_LIBXKBCOMMON + help + The compositor API is still experimental, and not built by + default. + +endif diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash new file mode 100644 index 00000000000..3d0ded7bec2 --- /dev/null +++ b/package/qt6/qt6wayland/qt6wayland.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtwayland-everywhere-src-6.7.2.tar.xz.sha256 +sha256 a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b qtwayland-everywhere-src-6.7.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk new file mode 100644 index 00000000000..29fc25edb0c --- /dev/null +++ b/package/qt6/qt6wayland/qt6wayland.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# qt6wayland +# +################################################################################ + +QT6WAYLAND_VERSION = $(QT6_VERSION) +QT6WAYLAND_SITE = $(QT6_SITE) +QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz +QT6WAYLAND_INSTALL_STAGING = YES + +QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6WAYLAND_CMAKE_BACKEND = ninja + +QT6WAYLAND_LICENSE = \ + BSD-3-Clause (examples, tests), \ + GPL-3.0 (compositor), \ + LGPL-3.0 or GPL-2.0 or GPL-3.0, \ + GPL-3.0 WITH Qt-GPL-exception-1.0 (tests), \ + GFDL-1.3 no invariants (docs) + +QT6WAYLAND_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6WAYLAND_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF \ + -DFEATURE_wayland_client=ON + +# host-qt6wayland needed to build the qtwaylandscanner host tool +QT6WAYLAND_DEPENDENCIES = \ + qt6base \ + wayland \ + host-qt6wayland + +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) +QT6WAYLAND_DEPENDENCIES += qt6declarative +endif + +ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y) +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON +QT6WAYLAND_DEPENDENCIES += libxkbcommon +else +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF +endif + +HOST_QT6WAYLAND_CONF_OPTS = \ + -DFEATURE_wayland_client=OFF \ + -DFEATURE_wayland_server=OFF + +HOST_QT6WAYLAND_DEPENDENCIES = host-qt6base + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 70a319f7f9aba2d44ed7548d7ac3cb42b6b216b3 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:36 +0200 Subject: [PATCH 1579/3013] package/qt6/qt6tools: new package The Network module is explicitly required by qt6tools: Failed to find required Qt component "Network". We need host-qt6base with Sql support for host-qt6tools to build the qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not available: Failed to find the host tool "Qt6::qhelpgenerator". It is part of the Qt6ToolsTools package, but the package did not contain the tool. Make sure that the host module Tools was built with all features enabled (no explicitly disabled tools). Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6tools/Config.in | 17 +++++++++++ package/qt6/qt6tools/qt6tools.hash | 12 ++++++++ package/qt6/qt6tools/qt6tools.mk | 45 ++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 package/qt6/qt6tools/Config.in create mode 100644 package/qt6/qt6tools/qt6tools.hash create mode 100644 package/qt6/qt6tools/qt6tools.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 69ce0b3f6a2..48366f5fd13 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" +source "package/qt6/qt6tools/Config.in" source "package/qt6/qt6wayland/Config.in" source "package/qt6/qt6websockets/Config.in" diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in new file mode 100644 index 00000000000..5f52c5644fd --- /dev/null +++ b/package/qt6/qt6tools/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_QT6TOOLS + bool "qt6tools" + select BR2_PACKAGE_QT6BASE_NETWORK + # qt6tools needs host-qt6tools, and host-qt6tools needs + # network support in qt6base. In addition, we also need + # host-qt6base with Sql support to build the qhelpgenerator + # tool, if target support for Sql is present + select BR2_PACKAGE_HOST_QT6BASE_NETWORK + select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Tools provides tools facilitate the development + and design of applications. + + https://github.com/qt/qttools diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash new file mode 100644 index 00000000000..622df4a00f5 --- /dev/null +++ b/package/qt6/qt6tools/qt6tools.hash @@ -0,0 +1,12 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz.sha256 +sha256 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a qttools-everywhere-src-6.7.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 3abd6471b9a9a08d65ce771143f8e278bb4c1aeb10c1c2d476935a6b049653f5 LICENSES/BSL-1.0.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk new file mode 100644 index 00000000000..d996f75b346 --- /dev/null +++ b/package/qt6/qt6tools/qt6tools.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6tools +# +################################################################################ + +QT6TOOLS_VERSION = $(QT6_VERSION) +QT6TOOLS_SITE = $(QT6_SITE) +QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz +QT6TOOLS_INSTALL_STAGING = YES +QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6TOOLS_CMAKE_BACKEND = ninja + +QT6TOOLS_LICENSE = \ + BSD-3-Clause (examples), \ + BSD-3-Clause (corecon), \ + BSL-1.0 (catch), \ + LGPL-3.0 or GPL-3.0 or GPL-2.0, \ + GPL-3.0 WITH Qt-GPL-exception-1.0 + +QT6TOOLS_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/BSL-1.0.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6TOOLS_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6TOOLS_DEPENDENCIES = \ + qt6base \ + host-qt6tools + +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) +QT6TOOLS_DEPENDENCIES += qt6declarative +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 4d609f369c7e3f8adc111f23e0238ba440165aae Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:37 +0200 Subject: [PATCH 1580/3013] package/qt6/qt6virtualkeyboard: new package Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6virtualkeyboard/Config.in | 11 ++++++ .../qt6virtualkeyboard.hash | 12 ++++++ .../qt6virtualkeyboard/qt6virtualkeyboard.mk | 39 +++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 package/qt6/qt6virtualkeyboard/Config.in create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 48366f5fd13..9dbc4b804ab 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" source "package/qt6/qt6tools/Config.in" +source "package/qt6/qt6virtualkeyboard/Config.in" source "package/qt6/qt6wayland/Config.in" source "package/qt6/qt6websockets/Config.in" diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in new file mode 100644 index 00000000000..4a9d6d57c0e --- /dev/null +++ b/package/qt6/qt6virtualkeyboard/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT6VIRTUALKEYBOARD + bool "qt6virtualkeyboard" + select BR2_PACKAGE_QT6DECLARATIVE + select BR2_PACKAGE_QT6SVG + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6virtualkeyboard module. + + https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash new file mode 100644 index 00000000000..f34eb11e9ea --- /dev/null +++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash @@ -0,0 +1,12 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz.sha256 +sha256 320664b55a0960ff79c1b822dcf6e8cebe3e08b791147d41b570996d81ce180f qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE +sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk new file mode 100644 index 00000000000..5c61ed7ec45 --- /dev/null +++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# qt6virtualkeyboard +# +################################################################################ + +QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION) +QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE) +QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz +QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES + +QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja + +QT6VIRTUALKEYBOARD_LICENSE = \ + BSD-3-Clause (examples), \ + GPL-3.0, \ + Apache-2.0 (openwnn, pinyin, tcime plugins) + +QT6VIRTUALKEYBOARD_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GPL-3.0-only.txt \ + src/plugins/openwnn/3rdparty/openwnn/NOTICE \ + src/plugins/pinyin/3rdparty/pinyin/NOTICE \ + src/plugins/tcime/3rdparty/tcime/COPYING + +QT6VIRTUALKEYBOARD_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6VIRTUALKEYBOARD_DEPENDENCIES = \ + qt6base \ + qt6declarative \ + qt6svg + +$(eval $(cmake-package)) From ba8e85bc068bfb3f4dc0909036e819ff8682f04e Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:38 +0200 Subject: [PATCH 1581/3013] package/qt6/qt6mqtt: new package Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6.mk | 2 ++ package/qt6/qt6mqtt/Config.in | 10 +++++++++ package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++ package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 package/qt6/qt6mqtt/Config.in create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 9dbc4b804ab..e84806d5e49 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6declarative/Config.in" source "package/qt6/qt6languageserver/Config.in" +source "package/qt6/qt6mqtt/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 372a92f413a..f2e0186f56a 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -9,4 +9,6 @@ QT6_VERSION = $(QT6_VERSION_MAJOR).2 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules +QT6_GIT = git://code.qt.io + include $(sort $(wildcard package/qt6/*/*.mk)) diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in new file mode 100644 index 00000000000..2cda7e53c0a --- /dev/null +++ b/package/qt6/qt6mqtt/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT6MQTT + bool "qt6mqtt" + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6mqtt module. + + https://doc.qt.io/qt-6/qtmqtt-index.html diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash new file mode 100644 index 00000000000..67ae6d0de38 --- /dev/null +++ b/package/qt6/qt6mqtt/qt6mqtt.hash @@ -0,0 +1,8 @@ +sha256 be2d3f12378a8e2a103c328201b1e308f8c6c09bd752322592b3164cebba5bde qt6mqtt-6.7.2-git4.tar.gz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk new file mode 100644 index 00000000000..00c6705cc86 --- /dev/null +++ b/package/qt6/qt6mqtt/qt6mqtt.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# qt6mqtt +# +################################################################################ + +QT6MQTT_VERSION = $(QT6_VERSION) +QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git + +QT6MQTT_INSTALL_STAGING = YES + +QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6MQTT_CMAKE_BACKEND = ninja + +QT6MQTT_LICENSE = \ + BSD-3-Clause (examples), \ + GFDL-1.3-invariants-only (docs), \ + GPL-3.0 + +QT6MQTT_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-3.0-only.txt + +QT6MQTT_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6MQTT_DEPENDENCIES = \ + qt6base + +$(eval $(cmake-package)) From 3900807b22835451ddb1b1f78e179d8b472b3554 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 12:53:01 +0200 Subject: [PATCH 1582/3013] DEVELOPERS: add Roy Kollen Svendsen for a number of qt6 packages Roy recently introduced a number of additional qt6 packages, let's add him to the DEVELOPERS file for those packages. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0faad55f97a..8c0deb9e412 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2798,6 +2798,16 @@ F: support/testing/tests/package/test_openssh.py F: support/testing/tests/package/test_python_mako.py F: toolchain/ +N: Roy Kollen Svendsen +F: package/qt6/qt6declarative/ +F: package/qt6/qt6languageserver/ +F: package/qt6/qt6mqtt/ +F: package/qt6/qt6shadertools/ +F: package/qt6/qt6tools/ +F: package/qt6/qt6virtualkeyboard/ +F: package/qt6/qt6wayland/ +F: package/qt6/qt6websockets/ + N: Rufus Segar F: package/agent-proxy/ From 51f753710d55a6a9e6ee778fba9d1c6b2a722485 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 May 2024 19:05:23 +0200 Subject: [PATCH 1583/3013] package/util-linux: fix build with uclibc-ng < 1.0.39 Fix the following build failure with uclibc-ng < 1.0.39 (i.e., without https://github.com/wbx-github/uclibc-ng/commit/85ac4f04d94e98389a8315e720630d0f95bfdfd6) raised since bump to version 2.39 in commit ad276d94a392fb13244e042851a44269e6254d61 and https://github.com/util-linux/util-linux/commit/03a254f010b08da1175f50a8ae7882e59228f1b4: sys-utils/setarch.c:106:7: error: 'PER_LINUX32_3GB' undeclared here (not in a function); did you mean 'PER_LINUX32'? 106 | X(PER_LINUX32_3GB) \ | ^~~~~~~~~~~~~~~ Fixes: ad276d94a392fb13244e042851a44269e6254d61 - http://autobuild.buildroot.org/results/fb1feb47f2660882fa53f66bacc63e191fd52175 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ch.c-fix-build-with-uclibc-ng-1.0.39.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch diff --git a/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch b/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch new file mode 100644 index 00000000000..12dd119ef32 --- /dev/null +++ b/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch @@ -0,0 +1,39 @@ +From beef18da4de87ca5aaadf2beb14187f35cc4f50f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 15 May 2024 18:22:11 +0200 +Subject: [PATCH] sys-utils/setarch.c: fix build with uclibc-ng < 1.0.39 + +Fix the following build failure with uclibc-ng < 1.0.39 (i.e., without +https://github.com/wbx-github/uclibc-ng/commit/85ac4f04d94e98389a8315e720630d0f95bfdfd6) +raised since version 2.39 and +https://github.com/util-linux/util-linux/commit/03a254f010b08da1175f50a8ae7882e59228f1b4: + +sys-utils/setarch.c:106:7: error: 'PER_LINUX32_3GB' undeclared here (not in a function); did you mean 'PER_LINUX32'? + 106 | X(PER_LINUX32_3GB) \ + | ^~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/fb1feb47f2660882fa53f66bacc63e191fd52175 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/util-linux/util-linux/commit/4647fc6afbf7e99c49531600425df60f1243fcd2 +--- + sys-utils/setarch.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c +index 227bc6b5de..4bcb5e69e6 100644 +--- a/sys-utils/setarch.c ++++ b/sys-utils/setarch.c +@@ -89,6 +89,11 @@ + # define PER_LINUX_FDPIC (PER_LINUX | FDPIC_FUNCPTRS) + #endif + ++/* fallback for old uclibc-headers < 1.0.39 */ ++#ifndef PER_LINUX32_3GB ++# define PER_LINUX32_3GB (PER_LINUX32 | ADDR_LIMIT_3GB) ++#endif ++ + #define ALL_PERSONALITIES \ + X(PER_LINUX) \ + X(PER_LINUX_32BIT) \ From 7c56e71b46007bc1d70e9c13267109abe4776f49 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 18 Jun 2024 11:23:29 +0200 Subject: [PATCH 1584/3013] package/cryptsetup: bump version to 2.7.3 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 531432aaaf2..dfee537a4a4 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 da5d1419e2a86e01aa32fd79582cd54d208857cb541bca2fd426a5ff1aaabbc3 cryptsetup-2.7.1.tar.xz +sha256 b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456 cryptsetup-2.7.3.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index b15f4585763..d5046d99433 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From 5543661bc0c1ebcd01e5e6bf5ac565fd0f1ac8d8 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 11 Jul 2024 21:15:39 +0200 Subject: [PATCH 1585/3013] package/sunxi-mali-utgard-driver: bump to version 2024-07-11 This version provide patches that can be applied with fuzz 0 and this is now required by Buildroot. Cc: Dario Binacchi Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash | 2 +- package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index be27a85970c..5f3e0013253 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2e5e671575d9488fd19b821d70e59952b6dbbb5b2036ea5462f811eec819370 sunxi-mali-utgard-driver-c4bc3e229c0e5f30c24c20ff1fb8db0e4a450c0f.tar.gz +sha256 151a56eb6a47efee19369a1c08b7aec506e48f983683a3cd05c5494cedf0fb69 sunxi-mali-utgard-driver-ad7e98bc1e81c7ac9c897f854c1a429d33e45d58.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk index b8a12247d39..ba7c50718dd 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_UTGARD_DRIVER_VERSION = c4bc3e229c0e5f30c24c20ff1fb8db0e4a450c0f +SUNXI_MALI_UTGARD_DRIVER_VERSION = ad7e98bc1e81c7ac9c897f854c1a429d33e45d58 SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,giuliobenetti,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 From afece24a72728621449e45deeecae520e55c847f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 2 Jun 2024 20:23:07 +0200 Subject: [PATCH 1586/3013] support/download: introduce curl backend for FTP transfers Recent versions of wget, starting with wget 2.0, aka wget2 thereafter, no longer support FTP (nor FTPS, aka FTP-over-SSL). wget2 is packaged in Fedora 40, recently released; F40 does not even have the old wget available in its repository anymore. Introduce cURL as a download backend, that we use for FTP and FPTS protocols. Note that the -q flag does not means being quiet; it means that a curlrc file should not be parsed. The long option is --disable, which meaning is not much more obivous than the short -q. It also has to be the first option on the command line. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- Config.in | 4 ++++ docs/manual/prerequisite.adoc | 1 + package/pkg-download.mk | 1 + package/pkg-generic.mk | 2 ++ support/download/curl | 45 +++++++++++++++++++++++++++++++++++ support/download/dl-wrapper | 1 + 6 files changed, 54 insertions(+) create mode 100755 support/download/curl diff --git a/Config.in b/Config.in index bdf5fa8647d..e0257ba3e8f 100644 --- a/Config.in +++ b/Config.in @@ -103,6 +103,10 @@ menu "Build options" menu "Commands" +config BR2_CURL + string "Curl command" + default "curl -q --ftp-pasv --retry 3" + config BR2_WGET string "Wget command" default "wget -nd -t 3" diff --git a/docs/manual/prerequisite.adoc b/docs/manual/prerequisite.adoc index ab609c12bed..5d3aa297a9b 100644 --- a/docs/manual/prerequisite.adoc +++ b/docs/manual/prerequisite.adoc @@ -75,6 +75,7 @@ packages using any of these methods, you will need to install the corresponding tool on the host system: + ** +bazaar+ +** +curl+ ** +cvs+ ** +git+ ** +mercurial+ diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 7028d3917a5..17c8a244c40 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -8,6 +8,7 @@ ################################################################################ # Download method commands +export CURL := $(call qstrip,$(BR2_CURL)) export WGET := $(call qstrip,$(BR2_WGET)) export SVN := $(call qstrip,$(BR2_SVN)) export CVS := $(call qstrip,$(BR2_CVS)) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a2749320c3c..e1c16b73435 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1253,6 +1253,8 @@ else ifeq ($$($(2)_SITE_METHOD),hg) DL_TOOLS_DEPENDENCIES += hg else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs +else ifneq ($(filter ftp ftps,$$($(2)_SITE_METHOD)),) +DL_TOOLS_DEPENDENCIES += curl endif # SITE_METHOD # cargo/go vendoring (may) need git diff --git a/support/download/curl b/support/download/curl new file mode 100755 index 00000000000..bea4485a6cf --- /dev/null +++ b/support/download/curl @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# We want to catch any unexpected failure, and exit immediately +set -e + +# Download helper for curl, to be called from the download wrapper script +# +# Options: +# -q Be quiet. +# -o FILE Save into file FILE. +# -f FILENAME The filename of the tarball to get at URL +# -u URL Download file at URL. +# +# Environment: +# CURL : the curl command to call + +quiet= +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do + case "${OPT}" in + q) quiet=-s;; + o) output="${OPTARG}";; + f) filename="${OPTARG}";; + u) url="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; + \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; + esac +done + +shift $((OPTIND-1)) # Get rid of our options + +# Caller needs to single-quote its arguments to prevent them from +# being expanded a second time (in case there are spaces in them) +_curl() { + if [ -z "${quiet}" ]; then + printf '%s ' "${CURL}" "${@}"; printf '\n' + fi + _plain_curl "$@" +} +# Note: please keep command below aligned with what is printed above +_plain_curl() { + # shellcheck disable=SC2086 # We want splitting + eval ${CURL} "${@}" +} + +_curl ${quiet} "${@}" --output "'${output}'" "'${url}/${filename}'" diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 35428faeefe..069b2c1c21e 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -91,6 +91,7 @@ main() { backend="${backend_urlencode%|*}" case "${backend}" in git|svn|cvs|bzr|file|scp|hg|sftp) ;; + ftp|ftps) backend="curl" ;; *) backend="wget" ;; esac uri=${uri#*+} From 881a8f13465b1be19540f6e35f2a658d49f63dd7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 12 Jul 2024 14:34:57 +0200 Subject: [PATCH 1587/3013] utils/genrandconfig: stop passing --passive-ftp to wget Since we no longer use WGET to retrieve FTP-hosted files, we can drop the --passive-ftp option from genrandconfig, as it would cause problems on systems that use wget2. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index dbde6564171..66b7a87311f 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -676,7 +676,7 @@ async def gen_config(args): configlines += minimalf.readlines() # Allow hosts with old certificates to download over https - configlines.append("BR2_WGET=\"wget --passive-ftp -nd -t 3 --no-check-certificate\"\n") + configlines.append("BR2_WGET=\"wget -nd -t 3 --no-check-certificate\"\n") # Per-package folder if randint(0, 15) == 0: From a316aeb7dabec9febd664422fd97a431717b59b8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 2 Jun 2024 20:23:08 +0200 Subject: [PATCH 1588/3013] utils/genrandconfig: do not check certificates with curl genrandconfig is used in autobuilders, and some autobuilders are running on old distributions that are lacking the most recent CAs, causing build failures because package sources can't be retrieved. Do for the curl backend what we already did a while back for the wget backend, with commit 0866a280e40a (utils/genrandconfig: use --no-check-certificate in wget by default); in curl, the equivalent would be --insecure, and applies to the ftps transport. The integrity of the downloads are validated against our bundled hashes so there is no risk of corruption of the downloaded files. The only issue would be that an MITM could inspect the transaction, the same way as for the wget --no-check-certificate in 0866a280e40a, but this is not considered a high-level issue (we're anyway talking FTPS here, that's a legacy protocol that has other issues). Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 66b7a87311f..216e733799e 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -677,6 +677,7 @@ async def gen_config(args): # Allow hosts with old certificates to download over https configlines.append("BR2_WGET=\"wget -nd -t 3 --no-check-certificate\"\n") + configlines.append("BR2_CURL=\"curl --ftp-pasv --retry 3 --insecure\"\n") # Per-package folder if randint(0, 15) == 0: From e0f2414330b049276678a19a45a53bfb521c52f2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 May 2024 10:21:38 +0200 Subject: [PATCH 1589/3013] support/gnuconfig: update config.sub/config.guess This adds support for Loongarch64 support. Signed-off-by: Waldemar Brodkorb Signed-off-by: Romain Naour --- support/gnuconfig/README.buildroot | 2 +- support/gnuconfig/config.guess | 1233 +++++++++++++++------------- support/gnuconfig/config.sub | 302 +++++-- 3 files changed, 894 insertions(+), 643 deletions(-) diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot index 952eea8b107..f34a6566bde 100644 --- a/support/gnuconfig/README.buildroot +++ b/support/gnuconfig/README.buildroot @@ -18,4 +18,4 @@ Run the script 'update' in this directory, and commit the result. The current Buildroot version is based on this commit of the config.git repository (leave alone on its own line, the script updates it): -d7a4dee7cc25e332b990d0a6d9f0ddd42cb33cf5 +948ae97ca5703224bd3eada06b7a69f40dd15a02 diff --git a/support/gnuconfig/config.guess b/support/gnuconfig/config.guess index 8d70ec2b263..f6d217a49f8 100755 --- a/support/gnuconfig/config.guess +++ b/support/gnuconfig/config.guess @@ -1,12 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2020 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. -timestamp='2020-09-19' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -27,17 +29,25 @@ timestamp='2020-09-19' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -50,13 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2020 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -84,13 +94,16 @@ if test $# != 0; then exit 1 fi +# Just in case it came from the environment. +GUESS= + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. @@ -102,7 +115,7 @@ set_cc_for_build() { # prevent multiple calls if $tmp is already set test "$tmp" && return 0 : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039 + # shellcheck disable=SC2039,SC3028 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || @@ -112,7 +125,7 @@ set_cc_for_build() { ,,) echo "int x;" > "$dummy.c" for driver in cc gcc c89 c99 ; do if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$driver" + CC_FOR_BUILD=$driver break fi done @@ -133,38 +146,57 @@ fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc + #elif defined(__GLIBC__) + LIBC=gnu + #elif defined(__LLVM_LIBC__) + LIBC=llvm #else #include + /* First heuristic to detect musl libc. */ #ifdef __DEFINED_va_list LIBC=musl - #else - LIBC=gnu + #endif #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -176,12 +208,12 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -190,13 +222,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown + machine=${arch}${endian}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; @@ -217,7 +249,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -228,7 +260,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -239,51 +271,57 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; *:OS108:*:*) - echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; *:Twizzler:*:*) - echo "$UNAME_MACHINE"-unknown-twizzler - exit ;; + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; + GUESS=$UNAME_MACHINE-unknown-redox + ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -297,7 +335,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -334,68 +372,69 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) set_cc_for_build SUN_ARCH=i386 @@ -404,47 +443,50 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # This test works for both compilers. if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; + # Japanese Language versions have a version number like '4.1.3-JL'. + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -454,41 +496,41 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -516,29 +558,29 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -547,44 +589,45 @@ EOF if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux"$UNAME_RELEASE" + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux"$UNAME_RELEASE" + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then set_cc_for_build @@ -601,16 +644,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -619,48 +662,48 @@ EOF IBM_ARCH=powerpc fi if test -x /usr/bin/lslpp ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; + GUESS=rs6000-ibm-aix + ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 @@ -727,12 +770,12 @@ EOF HP_ARCH=hppa64 fi fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -762,36 +805,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) if test -x /usr/sbin/sysversion ; then - echo "$UNAME_MACHINE"-unknown-osf1mk + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -799,17 +842,18 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -817,112 +861,153 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; arm:FreeBSD:*:*) UNAME_PROCESSOR=`uname -p` set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf fi - exit ;; + ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-pc-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) - echo "$UNAME_MACHINE"-unknown-minix - exit ;; + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __ARM_EABI__ + #ifdef __ARM_PCS_VFP + ABI=eabihf + #else + ABI=eabi + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; + esac + fi + GUESS=$CPU-unknown-linux-$LIBCABI + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -935,60 +1020,72 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:cos:*:*) + GUESS=$UNAME_MACHINE-unknown-cos + ;; + kvx:mbr:*:*) + GUESS=$UNAME_MACHINE-unknown-mbr + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) set_cc_for_build IS_GLIBC=0 @@ -1033,123 +1130,135 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI="$LIBC"x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" - exit ;; + GUESS=$CPU-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1157,12 +1266,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1172,11 +1281,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1184,31 +1293,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1233,116 +1342,119 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + ;; + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if test -d /usr/nec; then - echo mips-nec-sysv"$UNAME_RELEASE" + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv"$UNAME_RELEASE" + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; arm64:Darwin:*:*) - echo aarch64-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in @@ -1378,109 +1490,122 @@ EOF # uname -m returns i386 or x86_64 UNAME_PROCESSOR=$UNAME_MACHINE fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; *:Unleashed:*:*) - echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad + ;; esac +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + # No uname command or uname output not recognized. set_cc_for_build cat > "$dummy.c" </dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1620,7 +1745,7 @@ test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 <&2 + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; *-*-*-*) @@ -134,7 +145,8 @@ case $1 in nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \ + | windows-* ) basic_machine=$field1 basic_os=$maybe_os ;; @@ -163,6 +175,10 @@ case $1 in basic_machine=$field1 basic_os=$field2 ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ @@ -922,11 +938,13 @@ case $basic_machine in *-*) # shellcheck disable=SC2162 + saved_IFS=$IFS IFS="-" read cpu vendor <&2 + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 exit 1 ;; esac @@ -1278,34 +1287,45 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if test x$basic_os != x +if test x"$basic_os" != x then -# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just # set os. +obj= case $basic_os in gnu/linux*) kernel=linux - os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'` + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` ;; nto-qnx*) kernel=nto - os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'` + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` ;; *-*) # shellcheck disable=SC2162 + saved_IFS=$IFS IFS="-" read kernel os <&2 + fi + ;; + *) + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 + exit 1 + ;; +esac + +case $obj in + aout* | coff* | elf* | pe*) + ;; + '') + # empty is fine + ;; *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2 + exit 1 + ;; +esac + +# Here we handle the constraint that a (synthetic) cpu and os are +# valid only in combination with each other and nowhere else. +case $cpu-$os in + # The "javascript-unknown-ghcjs" triple is used by GHC; we + # accept it here in order to tolerate that, but reject any + # variations. + javascript-ghcjs) + ;; + javascript-* | *-ghcjs) + echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2 exit 1 ;; esac # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. -case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) +case $kernel-$os-$obj in + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ + | linux-mlibc*- | linux-musl*- | linux-newlib*- \ + | linux-relibc*- | linux-uclibc*- ) ;; - uclinux-uclibc* ) + uclinux-uclibc*- ) ;; - -dietlibc* | -newlib* | -musl* | -uclibc* ) + managarm-mlibc*- | managarm-kernel*- ) + ;; + windows*-msvc*-) + ;; + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ + | -uclibc*- ) # These are just libc implementations, not actual OSes, and thus # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 exit 1 ;; - kfreebsd*-gnu* | kopensolaris*-gnu*) + -kernel*- ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 ;; - nto-qnx*) + *-kernel*- ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 + exit 1 ;; - *-eabi* | *-gnueabi*) + *-msvc*- ) + echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 + exit 1 + ;; + kfreebsd*-gnu*- | kopensolaris*-gnu*-) + ;; + vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) + ;; + nto-qnx*-) + ;; + os2-emx-) ;; - -*) + *-eabi*- | *-gnueabi*-) + ;; + none--*) + # None (no kernel, i.e. freestanding / bare metal), + # can be paired with an machine code file format + ;; + -*-) # Blank kernel with real OS is always fine. ;; - *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + --*) + # Blank kernel and OS with real machine code file format is always fine. + ;; + *-*-*) + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 exit 1 ;; esac @@ -1836,7 +1960,7 @@ case $vendor in ;; esac -echo "$cpu-$vendor-${kernel:+$kernel-}$os" +echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}" exit # Local variables: From 20a6d583bd2c4cbeba409a3f892422e98181e2b0 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 7 Feb 2024 22:47:29 +0100 Subject: [PATCH 1590/3013] package/rtl8188eu: bump to 2024-02-06 version on v5.2.2.4 branch This version allows to build with Linux 6.8 Fixes: http://autobuild.buildroot.net/results/c2524c7580d97f7387ec22da62be71d77f2ed8ec Signed-off-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/rtl8188eu/rtl8188eu.hash | 2 +- package/rtl8188eu/rtl8188eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index eb28e6cf0a9..4f8f83e78c8 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cb10a047d39f13c776b0097ef1290f6b3c63590fd57bc0827e8638c878819f0 rtl8188eu-306f3e62cf7cddf8cee74f70f88a7a7b3af46f56.tar.gz +sha256 507d32eb91d3d407c7758319c81a36a9dc69e2b89378cabcd382411153927b7b rtl8188eu-f42fc9c45d2086c415dce70d3018031b54a7beef.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index 36a84d34de7..eca0fb8007b 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = 306f3e62cf7cddf8cee74f70f88a7a7b3af46f56 +RTL8188EU_VERSION = f42fc9c45d2086c415dce70d3018031b54a7beef RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING From cc2157418dedbfb8e0bd7400e13b6964e5ee92ac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Feb 2024 23:02:22 +0100 Subject: [PATCH 1591/3013] package/jack2: fix build with python 3.12 Fix the following build failure with python 3.12 (which removed imp module): Traceback (most recent call last): File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/./waf", line 166, in from waflib import Scripting File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Scripting.py", line 10, in from waflib import Utils, Configure, Logs, Options, ConfigSet, Context, Errors, Build, Node File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Configure.py", line 16, in from waflib import ConfigSet, Utils, Options, Logs, Context, Build, Errors File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Options.py", line 14, in from waflib import Logs, Utils, Context, Errors File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Context.py", line 9, in import os, re, imp, sys ModuleNotFoundError: No module named 'imp' Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/1bfe34e10ffdab80647ac01863165e93bcc9b0d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/jack2/0001-Update-to-waf-2-0-26.patch | 3480 +++++++++++++++++ 1 file changed, 3480 insertions(+) create mode 100644 package/jack2/0001-Update-to-waf-2-0-26.patch diff --git a/package/jack2/0001-Update-to-waf-2-0-26.patch b/package/jack2/0001-Update-to-waf-2-0-26.patch new file mode 100644 index 00000000000..b662894a05e --- /dev/null +++ b/package/jack2/0001-Update-to-waf-2-0-26.patch @@ -0,0 +1,3480 @@ +From 553ca1e649293ef87e96dd3e7621fd87e0b59986 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Tue, 29 Aug 2023 12:41:46 +0200 +Subject: [PATCH] Update to waf 2.0.26 + +This makes waf compatible with Python 3.12 again. + +Also, apply modifications needed for MacOS and add as a patch file (see +commits 0f2e3b2 and dc6c995). + +Signed-off-by: Nils Philippsen + +Upstream: https://github.com/jackaudio/jack2/commit/250420381b1a6974798939ad7104ab1a4b9a9994 +Signed-off-by: Fabrice Fontaine +--- + waf | 7 +- + waflib-macos-mods.patch | 18 + + waflib/Build.py | 47 +- + waflib/ConfigSet.py | 2 +- + waflib/Configure.py | 46 +- + waflib/Context.py | 24 +- + waflib/Logs.py | 9 +- + waflib/Node.py | 3 +- + waflib/Options.py | 31 +- + waflib/Runner.py | 27 +- + waflib/Scripting.py | 27 +- + waflib/Task.py | 48 ++- + waflib/TaskGen.py | 16 +- + waflib/Tools/c_aliases.py | 10 +- + waflib/Tools/c_config.py | 37 +- + waflib/Tools/c_preproc.py | 6 +- + waflib/Tools/c_tests.py | 18 +- + waflib/Tools/ccroot.py | 20 +- + waflib/Tools/compiler_c.py | 25 +- + waflib/Tools/compiler_cxx.py | 25 +- + waflib/Tools/irixcc.py | 14 +- + waflib/Tools/msvc.py | 45 +- + waflib/Tools/waf_unit_test.py | 14 +- + waflib/Utils.py | 60 ++- + waflib/ansiterm.py | 2 +- + waflib/extras/clang_cross.py | 92 ++++ + waflib/extras/clang_cross_common.py | 113 +++++ + waflib/extras/clangxx_cross.py | 106 +++++ + waflib/extras/classic_runner.py | 68 +++ + waflib/extras/color_msvc.py | 59 +++ + waflib/extras/fc_fujitsu.py | 52 +++ + waflib/extras/fc_nfort.py | 52 +++ + waflib/extras/genpybind.py | 194 +++++++++ + waflib/extras/haxe.py | 154 +++++++ + waflib/extras/msvc_pdb.py | 46 ++ + waflib/extras/sphinx.py | 120 ++++++ + waflib/extras/wafcache.py | 648 ++++++++++++++++++++++++++++ + waflib/extras/xcode6.py | 18 +- + waflib/fixpy2.py | 2 +- + waflib/processor.py | 4 + + 40 files changed, 2114 insertions(+), 195 deletions(-) + create mode 100644 waflib-macos-mods.patch + create mode 100644 waflib/extras/clang_cross.py + create mode 100644 waflib/extras/clang_cross_common.py + create mode 100644 waflib/extras/clangxx_cross.py + create mode 100644 waflib/extras/classic_runner.py + create mode 100644 waflib/extras/color_msvc.py + create mode 100644 waflib/extras/fc_fujitsu.py + create mode 100644 waflib/extras/fc_nfort.py + create mode 100644 waflib/extras/genpybind.py + create mode 100644 waflib/extras/haxe.py + create mode 100644 waflib/extras/msvc_pdb.py + create mode 100644 waflib/extras/sphinx.py + create mode 100644 waflib/extras/wafcache.py + +diff --git a/waf b/waf +index 845fba5e9..38b2c9106 100755 +--- a/waf ++++ b/waf +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python + # encoding: latin-1 + # Thomas Nagy, 2005-2018 + # +@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. + + import os, sys, inspect + +-VERSION="2.0.12" ++VERSION="2.0.26" + REVISION="x" + GIT="x" + INSTALL="x" +@@ -142,6 +142,9 @@ def find_lib(): + if name.endswith('waf-light'): + w = test(base) + if w: return w ++ for dir in sys.path: ++ if test(dir): ++ return dir + err('waf-light requires waflib -> export WAFDIR=/folder') + + dirname = '%s-%s-%s' % (WAF, VERSION, REVISION) +diff --git a/waflib-macos-mods.patch b/waflib-macos-mods.patch +new file mode 100644 +index 000000000..9e2c8a3de +--- /dev/null ++++ b/waflib-macos-mods.patch +@@ -0,0 +1,18 @@ ++diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py ++index cfef8bf5..484846f5 100644 ++--- a/waflib/Tools/ccroot.py +++++ b/waflib/Tools/ccroot.py ++@@ -575,12 +575,10 @@ def apply_vnum(self): ++ ++ cnum = getattr(self, 'cnum', str(nums[0])) ++ cnums = cnum.split('.') ++- if len(cnums)>len(nums) or nums[0:len(cnums)] != cnums: ++- raise Errors.WafError('invalid compatibility version %s' % cnum) ++ ++ libname = node.name ++ if libname.endswith('.dylib'): ++- name3 = libname.replace('.dylib', '.%s.dylib' % self.vnum) +++ name3 = libname.replace('.dylib', '.%s.dylib' % cnums[0]) ++ name2 = libname.replace('.dylib', '.%s.dylib' % cnum) ++ else: ++ name3 = libname + '.' + self.vnum +diff --git a/waflib/Build.py b/waflib/Build.py +index c9661df15..b49dd8302 100644 +--- a/waflib/Build.py ++++ b/waflib/Build.py +@@ -104,7 +104,7 @@ def __init__(self, **kw): + """Amount of jobs to run in parallel""" + + self.targets = Options.options.targets +- """List of targets to build (default: \*)""" ++ """List of targets to build (default: \\*)""" + + self.keep = Options.options.keep + """Whether the build should continue past errors""" +@@ -753,10 +753,12 @@ def tgpost(tg): + else: + ln = self.launch_node() + if ln.is_child_of(self.bldnode): +- Logs.warn('Building from the build directory, forcing --targets=*') ++ if Logs.verbose > 1: ++ Logs.warn('Building from the build directory, forcing --targets=*') + ln = self.srcnode + elif not ln.is_child_of(self.srcnode): +- Logs.warn('CWD %s is not under %s, forcing --targets=* (run distclean?)', ln.abspath(), self.srcnode.abspath()) ++ if Logs.verbose > 1: ++ Logs.warn('CWD %s is not under %s, forcing --targets=* (run distclean?)', ln.abspath(), self.srcnode.abspath()) + ln = self.srcnode + + def is_post(tg, ln): +@@ -1054,7 +1056,7 @@ def post_run(self): + def get_install_path(self, destdir=True): + """ + Returns the destination path where files will be installed, pre-pending `destdir`. +- ++ + Relative paths will be interpreted relative to `PREFIX` if no `destdir` is given. + + :rtype: string +@@ -1062,11 +1064,11 @@ def get_install_path(self, destdir=True): + if isinstance(self.install_to, Node.Node): + dest = self.install_to.abspath() + else: +- dest = Utils.subst_vars(self.install_to, self.env) ++ dest = os.path.normpath(Utils.subst_vars(self.install_to, self.env)) + if not os.path.isabs(dest): +- dest = os.path.join(self.env.PREFIX, dest) ++ dest = os.path.join(self.env.PREFIX, dest) + if destdir and Options.options.destdir: +- dest = os.path.join(Options.options.destdir, os.path.splitdrive(dest)[1].lstrip(os.sep)) ++ dest = Options.options.destdir.rstrip(os.sep) + os.sep + os.path.splitdrive(dest)[1].lstrip(os.sep) + return dest + + def copy_fun(self, src, tgt): +@@ -1160,11 +1162,19 @@ def do_install(self, src, tgt, lbl, **kw): + # same size and identical timestamps -> make no copy + if st1.st_mtime + 2 >= st2.st_mtime and st1.st_size == st2.st_size: + if not self.generator.bld.progress_bar: +- Logs.info('- install %s (from %s)', tgt, lbl) ++ ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ ++ Logs.info('%s- install %s%s%s (from %s)', c1, c2, tgt, c1, lbl) + return False + + if not self.generator.bld.progress_bar: +- Logs.info('+ install %s (from %s)', tgt, lbl) ++ ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ ++ Logs.info('%s+ install %s%s%s (from %s)', c1, c2, tgt, c1, lbl) + + # Give best attempt at making destination overwritable, + # like the 'install' utility used by 'make install' does. +@@ -1221,14 +1231,18 @@ def do_link(self, src, tgt, **kw): + """ + if os.path.islink(tgt) and os.readlink(tgt) == src: + if not self.generator.bld.progress_bar: +- Logs.info('- symlink %s (to %s)', tgt, src) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- symlink %s%s%s (to %s)', c1, c2, tgt, c1, src) + else: + try: + os.remove(tgt) + except OSError: + pass + if not self.generator.bld.progress_bar: +- Logs.info('+ symlink %s (to %s)', tgt, src) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s+ symlink %s%s%s (to %s)', c1, c2, tgt, c1, src) + os.symlink(src, tgt) + self.fix_perms(tgt) + +@@ -1237,7 +1251,9 @@ def do_uninstall(self, src, tgt, lbl, **kw): + See :py:meth:`waflib.Build.inst.do_install` + """ + if not self.generator.bld.progress_bar: +- Logs.info('- remove %s', tgt) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- remove %s%s%s', c1, c2, tgt, c1) + + #self.uninstall.append(tgt) + try: +@@ -1257,7 +1273,9 @@ def do_unlink(self, src, tgt, **kw): + """ + try: + if not self.generator.bld.progress_bar: +- Logs.info('- remove %s', tgt) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- remove %s%s%s', c1, c2, tgt, c1) + os.remove(tgt) + except OSError: + pass +@@ -1318,7 +1336,8 @@ def build(bld): + lst = [] + for env in self.all_envs.values(): + lst.extend(self.root.find_or_declare(f) for f in env[CFG_FILES]) +- for n in self.bldnode.ant_glob('**/*', excl='.lock* *conf_check_*/** config.log c4che/*', quiet=True): ++ excluded_dirs = '.lock* *conf_check_*/** config.log %s/*' % CACHE_DIR ++ for n in self.bldnode.ant_glob('**/*', excl=excluded_dirs, quiet=True): + if n in lst: + continue + n.delete() +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index 84736c9c8..901fba6c0 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -11,7 +11,7 @@ + + import copy, re, os + from waflib import Logs, Utils +-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) ++re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) + + class ConfigSet(object): + """ +diff --git a/waflib/Configure.py b/waflib/Configure.py +index d0a4793a8..f6fdc4e94 100644 +--- a/waflib/Configure.py ++++ b/waflib/Configure.py +@@ -125,7 +125,7 @@ def init_dirs(self): + self.bldnode.mkdir() + + if not os.path.isdir(self.bldnode.abspath()): +- conf.fatal('Could not create the build directory %s' % self.bldnode.abspath()) ++ self.fatal('Could not create the build directory %s' % self.bldnode.abspath()) + + def execute(self): + """ +@@ -180,6 +180,7 @@ def execute(self): + env.hash = self.hash + env.files = self.files + env.environ = dict(self.environ) ++ env.launch_dir = Context.launch_dir + + if not (self.env.NO_LOCK_IN_RUN or env.environ.get('NO_LOCK_IN_RUN') or getattr(Options.options, 'no_lock_in_run')): + env.store(os.path.join(Context.run_dir, Options.lockfile)) +@@ -438,7 +439,7 @@ def find_program(self, filename, **kw): + + var = kw.get('var', '') + if not var: +- var = re.sub(r'[-.]', '_', filename[0].upper()) ++ var = re.sub(r'\W', '_', filename[0].upper()) + + path_list = kw.get('path_list', '') + if path_list: +@@ -507,23 +508,27 @@ def find_binary(self, filenames, exts, paths): + @conf + def run_build(self, *k, **kw): + """ +- Create a temporary build context to execute a build. A reference to that build +- context is kept on self.test_bld for debugging purposes, and you should not rely +- on it too much (read the note on the cache below). +- The parameters given in the arguments to this function are passed as arguments for +- a single task generator created in the build. Only three parameters are obligatory: ++ Create a temporary build context to execute a build. A temporary reference to that build ++ context is kept on self.test_bld for debugging purposes. ++ The arguments to this function are passed to a single task generator for that build. ++ Only three parameters are mandatory: + + :param features: features to pass to a task generator created in the build + :type features: list of string + :param compile_filename: file to create for the compilation (default: *test.c*) + :type compile_filename: string +- :param code: code to write in the filename to compile ++ :param code: input file contents + :type code: string + +- Though this function returns *0* by default, the build may set an attribute named *retval* on the ++ Though this function returns *0* by default, the build may bind attribute named *retval* on the + build context object to return a particular value. See :py:func:`waflib.Tools.c_config.test_exec_fun` for example. + +- This function also provides a limited cache. To use it, provide the following option:: ++ The temporary builds creates a temporary folder; the name of that folder is calculated ++ by hashing input arguments to this function, with the exception of :py:class:`waflib.ConfigSet.ConfigSet` ++ objects which are used for both reading and writing values. ++ ++ This function also features a cache which is disabled by default; that cache relies ++ on the hash value calculated as indicated above:: + + def options(opt): + opt.add_option('--confcache', dest='confcache', default=0, +@@ -534,10 +539,24 @@ def options(opt): + $ waf configure --confcache + + """ +- lst = [str(v) for (p, v) in kw.items() if p != 'env'] +- h = Utils.h_list(lst) ++ buf = [] ++ for key in sorted(kw.keys()): ++ v = kw[key] ++ if isinstance(v, ConfigSet.ConfigSet): ++ # values are being written to, so they are excluded from contributing to the hash ++ continue ++ elif hasattr(v, '__call__'): ++ buf.append(Utils.h_fun(v)) ++ else: ++ buf.append(str(v)) ++ h = Utils.h_list(buf) + dir = self.bldnode.abspath() + os.sep + (not Utils.is_win32 and '.' or '') + 'conf_check_' + Utils.to_hex(h) + ++ cachemode = kw.get('confcache', getattr(Options.options, 'confcache', None)) ++ ++ if not cachemode and os.path.exists(dir): ++ shutil.rmtree(dir) ++ + try: + os.makedirs(dir) + except OSError: +@@ -548,7 +567,6 @@ def options(opt): + except OSError: + self.fatal('cannot use the configuration test folder %r' % dir) + +- cachemode = getattr(Options.options, 'confcache', None) + if cachemode == 1: + try: + proj = ConfigSet.ConfigSet(os.path.join(dir, 'cache_run_build')) +@@ -588,7 +606,7 @@ def options(opt): + else: + ret = getattr(bld, 'retval', 0) + finally: +- if cachemode == 1: ++ if cachemode: + # cache the results each time + proj = ConfigSet.ConfigSet() + proj['cache_run_build'] = ret +diff --git a/waflib/Context.py b/waflib/Context.py +index 761b521f5..369664819 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -6,20 +6,30 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) +-HEXVERSION=0x2000c00 ++HEXVERSION=0x2001a00 + """Constant updated on new releases""" + +-WAFVERSION="2.0.12" ++WAFVERSION="2.0.26" + """Constant updated on new releases""" + +-WAFREVISION="54841218840ffa34fddf834680a5a17db69caa12" ++WAFREVISION="0fb985ce1932c6f3e7533f435e4ee209d673776e" + """Git revision when the waf version is updated""" + ++WAFNAME="waf" ++"""Application name displayed on --help""" ++ + ABI = 20 + """Version of the build data cache file format (used in :py:const:`waflib.Context.DBFILE`)""" + +@@ -134,7 +144,7 @@ def foo(ctx): + :type fun: string + + .. inheritance-diagram:: waflib.Context.Context waflib.Build.BuildContext waflib.Build.InstallContext waflib.Build.UninstallContext waflib.Build.StepContext waflib.Build.ListContext waflib.Configure.ConfigurationContext waflib.Scripting.Dist waflib.Scripting.DistCheck waflib.Build.CleanContext +- ++ :top-classes: waflib.Context.Context + """ + + errors = Errors +@@ -613,7 +623,7 @@ def load_special_tools(self, var, ban=[]): + is typically called once for a programming language group, see for + example :py:mod:`waflib.Tools.compiler_c` + +- :param var: glob expression, for example 'cxx\_\*.py' ++ :param var: glob expression, for example 'cxx\\_\\*.py' + :type var: string + :param ban: list of exact file names to exclude + :type ban: list of string +@@ -678,7 +688,7 @@ def load_module(path, encoding=None): + + def load_tool(tool, tooldir=None, ctx=None, with_sys_path=True): + """ +- Importx a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` ++ Imports a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` + + :type tool: string + :param tool: Name of the tool +diff --git a/waflib/Logs.py b/waflib/Logs.py +index 2a475169b..298411db5 100644 +--- a/waflib/Logs.py ++++ b/waflib/Logs.py +@@ -237,7 +237,10 @@ def format(self, rec): + if rec.levelno >= logging.INFO: + # the goal of this is to format without the leading "Logs, hour" prefix + if rec.args: +- return msg % rec.args ++ try: ++ return msg % rec.args ++ except UnicodeDecodeError: ++ return msg.encode('utf-8') % rec.args + return msg + + rec.msg = msg +@@ -276,9 +279,9 @@ def error(*k, **kw): + + def warn(*k, **kw): + """ +- Wraps logging.warn ++ Wraps logging.warning + """ +- log.warn(*k, **kw) ++ log.warning(*k, **kw) + + def info(*k, **kw): + """ +diff --git a/waflib/Node.py b/waflib/Node.py +index 4ac1ea8a0..2ad184669 100644 +--- a/waflib/Node.py ++++ b/waflib/Node.py +@@ -73,7 +73,7 @@ def ant_matcher(s, ignorecase): + if k == '**': + accu.append(k) + else: +- k = k.replace('.', '[.]').replace('*','.*').replace('?', '.').replace('+', '\\+') ++ k = k.replace('.', '[.]').replace('*', '.*').replace('?', '.').replace('+', '\\+') + k = '^%s$' % k + try: + exp = re.compile(k, flags=reflags) +@@ -595,7 +595,6 @@ def ant_iter(self, accept=None, maxdepth=25, pats=[], dir=False, src=True, remov + :rtype: iterator + """ + dircont = self.listdir() +- dircont.sort() + + try: + lst = set(self.children.keys()) +diff --git a/waflib/Options.py b/waflib/Options.py +index ad802d4b9..d4104917c 100644 +--- a/waflib/Options.py ++++ b/waflib/Options.py +@@ -44,7 +44,7 @@ class opt_parser(optparse.OptionParser): + """ + def __init__(self, ctx, allow_unknown=False): + optparse.OptionParser.__init__(self, conflict_handler='resolve', add_help_option=False, +- version='waf %s (%s)' % (Context.WAFVERSION, Context.WAFREVISION)) ++ version='%s %s (%s)' % (Context.WAFNAME, Context.WAFVERSION, Context.WAFREVISION)) + self.formatter.width = Logs.get_term_cols() + self.ctx = ctx + self.allow_unknown = allow_unknown +@@ -62,6 +62,21 @@ def _process_args(self, largs, rargs, values): + else: + self.error(str(e)) + ++ def _process_long_opt(self, rargs, values): ++ # --custom-option=-ftxyz is interpreted as -f -t... see #2280 ++ if self.allow_unknown: ++ back = [] + rargs ++ try: ++ optparse.OptionParser._process_long_opt(self, rargs, values) ++ except optparse.BadOptionError: ++ while rargs: ++ rargs.pop() ++ rargs.extend(back) ++ rargs.pop(0) ++ raise ++ else: ++ optparse.OptionParser._process_long_opt(self, rargs, values) ++ + def print_usage(self, file=None): + return self.print_help(file) + +@@ -96,11 +111,11 @@ def get_usage(self): + lst.sort() + ret = '\n'.join(lst) + +- return '''waf [commands] [options] ++ return '''%s [commands] [options] + +-Main commands (example: ./waf build -j4) ++Main commands (example: ./%s build -j4) + %s +-''' % ret ++''' % (Context.WAFNAME, Context.WAFNAME, ret) + + + class OptionsContext(Context.Context): +@@ -141,9 +156,9 @@ def __init__(self, **kw): + gr.add_option('-o', '--out', action='store', default='', help='build dir for the project', dest='out') + gr.add_option('-t', '--top', action='store', default='', help='src dir for the project', dest='top') + +- gr.add_option('--no-lock-in-run', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_run') +- gr.add_option('--no-lock-in-out', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_out') +- gr.add_option('--no-lock-in-top', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_top') ++ gr.add_option('--no-lock-in-run', action='store_true', default=os.environ.get('NO_LOCK_IN_RUN', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_run') ++ gr.add_option('--no-lock-in-out', action='store_true', default=os.environ.get('NO_LOCK_IN_OUT', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_out') ++ gr.add_option('--no-lock-in-top', action='store_true', default=os.environ.get('NO_LOCK_IN_TOP', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_top') + + default_prefix = getattr(Context.g_module, 'default_prefix', os.environ.get('PREFIX')) + if not default_prefix: +@@ -282,6 +297,8 @@ def parse_cmd_args(self, _args=None, cwd=None, allow_unknown=False): + elif arg != 'options': + commands.append(arg) + ++ if options.jobs < 1: ++ options.jobs = 1 + for name in 'top out destdir prefix bindir libdir'.split(): + # those paths are usually expanded from Context.launch_dir + if getattr(options, name, None): +diff --git a/waflib/Runner.py b/waflib/Runner.py +index 261084d27..350c86a22 100644 +--- a/waflib/Runner.py ++++ b/waflib/Runner.py +@@ -37,6 +37,8 @@ def __len__(self): + return len(self.lst) + def __iter__(self): + return iter(self.lst) ++ def __str__(self): ++ return 'PriorityTasks: [%s]' % '\n '.join(str(x) for x in self.lst) + def clear(self): + self.lst = [] + def append(self, task): +@@ -69,7 +71,7 @@ def __init__(self, spawner, task): + """Task to execute""" + self.spawner = spawner + """Coordinator object""" +- self.setDaemon(1) ++ self.daemon = True + self.start() + def run(self): + """ +@@ -96,7 +98,7 @@ def __init__(self, master): + """:py:class:`waflib.Runner.Parallel` producer instance""" + self.sem = Utils.threading.Semaphore(master.numjobs) + """Bounded semaphore that prevents spawning more than *n* concurrent consumers""" +- self.setDaemon(1) ++ self.daemon = True + self.start() + def run(self): + """ +@@ -181,10 +183,12 @@ def __init__(self, bld, j=2): + The reverse dependency graph of dependencies obtained from Task.run_after + """ + +- self.spawner = Spawner(self) ++ self.spawner = None + """ + Coordinating daemon thread that spawns thread consumers + """ ++ if self.numjobs > 1: ++ self.spawner = Spawner(self) + + def get_next_task(self): + """ +@@ -254,6 +258,8 @@ def refill_task_list(self): + self.outstanding.append(x) + break + else: ++ if self.stop or self.error: ++ break + raise Errors.WafError('Broken revdeps detected on %r' % self.incomplete) + else: + tasks = next(self.biter) +@@ -331,11 +337,16 @@ def try_unfreeze(x): + + if hasattr(tsk, 'semaphore'): + sem = tsk.semaphore +- sem.release(tsk) +- while sem.waiting and not sem.is_locked(): +- # take a frozen task, make it ready to run +- x = sem.waiting.pop() +- self._add_task(x) ++ try: ++ sem.release(tsk) ++ except KeyError: ++ # TODO ++ pass ++ else: ++ while sem.waiting and not sem.is_locked(): ++ # take a frozen task, make it ready to run ++ x = sem.waiting.pop() ++ self._add_task(x) + + def get_out(self): + """ +diff --git a/waflib/Scripting.py b/waflib/Scripting.py +index 749d4f2e6..a80cb3678 100644 +--- a/waflib/Scripting.py ++++ b/waflib/Scripting.py +@@ -216,7 +216,10 @@ def parse_options(): + ctx = Context.create_context('options') + ctx.execute() + if not Options.commands: +- Options.commands.append(default_cmd) ++ if isinstance(default_cmd, list): ++ Options.commands.extend(default_cmd) ++ else: ++ Options.commands.append(default_cmd) + if Options.options.whelp: + ctx.parser.print_help() + sys.exit(0) +@@ -280,7 +283,7 @@ def distclean_dir(dirname): + pass + + try: +- shutil.rmtree('c4che') ++ shutil.rmtree(Build.CACHE_DIR) + except OSError: + pass + +@@ -303,7 +306,7 @@ def remove_and_log(k, fun): + + # remove a build folder, if any + cur = '.' +- if ctx.options.no_lock_in_top: ++ if os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top: + cur = ctx.options.out + + try: +@@ -329,7 +332,12 @@ def remove_and_log(k, fun): + else: + remove_and_log(env.out_dir, shutil.rmtree) + +- for k in (env.out_dir, env.top_dir, env.run_dir): ++ env_dirs = [env.out_dir] ++ if not (os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top): ++ env_dirs.append(env.top_dir) ++ if not (os.environ.get('NO_LOCK_IN_RUN') or ctx.options.no_lock_in_run): ++ env_dirs.append(env.run_dir) ++ for k in env_dirs: + p = os.path.join(k, Options.lockfile) + remove_and_log(p, os.remove) + +@@ -380,7 +388,11 @@ def archive(self): + + for x in files: + archive_name = self.get_base_name() + '/' + x.path_from(self.base_path) +- zip.write(x.abspath(), archive_name, zipfile.ZIP_DEFLATED) ++ if os.environ.get('SOURCE_DATE_EPOCH'): ++ # TODO: parse that timestamp ++ zip.writestr(zipfile.ZipInfo(archive_name), x.read(), zipfile.ZIP_DEFLATED) ++ else: ++ zip.write(x.abspath(), archive_name, zipfile.ZIP_DEFLATED) + zip.close() + else: + self.fatal('Valid algo types are tar.bz2, tar.gz, tar.xz or zip') +@@ -417,6 +429,8 @@ def add_tar_file(self, x, tar): + tinfo.gid = 0 + tinfo.uname = 'root' + tinfo.gname = 'root' ++ if os.environ.get('SOURCE_DATE_EPOCH'): ++ tinfo.mtime = int(os.environ.get('SOURCE_DATE_EPOCH')) + + if os.path.isfile(p): + with open(p, 'rb') as f: +@@ -598,12 +612,15 @@ def execute(self): + cmd = env.config_cmd or 'configure' + if Configure.autoconfig == 'clobber': + tmp = Options.options.__dict__ ++ launch_dir_tmp = Context.launch_dir + if env.options: + Options.options.__dict__ = env.options ++ Context.launch_dir = env.launch_dir + try: + run_command(cmd) + finally: + Options.options.__dict__ = tmp ++ Context.launch_dir = launch_dir_tmp + else: + run_command(cmd) + run_command(self.cmd) +diff --git a/waflib/Task.py b/waflib/Task.py +index 6aebc6074..cb49a7394 100644 +--- a/waflib/Task.py ++++ b/waflib/Task.py +@@ -163,10 +163,10 @@ class Task(evil): + """File extensions that objects of this task class may create""" + + before = [] +- """List of task class names to execute before instances of this class""" ++ """The instances of this class are executed before the instances of classes whose names are in this list""" + + after = [] +- """List of task class names to execute after instances of this class""" ++ """The instances of this class are executed after the instances of classes whose names are in this list""" + + hcode = Utils.SIG_NIL + """String representing an additional hash for the class representation""" +@@ -306,25 +306,31 @@ def exec_command(self, cmd, **kw): + if hasattr(self, 'stderr'): + kw['stderr'] = self.stderr + +- # workaround for command line length limit: +- # http://support.microsoft.com/kb/830473 +- if not isinstance(cmd, str) and (len(repr(cmd)) >= 8192 if Utils.is_win32 else len(cmd) > 200000): +- cmd, args = self.split_argfile(cmd) +- try: +- (fd, tmp) = tempfile.mkstemp() +- os.write(fd, '\r\n'.join(args).encode()) +- os.close(fd) +- if Logs.verbose: +- Logs.debug('argfile: @%r -> %r', tmp, args) +- return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw) +- finally: ++ if not isinstance(cmd, str): ++ if Utils.is_win32: ++ # win32 compares the resulting length http://support.microsoft.com/kb/830473 ++ too_long = sum([len(arg) for arg in cmd]) + len(cmd) > 8192 ++ else: ++ # non-win32 counts the amount of arguments (200k) ++ too_long = len(cmd) > 200000 ++ ++ if too_long and getattr(self, 'allow_argsfile', True): ++ # Shunt arguments to a temporary file if the command is too long. ++ cmd, args = self.split_argfile(cmd) + try: +- os.remove(tmp) +- except OSError: +- # anti-virus and indexers can keep files open -_- +- pass +- else: +- return self.generator.bld.exec_command(cmd, **kw) ++ (fd, tmp) = tempfile.mkstemp() ++ os.write(fd, '\r\n'.join(args).encode()) ++ os.close(fd) ++ if Logs.verbose: ++ Logs.debug('argfile: @%r -> %r', tmp, args) ++ return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw) ++ finally: ++ try: ++ os.remove(tmp) ++ except OSError: ++ # anti-virus and indexers can keep files open -_- ++ pass ++ return self.generator.bld.exec_command(cmd, **kw) + + def process(self): + """ +@@ -1044,7 +1050,7 @@ def funex(c): + exec(c, dc) + return dc['f'] + +-re_cond = re.compile('(?P\w+)|(?P\|)|(?P&)') ++re_cond = re.compile(r'(?P\w+)|(?P\|)|(?P&)') + re_novar = re.compile(r'^(SRC|TGT)\W+.*?$') + reg_act = re.compile(r'(?P\\)|(?P\$\$)|(?P\$\{(?P\w+)(?P.*?)\})', re.M) + def compile_fun_shell(line): +diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py +index a74e6431d..32468f03d 100644 +--- a/waflib/TaskGen.py ++++ b/waflib/TaskGen.py +@@ -74,7 +74,7 @@ def __init__(self, *k, **kw): + else: + self.bld = kw['bld'] + self.env = self.bld.env.derive() +- self.path = self.bld.path # emulate chdir when reading scripts ++ self.path = kw.get('path', self.bld.path) # by default, emulate chdir when reading scripts + + # Provide a unique index per folder + # This is part of a measure to prevent output file name collisions +@@ -400,7 +400,7 @@ def feature(*k): + Decorator that registers a task generator method that will be executed when the + object attribute ``feature`` contains the corresponding key(s):: + +- from waflib.Task import feature ++ from waflib.TaskGen import feature + @feature('myfeature') + def myfunction(self): + print('that is my feature!') +@@ -631,12 +631,8 @@ def chmod_fun(tsk): + cls.scan = self.scan + elif has_deps: + def scan(self): +- nodes = [] +- for x in self.generator.to_list(getattr(self.generator, 'deps', None)): +- node = self.generator.path.find_resource(x) +- if not node: +- self.generator.bld.fatal('Could not find %r (was it declared?)' % x) +- nodes.append(node) ++ deps = getattr(self.generator, 'deps', None) ++ nodes = self.generator.to_nodes(deps) + return [nodes, []] + cls.scan = scan + +@@ -727,7 +723,7 @@ def sequence_order(self): + self.bld.prev = self + + +-re_m4 = re.compile('@(\w+)@', re.M) ++re_m4 = re.compile(r'@(\w+)@', re.M) + + class subst_pc(Task.Task): + """ +@@ -905,7 +901,7 @@ def build(bld): + # paranoid safety measure for the general case foo.in->foo.h with ambiguous dependencies + for xt in HEADER_EXTS: + if b.name.endswith(xt): +- tsk.ext_in = tsk.ext_in + ['.h'] ++ tsk.ext_out = tsk.ext_out + ['.h'] + break + + inst_to = getattr(self, 'install_path', None) +diff --git a/waflib/Tools/c_aliases.py b/waflib/Tools/c_aliases.py +index c9d53692e..928cfe29c 100644 +--- a/waflib/Tools/c_aliases.py ++++ b/waflib/Tools/c_aliases.py +@@ -38,7 +38,7 @@ def sniff_features(**kw): + :return: the list of features for a task generator processing the source files + :rtype: list of string + """ +- exts = get_extensions(kw['source']) ++ exts = get_extensions(kw.get('source', [])) + typ = kw['typ'] + feats = [] + +@@ -47,10 +47,12 @@ def sniff_features(**kw): + if x in exts: + feats.append('cxx') + break +- + if 'c' in exts or 'vala' in exts or 'gs' in exts: + feats.append('c') + ++ if 's' in exts or 'S' in exts: ++ feats.append('asm') ++ + for x in 'f f90 F F90 for FOR'.split(): + if x in exts: + feats.append('fc') +@@ -66,11 +68,11 @@ def sniff_features(**kw): + if typ in ('program', 'shlib', 'stlib'): + will_link = False + for x in feats: +- if x in ('cxx', 'd', 'fc', 'c'): ++ if x in ('cxx', 'd', 'fc', 'c', 'asm'): + feats.append(x + typ) + will_link = True + if not will_link and not kw.get('features', []): +- raise Errors.WafError('Cannot link from %r, try passing eg: features="c cprogram"?' % kw) ++ raise Errors.WafError('Unable to determine how to link %r, try adding eg: features="c cshlib"?' % kw) + return feats + + def set_features(kw, typ): +diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py +index d2b3c0d8f..f5ab19bf6 100644 +--- a/waflib/Tools/c_config.py ++++ b/waflib/Tools/c_config.py +@@ -68,6 +68,8 @@ + '__s390__' : 's390', + '__sh__' : 'sh', + '__xtensa__' : 'xtensa', ++'__e2k__' : 'e2k', ++'__riscv' : 'riscv', + } + + @conf +@@ -86,6 +88,10 @@ def configure(conf): + :type uselib_store: string + :param env: config set or conf.env by default + :type env: :py:class:`waflib.ConfigSet.ConfigSet` ++ :param force_static: force usage of static libraries ++ :type force_static: bool default False ++ :param posix: usage of POSIX mode for shlex lexical analiysis library ++ :type posix: bool default True + """ + + assert(isinstance(line, str)) +@@ -103,6 +109,8 @@ def configure(conf): + lex.commenters = '' + lst = list(lex) + ++ so_re = re.compile(r"\.so(?:\.[0-9]+)*$") ++ + # append_unique is not always possible + # for example, apple flags may require both -arch i386 and -arch ppc + uselib = uselib_store +@@ -144,7 +152,7 @@ def appu(var, val): + elif x.startswith('-std='): + prefix = 'CXXFLAGS' if '++' in x else 'CFLAGS' + app(prefix, x) +- elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie'): ++ elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie', '-flto', '-fno-lto'): + app('CFLAGS', x) + app('CXXFLAGS', x) + app('LINKFLAGS', x) +@@ -180,7 +188,7 @@ def appu(var, val): + app('CFLAGS', tmp) + app('CXXFLAGS', tmp) + app('LINKFLAGS', tmp) +- elif x.endswith(('.a', '.so', '.dylib', '.lib')): ++ elif x.endswith(('.a', '.dylib', '.lib')) or so_re.search(x): + appu('LINKFLAGS', x) # not cool, #762 + else: + self.to_log('Unhandled flag %r' % x) +@@ -246,13 +254,15 @@ def exec_cfg(self, kw): + * if modversion is given, then return the module version + * else, execute the *-config* program with the *args* and *variables* given, and set the flags on the *conf.env.FLAGS_name* variable + ++ :param path: the **-config program to use** ++ :type path: list of string + :param atleast_pkgconfig_version: minimum pkg-config version to use (disable other tests) + :type atleast_pkgconfig_version: string + :param package: package name, for example *gtk+-2.0* + :type package: string +- :param uselib_store: if the test is successful, define HAVE\_*name*. It is also used to define *conf.env.FLAGS_name* variables. ++ :param uselib_store: if the test is successful, define HAVE\\_*name*. It is also used to define *conf.env.FLAGS_name* variables. + :type uselib_store: string +- :param modversion: if provided, return the version of the given module and define *name*\_VERSION ++ :param modversion: if provided, return the version of the given module and define *name*\\_VERSION + :type modversion: string + :param args: arguments to give to *package* when retrieving flags + :type args: list of string +@@ -260,6 +270,12 @@ def exec_cfg(self, kw): + :type variables: list of string + :param define_variable: additional variables to define (also in conf.env.PKG_CONFIG_DEFINES) + :type define_variable: dict(string: string) ++ :param pkg_config_path: paths where pkg-config should search for .pc config files (overrides env.PKG_CONFIG_PATH if exists) ++ :type pkg_config_path: string, list of directories separated by colon ++ :param force_static: force usage of static libraries ++ :type force_static: bool default False ++ :param posix: usage of POSIX mode for shlex lexical analiysis library ++ :type posix: bool default True + """ + + path = Utils.to_list(kw['path']) +@@ -334,6 +350,7 @@ def check_cfg(self, *k, **kw): + """ + Checks for configuration flags using a **-config**-like program (pkg-config, sdl-config, etc). + This wraps internal calls to :py:func:`waflib.Tools.c_config.validate_cfg` and :py:func:`waflib.Tools.c_config.exec_cfg` ++ so check exec_cfg parameters descriptions for more details on kw passed + + A few examples:: + +@@ -659,20 +676,21 @@ class test_exec(Task.Task): + """ + color = 'PINK' + def run(self): ++ cmd = [self.inputs[0].abspath()] + getattr(self.generator, 'test_args', []) + if getattr(self.generator, 'rpath', None): + if getattr(self.generator, 'define_ret', False): +- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) ++ self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd) + else: +- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) ++ self.generator.bld.retval = self.generator.bld.exec_command(cmd) + else: + env = self.env.env or {} + env.update(dict(os.environ)) + for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): + env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') + if getattr(self.generator, 'define_ret', False): +- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) ++ self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd, env=env) + else: +- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) ++ self.generator.bld.retval = self.generator.bld.exec_command(cmd, env=env) + + @feature('test_exec') + @after_method('apply_link') +@@ -1266,10 +1284,11 @@ def to_log(self, *k, **kw): + tasks = [] + + id_to_task = {} +- for dct in k: ++ for counter, dct in enumerate(k): + x = Task.classes['cfgtask'](bld=bld, env=None) + tasks.append(x) + x.args = dct ++ x.args['multicheck_counter'] = counter + x.bld = bld + x.conf = self + x.args = dct +diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py +index 7e04b4a7c..68e5f5aea 100644 +--- a/waflib/Tools/c_preproc.py ++++ b/waflib/Tools/c_preproc.py +@@ -75,13 +75,13 @@ class PreprocError(Errors.WafError): + re.IGNORECASE | re.MULTILINE) + """Match #include lines""" + +-re_mac = re.compile("^[a-zA-Z_]\w*") ++re_mac = re.compile(r"^[a-zA-Z_]\w*") + """Match macro definitions""" + + re_fun = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]') + """Match macro functions""" + +-re_pragma_once = re.compile('^\s*once\s*', re.IGNORECASE) ++re_pragma_once = re.compile(r'^\s*once\s*', re.IGNORECASE) + """Match #pragma once statements""" + + re_nl = re.compile('\\\\\r*\n', re.MULTILINE) +@@ -660,7 +660,7 @@ def extract_macro(txt): + # empty define, assign an empty token + return (v, [[], [('T','')]]) + +-re_include = re.compile('^\s*(<(?:.*)>|"(?:.*)")') ++re_include = re.compile(r'^\s*(<(?:.*)>|"(?:.*)")') + def extract_include(txt, defs): + """ + Process a line in the form:: +diff --git a/waflib/Tools/c_tests.py b/waflib/Tools/c_tests.py +index f858df576..bdd186c6b 100644 +--- a/waflib/Tools/c_tests.py ++++ b/waflib/Tools/c_tests.py +@@ -180,9 +180,15 @@ def check_large_file(self, **kw): + ######################################################################################## + + ENDIAN_FRAGMENT = ''' ++#ifdef _MSC_VER ++#define testshlib_EXPORT __declspec(dllexport) ++#else ++#define testshlib_EXPORT ++#endif ++ + short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +-int use_ascii (int i) { ++int testshlib_EXPORT use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +@@ -208,12 +214,12 @@ def run(self): + return -1 + + @feature('grep_for_endianness') +-@after_method('process_source') ++@after_method('apply_link') + def grep_for_endianness_fun(self): + """ + Used by the endianness configuration test + """ +- self.create_task('grep_for_endianness', self.compiled_tasks[0].outputs[0]) ++ self.create_task('grep_for_endianness', self.link_task.outputs[0]) + + @conf + def check_endianness(self): +@@ -223,7 +229,9 @@ def check_endianness(self): + tmp = [] + def check_msg(self): + return tmp[0] +- self.check(fragment=ENDIAN_FRAGMENT, features='c grep_for_endianness', +- msg='Checking for endianness', define='ENDIANNESS', tmp=tmp, okmsg=check_msg) ++ ++ self.check(fragment=ENDIAN_FRAGMENT, features='c cshlib grep_for_endianness', ++ msg='Checking for endianness', define='ENDIANNESS', tmp=tmp, ++ okmsg=check_msg, confcache=None) + return tmp[0] + +diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py +index 484846f5f..533992903 100644 +--- a/waflib/Tools/ccroot.py ++++ b/waflib/Tools/ccroot.py +@@ -111,7 +111,7 @@ def apply_incpaths(self): + tg = bld(features='includes', includes='.') + + The folders only need to be relative to the current directory, the equivalent build directory is +- added automatically (for headers created in the build directory). This enable using a build directory ++ added automatically (for headers created in the build directory). This enables using a build directory + or not (``top == out``). + + This method will add a list of nodes read by :py:func:`waflib.Tools.ccroot.to_incnodes` in ``tg.env.INCPATHS``, +@@ -128,6 +128,7 @@ class link_task(Task.Task): + Base class for all link tasks. A task generator is supposed to have at most one link task bound in the attribute *link_task*. See :py:func:`waflib.Tools.ccroot.apply_link`. + + .. inheritance-diagram:: waflib.Tools.ccroot.stlink_task waflib.Tools.c.cprogram waflib.Tools.c.cshlib waflib.Tools.cxx.cxxstlib waflib.Tools.cxx.cxxprogram waflib.Tools.cxx.cxxshlib waflib.Tools.d.dprogram waflib.Tools.d.dshlib waflib.Tools.d.dstlib waflib.Tools.ccroot.fake_shlib waflib.Tools.ccroot.fake_stlib waflib.Tools.asm.asmprogram waflib.Tools.asm.asmshlib waflib.Tools.asm.asmstlib ++ :top-classes: waflib.Tools.ccroot.link_task + """ + color = 'YELLOW' + +@@ -238,6 +239,17 @@ def wrap(self): + setattr(cls, 'run', wrap) + rm_tgt(stlink_task) + ++@feature('skip_stlib_link_deps') ++@before_method('process_use') ++def apply_skip_stlib_link_deps(self): ++ """ ++ This enables an optimization in the :py:func:wafilb.Tools.ccroot.processes_use: method that skips dependency and ++ link flag optimizations for targets that generate static libraries (via the :py:class:Tools.ccroot.stlink_task task). ++ The actual behavior is implemented in :py:func:wafilb.Tools.ccroot.processes_use: method so this feature only tells waf ++ to enable the new behavior. ++ """ ++ self.env.SKIP_STLIB_LINK_DEPS = True ++ + @feature('c', 'cxx', 'd', 'fc', 'asm') + @after_method('process_source') + def apply_link(self): +@@ -386,7 +398,11 @@ def build(bld): + y = self.bld.get_tgen_by_name(x) + var = y.tmp_use_var + if var and link_task: +- if var == 'LIB' or y.tmp_use_stlib or x in names: ++ if self.env.SKIP_STLIB_LINK_DEPS and isinstance(link_task, stlink_task): ++ # If the skip_stlib_link_deps feature is enabled then we should ++ # avoid adding lib deps to the stlink_task instance. ++ pass ++ elif var == 'LIB' or y.tmp_use_stlib or x in names: + self.env.append_value(var, [y.target[y.target.rfind(os.sep) + 1:]]) + self.link_task.dep_nodes.extend(y.link_task.outputs) + tmp_path = y.link_task.outputs[0].parent.path_from(self.get_cwd()) +diff --git a/waflib/Tools/compiler_c.py b/waflib/Tools/compiler_c.py +index 2dba3f827..e033ce6c5 100644 +--- a/waflib/Tools/compiler_c.py ++++ b/waflib/Tools/compiler_c.py +@@ -36,18 +36,19 @@ def build(bld): + from waflib.Logs import debug + + c_compiler = { +-'win32': ['msvc', 'gcc', 'clang'], +-'cygwin': ['gcc'], +-'darwin': ['clang', 'gcc'], +-'aix': ['xlc', 'gcc', 'clang'], +-'linux': ['gcc', 'clang', 'icc'], +-'sunos': ['suncc', 'gcc'], +-'irix': ['gcc', 'irixcc'], +-'hpux': ['gcc'], +-'osf1V': ['gcc'], +-'gnu': ['gcc', 'clang'], +-'java': ['gcc', 'msvc', 'clang', 'icc'], +-'default':['clang', 'gcc'], ++'win32': ['msvc', 'gcc', 'clang'], ++'cygwin': ['gcc', 'clang'], ++'darwin': ['clang', 'gcc'], ++'aix': ['xlc', 'gcc', 'clang'], ++'linux': ['gcc', 'clang', 'icc'], ++'sunos': ['suncc', 'gcc'], ++'irix': ['gcc', 'irixcc'], ++'hpux': ['gcc'], ++'osf1V': ['gcc'], ++'gnu': ['gcc', 'clang'], ++'java': ['gcc', 'msvc', 'clang', 'icc'], ++'gnukfreebsd': ['gcc', 'clang'], ++'default': ['clang', 'gcc'], + } + """ + Dict mapping platform names to Waf tools finding specific C compilers:: +diff --git a/waflib/Tools/compiler_cxx.py b/waflib/Tools/compiler_cxx.py +index 1af65a226..42658c584 100644 +--- a/waflib/Tools/compiler_cxx.py ++++ b/waflib/Tools/compiler_cxx.py +@@ -37,18 +37,19 @@ def build(bld): + from waflib.Logs import debug + + cxx_compiler = { +-'win32': ['msvc', 'g++', 'clang++'], +-'cygwin': ['g++'], +-'darwin': ['clang++', 'g++'], +-'aix': ['xlc++', 'g++', 'clang++'], +-'linux': ['g++', 'clang++', 'icpc'], +-'sunos': ['sunc++', 'g++'], +-'irix': ['g++'], +-'hpux': ['g++'], +-'osf1V': ['g++'], +-'gnu': ['g++', 'clang++'], +-'java': ['g++', 'msvc', 'clang++', 'icpc'], +-'default': ['clang++', 'g++'] ++'win32': ['msvc', 'g++', 'clang++'], ++'cygwin': ['g++', 'clang++'], ++'darwin': ['clang++', 'g++'], ++'aix': ['xlc++', 'g++', 'clang++'], ++'linux': ['g++', 'clang++', 'icpc'], ++'sunos': ['sunc++', 'g++'], ++'irix': ['g++'], ++'hpux': ['g++'], ++'osf1V': ['g++'], ++'gnu': ['g++', 'clang++'], ++'java': ['g++', 'msvc', 'clang++', 'icpc'], ++'gnukfreebsd': ['g++', 'clang++'], ++'default': ['clang++', 'g++'] + } + """ + Dict mapping the platform names to Waf tools finding specific C++ compilers:: +diff --git a/waflib/Tools/irixcc.py b/waflib/Tools/irixcc.py +index c3ae1ac91..0335c13cb 100644 +--- a/waflib/Tools/irixcc.py ++++ b/waflib/Tools/irixcc.py +@@ -13,22 +13,11 @@ + @conf + def find_irixcc(conf): + v = conf.env +- cc = None +- if v.CC: +- cc = v.CC +- elif 'CC' in conf.environ: +- cc = conf.environ['CC'] +- if not cc: +- cc = conf.find_program('cc', var='CC') +- if not cc: +- conf.fatal('irixcc was not found') +- ++ cc = conf.find_program('cc', var='CC') + try: + conf.cmd_and_log(cc + ['-version']) + except Errors.WafError: + conf.fatal('%r -version could not be executed' % cc) +- +- v.CC = cc + v.CC_NAME = 'irix' + + @conf +@@ -57,7 +46,6 @@ def irixcc_common_flags(conf): + + def configure(conf): + conf.find_irixcc() +- conf.find_cpp() + conf.find_ar() + conf.irixcc_common_flags() + conf.cc_load_tools() +diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py +index 17b347d45..d60f67026 100644 +--- a/waflib/Tools/msvc.py ++++ b/waflib/Tools/msvc.py +@@ -99,10 +99,31 @@ def build(bld): + """List of icl platforms""" + + def options(opt): +- opt.add_option('--msvc_version', type='string', help = 'msvc version, eg: "msvc 10.0,msvc 9.0"', default='') ++ default_ver = '' ++ vsver = os.getenv('VSCMD_VER') ++ if vsver: ++ m = re.match(r'(^\d+\.\d+).*', vsver) ++ if m: ++ default_ver = 'msvc %s' % m.group(1) ++ opt.add_option('--msvc_version', type='string', help = 'msvc version, eg: "msvc 10.0,msvc 9.0"', default=default_ver) + opt.add_option('--msvc_targets', type='string', help = 'msvc targets, eg: "x64,arm"', default='') + opt.add_option('--no-msvc-lazy', action='store_false', help = 'lazily check msvc target environments', default=True, dest='msvc_lazy') + ++class MSVCVersion(object): ++ def __init__(self, ver): ++ m = re.search(r'^(.*)\s+(\d+[.]\d+)', ver) ++ if m: ++ self.name = m.group(1) ++ self.number = float(m.group(2)) ++ else: ++ self.name = ver ++ self.number = 0. ++ ++ def __lt__(self, other): ++ if self.number == other.number: ++ return self.name < other.name ++ return self.number < other.number ++ + @conf + def setup_msvc(conf, versiondict): + """ +@@ -119,7 +140,7 @@ def setup_msvc(conf, versiondict): + platforms=Utils.to_list(conf.env.MSVC_TARGETS) or [i for i,j in all_msvc_platforms+all_icl_platforms+all_wince_platforms] + desired_versions = getattr(Options.options, 'msvc_version', '').split(',') + if desired_versions == ['']: +- desired_versions = conf.env.MSVC_VERSIONS or list(reversed(sorted(versiondict.keys()))) ++ desired_versions = conf.env.MSVC_VERSIONS or list(sorted(versiondict.keys(), key=MSVCVersion, reverse=True)) + + # Override lazy detection by evaluating after the fact. + lazy_detect = getattr(Options.options, 'msvc_lazy', True) +@@ -187,7 +208,7 @@ def get_msvc_version(conf, compiler, version, target, vcvars): + echo INCLUDE=%%INCLUDE%% + echo LIB=%%LIB%%;%%LIBPATH%% + """ % (vcvars,target)) +- sout = conf.cmd_and_log(['cmd.exe', '/E:on', '/V:on', '/C', batfile.abspath()]) ++ sout = conf.cmd_and_log(['cmd.exe', '/E:on', '/V:on', '/C', batfile.abspath()], stdin=getattr(Utils.subprocess, 'DEVNULL', None)) + lines = sout.splitlines() + + if not lines[0]: +@@ -281,7 +302,7 @@ def gather_wince_supported_platforms(): + + def gather_msvc_detected_versions(): + #Detected MSVC versions! +- version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$') ++ version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$') + detected_versions = [] + for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')): + prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver +@@ -367,7 +388,7 @@ def gather_wsdk_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^v..?.?\...?.?') ++ version_pattern = re.compile(r'^v..?.?\...?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows') + except OSError: +@@ -525,7 +546,7 @@ def gather_icl_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\....?.?') ++ version_pattern = re.compile(r'^...?.?\....?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++') + except OSError: +@@ -579,7 +600,7 @@ def gather_intel_composer_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\...?.?.?') ++ version_pattern = re.compile(r'^...?.?\...?.?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites') + except OSError: +@@ -683,7 +704,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + if not is_static and ltdict.get('library_names', ''): + dllnames=ltdict['library_names'].split() + dll=dllnames[0].lower() +- dll=re.sub('\.dll$', '', dll) ++ dll=re.sub(r'\.dll$', '', dll) + return (lt_libdir, dll, False) + elif ltdict.get('old_library', ''): + olib=ltdict['old_library'] +@@ -700,7 +721,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + @conf + def libname_msvc(self, libname, is_static=False): + lib = libname.lower() +- lib = re.sub('\.lib$','',lib) ++ lib = re.sub(r'\.lib$','',lib) + + if lib in g_msvc_systemlibs: + return lib +@@ -747,11 +768,11 @@ def libname_msvc(self, libname, is_static=False): + for libn in libnames: + if os.path.exists(os.path.join(path, libn)): + Logs.debug('msvc: lib found: %s', os.path.join(path,libn)) +- return re.sub('\.lib$', '',libn) ++ return re.sub(r'\.lib$', '',libn) + + #if no lib can be found, just return the libname as msvc expects it + self.fatal('The library %r could not be found' % libname) +- return re.sub('\.lib$', '', libname) ++ return re.sub(r'\.lib$', '', libname) + + @conf + def check_lib_msvc(self, libname, is_static=False, uselib_store=None): +@@ -969,7 +990,7 @@ def build(bld): + if not is_static: + for f in self.env.LINKFLAGS: + d = f.lower() +- if d[1:] == 'debug': ++ if d[1:] in ('debug', 'debug:full', 'debug:fastlink'): + pdbnode = self.link_task.outputs[0].change_ext('.pdb') + self.link_task.outputs.append(pdbnode) + +diff --git a/waflib/Tools/waf_unit_test.py b/waflib/Tools/waf_unit_test.py +index 74d6c0561..8cff89bde 100644 +--- a/waflib/Tools/waf_unit_test.py ++++ b/waflib/Tools/waf_unit_test.py +@@ -97,6 +97,7 @@ def make_interpreted_test(self): + if isinstance(v, str): + v = v.split(os.pathsep) + self.ut_env[k] = os.pathsep.join(p + v) ++ self.env.append_value('UT_DEPS', ['%r%r' % (key, self.ut_env[key]) for key in self.ut_env]) + + @feature('test') + @after_method('apply_link', 'process_use') +@@ -108,7 +109,8 @@ def make_test(self): + tsk = self.create_task('utest', self.link_task.outputs) + if getattr(self, 'ut_str', None): + self.ut_run, lst = Task.compile_fun(self.ut_str, shell=getattr(self, 'ut_shell', False)) +- tsk.vars = lst + tsk.vars ++ tsk.vars = tsk.vars + lst ++ self.env.append_value('UT_DEPS', self.ut_str) + + self.handle_ut_cwd('ut_cwd') + +@@ -139,6 +141,10 @@ def add_path(var): + if not hasattr(self, 'ut_cmd'): + self.ut_cmd = getattr(Options.options, 'testcmd', False) + ++ self.env.append_value('UT_DEPS', str(self.ut_cmd)) ++ self.env.append_value('UT_DEPS', self.ut_paths) ++ self.env.append_value('UT_DEPS', ['%r%r' % (key, self.ut_env[key]) for key in self.ut_env]) ++ + @taskgen_method + def add_test_results(self, tup): + """Override and return tup[1] to interrupt the build immediately if a test does not run""" +@@ -159,7 +165,7 @@ class utest(Task.Task): + """ + color = 'PINK' + after = ['vnum', 'inst'] +- vars = [] ++ vars = ['UT_DEPS'] + + def runnable_status(self): + """ +@@ -200,7 +206,7 @@ def run(self): + self.ut_exec = getattr(self.generator, 'ut_exec', [self.inputs[0].abspath()]) + ut_cmd = getattr(self.generator, 'ut_cmd', False) + if ut_cmd: +- self.ut_exec = shlex.split(ut_cmd % ' '.join(self.ut_exec)) ++ self.ut_exec = shlex.split(ut_cmd % Utils.shell_escape(self.ut_exec)) + + return self.exec_command(self.ut_exec) + +@@ -214,7 +220,7 @@ def exec_command(self, cmd, **kw): + 'cmd': cmd + } + script_file = self.inputs[0].abspath() + '_run.py' +- Utils.writef(script_file, script_code) ++ Utils.writef(script_file, script_code, encoding='utf-8') + os.chmod(script_file, Utils.O755) + if Logs.verbose > 1: + Logs.info('Test debug file written as %r' % script_file) +diff --git a/waflib/Utils.py b/waflib/Utils.py +index a0cc2a09d..ea0f7a9db 100644 +--- a/waflib/Utils.py ++++ b/waflib/Utils.py +@@ -11,7 +11,7 @@ + + from __future__ import with_statement + +-import atexit, os, sys, errno, inspect, re, datetime, platform, base64, signal, functools, time ++import atexit, os, sys, errno, inspect, re, datetime, platform, base64, signal, functools, time, shlex + + try: + import cPickle +@@ -49,10 +49,16 @@ class TimeoutExpired(Exception): + from hashlib import md5 + except ImportError: + try: +- from md5 import md5 ++ from hashlib import sha1 as md5 + except ImportError: +- # never fail to enable fixes from another module ++ # never fail to enable potential fixes from another module + pass ++else: ++ try: ++ md5().digest() ++ except ValueError: ++ # Fips? #2213 ++ from hashlib import sha1 as md5 + + try: + import threading +@@ -202,7 +208,7 @@ def __next__(self): + + next = __next__ + +-is_win32 = os.sep == '\\' or sys.platform == 'win32' # msys2 ++is_win32 = os.sep == '\\' or sys.platform == 'win32' or os.name == 'nt' # msys2 + """ + Whether this system is a Windows series + """ +@@ -446,6 +452,8 @@ def console_encoding(): + pass + else: + if codepage: ++ if 65001 == codepage and sys.version_info < (3, 3): ++ return 'utf-8' + return 'cp%d' % codepage + return sys.stdout.encoding or ('cp1252' if is_win32 else 'latin-1') + +@@ -484,7 +492,9 @@ def split_path_msys(path): + if sys.platform == 'cygwin': + split_path = split_path_cygwin + elif is_win32: +- if os.environ.get('MSYSTEM'): ++ # Consider this an MSYSTEM environment if $MSYSTEM is set and python ++ # reports is executable from a unix like path on a windows host. ++ if os.environ.get('MSYSTEM') and sys.executable.startswith('/'): + split_path = split_path_msys + else: + split_path = split_path_win32 +@@ -569,10 +579,13 @@ def quote_define_name(s): + fu = fu.upper() + return fu + +-re_sh = re.compile('\\s|\'|"') +-""" +-Regexp used for shell_escape below +-""" ++# shlex.quote didn't exist until python 3.3. Prior to that it was a non-documented ++# function in pipes. ++try: ++ shell_quote = shlex.quote ++except AttributeError: ++ import pipes ++ shell_quote = pipes.quote + + def shell_escape(cmd): + """ +@@ -581,7 +594,7 @@ def shell_escape(cmd): + """ + if isinstance(cmd, str): + return cmd +- return ' '.join(repr(x) if re_sh.search(x) else x for x in cmd) ++ return ' '.join(shell_quote(x) for x in cmd) + + def h_list(lst): + """ +@@ -596,6 +609,12 @@ def h_list(lst): + """ + return md5(repr(lst).encode()).digest() + ++if sys.hexversion < 0x3000000: ++ def h_list_python2(lst): ++ return md5(repr(lst)).digest() ++ h_list_python2.__doc__ = h_list.__doc__ ++ h_list = h_list_python2 ++ + def h_fun(fun): + """ + Hash functions +@@ -615,7 +634,7 @@ def h_fun(fun): + # + # The sorting result outcome will be consistent because: + # 1. tuples are compared in order of their elements +- # 2. optional argument names are unique ++ # 2. optional argument namess are unique + code.extend(sorted(fun.keywords.items())) + code.append(h_fun(fun.func)) + fun.code = h_list(code) +@@ -730,7 +749,7 @@ def unversioned_sys_platform(): + if s == 'cli' and os.name == 'nt': + # ironpython is only on windows as far as we know + return 'win32' +- return re.split('\d+$', s)[0] ++ return re.split(r'\d+$', s)[0] + + def nada(*k, **kw): + """ +@@ -851,6 +870,19 @@ def lib64(): + return '64' + return '' + ++def loose_version(ver_str): ++ # private for the time being! ++ # see #2402 ++ lst = re.split(r'([.]|\\d+|[a-zA-Z])', ver_str) ++ ver = [] ++ for i, val in enumerate(lst): ++ try: ++ ver.append(int(val)) ++ except ValueError: ++ if val != '.': ++ ver.append(val) ++ return ver ++ + def sane_path(p): + # private function for the time being! + return os.path.abspath(os.path.expanduser(p)) +@@ -871,13 +903,13 @@ def get_process(): + except IndexError: + filepath = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'processor.py' + cmd = [sys.executable, '-c', readf(filepath)] +- return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0) ++ return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0, close_fds=not is_win32) + + def run_prefork_process(cmd, kwargs, cargs): + """ + Delegates process execution to a pre-forked process instance. + """ +- if not 'env' in kwargs: ++ if not kwargs.get('env'): + kwargs['env'] = dict(os.environ) + try: + obj = base64.b64encode(cPickle.dumps([cmd, kwargs, cargs])) +diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py +index 0d20c6374..027f0ad68 100644 +--- a/waflib/ansiterm.py ++++ b/waflib/ansiterm.py +@@ -264,7 +264,7 @@ def hide_cursor(self,param): + 'u': pop_cursor, + } + # Match either the escape sequence or text not containing escape sequence +- ansi_tokens = re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') ++ ansi_tokens = re.compile(r'(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') + def write(self, text): + try: + wlock.acquire() +diff --git a/waflib/extras/clang_cross.py b/waflib/extras/clang_cross.py +new file mode 100644 +index 000000000..1b51e2886 +--- /dev/null ++++ b/waflib/extras/clang_cross.py +@@ -0,0 +1,92 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Krzysztof Kosiński 2014 ++# DragoonX6 2018 ++ ++""" ++Detect the Clang C compiler ++This version is an attempt at supporting the -target and -sysroot flag of Clang. ++""" ++ ++from waflib.Tools import ccroot, ar, gcc ++from waflib.Configure import conf ++import waflib.Context ++import waflib.extras.clang_cross_common ++ ++def options(opt): ++ """ ++ Target triplet for clang:: ++ $ waf configure --clang-target-triple=x86_64-pc-linux-gnu ++ """ ++ cc_compiler_opts = opt.add_option_group('Configuration options') ++ cc_compiler_opts.add_option('--clang-target-triple', default=None, ++ help='Target triple for clang', ++ dest='clang_target_triple') ++ cc_compiler_opts.add_option('--clang-sysroot', default=None, ++ help='Sysroot for clang', ++ dest='clang_sysroot') ++ ++@conf ++def find_clang(conf): ++ """ ++ Finds the program clang and executes it to ensure it really is clang ++ """ ++ ++ import os ++ ++ cc = conf.find_program('clang', var='CC') ++ ++ if conf.options.clang_target_triple != None: ++ conf.env.append_value('CC', ['-target', conf.options.clang_target_triple]) ++ ++ if conf.options.clang_sysroot != None: ++ sysroot = str() ++ ++ if os.path.isabs(conf.options.clang_sysroot): ++ sysroot = conf.options.clang_sysroot ++ else: ++ sysroot = os.path.normpath(os.path.join(os.getcwd(), conf.options.clang_sysroot)) ++ ++ conf.env.append_value('CC', ['--sysroot', sysroot]) ++ ++ conf.get_cc_version(cc, clang=True) ++ conf.env.CC_NAME = 'clang' ++ ++@conf ++def clang_modifier_x86_64_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++@conf ++def clang_modifier_i386_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++@conf ++def clang_modifier_x86_64_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clang_modifier_x86_64_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++@conf ++def clang_modifier_i386_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clang_modifier_i386_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++def configure(conf): ++ conf.find_clang() ++ conf.find_program(['llvm-ar', 'ar'], var='AR') ++ conf.find_ar() ++ conf.gcc_common_flags() ++ # Allow the user to provide flags for the target platform. ++ conf.gcc_modifier_platform() ++ # And allow more fine grained control based on the compiler's triplet. ++ conf.clang_modifier_target_triple() ++ conf.cc_load_tools() ++ conf.cc_add_flags() ++ conf.link_add_flags() +diff --git a/waflib/extras/clang_cross_common.py b/waflib/extras/clang_cross_common.py +new file mode 100644 +index 000000000..b76a07006 +--- /dev/null ++++ b/waflib/extras/clang_cross_common.py +@@ -0,0 +1,113 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# DragoonX6 2018 ++ ++""" ++Common routines for cross_clang.py and cross_clangxx.py ++""" ++ ++from waflib.Configure import conf ++import waflib.Context ++ ++def normalize_target_triple(target_triple): ++ target_triple = target_triple[:-1] ++ normalized_triple = target_triple.replace('--', '-unknown-') ++ ++ if normalized_triple.startswith('-'): ++ normalized_triple = 'unknown' + normalized_triple ++ ++ if normalized_triple.endswith('-'): ++ normalized_triple += 'unknown' ++ ++ # Normalize MinGW builds to *arch*-w64-mingw32 ++ if normalized_triple.endswith('windows-gnu'): ++ normalized_triple = normalized_triple[:normalized_triple.index('-')] + '-w64-mingw32' ++ ++ # Strip the vendor when doing msvc builds, since it's unused anyway. ++ if normalized_triple.endswith('windows-msvc'): ++ normalized_triple = normalized_triple[:normalized_triple.index('-')] + '-windows-msvc' ++ ++ return normalized_triple.replace('-', '_') ++ ++@conf ++def clang_modifier_msvc(conf): ++ import os ++ ++ """ ++ Really basic setup to use clang in msvc mode. ++ We actually don't really want to do a lot, even though clang is msvc compatible ++ in this mode, that doesn't mean we're actually using msvc. ++ It's probably the best to leave it to the user, we can assume msvc mode if the user ++ uses the clang-cl frontend, but this module only concerns itself with the gcc-like frontend. ++ """ ++ v = conf.env ++ v.cprogram_PATTERN = '%s.exe' ++ ++ v.cshlib_PATTERN = '%s.dll' ++ v.implib_PATTERN = '%s.lib' ++ v.IMPLIB_ST = '-Wl,-IMPLIB:%s' ++ v.SHLIB_MARKER = [] ++ ++ v.CFLAGS_cshlib = [] ++ v.LINKFLAGS_cshlib = ['-Wl,-DLL'] ++ v.cstlib_PATTERN = '%s.lib' ++ v.STLIB_MARKER = [] ++ ++ del(v.AR) ++ conf.find_program(['llvm-lib', 'lib'], var='AR') ++ v.ARFLAGS = ['-nologo'] ++ v.AR_TGT_F = ['-out:'] ++ ++ # Default to the linker supplied with llvm instead of link.exe or ld ++ v.LINK_CC = v.CC + ['-fuse-ld=lld', '-nostdlib'] ++ v.CCLNK_TGT_F = ['-o'] ++ v.def_PATTERN = '-Wl,-def:%s' ++ ++ v.LINKFLAGS = [] ++ ++ v.LIB_ST = '-l%s' ++ v.LIBPATH_ST = '-Wl,-LIBPATH:%s' ++ v.STLIB_ST = '-l%s' ++ v.STLIBPATH_ST = '-Wl,-LIBPATH:%s' ++ ++ CFLAGS_CRT_COMMON = [ ++ '-Xclang', '--dependent-lib=oldnames', ++ '-Xclang', '-fno-rtti-data', ++ '-D_MT' ++ ] ++ ++ v.CFLAGS_CRT_MULTITHREADED = CFLAGS_CRT_COMMON + [ ++ '-Xclang', '-flto-visibility-public-std', ++ '-Xclang', '--dependent-lib=libcmt', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED = v.CFLAGS_CRT_MULTITHREADED ++ ++ v.CFLAGS_CRT_MULTITHREADED_DBG = CFLAGS_CRT_COMMON + [ ++ '-D_DEBUG', ++ '-Xclang', '-flto-visibility-public-std', ++ '-Xclang', '--dependent-lib=libcmtd', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DBG = v.CFLAGS_CRT_MULTITHREADED_DBG ++ ++ v.CFLAGS_CRT_MULTITHREADED_DLL = CFLAGS_CRT_COMMON + [ ++ '-D_DLL', ++ '-Xclang', '--dependent-lib=msvcrt' ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DLL = v.CFLAGS_CRT_MULTITHREADED_DLL ++ ++ v.CFLAGS_CRT_MULTITHREADED_DLL_DBG = CFLAGS_CRT_COMMON + [ ++ '-D_DLL', ++ '-D_DEBUG', ++ '-Xclang', '--dependent-lib=msvcrtd', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DLL_DBG = v.CFLAGS_CRT_MULTITHREADED_DLL_DBG ++ ++@conf ++def clang_modifier_target_triple(conf, cpp=False): ++ compiler = conf.env.CXX if cpp else conf.env.CC ++ output = conf.cmd_and_log(compiler + ['-dumpmachine'], output=waflib.Context.STDOUT) ++ ++ modifier = ('clangxx' if cpp else 'clang') + '_modifier_' ++ clang_modifier_func = getattr(conf, modifier + normalize_target_triple(output), None) ++ if clang_modifier_func: ++ clang_modifier_func() +diff --git a/waflib/extras/clangxx_cross.py b/waflib/extras/clangxx_cross.py +new file mode 100644 +index 000000000..0ad38ad46 +--- /dev/null ++++ b/waflib/extras/clangxx_cross.py +@@ -0,0 +1,106 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy 2009-2018 (ita) ++# DragoonX6 2018 ++ ++""" ++Detect the Clang++ C++ compiler ++This version is an attempt at supporting the -target and -sysroot flag of Clang++. ++""" ++ ++from waflib.Tools import ccroot, ar, gxx ++from waflib.Configure import conf ++import waflib.extras.clang_cross_common ++ ++def options(opt): ++ """ ++ Target triplet for clang++:: ++ $ waf configure --clangxx-target-triple=x86_64-pc-linux-gnu ++ """ ++ cxx_compiler_opts = opt.add_option_group('Configuration options') ++ cxx_compiler_opts.add_option('--clangxx-target-triple', default=None, ++ help='Target triple for clang++', ++ dest='clangxx_target_triple') ++ cxx_compiler_opts.add_option('--clangxx-sysroot', default=None, ++ help='Sysroot for clang++', ++ dest='clangxx_sysroot') ++ ++@conf ++def find_clangxx(conf): ++ """ ++ Finds the program clang++, and executes it to ensure it really is clang++ ++ """ ++ ++ import os ++ ++ cxx = conf.find_program('clang++', var='CXX') ++ ++ if conf.options.clangxx_target_triple != None: ++ conf.env.append_value('CXX', ['-target', conf.options.clangxx_target_triple]) ++ ++ if conf.options.clangxx_sysroot != None: ++ sysroot = str() ++ ++ if os.path.isabs(conf.options.clangxx_sysroot): ++ sysroot = conf.options.clangxx_sysroot ++ else: ++ sysroot = os.path.normpath(os.path.join(os.getcwd(), conf.options.clangxx_sysroot)) ++ ++ conf.env.append_value('CXX', ['--sysroot', sysroot]) ++ ++ conf.get_cc_version(cxx, clang=True) ++ conf.env.CXX_NAME = 'clang' ++ ++@conf ++def clangxx_modifier_x86_64_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++@conf ++def clangxx_modifier_i386_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++@conf ++def clangxx_modifier_msvc(conf): ++ v = conf.env ++ v.cxxprogram_PATTERN = v.cprogram_PATTERN ++ v.cxxshlib_PATTERN = v.cshlib_PATTERN ++ ++ v.CXXFLAGS_cxxshlib = [] ++ v.LINKFLAGS_cxxshlib = v.LINKFLAGS_cshlib ++ v.cxxstlib_PATTERN = v.cstlib_PATTERN ++ ++ v.LINK_CXX = v.CXX + ['-fuse-ld=lld', '-nostdlib'] ++ v.CXXLNK_TGT_F = v.CCLNK_TGT_F ++ ++@conf ++def clangxx_modifier_x86_64_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ conf.clangxx_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clangxx_modifier_x86_64_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++@conf ++def clangxx_modifier_i386_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ conf.clangxx_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clangxx_modifier_i386_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++def configure(conf): ++ conf.find_clangxx() ++ conf.find_program(['llvm-ar', 'ar'], var='AR') ++ conf.find_ar() ++ conf.gxx_common_flags() ++ # Allow the user to provide flags for the target platform. ++ conf.gxx_modifier_platform() ++ # And allow more fine grained control based on the compiler's triplet. ++ conf.clang_modifier_target_triple(cpp=True) ++ conf.cxx_load_tools() ++ conf.cxx_add_flags() ++ conf.link_add_flags() +diff --git a/waflib/extras/classic_runner.py b/waflib/extras/classic_runner.py +new file mode 100644 +index 000000000..b08c794e8 +--- /dev/null ++++ b/waflib/extras/classic_runner.py +@@ -0,0 +1,68 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy, 2021 (ita) ++ ++from waflib import Utils, Runner ++ ++""" ++Re-enable the classic threading system from waf 1.x ++ ++def configure(conf): ++ conf.load('classic_runner') ++""" ++ ++class TaskConsumer(Utils.threading.Thread): ++ """ ++ Task consumers belong to a pool of workers ++ ++ They wait for tasks in the queue and then use ``task.process(...)`` ++ """ ++ def __init__(self, spawner): ++ Utils.threading.Thread.__init__(self) ++ """ ++ Obtain :py:class:`waflib.Task.TaskBase` instances from this queue. ++ """ ++ self.spawner = spawner ++ self.daemon = True ++ self.start() ++ ++ def run(self): ++ """ ++ Loop over the tasks to execute ++ """ ++ try: ++ self.loop() ++ except Exception: ++ pass ++ ++ def loop(self): ++ """ ++ Obtain tasks from :py:attr:`waflib.Runner.TaskConsumer.ready` and call ++ :py:meth:`waflib.Task.TaskBase.process`. If the object is a function, execute it. ++ """ ++ master = self.spawner.master ++ while 1: ++ if not master.stop: ++ try: ++ tsk = master.ready.get() ++ if tsk: ++ tsk.log_display(tsk.generator.bld) ++ master.process_task(tsk) ++ else: ++ break ++ finally: ++ master.out.put(tsk) ++ ++class Spawner(object): ++ """ ++ Daemon thread that consumes tasks from :py:class:`waflib.Runner.Parallel` producer and ++ spawns a consuming thread :py:class:`waflib.Runner.Consumer` for each ++ :py:class:`waflib.Task.Task` instance. ++ """ ++ def __init__(self, master): ++ self.master = master ++ """:py:class:`waflib.Runner.Parallel` producer instance""" ++ ++ self.pool = [TaskConsumer(self) for i in range(master.numjobs)] ++ ++Runner.Spawner = Spawner +diff --git a/waflib/extras/color_msvc.py b/waflib/extras/color_msvc.py +new file mode 100644 +index 000000000..60bacb7b2 +--- /dev/null ++++ b/waflib/extras/color_msvc.py +@@ -0,0 +1,59 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++ ++# Replaces the default formatter by one which understands MSVC output and colorizes it. ++# Modified from color_gcc.py ++ ++__author__ = __maintainer__ = "Alibek Omarov " ++__copyright__ = "Alibek Omarov, 2019" ++ ++import sys ++from waflib import Logs ++ ++class ColorMSVCFormatter(Logs.formatter): ++ def __init__(self, colors): ++ self.colors = colors ++ Logs.formatter.__init__(self) ++ ++ def parseMessage(self, line, color): ++ # Split messaage from 'disk:filepath: type: message' ++ arr = line.split(':', 3) ++ if len(arr) < 4: ++ return line ++ ++ colored = self.colors.BOLD + arr[0] + ':' + arr[1] + ':' + self.colors.NORMAL ++ colored += color + arr[2] + ':' + self.colors.NORMAL ++ colored += arr[3] ++ return colored ++ ++ def format(self, rec): ++ frame = sys._getframe() ++ while frame: ++ func = frame.f_code.co_name ++ if func == 'exec_command': ++ cmd = frame.f_locals.get('cmd') ++ if isinstance(cmd, list): ++ # Fix file case, it may be CL.EXE or cl.exe ++ argv0 = cmd[0].lower() ++ if 'cl.exe' in argv0: ++ lines = [] ++ # This will not work with "localized" versions ++ # of MSVC ++ for line in rec.msg.splitlines(): ++ if ': warning ' in line: ++ lines.append(self.parseMessage(line, self.colors.YELLOW)) ++ elif ': error ' in line: ++ lines.append(self.parseMessage(line, self.colors.RED)) ++ elif ': fatal error ' in line: ++ lines.append(self.parseMessage(line, self.colors.RED + self.colors.BOLD)) ++ elif ': note: ' in line: ++ lines.append(self.parseMessage(line, self.colors.CYAN)) ++ else: ++ lines.append(line) ++ rec.msg = "\n".join(lines) ++ frame = frame.f_back ++ return Logs.formatter.format(self, rec) ++ ++def options(opt): ++ Logs.log.handlers[0].setFormatter(ColorMSVCFormatter(Logs.colors)) ++ +diff --git a/waflib/extras/fc_fujitsu.py b/waflib/extras/fc_fujitsu.py +new file mode 100644 +index 000000000..cae676c20 +--- /dev/null ++++ b/waflib/extras/fc_fujitsu.py +@@ -0,0 +1,52 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Detection of the Fujitsu Fortran compiler for ARM64FX ++ ++import re ++from waflib.Tools import fc,fc_config,fc_scan ++from waflib.Configure import conf ++from waflib.Tools.compiler_fc import fc_compiler ++fc_compiler['linux'].append('fc_fujitsu') ++ ++@conf ++def find_fujitsu(conf): ++ fc=conf.find_program(['frtpx'],var='FC') ++ conf.get_fujitsu_version(fc) ++ conf.env.FC_NAME='FUJITSU' ++ conf.env.FC_MOD_CAPITALIZATION='lower' ++ ++@conf ++def fujitsu_flags(conf): ++ v=conf.env ++ v['_FCMODOUTFLAGS']=[] ++ v['FCFLAGS_DEBUG']=[] ++ v['FCFLAGS_fcshlib']=[] ++ v['LINKFLAGS_fcshlib']=[] ++ v['FCSTLIB_MARKER']='' ++ v['FCSHLIB_MARKER']='' ++ ++@conf ++def get_fujitsu_version(conf,fc): ++ version_re=re.compile(r"frtpx\s*\(FRT\)\s*(?P\d+)\.(?P\d+)\.",re.I).search ++ cmd=fc+['--version'] ++ out,err=fc_config.getoutput(conf,cmd,stdin=False) ++ if out: ++ match=version_re(out) ++ else: ++ match=version_re(err) ++ if not match: ++ return(False) ++ conf.fatal('Could not determine the Fujitsu FRT Fortran compiler version.') ++ else: ++ k=match.groupdict() ++ conf.env['FC_VERSION']=(k['major'],k['minor']) ++ ++def configure(conf): ++ conf.find_fujitsu() ++ conf.find_program('ar',var='AR') ++ conf.add_os_flags('ARFLAGS') ++ if not conf.env.ARFLAGS: ++ conf.env.ARFLAGS=['rcs'] ++ conf.fc_flags() ++ conf.fc_add_flags() ++ conf.fujitsu_flags() +diff --git a/waflib/extras/fc_nfort.py b/waflib/extras/fc_nfort.py +new file mode 100644 +index 000000000..c25886b8e +--- /dev/null ++++ b/waflib/extras/fc_nfort.py +@@ -0,0 +1,52 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Detection of the NEC Fortran compiler for Aurora Tsubasa ++ ++import re ++from waflib.Tools import fc,fc_config,fc_scan ++from waflib.Configure import conf ++from waflib.Tools.compiler_fc import fc_compiler ++fc_compiler['linux'].append('fc_nfort') ++ ++@conf ++def find_nfort(conf): ++ fc=conf.find_program(['nfort'],var='FC') ++ conf.get_nfort_version(fc) ++ conf.env.FC_NAME='NFORT' ++ conf.env.FC_MOD_CAPITALIZATION='lower' ++ ++@conf ++def nfort_flags(conf): ++ v=conf.env ++ v['_FCMODOUTFLAGS']=[] ++ v['FCFLAGS_DEBUG']=[] ++ v['FCFLAGS_fcshlib']=[] ++ v['LINKFLAGS_fcshlib']=[] ++ v['FCSTLIB_MARKER']='' ++ v['FCSHLIB_MARKER']='' ++ ++@conf ++def get_nfort_version(conf,fc): ++ version_re=re.compile(r"nfort\s*\(NFORT\)\s*(?P\d+)\.(?P\d+)\.",re.I).search ++ cmd=fc+['--version'] ++ out,err=fc_config.getoutput(conf,cmd,stdin=False) ++ if out: ++ match=version_re(out) ++ else: ++ match=version_re(err) ++ if not match: ++ return(False) ++ conf.fatal('Could not determine the NEC NFORT Fortran compiler version.') ++ else: ++ k=match.groupdict() ++ conf.env['FC_VERSION']=(k['major'],k['minor']) ++ ++def configure(conf): ++ conf.find_nfort() ++ conf.find_program('nar',var='AR') ++ conf.add_os_flags('ARFLAGS') ++ if not conf.env.ARFLAGS: ++ conf.env.ARFLAGS=['rcs'] ++ conf.fc_flags() ++ conf.fc_add_flags() ++ conf.nfort_flags() +diff --git a/waflib/extras/genpybind.py b/waflib/extras/genpybind.py +new file mode 100644 +index 000000000..ac206ee8a +--- /dev/null ++++ b/waflib/extras/genpybind.py +@@ -0,0 +1,194 @@ ++import os ++import pipes ++import subprocess ++import sys ++ ++from waflib import Logs, Task, Context ++from waflib.Tools.c_preproc import scan as scan_impl ++# ^-- Note: waflib.extras.gccdeps.scan does not work for us, ++# due to its current implementation: ++# The -MD flag is injected into the {C,CXX}FLAGS environment variable and ++# dependencies are read out in a separate step after compiling by reading ++# the .d file saved alongside the object file. ++# As the genpybind task refers to a header file that is never compiled itself, ++# gccdeps will not be able to extract the list of dependencies. ++ ++from waflib.TaskGen import feature, before_method ++ ++ ++def join_args(args): ++ return " ".join(pipes.quote(arg) for arg in args) ++ ++ ++def configure(cfg): ++ cfg.load("compiler_cxx") ++ cfg.load("python") ++ cfg.check_python_version(minver=(2, 7)) ++ if not cfg.env.LLVM_CONFIG: ++ cfg.find_program("llvm-config", var="LLVM_CONFIG") ++ if not cfg.env.GENPYBIND: ++ cfg.find_program("genpybind", var="GENPYBIND") ++ ++ # find clang reasource dir for builtin headers ++ cfg.env.GENPYBIND_RESOURCE_DIR = os.path.join( ++ cfg.cmd_and_log(cfg.env.LLVM_CONFIG + ["--libdir"]).strip(), ++ "clang", ++ cfg.cmd_and_log(cfg.env.LLVM_CONFIG + ["--version"]).strip()) ++ if os.path.exists(cfg.env.GENPYBIND_RESOURCE_DIR): ++ cfg.msg("Checking clang resource dir", cfg.env.GENPYBIND_RESOURCE_DIR) ++ else: ++ cfg.fatal("Clang resource dir not found") ++ ++ ++@feature("genpybind") ++@before_method("process_source") ++def generate_genpybind_source(self): ++ """ ++ Run genpybind on the headers provided in `source` and compile/link the ++ generated code instead. This works by generating the code on the fly and ++ swapping the source node before `process_source` is run. ++ """ ++ # name of module defaults to name of target ++ module = getattr(self, "module", self.target) ++ ++ # create temporary source file in build directory to hold generated code ++ out = "genpybind-%s.%d.cpp" % (module, self.idx) ++ out = self.path.get_bld().find_or_declare(out) ++ ++ task = self.create_task("genpybind", self.to_nodes(self.source), out) ++ # used to detect whether CFLAGS or CXXFLAGS should be passed to genpybind ++ task.features = self.features ++ task.module = module ++ # can be used to select definitions to include in the current module ++ # (when header files are shared by more than one module) ++ task.genpybind_tags = self.to_list(getattr(self, "genpybind_tags", [])) ++ # additional include directories ++ task.includes = self.to_list(getattr(self, "includes", [])) ++ task.genpybind = self.env.GENPYBIND ++ ++ # Tell waf to compile/link the generated code instead of the headers ++ # originally passed-in via the `source` parameter. (see `process_source`) ++ self.source = [out] ++ ++ ++class genpybind(Task.Task): # pylint: disable=invalid-name ++ """ ++ Runs genpybind on headers provided as input to this task. ++ Generated code will be written to the first (and only) output node. ++ """ ++ quiet = True ++ color = "PINK" ++ scan = scan_impl ++ ++ @staticmethod ++ def keyword(): ++ return "Analyzing" ++ ++ def run(self): ++ if not self.inputs: ++ return ++ ++ args = self.find_genpybind() + self._arguments( ++ resource_dir=self.env.GENPYBIND_RESOURCE_DIR) ++ ++ output = self.run_genpybind(args) ++ ++ # For debugging / log output ++ pasteable_command = join_args(args) ++ ++ # write generated code to file in build directory ++ # (will be compiled during process_source stage) ++ (output_node,) = self.outputs ++ output_node.write("// {}\n{}\n".format( ++ pasteable_command.replace("\n", "\n// "), output)) ++ ++ def find_genpybind(self): ++ return self.genpybind ++ ++ def run_genpybind(self, args): ++ bld = self.generator.bld ++ ++ kwargs = dict(cwd=bld.variant_dir) ++ if hasattr(bld, "log_command"): ++ bld.log_command(args, kwargs) ++ else: ++ Logs.debug("runner: {!r}".format(args)) ++ proc = subprocess.Popen( ++ args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs) ++ stdout, stderr = proc.communicate() ++ ++ if not isinstance(stdout, str): ++ stdout = stdout.decode(sys.stdout.encoding, errors="replace") ++ if not isinstance(stderr, str): ++ stderr = stderr.decode(sys.stderr.encoding, errors="replace") ++ ++ if proc.returncode != 0: ++ bld.fatal( ++ "genpybind returned {code} during the following call:" ++ "\n{command}\n\n{stdout}\n\n{stderr}".format( ++ code=proc.returncode, ++ command=join_args(args), ++ stdout=stdout, ++ stderr=stderr, ++ )) ++ ++ if stderr.strip(): ++ Logs.debug("non-fatal warnings during genpybind run:\n{}".format(stderr)) ++ ++ return stdout ++ ++ def _include_paths(self): ++ return self.generator.to_incnodes(self.includes + self.env.INCLUDES) ++ ++ def _inputs_as_relative_includes(self): ++ include_paths = self._include_paths() ++ relative_includes = [] ++ for node in self.inputs: ++ for inc in include_paths: ++ if node.is_child_of(inc): ++ relative_includes.append(node.path_from(inc)) ++ break ++ else: ++ self.generator.bld.fatal("could not resolve {}".format(node)) ++ return relative_includes ++ ++ def _arguments(self, genpybind_parse=None, resource_dir=None): ++ args = [] ++ relative_includes = self._inputs_as_relative_includes() ++ is_cxx = "cxx" in self.features ++ ++ # options for genpybind ++ args.extend(["--genpybind-module", self.module]) ++ if self.genpybind_tags: ++ args.extend(["--genpybind-tag"] + self.genpybind_tags) ++ if relative_includes: ++ args.extend(["--genpybind-include"] + relative_includes) ++ if genpybind_parse: ++ args.extend(["--genpybind-parse", genpybind_parse]) ++ ++ args.append("--") ++ ++ # headers to be processed by genpybind ++ args.extend(node.abspath() for node in self.inputs) ++ ++ args.append("--") ++ ++ # options for clang/genpybind-parse ++ args.append("-D__GENPYBIND__") ++ args.append("-xc++" if is_cxx else "-xc") ++ has_std_argument = False ++ for flag in self.env["CXXFLAGS" if is_cxx else "CFLAGS"]: ++ flag = flag.replace("-std=gnu", "-std=c") ++ if flag.startswith("-std=c"): ++ has_std_argument = True ++ args.append(flag) ++ if not has_std_argument: ++ args.append("-std=c++14") ++ args.extend("-I{}".format(n.abspath()) for n in self._include_paths()) ++ args.extend("-D{}".format(p) for p in self.env.DEFINES) ++ ++ # point to clang resource dir, if specified ++ if resource_dir: ++ args.append("-resource-dir={}".format(resource_dir)) ++ ++ return args +diff --git a/waflib/extras/haxe.py b/waflib/extras/haxe.py +new file mode 100644 +index 000000000..4ff374579 +--- /dev/null ++++ b/waflib/extras/haxe.py +@@ -0,0 +1,154 @@ ++import re ++ ++from waflib import Utils, Task, Errors, Logs ++from waflib.Configure import conf ++from waflib.TaskGen import extension, taskgen_method ++ ++HAXE_COMPILERS = { ++ 'JS': {'tgt': '--js', 'ext_out': ['.js']}, ++ 'LUA': {'tgt': '--lua', 'ext_out': ['.lua']}, ++ 'SWF': {'tgt': '--swf', 'ext_out': ['.swf']}, ++ 'NEKO': {'tgt': '--neko', 'ext_out': ['.n']}, ++ 'PHP': {'tgt': '--php', 'ext_out': ['.php']}, ++ 'CPP': {'tgt': '--cpp', 'ext_out': ['.h', '.cpp']}, ++ 'CPPIA': {'tgt': '--cppia', 'ext_out': ['.cppia']}, ++ 'CS': {'tgt': '--cs', 'ext_out': ['.cs']}, ++ 'JAVA': {'tgt': '--java', 'ext_out': ['.java']}, ++ 'JVM': {'tgt': '--jvm', 'ext_out': ['.jar']}, ++ 'PYTHON': {'tgt': '--python', 'ext_out': ['.py']}, ++ 'HL': {'tgt': '--hl', 'ext_out': ['.hl']}, ++ 'HLC': {'tgt': '--hl', 'ext_out': ['.h', '.c']}, ++} ++ ++@conf ++def check_haxe_pkg(self, **kw): ++ self.find_program('haxelib') ++ libs = kw.get('libs') ++ if not libs or not (type(libs) == str or (type(libs) == list and all(isinstance(s, str) for s in libs))): ++ self.fatal('Specify correct libs value in ensure call') ++ return ++ fetch = kw.get('fetch') ++ if not fetch is None and not type(fetch) == bool: ++ self.fatal('Specify correct fetch value in ensure call') ++ ++ libs = [libs] if type(libs) == str else libs ++ halt = False ++ for lib in libs: ++ try: ++ self.start_msg('Checking for library %s' % lib) ++ output = self.cmd_and_log(self.env.HAXELIB + ['list', lib]) ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t run haxelib list, ensuring halted') ++ return ++ ++ if lib in output: ++ self.end_msg(lib in output) ++ else: ++ if not fetch: ++ self.end_msg(False) ++ halt = True ++ continue ++ try: ++ status = self.exec_command(self.env.HAXELIB + ['install', lib]) ++ if status: ++ self.end_msg(False) ++ self.fatal('Can\'t get %s with haxelib, ensuring halted' % lib) ++ return ++ else: ++ self.end_msg('downloaded', color='YELLOW') ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t run haxelib install, ensuring halted') ++ return ++ postfix = kw.get('uselib_store') or lib.upper() ++ self.env.append_unique('LIB_' + postfix, lib) ++ ++ if halt: ++ self.fatal('Can\'t find libraries in haxelib list, ensuring halted') ++ return ++ ++class haxe(Task.Task): ++ vars = ['HAXE_VERSION', 'HAXE_FLAGS'] ++ ext_in = ['.hx'] ++ ++ def run(self): ++ cmd = self.env.HAXE + self.env.HAXE_FLAGS_DEFAULT + self.env.HAXE_FLAGS ++ return self.exec_command(cmd) ++ ++for COMP in HAXE_COMPILERS: ++ # create runners for each compile target ++ type("haxe_" + COMP, (haxe,), {'ext_out': HAXE_COMPILERS[COMP]['ext_out']}) ++ ++@taskgen_method ++def init_haxe(self): ++ errmsg = '%s not found, specify correct value' ++ try: ++ compiler = HAXE_COMPILERS[self.compiler] ++ comp_tgt = compiler['tgt'] ++ comp_mod = '/main.c' if self.compiler == 'HLC' else '' ++ except (AttributeError, KeyError): ++ self.bld.fatal(errmsg % 'COMPILER' + ': ' + ', '.join(HAXE_COMPILERS.keys())) ++ return ++ ++ self.env.append_value( ++ 'HAXE_FLAGS', ++ [comp_tgt, self.path.get_bld().make_node(self.target + comp_mod).abspath()]) ++ if hasattr(self, 'use'): ++ if not (type(self.use) == str or type(self.use) == list): ++ self.bld.fatal(errmsg % 'USE') ++ return ++ self.use = [self.use] if type(self.use) == str else self.use ++ ++ for dep in self.use: ++ if self.env['LIB_' + dep]: ++ for lib in self.env['LIB_' + dep]: ++ self.env.append_value('HAXE_FLAGS', ['-lib', lib]) ++ ++ if hasattr(self, 'res'): ++ if not type(self.res) == str: ++ self.bld.fatal(errmsg % 'RES') ++ return ++ self.env.append_value('HAXE_FLAGS', ['-D', 'resourcesPath=%s' % self.res]) ++ ++@extension('.hx') ++def haxe_hook(self, node): ++ if len(self.source) > 1: ++ self.bld.fatal('Use separate task generators for multiple files') ++ return ++ ++ src = node ++ tgt = self.path.get_bld().find_or_declare(self.target) ++ ++ self.init_haxe() ++ self.create_task('haxe_' + self.compiler, src, tgt) ++ ++@conf ++def check_haxe(self, mini=None, maxi=None): ++ self.start_msg('Checking for haxe version') ++ try: ++ curr = re.search( ++ r'(\d+.?)+', ++ self.cmd_and_log(self.env.HAXE + ['-version'])).group() ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t get haxe version') ++ return ++ ++ if mini and Utils.num2ver(curr) < Utils.num2ver(mini): ++ self.end_msg('wrong', color='RED') ++ self.fatal('%s is too old, need >= %s' % (curr, mini)) ++ return ++ if maxi and Utils.num2ver(curr) > Utils.num2ver(maxi): ++ self.end_msg('wrong', color='RED') ++ self.fatal('%s is too new, need <= %s' % (curr, maxi)) ++ return ++ self.end_msg(curr, color='GREEN') ++ self.env.HAXE_VERSION = curr ++ ++def configure(self): ++ self.env.append_value( ++ 'HAXE_FLAGS_DEFAULT', ++ ['-D', 'no-compilation', '-cp', self.path.abspath()]) ++ Logs.warn('Default flags: %s' % ' '.join(self.env.HAXE_FLAGS_DEFAULT)) ++ self.find_program('haxe') +diff --git a/waflib/extras/msvc_pdb.py b/waflib/extras/msvc_pdb.py +new file mode 100644 +index 000000000..077656b4f +--- /dev/null ++++ b/waflib/extras/msvc_pdb.py +@@ -0,0 +1,46 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Rafaël Kooi 2019 ++ ++from waflib import TaskGen ++ ++@TaskGen.feature('c', 'cxx', 'fc') ++@TaskGen.after_method('propagate_uselib_vars') ++def add_pdb_per_object(self): ++ """For msvc/fortran, specify a unique compile pdb per object, to work ++ around LNK4099. Flags are updated with a unique /Fd flag based on the ++ task output name. This is separate from the link pdb. ++ """ ++ if not hasattr(self, 'compiled_tasks'): ++ return ++ ++ link_task = getattr(self, 'link_task', None) ++ ++ for task in self.compiled_tasks: ++ if task.inputs and task.inputs[0].name.lower().endswith('.rc'): ++ continue ++ ++ add_pdb = False ++ for flagname in ('CFLAGS', 'CXXFLAGS', 'FCFLAGS'): ++ # several languages may be used at once ++ for flag in task.env[flagname]: ++ if flag[1:].lower() == 'zi': ++ add_pdb = True ++ break ++ ++ if add_pdb: ++ node = task.outputs[0].change_ext('.pdb') ++ pdb_flag = '/Fd:' + node.abspath() ++ ++ for flagname in ('CFLAGS', 'CXXFLAGS', 'FCFLAGS'): ++ buf = [pdb_flag] ++ for flag in task.env[flagname]: ++ if flag[1:3] == 'Fd' or flag[1:].lower() == 'fs' or flag[1:].lower() == 'mp': ++ continue ++ buf.append(flag) ++ task.env[flagname] = buf ++ ++ if link_task and not node in link_task.dep_nodes: ++ link_task.dep_nodes.append(node) ++ if not node in task.outputs: ++ task.outputs.append(node) +diff --git a/waflib/extras/sphinx.py b/waflib/extras/sphinx.py +new file mode 100644 +index 000000000..08f3cfd8a +--- /dev/null ++++ b/waflib/extras/sphinx.py +@@ -0,0 +1,120 @@ ++"""Support for Sphinx documentation ++ ++This is a wrapper for sphinx-build program. Please note that sphinx-build supports only ++one output format at a time, but the tool can create multiple tasks to handle more. ++The output formats can be passed via the sphinx_output_format, which is an array of ++strings. For backwards compatibility if only one output is needed, it can be passed ++as a single string. ++The default output format is html. ++ ++Specific formats can be installed in different directories by specifying the ++install_path_ attribute. If not defined, the standard install_path ++will be used instead. ++ ++Example wscript: ++ ++def configure(cnf): ++ conf.load('sphinx') ++ ++def build(bld): ++ bld( ++ features='sphinx', ++ sphinx_source='sources', # path to source directory ++ sphinx_options='-a -v', # sphinx-build program additional options ++ sphinx_output_format=['html', 'man'], # output format of sphinx documentation ++ install_path_man='${DOCDIR}/man' # put man pages in a specific directory ++ ) ++ ++""" ++ ++from waflib.Node import Node ++from waflib import Utils ++from waflib import Task ++from waflib.TaskGen import feature, after_method ++ ++ ++def configure(cnf): ++ """Check if sphinx-build program is available and loads gnu_dirs tool.""" ++ cnf.find_program('sphinx-build', var='SPHINX_BUILD', mandatory=False) ++ cnf.load('gnu_dirs') ++ ++ ++@feature('sphinx') ++def build_sphinx(self): ++ """Builds sphinx sources. ++ """ ++ if not self.env.SPHINX_BUILD: ++ self.bld.fatal('Program SPHINX_BUILD not defined.') ++ if not getattr(self, 'sphinx_source', None): ++ self.bld.fatal('Attribute sphinx_source not defined.') ++ if not isinstance(self.sphinx_source, Node): ++ self.sphinx_source = self.path.find_node(self.sphinx_source) ++ if not self.sphinx_source: ++ self.bld.fatal('Can\'t find sphinx_source: %r' % self.sphinx_source) ++ ++ # In the taskgen we have the complete list of formats ++ Utils.def_attrs(self, sphinx_output_format='html') ++ self.sphinx_output_format = Utils.to_list(self.sphinx_output_format) ++ ++ self.env.SPHINX_OPTIONS = getattr(self, 'sphinx_options', []) ++ ++ for source_file in self.sphinx_source.ant_glob('**/*'): ++ self.bld.add_manual_dependency(self.sphinx_source, source_file) ++ ++ for cfmt in self.sphinx_output_format: ++ sphinx_build_task = self.create_task('SphinxBuildingTask') ++ sphinx_build_task.set_inputs(self.sphinx_source) ++ # In task we keep the specific format this task is generating ++ sphinx_build_task.env.SPHINX_OUTPUT_FORMAT = cfmt ++ ++ # the sphinx-build results are in directory ++ sphinx_build_task.sphinx_output_directory = self.path.get_bld().make_node(cfmt) ++ sphinx_build_task.set_outputs(sphinx_build_task.sphinx_output_directory) ++ sphinx_build_task.sphinx_output_directory.mkdir() ++ ++ Utils.def_attrs(sphinx_build_task, install_path=getattr(self, 'install_path_' + cfmt, getattr(self, 'install_path', get_install_path(sphinx_build_task)))) ++ ++ ++def get_install_path(object): ++ if object.env.SPHINX_OUTPUT_FORMAT == 'man': ++ return object.env.MANDIR ++ elif object.env.SPHINX_OUTPUT_FORMAT == 'info': ++ return object.env.INFODIR ++ else: ++ return object.env.DOCDIR ++ ++ ++class SphinxBuildingTask(Task.Task): ++ color = 'BOLD' ++ run_str = '${SPHINX_BUILD} -M ${SPHINX_OUTPUT_FORMAT} ${SRC} ${TGT} -d ${TGT[0].bld_dir()}/doctrees-${SPHINX_OUTPUT_FORMAT} ${SPHINX_OPTIONS}' ++ ++ def keyword(self): ++ return 'Compiling (%s)' % self.env.SPHINX_OUTPUT_FORMAT ++ ++ def runnable_status(self): ++ ++ for x in self.run_after: ++ if not x.hasrun: ++ return Task.ASK_LATER ++ ++ self.signature() ++ ret = Task.Task.runnable_status(self) ++ if ret == Task.SKIP_ME: ++ # in case the files were removed ++ self.add_install() ++ return ret ++ ++ ++ def post_run(self): ++ self.add_install() ++ return Task.Task.post_run(self) ++ ++ ++ def add_install(self): ++ nodes = self.sphinx_output_directory.ant_glob('**/*', quiet=True) ++ self.outputs += nodes ++ self.generator.add_install_files(install_to=self.install_path, ++ install_from=nodes, ++ postpone=False, ++ cwd=self.sphinx_output_directory.make_node(self.env.SPHINX_OUTPUT_FORMAT), ++ relative_trick=True) +diff --git a/waflib/extras/wafcache.py b/waflib/extras/wafcache.py +new file mode 100644 +index 000000000..30ac3ef51 +--- /dev/null ++++ b/waflib/extras/wafcache.py +@@ -0,0 +1,648 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy, 2019 (ita) ++ ++""" ++Filesystem-based cache system to share and re-use build artifacts ++ ++Cache access operations (copy to and from) are delegated to ++independent pre-forked worker subprocesses. ++ ++The following environment variables may be set: ++* WAFCACHE: several possibilities: ++ - File cache: ++ absolute path of the waf cache (~/.cache/wafcache_user, ++ where `user` represents the currently logged-in user) ++ - URL to a cache server, for example: ++ export WAFCACHE=http://localhost:8080/files/ ++ in that case, GET/POST requests are made to urls of the form ++ http://localhost:8080/files/000000000/0 (cache management is delegated to the server) ++ - GCS, S3 or MINIO bucket ++ gs://my-bucket/ (uses gsutil command line tool or WAFCACHE_CMD) ++ s3://my-bucket/ (uses aws command line tool or WAFCACHE_CMD) ++ minio://my-bucket/ (uses mc command line tool or WAFCACHE_CMD) ++* WAFCACHE_CMD: bucket upload/download command, for example: ++ WAFCACHE_CMD="gsutil cp %{SRC} %{TGT}" ++ Note that the WAFCACHE bucket value is used for the source or destination ++ depending on the operation (upload or download). For example, with: ++ WAFCACHE="gs://mybucket/" ++ the following commands may be run: ++ gsutil cp build/myprogram gs://mybucket/aa/aaaaa/1 ++ gsutil cp gs://mybucket/bb/bbbbb/2 build/somefile ++* WAFCACHE_NO_PUSH: if set, disables pushing to the cache ++* WAFCACHE_VERBOSITY: if set, displays more detailed cache operations ++* WAFCACHE_STATS: if set, displays cache usage statistics on exit ++ ++File cache specific options: ++ Files are copied using hard links by default; if the cache is located ++ onto another partition, the system switches to file copies instead. ++* WAFCACHE_TRIM_MAX_FOLDER: maximum amount of tasks to cache (1M) ++* WAFCACHE_EVICT_MAX_BYTES: maximum amount of cache size in bytes (10GB) ++* WAFCACHE_EVICT_INTERVAL_MINUTES: minimum time interval to try ++ and trim the cache (3 minutes) ++ ++Upload specific options: ++* WAFCACHE_ASYNC_WORKERS: define a number of workers to upload results asynchronously ++ this may improve build performance with many/long file uploads ++ the default is unset (synchronous uploads) ++* WAFCACHE_ASYNC_NOWAIT: do not wait for uploads to complete (default: False) ++ this requires asynchonous uploads to have an effect ++ ++Usage:: ++ ++ def build(bld): ++ bld.load('wafcache') ++ ... ++ ++To troubleshoot:: ++ ++ waf clean build --zone=wafcache ++""" ++ ++import atexit, base64, errno, fcntl, getpass, os, re, shutil, sys, time, threading, traceback, urllib3, shlex ++try: ++ import subprocess32 as subprocess ++except ImportError: ++ import subprocess ++ ++base_cache = os.path.expanduser('~/.cache/') ++if not os.path.isdir(base_cache): ++ base_cache = '/tmp/' ++default_wafcache_dir = os.path.join(base_cache, 'wafcache_' + getpass.getuser()) ++ ++CACHE_DIR = os.environ.get('WAFCACHE', default_wafcache_dir) ++WAFCACHE_CMD = os.environ.get('WAFCACHE_CMD') ++TRIM_MAX_FOLDERS = int(os.environ.get('WAFCACHE_TRIM_MAX_FOLDER', 1000000)) ++EVICT_INTERVAL_MINUTES = int(os.environ.get('WAFCACHE_EVICT_INTERVAL_MINUTES', 3)) ++EVICT_MAX_BYTES = int(os.environ.get('WAFCACHE_EVICT_MAX_BYTES', 10**10)) ++WAFCACHE_NO_PUSH = 1 if os.environ.get('WAFCACHE_NO_PUSH') else 0 ++WAFCACHE_VERBOSITY = 1 if os.environ.get('WAFCACHE_VERBOSITY') else 0 ++WAFCACHE_STATS = 1 if os.environ.get('WAFCACHE_STATS') else 0 ++WAFCACHE_ASYNC_WORKERS = os.environ.get('WAFCACHE_ASYNC_WORKERS') ++WAFCACHE_ASYNC_NOWAIT = os.environ.get('WAFCACHE_ASYNC_NOWAIT') ++OK = "ok" ++ ++re_waf_cmd = re.compile('(?P%{SRC})|(?P%{TGT})') ++ ++try: ++ import cPickle ++except ImportError: ++ import pickle as cPickle ++ ++if __name__ != '__main__': ++ from waflib import Task, Logs, Utils, Build ++ ++def can_retrieve_cache(self): ++ """ ++ New method for waf Task classes ++ """ ++ if not self.outputs: ++ return False ++ ++ self.cached = False ++ ++ sig = self.signature() ++ ssig = Utils.to_hex(self.uid() + sig) ++ ++ if WAFCACHE_STATS: ++ self.generator.bld.cache_reqs += 1 ++ ++ files_to = [node.abspath() for node in self.outputs] ++ proc = get_process() ++ err = cache_command(proc, ssig, [], files_to) ++ process_pool.append(proc) ++ if err.startswith(OK): ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('CYAN', ' Fetched %r from cache' % files_to) ++ else: ++ Logs.debug('wafcache: fetched %r from cache', files_to) ++ if WAFCACHE_STATS: ++ self.generator.bld.cache_hits += 1 ++ else: ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('YELLOW', ' No cache entry %s' % files_to) ++ else: ++ Logs.debug('wafcache: No cache entry %s: %s', files_to, err) ++ return False ++ ++ self.cached = True ++ return True ++ ++def put_files_cache(self): ++ """ ++ New method for waf Task classes ++ """ ++ if WAFCACHE_NO_PUSH or getattr(self, 'cached', None) or not self.outputs: ++ return ++ ++ files_from = [] ++ for node in self.outputs: ++ path = node.abspath() ++ if not os.path.isfile(path): ++ return ++ files_from.append(path) ++ ++ bld = self.generator.bld ++ old_sig = self.signature() ++ ++ for node in self.inputs: ++ try: ++ del node.ctx.cache_sig[node] ++ except KeyError: ++ pass ++ ++ delattr(self, 'cache_sig') ++ sig = self.signature() ++ ++ def _async_put_files_cache(bld, ssig, files_from): ++ proc = get_process() ++ if WAFCACHE_ASYNC_WORKERS: ++ with bld.wafcache_lock: ++ if bld.wafcache_stop: ++ process_pool.append(proc) ++ return ++ bld.wafcache_procs.add(proc) ++ ++ err = cache_command(proc, ssig, files_from, []) ++ process_pool.append(proc) ++ if err.startswith(OK): ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('CYAN', ' Successfully uploaded %s to cache' % files_from) ++ else: ++ Logs.debug('wafcache: Successfully uploaded %r to cache', files_from) ++ if WAFCACHE_STATS: ++ bld.cache_puts += 1 ++ else: ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('RED', ' Error caching step results %s: %s' % (files_from, err)) ++ else: ++ Logs.debug('wafcache: Error caching results %s: %s', files_from, err) ++ ++ if old_sig == sig: ++ ssig = Utils.to_hex(self.uid() + sig) ++ if WAFCACHE_ASYNC_WORKERS: ++ fut = bld.wafcache_executor.submit(_async_put_files_cache, bld, ssig, files_from) ++ bld.wafcache_uploads.append(fut) ++ else: ++ _async_put_files_cache(bld, ssig, files_from) ++ else: ++ Logs.debug('wafcache: skipped %r upload due to late input modifications %r', self.outputs, self.inputs) ++ ++ bld.task_sigs[self.uid()] = self.cache_sig ++ ++def hash_env_vars(self, env, vars_lst): ++ """ ++ Reimplement BuildContext.hash_env_vars so that the resulting hash does not depend on local paths ++ """ ++ if not env.table: ++ env = env.parent ++ if not env: ++ return Utils.SIG_NIL ++ ++ idx = str(id(env)) + str(vars_lst) ++ try: ++ cache = self.cache_env ++ except AttributeError: ++ cache = self.cache_env = {} ++ else: ++ try: ++ return self.cache_env[idx] ++ except KeyError: ++ pass ++ ++ v = str([env[a] for a in vars_lst]) ++ v = v.replace(self.srcnode.abspath().__repr__()[:-1], '') ++ m = Utils.md5() ++ m.update(v.encode()) ++ ret = m.digest() ++ ++ Logs.debug('envhash: %r %r', ret, v) ++ ++ cache[idx] = ret ++ ++ return ret ++ ++def uid(self): ++ """ ++ Reimplement Task.uid() so that the signature does not depend on local paths ++ """ ++ try: ++ return self.uid_ ++ except AttributeError: ++ m = Utils.md5() ++ src = self.generator.bld.srcnode ++ up = m.update ++ up(self.__class__.__name__.encode()) ++ for x in self.inputs + self.outputs: ++ up(x.path_from(src).encode()) ++ self.uid_ = m.digest() ++ return self.uid_ ++ ++ ++def make_cached(cls): ++ """ ++ Enable the waf cache for a given task class ++ """ ++ if getattr(cls, 'nocache', None) or getattr(cls, 'has_cache', False): ++ return ++ ++ full_name = "%s.%s" % (cls.__module__, cls.__name__) ++ if full_name in ('waflib.Tools.ccroot.vnum', 'waflib.Build.inst'): ++ return ++ ++ m1 = getattr(cls, 'run', None) ++ def run(self): ++ if getattr(self, 'nocache', False): ++ return m1(self) ++ if self.can_retrieve_cache(): ++ return 0 ++ return m1(self) ++ cls.run = run ++ ++ m2 = getattr(cls, 'post_run', None) ++ def post_run(self): ++ if getattr(self, 'nocache', False): ++ return m2(self) ++ ret = m2(self) ++ self.put_files_cache() ++ return ret ++ cls.post_run = post_run ++ cls.has_cache = True ++ ++process_pool = [] ++def get_process(): ++ """ ++ Returns a worker process that can process waf cache commands ++ The worker process is assumed to be returned to the process pool when unused ++ """ ++ try: ++ return process_pool.pop() ++ except IndexError: ++ filepath = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'wafcache.py' ++ cmd = [sys.executable, '-c', Utils.readf(filepath)] ++ return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0) ++ ++def atexit_pool(): ++ for proc in process_pool: ++ proc.kill() ++atexit.register(atexit_pool) ++ ++def build(bld): ++ """ ++ Called during the build process to enable file caching ++ """ ++ ++ if WAFCACHE_ASYNC_WORKERS: ++ try: ++ num_workers = int(WAFCACHE_ASYNC_WORKERS) ++ except ValueError: ++ Logs.warn('Invalid WAFCACHE_ASYNC_WORKERS specified: %r' % WAFCACHE_ASYNC_WORKERS) ++ else: ++ from concurrent.futures import ThreadPoolExecutor ++ bld.wafcache_executor = ThreadPoolExecutor(max_workers=num_workers) ++ bld.wafcache_uploads = [] ++ bld.wafcache_procs = set([]) ++ bld.wafcache_stop = False ++ bld.wafcache_lock = threading.Lock() ++ ++ def finalize_upload_async(bld): ++ if WAFCACHE_ASYNC_NOWAIT: ++ with bld.wafcache_lock: ++ bld.wafcache_stop = True ++ ++ for fut in reversed(bld.wafcache_uploads): ++ fut.cancel() ++ ++ for proc in bld.wafcache_procs: ++ proc.kill() ++ ++ bld.wafcache_procs.clear() ++ else: ++ Logs.pprint('CYAN', '... waiting for wafcache uploads to complete (%s uploads)' % len(bld.wafcache_uploads)) ++ bld.wafcache_executor.shutdown(wait=True) ++ bld.add_post_fun(finalize_upload_async) ++ ++ if WAFCACHE_STATS: ++ # Init counter for statistics and hook to print results at the end ++ bld.cache_reqs = bld.cache_hits = bld.cache_puts = 0 ++ ++ def printstats(bld): ++ hit_ratio = 0 ++ if bld.cache_reqs > 0: ++ hit_ratio = (bld.cache_hits / bld.cache_reqs) * 100 ++ Logs.pprint('CYAN', ' wafcache stats: %s requests, %s hits (ratio: %.2f%%), %s writes' % ++ (bld.cache_reqs, bld.cache_hits, hit_ratio, bld.cache_puts) ) ++ bld.add_post_fun(printstats) ++ ++ if process_pool: ++ # already called once ++ return ++ ++ # pre-allocation ++ processes = [get_process() for x in range(bld.jobs)] ++ process_pool.extend(processes) ++ ++ Task.Task.can_retrieve_cache = can_retrieve_cache ++ Task.Task.put_files_cache = put_files_cache ++ Task.Task.uid = uid ++ Build.BuildContext.hash_env_vars = hash_env_vars ++ for x in reversed(list(Task.classes.values())): ++ make_cached(x) ++ ++def cache_command(proc, sig, files_from, files_to): ++ """ ++ Create a command for cache worker processes, returns a pickled ++ base64-encoded tuple containing the task signature, a list of files to ++ cache and a list of files files to get from cache (one of the lists ++ is assumed to be empty) ++ """ ++ obj = base64.b64encode(cPickle.dumps([sig, files_from, files_to])) ++ proc.stdin.write(obj) ++ proc.stdin.write('\n'.encode()) ++ proc.stdin.flush() ++ obj = proc.stdout.readline() ++ if not obj: ++ raise OSError('Preforked sub-process %r died' % proc.pid) ++ return cPickle.loads(base64.b64decode(obj)) ++ ++try: ++ copyfun = os.link ++except NameError: ++ copyfun = shutil.copy2 ++ ++def atomic_copy(orig, dest): ++ """ ++ Copy files to the cache, the operation is atomic for a given file ++ """ ++ global copyfun ++ tmp = dest + '.tmp' ++ up = os.path.dirname(dest) ++ try: ++ os.makedirs(up) ++ except OSError: ++ pass ++ ++ try: ++ copyfun(orig, tmp) ++ except OSError as e: ++ if e.errno == errno.EXDEV: ++ copyfun = shutil.copy2 ++ copyfun(orig, tmp) ++ else: ++ raise ++ os.rename(tmp, dest) ++ ++def lru_trim(): ++ """ ++ the cache folders take the form: ++ `CACHE_DIR/0b/0b180f82246d726ece37c8ccd0fb1cde2650d7bfcf122ec1f169079a3bfc0ab9` ++ they are listed in order of last access, and then removed ++ until the amount of folders is within TRIM_MAX_FOLDERS and the total space ++ taken by files is less than EVICT_MAX_BYTES ++ """ ++ lst = [] ++ for up in os.listdir(CACHE_DIR): ++ if len(up) == 2: ++ sub = os.path.join(CACHE_DIR, up) ++ for hval in os.listdir(sub): ++ path = os.path.join(sub, hval) ++ ++ size = 0 ++ for fname in os.listdir(path): ++ try: ++ size += os.lstat(os.path.join(path, fname)).st_size ++ except OSError: ++ pass ++ lst.append((os.stat(path).st_mtime, size, path)) ++ ++ lst.sort(key=lambda x: x[0]) ++ lst.reverse() ++ ++ tot = sum(x[1] for x in lst) ++ while tot > EVICT_MAX_BYTES or len(lst) > TRIM_MAX_FOLDERS: ++ _, tmp_size, path = lst.pop() ++ tot -= tmp_size ++ ++ tmp = path + '.remove' ++ try: ++ shutil.rmtree(tmp) ++ except OSError: ++ pass ++ try: ++ os.rename(path, tmp) ++ except OSError: ++ sys.stderr.write('Could not rename %r to %r\n' % (path, tmp)) ++ else: ++ try: ++ shutil.rmtree(tmp) ++ except OSError: ++ sys.stderr.write('Could not remove %r\n' % tmp) ++ sys.stderr.write("Cache trimmed: %r bytes in %r folders left\n" % (tot, len(lst))) ++ ++ ++def lru_evict(): ++ """ ++ Reduce the cache size ++ """ ++ lockfile = os.path.join(CACHE_DIR, 'all.lock') ++ try: ++ st = os.stat(lockfile) ++ except EnvironmentError as e: ++ if e.errno == errno.ENOENT: ++ with open(lockfile, 'w') as f: ++ f.write('') ++ return ++ else: ++ raise ++ ++ if st.st_mtime < time.time() - EVICT_INTERVAL_MINUTES * 60: ++ # check every EVICT_INTERVAL_MINUTES minutes if the cache is too big ++ # OCLOEXEC is unnecessary because no processes are spawned ++ fd = os.open(lockfile, os.O_RDWR | os.O_CREAT, 0o755) ++ try: ++ try: ++ fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB) ++ except EnvironmentError: ++ if WAFCACHE_VERBOSITY: ++ sys.stderr.write('wafcache: another cleaning process is running\n') ++ else: ++ # now dow the actual cleanup ++ lru_trim() ++ os.utime(lockfile, None) ++ finally: ++ os.close(fd) ++ ++class netcache(object): ++ def __init__(self): ++ self.http = urllib3.PoolManager() ++ ++ def url_of(self, sig, i): ++ return "%s/%s/%s" % (CACHE_DIR, sig, i) ++ ++ def upload(self, file_path, sig, i): ++ url = self.url_of(sig, i) ++ with open(file_path, 'rb') as f: ++ file_data = f.read() ++ r = self.http.request('POST', url, timeout=60, ++ fields={ 'file': ('%s/%s' % (sig, i), file_data), }) ++ if r.status >= 400: ++ raise OSError("Invalid status %r %r" % (url, r.status)) ++ ++ def download(self, file_path, sig, i): ++ url = self.url_of(sig, i) ++ with self.http.request('GET', url, preload_content=False, timeout=60) as inf: ++ if inf.status >= 400: ++ raise OSError("Invalid status %r %r" % (url, inf.status)) ++ with open(file_path, 'wb') as out: ++ shutil.copyfileobj(inf, out) ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_from): ++ if not os.path.islink(x): ++ self.upload(x, sig, i) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_to): ++ self.download(x, sig, i) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++class fcache(object): ++ def __init__(self): ++ if not os.path.exists(CACHE_DIR): ++ try: ++ os.makedirs(CACHE_DIR) ++ except OSError: ++ pass ++ if not os.path.exists(CACHE_DIR): ++ raise ValueError('Could not initialize the cache directory') ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ """ ++ Copy files to the cache, existing files are overwritten, ++ and the copy is atomic only for a given file, not for all files ++ that belong to a given task object ++ """ ++ try: ++ for i, x in enumerate(files_from): ++ dest = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ atomic_copy(x, dest) ++ except Exception: ++ return traceback.format_exc() ++ else: ++ # attempt trimming if caching was successful: ++ # we may have things to trim! ++ try: ++ lru_evict() ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ """ ++ Copy files from the cache ++ """ ++ try: ++ for i, x in enumerate(files_to): ++ orig = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ atomic_copy(orig, x) ++ ++ # success! update the cache time ++ os.utime(os.path.join(CACHE_DIR, sig[:2], sig), None) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++class bucket_cache(object): ++ def bucket_copy(self, source, target): ++ if WAFCACHE_CMD: ++ def replacer(match): ++ if match.group('src'): ++ return source ++ elif match.group('tgt'): ++ return target ++ cmd = [re_waf_cmd.sub(replacer, x) for x in shlex.split(WAFCACHE_CMD)] ++ elif CACHE_DIR.startswith('s3://'): ++ cmd = ['aws', 's3', 'cp', source, target] ++ elif CACHE_DIR.startswith('gs://'): ++ cmd = ['gsutil', 'cp', source, target] ++ else: ++ cmd = ['mc', 'cp', source, target] ++ ++ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ++ out, err = proc.communicate() ++ if proc.returncode: ++ raise OSError('Error copy %r to %r using: %r (exit %r):\n out:%s\n err:%s' % ( ++ source, target, cmd, proc.returncode, out.decode(errors='replace'), err.decode(errors='replace'))) ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_from): ++ dest = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ self.bucket_copy(x, dest) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_to): ++ orig = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ self.bucket_copy(orig, x) ++ except EnvironmentError: ++ return traceback.format_exc() ++ return OK ++ ++def loop(service): ++ """ ++ This function is run when this file is run as a standalone python script, ++ it assumes a parent process that will communicate the commands to it ++ as pickled-encoded tuples (one line per command) ++ ++ The commands are to copy files to the cache or copy files from the ++ cache to a target destination ++ """ ++ # one operation is performed at a single time by a single process ++ # therefore stdin never has more than one line ++ txt = sys.stdin.readline().strip() ++ if not txt: ++ # parent process probably ended ++ sys.exit(1) ++ ret = OK ++ ++ [sig, files_from, files_to] = cPickle.loads(base64.b64decode(txt)) ++ if files_from: ++ # TODO return early when pushing files upstream ++ ret = service.copy_to_cache(sig, files_from, files_to) ++ elif files_to: ++ # the build process waits for workers to (possibly) obtain files from the cache ++ ret = service.copy_from_cache(sig, files_from, files_to) ++ else: ++ ret = "Invalid command" ++ ++ obj = base64.b64encode(cPickle.dumps(ret)) ++ sys.stdout.write(obj.decode()) ++ sys.stdout.write('\n') ++ sys.stdout.flush() ++ ++if __name__ == '__main__': ++ if CACHE_DIR.startswith('s3://') or CACHE_DIR.startswith('gs://') or CACHE_DIR.startswith('minio://'): ++ if CACHE_DIR.startswith('minio://'): ++ CACHE_DIR = CACHE_DIR[8:] # minio doesn't need the protocol part, uses config aliases ++ service = bucket_cache() ++ elif CACHE_DIR.startswith('http'): ++ service = netcache() ++ else: ++ service = fcache() ++ while 1: ++ try: ++ loop(service) ++ except KeyboardInterrupt: ++ break ++ +diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py +index 91bbff181..c5b309120 100644 +--- a/waflib/extras/xcode6.py ++++ b/waflib/extras/xcode6.py +@@ -99,7 +99,7 @@ def delete_invalid_values(dct): + ... + } + 'Release': { +- 'ARCHS' x86_64' ++ 'ARCHS': x86_64' + ... + } + } +@@ -163,12 +163,12 @@ def tostring(self, value): + result = result + "\t\t}" + return result + elif isinstance(value, str): +- return "\"%s\"" % value ++ return '"%s"' % value.replace('"', '\\\\\\"') + elif isinstance(value, list): + result = "(\n" + for i in value: +- result = result + "\t\t\t%s,\n" % self.tostring(i) +- result = result + "\t\t)" ++ result = result + "\t\t\t\t%s,\n" % self.tostring(i) ++ result = result + "\t\t\t)" + return result + elif isinstance(value, XCodeNode): + return value._id +@@ -565,13 +565,13 @@ def process_xcode(self): + # Override target specific build settings + bldsettings = { + 'HEADER_SEARCH_PATHS': ['$(inherited)'] + self.env['INCPATHS'], +- 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR) , ++ 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR), + 'FRAMEWORK_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.FRAMEWORKPATH), +- 'OTHER_LDFLAGS': libs + ' ' + frameworks, +- 'OTHER_LIBTOOLFLAGS': bld.env['LINKFLAGS'], ++ 'OTHER_LDFLAGS': libs + ' ' + frameworks + ' ' + ' '.join(bld.env['LINKFLAGS']), + 'OTHER_CPLUSPLUSFLAGS': Utils.to_list(self.env['CXXFLAGS']), + 'OTHER_CFLAGS': Utils.to_list(self.env['CFLAGS']), +- 'INSTALL_PATH': [] ++ 'INSTALL_PATH': [], ++ 'GCC_PREPROCESSOR_DEFINITIONS': self.env['DEFINES'] + } + + # Install path +@@ -591,7 +591,7 @@ def process_xcode(self): + + # The keys represents different build configuration, e.g. Debug, Release and so on.. + # Insert our generated build settings to all configuration names +- keys = set(settings.keys() + bld.env.PROJ_CONFIGURATION.keys()) ++ keys = set(settings.keys()) | set(bld.env.PROJ_CONFIGURATION.keys()) + for k in keys: + if k in settings: + settings[k].update(bldsettings) +diff --git a/waflib/fixpy2.py b/waflib/fixpy2.py +index 24176e066..c99bff4b9 100644 +--- a/waflib/fixpy2.py ++++ b/waflib/fixpy2.py +@@ -56,7 +56,7 @@ def r1(code): + @subst('Runner.py') + def r4(code): + "generator syntax" +- return code.replace('next(self.biter)', 'self.biter.next()') ++ return code.replace('next(self.biter)', 'self.biter.next()').replace('self.daemon = True', 'self.setDaemon(1)') + + @subst('Context.py') + def r5(code): +diff --git a/waflib/processor.py b/waflib/processor.py +index 2eecf3bd9..eff2e69ad 100755 +--- a/waflib/processor.py ++++ b/waflib/processor.py +@@ -27,6 +27,10 @@ def run(): + [cmd, kwargs, cargs] = cPickle.loads(base64.b64decode(txt)) + cargs = cargs or {} + ++ if not 'close_fds' in kwargs: ++ # workers have no fds ++ kwargs['close_fds'] = False ++ + ret = 1 + out, err, ex, trace = (None, None, None, None) + try: From 9fb8f2e10c547fedb5a65db384c813a2850241d8 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Feb 2024 18:09:53 +0100 Subject: [PATCH 1592/3013] package/python-ruamel-yaml: fix comment in hash file Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 29852a51ed7..ee5016835ba 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,4 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/rfc3987/json +# md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz # Locally computed sha256 checksums From 21da0df09db09700948c27782d0bb446a0ad66f8 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Feb 2024 18:09:54 +0100 Subject: [PATCH 1593/3013] support/testing: add new python-ruamel-yaml runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ .../package/sample_python_ruamel_yaml.py | 27 +++++++++++++++++++ .../tests/package/test_python_ruamel_yaml.py | 12 +++++++++ 3 files changed, 41 insertions(+) create mode 100644 support/testing/tests/package/sample_python_ruamel_yaml.py create mode 100644 support/testing/tests/package/test_python_ruamel_yaml.py diff --git a/DEVELOPERS b/DEVELOPERS index 8c0deb9e412..9dedf0a7a44 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2158,7 +2158,9 @@ F: utils/diffconfig N: Marcus Hoffmann F: package/python-jc/ F: support/testing/tests/package/test_python_fastapi.py +F: support/testing/tests/package/test_python_ruamel_yaml.py F: support/testing/tests/package/sample_python_fastapi.py +F: support/testing/tests/package/sample_python_ruamel_yaml.py N: Marek Belisko F: package/libatasmart/ diff --git a/support/testing/tests/package/sample_python_ruamel_yaml.py b/support/testing/tests/package/sample_python_ruamel_yaml.py new file mode 100644 index 00000000000..5b3a0794714 --- /dev/null +++ b/support/testing/tests/package/sample_python_ruamel_yaml.py @@ -0,0 +1,27 @@ +from ruamel.yaml import YAML + +yaml_text = """ +Rootkey: + - ListEntry +AnotherRootKey: some-string + +ListRoot: + - float-value: '1.0' + int-value: 10234 + NestedList: + - 1 + - 2 + + - another-float: '1.1' + another-int: 1111 + +OneMoreRootKey: 9.99 +""" + +# Tests the pure python based implementation +yaml = YAML(typ='safe', pure=True) + +parsed = yaml.load(yaml_text) + +assert parsed['OneMoreRootKey'] == 9.99 +assert parsed['ListRoot'][1]['another-int'] == 1111 diff --git a/support/testing/tests/package/test_python_ruamel_yaml.py b/support/testing/tests/package/test_python_ruamel_yaml.py new file mode 100644 index 00000000000..15062b4455d --- /dev/null +++ b/support/testing/tests/package/test_python_ruamel_yaml.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3RuamelYaml(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_RUAMEL_YAML=y + """ + sample_scripts = ["tests/package/sample_python_ruamel_yaml.py"] + timeout = 40 From f538c7e6bdc07e3bd3db7a34798a47a905af4413 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Feb 2024 18:09:55 +0100 Subject: [PATCH 1594/3013] package/python-ruamel-yaml-clib: new package Add optional c extension for python-ruamel-yaml which can speed up yaml loading/parsing. Extend the ruamel-yaml runtime test to check if the c extension works correctly. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-ruamel-yaml-clib/Config.in | 8 ++++++++ .../python-ruamel-yaml-clib.hash | 5 +++++ .../python-ruamel-yaml-clib.mk | 14 ++++++++++++++ .../tests/package/sample_python_ruamel_yaml.py | 12 ++++++++++++ .../tests/package/test_python_ruamel_yaml.py | 1 + 7 files changed, 42 insertions(+) create mode 100644 package/python-ruamel-yaml-clib/Config.in create mode 100644 package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash create mode 100644 package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9dedf0a7a44..2f5e1e40bf9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2157,6 +2157,7 @@ F: utils/diffconfig N: Marcus Hoffmann F: package/python-jc/ +F: package/python-ruamel-yaml-clib/ F: support/testing/tests/package/test_python_fastapi.py F: support/testing/tests/package/test_python_ruamel_yaml.py F: support/testing/tests/package/sample_python_fastapi.py diff --git a/package/Config.in b/package/Config.in index 9806f6dc256..81f87fa2d5f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1331,6 +1331,7 @@ menu "External python modules" source "package/python-rtoml/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-ruamel-yaml/Config.in" + source "package/python-ruamel-yaml-clib/Config.in" source "package/python-s3transfer/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" diff --git a/package/python-ruamel-yaml-clib/Config.in b/package/python-ruamel-yaml-clib/Config.in new file mode 100644 index 00000000000..c747fb61e99 --- /dev/null +++ b/package/python-ruamel-yaml-clib/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_RUAMEL_YAML_CLIB + bool "python-ruamel-yaml-clib" + depends on BR2_PACKAGE_PYTHON_RUAMEL_YAML + help + C version of reader, parser and emitter for ruamel.yaml + derived from libyaml + + https://sourceforge.net/projects/ruamel-yaml/ diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash new file mode 100644 index 00000000000..937afc3df1c --- /dev/null +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/ruamel.yaml.clib/json +md5 b72e549363fa1b9c4f9123e98f2b46cc ruamel.yaml.clib-0.2.8.tar.gz +sha256 beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512 ruamel.yaml.clib-0.2.8.tar.gz +# Locally computed sha256 checksums +sha256 5458f90e82366f660f956b3c929ba5f7a0efdb99a99a847e2f51f2020ffbe887 LICENSE diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk new file mode 100644 index 00000000000..25c3b44131a --- /dev/null +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-ruamel-yaml-clib +# +################################################################################ + +PYTHON_RUAMEL_YAML_CLIB_VERSION = 0.2.8 +PYTHON_RUAMEL_YAML_CLIB_SOURCE = ruamel.yaml.clib-$(PYTHON_RUAMEL_YAML_CLIB_VERSION).tar.gz +PYTHON_RUAMEL_YAML_CLIB_SITE = https://files.pythonhosted.org/packages/46/ab/bab9eb1566cd16f060b54055dd39cf6a34bfa0240c53a7218c43e974295b +PYTHON_RUAMEL_YAML_CLIB_SETUP_TYPE = setuptools +PYTHON_RUAMEL_YAML_CLIB_LICENSE = MIT +PYTHON_RUAMEL_YAML_CLIB_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_ruamel_yaml.py b/support/testing/tests/package/sample_python_ruamel_yaml.py index 5b3a0794714..55cd6962788 100644 --- a/support/testing/tests/package/sample_python_ruamel_yaml.py +++ b/support/testing/tests/package/sample_python_ruamel_yaml.py @@ -25,3 +25,15 @@ assert parsed['OneMoreRootKey'] == 9.99 assert parsed['ListRoot'][1]['another-int'] == 1111 + +# Tests the C extension based loader +# ruamel.yaml automatically falls back to the pure python version, so we need +# to explicitly check if importing the CLoader works here. +# Import this here, so it's clearer what part of the test is failing. +from ruamel.yaml import CLoader # noqa: E402 +assert CLoader is not None +yaml = YAML(typ='safe') +parsed_from_c = yaml.load(yaml_text) + +assert parsed_from_c['OneMoreRootKey'] == 9.99 +assert parsed_from_c['ListRoot'][1]['another-int'] == 1111 diff --git a/support/testing/tests/package/test_python_ruamel_yaml.py b/support/testing/tests/package/test_python_ruamel_yaml.py index 15062b4455d..b145da4b244 100644 --- a/support/testing/tests/package/test_python_ruamel_yaml.py +++ b/support/testing/tests/package/test_python_ruamel_yaml.py @@ -7,6 +7,7 @@ class TestPythonPy3RuamelYaml(TestPythonPackageBase): """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_RUAMEL_YAML=y + BR2_PACKAGE_PYTHON_RUAMEL_YAML_CLIB=y """ sample_scripts = ["tests/package/sample_python_ruamel_yaml.py"] timeout = 40 From 8d466affdbdff1cd6de6fa5ddcc44d920cd3abdc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 7 Feb 2024 18:09:56 +0100 Subject: [PATCH 1595/3013] package/python-ruamel-yaml: bump to version 0.18.5 License hash changed due to year update: https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ Signed-off-by: James Hilliard Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index ee5016835ba..02845d112b2 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz # Locally computed sha256 checksums -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk index a6fed3bc2c8..bbdac591ca0 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_LICENSE = MIT PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE From 93b460a29449ba3fae3dbd42cdd228475e767ff1 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Sat, 2 Mar 2024 20:12:15 +0100 Subject: [PATCH 1596/3013] package/zoxide: new package A smarter cd command. Supports all major shells. https://github.com/ajeetdsouza/zoxide.git Signed-off-by: Saeed Kazemi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/zoxide/Config.in | 11 +++++++++++ package/zoxide/zoxide.hash | 3 +++ package/zoxide/zoxide.mk | 12 ++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/zoxide/Config.in create mode 100644 package/zoxide/zoxide.hash create mode 100644 package/zoxide/zoxide.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2f5e1e40bf9..4b2fdee6c8e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2820,6 +2820,7 @@ F: package/biosdevname/ N: Saeed Kazemi F: package/eza/ F: package/procs/ +F: package/zoxide/ N: Sam Lancia F: package/lrzip/ diff --git a/package/Config.in b/package/Config.in index 81f87fa2d5f..44ce5a5005c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2727,6 +2727,7 @@ comment "Utilities" source "package/xmlstarlet/Config.in" source "package/xxhash/Config.in" source "package/ytree/Config.in" + source "package/zoxide/Config.in" endmenu menu "System tools" diff --git a/package/zoxide/Config.in b/package/zoxide/Config.in new file mode 100644 index 00000000000..b2567dad0b2 --- /dev/null +++ b/package/zoxide/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_ZOXIDE + bool "zoxide" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + zoxide is a smarter cd command, inspired by z and autojump. + It remembers which directories you use most frequently, so + you can "jump" to them in just a few keystrokes. + zoxide works on all major shells. + + https://github.com/ajeetdsouza/zoxide.git diff --git a/package/zoxide/zoxide.hash b/package/zoxide/zoxide.hash new file mode 100644 index 00000000000..1a3a066af95 --- /dev/null +++ b/package/zoxide/zoxide.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 f2d9b9448516919f6d5cf32a5f154c2dc3a90d9fdf0addab9cd6a7824020befc zoxide-0.9.4-cargo2.tar.gz +sha256 23aa3b08366e4ed6050f3d9950070201802aadbe5675fa1c19f24f4de91cf294 LICENSE diff --git a/package/zoxide/zoxide.mk b/package/zoxide/zoxide.mk new file mode 100644 index 00000000000..92b4395a87b --- /dev/null +++ b/package/zoxide/zoxide.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# zoxide +# +################################################################################ + +ZOXIDE_VERSION = 0.9.4 +ZOXIDE_SITE = $(call github,ajeetdsouza,zoxide,v$(ZOXIDE_VERSION)) +ZOXIDE_LICENSE = MIT +ZOXIDE_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) From 6d0cce7dab6cbfad02edd27254b548948612432e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 21:44:39 +0200 Subject: [PATCH 1597/3013] package/qt5/qt5webkit: fix patch fuzz Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, qt5webkit fails to build with output: Applying 0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch using patch: patching file Source/WTF/wtf/glib/GRefPtr.h Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file Source/WTF/wtf/glib/GRefPtr.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...Remove-invalid-g_object-declarations-to-fix-build-wi.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch index 48605e4fe4f..e3a1faec9c9 100644 --- a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch +++ b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch @@ -8,6 +8,8 @@ g_object_ref_sink is defined as a macro meanwhile and so the build fails. Just remove the declarations, glib.h is included anyway. Signed-off-by: James Hilliard [Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058] +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Source/WTF/wtf/glib/GRefPtr.h | 3 --- 1 file changed, 3 deletions(-) @@ -17,8 +19,8 @@ index 06133d82cb35..d9a1d2f145f5 100644 --- a/Source/WTF/wtf/glib/GRefPtr.h +++ b/Source/WTF/wtf/glib/GRefPtr.h @@ -29,9 +29,6 @@ + #include #include - #include -extern "C" void g_object_unref(gpointer); -extern "C" gpointer g_object_ref_sink(gpointer); From 51ef6691ac3b18c3a6738535c7ec7c9e3a401bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Wed, 13 Mar 2024 23:46:09 +0100 Subject: [PATCH 1598/3013] package/qt5/qt5webkit: fix JavaScriptCore parser error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5webkit build currently fails with the following error: [...] parser.rb:587:in `block in parseSequence': undefined method `=~' for an instance of Annotation (NoMethodError) from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:654:in `block in parseSequence' from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:780:in `block in parseSequence' from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:625:in `block in parseSequence' from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:68:in `
' This issue is due to =~ being marked as deprecated since a few Ruby versions, and finally removed in 3.2.0 [1]. This now breaks the build since buildroot has moved to Ruby v3.3.0. The corresponding fix has already been issued in upstream Webkit project [2], but qt5webkit version tracked in buildroot does not have the corresponding webkit version pulled. Fix this build error by bringing the upstream patch. The patch is slightly modified (exclude part about Changelog file, which is absent from qt5webkit) Fixes: http://autobuild.buildroot.net/results/21397b110fe02e5711ecb1d35be2108221751b0a/ [1] https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ [2] https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef Signed-off-by: Alexis Lothoré Signed-off-by: Thomas Petazzoni --- ...ngs-with-newer-Ruby-versions-https-b.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch diff --git a/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch b/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch new file mode 100644 index 00000000000..c8e339c5f80 --- /dev/null +++ b/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch @@ -0,0 +1,48 @@ +From 47e03d4af292805bf304f09e34333b38a94c1789 Mon Sep 17 00:00:00 2001 +From: "aperez@igalia.com" +Date: Wed, 15 Jan 2020 22:15:38 +0000 +Subject: [PATCH] Offlineasm warnings with newer Ruby versions + https://bugs.webkit.org/show_bug.cgi?id=206233 + +Reviewed by Yusuke Suzuki. + +Avoid a warning about using Object#=~ on Annotation instances, which +has been deprecated in Ruby 2.7. + +* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator +to Annotation instances, which do not define it. + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc +Upstream: https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef +Signed-off-by: Alexis Lothoré +--- + Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb +index b4451124521f..cd1cffaec6ed 100644 +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -584,9 +584,7 @@ class Parser + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -600,6 +598,8 @@ class Parser + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 +-- +2.43.1 + From e24a11738896118870037d89ccd64d2fa331e15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Wed, 13 Mar 2024 23:46:10 +0100 Subject: [PATCH 1599/3013] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5webkit build currently breaks on the following error: XSLStyleSheetLibxslt.cpp:148:129: error: invalid conversion from ‘void (*)(void*, xmlError*)’ {aka ‘void (*)(void*, _xmlError*)’} to ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void*, const _xmlError*)’} [-fpermissive] 148 | XMLDocumentParserScope scope(cachedResourceLoader(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console); | ^ | | | void (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)} This error is due to an API update in libxml2, enforcing const on more struct in version 2.12.0 (see [1]). Buildroot now tracks v2.12.5. Upstream Webkit project has already issued the corresponding fix ([2]), which updates corresponding internal prototypes depending on libxml2 version, but the qt5webkit version tracked in buildroot does not integrate the corresponding Webkit version. Fix this build issue by bringing the upstream patch "as is" from Webkit No autobuilder references because this build error was hidden by another build error fixed in a previous patch. [1] https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0 [2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b Signed-off-by: Alexis Lothoré Signed-off-by: Thomas Petazzoni --- ...-libxml2-version-2.12.0-due-to-API-c.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch diff --git a/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch b/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch new file mode 100644 index 00000000000..d6f379ae8ec --- /dev/null +++ b/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch @@ -0,0 +1,61 @@ +From df49bfc4c93001970c9b9266903ee7e8804fb576 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 20 Nov 2023 07:42:30 -0800 +Subject: [PATCH] Build fails with libxml2 version 2.12.0 due to API change + https://bugs.webkit.org/show_bug.cgi?id=265128 + +Reviewed by Philippe Normand. + +Starting with libxml2 2.12.0, the API has changed the const-ness of the +xmlError pointers, which results in a build error due to a mismatched +type in the parsing error callback. This papers over the difference by +using preprocessor conditionals. + +* Source/WebCore/xml/XSLTProcessor.h: Use const when building against + libxml2 2.12.0 or newer. +* Source/WebCore/xml/XSLTProcessorLibxslt.cpp: +(WebCore::XSLTProcessor::parseErrorFunc): Ditto. + +Canonical link: https://commits.webkit.org/270977@main +Upstream: https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b +Signed-off-by: Alexis Lothoré +--- + Source/WebCore/xml/XSLTProcessor.h | 4 ++++ + Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h +index 21bb45b5cbe1..5cf20557918f 100644 +--- a/Source/WebCore/xml/XSLTProcessor.h ++++ b/Source/WebCore/xml/XSLTProcessor.h +@@ -61,7 +61,11 @@ public: + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void parseErrorFunc(void* userData, const xmlError*); ++#else + static void parseErrorFunc(void* userData, xmlError*); ++#endif + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks +diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +index a65691087e3c..9f6b363dfc6c 100644 +--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp ++++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +@@ -59,7 +59,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...) + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) ++#else + void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++#endif + { + PageConsoleClient* console = static_cast(userData); + if (!console) +-- +2.43.1 + From 751228436a4c68bc440a2f9dd1ef12ceb861765c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 22 Jun 2024 20:04:32 +0200 Subject: [PATCH 1600/3013] configs/stm32mp157a_dk1: add hashes The patch adds .hash files for Arm trusted firmware, Linux, Linux headers and U-Boot and then enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../stm32mp157a-dk1/patches/linux-headers/linux-headers.hash | 1 + .../stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash | 2 ++ .../stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash | 2 ++ configs/stm32mp157a_dk1_defconfig | 2 ++ 6 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash create mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash create mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 31be0b99e38..dfd5b2578ec 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -285,7 +285,6 @@ configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash -configs/stm32mp157a_dk1_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash configs/terasic_de10nano_cyclone5_defconfig lib_defconfig.ForceCheckHash diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..97c4500711f --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 068325043b7c8ecc47ebb8b4f241f01e86d3f69dc49a63f340aa94bd41a9e6df arm-trusted-firmware/arm-trusted-firmware-lts-v2.8.16.tar.gz diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash new file mode 100644 index 00000000000..8b7624cceb9 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9 linux-5.13.tar.xz diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash new file mode 100644 index 00000000000..7cef5b688ec --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 u-boot-2023.04.tar.bz2 diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index aed6cfad343..38f7bc8946c 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -6,6 +6,8 @@ BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y # System configuration +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32mp157a-dk1/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" From a83ab3f4c8621dec58dc78a8dcb48e519377ac3d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 22 Jun 2024 13:46:21 +0200 Subject: [PATCH 1601/3013] configs/spike_riscv32: new defconfig Buildroot commit [1] updated riscv-isa-sim (Spike), which now includes a NS16550 uart emulation. This can be used by RV32 Linux Kernel. This commit introduce a defconfig for running Linux on Spike RISC-V 32-bit ISA simulator. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/853b7661bf5ddca5d4b81964ef1a19a133beac85 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../patches/linux-headers/linux-headers.hash | 1 + board/spike/riscv32/patches/linux/linux.hash | 2 ++ .../riscv32/patches/opensbi/opensbi.hash | 2 ++ board/spike/riscv32/readme.txt | 30 +++++++++++++++++++ board/spike/riscv32/start.sh | 23 ++++++++++++++ configs/spike_riscv32_defconfig | 17 +++++++++++ 7 files changed, 76 insertions(+) create mode 120000 board/spike/riscv32/patches/linux-headers/linux-headers.hash create mode 100644 board/spike/riscv32/patches/linux/linux.hash create mode 100644 board/spike/riscv32/patches/opensbi/opensbi.hash create mode 100644 board/spike/riscv32/readme.txt create mode 100755 board/spike/riscv32/start.sh create mode 100644 configs/spike_riscv32_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 4b2fdee6c8e..c7d2129d458 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1758,6 +1758,7 @@ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig F: configs/qemu_riscv64_virt_efi_defconfig +F: configs/spike_riscv32_defconfig F: configs/spike_riscv64_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ diff --git a/board/spike/riscv32/patches/linux-headers/linux-headers.hash b/board/spike/riscv32/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/spike/riscv32/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/spike/riscv32/patches/linux/linux.hash b/board/spike/riscv32/patches/linux/linux.hash new file mode 100644 index 00000000000..a3b67a09a47 --- /dev/null +++ b/board/spike/riscv32/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 fce3ee728712ed063aa8c14a8756c8ff8c7a46ba3827f61d2b04a73c7cf5dd9e linux-6.6.35.tar.xz diff --git a/board/spike/riscv32/patches/opensbi/opensbi.hash b/board/spike/riscv32/patches/opensbi/opensbi.hash new file mode 100644 index 00000000000..bc4058abe62 --- /dev/null +++ b/board/spike/riscv32/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/board/spike/riscv32/readme.txt b/board/spike/riscv32/readme.txt new file mode 100644 index 00000000000..9cc49af9df3 --- /dev/null +++ b/board/spike/riscv32/readme.txt @@ -0,0 +1,30 @@ +Linux on Spike RISC-V 32-bit ISA simulator +========================================== + +This configuration provides a minimal working setup to run a Linux +kernel in the Spike RISC-V ISA simulator. + +The Spike ISA simulator can be an interresting alternative to Qemu, in +some specific cases. For example: simulating new instructions (see [1]), +simulating riscv-openocd/gdb debug sessions (see [2], [3]), or +generating an accurate per-instruction log of execution (see +riscv-isa-sim spike -l option)... + +To run Buildroot Linux in Spike, use the commands: + + make spike_riscv32_defconfig + make + ./board/spike/riscv32/start.sh + +The boot is made with the standard RISC-V OpenSBI boot loader. In +order to keep the simulation simple, the rootfs is passed as an initrd +ramfs. + +[1]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction + +[2]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-gdb + +[3]. +https://github.com/riscv-collab/riscv-openocd diff --git a/board/spike/riscv32/start.sh b/board/spike/riscv32/start.sh new file mode 100755 index 00000000000..43d2d9dcde1 --- /dev/null +++ b/board/spike/riscv32/start.sh @@ -0,0 +1,23 @@ +#! /bin/sh + +SCRIPT_DIR="$(dirname "$0")" +BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" + +# spike uses dtc at runtime startup, so make sure buildroot host +# directory is in the PATH +export PATH="${BR_BASEDIR}/output/host/usr/bin:$PATH" + +# Use Buildroot host spike by default, but allow the caller to +# redefine another spike binary +: "${SPIKE:=spike}" + +# Note 1: Kernel with initrd fail to boot on riscv32 when the system +# has more than 1GB of RAM. So we set exactly this amount of RAM. +# Note 2: The default spike ISA is RV64IMAFDC_zicntr_zihpm, so we need +# to force the RV32 ISA here. +exec "${SPIKE}" \ + -m1024 \ + --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ + --isa="RV32IMAFDC_zicntr_zihpm" \ + "${@}" \ + "${BR_BASEDIR}"/output/images/fw_payload.elf diff --git a/configs/spike_riscv32_defconfig b/configs/spike_riscv32_defconfig new file mode 100644 index 00000000000..6ea12dc1fb7 --- /dev/null +++ b/configs/spike_riscv32_defconfig @@ -0,0 +1,17 @@ +BR2_riscv=y +BR2_RISCV_32=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/spike/riscv32/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.35" +BR2_LINUX_KERNEL_DEFCONFIG="rv32" +BR2_TARGET_ROOTFS_CPIO=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y +BR2_PACKAGE_HOST_RISCV_ISA_SIM=y From fd358b97c053af9e45fcb94e59ade63b4d895f10 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 27 Jun 2024 10:02:04 +0200 Subject: [PATCH 1602/3013] package/dump1090: fix build with GCC 14 Fixes http://autobuild.buildroot.net/results/1d5804974153f96e80f5200793ec8cd12c9fa18a/ GCC 14 complains if the arguments to calloc (nmemb, size) are swapped around, causing a build failure as dump1090 builds with -Werror: net_io.c:107:34: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] 107 | if (!(service = calloc(sizeof(*service), 1))) { Add a patch from an upstream pull request to fix that. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- .../0001-swap-size-arguments-to-calloc.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/dump1090/0001-swap-size-arguments-to-calloc.patch diff --git a/package/dump1090/0001-swap-size-arguments-to-calloc.patch b/package/dump1090/0001-swap-size-arguments-to-calloc.patch new file mode 100644 index 00000000000..1c2d502793b --- /dev/null +++ b/package/dump1090/0001-swap-size-arguments-to-calloc.patch @@ -0,0 +1,43 @@ +From be8f5b7ab1223076ba0086f14aeeb53ace2d4b5c Mon Sep 17 00:00:00 2001 +From: Jeff Lawson +Date: Tue, 18 Jun 2024 15:58:24 +0000 +Subject: [PATCH] swap size arguments to calloc + +fixes #241 + +Signed-off-by: Peter Korsgaard +Upstream: https://github.com/flightaware/dump1090/pull/243 +--- + adaptive.c | 2 +- + net_io.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/adaptive.c b/adaptive.c +index f16e16c..d656433 100644 +--- a/adaptive.c ++++ b/adaptive.c +@@ -195,7 +195,7 @@ void adaptive_init() + adaptive_burst_window_remaining = adaptive_samples_per_window; + adaptive_burst_window_counter = 0; + +- adaptive_range_radix = calloc(sizeof(unsigned), 65536); ++ adaptive_range_radix = calloc(65536, sizeof(unsigned)); + adaptive_range_state = RANGE_RESCAN_UP; + + // select and enforce gain limits +diff --git a/net_io.c b/net_io.c +index bf98028..8abd510 100644 +--- a/net_io.c ++++ b/net_io.c +@@ -104,7 +104,7 @@ struct net_service *serviceInit(const char *descr, struct net_writer *writer, he + { + struct net_service *service; + +- if (!(service = calloc(sizeof(*service), 1))) { ++ if (!(service = calloc(1, sizeof(*service)))) { + fprintf(stderr, "Out of memory allocating service %s\n", descr); + exit(1); + } +-- +2.39.2 + From 76051e653199f8f6c20afa0c28496c7d8cfcb527 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 9 Jun 2024 21:55:19 +0200 Subject: [PATCH 1603/3013] package/bcc: add missing dependencies to comment Since its inception in 146498d13c48 (package/bcc: new package), not all the dependencies of bcc are mirrored in the comment to be displayed when those dependencies are not met. Fix that by adding the missing pieces: - wchar, - threads - dynamic libs, Signed-off-by: Yann E. MORIN Cc: Jugurtha BELKALEM Cc: Romain Naour Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/bcc/Config.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/bcc/Config.in b/package/bcc/Config.in index b91e0e5ee3d..bf46f07d936 100644 --- a/package/bcc/Config.in +++ b/package/bcc/Config.in @@ -38,8 +38,13 @@ config BR2_PACKAGE_BCC https://github.com/iovisor/bcc http://www.ebpf.io -comment "bcc needs a glibc toolchain, C++, gcc >= 7, host gcc >= 7" +comment "bcc needs a glibc toolchain, C++, wchar, threads, dynamic libs, gcc >= 7, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_HOST_GCC_AT_LEAST_7 + depends on !BR2_TOOLCHAIN_USES_GLIBC \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_HOST_GCC_AT_LEAST_7 \ + || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS From 98f452f97425c76a9404692530b585cd950dd1fd Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 19 Apr 2024 23:32:16 +0200 Subject: [PATCH 1604/3013] package/pkg-python: fix pep517 data files installation When installing a wheel in pep517 compatibility mode, the pyinstaller.py is invoked with the --data parameter which point to the directory in which data files should be installed. Actually the --data parameter points to the /usr subdirectory which is indeed wrong cause it shall point to the root directory where the wheel will be installed. This fixes the problem of having configuration files installed in /usr/etc instead of /etc. Signed-off-by: Angelo Compagnucci Tested-by: Fiona Klute Signed-off-by: Arnout Vandecappelle --- package/pkg-python.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 88fadecd549..2a85a04b7c3 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -67,7 +67,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ - --data=$(TARGET_DIR)/usr + --data=$(TARGET_DIR) PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ $(TOPDIR)/support/scripts/pyinstaller.py \ @@ -76,7 +76,7 @@ PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ - --data=$(STAGING_DIR)/usr + --data=$(STAGING_DIR) PKG_PYTHON_PEP517_DEPENDENCIES = \ host-python-pypa-build \ From c90b87156dec69c9acabb8bd80d2447a5dbfb1e8 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 19 Apr 2024 23:32:15 +0200 Subject: [PATCH 1605/3013] package/fail2ban: fix data_files installation path When packaging data_files in a wheel, those files shall have the destination path expressed as relative to the wheel installation. The reason for that is the wheel installation shall be contained inside a specific folder and/or in site-packages. When building the wheel file by the bdist_wheel command, python will package files with absolute paths as python files ending up installing them in site-packages. Fixes: http://autobuild.buildroot.net/results/36ac5278d19195a21c3d02d087965e08f49228ef Signed-off-by: Angelo Compagnucci Tested-by: Fiona Klute [Arnout: add Upstream tag to the patch] Signed-off-by: Arnout Vandecappelle --- ...001-setup.py-fix-data-relative-paths.patch | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 package/fail2ban/0001-setup.py-fix-data-relative-paths.patch diff --git a/package/fail2ban/0001-setup.py-fix-data-relative-paths.patch b/package/fail2ban/0001-setup.py-fix-data-relative-paths.patch new file mode 100644 index 00000000000..75bd9aaface --- /dev/null +++ b/package/fail2ban/0001-setup.py-fix-data-relative-paths.patch @@ -0,0 +1,74 @@ +From 7b7fa3c02d4575c09362336bc310835c37859f1a Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Fri, 19 Apr 2024 22:47:20 +0200 +Subject: [PATCH] setup.py: fix data relative paths +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As per distutils documentation: + +The directory should be a relative path. It is interpreted relative to the +installation prefix (Python’s sys.prefix for system installations; +site.USER_BASE for user installations). Distutils allows directory to be an +absolute installation path, but this is discouraged since it is incompatible +with the wheel packaging format [1]. + +When packaging to a bdist_wheel indeed, the files in the "data_files" dictionary +are not picked at all as data files if they have an absolute path, +but they are instead added to the wheel as python files. +This has the effect of installing them as part of python files in the +site-packages folder when the wheel is installed. + +This patch cannot be sent upstream because it breaks the legacy way of +installing the package with *python setup.py install* and it is needed only to +comply with the pep517 buildroot compatibility layer. + +[1] https://docs.python.org/3.10/distutils/setupscript.html#installing-additional-files +Signed-off-by: Angelo Compagnucci +Upstream: N/A [breaks traditional setuptools installation] +--- + setup.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 91f71cf2..99ba2e32 100755 +--- a/setup.py ++++ b/setup.py +@@ -238,26 +238,26 @@ setup( + for f in w[2]] + } if with_tests else {}, + data_files = [ +- ('/etc/fail2ban', ++ ('etc/fail2ban', + glob("config/*.conf") + ), +- ('/etc/fail2ban/filter.d', ++ ('etc/fail2ban/filter.d', + glob("config/filter.d/*.conf") + ), +- ('/etc/fail2ban/filter.d/ignorecommands', ++ ('etc/fail2ban/filter.d/ignorecommands', + [p for p in glob("config/filter.d/ignorecommands/*") if isfile(p)] + ), +- ('/etc/fail2ban/action.d', ++ ('etc/fail2ban/action.d', + glob("config/action.d/*.conf") + + glob("config/action.d/*.py") + ), +- ('/etc/fail2ban/fail2ban.d', ++ ('etc/fail2ban/fail2ban.d', + '' + ), +- ('/etc/fail2ban/jail.d', ++ ('etc/fail2ban/jail.d', + '' + ), +- ('/var/lib/fail2ban', ++ ('var/lib/fail2ban', + '' + ), + ] + data_files_extra, +-- +2.34.1 + From 5e36efd7ac994ed430bc2430ee0c03d44f0cbbff Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 12 Jul 2024 15:37:19 +0200 Subject: [PATCH 1606/3013] .checkpackageignore: remove chromebook check-hash exceptions Commits 3988f2d9238bc027b5d16219867e8d3c701c0c06 and 0d91281d7bdfa09be28237bab694e6ac22466541 added hashes for the chromebook defconfigs, but forgot to remove the exception from .checkpackageignore. Regenerate .checkpackageignore, which removes those exceptions. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dfd5b2578ec..f36e99fcf4d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -148,8 +148,6 @@ configs/beaglev_defconfig lib_defconfig.ForceCheckHash configs/beelink_gs1_defconfig lib_defconfig.ForceCheckHash configs/broadcom_northstar_defconfig lib_defconfig.ForceCheckHash configs/canaan_kd233_defconfig lib_defconfig.ForceCheckHash -configs/chromebook_elm_defconfig lib_defconfig.ForceCheckHash -configs/chromebook_snow_defconfig lib_defconfig.ForceCheckHash configs/ci20_defconfig lib_defconfig.ForceCheckHash configs/cubieboard2_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6qdl_icore_defconfig lib_defconfig.ForceCheckHash From 47976f67fb34fe727543380ea6aa13617cf18aa1 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Tue, 9 Jul 2024 12:18:41 +0200 Subject: [PATCH 1607/3013] package/fail2ban: fix sshd filter with OpenSSH 9.8 The filter needs to consider the new sshd-session binary, patches already merged upstream. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Arnout Vandecappelle --- ...lter-for-openssh-9.8-new-daemon-name.patch | 24 +++++++++++++++++++ ...shd.conf-ungroup-unneeded-for-daemon.patch | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 package/fail2ban/0002-adjust-sshd-filter-for-openssh-9.8-new-daemon-name.patch create mode 100644 package/fail2ban/0003-filter.d-sshd.conf-ungroup-unneeded-for-daemon.patch diff --git a/package/fail2ban/0002-adjust-sshd-filter-for-openssh-9.8-new-daemon-name.patch b/package/fail2ban/0002-adjust-sshd-filter-for-openssh-9.8-new-daemon-name.patch new file mode 100644 index 00000000000..9841d09240c --- /dev/null +++ b/package/fail2ban/0002-adjust-sshd-filter-for-openssh-9.8-new-daemon-name.patch @@ -0,0 +1,24 @@ +From 2fed408c05ac5206b490368d94599869bd6a056d Mon Sep 17 00:00:00 2001 +From: Fabian Dellwing +Date: Tue, 2 Jul 2024 07:54:15 +0200 +Subject: [PATCH] Adjust sshd filter for OpenSSH 9.8 new daemon name + +Upstream: https://github.com/fail2ban/fail2ban/commit/2fed408c05ac5206b490368d94599869bd6a056d +Signed-off-by: Fiona Klute (WIWA) +--- + config/filter.d/sshd.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf +index 1c8a02deb5..a1fd749aed 100644 +--- a/config/filter.d/sshd.conf ++++ b/config/filter.d/sshd.conf +@@ -16,7 +16,7 @@ before = common.conf + + [DEFAULT] + +-_daemon = sshd ++_daemon = (?:sshd(?:-session)?) + + # optional prefix (logged from several ssh versions) like "error: ", "error: PAM: " or "fatal: " + __pref = (?:(?:error|fatal): (?:PAM: )?)? diff --git a/package/fail2ban/0003-filter.d-sshd.conf-ungroup-unneeded-for-daemon.patch b/package/fail2ban/0003-filter.d-sshd.conf-ungroup-unneeded-for-daemon.patch new file mode 100644 index 00000000000..521d899640d --- /dev/null +++ b/package/fail2ban/0003-filter.d-sshd.conf-ungroup-unneeded-for-daemon.patch @@ -0,0 +1,24 @@ +From 50ff131a0fd8f54fdeb14b48353f842ee8ae8c1a Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Wed, 3 Jul 2024 19:35:28 +0200 +Subject: [PATCH] filter.d/sshd.conf: ungroup (unneeded for _daemon) + +Upstream: https://github.com/fail2ban/fail2ban/commit/50ff131a0fd8f54fdeb14b48353f842ee8ae8c1a +Signed-off-by: Fiona Klute (WIWA) +--- + config/filter.d/sshd.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf +index a1fd749aed..3a84b1ba52 100644 +--- a/config/filter.d/sshd.conf ++++ b/config/filter.d/sshd.conf +@@ -16,7 +16,7 @@ before = common.conf + + [DEFAULT] + +-_daemon = (?:sshd(?:-session)?) ++_daemon = sshd(?:-session)? + + # optional prefix (logged from several ssh versions) like "error: ", "error: PAM: " or "fatal: " + __pref = (?:(?:error|fatal): (?:PAM: )?)? From a341e4fe3e65c86c3402de239f3ea3b098520b2b Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Tue, 9 Jul 2024 12:18:40 +0200 Subject: [PATCH 1608/3013] package/fail2ban: bump version to 1.1.0 Fail2ban 1.1.0 brings Python 3.12 compatibility, and removes support for 2.x. This means 2to3 handling can be dropped. Unfortunately fail2ban 1.1.0 still relies on asynchat and asyncore, which have been removed from the Python standard library in 3.12. Depend on the compatibility package python-pyasynchat (which pulls in python-pyasyncore) and remove copies bundled in upstream code. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Arnout Vandecappelle --- package/fail2ban/Config.in | 1 + package/fail2ban/fail2ban.hash | 2 +- package/fail2ban/fail2ban.mk | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/fail2ban/Config.in b/package/fail2ban/Config.in index 8a48a8c1d0e..4c2c56440d7 100644 --- a/package/fail2ban/Config.in +++ b/package/fail2ban/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_FAIL2BAN bool "fail2ban" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYASYNCHAT # runtime select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD help Fail2ban scans log files (e.g. /var/log/apache/error_log) and diff --git a/package/fail2ban/fail2ban.hash b/package/fail2ban/fail2ban.hash index b40922e70a6..8627e01f055 100644 --- a/package/fail2ban/fail2ban.hash +++ b/package/fail2ban/fail2ban.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23 fail2ban-1.0.2.tar.gz +sha256 474fcc25afdaf929c74329d1e4d24420caabeea1ef2e041a267ce19269570bae fail2ban-1.1.0.tar.gz sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 0c1208c6fee..a77e5fad6c1 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAIL2BAN_VERSION = 1.0.2 +FAIL2BAN_VERSION = 1.1.0 FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION)) FAIL2BAN_LICENSE = GPL-2.0+ FAIL2BAN_LICENSE_FILES = COPYING @@ -12,13 +12,13 @@ FAIL2BAN_CPE_ID_VENDOR = fail2ban FAIL2BAN_SELINUX_MODULES = fail2ban FAIL2BAN_SETUP_TYPE = setuptools -define FAIL2BAN_PYTHON_2TO3 - $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban +# fail2ban contains bundled copies of pyasyncore and pyasynchat, +# remove them so only the packaged versions are installed. +define FAIL2BAN_REMOVE_BUNDLED_COMPAT + $(SED) '/fail2ban\.compat/d' $(@D)/setup.py + rm -rf $(@D)/fail2ban/compat endef -FAIL2BAN_DEPENDENCIES = host-python3 -# We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed -# to build and install before _POST_PATCH_HOOKS run. -FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3 +FAIL2BAN_POST_PATCH_HOOKS += FAIL2BAN_REMOVE_BUNDLED_COMPAT define FAIL2BAN_FIX_DEFAULT_CONFIG $(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf From ca9e08277c473de1d0119768661ce0ba96559a7a Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 11 Jun 2024 16:12:16 +0200 Subject: [PATCH 1609/3013] package/qt5: bump packages to latest kde submodule versions Bump qt5 packages to latest submodule versions from: https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 Signed-off-by: Roy Kollen Svendsen [Thomas: update the hash of qt5webengine] Signed-off-by: Thomas Petazzoni --- package/qt5/qt5.mk | 2 +- package/qt5/qt53d/qt53d.hash | 2 +- package/qt5/qt53d/qt53d.mk | 2 +- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/qt5/qt5charts/qt5charts.hash | 2 +- package/qt5/qt5charts/qt5charts.mk | 2 +- package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5doc/qt5doc.hash | 2 +- package/qt5/qt5doc/qt5doc.mk | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5location/qt5location.hash | 2 +- package/qt5/qt5location/qt5location.mk | 2 +- package/qt5/qt5lottie/qt5lottie.hash | 2 +- package/qt5/qt5lottie/qt5lottie.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- package/qt5/qt5script/qt5script.hash | 2 +- package/qt5/qt5script/qt5script.mk | 2 +- package/qt5/qt5scxml/qt5scxml.hash | 2 +- package/qt5/qt5scxml/qt5scxml.mk | 2 +- package/qt5/qt5sensors/qt5sensors.hash | 2 +- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- package/qt5/qt5serialport/qt5serialport.hash | 2 +- package/qt5/qt5serialport/qt5serialport.mk | 2 +- package/qt5/qt5speech/qt5speech.hash | 2 +- package/qt5/qt5speech/qt5speech.mk | 2 +- package/qt5/qt5svg/qt5svg.hash | 2 +- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5tools/qt5tools.hash | 2 +- package/qt5/qt5tools/qt5tools.mk | 2 +- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- package/qt5/qt5webengine/qt5webengine.hash | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 2 +- package/qt5/qt5websockets/qt5websockets.mk | 2 +- package/qt5/qt5webview/qt5webview.hash | 2 +- package/qt5/qt5webview/qt5webview.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index a43b36dd519..783dbd8c144 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,7 +5,7 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).11 +QT5_VERSION = $(QT5_VERSION_MAJOR).14 QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 0f63aab72a0..65e6e8e3801 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 +sha256 31b3e52fb0b28f1e99dd25342a0204d239f7f42bcb25fb56393956904ef412ea qt3d-9bf4d03e2515f7c454647d54542330b6e90f8191.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 4b748a49727..8d9babd7040 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 +QT53D_VERSION = 9bf4d03e2515f7c454647d54542330b6e90f8191 QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 77b88fa9095..14e0c9b602a 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9219c8e5d82b32b351743fb548f248400f3b3eca9db37a43b2b8c929d2625c01 qt5base-da6e958319e95fe564d3b30c931492dd666bfaff-git4.tar.gz +sha256 2d6ede564444b617a7fe6e8fa65b3d81df3a3308641cf7c35aef6aa471a21269 qt5base-2b9835f5c9bcfe3105b60a8dd33c1db7d8611378-git4.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bbab9b3de17..3fd5d302516 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff +QT5BASE_VERSION = 2b9835f5c9bcfe3105b60a8dd33c1db7d8611378 QT5BASE_SITE = $(QT5_SITE)/qtbase QT5BASE_SITE_METHOD = git QT5BASE_CPE_ID_VENDOR = qt diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index fec54c86b1f..009edbd2400 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 66dae46a8bcb1dfc10dd3404296701c41e50658792e4a6a7317a182fad6f36c8 qtcharts-e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826.tar.bz2 +sha256 c66fec01fedf753bee860aedc365730367026c28a2418a6819b0b2550336293c qtcharts-7315c48bcec88014e78165bbda54abfcd557e0af.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index bfc60212894..25da7f8ed7d 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CHARTS_VERSION = e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826 +QT5CHARTS_VERSION = 7315c48bcec88014e78165bbda54abfcd557e0af QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 776448502b6..8185a272eaa 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7a44848e113e1d7232c077f9fa8021ab038f59765123920e11936e7d4b8e3c66 qtconnectivity-f0c98c39447894bba493aa91c65053d7f18d68cb.tar.bz2 +sha256 3f7ed280d234a50d21937aecaf5494bbd570fb80e71f49598e082cefe81d41fe qtconnectivity-99f30db37c63447c59d5fac15bc8feb832a7fd04.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index dc5e647e0b6..e1592e80bb3 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = f0c98c39447894bba493aa91c65053d7f18d68cb +QT5CONNECTIVITY_VERSION = 99f30db37c63447c59d5fac15bc8feb832a7fd04 QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 3db5c944584..3a5fc44356c 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bebd1205aa087f529b8824f0284e127e08672ff7ce36a6b865cd921514ec1192 qtdeclarative-960a980dc885622cb84990c4da75d5060318302d.tar.bz2 +sha256 9a84a707411c0daa6b3292ebe264ac7e979639d9f6d5fd45bb18799b42ca0c33 qtdeclarative-50c8def854806485d66aabcf6918e8b987032e55.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 99c88e7d069..0dbb69f2e0c 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 960a980dc885622cb84990c4da75d5060318302d +QT5DECLARATIVE_VERSION = 50c8def854806485d66aabcf6918e8b987032e55 QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5doc/qt5doc.hash b/package/qt5/qt5doc/qt5doc.hash index ec84ecdcb5b..8139bfddc90 100644 --- a/package/qt5/qt5doc/qt5doc.hash +++ b/package/qt5/qt5doc/qt5doc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87ef0ba72ede78148dfae8fbe78c839f0e9966e1ab4a58d7725041144c0de70f qtdoc-897e90fe304d844beaf694b82a93a50237fa8b9e.tar.bz2 +sha256 2fd5e9d12067e67c1e1cf77862e6e351ce7300a9eb9b3f089627114f40d45165 qtdoc-bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd.tar.bz2 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5doc/qt5doc.mk b/package/qt5/qt5doc/qt5doc.mk index 77845a347f7..597bc965ad9 100644 --- a/package/qt5/qt5doc/qt5doc.mk +++ b/package/qt5/qt5doc/qt5doc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DOC_VERSION = 897e90fe304d844beaf694b82a93a50237fa8b9e +QT5DOC_VERSION = bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd QT5DOC_SITE = $(QT5_SITE)/qtdoc/-/archive/$(QT5DOC_VERSION) QT5DOC_SOURCE = qtdoc-$(QT5DOC_VERSION).tar.bz2 QT5DOC_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index e5fdaf67bf4..900edaee05a 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 18afbc24b40420ce0fe6bfad8331f43a1d8c8ec22501b7987ecec9334b69e9a2 qtgraphicaleffects-cce7d784237cd2dd4af1abe2757d048e34e02685.tar.bz2 +sha256 dca1697c8dd21e53999df67f0ac59c1c26531ef3a693bfc066408047ea511e7a qtgraphicaleffects-2c39e673d6c15a84dcc7882d3772fa04cc79f9ed.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index ddf805303ba..341f4a70ac6 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = cce7d784237cd2dd4af1abe2757d048e34e02685 +QT5GRAPHICALEFFECTS_VERSION = 2c39e673d6c15a84dcc7882d3772fa04cc79f9ed QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 779db8d109f..5da25631872 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bac150b9c5eaf0132a39a0b2a75cfca5400c11f4b8bf60f7362a6e0307f5c19e qtimageformats-6a1af670d52492ab0955933b830026b2a18ed6d6.tar.bz2 +sha256 d4805fadfd33243c4a1c9f81083f75b5162e25b92a39a56d87558ba03a2fb8a3 qtimageformats-4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 27ef05777da..1f51e002e9a 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = 6a1af670d52492ab0955933b830026b2a18ed6d6 +QT5IMAGEFORMATS_VERSION = 4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 062dfd42ff0..0b44f09cbb4 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7664c9f2bb8a111c939f988c1951737858e91754b9302476ae7cedcf112aa4a3 qt5location-0ec8f5e82da7369a92824167c4d7331f6c502325-git4.tar.gz +sha256 fe3b037f9291352d11714a4c1101299d83e561c11b867d77273fb3f5c44384a3 qt5location-3beb9c810611337fde61d89aa981e9f177a9ede9-git4.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 88bf3d289c2..01bb4f747bf 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOCATION_VERSION = 0ec8f5e82da7369a92824167c4d7331f6c502325 +QT5LOCATION_VERSION = 3beb9c810611337fde61d89aa981e9f177a9ede9 QT5LOCATION_SITE = $(QT5_SITE)/qtlocation QT5LOCATION_SITE_METHOD = git QT5LOCATION_GIT_SUBMODULES = YES diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 642625753c5..304b92de86f 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4d8a063687c25675b012821e252a1afd455bdb4ea43e6d79787f9991c68cb5c5 qtlottie-909b79f4810b8ac62baa3544837793cfb132593b.tar.bz2 +sha256 514e4a8e334e69eb345e9ae7186f6254854077ebf5ca30f0ae216df3ea78bacd qtlottie-b8c1fa109dce6f8bff9f55738d2f1e21ff677796.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index d4ad3afc63e..a364f2e10a1 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOTTIE_VERSION = 909b79f4810b8ac62baa3544837793cfb132593b +QT5LOTTIE_VERSION = b8c1fa109dce6f8bff9f55738d2f1e21ff677796 QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 7925c4fe059..d6aca5c74da 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3f78ede5dcc231d0e92e9907d11fa1d7a7cf506eb73d3f035e8461b57dc692b4 qtmultimedia-b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4.tar.bz2 +sha256 62d9ab403bae05d3ca1335324143c371a33089ceed6f4124be74a1518b85906e qtmultimedia-53069c9c6eb52b744333812f42aed36c3db6e752.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 7a56d238f2e..07314b3de3c 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 +QT5MULTIMEDIA_VERSION = 53069c9c6eb52b744333812f42aed36c3db6e752 QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 219dc8d5887..fda31985719 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8c02691d3eb45b9f144bef64c9705e26e8a4c725a0731b18450d39a589965c49 qtquickcontrols-dcc90558d9c0cba41eec7df290943994289b0e87.tar.bz2 +sha256 0f2244f4425b8886bbeef77c92b807ef4749ace18d31e02ca88183e5af088c18 qtquickcontrols-9325659ec390eda5b160736a926ba58ccb445cce.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 86792ddd8ea..ab7b49f0b8d 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = dcc90558d9c0cba41eec7df290943994289b0e87 +QT5QUICKCONTROLS_VERSION = 9325659ec390eda5b160736a926ba58ccb445cce QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 91fb31a7b73..9c401c00e3b 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 481220682ce3127711465d6ade22c9ce0e4a4130dd9735344f7464f9147d8f0d qtquickcontrols2-1ce461bd1dc713cd2f79fc16c5454d587b45eefa.tar.bz2 +sha256 90fb0d1b578af622b98a291f7bc1069695c180040b18e9cd8423fe86e325c290 qtquickcontrols2-69fea340f8f4c483a9b2889e4e24a4b1b52ebc87.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index a2503eb9a37..34c27b7cb7c 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = 1ce461bd1dc713cd2f79fc16c5454d587b45eefa +QT5QUICKCONTROLS2_VERSION = 69fea340f8f4c483a9b2889e4e24a4b1b52ebc87 QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index 1c9f436b1b1..602127d7699 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ee404943ef00dbac33928cf001b613ca517fdfdf2767b932a8def5f8c2b0797f qtquicktimeline-b1b4b882dabaa036c3fb73c4a879ba8efbb02ded.tar.bz2 +sha256 72b1e95f7d4235b03c0d3ffcbc67ab3e7fbe4c96a4d9631cb8c9024a2b9d4f50 qtquicktimeline-bf6c73064c82b07fcb1f7e72c263b249e137e224.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index 3a8542ab1b8..4307c9b1234 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = b1b4b882dabaa036c3fb73c4a879ba8efbb02ded +QT5QUICKTIMELINE_VERSION = bf6c73064c82b07fcb1f7e72c263b249e137e224 QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index a931ce09cb9..943ecb268ee 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 677b8ccb5c07673296c4fa01bcbc6bd9b8e3a534d332624f61fe0360a5649703 qtremoteobjects-bdc316aca82769b43cb7821c10d80a1ca02b846e.tar.bz2 +sha256 347c89c24480b1f20f12d7415706aba6536ff7277862d3450e34c40cc711016e qtremoteobjects-3873bdc809ca8d58d91968cb0de34da26646bc79.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index 5fea3487a56..8848af3c81f 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = bdc316aca82769b43cb7821c10d80a1ca02b846e +QT5REMOTEOBJECTS_VERSION = 3873bdc809ca8d58d91968cb0de34da26646bc79 QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index d6572be818d..655b772595e 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7731d8c85636d039a2b35a9ee0de7b5ebb0c3900a9b4845676041ce91f56f01f qtscript-f237e324508dcf0dbabde9dd498eda9fa61c4ff0.tar.bz2 +sha256 6462533cb1749d76c890cb3c325524835a6ee7f12682d425a2cf19628806b284 qtscript-572daa83e990ce88cca27909470c5404657ec9de.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 96cbbfbbadb..4c8a7e16762 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCRIPT_VERSION = f237e324508dcf0dbabde9dd498eda9fa61c4ff0 +QT5SCRIPT_VERSION = 572daa83e990ce88cca27909470c5404657ec9de QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 0f13743f456..60e64feb88b 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d598238bfa3bbbe283a8bd2907a4e8e813e00c522f08297a856e6595bbd44099 qtscxml-e8727aabe55526956295407d27317ec15e12b283.tar.bz2 +sha256 92191932423bdbb11e3005bf4c8bc43faa623d7b16558ecf884f20564ad8dbff qtscxml-6834b183966d08d9f061642ee7ea2d482cbbf073.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 32ef425e97e..f92bfdf6459 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCXML_VERSION = e8727aabe55526956295407d27317ec15e12b283 +QT5SCXML_VERSION = 6834b183966d08d9f061642ee7ea2d482cbbf073 QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 37a23516dfd..2955e651e78 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f44148d1a21f3959d79f973d8aa233ddfacf37af6e27902fca8c885b91933fcc qtsensors-a41492b23cde20d1e00427d31e4637d06aea3638.tar.bz2 +sha256 d01ee718ae1c00329a6b3cdadb190a2159e7d1e1e76d7345815cb17a42d48113 qtsensors-bf0b718cd0b6c7823e9d2037d3bdece44185f444.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 29e257fddad..b99440e21e5 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SENSORS_VERSION = a41492b23cde20d1e00427d31e4637d06aea3638 +QT5SENSORS_VERSION = bf0b718cd0b6c7823e9d2037d3bdece44185f444 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 1d1861a4a30..64a518734c3 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 952b145ae64e03208d7c2a0b0b2b94b928e8998eb72c6762b54e4d9760737dde qtserialbus-c41785c9f36560722b917d373ee97eed8cc4089a.tar.bz2 +sha256 45bf8a97ef2f2e85c023f4e7ce761b64f98ac6a9c3af2a8f232f2cc778762736 qtserialbus-616bc5b962cdcacb1c1ba985d7236392e9cadb8c.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 3315ef5be71..ca22a0ca1c6 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALBUS_VERSION = c41785c9f36560722b917d373ee97eed8cc4089a +QT5SERIALBUS_VERSION = 616bc5b962cdcacb1c1ba985d7236392e9cadb8c QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index e95392b8809..b18d0d05b4f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2b7584de148f0b6ea2cf162609d44d7ad3bb893b1995427ceed72cb4562db6d7 qtserialport-3380465d5d4977326616c5e57789a81681be650e.tar.bz2 +sha256 c8eea27d6fc031088fc84cf08cdfffda3b72b6fdd279144a0de7a1bcb9f19d91 qtserialport-34c19c6441cd440dc65b59ae7670eadf099d51f8.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 462d1dd7b9b..592de6f0a90 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALPORT_VERSION = 3380465d5d4977326616c5e57789a81681be650e +QT5SERIALPORT_VERSION = 34c19c6441cd440dc65b59ae7670eadf099d51f8 QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash index 3be66a77fe1..a222b162925 100644 --- a/package/qt5/qt5speech/qt5speech.hash +++ b/package/qt5/qt5speech/qt5speech.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4be0161595806cfc5c9c3160a83d0379269a2813dd4b3ffe2e2a1328f23d8fbc qtspeech-214dcefc7c408e11a3e9fe9d221e4a384e2eaca1.tar.bz2 +sha256 8414b8e9cedc8bdd7bc70f5a1c5b83dda2147fba22c7c6fa6498ea4c1451d6df qtspeech-8ad0f08ad7e2a8d27dc5e69806812c6a3f298946.tar.bz2 # Hashes for license files: sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk index c8054431df7..22f9d8c9d38 100644 --- a/package/qt5/qt5speech/qt5speech.mk +++ b/package/qt5/qt5speech/qt5speech.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SPEECH_VERSION = 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1 +QT5SPEECH_VERSION = 8ad0f08ad7e2a8d27dc5e69806812c6a3f298946 QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 QT5SPEECH_INSTALL_STAGING = YES diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index f3e47da5ded..654016d94c4 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6a71029b46e71667f86c48923f0b292c3057ea56b2aedb8aeaa5af70e85e71c3 qtsvg-3385b64df939815e9df5955f991d270d47a5515b.tar.bz2 +sha256 8e4d0fbfdd8bd33ec23036af932b12f838974ac322a5d53f487190477b2be286 qtsvg-690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index c1d019000b3..1221dedcc96 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SVG_VERSION = 3385b64df939815e9df5955f991d270d47a5515b +QT5SVG_VERSION = 690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638 QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index d4ea0dc0471..c19eb41e5ba 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7214584115d0b89a362c6b0e8586d6228ac138f3ed5e52c97962b8634edbbcfd qttools-ddf6686e9bce7a3232af14a2966b4c895e654f02.tar.bz2 +sha256 46bd221011a6b4b1b9da6ce13099e10d09548af325a8b2082b8bc2f692a0d95d qttools-f82ed367d1b80b69d738cfcde534b75854a45476.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 98f3948d178..c03d5d6e385 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5TOOLS_VERSION = ddf6686e9bce7a3232af14a2966b4c895e654f02 +QT5TOOLS_VERSION = f82ed367d1b80b69d738cfcde534b75854a45476 QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 89559b63f28..d091df1b942 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c8dfb16614a63e39c714673abe35a7c30107d359356695634af619e62e8ce6cd qtvirtualkeyboard-817378aa10176fd26eed36542bc657e48d9dd42e.tar.bz2 +sha256 264d7fb33bc7cf1e9a387c7220c997f96e64a2659738a419d558e7c518718bd0 qtvirtualkeyboard-7389450a5de5fdd210f1459abcf73621ec0496bd.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 5657d78c30f..b4673f7fd46 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = 817378aa10176fd26eed36542bc657e48d9dd42e +QT5VIRTUALKEYBOARD_VERSION = 7389450a5de5fdd210f1459abcf73621ec0496bd QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index f4a1663add8..3e1aebb5de6 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d45149cce43ad76f0c8ee43f0469728259d2ab341cf7e2c02ddab6163c5f1d13 qtwayland-b8f1882df7215b6e00f66b7a6a08afafe230de29.tar.bz2 +sha256 49fa530747c14e6dbe17f6c683e3292340db8bbaf4f17f7699467d3004b45b5b qtwayland-11e099c6b7fbec0e198bffaf8016676ef430cfba.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 4ce89fc46a9..41f99801fa5 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = b8f1882df7215b6e00f66b7a6a08afafe230de29 +QT5WAYLAND_VERSION = 11e099c6b7fbec0e198bffaf8016676ef430cfba QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 7f2a357dbb6..bf613d0785e 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7d482e5140d789b417c359f557da783ed2cc07e8148133971caeb5b48b418645 qtwebchannel-48a520c11a0ef57f2553746159acf739c7f3863d.tar.bz2 +sha256 fef1e1180d479293b23569190ddfaff5643737f3da065f8954c24b3a1030ea71 qtwebchannel-fca83088ef430f96257d2014e77d08bd350259af.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 8ba81383d1b..fe509045b99 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = 48a520c11a0ef57f2553746159acf739c7f3863d +QT5WEBCHANNEL_VERSION = fca83088ef430f96257d2014e77d08bd350259af QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index e0447c70b12..fcd6d4d3d63 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e7c9534453472311c06605f2892e038e9920bf10ca3a0dad99b46955ea124618 qtwebengine-v5.15.11-lts.tar.bz2 +sha256 f760fbc14fec8fed3485cb757986e459f7b150cfc8484aced1116158f6b8a656 qtwebengine-v5.15.14-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index fa3cc489954..c7fe153f7c0 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2e024a4c0706d58a9c846cc1d036f383906e392f3cd7c3051fc56915b7530eee qtwebsockets-50f3853a83ffc80a978cfa0882bdc2859e8de71e.tar.bz2 +sha256 00c915dc0f909d91c13aae4fb39e83e7c4bb5b8c6ad98de9f4e1e44f699cc605 qtwebsockets-dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index bb96fefe820..565894e0baa 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = 50f3853a83ffc80a978cfa0882bdc2859e8de71e +QT5WEBSOCKETS_VERSION = dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index 00525dbad2a..55aedd54e68 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2427179da946d6df409e334c94ffe3f8589035a5d566caf52db2333cc9bfe47c qtwebview-f078642eb9a440f6aa88f2beaf10f445de1e29bb.tar.bz2 +sha256 7b5bf69f3037f55a8ff7b9e153bfa5a42dcdecb322ce2749ace8f11562a0780d qtwebview-bbb1891595aba23ff3c6d137aa74442f9e54479b.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 01a377c27b4..310bfbba425 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBVIEW_VERSION = f078642eb9a440f6aa88f2beaf10f445de1e29bb +QT5WEBVIEW_VERSION = bbb1891595aba23ff3c6d137aa74442f9e54479b QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 132c28dd963..a84df3f2e21 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7d99fa4d900207c0ae1c7a514e7dc0b607c04e0232d2842a8d84f52534bd16e6 qtx11extras-5fb2e067a38d3583684310130f5d8aad064f512f.tar.bz2 +sha256 85943a927c6e07a2a7b2cdf2b6006b554cd9b52271d8892f6475fe9db67d16f3 qtx11extras-6c3605fcb3b34e55951f597e06c135d97dfa6cd7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index a6fade01353..922730c4d7d 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = 5fb2e067a38d3583684310130f5d8aad064f512f +QT5X11EXTRAS_VERSION = 6c3605fcb3b34e55951f597e06c135d97dfa6cd7 QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 9be7bb78315..9531c02e53b 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7770b333f2c0079cf65aa19dafd9e7d80fe058baf8e924f1c0d6e75c0b6e7374 qtxmlpatterns-5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2.tar.bz2 +sha256 2dcac1941b2510ea6fd85fe700fead9443f737e93cc12bf9b90dc6b71ff8d844 qtxmlpatterns-087f6f35bd027f940818b1696d0aad822e034377.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 2126d3c9152..d346d92f7bd 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 +QT5XMLPATTERNS_VERSION = 087f6f35bd027f940818b1696d0aad822e034377 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES From 0c06715849224e8fa140d685e146cc614f895606 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 2 Jun 2024 15:33:33 -0600 Subject: [PATCH 1610/3013] package/python-bcrypt: bump to version 4.1.3 Migrate from generic setuptools infrastructure to setuptools-rust infrastructure. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-bcrypt/python-bcrypt.hash | 2 +- package/python-bcrypt/python-bcrypt.mk | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/package/python-bcrypt/python-bcrypt.hash b/package/python-bcrypt/python-bcrypt.hash index 8e660a158be..f3e05174296 100644 --- a/package/python-bcrypt/python-bcrypt.hash +++ b/package/python-bcrypt/python-bcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 f0b2c7d5d79a6537e3d291b07d2be70dd122a15ea871854d4ce95b447c6873a5 python-bcrypt-4.0.1-cargo2.tar.gz +sha256 630f29d9eccca3aea0521eaeff7e4aab43611f1bbf4f8afcdf590aeee9fc8187 python-bcrypt-4.1.3-cargo2.tar.gz # Locally computed sha256 checksums sha256 8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90 LICENSE diff --git a/package/python-bcrypt/python-bcrypt.mk b/package/python-bcrypt/python-bcrypt.mk index f3137401d70..3d1aeab2884 100644 --- a/package/python-bcrypt/python-bcrypt.mk +++ b/package/python-bcrypt/python-bcrypt.mk @@ -4,24 +4,13 @@ # ################################################################################ -PYTHON_BCRYPT_VERSION = 4.0.1 +PYTHON_BCRYPT_VERSION = 4.1.3 PYTHON_BCRYPT_SOURCE_PYPI = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz -PYTHON_BCRYPT_SITE_PYPI = https://files.pythonhosted.org/packages/8c/ae/3af7d006aacf513975fd1948a6b4d6f8b4a307f8a244e1a3d3774b297aad +PYTHON_BCRYPT_SITE_PYPI = https://files.pythonhosted.org/packages/ca/e9/0b36987abbcd8c9210c7b86673d88ff0a481b4610630710fb80ba5661356 PYTHON_BCRYPT_SITE = $(PYTHON_BCRYPT_SITE_PYPI)/$(PYTHON_BCRYPT_SOURCE_PYPI)?buildroot-path=filename -PYTHON_BCRYPT_SETUP_TYPE = setuptools +PYTHON_BCRYPT_SETUP_TYPE = setuptools-rust PYTHON_BCRYPT_LICENSE = Apache-2.0 PYTHON_BCRYPT_LICENSE_FILES = LICENSE -PYTHON_BCRYPT_DEPENDENCIES = \ - host-python-setuptools-rust \ - host-rustc -PYTHON_BCRYPT_ENV = \ - $(PKG_CARGO_ENV) \ - PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" -# We need to vendor the Cargo crates at download time -PYTHON_BCRYPT_DOWNLOAD_POST_PROCESS = cargo -PYTHON_BCRYPT_DOWNLOAD_DEPENDENCIES = host-rustc -PYTHON_BCRYPT_DL_ENV = \ - $(PKG_CARGO_ENV) \ - BR_CARGO_MANIFEST_PATH=src/_bcrypt/Cargo.toml +PYTHON_BCRYPT_CARGO_MANIFEST_PATH = src/_bcrypt/Cargo.toml $(eval $(python-package)) From 3ba6f800fdc2435d09aca215ef2e8aefb3165bff Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 2 Jun 2024 01:03:40 +0200 Subject: [PATCH 1611/3013] support/testing: add mosquitto runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../testing/tests/package/test_mosquitto.py | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 support/testing/tests/package/test_mosquitto.py diff --git a/DEVELOPERS b/DEVELOPERS index c7d2129d458..aeae27eb46f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1871,6 +1871,7 @@ F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py F: support/testing/tests/package/test_micropython/ +F: support/testing/tests/package/test_mosquitto.py F: support/testing/tests/package/test_mtools.py F: support/testing/tests/package/test_mtr.py F: support/testing/tests/package/test_ncdu.py diff --git a/support/testing/tests/package/test_mosquitto.py b/support/testing/tests/package/test_mosquitto.py new file mode 100644 index 00000000000..ba10b30b00b --- /dev/null +++ b/support/testing/tests/package/test_mosquitto.py @@ -0,0 +1,38 @@ +import os +import time + +import infra.basetest + + +class TestMosquitto(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MOSQUITTO=y + BR2_PACKAGE_MOSQUITTO_BROKER=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + topic = "br-test-topic" + log = "mqtt.log" + msg = "Hello Buildroot!" + + # We subscribe to a topic and write one message to a log file. + self.assertRunOk(f"mosquitto_sub -t {topic} -C 1 > {log} &") + + time.sleep(1) + + # We publish a message. + self.assertRunOk(f"mosquitto_pub -t {topic} -m '{msg}'") + + # We check the log file contains our message. + out, ret = self.emulator.run(f"cat {log}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) From 4516c6c5d04878874545f32e1ca253505c228ed4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 1 Jun 2024 23:01:04 +0200 Subject: [PATCH 1612/3013] support/testing: add bcc runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_bcc.py | 84 +++++++++++++++++++ .../tests/package/test_bcc/linux-bcc.fragment | 4 + 3 files changed, 90 insertions(+) create mode 100644 support/testing/tests/package/test_bcc.py create mode 100644 support/testing/tests/package/test_bcc/linux-bcc.fragment diff --git a/DEVELOPERS b/DEVELOPERS index aeae27eb46f..b0c5cc02d74 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1807,6 +1807,8 @@ F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_bc.py +F: support/testing/tests/package/test_bcc.py +F: support/testing/tests/package/test_bcc/ F: support/testing/tests/package/test_bitcoin.py F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py diff --git a/support/testing/tests/package/test_bcc.py b/support/testing/tests/package/test_bcc.py new file mode 100644 index 00000000000..51f175a5b49 --- /dev/null +++ b/support/testing/tests/package/test_bcc.py @@ -0,0 +1,84 @@ +import os +import time + +import infra.basetest + + +class TestBcc(infra.basetest.BRTest): + # This test is using a Kernel >= 5.2, so it will use + # CONFIG_IKHEADERS. Those Kernel headers are unpacked from + # "/sys/kernel/kheaders.tar.xz" with a "tar" invocation. The + # Busybox "tar" command invoked by bcc fails to unpack the Kernel + # tar archive. We need the GNU Tar package. The Kernel also needs + # few extra config options, for running execsnoop. + kern_fragment = \ + infra.filepath("tests/package/test_bcc/linux-bcc.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_BCC=y + BR2_PACKAGE_TAR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + log = "/root/execsnoop.log" + test_cmd = "/bin/sleep 1" + + # bcc needs debugs to be mounted. + self.assertRunOk("mount -t debugfs none /sys/kernel/debug/") + + # Generate some exec()s activity in background. We explicitly + # call for "/bin/sleep" rather than just "sleep" to avoid + # using any shell builtin and make sure we will exec() the + # binary. + cmd = f"while true ; do {test_cmd} ; done &" + self.assertRunOk(cmd) + + # Run execsnoop, also in background... + cmd = f"/usr/share/bcc/tools/execsnoop > {log} &" + self.assertRunOk(cmd) + + for attempt in range(3): + # Wait a bit, to let execsnoop to start and log some data. + time.sleep(40 * self.timeout_multiplier) + + # We check that the log file contains some data. + cmd = f"test -s {log}" + _, ret = self.emulator.run(cmd) + if ret == 0: + break + else: + self.fail(f"Timeout while waiting for data in {log}.") + + # Kill our background execsnoop execution. + self.assertRunOk("kill $!") + + # Check we have captured execution occurrences of out test + # command. + cmd = f"grep -Foc '{test_cmd}' {log}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertGreater(int(out[0]), 0) diff --git a/support/testing/tests/package/test_bcc/linux-bcc.fragment b/support/testing/tests/package/test_bcc/linux-bcc.fragment new file mode 100644 index 00000000000..35359b08f6a --- /dev/null +++ b/support/testing/tests/package/test_bcc/linux-bcc.fragment @@ -0,0 +1,4 @@ +CONFIG_FTRACE=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_FUNCTION_TRACER=y +CONFIG_KPROBES=y From 51b4421758e5ccba0f051672ccd28bc3114948d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 7 Jun 2024 09:13:58 +0200 Subject: [PATCH 1613/3013] configs/raspberrypi*: bump kernel version to 17f135b (6.6.28) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now based on 6.6.28 (from 6.1.61). Signed-off-by: Gaël PORTAY Reviewed-by: Brandon Maier Tested-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- board/raspberrypi/patches/linux/linux.hash | 2 +- configs/raspberrypi0_defconfig | 8 ++++---- configs/raspberrypi0w_defconfig | 8 ++++---- configs/raspberrypi2_defconfig | 8 ++++---- configs/raspberrypi3_64_defconfig | 6 +++--- configs/raspberrypi3_defconfig | 8 ++++---- configs/raspberrypi3_qt5we_defconfig | 6 +++--- configs/raspberrypi4_64_defconfig | 6 +++--- configs/raspberrypi4_defconfig | 8 ++++---- configs/raspberrypi5_defconfig | 6 +++--- configs/raspberrypi_defconfig | 8 ++++---- configs/raspberrypicm4io_64_defconfig | 6 +++--- configs/raspberrypicm4io_defconfig | 8 ++++---- configs/raspberrypizero2w_defconfig | 8 ++++---- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/board/raspberrypi/patches/linux/linux.hash b/board/raspberrypi/patches/linux/linux.hash index 2843b7023d7..8d43c251512 100644 --- a/board/raspberrypi/patches/linux/linux.hash +++ b/board/raspberrypi/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4d3a2af178ac6ed8f35b773836c8d216493a850aeb80932b379348e2df0cf5d2 linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz +sha256 dab3052783c68c46a5bc645b1c38d9705da995ab42823566518b62eb1fa1ef97 linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 74a8477cc6a..b2b7351ac1b 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -6,20 +6,20 @@ BR2_ARM_EABIHF=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same # as the A+ model, just in a different form-factor BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 03f6a805e6d..a198596b40e 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -6,17 +6,17 @@ BR2_ARM_EABIHF=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero-w" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 79de3fbf3ee..05870cc6e1f 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -11,17 +11,17 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 5460cd8c62c..ec309b2badc 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -10,12 +10,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index eded94014db..ba2d5b6eed8 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -10,17 +10,17 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 72e1c349f2a..38f41f45a6f 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -11,12 +11,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 8da3ecee122..5c6698fb370 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -10,12 +10,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 2c376313969..c14b77eacdd 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -10,17 +10,17 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig index 73592c4a1a4..3c88ce46cd7 100644 --- a/configs/raspberrypi5_defconfig +++ b/configs/raspberrypi5_defconfig @@ -6,13 +6,13 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index c911ec63e97..03c81ebf39f 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -8,19 +8,19 @@ BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 75077263e4b..e9d57091b54 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -10,12 +10,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 07adb962a4e..537d077b71f 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -10,17 +10,17 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-cm4" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 0b1457f4072..37922909f39 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -6,19 +6,19 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-zero-2-w" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-zero-2-w" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y From 28e6953ba84d39a6074aee439a64ef86b109dcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 7 Jun 2024 09:13:59 +0200 Subject: [PATCH 1614/3013] package/rpi-firmware: bump version to 5476720 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 5476720 match the with kernel 6.6.28. Signed-off-by: Gaël PORTAY Reviewed-by: Brandon Maier Tested-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 33e05a2f4a9..4501db739c7 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dd43e77ca1a8969cdb7f05dd72a57f90862071d5a93bdd6aea8246aba85689cf rpi-firmware-83dafbc92c0e63f76ca2ecdd42462d56489d1c77.tar.gz +sha256 00fe5487376e9d5ed14cbc72a9b7a5bd8d6900c84aee10f6d656f192a26d161c rpi-firmware-5476720d52cf579dc1627715262b30ba1242525e.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 11177aee02c..7ae9ff6c28b 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 83dafbc92c0e63f76ca2ecdd42462d56489d1c77 +RPI_FIRMWARE_VERSION = 5476720d52cf579dc1627715262b30ba1242525e RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From e86fa6bdb4707c56f96677b41be17460e77d2757 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 28 Mar 2024 12:00:58 +0100 Subject: [PATCH 1615/3013] package/nodejs: bump to 20.12.0 Release Notes: https://nodejs.org/en/blog/release/v20.12.0 LICENSE hash changed due to changes in vendored components: * copyright year updates [1][2] * version name update [3] * change from "Unicode, Inc. License - Data Files and Software" to the "Unicode License v3" [4]. This is in the icu vendored dependency which is unused in buildroot. * new build tooling script [5] under BSD style license NodeJS tests are passing: $ ./utils/docker-run ./support/testing/run-tests -o ./outputs/ -k tests.package.test_nodejs 13:40:05 TestNodeJSModuleHostSrc Starting 13:40:06 TestNodeJSModuleHostSrc Building 14:05:52 TestNodeJSModuleHostSrc Building done 14:06:02 TestNodeJSModuleHostSrc Cleaning up .14:06:02 TestNodeJSModuleHostBin Starting 14:06:03 TestNodeJSModuleHostBin Building 14:24:25 TestNodeJSModuleHostBin Building done 14:24:31 TestNodeJSModuleHostBin Cleaning up .14:24:31 TestNodeJSBasic Starting 14:24:32 TestNodeJSBasic Building 14:42:53 TestNodeJSBasic Building done 14:43:02 TestNodeJSBasic Cleaning up . ---------------------------------------------------------------------- Ran 3 tests in 3776.679s OK [1] https://github.com/nodejs/node/commit/347e1dd06a5f927d9fd64ce72d776c56d5101910 [2] https://github.com/nodejs/node/commit/b88170d602791fa62fc45ac80ca9953bc1bdd25b [3] https://github.com/nodejs/node/commit/c8233912e9fd7464898b549d6762130722bf0bf4 [4] https://github.com/nodejs/node/commit/625fd69b76b5a8f59152f803b31941c8986d924b [5] https://github.com/nodejs/node/commit/b5bc597871ca701bab750c46d31ed626decd7f89 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index ddab345e0a6..2cbbf766f5c 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc -sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz -sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz -sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz -sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz -sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz +# From https://nodejs.org/dist/v20.12.0/SHASUMS256.txt.asc +sha256 007ca2699cf6e84290e5bed844ed66ef9d707d23561dfaf117212b7dce216ba7 node-v20.12.0-linux-arm64.tar.xz +sha256 668fb421a24be596c98f00a31049fbf6ada14d221b7382e0f1caa55ab421431a node-v20.12.0-linux-armv7l.tar.xz +sha256 78dc3b7ad993c332684802e35c1f0de2b76193d13394bc89e3bab216828587c7 node-v20.12.0-linux-ppc64le.tar.xz +sha256 0a126adf5b6a5eb11a37bad76a0c626a18f20b6811322e68aae0e3cf9bf580bd node-v20.12.0-linux-x64.tar.xz +sha256 76e5346cebfd581528f699f764f4d1a6e87cb818b696708f235ddcb625a0f78d node-v20.12.0.tar.xz # Locally calculated -sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE +sha256 d3a9fbfe0a1fb78627ee296cd5ca5b498822d4d1c5da3b8e8100c41bd7b791fd LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 858c6a86f5d..9ed51fbe9ba 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.11.1 +NODEJS_COMMON_VERSION = 20.12.0 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From 758fc7e06be7de42b16ffe9933f1630747d00193 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 5 Jul 2024 08:51:21 +0200 Subject: [PATCH 1616/3013] package/pulseview: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, pulseview fails to build with output: Applying 0001-Replace-obsolete-deprecated-Qt-methods.patch using patch: patching file pv/util.cpp Hunk #2 succeeded at 175 (offset 4 lines). Hunk #3 succeeded at 285 (offset 4 lines). patching file pv/util.hpp Hunk #2 succeeded at 139 (offset 1 line). patching file pv/views/trace/decodetrace.cpp Hunk #1 FAILED at 103. 1 out of 1 hunk FAILED -- saving rejects to file pv/views/trace/decodetrace.cpp.rej Applying 0003-Support-glibmm-2.68.patch using patch: patching file CMakeLists.txt Hunk #3 FAILED at 231. Hunk #4 FAILED at 492. 2 out of 4 hunks FAILED -- saving rejects to file CMakeLists.txt.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...place-obsolete-deprecated-Qt-methods.patch | 32 ++++++++++--------- .../pulseview/0003-Support-glibmm-2.68.patch | 22 +++++++------ 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index f36e99fcf4d..69414d24964 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1175,7 +1175,6 @@ package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.pat package/pulseaudio/S50pulseaudio lib_sysv.ConsecutiveEmptyLines lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch lib_patch.Upstream package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch lib_patch.Upstream -package/pulseview/0003-Support-glibmm-2.68.patch lib_patch.Upstream package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch lib_patch.Upstream package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch lib_patch.Upstream package/python-daphne/0001-remove-pytest-runner-requirement.patch lib_patch.Upstream diff --git a/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch b/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch index 047fe2cccdc..24fde677bf9 100644 --- a/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch +++ b/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch @@ -1,4 +1,4 @@ -From caacc9bc622238ca48674ea6f40d07466e4b97a5 Mon Sep 17 00:00:00 2001 +From 01de3217e14b52e44356185729f804460147c85c Mon Sep 17 00:00:00 2001 From: Valentin Ochs Date: Sat, 20 Jun 2020 16:01:27 +0200 Subject: [PATCH] Replace obsolete/deprecated Qt methods @@ -9,6 +9,8 @@ resolved in pv/util.cpp.] Signed-off-by: Thomas Petazzoni [Fabrice: restore original patch in pv/util.cpp for 0.4.2] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- pv/util.cpp | 21 +++++++++++++++++++-- pv/util.hpp | 10 ++++++++++ @@ -18,7 +20,7 @@ Signed-off-by: Fabrice Fontaine 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/pv/util.cpp b/pv/util.cpp -index 49b9467c..2a63038d 100644 +index 9a9a5065a2e1..b0c29f304287 100644 --- a/pv/util.cpp +++ b/pv/util.cpp @@ -137,7 +137,7 @@ QString format_time_si(const Timestamp& v, SIPrefix prefix, @@ -30,7 +32,7 @@ index 49b9467c..2a63038d 100644 ts << qSetRealNumberPrecision(precision) << (v * multiplier); ts << ' ' << prefix << unit; -@@ -171,7 +171,7 @@ QString format_value_si(double v, SIPrefix prefix, unsigned precision, +@@ -175,7 +175,7 @@ QString format_value_si(double v, SIPrefix prefix, unsigned precision, QString s; QTextStream ts(&s); if (sign && (v != 0)) @@ -39,7 +41,7 @@ index 49b9467c..2a63038d 100644 ts.setRealNumberNotation(QTextStream::FixedNotation); ts.setRealNumberPrecision(precision); ts << (v * multiplier) << ' ' << prefix << unit; -@@ -281,5 +281,22 @@ vector split_string(string text, string separator) +@@ -285,5 +285,22 @@ vector split_string(string text, string separator) return result; } @@ -63,7 +65,7 @@ index 49b9467c..2a63038d 100644 } // namespace util } // namespace pv diff --git a/pv/util.hpp b/pv/util.hpp -index dd7be222..ad904f85 100644 +index e1640c4a374d..a6cdfdcad4d9 100644 --- a/pv/util.hpp +++ b/pv/util.hpp @@ -30,6 +30,7 @@ @@ -74,7 +76,7 @@ index dd7be222..ad904f85 100644 using std::string; using std::vector; -@@ -137,6 +138,15 @@ QString format_time_minutes(const Timestamp& t, signed precision = 0, +@@ -138,6 +139,15 @@ QString format_time_minutes(const Timestamp& t, signed precision = 0, vector split_string(string text, string separator); @@ -91,10 +93,10 @@ index dd7be222..ad904f85 100644 } // namespace pv diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp -index 9c7196bf..1ee7ae9f 100644 +index 1cc89feb67ae..0347b3327b27 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp -@@ -103,7 +103,8 @@ DecodeTrace::DecodeTrace(pv::Session &session, +@@ -164,7 +164,8 @@ DecodeTrace::DecodeTrace(pv::Session &session, // Determine shortest string we want to see displayed in full QFontMetrics m(QApplication::font()); @@ -102,13 +104,13 @@ index 9c7196bf..1ee7ae9f 100644 + // e.g. two hex characters + min_useful_label_width_ = util::text_width(m, "XX"); - // For the base color, we want to start at a very different color for - // every decoder stack, so multiply the index with a number that is + default_row_height_ = (ViewItemPaintParams::text_height() * 6) / 4; + annotation_height_ = (ViewItemPaintParams::text_height() * 5) / 4; diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp -index acea8a36..68134966 100644 +index 555794fc42c6..83ffed281b5f 100644 --- a/pv/views/trace/ruler.cpp +++ b/pv/views/trace/ruler.cpp -@@ -218,7 +218,7 @@ void Ruler::paintEvent(QPaintEvent*) +@@ -283,7 +283,7 @@ void Ruler::paintEvent(QPaintEvent*) const int rightedge = width(); const int x_tick = tick.first; if ((x_tick > leftedge) && (x_tick < rightedge)) { @@ -118,10 +120,10 @@ index acea8a36..68134966 100644 const int x_legend = min(max(x_tick, x_left_bound), x_right_bound); p.drawText(x_legend, ValueMargin, 0, text_height, diff --git a/pv/widgets/timestampspinbox.cpp b/pv/widgets/timestampspinbox.cpp -index 21b3d0d7..383aed1f 100644 +index fea8175e8e00..01424a5b7837 100644 --- a/pv/widgets/timestampspinbox.cpp +++ b/pv/widgets/timestampspinbox.cpp -@@ -75,7 +75,7 @@ QSize TimestampSpinBox::minimumSizeHint() const +@@ -76,7 +76,7 @@ QSize TimestampSpinBox::minimumSizeHint() const { const QFontMetrics fm(fontMetrics()); const int l = round(value_).str().size() + precision_ + 10; @@ -131,5 +133,5 @@ index 21b3d0d7..383aed1f 100644 return QSize(w, h); } -- -2.26.2 +2.43.0 diff --git a/package/pulseview/0003-Support-glibmm-2.68.patch b/package/pulseview/0003-Support-glibmm-2.68.patch index 00e4e696d92..558699a684a 100644 --- a/package/pulseview/0003-Support-glibmm-2.68.patch +++ b/package/pulseview/0003-Support-glibmm-2.68.patch @@ -1,4 +1,4 @@ -From a97d5a060a534a3c658578e7f14ab43556db93ca Mon Sep 17 00:00:00 2001 +From cbdd970fa4a805cefcad2e692df204bfceb46e16 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 30 Dec 2021 16:19:46 +0100 Subject: [PATCH] Support glibmm 2.68 @@ -10,14 +10,16 @@ https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS C++17 support is mandatory with glibmm 2.68 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +Upstream: not sent yet +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- CMakeLists.txt | 23 +++++++++++++++++++---- INSTALL | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7791b1b1..58a9cf92 100644 +index c29fa283bcb6..e739d5fccaa7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,14 @@ add_subdirectory(manual) @@ -44,9 +46,9 @@ index 7791b1b1..58a9cf92 100644 pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") -@@ -225,7 +231,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) +@@ -194,7 +200,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) set(PV_TITLE PulseView) - set(PV_VERSION_STRING "0.5.0") + set(PV_VERSION_STRING "0.4.2") -set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) +if(LIBSRGLIBMM24_FOUND) @@ -57,7 +59,7 @@ index 7791b1b1..58a9cf92 100644 include(GetGitRevisionDescription) -@@ -486,7 +496,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) +@@ -445,7 +455,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) add_definitions(-DQT_NO_KEYWORDS) add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) @@ -69,10 +71,10 @@ index 7791b1b1..58a9cf92 100644 + add_definitions(-std=c++17) +endif() add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) - if(WIN32) - add_definitions(-Wa,-mbig-obj -O3) + + if(ENABLE_FLOW) diff --git a/INSTALL b/INSTALL -index da89be8d..8003fcfb 100644 +index d666f0a7f824..ecf984f3c4b4 100644 --- a/INSTALL +++ b/INSTALL @@ -14,7 +14,7 @@ Requirements @@ -85,5 +87,5 @@ index da89be8d..8003fcfb 100644 - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg, Qt5LinguistTools - Qt translation package (optional; needed at runtime, not build time) -- -2.34.1 +2.43.0 From 57d7b12008a7f0998b8259a94621c35083531b84 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 5 Jul 2024 09:35:27 +0200 Subject: [PATCH 1617/3013] package/oatpp: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, oatpp fails to build with output: Applying 0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch using patch: patching file src/oatpp/core/base/Environment.hpp Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file src/oatpp/core/base/Environment.hpp.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...re-base-Environment.hpp-include-cstdarg.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch b/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch index e9b78328375..33fa04a2f2a 100644 --- a/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch +++ b/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch @@ -1,4 +1,4 @@ -From b3e8930ccbaeeb77a4cd8b0fffbe52a208aa9a29 Mon Sep 17 00:00:00 2001 +From 6ac376cec5c9573abf3ee3b82e71bd2b7e410dad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Nov 2023 22:45:56 +0100 Subject: [PATCH] src/oatpp/core/base/Environment.hpp: include cstdarg @@ -16,22 +16,24 @@ Fixes: Signed-off-by: Fabrice Fontaine Upstream: https://github.com/oatpp/oatpp/commit/1d11558e2cbbabc0db02a233bf00d651ce5ea758 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/oatpp/core/base/Environment.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/oatpp/core/base/Environment.hpp b/src/oatpp/core/base/Environment.hpp -index fd77a5c6..05d5c949 100644 +index 984afdf2a7f5..2eb18be3e196 100644 --- a/src/oatpp/core/base/Environment.hpp +++ b/src/oatpp/core/base/Environment.hpp -@@ -29,6 +29,7 @@ - #include "./Compiler.hpp" +@@ -28,6 +28,7 @@ + #include "./Config.hpp" - + +#include #include #include #include --- -2.42.0 +-- +2.43.0 From d64958d92388dc5ecf29f3ddb36cb758d222bef9 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 18 Jun 2024 04:38:48 +0100 Subject: [PATCH 1618/3013] configs/zynqmp_kria_kd240_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_kria_kd240_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer needed. With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now the offset between the base address of the boot.bin and u-boot.itb instead of a raw base address of u-boot.itb. This allows for A/B firmware updates since the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. Thus, Kria SOMs come with the following QSPI address table. Partition A: 0x200000 - boot.bin 0x280000 - u-boot.itb Partition B: 0xF80000 - boot.bin 0x1000000 - u-boot.itb In addition, the kd240 still requires a board specific patch for the usb to sd card bridge device. Without the board specific patch in the ./board/zynqmp/kria/kd240/patches directory, the usb will not come up correctly and u-boot will not be able to find the sd card containing the Linux kernel and file system. Upstream: https://patchwork.ozlabs.org/project/uboot/patch/20240604083854.2033917-1-neal.frager@amd.com/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...arm64-zynqmp-Enable-usb3-for-k24-som.patch | 81 ++++ ...nqmp-Fix-k24-psu_init_gpl.c-clocking.patch | 401 ------------------ ...ynqmp-Add-output-enable-pins-to-SOMs.patch | 79 ---- configs/zynqmp_kria_kd240_defconfig | 20 +- 5 files changed, 93 insertions(+), 489 deletions(-) create mode 100644 board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Enable-usb3-for-k24-som.patch delete mode 100644 board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch delete mode 100644 board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch diff --git a/.checkpackageignore b/.checkpackageignore index 69414d24964..474508bf63d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -294,7 +294,6 @@ configs/uevm5432_defconfig lib_defconfig.ForceCheckHash configs/visionfive_defconfig lib_defconfig.ForceCheckHash configs/wandboard_defconfig lib_defconfig.ForceCheckHash configs/warp7_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_kria_kd240_defconfig lib_defconfig.ForceCheckHash linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch lib_patch.Upstream package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/4th/0001-avoid-regen-during-install.patch lib_patch.Upstream diff --git a/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Enable-usb3-for-k24-som.patch b/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Enable-usb3-for-k24-som.patch new file mode 100644 index 00000000000..0cc10d344e0 --- /dev/null +++ b/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Enable-usb3-for-k24-som.patch @@ -0,0 +1,81 @@ +From 73c99c29508d7adfe11b6a81f13cf00efab5f9de Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Tue, 4 Jun 2024 09:15:23 +0100 +Subject: [PATCH] arm64: zynqmp: Enable usb3 for k24 som + +This patch corrects the mio and pll configuration registers for using usb3 +on the kd240 starter kit. Without this patch, the usb3 to sd card bridge does +not initialize correctly and u-boot is unable to find the OS located on the +kd240 starter kit sd card. + +In addition, this patch correctly configures mio76 and mio77 as gpio pins +which are used as reset gpio pins on the kd240 starter kit. + +Signed-off-by: Neal Frager +Upstream: https://patchwork.ozlabs.org/project/uboot/patch/20240604083854.2033917-1-neal.frager@amd.com/ +--- + .../zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c | 23 ++++++++----------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +diff --git a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +index 166e61431b..274203ffaa 100644 +--- a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c ++++ b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +@@ -528,8 +528,8 @@ static unsigned long psu_mio_init_data(void) + psu_mask_write(0xFF180124, 0x000000FEU, 0x00000002U); + psu_mask_write(0xFF180128, 0x000000FEU, 0x00000002U); + psu_mask_write(0xFF18012C, 0x000000FEU, 0x00000002U); +- psu_mask_write(0xFF180130, 0x000000FEU, 0x000000C0U); +- psu_mask_write(0xFF180134, 0x000000FEU, 0x000000C0U); ++ psu_mask_write(0xFF180130, 0x000000FEU, 0x00000000U); ++ psu_mask_write(0xFF180134, 0x000000FEU, 0x00000000U); + psu_mask_write(0xFF180204, 0xFFFFFFFFU, 0x50000000U); + psu_mask_write(0xFF180208, 0xFFFFFFFFU, 0x00B02020U); + psu_mask_write(0xFF18020C, 0x00003FFFU, 0x00000FC0U); +@@ -569,21 +569,16 @@ static unsigned long psu_peripherals_init_data(void) + psu_mask_write(0xFD1A0100, 0x0001807CU, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x001A0000U, 0x00000000U); + psu_mask_write(0xFF5E023C, 0x0093C018U, 0x00000000U); +- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000000U); ++ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000001U, 0x00000000U); + psu_mask_write(0xFF180390, 0x00000004U, 0x00000004U); + psu_mask_write(0xFF5E023C, 0x00000400U, 0x00000000U); +- psu_mask_write(0xFF5E0238, 0x00000040U, 0x00000000U); +- psu_mask_write(0xFF180310, 0x00008000U, 0x00000000U); +- psu_mask_write(0xFF180320, 0x33840000U, 0x02840000U); +- psu_mask_write(0xFF18031C, 0x7FFE0000U, 0x64500000U); +- psu_mask_write(0xFF180358, 0x00000008U, 0x00000008U); +- psu_mask_write(0xFF180324, 0x03C00000U, 0x00000000U); ++ psu_mask_write(0xFF5E0238, 0x00000080U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000400U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000010U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U); +- psu_mask_write(0xFF5E0238, 0x00000004U, 0x00000000U); ++ psu_mask_write(0xFF5E0238, 0x00000006U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U); + psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU); + psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U); +@@ -591,13 +586,15 @@ static unsigned long psu_peripherals_init_data(void) + psu_mask_write(0xFFA60040, 0x80000000U, 0x80000000U); + psu_mask_write(0xFF260020, 0xFFFFFFFFU, 0x05F5DD18U); + psu_mask_write(0xFF260000, 0x00000001U, 0x00000001U); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); ++ psu_mask_write(0xFF0A0284, 0x03FFFFFFU, 0x01000000U); ++ psu_mask_write(0xFF0A0288, 0x03FFFFFFU, 0x01000000U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); + + mask_delay(1); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000002U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0000U); + + mask_delay(5); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); + + return 1; + } +-- +2.25.1 + diff --git a/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch b/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch deleted file mode 100644 index f088b90f526..00000000000 --- a/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch +++ /dev/null @@ -1,401 +0,0 @@ -From f8cba630d3fccd901164dec7bd9b60442bab8995 Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Wed, 13 Dec 2023 12:53:29 +0000 -Subject: [PATCH] arm64: zynqmp: Fix k24 psu_init_gpl.c clocking - -This patch corrects the k24 som clocking configuration such that the serdes -clocks are correctly enabled and the usb0 is configured to use the psgtr -refclk2 for usb3 mode. - -This patch also corrects the configuration of mio pins mio76 and mio77 -which should be configured as gpio pins. - -Signed-off-by: Neal Frager -Upstream: https://patchwork.ozlabs.org/project/uboot/patch/20231213134007.2818069-1-neal.frager@amd.com/ ---- - .../zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c | 266 +++++++++++++----- - 1 file changed, 200 insertions(+), 66 deletions(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c -index 45102302dc..4c904c6c81 100644 ---- a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c -@@ -72,6 +72,18 @@ static void dpll_prog(int div2, int ddr_pll_fbdiv, int d_lock_dly, - Xil_Out32(((0xFD1A0000U) + 0x0000002C), pll_ctrl_regval); - } - -+static int serdes_illcalib(u32 lane3_protocol, u32 lane3_rate, -+ u32 lane2_protocol, u32 lane2_rate, -+ u32 lane1_protocol, u32 lane1_rate, -+ u32 lane0_protocol, u32 lane0_rate) -+{ -+ Xil_Out32(0xFD409914, 0xF3); -+ Xil_Out32(0xFD409940, 0xF3); -+ Xil_Out32(0xFD409990, 0x20); -+ Xil_Out32(0xFD409924, 0x37); -+ return 1; -+} -+ - static unsigned long psu_pll_init_data(void) - { - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4B0C62U); -@@ -490,20 +502,20 @@ static unsigned long psu_mio_init_data(void) - psu_mask_write(0xFF18008C, 0x000000FEU, 0x00000000U); - psu_mask_write(0xFF180090, 0x000000FEU, 0x000000C0U); - psu_mask_write(0xFF180094, 0x000000FEU, 0x000000C0U); -- psu_mask_write(0xFF180098, 0x000000FEU, 0x00000000U); -- psu_mask_write(0xFF18009C, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800A0, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800A4, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800A8, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800AC, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800B0, 0x000000FEU, 0x00000000U); -- psu_mask_write(0xFF1800B4, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800B8, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800BC, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800C0, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800C4, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800C8, 0x000000FEU, 0x00000010U); -- psu_mask_write(0xFF1800CC, 0x000000FEU, 0x00000010U); -+ psu_mask_write(0xFF180098, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF18009C, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800A0, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800A4, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800A8, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800AC, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800B0, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800B4, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800B8, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800BC, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800C0, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800C4, 0x000000FEU, 0x00000002U); -+ psu_mask_write(0xFF1800C8, 0x000000FEU, 0x00000080U); -+ psu_mask_write(0xFF1800CC, 0x000000FEU, 0x00000080U); - psu_mask_write(0xFF1800D0, 0x000000FEU, 0x00000004U); - psu_mask_write(0xFF1800D4, 0x000000FEU, 0x00000004U); - psu_mask_write(0xFF1800D8, 0x000000FEU, 0x00000004U); -@@ -528,8 +540,8 @@ static unsigned long psu_mio_init_data(void) - psu_mask_write(0xFF180124, 0x000000FEU, 0x00000002U); - psu_mask_write(0xFF180128, 0x000000FEU, 0x00000002U); - psu_mask_write(0xFF18012C, 0x000000FEU, 0x00000002U); -- psu_mask_write(0xFF180130, 0x000000FEU, 0x000000C0U); -- psu_mask_write(0xFF180134, 0x000000FEU, 0x000000C0U); -+ psu_mask_write(0xFF180130, 0x000000FEU, 0x00000000U); -+ psu_mask_write(0xFF180134, 0x000000FEU, 0x00000000U); - psu_mask_write(0xFF180204, 0xFFFFFFFFU, 0x50000000U); - psu_mask_write(0xFF180208, 0xFFFFFFFFU, 0x00B02020U); - psu_mask_write(0xFF18020C, 0x00003FFFU, 0x00000FC0U); -@@ -539,18 +551,18 @@ static unsigned long psu_mio_init_data(void) - psu_mask_write(0xFF180144, 0x03FFFFFFU, 0x03FFFFFFU); - psu_mask_write(0xFF180148, 0x03FFFFFFU, 0x03FFFFFFU); - psu_mask_write(0xFF18014C, 0x03FFFFFFU, 0x03FFFFFFU); -- psu_mask_write(0xFF180154, 0x03FFFFFFU, 0x00080814U); -+ psu_mask_write(0xFF180154, 0x03FFFFFFU, 0x00FC0814U); - psu_mask_write(0xFF180158, 0x03FFFFFFU, 0x03FFFFFFU); - psu_mask_write(0xFF18015C, 0x03FFFFFFU, 0x00000000U); -- psu_mask_write(0xFF180160, 0x03FFFFFFU, 0x03FFFFFFU); -- psu_mask_write(0xFF180164, 0x03FFFFFFU, 0x03FFFFFFU); -- psu_mask_write(0xFF180168, 0x03FFFFFFU, 0x03F7F7EBU); -- psu_mask_write(0xFF180170, 0x03FFFFFFU, 0x00FC000BU); -+ psu_mask_write(0xFF180160, 0x0387FFFFU, 0x0387FFFFU); -+ psu_mask_write(0xFF180164, 0x03FFFFFFU, 0x03FFF87FU); -+ psu_mask_write(0xFF180168, 0x03FFFFFFU, 0x0303F7EBU); -+ psu_mask_write(0xFF180170, 0x03FFFFFFU, 0x0004400BU); - psu_mask_write(0xFF180174, 0x03FFFFFFU, 0x03FFFFFFU); - psu_mask_write(0xFF180178, 0x03FFFFFFU, 0x00000000U); -- psu_mask_write(0xFF18017C, 0x0357FFFFU, 0x0357FFFFU); -- psu_mask_write(0xFF180180, 0x03FFFFFFU, 0x0357FFFFU); -- psu_mask_write(0xFF180184, 0x03FFFFFFU, 0x0303FFF4U); -+ psu_mask_write(0xFF18017C, 0x03FFFFFFU, 0x03FFFFFFU); -+ psu_mask_write(0xFF180180, 0x03FFFFFFU, 0x03FFFFFFU); -+ psu_mask_write(0xFF180184, 0x03FFFFFFU, 0x03FBBFF4U); - psu_mask_write(0xFF180200, 0x0000000FU, 0x00000000U); - - return 1; -@@ -569,21 +581,16 @@ static unsigned long psu_peripherals_init_data(void) - psu_mask_write(0xFD1A0100, 0x0001807CU, 0x00000000U); - psu_mask_write(0xFF5E0238, 0x001A0000U, 0x00000000U); - psu_mask_write(0xFF5E023C, 0x0093C018U, 0x00000000U); -- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000000U); -+ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000000U); - psu_mask_write(0xFF5E0238, 0x00000001U, 0x00000000U); - psu_mask_write(0xFF180390, 0x00000004U, 0x00000004U); - psu_mask_write(0xFF5E023C, 0x00000400U, 0x00000000U); -- psu_mask_write(0xFF5E0238, 0x00000040U, 0x00000000U); -- psu_mask_write(0xFF180310, 0x00008000U, 0x00000000U); -- psu_mask_write(0xFF180320, 0x33840000U, 0x02840000U); -- psu_mask_write(0xFF18031C, 0x7FFE0000U, 0x64500000U); -- psu_mask_write(0xFF180358, 0x00000008U, 0x00000008U); -- psu_mask_write(0xFF180324, 0x03C00000U, 0x00000000U); -+ psu_mask_write(0xFF5E0238, 0x00000080U, 0x00000000U); - psu_mask_write(0xFF5E0238, 0x00000400U, 0x00000000U); - psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U); - psu_mask_write(0xFF5E0238, 0x00000010U, 0x00000000U); - psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U); -- psu_mask_write(0xFF5E0238, 0x00000004U, 0x00000000U); -+ psu_mask_write(0xFF5E0238, 0x00000006U, 0x00000000U); - psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U); - psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU); - psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U); -@@ -591,40 +598,26 @@ static unsigned long psu_peripherals_init_data(void) - psu_mask_write(0xFFA60040, 0x80000000U, 0x80000000U); - psu_mask_write(0xFF260020, 0xFFFFFFFFU, 0x05F5DD18U); - psu_mask_write(0xFF260000, 0x00000001U, 0x00000001U); -- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); -+ psu_mask_write(0xFF0A0284, 0x03FFFFFFU, 0x01000000U); -+ psu_mask_write(0xFF0A0288, 0x03FFFFFFU, 0x01000000U); -+ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); - - mask_delay(1); -- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000002U); -+ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0000U); - - mask_delay(5); -- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); -+ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); - - return 1; - } - - static unsigned long psu_serdes_init_data(void) - { -- psu_mask_write(0xFD410000, 0x0000001FU, 0x00000009U); -- psu_mask_write(0xFD410004, 0x0000001FU, 0x00000009U); - psu_mask_write(0xFD410008, 0x0000001FU, 0x00000008U); -- psu_mask_write(0xFD402860, 0x00000080U, 0x00000080U); -- psu_mask_write(0xFD402864, 0x00000081U, 0x00000001U); -- psu_mask_write(0xFD402868, 0x00000082U, 0x00000002U); -+ psu_mask_write(0xFD402868, 0x00000080U, 0x00000080U); - psu_mask_write(0xFD40A094, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD40A368, 0x000000FFU, 0x00000038U); - psu_mask_write(0xFD40A36C, 0x00000007U, 0x00000003U); -- psu_mask_write(0xFD402368, 0x000000FFU, 0x00000058U); -- psu_mask_write(0xFD40236C, 0x00000007U, 0x00000003U); -- psu_mask_write(0xFD406368, 0x000000FFU, 0x00000058U); -- psu_mask_write(0xFD40636C, 0x00000007U, 0x00000003U); -- psu_mask_write(0xFD402370, 0x000000FFU, 0x0000007CU); -- psu_mask_write(0xFD402374, 0x000000FFU, 0x00000033U); -- psu_mask_write(0xFD402378, 0x000000FFU, 0x00000002U); -- psu_mask_write(0xFD40237C, 0x00000033U, 0x00000030U); -- psu_mask_write(0xFD406370, 0x000000FFU, 0x0000007CU); -- psu_mask_write(0xFD406374, 0x000000FFU, 0x00000033U); -- psu_mask_write(0xFD406378, 0x000000FFU, 0x00000002U); -- psu_mask_write(0xFD40637C, 0x00000033U, 0x00000030U); - psu_mask_write(0xFD40A370, 0x000000FFU, 0x000000F4U); - psu_mask_write(0xFD40A374, 0x000000FFU, 0x00000031U); - psu_mask_write(0xFD40A378, 0x000000FFU, 0x00000002U); -@@ -678,18 +671,8 @@ static unsigned long psu_serdes_init_data(void) - psu_mask_write(0xFD409978, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD40D978, 0x00000010U, 0x00000010U); - -- serdes_illcalib(0, 0, 3, 0, 4, 0, 4, 0); -- psu_mask_write(0xFD410010, 0x00000077U, 0x00000044U); -+ serdes_illcalib(0, 0, 3, 0, 0, 0, 0, 0); - psu_mask_write(0xFD410014, 0x00000007U, 0x00000003U); -- psu_mask_write(0xFD400CB4, 0x00000037U, 0x00000037U); -- psu_mask_write(0xFD404CB4, 0x00000037U, 0x00000037U); -- psu_mask_write(0xFD4001D8, 0x00000001U, 0x00000001U); -- psu_mask_write(0xFD4041D8, 0x00000001U, 0x00000001U); -- psu_mask_write(0xFD404CC0, 0x0000001FU, 0x00000000U); -- psu_mask_write(0xFD400CC0, 0x0000001FU, 0x00000000U); -- psu_mask_write(0xFD404048, 0x000000FFU, 0x00000000U); -- psu_mask_write(0xFD400048, 0x000000FFU, 0x00000000U); -- - return 1; - } - -@@ -699,7 +682,7 @@ static unsigned long psu_resetout_init_data(void) - psu_mask_write(0xFF9D0080, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF9D007C, 0x00000001U, 0x00000000U); - psu_mask_write(0xFF5E023C, 0x00000140U, 0x00000000U); -- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000000U); -+ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000000U); - psu_mask_write(0xFD1A0100, 0x00010000U, 0x00000000U); - psu_mask_write(0xFD4A0200, 0x00000002U, 0x00000000U); - psu_mask_write(0xFD4A0238, 0x0000000FU, 0x00000000U); -@@ -708,7 +691,6 @@ static unsigned long psu_resetout_init_data(void) - psu_mask_write(0xFE20C11C, 0x00000600U, 0x00000600U); - psu_mask_write(0xFE20C12C, 0x00004000U, 0x00004000U); - psu_mask_write(0xFD480064, 0x00000200U, 0x00000200U); -- mask_poll(0xFD4063E4, 0x00000010U); - mask_poll(0xFD40A3E4, 0x00000010U); - - return 1; -@@ -717,7 +699,7 @@ static unsigned long psu_resetout_init_data(void) - static unsigned long psu_resetin_init_data(void) - { - psu_mask_write(0xFF5E023C, 0x00000540U, 0x00000540U); -- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000008U); -+ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000002U); - psu_mask_write(0xFD4A0238, 0x0000000FU, 0x0000000AU); - psu_mask_write(0xFD4A0200, 0x00000002U, 0x00000002U); - psu_mask_write(0xFD1A0100, 0x00010000U, 0x00010000U); -@@ -1034,6 +1016,157 @@ static unsigned long psu_ddr_phybringup_data(void) - return 1; - } - -+static int serdes_enb_coarse_saturation(void) -+{ -+ Xil_Out32(0xFD402094, 0x00000010); -+ Xil_Out32(0xFD406094, 0x00000010); -+ Xil_Out32(0xFD40A094, 0x00000010); -+ Xil_Out32(0xFD40E094, 0x00000010); -+ return 1; -+} -+ -+static int serdes_fixcal_code(void) -+{ -+ int maskstatus = 1; -+ unsigned int rdata = 0; -+ unsigned int match_pmos_code[23]; -+ unsigned int match_nmos_code[23]; -+ unsigned int match_ical_code[7]; -+ unsigned int match_rcal_code[7]; -+ unsigned int p_code = 0; -+ unsigned int n_code = 0; -+ unsigned int i_code = 0; -+ unsigned int r_code = 0; -+ unsigned int repeat_count = 0; -+ unsigned int L3_TM_CALIB_DIG20 = 0; -+ unsigned int L3_TM_CALIB_DIG19 = 0; -+ unsigned int L3_TM_CALIB_DIG18 = 0; -+ unsigned int L3_TM_CALIB_DIG16 = 0; -+ unsigned int L3_TM_CALIB_DIG15 = 0; -+ unsigned int L3_TM_CALIB_DIG14 = 0; -+ int i = 0; -+ -+ rdata = Xil_In32(0xFD40289C); -+ rdata = rdata & ~0x03; -+ rdata = rdata | 0x1; -+ Xil_Out32(0xFD40289C, rdata); -+ int count = 0; -+ do { -+ if (count == 1100000) -+ break; -+ rdata = Xil_In32(0xFD402B1C); -+ count++; -+ } while ((rdata & 0x0000000E) != 0x0000000E); -+ -+ for (i = 0; i < 23; i++) { -+ match_pmos_code[i] = 0; -+ match_nmos_code[i] = 0; -+ } -+ for (i = 0; i < 7; i++) { -+ match_ical_code[i] = 0; -+ match_rcal_code[i] = 0; -+ } -+ -+ do { -+ Xil_Out32(0xFD410010, 0x00000000); -+ Xil_Out32(0xFD410014, 0x00000000); -+ -+ Xil_Out32(0xFD410010, 0x00000001); -+ Xil_Out32(0xFD410014, 0x00000000); -+ -+ maskstatus = mask_poll(0xFD40EF14, 0x2); -+ if (maskstatus == 0) { -+ xil_printf("#SERDES initialization timed out\n\r"); -+ return maskstatus; -+ } -+ -+ p_code = mask_read(0xFD40EF18, 0xFFFFFFFF); -+ n_code = mask_read(0xFD40EF1C, 0xFFFFFFFF); -+ ; -+ i_code = mask_read(0xFD40EF24, 0xFFFFFFFF); -+ r_code = mask_read(0xFD40EF28, 0xFFFFFFFF); -+ ; -+ -+ if (p_code >= 0x26 && p_code <= 0x3C) -+ match_pmos_code[p_code - 0x26] += 1; -+ -+ if (n_code >= 0x26 && n_code <= 0x3C) -+ match_nmos_code[n_code - 0x26] += 1; -+ -+ if (i_code >= 0xC && i_code <= 0x12) -+ match_ical_code[i_code - 0xC] += 1; -+ -+ if (r_code >= 0x6 && r_code <= 0xC) -+ match_rcal_code[r_code - 0x6] += 1; -+ -+ } while (repeat_count++ < 10); -+ -+ for (i = 0; i < 23; i++) { -+ if (match_pmos_code[i] >= match_pmos_code[0]) { -+ match_pmos_code[0] = match_pmos_code[i]; -+ p_code = 0x26 + i; -+ } -+ if (match_nmos_code[i] >= match_nmos_code[0]) { -+ match_nmos_code[0] = match_nmos_code[i]; -+ n_code = 0x26 + i; -+ } -+ } -+ -+ for (i = 0; i < 7; i++) { -+ if (match_ical_code[i] >= match_ical_code[0]) { -+ match_ical_code[0] = match_ical_code[i]; -+ i_code = 0xC + i; -+ } -+ if (match_rcal_code[i] >= match_rcal_code[0]) { -+ match_rcal_code[0] = match_rcal_code[i]; -+ r_code = 0x6 + i; -+ } -+ } -+ -+ L3_TM_CALIB_DIG20 = mask_read(0xFD40EC50, 0xFFFFFFF0); -+ L3_TM_CALIB_DIG20 = L3_TM_CALIB_DIG20 | 0x8 | ((p_code >> 2) & 0x7); -+ -+ L3_TM_CALIB_DIG19 = mask_read(0xFD40EC4C, 0xFFFFFF18); -+ L3_TM_CALIB_DIG19 = L3_TM_CALIB_DIG19 | ((p_code & 0x3) << 6) -+ | 0x20 | 0x4 | ((n_code >> 3) & 0x3); -+ -+ L3_TM_CALIB_DIG18 = mask_read(0xFD40EC48, 0xFFFFFF0F); -+ L3_TM_CALIB_DIG18 = L3_TM_CALIB_DIG18 | ((n_code & 0x7) << 5) | 0x10; -+ -+ L3_TM_CALIB_DIG16 = mask_read(0xFD40EC40, 0xFFFFFFF8); -+ L3_TM_CALIB_DIG16 = L3_TM_CALIB_DIG16 | ((r_code >> 1) & 0x7); -+ -+ L3_TM_CALIB_DIG15 = mask_read(0xFD40EC3C, 0xFFFFFF30); -+ L3_TM_CALIB_DIG15 = L3_TM_CALIB_DIG15 | ((r_code & 0x1) << 7) -+ | 0x40 | 0x8 | ((i_code >> 1) & 0x7); -+ -+ L3_TM_CALIB_DIG14 = mask_read(0xFD40EC38, 0xFFFFFF3F); -+ L3_TM_CALIB_DIG14 = L3_TM_CALIB_DIG14 | ((i_code & 0x1) << 7) | 0x40; -+ -+ Xil_Out32(0xFD40EC50, L3_TM_CALIB_DIG20); -+ Xil_Out32(0xFD40EC4C, L3_TM_CALIB_DIG19); -+ Xil_Out32(0xFD40EC48, L3_TM_CALIB_DIG18); -+ Xil_Out32(0xFD40EC40, L3_TM_CALIB_DIG16); -+ Xil_Out32(0xFD40EC3C, L3_TM_CALIB_DIG15); -+ Xil_Out32(0xFD40EC38, L3_TM_CALIB_DIG14); -+ return maskstatus; -+} -+ -+static int init_serdes(void) -+{ -+ int status = 1; -+ -+ status &= psu_resetin_init_data(); -+ -+ status &= serdes_fixcal_code(); -+ status &= serdes_enb_coarse_saturation(); -+ -+ status &= psu_serdes_init_data(); -+ status &= psu_resetout_init_data(); -+ -+ return status; -+} -+ - static void init_peripheral(void) - { - psu_mask_write(0xFD5F0018, 0x8000001FU, 0x8000001FU); -@@ -1050,6 +1183,7 @@ int psu_init(void) - status &= psu_ddr_init_data(); - status &= psu_ddr_phybringup_data(); - status &= psu_peripherals_init_data(); -+ status &= init_serdes(); - init_peripheral(); - - status &= psu_afi_config(); --- -2.25.1 - diff --git a/board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch b/board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch deleted file mode 100644 index 5566dae8916..00000000000 --- a/board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch +++ /dev/null @@ -1,79 +0,0 @@ -From bf35bdac2adfa7c65c2992d8dedcc24585561732 Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Wed, 13 Dec 2023 13:11:42 +0000 -Subject: [PATCH] arm64: zynqmp: Add output-enable pins to SOMs - -Now that the zynqmp pinctrl driver supports the tri-state registers, make -sure that the pins requiring output-enable are configured appropriately for -SOMs. - -Without it, all tristate setting for MIOs, which are not related to SOM -itself, are using default configuration which is not correct setting. -It means SDs, USBs, ethernet, etc. are not working properly. - -In past it was fixed through calling tristate configuration via bootcmd: -usb_init=mw 0xFF180208 2020 -kv260_gem3=mw 0xFF18020C 0xFC0 && gpio toggle gpio@ff0a000038 && \ - gpio toggle gpio@ff0a000038 - -Signed-off-by: Neal Frager -Upstream: https://patchwork.ozlabs.org/project/uboot/patch/20231213134052.2818879-1-neal.frager@amd.com/ ---- - arch/arm/dts/zynqmp-sck-kd-g-revA.dts | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/arm/dts/zynqmp-sck-kd-g-revA.dts b/arch/arm/dts/zynqmp-sck-kd-g-revA.dts -index 56f3128528..12865392a3 100644 ---- a/arch/arm/dts/zynqmp-sck-kd-g-revA.dts -+++ b/arch/arm/dts/zynqmp-sck-kd-g-revA.dts -@@ -175,6 +175,7 @@ - conf-tx { - pins = "MIO36"; - bias-disable; -+ output-enable; - }; - - mux { -@@ -226,6 +227,7 @@ - conf-bootstrap { - pins = "MIO44", "MIO49"; - bias-disable; -+ output-enable; - low-power-disable; - }; - -@@ -233,6 +235,7 @@ - pins = "MIO38", "MIO39", "MIO40", - "MIO41", "MIO42", "MIO43"; - bias-disable; -+ output-enable; - low-power-enable; - }; - -@@ -241,6 +244,7 @@ - slew-rate = ; - power-source = ; - bias-disable; -+ output-enable; - }; - - mux-mdio { -@@ -271,6 +275,7 @@ - pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", - "MIO60", "MIO61", "MIO62", "MIO63"; - bias-disable; -+ output-enable; - drive-strength = <4>; - slew-rate = ; - }; -@@ -298,6 +303,7 @@ - pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71", - "MIO72", "MIO73", "MIO74", "MIO75"; - bias-disable; -+ output-enable; - drive-strength = <4>; - slew-rate = ; - }; --- -2.25.1 - diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index 78302a48c0b..dff49b9837b 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kd240/kd240.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k24-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -32,11 +31,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kd240-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kd240/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="kd240" +BR2_TARGET_XILINX_PREBUILT_KRIA=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches board/zynqmp/kria/kd240/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/kd240/patches board/xilinx/patches" From 829f7d9e8462fbfff9afa3ad5d90c7d383a82bb8 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 18 Jun 2024 04:38:49 +0100 Subject: [PATCH 1619/3013] board/zynqmp: cleanup Now that all zynqmp defconfigs have been bumped to xilinx-v2024.1, this patch cleans up the board/zynqmp dir by removing files that are no longer necessary. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- board/zynqmp/kria/uboot.fragment | 11 ----------- ...-build-add-support-for-new-binutils-versions.patch | 1 - .../0002-build-tools-avoid-unnecessary-link.patch | 1 - 3 files changed, 13 deletions(-) delete mode 100644 board/zynqmp/kria/uboot.fragment delete mode 120000 board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch delete mode 120000 board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch diff --git a/board/zynqmp/kria/uboot.fragment b/board/zynqmp/kria/uboot.fragment deleted file mode 100644 index d8efc230a07..00000000000 --- a/board/zynqmp/kria/uboot.fragment +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 -CONFIG_MULTI_DTB_FIT=y -CONFIG_DTB_RESELECT=y -CONFIG_DMA=y -CONFIG_XILINX_DPDMA=y -CONFIG_PHY=y -CONFIG_PHY_XILINX_ZYNQMP=y -CONFIG_PINCTRL=y -CONFIG_PINCONF=y -CONFIG_VIDEO_ZYNQMP_DPSUB=y -CONFIG_SF_DEFAULT_SPEED=40000000 diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch deleted file mode 120000 index 8ad996914b4..00000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch \ No newline at end of file diff --git a/board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch b/board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch deleted file mode 120000 index fecdee54493..00000000000 --- a/board/zynqmp/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch \ No newline at end of file From a72b3e2eee788ca4b8544ab4f6c0db41065823c6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Jul 2024 10:56:16 -0600 Subject: [PATCH 1620/3013] package/prelink-cross: bump to version 440c0059a21f06b5577499a80b55482cb99d6d1c Drop no longer relevant patch. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...c-Fix-TLS-offsets-computation-for-s3.patch | 43 ------------------- package/prelink-cross/prelink-cross.hash | 2 +- package/prelink-cross/prelink-cross.mk | 2 +- 4 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch diff --git a/.checkpackageignore b/.checkpackageignore index 474508bf63d..f5a9af99450 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1154,7 +1154,6 @@ package/pptp-linux/0001-susv3-legacy.patch lib_patch.Upstream package/pptp-linux/0002-fix-parallel-build.patch lib_patch.Upstream package/prboom/0001-libpng-1.4.patch lib_patch.Upstream package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch lib_patch.Upstream -package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch lib_patch.Upstream package/procps-ng/0001-configure-Add--disable-w.patch lib_patch.Upstream package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch lib_patch.Upstream package/procps-ng/0003-fix-pifd_open-check.patch lib_patch.Upstream diff --git a/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch b/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch deleted file mode 100644 index cea1357d1db..00000000000 --- a/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4064f77d2f550762cbf220fec7c26a8ce4219ea4 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov -Date: Sun, 8 Aug 2021 11:19:52 +0200 -Subject: [PATCH] src/rtld/dl-tls.c: Fix TLS offsets computation for s390 arch - -rtld_determine_tlsoffsets() didn't handle s390 arch properly by falling -back to the default case. If TLS_TCB_AT_TP is 1, then set offset to -1. - -From glibc's sysdeps/s390/nptl/tls.h: -------------------------------------- -/* The TCB can have any size and the memory following the address the - thread pointer points to is unspecified. Allocate the TCB there. */ -define TLS_TCB_AT_TP 1 -define TLS_DTV_AT_TP 0 - -This lead to the following error: ---------------------------------- -prelink-rtld: error while loading shared libraries: /lib64/libc.so.6: cannot handle TLS data - -Signed-off-by: Alexander Egorenkov ---- - src/rtld/dl-tls.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/rtld/dl-tls.c b/src/rtld/dl-tls.c -index 280cee45f950..29422dcfd25e 100644 ---- a/src/rtld/dl-tls.c -+++ b/src/rtld/dl-tls.c -@@ -143,6 +143,11 @@ rtld_determine_tlsoffsets (int e_machine, struct r_scope_elem *search_list) - tls_tcb_size = 0; - break; - -+ case EM_S390: -+ tls_tcb_at_tp = 1; -+ tls_tcb_size = -1; -+ break; -+ - default: - /* Hope there's no TLS! */ - for (i = 0; i < search_list->r_nlist; i++) --- -2.31.1 - diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash index 6776d407b8d..4aa3a86c455 100644 --- a/package/prelink-cross/prelink-cross.hash +++ b/package/prelink-cross/prelink-cross.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 555fd65c1b907f9b78d6d41ec04cb6e242d2ecb0667867e39cdd517b3f182dd3 prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2-git4.tar.gz +sha256 ce0d58b7c60a441fd61c52329e2c767f7888056c491f55627a5304b13fda743f prelink-cross-440c0059a21f06b5577499a80b55482cb99d6d1c-git4.tar.gz sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk index 2312ee53e69..c32ea74afd8 100644 --- a/package/prelink-cross/prelink-cross.mk +++ b/package/prelink-cross/prelink-cross.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2 +PRELINK_CROSS_VERSION = 440c0059a21f06b5577499a80b55482cb99d6d1c PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross PRELINK_CROSS_SITE_METHOD = git PRELINK_CROSS_LICENSE = GPL-2.0+ From 581b4ddd54a4819d5165c0ec3b3ab324927dda92 Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Sun, 19 May 2024 07:50:03 +0300 Subject: [PATCH 1621/3013] package/uclibc-ng-test: bump to the latest git version Upstream contains new tests and refactoring of the existing functionality. Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/uclibc-ng-test/uclibc-ng-test.hash | 2 +- package/uclibc-ng-test/uclibc-ng-test.mk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index b0c5cc02d74..ae3a6757313 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -853,6 +853,7 @@ F: package/wireless-regdb/ N: Dmitry Chestnykh F: board/qemu/sparc-ss10/ F: configs/qemu_sparc_ss10_defconfig +F: package/uclibc-ng-test/ N: Dominik Faessler F: package/logsurfer/ diff --git a/package/uclibc-ng-test/uclibc-ng-test.hash b/package/uclibc-ng-test/uclibc-ng-test.hash index dc0499001e6..38621062be8 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.hash +++ b/package/uclibc-ng-test/uclibc-ng-test.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f5badc6621eb9dbc9030121bfa6d4d1ccf680a346cd15c6dca05a6e03010d96 uclibc-ng-test-0f303c63fab7f4038515ced6f2659242cf60ac19-git4.tar.gz +sha256 fae9be86b0eb050e139047d934e7e02599d074d481523dead65ce164c8453500 uclibc-ng-test-132c6134d69146bcafbdda68ae3a9cbd9f8fb921-git4.tar.gz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk index 7d624012449..a80b64349b6 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/package/uclibc-ng-test/uclibc-ng-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_NG_TEST_VERSION = 0f303c63fab7f4038515ced6f2659242cf60ac19 +UCLIBC_NG_TEST_VERSION = 132c6134d69146bcafbdda68ae3a9cbd9f8fb921 UCLIBC_NG_TEST_SITE = https://git.uclibc-ng.org/git/uclibc-ng-test.git UCLIBC_NG_TEST_SITE_METHOD = git UCLIBC_NG_TEST_LICENSE = LGPL-2.1+ From 50b18ed68ceef78061e85a390d29ad172d1f9f95 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 May 2024 11:17:07 +0200 Subject: [PATCH 1622/3013] package/gpm: fix musl build with gcc 14 Fix the following musl build failure with gcc 14: daemon/old_main.c: In function 'old_main': daemon/old_main.c:56:11: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] 56 | if(!strcmp((which_mouse->opt_dev),"-")) fd=0; /* use stdin */ | ^~~~~~ daemon/old_main.c:35:1: note: include '' or provide a declaration of 'strcmp' 34 | #include "headers/gpmInt.h" /* daemon internals */ +++ |+#include 35 | While at it, add Upstream tags to other patches Fixes: - http://autobuild.buildroot.org/results/3192740863d57e72e90e622683e7b9fcc057fa8b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 5 ---- ...usl-support-to-libgpm-and-the-daemon.patch | 4 +-- .../0002-Install-unversioned-solibrary.patch | 4 +-- ...mptyset-API-instead-of-__sigemptyset.patch | 1 + .../gpm/0005-fix-building-w-newer-glibc.patch | 1 + ...on.h-avoid-redefinition-of-last_sele.patch | 1 + package/gpm/0007-Add-include-string-h.patch | 27 +++++++++++++++++++ 7 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 package/gpm/0007-Add-include-string-h.patch diff --git a/.checkpackageignore b/.checkpackageignore index f5a9af99450..3866c4b146c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -635,11 +635,6 @@ package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch lib_patch.Upstream -package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch lib_patch.Upstream -package/gpm/0002-Install-unversioned-solibrary.patch lib_patch.Upstream -package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch lib_patch.Upstream -package/gpm/0005-fix-building-w-newer-glibc.patch lib_patch.Upstream -package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch lib_patch.Upstream package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream diff --git a/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch b/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch index 1e1e919416a..1e143e50310 100644 --- a/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch +++ b/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch @@ -3,9 +3,7 @@ From: Dima Krasner Date: Wed, 12 Nov 2014 23:06:46 +0200 Subject: [PATCH] Added musl support to libgpm and the daemon. -[Upstream patch backported from the github repository, -https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe.] - +Upstream: https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe Signed-off-by: Thomas Petazzoni --- src/daemon/open_console.c | 1 + diff --git a/package/gpm/0002-Install-unversioned-solibrary.patch b/package/gpm/0002-Install-unversioned-solibrary.patch index 27e97acb32b..5f184daba28 100644 --- a/package/gpm/0002-Install-unversioned-solibrary.patch +++ b/package/gpm/0002-Install-unversioned-solibrary.patch @@ -6,9 +6,7 @@ Subject: [PATCH] Install unversioned solibrary Unversioned solibraries are shipped with -devel packages in Linux distros. Generate and install it for the consistency. -[Upstream patch backported from the github repository, -https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa] - +Upstream: https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Signed-off-by: Bernd Kuhls --- src/Makefile.in | 7 +++---- diff --git a/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch index 01c7424a9de..5820d21f513 100644 --- a/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch +++ b/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch @@ -7,6 +7,7 @@ __sigemptyset has been removed from glibc public API headers in upcoming (2.26) release onwards Signed-off-by: Khem Raj +Upstream: https://github.com/telmich/gpm/commit/fdc42770596e25749f7e2ce0ea97882177397167 Signed-off-by: Petr Vorel --- src/prog/gpm-root.y | 4 ---- diff --git a/package/gpm/0005-fix-building-w-newer-glibc.patch b/package/gpm/0005-fix-building-w-newer-glibc.patch index b451d975e0b..839f92f37bf 100644 --- a/package/gpm/0005-fix-building-w-newer-glibc.patch +++ b/package/gpm/0005-fix-building-w-newer-glibc.patch @@ -7,6 +7,7 @@ Linux C libraries are looking to disentangle sysmacros.h from the sys/types.h include, so make sure we pull in the header when it is found. +Upstream: https://github.com/telmich/gpm/commit/b350aee4ea5785a75cb6ad770f6b768c506ebb70 Signed-off-by: Giulio Benetti --- src/daemon/open_console.c | 4 ++++ diff --git a/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch b/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch index 36a8ddc5bb0..0c8428df2c5 100644 --- a/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch +++ b/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch @@ -20,6 +20,7 @@ https://gcc.gnu.org/PR85678. The error also happens if CFLAGS=-fno-common passed explicitly. Signed-off-by: Sergei Trofimovich +Upstream: https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Signed-off-by: Heiko Thiery --- src/headers/daemon.h | 2 +- diff --git a/package/gpm/0007-Add-include-string-h.patch b/package/gpm/0007-Add-include-string-h.patch new file mode 100644 index 00000000000..dd7e736e7b6 --- /dev/null +++ b/package/gpm/0007-Add-include-string-h.patch @@ -0,0 +1,27 @@ +From 2085cab74a0a84df8b965addf007775a7225c9ec Mon Sep 17 00:00:00 2001 +From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com> +Date: Sat, 29 Dec 2018 23:47:17 -0600 +Subject: [PATCH] Add include + +Added + line 28, #include /* strcpy, bzero */ +for musl compilation + +Upstream: https://github.com/telmich/gpm/commit/2085cab74a0a84df8b965addf007775a7225c9ec +Signed-off-by: Fabrice Fontaine +--- + src/daemon/old_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/daemon/old_main.c b/src/daemon/old_main.c +index 2581e26..ab7a87f 100644 +--- a/src/daemon/old_main.c ++++ b/src/daemon/old_main.c +@@ -25,6 +25,7 @@ + #include /* guess again */ + #include /* guess again */ + #include /* unlink */ ++#include /* strcpy, bzero */ + #include /* chmod */ + + #include /* linux hd* */ From 1b01c3c3331f3c33268c4232900079ee9166fc14 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 17 May 2024 10:20:07 +0200 Subject: [PATCH 1623/3013] package/frotz: fix build with gcc 14 Change -std=c99 into -std=gnu99 in the CFLAGS to avoid the following build failure with gcc 14: fastmem.c: In function 'z_restore': fastmem.c:842:36: error: implicit declaration of function 'strdup'; did you mean 'strcmp'? [-Wimplicit-function-declaration] 842 | f_setup.aux_name = strdup(default_name); | ^~~~~~ | strcmp Fixes: - http://autobuild.buildroot.org/results/df3b3b98265ec3a75578614746b2d1426c90e125 Reported-by: Fabrice Fontaine Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni --- package/frotz/frotz.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/frotz/frotz.mk b/package/frotz/frotz.mk index 5af235137cd..4c477c396df 100644 --- a/package/frotz/frotz.mk +++ b/package/frotz/frotz.mk @@ -21,7 +21,7 @@ endif define FROTZ_BUILD_CMDS $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr CONFIG_DIR=/etc \ SOUND_TYPE=none CURSES="$(FROTZ_CURSES)" USE_UTF8=$(FROTZ_UTF8) \ - CFLAGS="$(TARGET_CFLAGS) -std=c99" + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" endef define FROTZ_INSTALL_TARGET_CMDS From 4cb762efa4f35fa62a63475154c9431fd0da8e97 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 7 Jun 2024 11:37:12 +0200 Subject: [PATCH 1624/3013] boot/ti-k3-r5-loader: share download files with uboot ti-k3-r5-loader is just a U-Boot SPL running on the R5 core on TI's K3 processors, so it makes sense to just share the downloads with U-Boot. With commit ebe238f2b595 (package/pkg-download: use _DL_SUBDIR as root dir of generated archives), the root of the generated archive will also be based on _DL_SUBDIR, but the name of the archive, _SOURCE, is still based on the current package unless explicitly set. For ti-k3-r5-loader, that would create an archive which fiename does not match its root directory; although Buildroot does not care (we --strip-components=1 when extracting), this would be a bit surprising to anyone manually extrating the archive, as it diverges from the usual expectations. Do like we do for linux-headers, and force the ti-k3-r4-loader archive filename to be u-boot-VERSION.tar.gz Signed-off-by: Yann E. MORIN Cc: Anand Gadiyar Cc: Bryan Brattlof Cc: Xuanhao Shi Cc: Paresh Bhagat Reviewed-by: Bryan Brattlof Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 98a6d473f17..e426f039e02 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -5,6 +5,7 @@ ################################################################################ TI_K3_R5_LOADER_VERSION = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_VERSION)) +TI_K3_R5_LOADER_DL_SUBDIR = uboot ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL),y) # Handle custom U-Boot tarballs as specified by the configuration @@ -14,12 +15,15 @@ TI_K3_R5_LOADER_SOURCE = $(notdir $(TI_K3_R5_LOADER_TARBALL)) else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT),y) TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) TI_K3_R5_LOADER_SITE_METHOD = git +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG),y) TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) TI_K3_R5_LOADER_SITE_METHOD = hg +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN),y) TI_K3_R5_LOADER_SITE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL)) TI_K3_R5_LOADER_SITE_METHOD = svn +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz else # Handle stable official U-Boot versions TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot From 70319b47f646f74f407ed3355baf5b581a10518a Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 28 Jun 2024 01:02:18 +0300 Subject: [PATCH 1625/3013] package/libdex: new package This package provides utilities for asynchronous programming in C using a futures/promises model. Newer versions of sysprof require this library. https://gitlab.gnome.org/GNOME/libdex Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libdex/Config.in | 17 +++++++++++++++++ package/libdex/libdex.hash | 5 +++++ package/libdex/libdex.mk | 31 +++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+) create mode 100644 package/libdex/Config.in create mode 100644 package/libdex/libdex.hash create mode 100644 package/libdex/libdex.mk diff --git a/DEVELOPERS b/DEVELOPERS index ae3a6757313..1fa425f3ee3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -55,6 +55,7 @@ F: package/brotli/ F: package/bubblewrap/ F: package/cage/ F: package/cog/ +F: package/libdex/ F: package/libepoxy/ F: package/libmanette/ F: package/libpsl/ diff --git a/package/Config.in b/package/Config.in index 44ce5a5005c..2b71978112f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2163,6 +2163,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdex/Config.in" source "package/libdill/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" diff --git a/package/libdex/Config.in b/package/libdex/Config.in new file mode 100644 index 00000000000..f10bdac46f1 --- /dev/null +++ b/package/libdex/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBDEX + bool "libdex" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2, gettext + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + select BR2_PACKAGE_LIBGLIB2 + help + Dex provides Future-based programming for GLib-based + applications. It both integrates with and brings new + features for application and library authors who want + to structure concurrent code in an easy to manage way. + + https://gitlab.gnome.org/GNOME/libdex + +comment "libdex needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libdex/libdex.hash b/package/libdex/libdex.hash new file mode 100644 index 00000000000..ec22f330d9f --- /dev/null +++ b/package/libdex/libdex.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/libdex/0.6/libdex-0.6.1.sha256sum +sha256 d176de6578571e32a8c0b603b6a5a13fa5f87fb6b5442575b38ec5af16b17a92 libdex-0.6.1.tar.xz + +# License files +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libdex/libdex.mk b/package/libdex/libdex.mk new file mode 100644 index 00000000000..530dfc2babf --- /dev/null +++ b/package/libdex/libdex.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# libdex +# +################################################################################ + +LIBDEX_VERSION_MAJOR = 0.6 +LIBDEX_VERSION = $(LIBDEX_VERSION_MAJOR).1 +LIBDEX_SOURCE = libdex-$(LIBDEX_VERSION).tar.xz +LIBDEX_SITE = https://download.gnome.org/sources/libdex/$(LIBDEX_VERSION_MAJOR) +LIBDEX_LICENSE = LGPL-2.1+ +LIBDEX_LICENSE_FILES = COPYING +LIBDEX_INSTALL_STAGING = YES +LIBDEX_DEPENDENCIES = libglib2 +LIBDEX_CONF_OPTS = \ + -Ddocs=false \ + -Dexamples=false \ + -Dsysprof=false \ + -Dtests=false \ + -Dvapi=false \ + -Deventfd=enabled \ + -Dintrospection=disabled + +ifeq ($(BR2_PACKAGE_LIBURING),y) +LIBDEX_CONF_OPTS += -Dliburing=enabled +LIBDEX_DEPENDENCIES += liburing +else +LIBDEX_CONF_OPTS += -Dliburing=disabled +endif + +$(eval $(meson-package)) From 0d57555407f2a0708515e7c377f57a6466c78b1b Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 28 Jun 2024 01:02:19 +0300 Subject: [PATCH 1626/3013] package/sysprof: update to version 46.0 Bring Sysprof twelve years into the future by updating it to the most recent release. The GUI now uses GTK4, for which there is not yet a package, so for now the option is removed. Obviously, many things changed: - Build system moved to meson - License moved from GPLv2 to GPLv3 - Many new dependencies Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../sysprof/0001-define-NT_GNU_BUILD_ID.patch | 22 ---------- package/sysprof/Config.in | 40 +++++++++---------- package/sysprof/sysprof.hash | 8 ++-- package/sysprof/sysprof.mk | 26 ++++++++---- 5 files changed, 43 insertions(+), 54 deletions(-) delete mode 100644 package/sysprof/0001-define-NT_GNU_BUILD_ID.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3866c4b146c..2c0f265d96d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1344,7 +1344,6 @@ package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch package/suricata/S99suricata Shellcheck package/swupdate/swupdate.sh Shellcheck package/sylpheed/0001-harden-link-checker-before-accepting-click.patch lib_patch.Upstream -package/sysprof/0001-define-NT_GNU_BUILD_ID.patch lib_patch.Upstream package/sysrepo/S51sysrepo-plugind Shellcheck lib_sysv.Indent package/sysvinit/0001-Makefile-disable-stack-protector-strong.patch lib_patch.Upstream package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream diff --git a/package/sysprof/0001-define-NT_GNU_BUILD_ID.patch b/package/sysprof/0001-define-NT_GNU_BUILD_ID.patch deleted file mode 100644 index dcc2cbe67cc..00000000000 --- a/package/sysprof/0001-define-NT_GNU_BUILD_ID.patch +++ /dev/null @@ -1,22 +0,0 @@ -On uclibc elf.h does not have GNU extentions but we need this define -so we define it locally if its not getting it from elf.h - -Signed-off-by: Khem Raj - -Upstream-Status: Pending - -Index: git/elfparser.h -=================================================================== ---- git.orig/elfparser.h 2011-07-16 18:57:41.000000000 -0700 -+++ git/elfparser.h 2011-07-16 20:28:54.733829895 -0700 -@@ -17,6 +17,10 @@ - */ - #include - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif -+ - typedef struct ElfSym ElfSym; - typedef struct ElfParser ElfParser; - diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in index 3913274be4f..1d1b2fa264e 100644 --- a/package/sysprof/Config.in +++ b/package/sysprof/Config.in @@ -1,31 +1,29 @@ config BR2_PACKAGE_SYSPROF bool "sysprof" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - # In its util.h file, sysprof contains architecture-specific - # code - depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb + depends on BR2_USE_WCHAR # glib2, libdex, json-glib + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, libdex, json-glib, polkit + depends on BR2_USE_MMU # glib2, libdex, json-glib + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libunwind, polkit + depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # libunwind, polkit + depends on !BR2_OPTIMIZE_FAST # polkit + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBDEX select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBUNWIND + select BR2_PACKAGE_POLKIT help Sysprof is a statistical, system-wide profiler that can profile user and kernel code using the perf API. http://sysprof.com -if BR2_PACKAGE_SYSPROF - -config BR2_PACKAGE_SYSPROF_GUI - bool "sysprof GUI" - depends on BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBGLADE - select BR2_PACKAGE_GDK_PIXBUF - help - GUI for the sysprof system-wide statistical profiler. - -endif - -comment "sysprof needs a toolchain w/ wchar, threads" +comment "sysprof needs a toolchain w/ dynamic libraray, wchar, threads, gcc >= 7" depends on BR2_USE_MMU - depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + BR2_STATIC_LIBS + +comment "sysprof can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/sysprof/sysprof.hash b/package/sysprof/sysprof.hash index 4ce206be0bd..f21e7621e14 100644 --- a/package/sysprof/sysprof.hash +++ b/package/sysprof/sysprof.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 baf03c6fc01a845c705873e6fc7927aa89539dcda6963f9ec4c8eb4c086a64f1 sysprof-1.2.0.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +# From https://download.gnome.org/sources/sysprof/46/sysprof-46.0.sha256sum +sha256 73aa7e75ebab3e4e0946a05a723df7e6ee4249e3b9e884dba35500aba2a1d176 sysprof-46.0.tar.xz + +# License files +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/sysprof/sysprof.mk b/package/sysprof/sysprof.mk index 9823416e3fd..8e69a7044e9 100644 --- a/package/sysprof/sysprof.mk +++ b/package/sysprof/sysprof.mk @@ -4,14 +4,26 @@ # ################################################################################ -SYSPROF_VERSION = 1.2.0 -SYSPROF_SITE = http://sysprof.com -SYSPROF_DEPENDENCIES = libglib2 -SYSPROF_LICENSE = GPL-2.0+ +SYSPROF_VERSION_MAJOR = 46 +SYSPROF_VERSION = $(SYSPROF_VERSION_MAJOR).0 +SYSPROF_SOURCE = sysprof-$(SYSPROF_VERSION).tar.xz +SYSPROF_SITE = https://download.gnome.org/sources/sysprof/$(SYSPROF_VERSION_MAJOR) +SYSPROF_LICENSE = GPL-3.0+ SYSPROF_LICENSE_FILES = COPYING +SYSPROF_DEPENDENCIES = libglib2 libdex libunwind json-glib polkit +SYSPROF_CONF_OPTS = \ + -Ddevelopment=false \ + -Dexamples=false \ + -Dgtk=false \ + -Dhelp=false \ + -Dinstall-static=false \ + -Dlibsysprof=true \ + -Dtests=false \ + -Dtools=true \ + -Dsystemdunitdir=/usr/lib/systemd/system -ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y) -SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SYSPROF_DEPENDENCIES += systemd endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From cca315f814888025daa80fc320610117a6f69007 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:49 -0300 Subject: [PATCH 1627/3013] utils/check-package: fix check for _REDISTRIBUTE Commit "8e87d76c12 check-package: check *.mk files" added a typo that prevents check-package from checking _REDISTRIBUTE default value. Fix the typo: _INSTALL_REDISTRIBUTE -> _REDISTRIBUTE Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- utils/checkpackagelib/lib_mk.py | 2 +- utils/checkpackagelib/test_lib_mk.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index ce2ab5157c4..4d97571f505 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -324,7 +324,7 @@ class UselessFlag(_CheckFunction): r"_LIBTOOL_PATCH\s*=\s*YES"]))) DEFAULT_GENERIC_FLAG = re.compile(r"^.*{}".format("|".join([ r"_INSTALL_IMAGES\s*=\s*NO", - r"_INSTALL_REDISTRIBUTE\s*=\s*YES", + r"_REDISTRIBUTE\s*=\s*YES", r"_INSTALL_STAGING\s*=\s*NO", r"_INSTALL_TARGET\s*=\s*YES"]))) END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 2086237ebb1..11fecdd5cf2 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -602,13 +602,13 @@ def test_TypoInPackageVariable(testname, filename, string, expected): ('generic', 'any.mk', 'ANY_INSTALL_IMAGES = NO\n' - 'ANY_INSTALL_REDISTRIBUTE = YES\n' + 'ANY_REDISTRIBUTE = YES\n' 'ANY_INSTALL_STAGING = NO\n' 'ANY_INSTALL_TARGET = YES\n', [['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', 'ANY_INSTALL_IMAGES = NO\n'], ['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', - 'ANY_INSTALL_REDISTRIBUTE = YES\n'], + 'ANY_REDISTRIBUTE = YES\n'], ['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', 'ANY_INSTALL_STAGING = NO\n'], ['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', @@ -618,9 +618,9 @@ def test_TypoInPackageVariable(testname, filename, string, expected): 'ifneq (condition)\n' 'ANY_INSTALL_IMAGES = NO\n' 'endif\n' - 'ANY_INSTALL_REDISTRIBUTE = YES\n', + 'ANY_REDISTRIBUTE = YES\n', [['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', - 'ANY_INSTALL_REDISTRIBUTE = YES\n']]), + 'ANY_REDISTRIBUTE = YES\n']]), ] From ccc12c0f244de23672300b5837b473292c8db931 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:50 -0300 Subject: [PATCH 1628/3013] utils/check-package: check linux-tools Each linux tool uses a fragment of a .mk file, named, for instance: package/linux-tools/linux-tool-cpupower.mk.in So currently check-package does not check these files. Add the support in check-package script. At the same time, factor out a function to derive package prefix from the filename being checked, so the fix (calling os.path.splitext twice) can be applied in a single place. Signed-off-by: Ricardo Martincoski [Arnout: add docstring and explain double splitext to get_package_prefix_from_filename] Signed-off-by: Arnout Vandecappelle --- utils/check-package | 3 ++- utils/checkpackagelib/lib_mk.py | 30 ++++++++++++--------- utils/checkpackagelib/test_lib_mk.py | 40 ++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/utils/check-package b/utils/check-package index cbb3613e190..3741a2ccdcb 100755 --- a/utils/check-package +++ b/utils/check-package @@ -126,6 +126,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", r"fs/common\.mk$", + r"package/alchemy/atom.mk.in$", r"package/doc-asciidoc\.mk$", r"package/pkg-\S*\.mk$", r"support/dependencies/[^/]+\.mk$", @@ -163,7 +164,7 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_defconfig if fname.endswith(".hash"): return checkpackagelib.lib_hash - if fname.endswith(".mk"): + if fname.endswith(".mk") or fname.endswith(".mk.in"): return checkpackagelib.lib_mk if fname.endswith(".patch"): return checkpackagelib.lib_patch diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 4d97571f505..1e6bd708a5c 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -49,6 +49,18 @@ def check_line(self, lineno, text): text] +def get_package_prefix_from_filename(filename): + """Return a tuple (pkgname, PKGNAME) with the package name derived from the file name""" + # Double splitext to support .mk.in + package = os.path.splitext(os.path.splitext(os.path.basename(filename))[0])[0] + # linux tools do not use LINUX_TOOL_ prefix for variables + package = package.replace("linux-tool-", "") + # linux extensions do not use LINUX_EXT_ prefix for variables + package = package.replace("linux-ext-", "") + package_upper = package.replace("-", "_").upper() + return package, package_upper + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) @@ -207,12 +219,10 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): packages_that_may_contain_default_source = ["binutils", "gcc", "gdb"] def before(self): - package, _ = os.path.splitext(os.path.basename(self.filename)) - package_upper = package.replace("-", "_").upper() - self.package = package + self.package, package_upper = get_package_prefix_from_filename(self.filename) self.FIND_SOURCE = re.compile( r"^{}_SOURCE\s*=\s*{}-\$\({}_VERSION\)\.tar\.gz" - .format(package_upper, package, package_upper)) + .format(package_upper, self.package, package_upper)) def check_line(self, lineno, text): if self.FIND_SOURCE.search(text): @@ -282,16 +292,10 @@ class TypoInPackageVariable(_CheckFunction): VARIABLE = re.compile(r"^(define\s+)?([A-Z0-9_]+_[A-Z0-9_]+)") def before(self): - package, _ = os.path.splitext(os.path.basename(self.filename)) - package = package.replace("-", "_").upper() - # linux tools do not use LINUX_TOOL_ prefix for variables - package = package.replace("LINUX_TOOL_", "") - # linux extensions do not use LINUX_EXT_ prefix for variables - package = package.replace("LINUX_EXT_", "") - self.package = package - self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package)) + _, self.package = get_package_prefix_from_filename(self.filename) + self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(self.package)) self.FIND_VIRTUAL = re.compile( - r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package)) + r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(self.package)) self.virtual = [] def check_line(self, lineno, text): diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 11fecdd5cf2..208b1ecdc2b 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -74,6 +74,40 @@ def test_Ifdef(testname, filename, string, expected): assert warnings == expected +get_package_prefix_from_filename = [ + ('linux extension', + 'linux/linux-ext-aufs.mk', + ['aufs', 'AUFS']), + ('linux tool', + 'package/linux-tools/linux-tool-gpio.mk.in', + ['gpio', 'GPIO']), + ('boot', + 'boot/binaries-marvell/binaries-marvell.mk', + ['binaries-marvell', 'BINARIES_MARVELL']), + ('toolchain', + 'toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk', + ['toolchain-external-bootlin', 'TOOLCHAIN_EXTERNAL_BOOTLIN']), + ('package, underscore, subfolder', + 'package/x11r7/xapp_bitmap/xapp_bitmap.mk', + ['xapp_bitmap', 'XAPP_BITMAP']), + ('package, starting with number', + 'package/4th/4th.mk', + ['4th', '4TH']), + ('package, long name', + 'package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk', + ['perl-mojolicious-plugin-authentication', 'PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION']), + ('package, case sensitive', + 'package/libeXosip2/libeXosip2.mk', + ['libeXosip2', 'LIBEXOSIP2']), + ] + + +@pytest.mark.parametrize('testname,filename,expected', get_package_prefix_from_filename) +def test_get_package_prefix_from_filename(testname, filename, expected): + prefix_lower, prefix_upper = m.get_package_prefix_from_filename(filename) + assert [prefix_lower, prefix_upper] == expected + + Indent = [ ('ignore comment at beginning of line', 'any', @@ -567,6 +601,12 @@ def test_TrailingBackslash(testname, filename, string, expected): 'OTHERS_VAR = \n', [['any.mk:2: possible typo: OTHERS_VAR -> *ANY*', 'OTHERS_VAR = \n']]), + ('linux tool', + 'package/linux-tools/linux-tool-cpupower.mk.in', + 'CPUPOWER_DEPENDENCIES =\n' + 'POWER_DEPENDENCIES +=\n', + [['package/linux-tools/linux-tool-cpupower.mk.in:2: possible typo: POWER_DEPENDENCIES -> *CPUPOWER*', + 'POWER_DEPENDENCIES +=\n']]), ] From 4286c89f9d987f5f3bcbb14dfd58ba440944f4c2 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:53 -0300 Subject: [PATCH 1629/3013] docs/manual: standardize references to the generic infra Currently the text for each package infra that mentions the usage of variables already provided by the generic infra diverge from each other: - some (golang, kconfig, python) add a cross-referece to the generic infra chapter; - kconfig does not list any example; - some mention _LICENSE as an example, others don't; - some (cargo, golang, python) add an 'etc.' at the end of the examples, giving the idea that can be more symbols provided by the generic infra than the ones listed; - most have the text 'works by defining a number of variables before calling the ++ macro', except golang and kconfig; - some actually list 'A few additional variables' but keep using some old reference as 'An additional variable'; - some say 'First, all the package metadata' and other only 'All the package metadata'; - most mention _SUBDIR as an example of variable supported by the generic infra, even the generic infra manual not mentioning it. Improve the correctness for the manual by standardizing the text among the package infras: - use the same text "All the package metadata information variables that exist in the generic package infrastructure also exist in the infrastructure:" for all of them; - add the cross-reference for all of them; - remove the examples of variables inherited from the generic infra - this also solves the _SUBDIR problem, there no longer is any reference to _SUBDIR; - wrap the modified text at 80 columns; - add "macro" to golang and luarocks infra; - use "A few additional variables" for qmake and waf. At same time, add a missing format on golang manual for BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. Cc: Eric Le Bihan Cc: Thomas De Schampheleire Signed-off-by: Ricardo Martincoski [Arnout: - remove the examples; - add "the" where "macro" was added; - rewrite the preceding paragraphs for kconfig to make it more consistent. ] Signed-off-by: Arnout Vandecappelle --- docs/manual/adding-packages-autotools.adoc | 9 +++------ docs/manual/adding-packages-cargo.adoc | 7 +++---- docs/manual/adding-packages-cmake.adoc | 8 +++----- docs/manual/adding-packages-golang.adoc | 9 ++++----- docs/manual/adding-packages-kconfig.adoc | 14 ++++++++++---- docs/manual/adding-packages-luarocks.adoc | 10 +++++----- docs/manual/adding-packages-meson.adoc | 7 +++---- docs/manual/adding-packages-perl.adoc | 9 +++------ docs/manual/adding-packages-python.adoc | 5 +---- docs/manual/adding-packages-qmake.adoc | 10 ++++------ docs/manual/adding-packages-rebar.adoc | 10 +++------- docs/manual/adding-packages-waf.adoc | 10 ++++------ 12 files changed, 46 insertions(+), 62 deletions(-) diff --git a/docs/manual/adding-packages-autotools.adoc b/docs/manual/adding-packages-autotools.adoc index ad96957f3d8..c2b90f31eb6 100644 --- a/docs/manual/adding-packages-autotools.adoc +++ b/docs/manual/adding-packages-autotools.adoc @@ -76,12 +76,9 @@ Just like the generic infrastructure, the autotools infrastructure works by defining a number of variables before calling the +autotools-package+ macro. -First, all the package metadata information variables that exist in the -generic infrastructure also exist in the autotools infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, -+LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, -+LIBFOO_INSTALL_STAGING+, +LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the autotools infrastructure. A few additional variables, specific to the autotools infrastructure, can also be defined. Many of them are only useful in very specific diff --git a/docs/manual/adding-packages-cargo.adoc b/docs/manual/adding-packages-cargo.adoc index e18fd9ce237..a2a15ed996a 100644 --- a/docs/manual/adding-packages-cargo.adoc +++ b/docs/manual/adding-packages-cargo.adoc @@ -64,10 +64,9 @@ Just like the generic infrastructure, the Cargo infrastructure works by defining a number of variables before calling the +cargo-package+ or +host-cargo-package+ macros. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the Cargo infrastructure: -+FOO_VERSION+, +FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, -+FOO_DEPENDENCIES+, +FOO_LICENSE+, +FOO_LICENSE_FILES+, etc. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Cargo infrastructure. A few additional variables, specific to the Cargo infrastructure, can also be defined. Many of them are only useful in very specific cases, diff --git a/docs/manual/adding-packages-cmake.adoc b/docs/manual/adding-packages-cmake.adoc index 4f336db7373..e375e17d74f 100644 --- a/docs/manual/adding-packages-cmake.adoc +++ b/docs/manual/adding-packages-cmake.adoc @@ -75,11 +75,9 @@ Just like the generic infrastructure, the CMake infrastructure works by defining a number of variables before calling the +cmake-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the CMake infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, -+LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the CMake infrastructure. A few additional variables, specific to the CMake infrastructure, can also be defined. Many of them are only useful in very specific cases, diff --git a/docs/manual/adding-packages-golang.adoc b/docs/manual/adding-packages-golang.adoc index c952cde5776..00b8bea285d 100644 --- a/docs/manual/adding-packages-golang.adoc +++ b/docs/manual/adding-packages-golang.adoc @@ -56,16 +56,15 @@ The main macro of the Go package infrastructure is ability to build host packages is also available, with the +host-golang-package+ macro. Host packages built by +host-golang-package+ macro should depend on -BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. ++BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS+. Just like the generic infrastructure, the Go infrastructure works -by defining a number of variables before calling the +golang-package+. +by defining a number of variables before calling the +golang-package+ +macro. All the package metadata information variables that exist in the xref:generic-package-reference[generic package infrastructure] also -exist in the Go infrastructure: +FOO_VERSION+, +FOO_SOURCE+, -+FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+, -+FOO_LICENSE+, +FOO_LICENSE_FILES+, +FOO_INSTALL_STAGING+, etc. +exist in the Go infrastructure. Note that it is not necessary to add +host-go+ in the +FOO_DEPENDENCIES+ variable of a package, since this basic dependency diff --git a/docs/manual/adding-packages-kconfig.adoc b/docs/manual/adding-packages-kconfig.adoc index a35681775f8..f2c40ed7a28 100644 --- a/docs/manual/adding-packages-kconfig.adoc +++ b/docs/manual/adding-packages-kconfig.adoc @@ -15,10 +15,16 @@ expose the package's +menuconfig+ target as +foo-menuconfig+ in Buildroot, and to handle the copying back and forth of the configuration file in a correct way. -The +kconfig-package+ infrastructure is based on the +generic-package+ -infrastructure. All variables supported by +generic-package+ are -available in +kconfig-package+ as well. See -xref:generic-package-reference[] for more details. +The main macro of the kconfig package infrastructure is ++kconfig-package+. It is similar to the +generic-package+ macro. + +Just like the generic infrastructure, the kconfig infrastructure works +by defining a number of variables before calling the +kconfig-package+ +macro. + +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the kconfig infrastructure. In order to use the +kconfig-package+ infrastructure for a Buildroot package, the minimally required lines in the +.mk+ file, in addition to diff --git a/docs/manual/adding-packages-luarocks.adoc b/docs/manual/adding-packages-luarocks.adoc index 70f48fc02cc..9ced6c55046 100644 --- a/docs/manual/adding-packages-luarocks.adoc +++ b/docs/manual/adding-packages-luarocks.adoc @@ -73,16 +73,16 @@ infrastructures in Buildroot, respectively. The main macro of the LuaRocks package infrastructure is +luarocks-package+: like +generic-package+ it works by defining a number of variables providing -metadata information about the package, and then calling +luarocks-package+. +metadata information about the package, and then calling the +luarocks-package+ +macro. Just like the generic infrastructure, the LuaRocks infrastructure works by defining a number of variables before calling the +luarocks-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the LuaRocks infrastructure: -+LUA_FOO_VERSION+, +LUA_FOO_SOURCE+, +LUA_FOO_SITE+, -+LUA_FOO_DEPENDENCIES+, +LUA_FOO_LICENSE+, +LUA_FOO_LICENSE_FILES+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the LuaRocks infrastructure. Two of them are populated by the LuaRocks infrastructure (for the +download+ step). If your package is not hosted on the LuaRocks mirror diff --git a/docs/manual/adding-packages-meson.adoc b/docs/manual/adding-packages-meson.adoc index 029c8c2488d..8c0f84709f8 100644 --- a/docs/manual/adding-packages-meson.adoc +++ b/docs/manual/adding-packages-meson.adoc @@ -76,10 +76,9 @@ packages is also available, with the +host-meson-package+ macro. Just like the generic infrastructure, the Meson infrastructure works by defining a number of variables before calling the +meson-package+ macro. -First, all the package metadata information variables that exist in the generic -infrastructure also exist in the Meson infrastructure: +FOO_VERSION+, -+FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+, -+FOO_INSTALL_STAGING+, +FOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Meson infrastructure. A few additional variables, specific to the Meson infrastructure, can also be defined. Many of them are only useful in very specific cases, typical packages diff --git a/docs/manual/adding-packages-perl.adoc b/docs/manual/adding-packages-perl.adoc index 6ce693fd6eb..7c60a1a4a7e 100644 --- a/docs/manual/adding-packages-perl.adoc +++ b/docs/manual/adding-packages-perl.adoc @@ -85,12 +85,9 @@ Just like the generic infrastructure, the Perl/CPAN infrastructure works by defining a number of variables before calling the +perl-package+ macro. -First, all the package metadata information variables that exist in the -generic infrastructure also exist in the Perl/CPAN infrastructure: -+PERL_FOO_VERSION+, +PERL_FOO_SOURCE+, -+PERL_FOO_PATCH+, +PERL_FOO_SITE+, -+PERL_FOO_SUBDIR+, +PERL_FOO_DEPENDENCIES+, -+PERL_FOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Perl/CPAN infrastructure. Note that setting +PERL_FOO_INSTALL_STAGING+ to +YES+ has no effect unless a +PERL_FOO_INSTALL_STAGING_CMDS+ variable is defined. The perl diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 67f2f6081d7..7cb36357928 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -80,10 +80,7 @@ or +host-python-package+ macros. All the package metadata information variables that exist in the xref:generic-package-reference[generic package infrastructure] also -exist in the Python infrastructure: +PYTHON_FOO_VERSION+, -+PYTHON_FOO_SOURCE+, +PYTHON_FOO_PATCH+, +PYTHON_FOO_SITE+, -+PYTHON_FOO_SUBDIR+, +PYTHON_FOO_DEPENDENCIES+, +PYTHON_FOO_LICENSE+, -+PYTHON_FOO_LICENSE_FILES+, +PYTHON_FOO_INSTALL_STAGING+, etc. +exist in the Python infrastructure. Note that: diff --git a/docs/manual/adding-packages-qmake.adoc b/docs/manual/adding-packages-qmake.adoc index 699d082aa1b..0205f6ca293 100644 --- a/docs/manual/adding-packages-qmake.adoc +++ b/docs/manual/adding-packages-qmake.adoc @@ -51,13 +51,11 @@ Just like the generic infrastructure, the QMake infrastructure works by defining a number of variables before calling the +qmake-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the QMake infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, -+LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the QMake infrastructure. -An additional variable, specific to the QMake infrastructure, can +A few additional variables, specific to the QMake infrastructure, can also be defined. * +LIBFOO_CONF_ENV+, to specify additional environment variables to diff --git a/docs/manual/adding-packages-rebar.adoc b/docs/manual/adding-packages-rebar.adoc index d78b3171d8c..c2a5b0d0e9e 100644 --- a/docs/manual/adding-packages-rebar.adoc +++ b/docs/manual/adding-packages-rebar.adoc @@ -51,13 +51,9 @@ Just like the generic infrastructure, the +rebar+ infrastructure works by defining a number of variables before calling the +rebar-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the +rebar+ infrastructure: -+ERLANG_FOOBAR_VERSION+, +ERLANG_FOOBAR_SOURCE+, -+ERLANG_FOOBAR_PATCH+, +ERLANG_FOOBAR_SITE+, -+ERLANG_FOOBAR_SUBDIR+, +ERLANG_FOOBAR_DEPENDENCIES+, -+ERLANG_FOOBAR_INSTALL_STAGING+, +ERLANG_FOOBAR_INSTALL_TARGET+, -+ERLANG_FOOBAR_LICENSE+ and +ERLANG_FOOBAR_LICENSE_FILES+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the +rebar+ infrastructure. A few additional variables, specific to the +rebar+ infrastructure, can also be defined. Many of them are only useful in very specific diff --git a/docs/manual/adding-packages-waf.adoc b/docs/manual/adding-packages-waf.adoc index 101cddf1f13..7622c55a7b2 100644 --- a/docs/manual/adding-packages-waf.adoc +++ b/docs/manual/adding-packages-waf.adoc @@ -51,13 +51,11 @@ Just like the generic infrastructure, the Waf infrastructure works by defining a number of variables before calling the +waf-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the Waf infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, -+LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Waf infrastructure. -An additional variable, specific to the Waf infrastructure, can +A few additional variables, specific to the Waf infrastructure, can also be defined. * +LIBFOO_SUBDIR+ may contain the name of a subdirectory inside the From 447fa1fca425e629cc65cd0a8261a4c09ddf67d2 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 12 Jul 2024 20:23:24 +0200 Subject: [PATCH 1630/3013] docs/manual: normalize delimiters of listing blocks Although the asciidoc toolchain accepts any number of ~ to delimit a listing block (i.e. a code block), it is actually specified to be exactly four, i.e. ~~~~. Currently, a mix of diffrent numbers of ~ are being used - sometimes even a different number at the beginning and at the end of the block. Normalize this to always use exactly four ~ for the delimiter. Signed-off-by: Arnout Vandecappelle --- docs/manual/adding-board-support.adoc | 4 +- docs/manual/adding-packages-autotools.adoc | 4 +- docs/manual/adding-packages-cargo.adoc | 8 +- docs/manual/adding-packages-cmake.adoc | 4 +- docs/manual/adding-packages-directory.adoc | 60 ++++++------- docs/manual/adding-packages-generic.adoc | 28 +++---- docs/manual/adding-packages-golang.adoc | 4 +- docs/manual/adding-packages-hooks.adoc | 4 +- docs/manual/adding-packages-kconfig.adoc | 4 +- ...ding-packages-linux-kernel-spec-infra.adoc | 16 ++-- docs/manual/adding-packages-luarocks.adoc | 4 +- docs/manual/adding-packages-meson.adoc | 4 +- docs/manual/adding-packages-perl.adoc | 4 +- docs/manual/adding-packages-python.adoc | 24 +++--- docs/manual/adding-packages-qmake.adoc | 4 +- docs/manual/adding-packages-rebar.adoc | 4 +- docs/manual/adding-packages-tips.adoc | 12 +-- docs/manual/adding-packages-virtual.adoc | 24 +++--- docs/manual/adding-packages-waf.adoc | 4 +- docs/manual/beyond-buildroot.adoc | 16 ++-- docs/manual/ccache-support.adoc | 4 +- docs/manual/common-usage.adoc | 64 +++++++------- docs/manual/configure.adoc | 4 +- docs/manual/contribute.adoc | 84 +++++++++---------- .../manual/customize-directory-structure.adoc | 12 +-- docs/manual/customize-outside-br.adoc | 24 +++--- docs/manual/customize-packages.adoc | 8 +- docs/manual/download-location.adoc | 4 +- docs/manual/faq-troubleshooting.adoc | 4 +- docs/manual/getting.adoc | 8 +- docs/manual/legal-notice.adoc | 4 +- docs/manual/make-tips.adoc | 24 +++--- docs/manual/package-make-target.adoc | 4 +- docs/manual/patch-policy.adoc | 16 ++-- docs/manual/quickstart.adoc | 20 ++--- docs/manual/rebuilding-packages.adoc | 4 +- docs/manual/using-buildroot-debugger.adoc | 12 +-- docs/manual/using-buildroot-development.adoc | 24 +++--- docs/manual/writing-rules.adoc | 36 ++++---- 39 files changed, 298 insertions(+), 298 deletions(-) diff --git a/docs/manual/adding-board-support.adoc b/docs/manual/adding-board-support.adoc index ef6dbd3c2b9..9501262086a 100644 --- a/docs/manual/adding-board-support.adoc +++ b/docs/manual/adding-board-support.adoc @@ -51,10 +51,10 @@ Before submitting patches for new boards it is recommended to test it by building it using latest gitlab-CI docker container. To do this use +utils/docker-run+ script and inside it issue these commands: --------------------- +---- $ make _defconfig $ make --------------------- +---- By default, Buildroot developers use the official image hosted on the https://gitlab.com/buildroot.org/buildroot/container_registry/2395076[gitlab.com diff --git a/docs/manual/adding-packages-autotools.adoc b/docs/manual/adding-packages-autotools.adoc index c2b90f31eb6..a45d1652b59 100644 --- a/docs/manual/adding-packages-autotools.adoc +++ b/docs/manual/adding-packages-autotools.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for an autotools-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -26,7 +26,7 @@ package, with an example : 13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf 14: 15: $(eval $(autotools-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-cargo.adoc b/docs/manual/adding-packages-cargo.adoc index a2a15ed996a..1d476589f83 100644 --- a/docs/manual/adding-packages-cargo.adoc +++ b/docs/manual/adding-packages-cargo.adoc @@ -14,7 +14,7 @@ called "crates". The +Config.in+ file of Cargo-based package 'foo' should contain: ---------------------------- +---- 01: config BR2_PACKAGE_FOO 02: bool "foo" 03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS @@ -23,11 +23,11 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 06: This is a comment that explains what foo is. 07: 08: http://foosoftware.org/foo/ ---------------------------- +---- And the +.mk+ file for this package should contain: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -41,7 +41,7 @@ And the +.mk+ file for this package should contain: 11: FOO_LICENSE_FILES = COPYING 12: 13: $(eval $(cargo-package)) --------------------------------- +---- The Makefile starts with the definition of the standard variables for package declaration (lines 7 to 11). diff --git a/docs/manual/adding-packages-cmake.adoc b/docs/manual/adding-packages-cmake.adoc index e375e17d74f..845f54ad4b4 100644 --- a/docs/manual/adding-packages-cmake.adoc +++ b/docs/manual/adding-packages-cmake.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a CMake-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -26,7 +26,7 @@ with an example : 13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf 14: 15: $(eval $(cmake-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 0b7221aae0f..2039c2c7cc6 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -24,7 +24,7 @@ file will contain the option descriptions related to our +libfoo+ software that will be used and displayed in the configuration tool. It should basically contain: ---------------------------- +---- config BR2_PACKAGE_LIBFOO bool "libfoo" help @@ -32,7 +32,7 @@ config BR2_PACKAGE_LIBFOO should be wrapped. http://foosoftware.org/libfoo/ ---------------------------- +---- The +bool+ line, +help+ line and other metadata information about the configuration option must be indented with one tab. The help text @@ -64,9 +64,9 @@ put your package in one of the existing categories). The files included there are 'sorted alphabetically' per category and are 'NOT' supposed to contain anything but the 'bare' name of the package. --------------------------- +---- source "package/libfoo/Config.in" --------------------------- +---- ==== +Config.in.host+ file @@ -83,14 +83,14 @@ options here: the configuration menu. In this case, create a +Config.in.host+ file for that host package: + ---------------------------- +---- config BR2_PACKAGE_HOST_FOO bool "host foo" help This is a comment that explains what foo for the host is. http://foosoftware.org/foo/ ---------------------------- +---- + The same coding style and options as for the +Config.in+ file are valid. + @@ -98,9 +98,9 @@ Finally you have to add your new +libfoo/Config.in.host+ to +package/Config.in.host+. The files included there are 'sorted alphabetically' and are 'NOT' supposed to contain anything but the 'bare' name of the package. + --------------------------- +---- source "package/foo/Config.in.host" --------------------------- +---- + The host package will then be available from the +Host utilities+ menu. @@ -136,7 +136,7 @@ is not met. An example illustrates both the usage of +select+ and +depends on+. --------------------------- +---- config BR2_PACKAGE_RRDTOOL bool "rrdtool" depends on BR2_USE_WCHAR @@ -152,7 +152,7 @@ config BR2_PACKAGE_RRDTOOL comment "rrdtool needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR --------------------------- +---- Note that these two dependency types are only transitive with the @@ -160,7 +160,7 @@ dependencies of the same kind. This means, in the following example: --------------------------- +---- config BR2_PACKAGE_A bool "Package A" @@ -179,7 +179,7 @@ config BR2_PACKAGE_D config BR2_PACKAGE_E bool "Package E" select BR2_PACKAGE_D --------------------------- +---- * Selecting +Package C+ will be visible if +Package B+ has been selected, which in turn is only visible if +Package A+ has been @@ -193,7 +193,7 @@ config BR2_PACKAGE_E the dependency of +Package B+ on +Package A+. Therefore, in such a situation, the transitive dependency has to be added explicitly: --------------------------- +---- config BR2_PACKAGE_D bool "Package D" depends on BR2_PACKAGE_A @@ -203,7 +203,7 @@ config BR2_PACKAGE_E bool "Package E" depends on BR2_PACKAGE_A select BR2_PACKAGE_D --------------------------- +---- Overall, for package library dependencies, +select+ should be preferred. @@ -247,21 +247,21 @@ comment and other config options. The general format of a dependency +comment+ for package foo is: --------------------------- +---- foo needs a toolchain w/ featA, featB, featC --------------------------- +---- for example: --------------------------- +---- mpd needs a toolchain w/ C++, threads, wchar --------------------------- +---- or --------------------------- +---- crda needs a toolchain w/ threads --------------------------- +---- Note that this text is kept brief on purpose, so that it will fit on a 80-character terminal. @@ -358,32 +358,32 @@ typically kernel modules or firmware. A comment should be added in the Config.in file to express this dependency, similar to dependencies on toolchain options. The general format is: --------------------------- +---- foo needs a Linux kernel to be built --------------------------- +---- If there is a dependency on both toolchain options and the Linux kernel, use this format: --------------------------- +---- foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built --------------------------- +---- ==== Dependencies on udev /dev management If a package needs udev /dev management, it should depend on symbol +BR2_PACKAGE_HAS_UDEV+, and the following comment should be added: --------------------------- +---- foo needs udev /dev management --------------------------- +---- If there is a dependency on both toolchain options and udev /dev management, use this format: --------------------------- +---- foo needs udev /dev management and a toolchain w/ featA, featB, featC --------------------------- +---- ==== Dependencies on features provided by virtual packages @@ -578,7 +578,7 @@ not start before +S40network+. The scripts are started in alphabetical order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ start thereafter. ------------------------------- +---- 01: #!/bin/sh 02: 03: DAEMON="syslogd" @@ -634,7 +634,7 @@ start thereafter. 53: echo "Usage: $0 {start|stop|restart|reload}" 54: exit 1 55: esac ------------------------------- +---- *Note:* programs that support reloading their configuration in some fashion (+SIGHUP+) should provide a +reload()+ function similar to diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 9d365a10cae..89fc7004528 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -12,7 +12,7 @@ system is based on hand-written Makefiles or shell scripts. ==== +generic-package+ tutorial ------------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -56,7 +56,7 @@ system is based on hand-written Makefiles or shell scripts. 41: endef 42: 43: $(eval $(generic-package)) --------------------------------- +---- The Makefile begins on line 7 to 11 with metadata information: the version of the package (+LIBFOO_VERSION+), the name of the @@ -103,9 +103,9 @@ Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'. So its fixup would be: --------------------------------- +---- DIVINE_CONFIG_SCRIPTS = divine-config --------------------------------- +---- ================================ .Config script: 'imagemagick' package: @@ -115,11 +115,11 @@ Package imagemagick installs the following scripts: So it's fixup would be: --------------------------------- +---- IMAGEMAGICK_CONFIG_SCRIPTS = \ Magick-config Magick++-config \ MagickCore-config MagickWand-config Wand-config --------------------------------- +---- ================================ On line 14, we specify the list of dependencies this package relies @@ -166,10 +166,10 @@ for the host. It is possible to call both of them in a single +.mk+ file: once to create the rules to generate a target package and once to create the rules to generate a host package: ----------------------- +---- $(eval $(generic-package)) $(eval $(host-generic-package)) ----------------------- +---- This might be useful if the compilation of the target package requires some tools to be installed on the host. If the package name is @@ -504,12 +504,12 @@ not and can not work as people would expect it should: Buildroot package. A Makefile comment must always precede the addition of a CVE to this variable. Example: + ----------------------- +---- # 0001-fix-cve-2020-12345.patch LIBFOO_IGNORE_CVES += CVE-2020-12345 # only when built with libbaz, which Buildroot doesn't support LIBFOO_IGNORE_CVES += CVE-2020-54321 ----------------------- +---- * [[cpe-id]] +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the package to define its https://nvd.nist.gov/products/cpe[CPE @@ -551,9 +551,9 @@ corresponding target package. The recommended way to define these variables is to use the following syntax: ----------------------- +---- LIBFOO_VERSION = 2.32 ----------------------- +---- Now, the variables that define what should be performed at the different steps of the build process. @@ -633,13 +633,13 @@ different steps of the build process. The preferred way to define these variables is: ----------------------- +---- define LIBFOO_CONFIGURE_CMDS action 1 action 2 action 3 endef ----------------------- +---- In the action definitions, you can use the following variables: diff --git a/docs/manual/adding-packages-golang.adoc b/docs/manual/adding-packages-golang.adoc index 00b8bea285d..3ddbe57afe0 100644 --- a/docs/manual/adding-packages-golang.adoc +++ b/docs/manual/adding-packages-golang.adoc @@ -13,7 +13,7 @@ build system and use bundled dependencies. First, let's see how to write a +.mk+ file for a go package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -26,7 +26,7 @@ with an example : 10: FOO_LICENSE_FILES = LICENSE 11: 12: $(eval $(golang-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-hooks.adoc b/docs/manual/adding-packages-hooks.adoc index 741b71ca296..7aa7aa232dd 100644 --- a/docs/manual/adding-packages-hooks.adoc +++ b/docs/manual/adding-packages-hooks.adoc @@ -52,14 +52,14 @@ These variables are 'lists' of variable names containing actions to be performed at this hook point. This allows several hooks to be registered at a given hook point. Here is an example: ----------------------- +---- define LIBFOO_POST_PATCH_FIXUP action1 action2 endef LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP ----------------------- +---- [[hooks-rsync]] ==== Using the +POST_RSYNC+ hook diff --git a/docs/manual/adding-packages-kconfig.adoc b/docs/manual/adding-packages-kconfig.adoc index f2c40ed7a28..ee52cbd7370 100644 --- a/docs/manual/adding-packages-kconfig.adoc +++ b/docs/manual/adding-packages-kconfig.adoc @@ -30,11 +30,11 @@ In order to use the +kconfig-package+ infrastructure for a Buildroot package, the minimally required lines in the +.mk+ file, in addition to the variables required by the +generic-package+ infrastructure, are: ------------------------------- +---- FOO_KCONFIG_FILE = reference-to-source-configuration-file $(eval $(kconfig-package)) ------------------------------- +---- This snippet creates the following make targets: diff --git a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc index b948e208da8..3b3daebf557 100644 --- a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc +++ b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc @@ -22,7 +22,7 @@ Let's look at an example of a Linux tool. For a new Linux tool named descriptions related to each kernel tool that will be used and displayed in the configuration tool. It would basically look like: ------------------------------- +---- 01: config BR2_PACKAGE_LINUX_TOOLS_FOO 02: bool "foo" 03: select BR2_PACKAGE_LINUX_TOOLS @@ -30,7 +30,7 @@ displayed in the configuration tool. It would basically look like: 05: This is a comment that explains what foo kernel tool is. 06: 07: http://foosoftware.org/foo/ ------------------------------- +---- The name of the option starts with the prefix +BR2_PACKAGE_LINUX_TOOLS_+, followed by the uppercase name of the tool (like is done for packages). @@ -43,7 +43,7 @@ the `Target packages` main menu. Then for each linux tool, add a new +.mk.in+ file named +package/linux-tools/linux-tool-foo.mk.in+. It would basically look like: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -69,7 +69,7 @@ Then for each linux tool, add a new +.mk.in+ file named 23: DESTDIR=$(TARGET_DIR) \ 24: foo_install 25: endef --------------------------------- +---- On line 7, we register the Linux tool +foo+ to the list of available Linux tools. @@ -115,19 +115,19 @@ the existing +linux/Config.ext.in+. This file contains the option descriptions related to each kernel extension that will be used and displayed in the configuration tool. It would basically look like: ------------------------------- +---- 01: config BR2_LINUX_KERNEL_EXT_FOO 02: bool "foo" 03: help 04: This is a comment that explains what foo kernel extension is. 05: 06: http://foosoftware.org/foo/ ------------------------------- +---- Then for each linux extension, add a new +.mk+ file named +linux/linux-ext-foo.mk+. It should basically contain: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -139,7 +139,7 @@ Then for each linux extension, add a new +.mk+ file named 09: define FOO_PREPARE_KERNEL 10: $(FOO_DIR)/prepare-kernel-tree.sh --linux-dir=$(@D) 11: endef --------------------------------- +---- On line 7, we add the Linux extension +foo+ to the list of available Linux extensions. diff --git a/docs/manual/adding-packages-luarocks.adoc b/docs/manual/adding-packages-luarocks.adoc index 9ced6c55046..e9d47175686 100644 --- a/docs/manual/adding-packages-luarocks.adoc +++ b/docs/manual/adding-packages-luarocks.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a LuaRocks-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # lua-foo @@ -27,7 +27,7 @@ with an example : 14: LUA_FOO_LICENSE_FILES = $(LUA_FOO_SUBDIR)/COPYING 15: 16: $(eval $(luarocks-package)) ------------------------- +---- On line 7, we declare the version of the package (the same as in the rockspec, which is the concatenation of the upstream version and the rockspec revision, diff --git a/docs/manual/adding-packages-meson.adoc b/docs/manual/adding-packages-meson.adoc index 8c0f84709f8..16135b12978 100644 --- a/docs/manual/adding-packages-meson.adoc +++ b/docs/manual/adding-packages-meson.adoc @@ -14,7 +14,7 @@ build operations. Let's see how to write a +.mk+ file for a Meson-based package, with an example: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -38,7 +38,7 @@ Let's see how to write a +.mk+ file for a Meson-based package, with an example: 21: endif 22: 23: $(eval $(meson-package)) --------------------------------- +---- The Makefile starts with the definition of the standard variables for package declaration (lines 7 to 11). diff --git a/docs/manual/adding-packages-perl.adoc b/docs/manual/adding-packages-perl.adoc index 7c60a1a4a7e..405931770c2 100644 --- a/docs/manual/adding-packages-perl.adoc +++ b/docs/manual/adding-packages-perl.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a Perl/CPAN package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # perl-foo-bar @@ -26,7 +26,7 @@ with an example : 13: PERL_FOO_BAR_DISTNAME = Foo-Bar 14: 15: $(eval $(perl-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 7cb36357928..f33770f95c6 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -15,7 +15,7 @@ system, generally recognizable by the usage of a +setup.py+ script or First, let's see how to write a +.mk+ file for a Python package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # python-foo @@ -32,7 +32,7 @@ with an example : 14: PYTHON_FOO_SETUP_TYPE = setuptools 15: 16: $(eval $(python-package)) ------------------------- +---- On line 7, we declare the version of the package. @@ -170,9 +170,9 @@ your host. When at the root of your buildroot directory just do : ------------------------ +---- utils/scanpypi foo bar -o package ------------------------ +---- This will generate packages +python-foo+ and +python-bar+ in the package folder if they exist on https://pypi.python.org. @@ -190,18 +190,18 @@ need to manually add the package to the +package/Config.in+ file. If your Buildroot package is not in the official Buildroot tree but in a br2-external tree, use the -o flag as follows: ------------------------ +---- utils/scanpypi foo bar -o other_package_dir ------------------------ +---- This will generate packages +python-foo+ and +python-bar+ in the +other_package_directory+ instead of +package+. Option +-h+ will list the available options: ------------------------ +---- utils/scanpypi -h ------------------------ +---- [[python-package-cffi-backend]] @@ -219,17 +219,17 @@ Such a package should: compiled C library wrapper on the target. This is achieved by adding +select BR2_PACKAGE_PYTHON_CFFI+ to the package +Config.in+. ------------------------- +---- config BR2_PACKAGE_PYTHON_FOO bool "python-foo" select BR2_PACKAGE_PYTHON_CFFI # runtime ------------------------- +---- * add +host-python-cffi+ as a build-time dependency in order to cross-compile the C wrapper. This is achieved by adding +host-python-cffi+ to the +PYTHON_FOO_DEPENDENCIES+ variable. ------------------------- +---- ################################################################################ # # python-foo @@ -241,4 +241,4 @@ cross-compile the C wrapper. This is achieved by adding PYTHON_FOO_DEPENDENCIES = host-python-cffi $(eval $(python-package)) ------------------------- +---- diff --git a/docs/manual/adding-packages-qmake.adoc b/docs/manual/adding-packages-qmake.adoc index 0205f6ca293..e09da166b90 100644 --- a/docs/manual/adding-packages-qmake.adoc +++ b/docs/manual/adding-packages-qmake.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a QMake-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -24,7 +24,7 @@ an example : 11: LIBFOO_DEPENDENCIES = bar 12: 13: $(eval $(qmake-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-rebar.adoc b/docs/manual/adding-packages-rebar.adoc index c2a5b0d0e9e..d2ed67c4741 100644 --- a/docs/manual/adding-packages-rebar.adoc +++ b/docs/manual/adding-packages-rebar.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a rebar-based package, with an example : ------------------------------- +---- 01: ################################################################################ 02: # 03: # erlang-foobar @@ -23,7 +23,7 @@ with an example : 10: ERLANG_FOOBAR_DEPENDENCIES = host-libaaa libbbb 11: 12: $(eval $(rebar-package)) --------------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-tips.adoc b/docs/manual/adding-packages-tips.adoc index d8c2eceb105..b04b42b51f9 100644 --- a/docs/manual/adding-packages-tips.adoc +++ b/docs/manual/adding-packages-tips.adoc @@ -172,11 +172,11 @@ However, it is possible to download tarballs directly from the repository on GitHub. As GitHub is known to have changed download mechanisms in the past, the 'github' helper function should be used as shown below. ------------------------- +---- # Use a tag or a full commit ID FOO_VERSION = 1.0 FOO_SITE = $(call github,,,v$(FOO_VERSION)) ------------------------- +---- .Notes - The FOO_VERSION can either be a tag or a commit ID. @@ -220,22 +220,22 @@ to download from Gitlab repositories. It can be used to download auto-generated tarballs produced by Gitlab, either for specific tags or commits: ------------------------- +---- # Use a tag or a full commit ID FOO_VERSION = 1.0 FOO_SITE = $(call gitlab,,,v$(FOO_VERSION)) ------------------------- +---- By default, it will use a +.tar.gz+ tarball, but Gitlab also provides +.tar.bz2+ tarballs, so by adding a +_SOURCE+ variable, this +.tar.bz2+ tarball can be used: ------------------------- +---- # Use a tag or a full commit ID FOO_VERSION = 1.0 FOO_SITE = $(call gitlab,,,v$(FOO_VERSION)) FOO_SOURCE = foo-$(FOO_VERSION).tar.bz2 ------------------------- +---- If there is a specific tarball uploaded by the upstream developers in +https://gitlab.com//releases/+, do not use this macro, but diff --git a/docs/manual/adding-packages-virtual.adoc b/docs/manual/adding-packages-virtual.adoc index 722e6e3771f..297e189186d 100644 --- a/docs/manual/adding-packages-virtual.adoc +++ b/docs/manual/adding-packages-virtual.adoc @@ -26,14 +26,14 @@ First, let's create the virtual package. The +Config.in+ file of virtual package 'something-virtual' should contain: ---------------------------- +---- 01: config BR2_PACKAGE_HAS_SOMETHING_VIRTUAL 02: bool 03: 04: config BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL 05: depends on BR2_PACKAGE_HAS_SOMETHING_VIRTUAL 06: string ---------------------------- +---- In this file, we declare two options, +BR2_PACKAGE_HAS_SOMETHING_VIRTUAL+ and +BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL+, whose values will be used by the @@ -43,7 +43,7 @@ providers. The +.mk+ for the virtual package should just evaluate the +virtual-package+ macro: ---------------------------- +---- 01: ################################################################################ 02: # 03: # something-virtual @@ -51,7 +51,7 @@ The +.mk+ for the virtual package should just evaluate the +virtual-package+ mac 05: ################################################################################ 06: 07: $(eval $(virtual-package)) ---------------------------- +---- The ability to have target and host packages is also available, with the +host-virtual-package+ macro. @@ -64,7 +64,7 @@ modifications. The +Config.in+ file of the package 'some-provider', which provides the functionalities of 'something-virtual', should contain: ---------------------------- +---- 01: config BR2_PACKAGE_SOME_PROVIDER 02: bool "some-provider" 03: select BR2_PACKAGE_HAS_SOMETHING_VIRTUAL @@ -77,7 +77,7 @@ functionalities of 'something-virtual', should contain: 10: config BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL 11: default "some-provider" 12: endif ---------------------------- +---- On line 3, we select +BR2_PACKAGE_HAS_SOMETHING_VIRTUAL+, and on line 11, we set the value of +BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL+ to the name of the @@ -89,9 +89,9 @@ The +.mk+ file should also declare an additional variable +SOME_PROVIDER_PROVIDES+ to contain the names of all the virtual packages it is an implementation of: ---------------------------- +---- 01: SOME_PROVIDER_PROVIDES = something-virtual ---------------------------- +---- Of course, do not forget to add the proper build and runtime dependencies for this package! @@ -101,14 +101,14 @@ this package! When adding a package that requires a certain +FEATURE+ provided by a virtual package, you have to use +depends on BR2_PACKAGE_HAS_FEATURE+, like so: ---------------------------- +---- config BR2_PACKAGE_HAS_FEATURE bool config BR2_PACKAGE_FOO bool "foo" depends on BR2_PACKAGE_HAS_FEATURE ---------------------------- +---- ==== Notes on depending on a specific provider @@ -118,7 +118,7 @@ provider. Let's take an example with two providers for a +FEATURE+: ---------------------------- +---- config BR2_PACKAGE_HAS_FEATURE bool @@ -129,7 +129,7 @@ config BR2_PACKAGE_FOO config BR2_PACKAGE_BAR bool "bar" select BR2_PACKAGE_HAS_FEATURE ---------------------------- +---- And you are adding a package that needs +FEATURE+ as provided by +foo+, but not as provided by +bar+. diff --git a/docs/manual/adding-packages-waf.adoc b/docs/manual/adding-packages-waf.adoc index 7622c55a7b2..59029172145 100644 --- a/docs/manual/adding-packages-waf.adoc +++ b/docs/manual/adding-packages-waf.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a Waf-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -24,7 +24,7 @@ an example : 11: LIBFOO_DEPENDENCIES = bar 12: 13: $(eval $(waf-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/beyond-buildroot.adoc b/docs/manual/beyond-buildroot.adoc index eefea1fecf7..871b591a02c 100644 --- a/docs/manual/beyond-buildroot.adoc +++ b/docs/manual/beyond-buildroot.adoc @@ -13,9 +13,9 @@ images_ menu. After a complete build, just run the following commands to setup the NFS-root directory: -------------------- +---- sudo tar -xavf /path/to/output_dir/rootfs.tar -C /path/to/nfs_root_dir -------------------- +---- Remember to add this path to +/etc/exports+. @@ -34,21 +34,21 @@ as a live CD and live USB (through the _Build hybrid image_ option). You can test your live CD image using QEMU: -------------------- +---- qemu-system-i386 -cdrom output/images/rootfs.iso9660 -------------------- +---- Or use it as a hard-drive image if it is a hybrid ISO: -------------------- +---- qemu-system-i386 -hda output/images/rootfs.iso9660 -------------------- +---- It can be easily flashed to a USB drive with +dd+: -------------------- +---- dd if=output/images/rootfs.iso9660 of=/dev/sdb -------------------- +---- === Chroot diff --git a/docs/manual/ccache-support.adoc b/docs/manual/ccache-support.adoc index ab4f10be23c..86cb4a150dc 100644 --- a/docs/manual/ccache-support.adoc +++ b/docs/manual/ccache-support.adoc @@ -28,13 +28,13 @@ misses, etc.) by running +make ccache-stats+. The make target +ccache-options+ and the +CCACHE_OPTIONS+ variable provide more generic access to the ccache. For example ------------------ +---- # set cache limit size make CCACHE_OPTIONS="--max-size=5G" ccache-options # zero statistics counters make CCACHE_OPTIONS="--zero-stats" ccache-options ------------------ +---- +ccache+ makes a hash of the source files and of the compiler options. If a compiler option is different, the cached object file will not be diff --git a/docs/manual/common-usage.adoc b/docs/manual/common-usage.adoc index e0ab1a9f660..43caa3a9bc8 100644 --- a/docs/manual/common-usage.adoc +++ b/docs/manual/common-usage.adoc @@ -13,9 +13,9 @@ If you intend to do an offline build and just want to download all sources that you previously selected in the configurator ('menuconfig', 'nconfig', 'xconfig' or 'gconfig'), then issue: --------------------- +---- $ make source --------------------- +---- You can now disconnect or copy the content of your +dl+ directory to the build-host. @@ -29,15 +29,15 @@ Buildroot also supports building out of tree with a syntax similar to the Linux kernel. To use it, add +O=+ to the make command line: --------------------- +---- $ make O=/tmp/build menuconfig --------------------- +---- Or: --------------------- +---- $ cd /tmp/build; make O=$PWD -C path/to/buildroot menuconfig --------------------- +---- All the output files will be located under +/tmp/build+. If the +O+ path does not exist, Buildroot will create it. @@ -56,9 +56,9 @@ For ease of use, Buildroot generates a Makefile wrapper in the output directory - so after the first run, you no longer need to pass +O=<...>+ and +-C <...>+, simply run (in the output directory): --------------------- +---- $ make --------------------- +---- [[env-vars]] @@ -108,16 +108,16 @@ to +make+ or set in the environment: An example that uses config files located in the toplevel directory and in your $HOME: --------------------- +---- $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config --------------------- +---- If you want to use a compiler other than the default +gcc+ or +g+++ for building helper-binaries on your host, then do --------------------- +---- $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD --------------------- +---- === Dealing efficiently with filesystem images @@ -166,9 +166,9 @@ packages in the current configuration, together with their dependencies, licenses and other metadata. This JSON blurb is produced by using the +show-info+ make target: ------------------------- +---- make show-info ------------------------- +---- Buildroot can also produce details about packages as HTML and JSON output using the +pkg-stats+ make target. Amongst other things, these @@ -176,9 +176,9 @@ details include whether known CVEs (security vulnerabilities) affect the packages in your current configuration. It also shows if there is a newer upstream version for those packages. ------------------------- +---- make pkg-stats ------------------------- +---- === Graphing the dependencies between packages @@ -198,9 +198,9 @@ graphs. To generate a dependency graph of the full system you have compiled, simply run: ------------------------- +---- make graph-depends ------------------------- +---- You will find the generated graph in +output/graphs/graph-depends.pdf+. @@ -209,9 +209,9 @@ If your system is quite large, the dependency graph may be too complex and difficult to read. It is therefore possible to generate the dependency graph just for a given package: ------------------------- +---- make -graph-depends ------------------------- +---- You will find the generated graph in +output/graph/-graph-depends.pdf+. @@ -227,9 +227,9 @@ can switch to other output formats, such as PNG, PostScript or SVG. All formats supported by the +-T+ option of the +dot+ tool are supported. --------------------------------- +---- BR2_GRAPH_OUT=svg make graph-depends --------------------------------- +---- The +graph-depends+ behaviour can be controlled by setting options in the +BR2_GRAPH_DEPS_OPTS+ environment variable. The accepted options are: @@ -253,9 +253,9 @@ The +graph-depends+ behaviour can be controlled by setting options in the root package (+R+), the target packages (+T+) and the host packages (+H+). Defaults to: +lightblue,grey,gainsboro+ --------------------------------- +---- BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colors=red,green,blue' make graph-depends --------------------------------- +---- === Graphing the build duration @@ -269,9 +269,9 @@ step of each package, and allows to generate graphs from this data. To generate the build time graph after a build, run: ----------------- +---- make graph-build ----------------- +---- This will generate a set of files in +output/graphs+ : @@ -299,9 +299,9 @@ By default, the output format for the graph is PDF, but a different format can be selected using the +BR2_GRAPH_OUT+ environment variable. The only other format supported is PNG: ----------------- +---- BR2_GRAPH_OUT=png make graph-build ----------------- +---- [[graph-size]] === Graphing the filesystem size contribution of packages @@ -315,9 +315,9 @@ the different packages. To generate these data after a build, run: ----------------- +---- make graph-size ----------------- +---- This will generate: @@ -366,9 +366,9 @@ Buildroot release, use the +size-stats-compare+ script. It takes two +file-size-stats.csv+ files (produced by +make graph-size+) as input. Refer to the help text of this script for more details: ----------------- +---- utils/size-stats-compare -h ----------------- +---- [[top-level-parallel-build]] === Top-level parallel build diff --git a/docs/manual/configure.adoc b/docs/manual/configure.adoc index 60860d2c716..d27cdf3eb96 100644 --- a/docs/manual/configure.adoc +++ b/docs/manual/configure.adoc @@ -252,9 +252,9 @@ Then, we can trigger the build, and also ask Buildroot to generate a SDK. This will conveniently generate for us a tarball which contains our toolchain: ------ +---- make sdk ------ +---- This produces the SDK tarball in +$(O)/images+, with a name similar to +arm-buildroot-linux-uclibcgnueabi_sdk-buildroot.tar.gz+. Save this diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 078725ef567..fe3ae963a58 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -72,9 +72,9 @@ basically two things that can be done: can be removed. In the commit message of a patch fixing an autobuild failure, add a reference to the build result directory, as follows: ---------------------- +---- Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 ---------------------- +---- === Reviewing and testing patches @@ -153,10 +153,10 @@ When browsing patches in the patchwork management interface, an +mbox+ link is provided at the top of the page. Copy this link address and run the following commands: ---------------------- +---- $ git checkout -b $ wget -O - | git am ---------------------- +---- Another option for applying patches is to create a bundle. A bundle is a set of patches that you can group together using the patchwork @@ -310,24 +310,24 @@ Starting from the changes committed in your local git view, _rebase_ your development branch on top of the upstream tree before generating a patch set. To do so, run: ---------------------- +---- $ git fetch --all --tags $ git rebase origin/master ---------------------- +---- Now check the coding style for the changes you committed: ---------------------- +---- $ utils/docker-run make check-package ---------------------- +---- Now, you are ready to generate then submit your patch set. To generate it, run: ---------------------- +---- $ git format-patch -M -n -s -o outgoing origin/master ---------------------- +---- This will generate patch files in the +outgoing+ subdirectory, automatically adding the +Signed-off-by+ line. @@ -340,37 +340,37 @@ sent, called +get-developers+ (see xref:DEVELOPERS[] for more information). This tool reads your patches and outputs the appropriate +git send-email+ command to use: ---------------------- +---- $ ./utils/get-developers outgoing/* ---------------------- +---- Use the output of +get-developers+ to send your patches: ---------------------- +---- $ git send-email --to buildroot@buildroot.org --cc bob --cc alice outgoing/* ---------------------- +---- Alternatively, +get-developers -e+ can be used directly with the +--cc-cmd+ argument to +git send-email+ to automatically CC the affected developers: ---------------------- +---- $ git send-email --to buildroot@buildroot.org \ --cc-cmd './utils/get-developers -e' origin/master ---------------------- +---- +git+ can be configured to automatically do this out of the box with: ---------------------- +---- $ git config sendemail.to buildroot@buildroot.org $ git config sendemail.ccCmd "$(pwd)/utils/get-developers -e" ---------------------- +---- And then just do: ---------------------- +---- $ git send-email origin/master ---------------------- +---- Note that +git+ should be configured to use your mail account. To configure +git+, see +man git-send-email+ or https://git-send-email.io/. @@ -431,10 +431,10 @@ should be based off the maintenance branch, and the patch subject prefix must include the maintenance branch name (for example "[PATCH 2020.02.x]"). This can be done with the +git format-patch+ flag +--subject-prefix+: ---------------------- +---- $ git format-patch --subject-prefix "PATCH 2020.02.x" \ -M -s -o outgoing origin/2020.02.x ---------------------- +---- Then send the patches with +git send-email+, as described above. @@ -462,7 +462,7 @@ be preserved forever in the +git+ history of the project. Hereafter the recommended layout: ---------------- +---- Patch title: short explanation, max 72 chars A paragraph that explains the problem, and how it manifests itself. If @@ -485,7 +485,7 @@ Changes v2 -> v3: Changes v1 -> v2: - alpha bravo (suggested by John) - charly delta ---------------- +---- Any patch revision should include the version number. The version number is simply composed of the letter +v+ followed by an +integer+ greater or @@ -494,17 +494,17 @@ equal to two (i.e. "PATCH v2", "PATCH v3" ...). This can be easily handled with +git format-patch+ by using the option +--subject-prefix+: ---------------------- +---- $ git format-patch --subject-prefix "PATCH v4" \ -M -s -o outgoing origin/master ---------------------- +---- Since git version 1.8.1, you can also use +-v + (where is the version number): ---------------------- +---- $ git format-patch -v4 -M -s -o outgoing origin/master ---------------------- +---- When you provide a new version of a patch, please mark the old one as superseded in @@ -583,7 +583,7 @@ cases can be listed by executing +support/testing/run-tests -l+. These tests can all be run individually during test development from the console. Both one at a time and selectively as a group of a subset of tests. ---------------------- +---- $ support/testing/run-tests -l List of tests test_run (tests.utils.test_check_package.TestCheckPackage) @@ -610,11 +610,11 @@ test_run (tests.init.test_busybox.TestInitSystemBusyboxRwNet) ... ok Ran 157 tests in 0.021s OK ---------------------- +---- * Then, to run one test case: ---------------------- +---- $ support/testing/run-tests -d dl -o output_folder -k tests.init.test_busybox.TestInitSystemBusyboxRw 15:03:26 TestInitSystemBusyboxRw Starting 15:03:28 TestInitSystemBusyboxRw Building @@ -624,7 +624,7 @@ $ support/testing/run-tests -d dl -o output_folder -k tests.init.test_busybox.Te Ran 1 test in 301.140s OK ---------------------- +---- The standard output indicates if the test is successful or not. By default, the output folder for the test is deleted automatically @@ -678,12 +678,12 @@ be the maintainer of that test case. When a test case runs, the +output_folder+ will contain the following: ---------------------- +---- $ ls output_folder/ TestInitSystemBusyboxRw/ TestInitSystemBusyboxRw-build.log TestInitSystemBusyboxRw-run.log ---------------------- +---- +TestInitSystemBusyboxRw/+ is the Buildroot output directory, and it is preserved only if the +-k+ option is passed. @@ -725,28 +725,28 @@ arbitrary string you choose. * To trigger all run-test test case jobs, push a branch that ends with +-runtime-tests+: ---------------------- +---- $ git push gitlab HEAD:-runtime-tests ---------------------- +---- * To trigger one or several test case jobs, push a branch that ends with the complete test case name (+tests.init.test_busybox.TestInitSystemBusyboxRo+) or with the name of a category of tests (+tests.init.test_busybox+): ---------------------- +---- $ git push gitlab HEAD:- ---------------------- +---- Example to run one test: ---------------------- +---- $ git push gitlab HEAD:foo-tests.init.test_busybox.TestInitSystemBusyboxRo ---------------------- +---- Examples to run several tests part of the same group: ---------------------- +---- $ git push gitlab HEAD:foo-tests.init.test_busybox $ git push gitlab HEAD:foo-tests.init ---------------------- +---- diff --git a/docs/manual/customize-directory-structure.adoc b/docs/manual/customize-directory-structure.adoc index 1249421da2f..e0eecb56417 100644 --- a/docs/manual/customize-directory-structure.adoc +++ b/docs/manual/customize-directory-structure.adoc @@ -16,7 +16,7 @@ this structure itself: either inside the Buildroot tree, or outside of it using a br2-external tree. Both options are valid, the choice is up to you. ------ +---- +-- board/ | +-- / | +-- / @@ -51,7 +51,7 @@ to you. +-- Config.in (if using a br2-external tree) +-- external.mk (if using a br2-external tree) +-- external.desc (if using a br2-external tree) ------- +---- Details on the files shown above are given further in this chapter. @@ -79,7 +79,7 @@ more than two layers. An example directory structure for where a user has two customization layers 'common' and 'fooboard' is: ------ +---- +-- board/ +-- / +-- common/ @@ -98,14 +98,14 @@ layers 'common' and 'fooboard' is: | +-- ... +-- patches/ +-- ... ------ +---- For example, if the user has the +BR2_GLOBAL_PATCH_DIR+ configuration option set as: ------ +---- BR2_GLOBAL_PATCH_DIR="board//common/patches board//fooboard/patches" ------ +---- then first the patches from the 'common' layer would be applied, followed by the patches from the 'fooboard' layer. diff --git a/docs/manual/customize-outside-br.adoc b/docs/manual/customize-outside-br.adoc index 348f2b089ce..5e653f1603e 100644 --- a/docs/manual/customize-outside-br.adoc +++ b/docs/manual/customize-outside-br.adoc @@ -40,23 +40,23 @@ xref:br2-external-converting[] for help on doing so. Some examples: ------ +---- buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig ------ +---- From now on, definitions from the +/path/to/foo+ br2-external tree will be used: ------ +---- buildroot/ $ make buildroot/ $ make legal-info ------ +---- We can switch to another br2-external tree at any time: ------ +---- buildroot/ $ make BR2_EXTERNAL=/where/we/have/bar xconfig ------ +---- We can also use multiple br2-external trees: @@ -66,9 +66,9 @@ buildroot/ $ make BR2_EXTERNAL=/path/to/foo:/where/we/have/bar menuconfig Or disable the usage of any br2-external tree: ------ +---- buildroot/ $ make BR2_EXTERNAL= xconfig ------ +---- ==== Layout of a br2-external tree @@ -152,16 +152,16 @@ makefile logic. The main usage of this is to store package recipes. The recommended way to do this is to write a +Config.in+ file that looks like: ------- +---- source "$BR2_EXTERNAL_BAR_42_PATH/package/package1/Config.in" source "$BR2_EXTERNAL_BAR_42_PATH/package/package2/Config.in" ------- +---- Then, have an +external.mk+ file that looks like: ------- +---- include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) ------- +---- And then in +$(BR2_EXTERNAL_BAR_42_PATH)/package/package1+ and +$(BR2_EXTERNAL_BAR_42_PATH)/package/package2+ create normal diff --git a/docs/manual/customize-packages.adoc b/docs/manual/customize-packages.adoc index b57280ea10d..af2fd13debd 100644 --- a/docs/manual/customize-packages.adoc +++ b/docs/manual/customize-packages.adoc @@ -34,19 +34,19 @@ includes these additional +.mk+ files. Therefore, create a file +package//.mk+ with following contents (assuming you have only one extra directory level below +package//+): ------ +---- include $(sort $(wildcard package//*/*.mk)) ------ +---- For the +Config.in+ files, create a file +package//Config.in+ that includes the +Config.in+ files of all your packages. An exhaustive list has to be provided since wildcards are not supported in the source command of kconfig. For example: ------ +---- source "package//package1/Config.in" source "package//package2/Config.in" ------ +---- Include this new file +package//Config.in+ from +package/Config.in+, preferably in a company-specific menu to make diff --git a/docs/manual/download-location.adoc b/docs/manual/download-location.adoc index d485df94f59..b2c527ad050 100644 --- a/docs/manual/download-location.adoc +++ b/docs/manual/download-location.adoc @@ -18,9 +18,9 @@ shared download location. This can be achieved by pointing the set, then the value of +BR2_DL_DIR+ in the Buildroot configuration is overridden. The following line should be added to +<~/.bashrc>+. ------------------ +---- export BR2_DL_DIR= ------------------ +---- The download location can also be set in the +.config+ file, with the +BR2_DL_DIR+ option. Unlike most options in the .config file, this value diff --git a/docs/manual/faq-troubleshooting.adoc b/docs/manual/faq-troubleshooting.adoc index a61276d4c56..5f132f99f6c 100644 --- a/docs/manual/faq-troubleshooting.adoc +++ b/docs/manual/faq-troubleshooting.adoc @@ -10,12 +10,12 @@ If the boot process seems to hang after the following messages (messages not necessarily exactly similar, depending on the list of packages selected): ------------------------- +---- Freeing init memory: 3972K Initializing random number generator... done. Starting network... Starting dropbear sshd: generating rsa key... generating dsa key... OK ------------------------- +---- then it means that your system is running, but didn't start a shell on the serial console. In order to have the system start a shell on your diff --git a/docs/manual/getting.adoc b/docs/manual/getting.adoc index 549938a223d..51c97d57931 100644 --- a/docs/manual/getting.adoc +++ b/docs/manual/getting.adoc @@ -18,17 +18,17 @@ get started. If you want to setup an isolated buildroot environment on Linux or Mac Os X, paste this line onto your terminal: --------------------- +---- curl -O https://buildroot.org/downloads/Vagrantfile; vagrant up --------------------- +---- If you are on Windows, paste this into your powershell: --------------------- +---- (new-object System.Net.WebClient).DownloadFile( "https://buildroot.org/downloads/Vagrantfile","Vagrantfile"); vagrant up --------------------- +---- If you want to follow development, you can use the daily snapshots or make a clone of the Git repository. Refer to the diff --git a/docs/manual/legal-notice.adoc b/docs/manual/legal-notice.adoc index 179aa6b1798..495c5ffe9c4 100644 --- a/docs/manual/legal-notice.adoc +++ b/docs/manual/legal-notice.adoc @@ -24,9 +24,9 @@ To make this easier for you, Buildroot can collect for you some material you will probably need. To produce this material, after you have configured Buildroot with +make menuconfig+, +make xconfig+ or +make gconfig+, run: --------------------- +---- make legal-info --------------------- +---- Buildroot will collect legally-relevant material in your output directory, under the +legal-info/+ subdirectory. diff --git a/docs/manual/make-tips.adoc b/docs/manual/make-tips.adoc index df3b888c25e..4ccb460525e 100644 --- a/docs/manual/make-tips.adoc +++ b/docs/manual/make-tips.adoc @@ -8,21 +8,21 @@ This is a collection of tips that help you make the most of Buildroot. .Display all commands executed by make: --------------------- +---- $ make V=1 --------------------- +---- .Display the list of boards with a defconfig: --------------------- +---- $ make list-defconfigs --------------------- +---- .Display all available targets: --------------------- +---- $ make help --------------------- +---- Not all targets are always available, some settings in the +.config+ file may hide some targets: @@ -46,19 +46,19 @@ configuration options are changed. To delete all build products (including build directories, host, staging and target trees, the images and the toolchain): --------------------- +---- $ make clean --------------------- +---- .Generating the manual: The present manual sources are located in the 'docs/manual' directory. To generate the manual: ---------------------------------- +---- $ make manual-clean $ make manual ---------------------------------- +---- The manual outputs will be generated in 'output/docs/manual'. @@ -70,9 +70,9 @@ The manual outputs will be generated in 'output/docs/manual'. To delete all build products as well as the configuration: --------------------- +---- $ make distclean --------------------- +---- .Notes If +ccache+ is enabled, running +make clean+ or +distclean+ does diff --git a/docs/manual/package-make-target.adoc b/docs/manual/package-make-target.adoc index 795c7d46dee..90a7910e23e 100644 --- a/docs/manual/package-make-target.adoc +++ b/docs/manual/package-make-target.adoc @@ -12,9 +12,9 @@ For packages relying on the Buildroot infrastructure, there are numerous special make targets that can be called independently like this: ------------- +---- make - ------------- +---- The package build targets are (in the order they are executed): diff --git a/docs/manual/patch-policy.adoc b/docs/manual/patch-policy.adoc index dc35132ecfd..a4bc5f391ab 100644 --- a/docs/manual/patch-policy.adoc +++ b/docs/manual/patch-policy.adoc @@ -122,7 +122,7 @@ removed, but do update the rest of the patch comment when appropriate. At the end, the patch should look like: ---------------- +---- configure.ac: add C++ support test Signed-off-by: John Doe @@ -142,7 +142,7 @@ AC_PROG_MAKE_SET + AC_LANG_POP([C++])]) + +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) ---------------- +---- === Additional patch documentation @@ -152,17 +152,17 @@ applicable, via the +Upstream+ trailer. When backporting an upstream patch that has been accepted into mainline, it is preferred that the URL to the commit is referenced: ---------------- +---- Upstream: ---------------- +---- If a new issue is identified in Buildroot and upstream is generally affected by the issue (it's not a Buildroot specific issue), users should submit the patch upstream and provide a link to that submission when possible: ---------------- +---- Upstream: ---------------- +---- Patches that have been submitted but were denied upstream should note that and include comments about why the patch is being used despite the upstream status. @@ -172,9 +172,9 @@ about any changes to the patch that may have been necessary. If a patch does not apply upstream then this should be noted with a comment: ---------------- +---- Upstream: N/A ---------------- +---- Adding this documentation helps streamline the patch review process during package version updates. \ No newline at end of file diff --git a/docs/manual/quickstart.adoc b/docs/manual/quickstart.adoc index 80569e85f40..605031037f9 100644 --- a/docs/manual/quickstart.adoc +++ b/docs/manual/quickstart.adoc @@ -15,27 +15,27 @@ http://www.busybox.net/[BusyBox]. From the buildroot directory, run --------------------- +---- $ make menuconfig --------------------- +---- for the original curses-based configurator, or --------------------- +---- $ make nconfig --------------------- +---- for the new curses-based configurator, or --------------------- +---- $ make xconfig --------------------- +---- for the Qt-based configurator, or --------------------- +---- $ make gconfig --------------------- +---- for the GTK-based configurator. @@ -56,9 +56,9 @@ read by the top-level Makefile. To start the build process, simply run: --------------------- +---- $ make --------------------- +---- By default, Buildroot does not support top-level parallel build, so running +make -jN+ is not necessary. There is however experimental diff --git a/docs/manual/rebuilding-packages.adoc b/docs/manual/rebuilding-packages.adoc index 06d3855148d..0658a93b303 100644 --- a/docs/manual/rebuilding-packages.adoc +++ b/docs/manual/rebuilding-packages.adoc @@ -86,9 +86,9 @@ necessary, and you will save more and more time. For reference, a full rebuild is achieved by running: ---------------- +---- $ make clean all ---------------- +---- [[rebuild-pkg]] === Understanding how to rebuild packages diff --git a/docs/manual/using-buildroot-debugger.adoc b/docs/manual/using-buildroot-debugger.adoc index 9a8a7dfbaf9..c208e86bbdc 100644 --- a/docs/manual/using-buildroot-debugger.adoc +++ b/docs/manual/using-buildroot-debugger.adoc @@ -24,9 +24,9 @@ To achieve this: Now, to start debugging a program called +foo+, you should run on the target: ----------------------------- +---- gdbserver :2345 foo ----------------------------- +---- This will cause +gdbserver+ to listen on TCP port 2345 for a connection from the cross gdb. @@ -34,9 +34,9 @@ from the cross gdb. Then, on the host, you should start the cross gdb using the following command line: ----------------------------- +---- /output/host/bin/-gdb -ix /output/staging/usr/share/buildroot/gdbinit foo ----------------------------- +---- Of course, +foo+ must be available in the current directory, built with debugging symbols. Typically you start this command from the @@ -48,6 +48,6 @@ cross gdb where to find the libraries of the target. Finally, to connect to the target from the cross gdb: ----------------------------- +---- (gdb) target remote :2345 ----------------------------- +---- diff --git a/docs/manual/using-buildroot-development.adoc b/docs/manual/using-buildroot-development.adoc index da6dd822fb0..72628e0a6f9 100644 --- a/docs/manual/using-buildroot-development.adoc +++ b/docs/manual/using-buildroot-development.adoc @@ -47,17 +47,17 @@ option. In this _override_ file, Buildroot expects to find lines of the form: ------------------- +---- _OVERRIDE_SRCDIR = /path/to/pkg1/sources _OVERRIDE_SRCDIR = /path/to/pkg2/sources ------------------- +---- For example: ------------------- +---- LINUX_OVERRIDE_SRCDIR = /home/bob/linux/ BUSYBOX_OVERRIDE_SRCDIR = /home/bob/busybox/ ------------------- +---- When Buildroot finds that for a given package, an +_OVERRIDE_SRCDIR+ has been defined, it will no longer attempt to @@ -79,17 +79,17 @@ process of just this package. In the example of the +linux+ package above, the developer can then make a source code change in +/home/bob/linux+ and then run: ------------------------ +---- make linux-rebuild all ------------------------ +---- and in a matter of seconds gets the updated Linux kernel image in +output/images+. Similarly, a change can be made to the BusyBox source code in +/home/bob/busybox+, and after: ------------------------ +---- make busybox-rebuild all ------------------------ +---- the root filesystem image in +output/images+ contains the updated BusyBox. @@ -102,13 +102,13 @@ from the source tree. For example, when working on the +webkitgtk+ package, the following will exclude the tests and in-tree builds from a local WebKit source tree: ------------------- +---- WEBKITGTK_OVERRIDE_SRCDIR = /home/bob/WebKit WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \ --exclude JSTests --exclude ManualTests --exclude PerformanceTests \ --exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \ --exclude WebKit.xcworkspace --exclude Websites --exclude Examples ------------------- +---- By default, Buildroot skips syncing of VCS artifacts (e.g., the *.git* and *.svn* directories). Some packages prefer to have these VCS directories @@ -116,6 +116,6 @@ available during build, for example for automatically determining a precise commit reference for version information. To undo this built-in filtering at a cost of a slower speed, add these directories back: ------------------- +---- LINUX_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = --include .git ------------------- +---- diff --git a/docs/manual/writing-rules.adoc b/docs/manual/writing-rules.adoc index 13b7fd5bea6..03e4f2c61cf 100644 --- a/docs/manual/writing-rules.adoc +++ b/docs/manual/writing-rules.adoc @@ -23,7 +23,7 @@ Buildroot. An entry has the following pattern: ---------------------- +---- config BR2_PACKAGE_LIBFOO bool "libfoo" depends on BR2_PACKAGE_LIBBAZ @@ -33,7 +33,7 @@ config BR2_PACKAGE_LIBFOO should be wrapped. http://foosoftware.org/libfoo/ ---------------------- +---- * The +bool+, +depends on+, +select+ and +help+ lines are indented with one tab. @@ -57,31 +57,31 @@ http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[]. preferably in lowercase, enclosed between separators made of 80 hashes. A blank line is mandatory after the header: + ---------------------- +---- ################################################################################ # # libfoo # ################################################################################ ---------------------- +---- + * Assignment: use +=+ preceded and followed by one space: + ---------------------- +---- LIBFOO_VERSION = 1.0 LIBFOO_CONF_OPTS += --without-python-support ---------------------- +---- + Do not align the +=+ signs. * Indentation: use tab only: + ---------------------- +---- define LIBFOO_REMOVE_DOC $(RM) -r $(TARGET_DIR)/usr/share/libfoo/doc \ $(TARGET_DIR)/usr/share/man/man3/libfoo* endef ---------------------- +---- + Note that commands inside a +define+ block should always start with a tab, so _make_ recognizes them as commands. @@ -92,21 +92,21 @@ so _make_ recognizes them as commands. + YES: + ---------------------- +---- ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBFOO_CONF_OPTS += --with-python-support LIBFOO_DEPENDENCIES += python3 else LIBFOO_CONF_OPTS += --without-python-support endif ---------------------- +---- + NO: + ---------------------- +---- LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON3),,out)-python-support LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) ---------------------- +---- ** Keep configure options and dependencies close together. @@ -115,18 +115,18 @@ LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) + YES: + ---------------------- +---- ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) define LIBFOO_REMOVE_DATA $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif ---------------------- +---- + NO: + ---------------------- +---- define LIBFOO_REMOVE_DATA $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef @@ -134,7 +134,7 @@ endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif ---------------------- +---- [[writing-genimage-cfg]] @@ -145,7 +145,7 @@ uses to create final .img file. An example follows: ---------------------- +---- image efi-part.vfat { vfat { file EFI { @@ -174,7 +174,7 @@ image sdimage.img { size = 512M } } ---------------------- +---- * Every +section+(i.e. hdimage, vfat etc.), +partition+ must be indented with one tab. From b162aab7c6da6b45dc5ba9ad30b59b4362e2dc2e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 21:07:14 +0200 Subject: [PATCH 1631/3013] package/pppd: add patch fixing build issue on SPARC/SPARC64 Integrate a patch, which was submitted upstream, to work-around an issue with the SPARC kernel headers. The kernel headers have been fixed in the upstream kernel (in the to-be-released 6.10 kernel), but we need a workaround for the older toolchains, until we believe 6.10 is "old" enough to be able to drop the workaround. Fixes: http://autobuild.buildroot.net/results/272c464ed4f9392535fa3b7613218dbd03acf901/ Signed-off-by: Thomas Petazzoni --- ...orkaround-sparc-asm-termbits.h-issue.patch | 316 ++++++++++++++++++ 1 file changed, 316 insertions(+) create mode 100644 package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch diff --git a/package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch b/package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch new file mode 100644 index 00000000000..923c0477431 --- /dev/null +++ b/package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch @@ -0,0 +1,316 @@ +From ef37e5b112734f551132b613438788fd4ef8797a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 12 Jul 2024 20:24:22 +0200 +Subject: [PATCH] pppd: workaround sparc issue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The SPARC version of the kernel header has an issue: +it defines "struct termio", which conflicts with the definition in +, causing a build failure in pppd. + +This issue was fixed in the upstream Linux kernel in commit +c32d18e7942d7589b62e301eb426b32623366565 ("sparc: move struct termio +to asm/termios.h"), which is going to appear in Linux 6.10. + +In order to support building with older toolchains, this patch +includes in the pppd source code a copy of the fixed SPARC + in the pppd code base, and uses it if we're on SPARC +with kernel headers older than 6.10. + +Fixes: + +In file included from termios_linux.h:39: +/home/thomas/projets/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/asm/termbits.h:17:8: error: redefinition of ‘struct termio’ + 17 | struct termio { + | ^~~~~~ + CC pppd-ipv6cp.o +In file included from /home/thomas/projets/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/sys/ioctl.h:29, + from sys-linux.c:76: +/home/thomas/projets/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/bits/ioctl-types.h:36:8: note: originally defined here + 36 | struct termio + | ^~~~~~ + +Upstream: https://github.com/ppp-project/ppp/pull/504 +Signed-off-by: Thomas Petazzoni +--- + pppd/sparc-termbits.h | 247 ++++++++++++++++++++++++++++++++++++++++++ + pppd/termios_linux.h | 6 + + 2 files changed, 253 insertions(+) + create mode 100644 pppd/sparc-termbits.h + +diff --git a/pppd/sparc-termbits.h b/pppd/sparc-termbits.h +new file mode 100644 +index 0000000..f92a27a +--- /dev/null ++++ b/pppd/sparc-termbits.h +@@ -0,0 +1,247 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++#ifndef _SPARC_TERMBITS_H ++#define _SPARC_TERMBITS_H ++ ++#include ++ ++typedef unsigned char cc_t; ++typedef unsigned int speed_t; ++ ++#if defined(__sparc__) && defined(__arch64__) ++typedef unsigned int tcflag_t; ++#else ++typedef unsigned long tcflag_t; ++#endif ++ ++#define NCCS 17 ++struct termios { ++ tcflag_t c_iflag; /* input mode flags */ ++ tcflag_t c_oflag; /* output mode flags */ ++ tcflag_t c_cflag; /* control mode flags */ ++ tcflag_t c_lflag; /* local mode flags */ ++ cc_t c_line; /* line discipline */ ++ cc_t c_cc[NCCS]; /* control characters */ ++}; ++ ++struct termios2 { ++ tcflag_t c_iflag; /* input mode flags */ ++ tcflag_t c_oflag; /* output mode flags */ ++ tcflag_t c_cflag; /* control mode flags */ ++ tcflag_t c_lflag; /* local mode flags */ ++ cc_t c_line; /* line discipline */ ++ cc_t c_cc[NCCS+2]; /* control characters */ ++ speed_t c_ispeed; /* input speed */ ++ speed_t c_ospeed; /* output speed */ ++}; ++ ++struct ktermios { ++ tcflag_t c_iflag; /* input mode flags */ ++ tcflag_t c_oflag; /* output mode flags */ ++ tcflag_t c_cflag; /* control mode flags */ ++ tcflag_t c_lflag; /* local mode flags */ ++ cc_t c_line; /* line discipline */ ++ cc_t c_cc[NCCS+2]; /* control characters */ ++ speed_t c_ispeed; /* input speed */ ++ speed_t c_ospeed; /* output speed */ ++}; ++ ++/* c_cc characters */ ++#define VINTR 0 ++#define VQUIT 1 ++#define VERASE 2 ++#define VKILL 3 ++#define VEOF 4 ++#define VEOL 5 ++#define VEOL2 6 ++#define VSWTC 7 ++#define VSTART 8 ++#define VSTOP 9 ++ ++ ++ ++#define VSUSP 10 ++#define VDSUSP 11 /* SunOS POSIX nicety I do believe... */ ++#define VREPRINT 12 ++#define VDISCARD 13 ++#define VWERASE 14 ++#define VLNEXT 15 ++ ++/* Kernel keeps vmin/vtime separated, user apps assume vmin/vtime is ++ * shared with eof/eol ++ */ ++#define VMIN VEOF ++#define VTIME VEOL ++ ++/* c_iflag bits */ ++#define IGNBRK 0x00000001 ++#define BRKINT 0x00000002 ++#define IGNPAR 0x00000004 ++#define PARMRK 0x00000008 ++#define INPCK 0x00000010 ++#define ISTRIP 0x00000020 ++#define INLCR 0x00000040 ++#define IGNCR 0x00000080 ++#define ICRNL 0x00000100 ++#define IUCLC 0x00000200 ++#define IXON 0x00000400 ++#define IXANY 0x00000800 ++#define IXOFF 0x00001000 ++#define IMAXBEL 0x00002000 ++#define IUTF8 0x00004000 ++ ++/* c_oflag bits */ ++#define OPOST 0x00000001 ++#define OLCUC 0x00000002 ++#define ONLCR 0x00000004 ++#define OCRNL 0x00000008 ++#define ONOCR 0x00000010 ++#define ONLRET 0x00000020 ++#define OFILL 0x00000040 ++#define OFDEL 0x00000080 ++#define NLDLY 0x00000100 ++#define NL0 0x00000000 ++#define NL1 0x00000100 ++#define CRDLY 0x00000600 ++#define CR0 0x00000000 ++#define CR1 0x00000200 ++#define CR2 0x00000400 ++#define CR3 0x00000600 ++#define TABDLY 0x00001800 ++#define TAB0 0x00000000 ++#define TAB1 0x00000800 ++#define TAB2 0x00001000 ++#define TAB3 0x00001800 ++#define XTABS 0x00001800 ++#define BSDLY 0x00002000 ++#define BS0 0x00000000 ++#define BS1 0x00002000 ++#define VTDLY 0x00004000 ++#define VT0 0x00000000 ++#define VT1 0x00004000 ++#define FFDLY 0x00008000 ++#define FF0 0x00000000 ++#define FF1 0x00008000 ++#define PAGEOUT 0x00010000 /* SUNOS specific */ ++#define WRAP 0x00020000 /* SUNOS specific */ ++ ++/* c_cflag bit meaning */ ++#define CBAUD 0x0000100f ++#define B0 0x00000000 /* hang up */ ++#define B50 0x00000001 ++#define B75 0x00000002 ++#define B110 0x00000003 ++#define B134 0x00000004 ++#define B150 0x00000005 ++#define B200 0x00000006 ++#define B300 0x00000007 ++#define B600 0x00000008 ++#define B1200 0x00000009 ++#define B1800 0x0000000a ++#define B2400 0x0000000b ++#define B4800 0x0000000c ++#define B9600 0x0000000d ++#define B19200 0x0000000e ++#define B38400 0x0000000f ++#define EXTA B19200 ++#define EXTB B38400 ++#define CSIZE 0x00000030 ++#define CS5 0x00000000 ++#define CS6 0x00000010 ++#define CS7 0x00000020 ++#define CS8 0x00000030 ++#define CSTOPB 0x00000040 ++#define CREAD 0x00000080 ++#define PARENB 0x00000100 ++#define PARODD 0x00000200 ++#define HUPCL 0x00000400 ++#define CLOCAL 0x00000800 ++#define CBAUDEX 0x00001000 ++/* We'll never see these speeds with the Zilogs, but for completeness... */ ++#define BOTHER 0x00001000 ++#define B57600 0x00001001 ++#define B115200 0x00001002 ++#define B230400 0x00001003 ++#define B460800 0x00001004 ++/* This is what we can do with the Zilogs. */ ++#define B76800 0x00001005 ++/* This is what we can do with the SAB82532. */ ++#define B153600 0x00001006 ++#define B307200 0x00001007 ++#define B614400 0x00001008 ++#define B921600 0x00001009 ++/* And these are the rest... */ ++#define B500000 0x0000100a ++#define B576000 0x0000100b ++#define B1000000 0x0000100c ++#define B1152000 0x0000100d ++#define B1500000 0x0000100e ++#define B2000000 0x0000100f ++/* These have totally bogus values and nobody uses them ++ so far. Later on we'd have to use say 0x10000x and ++ adjust CBAUD constant and drivers accordingly. ++#define B2500000 0x00001010 ++#define B3000000 0x00001011 ++#define B3500000 0x00001012 ++#define B4000000 0x00001013 */ ++#define CIBAUD 0x100f0000 /* input baud rate (not used) */ ++#define CMSPAR 0x40000000 /* mark or space (stick) parity */ ++#define CRTSCTS 0x80000000 /* flow control */ ++ ++#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ ++ ++/* c_lflag bits */ ++#define ISIG 0x00000001 ++#define ICANON 0x00000002 ++#define XCASE 0x00000004 ++#define ECHO 0x00000008 ++#define ECHOE 0x00000010 ++#define ECHOK 0x00000020 ++#define ECHONL 0x00000040 ++#define NOFLSH 0x00000080 ++#define TOSTOP 0x00000100 ++#define ECHOCTL 0x00000200 ++#define ECHOPRT 0x00000400 ++#define ECHOKE 0x00000800 ++#define DEFECHO 0x00001000 /* SUNOS thing, what is it? */ ++#define FLUSHO 0x00002000 ++#define PENDIN 0x00004000 ++#define IEXTEN 0x00008000 ++#define EXTPROC 0x00010000 ++ ++/* modem lines */ ++#define TIOCM_LE 0x001 ++#define TIOCM_DTR 0x002 ++#define TIOCM_RTS 0x004 ++#define TIOCM_ST 0x008 ++#define TIOCM_SR 0x010 ++#define TIOCM_CTS 0x020 ++#define TIOCM_CAR 0x040 ++#define TIOCM_RNG 0x080 ++#define TIOCM_DSR 0x100 ++#define TIOCM_CD TIOCM_CAR ++#define TIOCM_RI TIOCM_RNG ++#define TIOCM_OUT1 0x2000 ++#define TIOCM_OUT2 0x4000 ++#define TIOCM_LOOP 0x8000 ++ ++/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ ++#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ ++ ++ ++/* tcflow() and TCXONC use these */ ++#define TCOOFF 0 ++#define TCOON 1 ++#define TCIOFF 2 ++#define TCION 3 ++ ++/* tcflush() and TCFLSH use these */ ++#define TCIFLUSH 0 ++#define TCOFLUSH 1 ++#define TCIOFLUSH 2 ++ ++/* tcsetattr uses these */ ++#define TCSANOW 0 ++#define TCSADRAIN 1 ++#define TCSAFLUSH 2 ++ ++#endif /* _SPARC_TERMBITS_H */ +diff --git a/pppd/termios_linux.h b/pppd/termios_linux.h +index a234d30..9812017 100644 +--- a/pppd/termios_linux.h ++++ b/pppd/termios_linux.h +@@ -32,7 +32,13 @@ + #include + #include + #include ++#include ++ ++#if defined(__sparc__) && LINUX_VERSION_CODE < KERNEL_VERSION(6,10,0) ++#include "sparc-termbits.h" ++#else + #include ++#endif + + #if defined(BOTHER) && defined(TCGETS2) + #define termios termios2 +-- +2.45.2 + From 430921120fdd6285c07557fcae010e10b7715235 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 5 Jul 2024 12:22:25 +0200 Subject: [PATCH 1632/3013] package/udpcast: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, udpcast fails to build with output: Applying 0001-fix-musl-build.patch using patch: patching file receivedata.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file receivedata.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .checkpackageignore | 1 - package/udpcast/0001-fix-musl-build.patch | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 2c0f265d96d..9546391d1f5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1384,7 +1384,6 @@ package/uboot-tools/0001-drop-configh-from-tools.patch lib_patch.Upstream package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch lib_patch.Upstream package/uboot-tools/0003-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch lib_patch.Upstream package/ubus/0001-Install-server-and-client-examples.patch lib_patch.Upstream -package/udpcast/0001-fix-musl-build.patch lib_patch.Upstream package/uemacs/01-clear-ixon-termios-flag.patch lib_patch.Upstream package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch lib_patch.Upstream package/uhttpd/0001-Remove-Werror.patch lib_patch.Upstream diff --git a/package/udpcast/0001-fix-musl-build.patch b/package/udpcast/0001-fix-musl-build.patch index 0e213b27934..e24f3e9e940 100644 --- a/package/udpcast/0001-fix-musl-build.patch +++ b/package/udpcast/0001-fix-musl-build.patch @@ -15,8 +15,9 @@ Fixes: - http://autobuild.buildroot.org/results/30208c6f175967fed6de690447a09e0c86547b24 Signed-off-by: Fabrice Fontaine -[Upstream status: -https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/] +Upstream: https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff '--color=auto' -Nura udpcast-20211207.orig/receivedata.c udpcast-20211207/receivedata.c --- udpcast-20211207.orig/receivedata.c 2022-08-13 21:48:06.226588614 +0200 @@ -27,5 +28,5 @@ diff '--color=auto' -Nura udpcast-20211207.orig/receivedata.c udpcast-20211207/r #include +#include #include - #include #include + From 9ede791756a9c7a24da2d88667d813a0dc2c43ff Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 4 Jul 2024 08:37:22 +0200 Subject: [PATCH 1633/3013] package/libglfw: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libglfw fails to build with output: Applying 0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch using patch: patching file src/CMakeLists.txt Hunk #1 FAILED at 75. 1 out of 1 hunk FAILED -- saving rejects to file src/CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .checkpackageignore | 1 - ...emove-extra-cmake-modules-dependency.patch | 18 ++++++++++------- ...xt-allow-override-of-wayland-pkgdata.patch | 20 ++++++++++--------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 9546391d1f5..69b8dece380 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -763,7 +763,6 @@ package/libfuse/0001-fix-aarch64-build.patch lib_patch.Upstream package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch lib_patch.Upstream package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_patch.Upstream package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch lib_patch.Upstream -package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch lib_patch.Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch index d5ee7c829a4..ffa1d13f513 100644 --- a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -1,4 +1,4 @@ -From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From 8ebf1067390948d03330a5a0c814e5f7f860e678 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Mon, 28 Sep 2020 22:23:02 -0700 Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency @@ -8,17 +8,18 @@ Fixes #1774. [Retrieved (and backported) from: https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0 dropping all Hunks] +Signed-off-by: Dario Binacchi --- - .gitignore | 4 --- CMakeLists.txt | 16 ++++++------ src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ - 3 files changed, 45 insertions(+), 37 deletions(-) + 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42bfa1806d..394827520b 100644 +index 75069161fc36..b315eaa15305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -191,20 +191,18 @@ endif() +@@ -249,20 +249,18 @@ endif() # Use Wayland for window creation #-------------------------------------------------------------------- if (_GLFW_WAYLAND) @@ -47,10 +48,10 @@ index 42bfa1806d..394827520b 100644 include(CheckIncludeFiles) include(CheckFunctionExists) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2f2bdd883d..e834506c6c 100644 +index b6dd86c54512..29be6515ae58 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) +@@ -40,30 +40,44 @@ elseif (_GLFW_WAYLAND) posix_time.c posix_thread.c xkb_unicode.c egl_context.c osmesa_context.c) @@ -119,3 +120,6 @@ index 2f2bdd883d..e834506c6c 100644 elseif (_GLFW_OSMESA) set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h posix_time.h posix_thread.h osmesa_context.h) +-- +2.43.0 + diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch index 4bcb5e4eb70..268b1248518 100644 --- a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -1,4 +1,4 @@ -From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From a2c88988b6cfe4023fe78f13519b56a8ac9f568b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 4 Mar 2022 17:59:19 +0100 Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir @@ -7,17 +7,19 @@ Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} (needed when cross-compiling) Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glfw/glfw/pull/2053] +Upstream: https://github.com/glfw/glfw/pull/2053 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - src/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + src/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 01f191c9..475ce882 100644 +index 29be6515ae58..1767b3c8ad8f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) - include(FindPkgConfig) +@@ -42,7 +42,9 @@ elseif (_GLFW_WAYLAND) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) - pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) @@ -26,7 +28,7 @@ index 01f191c9..475ce882 100644 + endif() macro(wayland_generate protocol_file output_file) - add_custom_command(OUTPUT "${output_file}.h" + add_custom_command(OUTPUT ${output_file}.h -- -2.34.1 +2.43.0 From 3149532ff14c6b5d4e00e9458a39daae60b07fca Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 4 Jul 2024 11:45:49 +0200 Subject: [PATCH 1634/3013] package/rdesktop: update the patches to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, rdesktop fails to build with output: Applying 0001-8bit-colors.patch using patch: patching file xwin.c Hunk #1 succeeded at 1801 (offset 340 lines). Hunk #2 FAILED at 1568. 1 out of 2 hunks FAILED -- saving rejects to file xwin.c.rej This commit refreshes the package patches on the current package version. The original patch was not generated with "git format-patch", and had no information (no commit log, no author, no date, ...). Since it was introduced in commit [1], the author and date is set to this commit. The "Upstream:" tag is also added to the patch, mentioning the upstream project is reported as unmaintained on its homepage (at the time of this commit). Finally, the ".checkpackageignore" entry is removed, since it is no longer needed. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/e2dde9c7cdc2f9ed851acfb7daa858ffa1744246 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- .checkpackageignore | 1 - package/rdesktop/0001-8bit-colors.patch | 21 ---------- .../rdesktop/0001-Allow-8-bit-colors.patch | 38 +++++++++++++++++++ 3 files changed, 38 insertions(+), 22 deletions(-) delete mode 100644 package/rdesktop/0001-8bit-colors.patch create mode 100644 package/rdesktop/0001-Allow-8-bit-colors.patch diff --git a/.checkpackageignore b/.checkpackageignore index 69b8dece380..63a27410caf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1226,7 +1226,6 @@ package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch lib_pat package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream -package/rdesktop/0001-8bit-colors.patch lib_patch.Sob lib_patch.Upstream package/read-edid/0001-Fix-install-file-list.patch lib_patch.Upstream package/read-edid/0002-Fix-compiler-check.patch lib_patch.Upstream package/read-edid/0003-fix-build-with-gcc-10.patch lib_patch.Upstream diff --git a/package/rdesktop/0001-8bit-colors.patch b/package/rdesktop/0001-8bit-colors.patch deleted file mode 100644 index 710f8debef2..00000000000 --- a/package/rdesktop/0001-8bit-colors.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urpN rdesktop-1.5.0-orig/xwin.c rdesktop-1.5.0/xwin.c ---- rdesktop-1.5.0-orig/xwin.c 2007-01-17 12:01:18.000000000 +0100 -+++ rdesktop-1.5.0/xwin.c 2007-01-17 12:05:02.000000000 +0100 -@@ -1461,7 +1461,7 @@ select_visual(int screen_num) - } - - /* we use a colourmap, so the default visual should do */ -- g_owncolmap = True; -+// g_owncolmap = True; - g_visual = vmatches[0].visual; - g_depth = vmatches[0].depth; - } -@@ -1568,7 +1568,7 @@ ui_init(void) - { - g_xcolmap = - XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual, -- AllocNone); -+ (g_depth <= 8) ? AllocAll : AllocNone); - if (g_depth <= 8) - warning("Display colour depth is %d bit: you may want to use -C for a private colourmap.\n", g_depth); - } diff --git a/package/rdesktop/0001-Allow-8-bit-colors.patch b/package/rdesktop/0001-Allow-8-bit-colors.patch new file mode 100644 index 00000000000..0c2b820a453 --- /dev/null +++ b/package/rdesktop/0001-Allow-8-bit-colors.patch @@ -0,0 +1,38 @@ +From 2159684f1287b6bca2bd74c129b752a636ee807f Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Wed, 17 Jan 2007 13:58:01 +0000 +Subject: [PATCH] Allow 8-bit colors + +Upstream: Reported as unmaintained on homepage http://www.rdesktop.org/ +Signed-off-by: Peter Korsgaard +[Julien: refreshed the patch to be applied with fuzz factor 0] +Signed-off-by: Julien Olivain +--- + xwin.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xwin.c b/xwin.c +index d96d0f4..d11f4a6 100644 +--- a/xwin.c ++++ b/xwin.c +@@ -1801,7 +1801,7 @@ select_visual(int screen_num) + } + + /* we use a colourmap, so the default visual should do */ +- g_owncolmap = True; ++// g_owncolmap = True; + g_visual = vmatches[0].visual; + g_depth = vmatches[0].depth; + } +@@ -2010,7 +2010,7 @@ ui_init(void) + { + g_xcolmap = + XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual, +- AllocNone); ++ (g_depth <= 8) ? AllocAll : AllocNone); + if (g_depth <= 8) + logger(GUI, Warning, + "Display colour depth is %d bit: you may want to use -C for a private colourmap", +-- +2.45.2 + From a411588b582ad6a0c8573ec9f59f737473d69bee Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 22 Aug 2023 21:23:14 +0200 Subject: [PATCH 1635/3013] package/kexec: fix link error when BR2_OPTIMIZE_0=y When BR2_OPTIMIZE_0, -O0 is passed in compiler CFLAGS. This means no code optimization will be performed. kexec code uses a trick to detect unaligned accesses at link time which needs at least dead-code-removal to work. See put/get_unaligned() macros in kexec/kexec.h. This code was re-enabled in upstream commit [1]. This commit sets at least -O1 (which include the sufficient dead-code-removal) when BR2_OPTIMIZE_0=y, to fix those issues. Fixes: - http://autobuild.buildroot.org/results/8f8/8f8532f1dfbd71e52c51c00118934af9fa45e7cb - http://autobuild.buildroot.org/results/528/528fd7baf9b0ad5549d22ec8e0623c5fa1f2d117 - http://autobuild.buildroot.org/results/499/499115439680adfb4b40042468e5bbb65d91ce6c - ...and many others [1] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=0723defb5308ac7fce296f8b596bff4df6803f01 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/kexec/kexec.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index df14b2d711a..1fd8c0f0ab3 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -16,6 +16,14 @@ KEXEC_SELINUX_MODULES = kdump # Makefile expects $STRIP -o to work, so needed for !BR2_STRIP_strip KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip" +# kexec requires at least -O1 optimization level. Its code uses a +# trick to detect unaligned accesses at link time which needs at least +# dead-code-removal to work. See put/get_unaligned() macros in +# kexec/kexec.h +ifeq ($(BR2_OPTIMIZE_0),y) +KEXEC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" +endif + ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) KEXEC_CONF_OPTS += --with-zlib KEXEC_DEPENDENCIES += zlib From 28925c6c86c41f2539c057f1a67267e58b5b2057 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 8 Aug 2023 22:05:46 +0200 Subject: [PATCH 1636/3013] package/xvisor: fix RISC-V hang when BR2_SHARED_LIBS=y When BR2_SHARED_LIBS=y (shared libraries only) and BR2_PIC_PIE=y (Build code with PIC/PIE), the toolchain-wrapper will try to enable position-independent code/executables. See [1]. This configuration is a common default. Xvisor was likely tested only with RISC-V gcc from [2], which will not enable PIE by default. Since Xvisor is a Type 1 hypervisor, it needs the same kind of special treatment as U-Boot or Kernel. This commit adds a patch to explicitly force static linking and disable PIE for RISC-V architecture. [1] https://git.buildroot.org/buildroot/tree/toolchain/toolchain-wrapper.c?h=2023.05.1#n392 [2] https://github.com/riscv-collab/riscv-gnu-toolchain Signed-off-by: Julien Olivain [Arnout: renumber patch] Signed-off-by: Arnout Vandecappelle --- ...-pie-code-generation-and-static-link.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch diff --git a/package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch b/package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch new file mode 100644 index 00000000000..706fbbfbda9 --- /dev/null +++ b/package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch @@ -0,0 +1,46 @@ +From 8491908238c4b3397571e9cff55765d59da03a45 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Wed, 2 Aug 2023 23:57:17 +0200 +Subject: [PATCH] RISC-V: Force no-pie code generation and static link + +Some toolchains are now enabling PIE for security reasons by default. +When XVisor is built with such a RISC-V toolchain, it is crashing +just after OpenSBI, in early Xvisor startup (before any message is +printed on the console). + +Hangs looks like those described in: + +https://github.com/xvisor/xvisor/issues/144 +https://github.com/xvisor/xvisor/issues/159 + +Forcing -fno-pie code generation and -static link will explicitly disable +PIE with those toolchains, hence fixing those issues. + +This issue was observed while using a riscv64 gcc toolchain from: +https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2022.08-1.tar.bz2 + +Signed-off-by: Julien Olivain +Upstream: https://github.com/xvisor/xvisor/pull/170 +--- + arch/riscv/cpu/generic/objects.mk | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/riscv/cpu/generic/objects.mk b/arch/riscv/cpu/generic/objects.mk +index 230da2a1..576603f6 100644 +--- a/arch/riscv/cpu/generic/objects.mk ++++ b/arch/riscv/cpu/generic/objects.mk +@@ -67,6 +67,11 @@ cpu-cflags += -fno-strict-aliasing -O2 + cpu-asflags += $(arch-cflags-y) -march=$(march-nonld-isa-y) + cpu-ldflags += $(arch-ldflags-y) -march=$(march-ld-isa-y) + ++cpu-cflags += -fno-pie ++cpu-asflags += -fno-pie ++cpu-ldflags += -static ++cpu-mergeflags += -static ++ + cpu-objs-y+= cpu_entry.o + cpu-objs-y+= cpu_proc.o + cpu-objs-y+= cpu_tlb.o +-- +2.41.0 + From a5327724686a1ba719d37caff5986f241993b500 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Aug 2023 19:43:58 +0200 Subject: [PATCH 1637/3013] package/ntpsec: fix compile issue for some toolchains Ntpsec unconditionally uses PIE to compile code. This breaks compilation for at least microblaze-uclibc and m68k-uclibc toolchains. Also in Buildroot context, PIE should anyway be governed by BR2_PIC_PIE. It would be better to add a configure option to allow to disable pie support, but this is something for a waf expert. Fixes: - http://autobuild.buildroot.net/results/77f/77f4e4065874d022a2ae98d82508242f551e224c - http://autobuild.buildroot.net/results/e45/e45b65f2aa323df075d54ff43b0401b5ac7c6eb5 Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle --- package/ntpsec/0003-disable-PIE-support.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/ntpsec/0003-disable-PIE-support.patch diff --git a/package/ntpsec/0003-disable-PIE-support.patch b/package/ntpsec/0003-disable-PIE-support.patch new file mode 100644 index 00000000000..64eb559de02 --- /dev/null +++ b/package/ntpsec/0003-disable-PIE-support.patch @@ -0,0 +1,26 @@ +From 712675fbd2a736df817fecd7bfb39055946ef85b Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sun, 13 Aug 2023 13:48:03 +0200 +Subject: [PATCH] disable PIE support + +Signed-off-by: Waldemar Brodkorb +Upstream: N/A Not upstreamable +--- + wscript | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/wscript b/wscript +index 292e3a45b..105c7eac2 100644 +--- a/wscript ++++ b/wscript +@@ -299,7 +299,6 @@ def configure(ctx): + + cc_test_flags = [ + ('PIC', '-fPIC'), +- ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie + ('unused', '-Qunused-arguments'), + # This is a useless warning on any architecture with a barrel +-- +2.39.2 + From 408352207c18084c331b23aa739cde98cd52d000 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 17 Aug 2023 16:51:38 +0200 Subject: [PATCH 1638/3013] package/tcf-agent: fix uClibc-ng compile on ARM When a shared build is used, we can use getauxval and no ARM only instuctions are in use. When a static build is used, we need to override CFLAGS to use arm instructions, as uClibc-ng only supports getauxval for shared case. Fixes: - http://autobuild.buildroot.net/results/3b5/3b5c5519a3e5ee490308bc1a1b9579ce13417235 Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle --- .../0001-fix-uClibc-ng-compile.patch | 27 +++++++++++++++++++ package/tcf-agent/tcf-agent.mk | 7 +++++ 2 files changed, 34 insertions(+) create mode 100644 package/tcf-agent/0001-fix-uClibc-ng-compile.patch diff --git a/package/tcf-agent/0001-fix-uClibc-ng-compile.patch b/package/tcf-agent/0001-fix-uClibc-ng-compile.patch new file mode 100644 index 00000000000..b8f46f3c48d --- /dev/null +++ b/package/tcf-agent/0001-fix-uClibc-ng-compile.patch @@ -0,0 +1,27 @@ +From a78007cd139e1dea3d893f5fe1d1c3a47503e6a2 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 12 Aug 2023 18:27:02 +0200 +Subject: [PATCH] fix uClibc-ng compile + +Signed-off-by: Waldemar Brodkorb +Upstream: N/A only mail available +--- + agent/machine/arm/tcf/cpudefs-mdep.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/machine/arm/tcf/cpudefs-mdep.c b/agent/machine/arm/tcf/cpudefs-mdep.c +index 051631a0..7c4fbf3e 100644 +--- a/agent/machine/arm/tcf/cpudefs-mdep.c ++++ b/agent/machine/arm/tcf/cpudefs-mdep.c +@@ -21,7 +21,7 @@ + + #ifndef USE_getauxval + # include +-# define USE_getauxval (defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))) ++# define USE_getauxval (defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) || (defined(__UCLIBC__) && defined(__HAVE_SHARED__))) + #endif + + #include +-- +2.39.2 + diff --git a/package/tcf-agent/tcf-agent.mk b/package/tcf-agent/tcf-agent.mk index 9d955d4b6f2..cc998d82d6f 100644 --- a/package/tcf-agent/tcf-agent.mk +++ b/package/tcf-agent/tcf-agent.mk @@ -20,6 +20,13 @@ TCF_AGENT_CONF_OPTS = \ -DBUILD_SHARED_LIBS=OFF \ -DTCF_MACHINE=$(call qstrip,$(BR2_PACKAGE_TCF_AGENT_ARCH)) +# tcf-agent uses some arm instructions in case getauxval is not available. +# unfortunately the uClibc-ng implementation of getauxval uses some features +# of ld.so to work +ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_ARM_INSTRUCTIONS_THUMB),yyy) +TCF_AGENT_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + define TCF_AGENT_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tcf-agent/tcf-agent.service \ $(TARGET_DIR)/usr/lib/systemd/system/tcf-agent.service From bd0d5498ea00c29b22bb8c87b8f593b356deb469 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 18 Aug 2023 17:16:08 +0200 Subject: [PATCH 1639/3013] package/pkg-generic.mk: remove double colon in .stamp_built This issue was introduced back in 2009 with commit e11fe847b2f545446fc3300dd2ba88fd5da05756 that created the generic package infrastructure. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index e1c16b73435..132bdb96800 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -276,7 +276,7 @@ $(BUILD_DIR)/%/.stamp_configured: $(Q)touch $@ # Build -$(BUILD_DIR)/%/.stamp_built:: +$(BUILD_DIR)/%/.stamp_built: @$(call step_start,build) @$(call MESSAGE,"Building") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) From 2547a3b32d2be1fc2b49da8d6b81f0c711821212 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 5 Jul 2024 21:52:31 +0200 Subject: [PATCH 1640/3013] package/libsvgtiny: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libsvgtiny fails to build with output: Applying 0004-Build-Include-gperf-generated-code-directly.patch using patch: patching file src/Makefile Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- ...0004-Build-Include-gperf-generated-code-directly.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch b/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch index c17426ff051..b5443e99121 100644 --- a/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch +++ b/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch @@ -11,6 +11,8 @@ svgtiny.c instead, which is the only place its used. [Retrieved from: https://source.netsurf-browser.org/libsvgtiny.git/commit/src?id=4390f1c84e8fee51fc22468821e6fc158e783053] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/Makefile | 13 +++++++------ src/colors.gperf | 8 -------- @@ -44,7 +46,7 @@ index a979720..fb8a72f 100644 + +CLEAN_ITEMS := $(DIR)autogenerated_colors.c - include $(NSBUILD)/Makefile.subdir + include build/makefiles/Makefile.subdir diff --git a/src/colors.gperf b/src/colors.gperf index 96d5b9e..a836787 100644 --- a/src/colors.gperf @@ -68,7 +70,7 @@ diff --git a/src/svgtiny.c b/src/svgtiny.c index 4661a58..bbefb88 100644 --- a/src/svgtiny.c +++ b/src/svgtiny.c -@@ -20,6 +20,9 @@ +@@ -17,6 +17,9 @@ #include "svgtiny.h" #include "svgtiny_internal.h" @@ -82,7 +84,7 @@ diff --git a/src/svgtiny_internal.h b/src/svgtiny_internal.h index 158d230..6bf5d64 100644 --- a/src/svgtiny_internal.h +++ b/src/svgtiny_internal.h -@@ -102,9 +102,4 @@ void *svgtiny_list_get(struct svgtiny_list *list, +@@ -87,9 +87,4 @@ void *svgtiny_list_push(struct svgtiny_list *list); void svgtiny_list_free(struct svgtiny_list *list); From f2f71ca6e68094c322605aea28abdcbf86f37a20 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 18:21:49 +0200 Subject: [PATCH 1641/3013] package/x11r7/xdriver_xf86-video-tdfx: fix patch fuzz Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, xdriver_xf86-video-tdfx fails to build with output: Applying 0001-cross.patch using patch: patching file configure.ac Hunk #1 FAILED at 67. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .checkpackageignore | 2 +- package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 63a27410caf..c7d49ceffd7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1485,7 +1485,7 @@ package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-pat package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream -package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Sob lib_patch.Upstream +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Upstream package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream diff --git a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch index e53591bb0bc..f9880afb547 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch +++ b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch @@ -1,8 +1,10 @@ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- xf86-video-tdfx-1.3.0/configure.ac.orig 2007-06-10 21:01:54.000000000 +0200 +++ xf86-video-tdfx-1.3.0/configure.ac 2007-06-10 21:02:06.000000000 +0200 -@@ -67,13 +67,20 @@ - # Checks for header files. - AC_HEADER_STDC +@@ -75,13 +75,20 @@ + [#include "xorg-server.h"]) + CPPFLAGS="$SAVE_CPPFLAGS" -if test "$DRI" != no; then +if test "x$DRI" != xno; then From ceba36f28bc790af40508ed1011e4e88d55f6d27 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 18:33:29 +0200 Subject: [PATCH 1642/3013] package/x11r7/xdriver_xf86-video-mach64: fix patch fuzz Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, xdriver_xf86-video-mach64 fails to build with output: Applying 0001-cross-compile.patch using patch: patching file configure.ac Hunk #1 FAILED at 85. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .checkpackageignore | 2 +- .../xdriver_xf86-video-mach64/0001-cross-compile.patch | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index c7d49ceffd7..842b86bbc8d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1483,7 +1483,7 @@ package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch lib_patch.Ups package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream -package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Upstream package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream diff --git a/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch b/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch index d27617606ea..02d34ce9fc3 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch +++ b/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch @@ -1,7 +1,9 @@ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- a/configure.ac 2008-06-23 10:39:28.000000000 -0400 +++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400 -@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo - AC_HEADER_STDC +@@ -80,14 +80,20 @@ + # Checks for libraries. if test "$DRI" != no; then - AC_CHECK_FILE([${sdkdir}/dri.h], From e6d5cdcd5b45d812a6f091e78b51212a46682c90 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 18:46:02 +0200 Subject: [PATCH 1643/3013] package/mediastreamer: fix patch fuzz Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, mediastreamer fails to build with output: Applying 0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch using patch: patching file src/utils/ffmpeg-priv.h Hunk #1 FAILED at 102. 1 out of 1 hunk FAILED -- saving rejects to file src/utils/ffmpeg-priv.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- ...e-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch index fc66e9a9f92..9fd3fda2ecc 100644 --- a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +++ b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch @@ -19,6 +19,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735 Signed-off-by: Bernd Kuhls [Fabrice: updated for 4.3.1] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/utils/ffmpeg-priv.h | 4 ++++ src/videofilters/nowebcam.c | 4 ++-- @@ -28,8 +30,8 @@ diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h index c0745a9a..d59ea0e1 100644 --- a/src/utils/ffmpeg-priv.h +++ b/src/utils/ffmpeg-priv.h -@@ -102,6 +102,10 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, - #endif +@@ -115,6 +115,10 @@ + extern "C" { #endif +#ifndef AV_INPUT_BUFFER_PADDING_SIZE From 77e945b003e1b401c0def36db403c937e4d604bb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 16:22:56 +0200 Subject: [PATCH 1644/3013] package/check: disable static build check can't be built statically since switch to cmake in commit 6dfc789f4f21367bc5f4b5454db0922821a765bc: /home/autobuild/autobuild/instance-2/output-1/host/lib/gcc/mipsel-buildroot-linux-uclibc/12.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: libcheck.so.0.15.2: hidden symbol `__fini_array_end' isn't defined Fixes: - http://autobuild.buildroot.org/results/0d6/0d6fcbedef29bf0d6a1d9ecb8e4d82b4ad06cfa8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/check/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/check/Config.in b/package/check/Config.in index 2312fbf81c0..a3a7ff1f117 100644 --- a/package/check/Config.in +++ b/package/check/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_CHECK bool "check" + depends on !BR2_STATIC_LIBS help Check is a unit testing framework for C. https://libcheck.github.io/check/ + +comment "check needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS From bbc08b15ae60c3008fb8cbff59dc329d8357c563 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 17:10:15 +0200 Subject: [PATCH 1645/3013] package/libarchive: add bsdunzip option Add bsdunzip option to avoid the following build failure raised since bump to version 3.7.1 in commit 7991d2c48a859f9c0333ade8192868c21b1a8a31 and https://github.com/libarchive/libarchive/commit/c157e4ce8eb170a92945cc2d292fd7106bdfcce1: CCLD bsdunzip /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc-buildroot-linux-musl/12.3.0/../../../../powerpc-buildroot-linux-musl/bin/ld: cannot find -lz: No such file or directory By handling it explicitly, we can specify whether the dynamic or static library should be used, according to what we actually have available. Fixes: - http://autobuild.buildroot.org/results/aaf7fdefa0b7bd7e5ac743487c197544c1a2ce6f Signed-off-by: Fabrice Fontaine Tested-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libarchive/Config.in | 6 ++++++ package/libarchive/libarchive.mk | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in index ffa4cff7b33..2c8d813ccbd 100644 --- a/package/libarchive/Config.in +++ b/package/libarchive/Config.in @@ -30,4 +30,10 @@ config BR2_PACKAGE_LIBARCHIVE_BSDCAT The 'bsdcat' program is a simple replacement tool for zcat, bzcat, xzcat, and such. +config BR2_PACKAGE_LIBARCHIVE_BSDUNZIP + bool "bsdunzip" + help + The 'bsdunzip' program is a simple replacement tool + for Info-ZIP. + endif diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 1a50b0472da..7d58b5c69f3 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -46,6 +46,16 @@ else LIBARCHIVE_CONF_OPTS += --disable-bsdcat endif +ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDUNZIP),y) +ifeq ($(BR2_STATIC_LIBS),y) +LIBARCHIVE_CONF_OPTS += --enable-bsdunzip=static +else +LIBARCHIVE_CONF_OPTS += --enable-bsdunzip=shared +endif +else +LIBARCHIVE_CONF_OPTS += --disable-bsdunzip +endif + ifeq ($(BR2_PACKAGE_ACL),y) LIBARCHIVE_DEPENDENCIES += acl else From 526b89b981cb3fa3da7644482d1f140f1fb25e27 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 22:16:08 +0200 Subject: [PATCH 1646/3013] package/check: don't build shared lib when disabled The build system of check was unconditionally building a shared library, even when BUILD_SHARED_LIBS=OFF. This commit brings a patch, submitted upstream, which fixes this issue, and allows to fix the build in BR2_STATIC_LIBS=y configurations. Fixes: http://autobuild.buildroot.net/results/d4a1c6d49dd15ce6b73cfade2557d49733e9318b/ Signed-off-by: Thomas Petazzoni --- ...xt-don-t-build-shared-libraries-when.patch | 255 ++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch diff --git a/package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch b/package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch new file mode 100644 index 00000000000..6ed01f5401f --- /dev/null +++ b/package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch @@ -0,0 +1,255 @@ +From 2ae2137d724d5f3a70d5d2856cb979d389c4cbd8 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 12 Jul 2024 21:30:43 +0200 +Subject: [PATCH] src/CMakeLists.txt: don't build shared libraries when not + enabled + +BUILD_SHARED_LIBS is a standard CMake option [1] that specifies +whether shared libraries should be built or not. This commit adjusts +src/CMakeLists.txt to observe this variable to decide whether the +shared library variant should be built or not. This allows check to +only build a static library in environments where only a static +library can be compiled. + +This needs a bit of refactoring to avoid duplication: + +- Additional source files from libcompat are directly added to the + ${SOURCES} variable as needed + +- Additional libraries are collected into ${ADDITIONAL_LIBS} before + being associated to the static library and shared library (if enabled) + +[1] https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html + +Fixes: + +__uClibc_main.c:(.text+0x12c): undefined reference to `__fini_array_end' +/home/autobuild/autobuild/instance-20/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/13.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: __uClibc_main.c:(.text+0x130): undefined reference to `__fini_array_start' +/home/autobuild/autobuild/instance-20/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/13.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: __uClibc_main.c:(.text+0x134): undefined reference to `__fini_array_end' + +Upstream: https://github.com/libcheck/check/pull/355 +Signed-off-by: Thomas Petazzoni +--- + src/CMakeLists.txt | 137 ++++++++++++++++++++++----------------------- + 1 file changed, 67 insertions(+), 70 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a02dbe..e0cf32b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,117 +31,106 @@ set(SOURCES + check_run.c + check_str.c) + +-set(HEADERS +- ${CONFIG_HEADER} +- ${CMAKE_CURRENT_BINARY_DIR}/check.h +- check.h.in +- check_error.h +- check_impl.h +- check_list.h +- check_log.h +- check_msg.h +- check_pack.h +- check_print.h +- check_str.h) +- +-configure_file(check.h.in check.h @ONLY) +- +-# To maintain compatibility with the Autotools installation +-# we specifically create both shared and static libraries +-# as that is what Autotools script has been doing. +-# Normally CMake would create the system's native default library type. +- +-add_library(check STATIC ${SOURCES} ${HEADERS}) +-add_library(Check::check ALIAS check) +- +- +-# We would like to create an OBJECT library but currently they are +-# too unreliable and cumbersome, +-# especially with target_link_libraries and install(EXPORT... +-# https://stackoverflow.com/questions/38832528/transitive-target-include-directories-on-object-libraries +-# So we instead do the work twice. +-add_library(checkShared SHARED ${SOURCES} ${HEADERS}) +-add_library(Check::checkShared ALIAS checkShared) +- + # Add parts of libcompat as required +-target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/fpclassify.c) +-target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/fpclassify.c) ++list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/fpclassify.c) + + if (NOT HAVE_LIBRT) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/clock_gettime.c) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_create.c) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_delete.c) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_settime.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/clock_gettime.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_create.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_delete.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_settime.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/clock_gettime.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_create.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_delete.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_settime.c) + endif(NOT HAVE_LIBRT) + + if(NOT HAVE_GETLINE) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/getline.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/getline.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/getline.c) + endif(NOT HAVE_GETLINE) + + if(NOT HAVE_GETTIMEOFDAY) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/gettimeofday.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/gettimeofday.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/gettimeofday.c) + endif(NOT HAVE_GETTIMEOFDAY) + + if(NOT HAVE_DECL_LOCALTIME_R) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/localtime_r.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/localtime_r.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/localtime_r.c) + endif(NOT HAVE_DECL_LOCALTIME_R) + + if(NOT HAVE_MALLOC) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/malloc.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/malloc.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/malloc.c) + endif(NOT HAVE_MALLOC) + + if(NOT HAVE_REALLOC) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/realloc.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/realloc.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/realloc.c) + endif(NOT HAVE_REALLOC) + + if(NOT HAVE_SNPRINTF) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) + endif(NOT HAVE_SNPRINTF) + + if(NOT HAVE_DECL_STRDUP AND NOT HAVE__STRDUP) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strdup.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strdup.c) + endif(NOT HAVE_DECL_STRDUP AND NOT HAVE__STRDUP) + + if(NOT HAVE_DECL_STRSIGNAL) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strsignal.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strsignal.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strsignal.c) + endif(NOT HAVE_DECL_STRSIGNAL) + + if(NOT HAVE_DECL_ALARM) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/alarm.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/alarm.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/alarm.c) + endif(NOT HAVE_DECL_ALARM) + + if(NOT HAVE_PTHREAD) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/pthread_mutex.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/pthread_mutex.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/pthread_mutex.c) + endif() + ++set(HEADERS ++ ${CONFIG_HEADER} ++ ${CMAKE_CURRENT_BINARY_DIR}/check.h ++ check.h.in ++ check_error.h ++ check_impl.h ++ check_list.h ++ check_log.h ++ check_msg.h ++ check_pack.h ++ check_print.h ++ check_str.h) ++ ++configure_file(check.h.in check.h @ONLY) ++ ++# To maintain compatibility with the Autotools installation ++# we specifically create both shared and static libraries ++# as that is what Autotools script has been doing. ++# Normally CMake would create the system's native default library type. ++ ++add_library(check STATIC ${SOURCES} ${HEADERS}) ++add_library(Check::check ALIAS check) ++ ++# We would like to create an OBJECT library but currently they are ++# too unreliable and cumbersome, ++# especially with target_link_libraries and install(EXPORT... ++# https://stackoverflow.com/questions/38832528/transitive-target-include-directories-on-object-libraries ++# So we instead do the work twice. ++if (BUILD_SHARED_LIBS) ++ add_library(checkShared SHARED ${SOURCES} ${HEADERS}) ++ add_library(Check::checkShared ALIAS checkShared) ++endif (BUILD_SHARED_LIBS) ++ + # Include libraries if available + if (HAVE_LIBM) +- target_link_libraries(check PUBLIC m) +- target_link_libraries(checkShared PUBLIC m) ++ list(APPEND ADDITIONAL_LIBS m) + endif (HAVE_LIBM) + if (HAVE_LIBRT) +- target_link_libraries(check PUBLIC rt) +- target_link_libraries(checkShared PUBLIC rt) ++ list(APPEND ADDITIONAL_LIBS rt) + endif (HAVE_LIBRT) + if (HAVE_SUBUNIT) +- target_link_libraries(check PUBLIC subunit) +- target_link_libraries(checkShared PUBLIC subunit) ++ list(APPEND ADDITIONAL_LIBS subunit) + endif (HAVE_SUBUNIT) + ++target_link_libraries(check PUBLIC ${ADDITIONAL_LIBS}) ++if (BUILD_SHARED_LIBS) ++ target_link_libraries(checkShared PUBLIC m) ++endif (BUILD_SHARED_LIBS) ++ ++ + if(MSVC) + target_compile_definitions(checkShared + PRIVATE "CK_DLL_EXP=_declspec(dllexport)" +@@ -168,27 +157,35 @@ if (MSVC) + # So we call it this: + set(LIBRARY_OUTPUT_NAME "checkDynamic") + endif (MSVC) ++if (BUILD_SHARED_LIBS) + set_target_properties(checkShared PROPERTIES + OUTPUT_NAME ${LIBRARY_OUTPUT_NAME} + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR} + PUBLIC_HEADER "${public_headers}" + ) ++endif (BUILD_SHARED_LIBS) + target_include_directories(check + PUBLIC + $ + $ + $ + ) ++if (BUILD_SHARED_LIBS) + target_include_directories(checkShared + PUBLIC + $ + $ + $ +-) ++ ) ++endif (BUILD_SHARED_LIBS) + + if(NOT THIS_IS_SUBPROJECT) +- install(TARGETS check checkShared ++ if (BUILD_SHARED_LIBS) ++ set(SHARED_LIBNAME checkShared) ++ endif () ++ ++ install(TARGETS check ${SHARED_LIBNAME} + EXPORT check-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +-- +2.45.2 + From d10bee42012103fe7974c5e20be3af81e3c1c250 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 22:17:30 +0200 Subject: [PATCH 1647/3013] package/check: fix build on noMMU configurations check was failing to build on noMMU configurations due to mistake in the build conditionals of the code around the HAVE_FORK macro. This commit brings a patch, submitted upstream, that fixes those issues. Fixes: http://autobuild.buildroot.net/results/1509108aa111da706d544eb67e1ae2c2b34bd4e4/ Signed-off-by: Thomas Petazzoni --- ...k_run.c-fix-build-on-noMMU-platforms.patch | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch diff --git a/package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch b/package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch new file mode 100644 index 00000000000..173fa4ae5ac --- /dev/null +++ b/package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch @@ -0,0 +1,82 @@ +From c9bebf051aa7e3037ca8e0fe554e073204ffedde Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 12 Jul 2024 21:27:47 +0200 +Subject: [PATCH] src/check_run.c: fix build on noMMU platforms + +src/check_run.c defines sig_handler() under the following conditions: + + #if defined(HAVE_FORK) && HAVE_FORK==1 + +however, it does use sig_handler under the following conditions: + + #if defined(HAVE_SIGACTION) && defined(HAVE_FORK) + +which breaks when HAVE_FORK is defined, but has the value HAVE_FORK=0, +as is the case on noMMU platforms. + +This commit fixes this by ensuring that the build conditions are +aligned throughout check_run.c. + +Fixes: + +src/check_run.c: In function 'srunner_run_tagged': +src/check_run.c:802:38: error: 'sig_handler' undeclared (first use in this function); did you mean 'sa_handler'? +[...] + +Upstream: https://github.com/libcheck/check/pull/354 +Signed-off-by: Thomas Petazzoni +--- + src/check_run.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/check_run.c b/src/check_run.c +index 5f160e5..4c370b3 100644 +--- a/src/check_run.c ++++ b/src/check_run.c +@@ -772,12 +772,12 @@ void srunner_run_tagged(SRunner * sr, const char *sname, const char *tcname, + const char *include_tags, const char *exclude_tags, + enum print_output print_mode) + { +-#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) ++#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) && HAVE_FORK==1 + static struct sigaction sigalarm_old_action; + static struct sigaction sigalarm_new_action; + static struct sigaction sigint_new_action; + static struct sigaction sigterm_new_action; +-#endif /* HAVE_SIGACTION && HAVE_FORK */ ++#endif /* HAVE_SIGACTION && HAVE_FORK && HAVE_FORK==1 */ + + /* Get the selected test suite and test case from the + environment. */ +@@ -797,7 +797,7 @@ void srunner_run_tagged(SRunner * sr, const char *sname, const char *tcname, + eprintf("Bad print_mode argument to srunner_run_all: %d", + __FILE__, __LINE__, print_mode); + } +-#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) ++#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) && HAVE_FORK==1 + memset(&sigalarm_new_action, 0, sizeof(sigalarm_new_action)); + sigalarm_new_action.sa_handler = sig_handler; + sigaction(SIGALRM, &sigalarm_new_action, &sigalarm_old_action); +@@ -809,16 +809,16 @@ void srunner_run_tagged(SRunner * sr, const char *sname, const char *tcname, + memset(&sigterm_new_action, 0, sizeof(sigterm_new_action)); + sigterm_new_action.sa_handler = sig_handler; + sigaction(SIGTERM, &sigterm_new_action, &sigterm_old_action); +-#endif /* HAVE_SIGACTION && HAVE_FORK */ ++#endif /* HAVE_SIGACTION && HAVE_FORK && HAVE_FORK==1 */ + srunner_run_init(sr, print_mode); + srunner_iterate_suites(sr, sname, tcname, include_tags, exclude_tags, + print_mode); + srunner_run_end(sr, print_mode); +-#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) ++#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) && HAVE_FORK==1 + sigaction(SIGALRM, &sigalarm_old_action, NULL); + sigaction(SIGINT, &sigint_old_action, NULL); + sigaction(SIGTERM, &sigterm_old_action, NULL); +-#endif /* HAVE_SIGACTION && HAVE_FORK */ ++#endif /* HAVE_SIGACTION && HAVE_FORK && HAVE_FORK==1 */ + } + + void srunner_run(SRunner * sr, const char *sname, const char *tcname, +-- +2.45.2 + From 9ef51ec2cabff9fed9a3acc96d39cb1be456a11a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 22:19:54 +0200 Subject: [PATCH 1648/3013] Revert "package/check: disable static build" This reverts commit 77e945b003e1b401c0def36db403c937e4d604bb. The static linking issue was fixed by commit 526b89b981cb3fa3da7644482d1f140f1fb25e27 ("package/check: don't build shared lib when disabled") Signed-off-by: Thomas Petazzoni --- package/check/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/check/Config.in b/package/check/Config.in index a3a7ff1f117..2312fbf81c0 100644 --- a/package/check/Config.in +++ b/package/check/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_CHECK bool "check" - depends on !BR2_STATIC_LIBS help Check is a unit testing framework for C. https://libcheck.github.io/check/ - -comment "check needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS From 61d04a0a738dd10bb2dd96a2e28ff3fd15e03476 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 20 May 2024 10:49:31 +0200 Subject: [PATCH 1649/3013] configs/imx8mpico: remove defconfig This defconfig fail to build since commit dc0f721 "package/gcc: switch to 13.x as default". This board is no longer listed in the supported platforms in the latest BSPs from TechNexion: https://developer.technexion.com/docs/release-notes-yp42-2024q2#supported-platforms-in-this-release This commit removes this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6865597285 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - DEVELOPERS | 4 - ...low-lower-address-access-with-gcc-12.patch | 62 ------------ ...dd-support-for-new-binutils-versions.patch | 62 ------------ board/technexion/imx8mpico/readme.txt | 99 ------------------- configs/imx8mpico_defconfig | 40 -------- 6 files changed, 268 deletions(-) delete mode 100644 board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch delete mode 100644 board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch delete mode 100644 board/technexion/imx8mpico/readme.txt delete mode 100644 configs/imx8mpico_defconfig diff --git a/.checkpackageignore b/.checkpackageignore index 842b86bbc8d..81cabcb3088 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -192,7 +192,6 @@ configs/imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/imx6ulpico_defconfig lib_defconfig.ForceCheckHash configs/imx7d-sdb_defconfig lib_defconfig.ForceCheckHash configs/imx7dpico_defconfig lib_defconfig.ForceCheckHash -configs/imx8mpico_defconfig lib_defconfig.ForceCheckHash configs/imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/imxrt1050-evk_defconfig lib_defconfig.ForceCheckHash configs/khadas_vim3_defconfig lib_defconfig.ForceCheckHash diff --git a/DEVELOPERS b/DEVELOPERS index 1fa425f3ee3..d878e86f0e2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1755,10 +1755,6 @@ F: package/paho-mqtt-c N: Julien Olivain F: board/qemu/riscv64-virt-efi/ F: board/spike/ -F: board/technexion/imx8mmpico/ -F: board/technexion/imx8mpico/ -F: configs/imx8mmpico_defconfig -F: configs/imx8mpico_defconfig F: configs/qemu_riscv64_virt_efi_defconfig F: configs/spike_riscv32_defconfig F: configs/spike_riscv64_defconfig diff --git a/board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch b/board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch deleted file mode 100644 index 90e808cc8e5..00000000000 --- a/board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 078cbf942c86d77775a26d83fc87ca244de02d4c Mon Sep 17 00:00:00 2001 -From: Govindraj Raja -Date: Fri, 5 May 2023 09:09:36 -0500 -Subject: [PATCH] fix(build): allow lower address access with gcc-12 - -With gcc-12 any lower address access can trigger a warning/error -this would be useful in other parts of system but in TF-A -there are various reasons to access to the lower address ranges, -example using mmio_read_*/writes_* - -So setup to allow access to lower addresses while using gcc-12 - -Change-Id: Id1b4012b13bc6876d83b90a347fee12478a1921d -Signed-off-by: Govindraj Raja -Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/dea23e245fb890c6c06eff7d1aed8fffa981fc05 -Signed-off-by: Julien Olivain ---- - Makefile | 4 ++++ - make_helpers/build_macros.mk | 12 ++++++++++++ - 2 files changed, 16 insertions(+) - -diff --git a/Makefile b/Makefile -index dccf0121d..edd7f5886 100644 ---- a/Makefile -+++ b/Makefile -@@ -385,6 +385,10 @@ ifeq ($(findstring clang,$(notdir $(CC))),) - WARNINGS += -Wunused-but-set-variable -Wmaybe-uninitialized \ - -Wpacked-bitfield-compat -Wshift-overflow=2 \ - -Wlogical-op -+ -+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 -+TF_CFLAGS += $(call cc_option, --param=min-pagesize=0) -+ - else - # using clang - WARNINGS += -Wshift-overflow -Wshift-sign-overflow \ -diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk -index 12aaee684..3a54bf67c 100644 ---- a/make_helpers/build_macros.mk -+++ b/make_helpers/build_macros.mk -@@ -86,6 +86,18 @@ define assert_numerics - $(foreach num,$1,$(eval $(call assert_numeric,$(num)))) - endef - -+# Convenience function to check for a given linker option. An call to -+# $(call ld_option, --no-XYZ) will return --no-XYZ if supported by the linker -+define ld_option -+ $(shell if $(LD) $(1) -v >/dev/null 2>&1; then echo $(1); fi ) -+endef -+ -+# Convenience function to check for a given compiler option. A call to -+# $(call cc_option, --no-XYZ) will return --no-XYZ if supported by the compiler -+define cc_option -+ $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi ) -+endef -+ - # CREATE_SEQ is a recursive function to create sequence of numbers from 1 to - # $(2) and assign the sequence to $(1) - define CREATE_SEQ --- -2.41.0 - diff --git a/board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch b/board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch deleted file mode 100644 index d989bdb06be..00000000000 --- a/board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cc14748257e07ed5b2caf5194c4c333a8d09a1f4 Mon Sep 17 00:00:00 2001 -From: Marco Felsch -Date: Wed, 9 Nov 2022 12:59:09 +0100 -Subject: [PATCH] feat(build): add support for new binutils versions - -Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces -of a new warning when linking the bl*.elf in the form: - - ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack - ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker - ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions - ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions - -These new warnings are enbaled by default to secure elf binaries: - - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 - - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 - -Fix it in a similar way to what the Linux kernel does, see: -https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ - -Following the reasoning there, we set "-z noexecstack" for all linkers -(although LLVM's LLD defaults to it) and optional add ---no-warn-rwx-segments since this a ld.bfd related. - -Signed-off-by: Marco Felsch -Signed-off-by: Robert Schwebel -Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 -Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c -Signed-off-by: Julien Olivain ---- - Makefile | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/Makefile b/Makefile -index edd7f5886..4c0e1473e 100644 ---- a/Makefile -+++ b/Makefile -@@ -418,6 +418,8 @@ endif - - GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) - -+TF_LDFLAGS += -z noexecstack -+ - # LD = armlink - ifneq ($(findstring armlink,$(notdir $(LD))),) - TF_LDFLAGS += --diag_error=warning --lto_level=O1 -@@ -445,6 +447,12 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) - # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other - else - TF_LDFLAGS += --fatal-warnings -O1 -+ -+# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we -+# are not loaded by a elf loader. -+TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) -+TF_LDFLAGS += -O1 -+ - TF_LDFLAGS += --gc-sections - # ld.lld doesn't recognize the errata flags, - # therefore don't add those in that case --- -2.41.0 - diff --git a/board/technexion/imx8mpico/readme.txt b/board/technexion/imx8mpico/readme.txt deleted file mode 100644 index c20bfc0f448..00000000000 --- a/board/technexion/imx8mpico/readme.txt +++ /dev/null @@ -1,99 +0,0 @@ -**************************** -Technexion i.MX8M Pico board -**************************** - -This file documents the Buildroot support for the Technexion i.MX8M -Pico board. The Pico i.MX8M system-on-module [1] is present in -development kits like the Pico Pi i.MX8M [2]. - -Build -===== - -First, configure Buildroot for the i.MX8M Pico board: - - make imx8mpico_defconfig - -Build all components: - - make - -You will find in output/images/ the following files: - - bl31.bin - - boot.vfat - - Image - - imx8-boot-sd.bin - - lpddr4_pmu_train_fw.bin - - pico-8m-dcss-ili9881c.dtb - - pico-8m.dtb - - rootfs.ext4 - - sdcard.img - - signed_hdmi_imx8m.bin - - u-boot.imx - -Flashing sdcard.img on the eMMC -=============================== - -i.MX8M Pico board does not have a SD card slot. The storage is an -eMMC. An easy way to flash the eMMC is to use the u-boot ums -command. The boards are sold pre-flashed with such a u-boot. It is -assumed here that the board has already a working u-boot on eMMC and -jumpers are set to boot on eMMC. See [3]. - -Jumper configuration for eMMC boot: -J1: jumper on pins 4 and 6. -J2: jumper on pins 2 and 4. - -In case the board was flashed with a wrong u-boot, or the eMMC is -erased, u-boot can be loaded by USB Serial Download boot mode, using -imx-usb-loader. See [3]. - -For flashing: -- Plug the micro USB cable from the Debug USB Port, to your computer -- Plug the USB Type C to your computer, this will power up the board - -In the U-Boot prompt launch: - -=> ums 0 mmc ${mmcdev} - -This will mount the eMMC content in the host PC as a mass storage device. -Note: the ${mmcdev} id may change from one uboot version to another. The -actual id can be confirmed by running commands "mmc rescan" then -"mmc list", to find the eMMC entry. Finally it's possible to enter -directly the mmc device id, for example: "ums 0 mmc 2". - -To determine the device associated to the eMMC card have a look in the -/proc/partitions file: - - cat /proc/partitions - -If your system automatically mount some device partitions, make sure -to unmount them. - -Buildroot prepares a bootable "sdcard.img" image in the output/images/ -directory, ready to be dumped on the eMMC. Launch the following -command as root: - - dd bs=1M if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the eMMC content. Use with care! *** - -This operation can take several minutes, depending on the image -size. When tested, a 10MB/s transfer rate was observed. Note: the -blocksize "bs=1M" parameter gives better transfer performances. - -For details about the medium image layout, see the definition in -board/freescale/common/imx/genimage.cfg.template. - -Boot the i.MX8M Pico board -========================== - -To boot your newly created system: -- put a micro USB cable into the Debug USB Port and connect using a terminal - emulator at 115200 bps, 8n1; -- power on the board, with USB Type C connector. - -Enjoy! - -[1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M -[2]. https://www.technexion.com/products/system-on-modules/evk/pico-pi-imx8m/ -[3]. https://developer.technexion.com/docs/pico-evaluation-kit-boot-mode-settings#picoimx8m-and-picoimx8mmini diff --git a/configs/imx8mpico_defconfig b/configs/imx8mpico_defconfig deleted file mode 100644 index dd0f0e7b650..00000000000 --- a/configs/imx8mpico_defconfig +++ /dev/null @@ -1,40 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-pico-pi.dtb" -BR2_GLOBAL_PATCH_DIR="board/technexion/imx8mpico/patches" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/linux-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-pico-pi freescale/imx8mq-pico-pi-dcss-ili9881c" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_FREESCALE_IMX=y -BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y -BR2_PACKAGE_FIRMWARE_IMX=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.15.71-2.2.0)/imx-atf-lf-5.15.71-2.2.0.tar.gz" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/u-boot-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mq" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" -BR2_TARGET_UBOOT_SPL=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From 50049eb8a66e966f1f42fbd4494af4c4c1ec3ff3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 22:24:36 +0200 Subject: [PATCH 1650/3013] DEVELOPERS: re-add entries for imx8mmpico_defconfig These entries should not have been removed by commit 61d04a0a738dd10bb2dd96a2e28ff3fd15e03476 ("configs/imx8mpico: remove defconfig"). Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d878e86f0e2..896791cab3c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1755,6 +1755,8 @@ F: package/paho-mqtt-c N: Julien Olivain F: board/qemu/riscv64-virt-efi/ F: board/spike/ +F: board/technexion/imx8mmpico/ +F: configs/imx8mmpico_defconfig F: configs/qemu_riscv64_virt_efi_defconfig F: configs/spike_riscv32_defconfig F: configs/spike_riscv64_defconfig From 093aac9a2f0cf6b3ae97f68f4f774c0b5edd3df2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 20 May 2024 11:07:39 +0200 Subject: [PATCH 1651/3013] package/mokutil: bump to version 0.7.2 For release note, see: https://github.com/lcp/mokutil/releases/tag/0.7.2 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/mokutil/mokutil.hash | 2 +- package/mokutil/mokutil.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mokutil/mokutil.hash b/package/mokutil/mokutil.hash index 86555e6f4db..4eb8414d1b6 100644 --- a/package/mokutil/mokutil.hash +++ b/package/mokutil/mokutil.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1c0bcba3d2f4ab98235b1edb5eb71b40508f79d93d3e28b1a04b7fbd4a2c1457 mokutil-0.7.1.tar.gz +sha256 839d677c4fc9805f1565703ca32863e4652692c53da66a88ae9b9e30676f9e17 mokutil-0.7.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mokutil/mokutil.mk b/package/mokutil/mokutil.mk index f176fa5beec..de379991acb 100644 --- a/package/mokutil/mokutil.mk +++ b/package/mokutil/mokutil.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOKUTIL_VERSION = 0.7.1 +MOKUTIL_VERSION = 0.7.2 MOKUTIL_SITE = $(call github,lcp,mokutil,$(MOKUTIL_VERSION)) MOKUTIL_LICENSE = GPL-3.0+ MOKUTIL_LICENSE_FILES = COPYING From be5f14657a5540fdabb03ba8b5ff64c0da804e32 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 4 Jul 2024 19:11:14 -0600 Subject: [PATCH 1652/3013] package/systemd: enable required oomd kernel options In order for systemd-oomd to run CONFIG_PSI and CONFIG_MEMCG must be enabled in the kernel config. See: https://github.com/systemd/systemd/commit/e7b3f1a6c358dd3eaf0b50547bd52130ad4126ae https://github.com/systemd/systemd/commit/aa329b89223a79793cde8288b1bc6e93db174938 Signed-off-by: James Hilliard Signed-off-by: Romain Naour --- package/systemd/systemd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6b3553723c4..52fa344807d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -480,6 +480,10 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) SYSTEMD_CONF_OPTS += -Doomd=true SYSTEMD_OOMD_USER = systemd-oom -1 systemd-oom -1 * - - - systemd Userspace OOM Killer +define SYSTEMD_OOMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_PSI) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) +endef else SYSTEMD_CONF_OPTS += -Doomd=false endif @@ -804,6 +808,8 @@ define SYSTEMD_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) + + $(SYSTEMD_OOMD_LINUX_CONFIG_FIXUPS) endef # We need a very minimal host variant, so we disable as much as possible. From f6d9fa3692b0e5dd75bb1fee5d151fe58da7800d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 20 May 2024 11:52:05 +0200 Subject: [PATCH 1653/3013] package/fwts: fix build with host make >= 4.4 When build host has a many CPUs (more that 20) and GNU Make 4.4 (included for example in Fedora 40), fwts can randomly fail to build. This commit adds a package patch to fix the issue. Fixes: mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory mv: cannot stat 'prparser.tab.c': No such file or directory See also: https://github.com/fwts/fwts/issues/7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...fix-parallel-build-with-GNU-Make-4.4.patch | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch diff --git a/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch b/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch new file mode 100644 index 00000000000..a5568d1fd9f --- /dev/null +++ b/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch @@ -0,0 +1,133 @@ +From 65a89b6253ef527ab4bc951eb8f9deba12f0121a Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 May 2024 11:14:02 +0200 +Subject: [PATCH] libfwtsiasl: fix parallel build with GNU Make >= 4.4 + +When a build host has a large number of cores (like 20+) and GNU Make +version is >= 4.4, fwts randomly fail to build in parallel, with a +"make -j$(nproc)" command, with error: + + mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory + mv: cannot stat 'prparser.tab.c': No such file or directory + +This issue has been reported here: +https://github.com/fwts/fwts/issues/7 + +The Makefile.am of libfwtsiasl is using the GNU Make ".NOTPARALLEL" +special target with prerequisites to handle commands generating +multiple outputs (like lex/yacc invocations). See: +https://github.com/fwts/fwts/blob/V24.03.00/src/libfwtsiasl/Makefile.am#L61 + +First, the .NOTPARALLEL special target _with_ prerequisites is a +feature added in GNU Make 4.4. See: +https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 +https://lists.gnu.org/archive/html/help-make/2022-10/msg00020.html + +GNU Make version < 4.4 will interpret it as if it was written without +prerequisite (as a standalone ".NOTPARALLEL:"). The effect is that the +parallel compilation is disabled for the whole libfwtsiasl. The +standalone .NOTPARALLEL special target was introduced in GNU Make 3.79 +in 2000. This is why parallel builds are working with Make older than +version 4.4. + +Secondly, the reason why the build is failing on GNU Make >= 4.4 is +because the usage of .NOTPARALLEL in incorrect. + +Quoting the Make manual: +https://www.gnu.org/software/make/manual/html_node/Parallel-Disable.html +""" +If the .NOTPARALLEL special target has prerequisites, then each of those +prerequisites will be considered a target and all prerequisites of these +targets will be run serially. +""" + +Note the serialization will happen on the prerequisites of the targets +set as prerequisites of .NOTPARALLEL. + +The targets will not be correctly marked to disable parallel +execution. + +Thirdly, the use of multiple targets in a rule is incorrect here. See +Make manual: +https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html +The construct used in Makefile.am of libfwtsiasl for lex/yacc parsers +assumes they are independant targets (so they can be executed in +parallel). Finally, the "mv" command is failing, because there will be +one parallel execution per target, the first mv will suceed and the +other ones will fail. Multiple independant targets are often used in +Makefiles for lex/yacc, they are working because they are not using +"mv". Even in multiple execution, files are just overwritten. + +Fixing this .NOTPARALLEL usage with prerequisites would require Make +version 4.4 or greater. This is a strong requirement, as there is +still many Linux distros with older Make version (as an example Ubuntu +22.04 LTS has Make 4.3). + +The .WAIT special target could be used, but was also introduced in +Make version 4.4. See: +https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 + +GNU Make 4.3 also introduced "Grouped Targets" for that purpose. See: +https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html +But this would add a requirement on a recent Make version. + +This commit fixes the issue by declaring the first generated file as a +dependency of the other extra generated files. This has the effect of +completely solving the parallel build for all GNU Make versions. Also, +this enables parallel build for libfwtsiasl (except for the parser +generation) and makes the whole build faster. + +Signed-off-by: Julien Olivain +Upstream: https://github.com/fwts/fwts/commit/c0962cd74c725418523c46ca44101e0e70201f81 +--- + src/libfwtsiasl/Makefile.am | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am +index cb10bc58..ac54f621 100644 +--- a/src/libfwtsiasl/Makefile.am ++++ b/src/libfwtsiasl/Makefile.am +@@ -58,32 +58,32 @@ aslcompiler.y: $(ASL_PARSER) + aslcompilerlex.c: $(ASL_LEXER) + ${LEX} ${AM_LFLAGS} -PAslCompiler -o$@ $(top_srcdir)/src/acpica/source/compiler/aslcompiler.l + +-.NOTPARALLEL: aslcompiler.c +-aslcompiler.c aslcompiler.y.h: aslcompiler.y ++aslcompiler.c: aslcompiler.y + ${YACC} ${AM_YFLAGS} -d -baslcompiler -pAslCompiler $^ + mv aslcompiler.tab.c aslcompiler.c + cp aslcompiler.tab.h aslcompiler.y.h ++aslcompiler.y.h: aslcompiler.c + +-.NOTPARALLEL: dtcompilerparserlex.c +-dtcompilerparserlex.c dtcompilerparser.c dtcompilerparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y ++dtcompilerparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y + ${LEX} ${AM_LFLAGS} -PDtCompilerParser -odtcompilerparserlex.c $< + ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y + mv dtcompilerparser.tab.c dtcompilerparser.c + cp dtcompilerparser.tab.h dtcompilerparser.y.h ++dtcompilerparser.c dtcompilerparser.y.h: dtcompilerparserlex.c + +-.NOTPARALLEL: dtparserlex.c +-dtparserlex.c dtparser.c dtparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y ++dtparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y + ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c $< + ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser $(top_srcdir)/src/acpica/source/compiler/dtparser.y + mv dtparser.tab.c dtparser.c + cp dtparser.tab.h dtparser.y.h ++dtparser.c dtparser.y.h: dtparserlex.c + +-.NOTPARALLEL: prparserlex.c +-prparserlex.c prparser.c prparser.y.h: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y ++prparserlex.c: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y + ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c $< + ${YACC} ${AM_YFLAGS} -bprparser -pPrParser $(top_srcdir)/src/acpica/source/compiler/prparser.y + mv prparser.tab.c prparser.c + cp prparser.tab.h prparser.y.h ++prparser.c prparser.y.h: prparserlex.c + + pkglib_LTLIBRARIES = libfwtsiasl.la + +-- +2.45.1 + From 38d84178ce29ac3433cc1d1ae5b52ff17aace724 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 12 Jul 2024 20:33:18 +0200 Subject: [PATCH 1654/3013] board/spike/riscv64/readme.txt: remove obsolete comment At the time the spike_riscv64_defconfig was introduced in commit [1], it was not possible to have a console input using Spike and OpenSBI for RISC-V 32 bits. This limitation no longer applies, as upstream components now implements support for this. Buildroot commit [2] updated riscv-isa-sim (Spike), which now includes a NS16550 uart emulation. This can be used by RV32 Linux Kernel. Finally, a spike_riscv32_defconfig was added in [3]. This commit removes the comment about this limitation, since it no longer applies. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/24d07fdc1404901fb1872ac55f875fe1d555cbb3 [2] https://gitlab.com/buildroot.org/buildroot/-/commit/853b7661bf5ddca5d4b81964ef1a19a133beac85 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/a83ab3f4c8621dec58dc78a8dcb48e519377ac3d Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- board/spike/riscv64/readme.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/board/spike/riscv64/readme.txt b/board/spike/riscv64/readme.txt index 5ad7df46dfb..34db625aadd 100644 --- a/board/spike/riscv64/readme.txt +++ b/board/spike/riscv64/readme.txt @@ -20,11 +20,6 @@ The boot is made with the standard RISC-V OpenSBI boot loader. In order to keep the simulation simple, the rootfs is passed as an initrd ramfs. -Note: at the time of this writing, Spike v1.1.0 and OpenSBI v1.0 does -not support console input emulation for 32bit RISC-V systems. A 32bit -Linux system can boot and reach the login, but it's not possible to -login. See [4]. - [1]. https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction @@ -34,6 +29,3 @@ https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-g [3]. https://github.com/riscv/riscv-openocd - -[4]. -https://github.com/riscv-software-src/opensbi/blob/v1.0/lib/utils/sys/htif.c#L127 From 8460ba0d2625abd8d4116f04fd25073845669a96 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 12 Jul 2024 20:39:31 +0200 Subject: [PATCH 1655/3013] configs/spike_riscv64: bump kernel to 6.6.35 and add hashes Commit [1] introduced a new spike_riscv32_defconfig with Kernel at v6.6.35. This commit bumps the Kernel of spike_riscv64_defconfig to have it aligned with its 32bit counterpart. This commit also adds custom hashes. Therefore, it adds BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in the defconfig, adds a global patch directory, and removes the entry in ".checkpackageignore". Finally, to completely align with the spike_riscv32_defconfig, the config directive BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM is moved by few lines. With this commit, the maintenance of the two spike_riscv{32,64} defconfigs will be easier. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/a83ab3f4c8621dec58dc78a8dcb48e519377ac3d Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../spike/riscv64/patches/linux-headers/linux-headers.hash | 1 + board/spike/riscv64/patches/linux/linux.hash | 2 ++ board/spike/riscv64/patches/opensbi/opensbi.hash | 2 ++ configs/spike_riscv64_defconfig | 6 ++++-- 5 files changed, 9 insertions(+), 3 deletions(-) create mode 120000 board/spike/riscv64/patches/linux-headers/linux-headers.hash create mode 100644 board/spike/riscv64/patches/linux/linux.hash create mode 100644 board/spike/riscv64/patches/opensbi/opensbi.hash diff --git a/.checkpackageignore b/.checkpackageignore index 81cabcb3088..0944eb1c2d0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -281,7 +281,6 @@ configs/socrates_cyclone5_defconfig lib_defconfig.ForceCheckHash configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash -configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash configs/terasic_de10nano_cyclone5_defconfig lib_defconfig.ForceCheckHash diff --git a/board/spike/riscv64/patches/linux-headers/linux-headers.hash b/board/spike/riscv64/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/spike/riscv64/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/spike/riscv64/patches/linux/linux.hash b/board/spike/riscv64/patches/linux/linux.hash new file mode 100644 index 00000000000..a3b67a09a47 --- /dev/null +++ b/board/spike/riscv64/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 fce3ee728712ed063aa8c14a8756c8ff8c7a46ba3827f61d2b04a73c7cf5dd9e linux-6.6.35.tar.xz diff --git a/board/spike/riscv64/patches/opensbi/opensbi.hash b/board/spike/riscv64/patches/opensbi/opensbi.hash new file mode 100644 index 00000000000..bc4058abe62 --- /dev/null +++ b/board/spike/riscv64/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index fa8cba42755..feb13d84dbf 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -1,10 +1,12 @@ BR2_riscv=y BR2_RISCV_64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/spike/riscv64/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.26" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.35" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y From 02f553f02d4042d7a5b9c66ff924c85a6b452472 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Fri, 12 Jul 2024 20:42:41 +0200 Subject: [PATCH 1656/3013] package/ima-evm-utils: bump version to 1.6 Upstream moved git repository. The COPYING file has been dropped in favor of a LICENSES.txt file that clarifies the licensing. We take this opportunity to update the IMA_EVM_UTILS_LICENSE variable according to what LICENSES.txt indicates. Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/ima-evm-utils/ima-evm-utils.hash | 6 +++--- package/ima-evm-utils/ima-evm-utils.mk | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/ima-evm-utils/ima-evm-utils.hash b/package/ima-evm-utils/ima-evm-utils.hash index 9777c7f2130..844ba0d4fe8 100644 --- a/package/ima-evm-utils/ima-evm-utils.hash +++ b/package/ima-evm-utils/ima-evm-utils.hash @@ -1,3 +1,3 @@ -# https://github.com/mimizohar/ima-evm-utils/releases/download/v1.5/ima-evm-utils-1.5.tar.gz.sha256 -sha256 45f1caa3ad59ec59a1d6a74ea5df38c413488cd952ab62d98cf893c15e6f246d ima-evm-utils-1.5.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# https://github.com/linux-integrity/ima-evm-utils/releases/download/v1.6/ima-evm-utils-1.6.tar.gz.sha256 +sha256 3d09e77a09e985b285891f13d458653f44913879147679dce30bdbf00380d40e ima-evm-utils-1.6.tar.gz +sha256 d037fb0b5fdb4d1e09e246a56bdb8049fc6d9b1f9270c0ec2ae4bc8f9285165b LICENSES.txt diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index b969b4709e4..858efee8da8 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -4,10 +4,10 @@ # ################################################################################ -IMA_EVM_UTILS_VERSION = 1.5 -IMA_EVM_UTILS_SITE = https://github.com/mimizohar/ima-evm-utils/releases/download/v$(IMA_EVM_UTILS_VERSION) -IMA_EVM_UTILS_LICENSE = GPL-2.0 -IMA_EVM_UTILS_LICENSE_FILES = COPYING +IMA_EVM_UTILS_VERSION = 1.6 +IMA_EVM_UTILS_SITE = https://github.com/linux-integrity/ima-evm-utils/releases/download/v$(IMA_EVM_UTILS_VERSION) +IMA_EVM_UTILS_LICENSE = LGPL-2.0+ (libimaevm), GPL-2.0+ (evmctl) +IMA_EVM_UTILS_LICENSE_FILES = LICENSES.txt IMA_EVM_UTILS_INSTALL_STAGING = YES IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss From f9b5d9170f943ae61fc10a9d119a4ac26e645418 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Tue, 19 Sep 2023 21:35:14 +0200 Subject: [PATCH 1657/3013] package/mxt-app: new package mxt-app is a utility for managing Atmel maXTouch touch controllers and other devices that support Atmel Object Based Protocol. Signed-off-by: Saeed Kazemi [Arnout: - drop BR2_PACKAGE_MXT_APP_DEBUG option, instead use BR2_ENABLE_RUNTIME_DEBUG; - also explicitly disable debug; - add comment to explain AUTORECONF. ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in | 1 + package/mxt-app/Config.in | 15 +++++++++++++++ package/mxt-app/mxt-app.hash | 3 +++ package/mxt-app/mxt-app.mk | 22 ++++++++++++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 package/mxt-app/Config.in create mode 100644 package/mxt-app/mxt-app.hash create mode 100644 package/mxt-app/mxt-app.mk diff --git a/DEVELOPERS b/DEVELOPERS index 896791cab3c..d5ca42fb006 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2824,6 +2824,7 @@ F: package/biosdevname/ N: Saeed Kazemi F: package/eza/ F: package/procs/ +F: package/mxt-app/ F: package/zoxide/ N: Sam Lancia diff --git a/package/Config.in b/package/Config.in index 2b71978112f..34ce57f5cf3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -565,6 +565,7 @@ endmenu source "package/mhz/Config.in" source "package/minicom/Config.in" source "package/msr-tools/Config.in" + source "package/mxt-app/Config.in" source "package/nanocom/Config.in" source "package/neard/Config.in" source "package/nvidia-driver/Config.in" diff --git a/package/mxt-app/Config.in b/package/mxt-app/Config.in new file mode 100644 index 00000000000..96085e7f7dd --- /dev/null +++ b/package/mxt-app/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_MXT_APP + bool "mxt-app" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + help + mxt-app is a utility for managing Atmel maXTouch touch + controllers and other devices that support Atmel Object Based + Protocol. + + https://github.com/atmel-maxtouch/mxt-app/ + +comment "mxt-app needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/mxt-app/mxt-app.hash b/package/mxt-app/mxt-app.hash new file mode 100644 index 00000000000..b7851cea37c --- /dev/null +++ b/package/mxt-app/mxt-app.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3639720ae1ea033bd982d68c5cab84432ce046fe14a66d9b2de07f115b642722 mxt-app-1.36.tar.gz +sha256 3682b125a40a4da00b6ab69bdbd38c25ed4beae69b3fe32458d2e32638477c4c LICENSE diff --git a/package/mxt-app/mxt-app.mk b/package/mxt-app/mxt-app.mk new file mode 100644 index 00000000000..3da14589784 --- /dev/null +++ b/package/mxt-app/mxt-app.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# mxt-app +# +################################################################################ + +MXT_APP_VERSION = 1.36 +MXT_APP_SITE = $(call github,atmel-maxtouch,mxt-app,v$(MXT_APP_VERSION)) +MXT_APP_LICENSE = BSD-2-Clause +MXT_APP_LICENSE_FILES = LICENSE +MXT_APP_DEPENDENCIES = libusb +MXT_APP_INSTALL_STAGING = YES +# From a git tree: no generated autotools files +MXT_APP_AUTORECONF = YES + +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) +MXT_APP_CONF_OPTS += --enable-debug +else +MXT_APP_CONF_OPTS += --disable-debug +endif + +$(eval $(autotools-package)) From b919d852e2a09b3517b79f8d0a5edeca21d2a9bb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 12 Jul 2024 14:19:43 -0600 Subject: [PATCH 1658/3013] package/prelink-cross: bump to version ff2561c02ade96c5d4d56ddd4e27ff064840a176 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/prelink-cross/prelink-cross.hash | 2 +- package/prelink-cross/prelink-cross.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash index 4aa3a86c455..286fef9fc32 100644 --- a/package/prelink-cross/prelink-cross.hash +++ b/package/prelink-cross/prelink-cross.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ce0d58b7c60a441fd61c52329e2c767f7888056c491f55627a5304b13fda743f prelink-cross-440c0059a21f06b5577499a80b55482cb99d6d1c-git4.tar.gz +sha256 a8fdf6e96032d2300102c549bdb4d961fef4e546874d79cda1f88fa07912e30c prelink-cross-ff2561c02ade96c5d4d56ddd4e27ff064840a176-git4.tar.gz sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk index c32ea74afd8..e554a423d4f 100644 --- a/package/prelink-cross/prelink-cross.mk +++ b/package/prelink-cross/prelink-cross.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRELINK_CROSS_VERSION = 440c0059a21f06b5577499a80b55482cb99d6d1c +PRELINK_CROSS_VERSION = ff2561c02ade96c5d4d56ddd4e27ff064840a176 PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross PRELINK_CROSS_SITE_METHOD = git PRELINK_CROSS_LICENSE = GPL-2.0+ From f4cf2bbc42d0c55393356bdb5a40b79fc1ba8cad Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 20 May 2024 17:27:48 +0200 Subject: [PATCH 1659/3013] package/tig: new package Tig is an ncurses-based text-mode interface for git. It functions mainly as a Git repository browser, but can also assist in staging changes for commit at chunk level and act as a pager for output from various Git commands. https://jonas.github.io/tig/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tig/Config.in | 12 ++++++++++++ package/tig/tig.hash | 6 ++++++ package/tig/tig.mk | 21 +++++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 package/tig/Config.in create mode 100644 package/tig/tig.hash create mode 100644 package/tig/tig.mk diff --git a/DEVELOPERS b/DEVELOPERS index d5ca42fb006..f482e3fe562 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1788,6 +1788,7 @@ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ +F: package/tig/ F: package/tinycompress/ F: package/z3/ F: package/zynaddsubfx/ diff --git a/package/Config.in b/package/Config.in index 34ce57f5cf3..eeb11dfa83d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -202,6 +202,7 @@ menu "Development tools" source "package/ripgrep/Config.in" source "package/sed/Config.in" source "package/subversion/Config.in" + source "package/tig/Config.in" source "package/tree/Config.in" source "package/unifdef/Config.in" source "package/yasm/Config.in" diff --git a/package/tig/Config.in b/package/tig/Config.in new file mode 100644 index 00000000000..0a1cc93404a --- /dev/null +++ b/package/tig/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TIG + bool "tig" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_GIT # runtime + select BR2_PACKAGE_NCURSES + help + Tig is an ncurses-based text-mode interface for git. It + functions mainly as a Git repository browser, but can also + assist in staging changes for commit at chunk level and act + as a pager for output from various Git commands. + + https://jonas.github.io/tig/ diff --git a/package/tig/tig.hash b/package/tig/tig.hash new file mode 100644 index 00000000000..b5aebb9c5d6 --- /dev/null +++ b/package/tig/tig.hash @@ -0,0 +1,6 @@ +# From: +# https://github.com/jonas/tig/releases/download/tig-2.5.10/tig-2.5.10.tar.gz.sha256 +sha256 f655cc1366fc10058a2bd505bb88ca78e653ff7526c1b81774c44b9d841210e3 tig-2.5.10.tar.gz + +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/tig/tig.mk b/package/tig/tig.mk new file mode 100644 index 00000000000..d3aa6df62ac --- /dev/null +++ b/package/tig/tig.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# tig +# +################################################################################ + +TIG_VERSION = 2.5.10 +TIG_SITE = https://github.com/jonas/tig/releases/download/tig-$(TIG_VERSION) +TIG_LICENSE = GPL-2.0+ +TIG_LICENSE_FILES = COPYING + +TIG_DEPENDENCIES = ncurses + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +TIG_DEPENDENCIES += libiconv +TIG_CONF_OPTS += --with-iconv=$(STAGING_DIR)/usr +else +TIG_CONF_OPTS += --without-iconv +endif + +$(eval $(autotools-package)) From 9f458cd6c2940267655f673b3ae5f14334f12859 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 22 May 2024 12:16:06 +0300 Subject: [PATCH 1660/3013] package/libavif: new package libavif is an implementation of the AV1F image format, which may be a frontend for different encoders and decoders. At the moment only dav1d is packaged so that is the one configured. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libavif/Config.in | 13 +++++++++++++ package/libavif/libavif.hash | 3 +++ package/libavif/libavif.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 package/libavif/Config.in create mode 100644 package/libavif/libavif.hash create mode 100644 package/libavif/libavif.mk diff --git a/DEVELOPERS b/DEVELOPERS index f482e3fe562..7b0f65fbfb9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -55,6 +55,7 @@ F: package/brotli/ F: package/bubblewrap/ F: package/cage/ F: package/cog/ +F: package/libavif/ F: package/libdex/ F: package/libepoxy/ F: package/libmanette/ diff --git a/package/Config.in b/package/Config.in index eeb11dfa83d..a52ed146d93 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1677,6 +1677,7 @@ menu "Graphics" source "package/leptonica/Config.in" source "package/lesstif/Config.in" source "package/libart/Config.in" + source "package/libavif/Config.in" source "package/libdecor/Config.in" source "package/libdmtx/Config.in" source "package/libdri2/Config.in" diff --git a/package/libavif/Config.in b/package/libavif/Config.in new file mode 100644 index 00000000000..a15e9fc733e --- /dev/null +++ b/package/libavif/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBAVIF + bool "libavif" + depends on !BR2_STATIC_LIBS # dav1d, dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS # dav1d, pthread + select BR2_PACKAGE_DAV1D + help + Friendly, portable C implementation of the AV1 Image File + Format. + + https://github.com/AOMediaCodec/libavif + +comment "libavif needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/libavif/libavif.hash b/package/libavif/libavif.hash new file mode 100644 index 00000000000..f4599cdb0b8 --- /dev/null +++ b/package/libavif/libavif.hash @@ -0,0 +1,3 @@ +sha256 dc56708c83a4b934a8af2b78f67f866ba2fb568605c7cf94312acf51ee57d146 libavif-1.0.4.tar.gz + +sha256 10952217a6d404de8bf8a997fbea9b88f682df1fe98cb9b9f467ade641525639 LICENSE diff --git a/package/libavif/libavif.mk b/package/libavif/libavif.mk new file mode 100644 index 00000000000..b87597995ad --- /dev/null +++ b/package/libavif/libavif.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# libavif +# +################################################################################ + +LIBAVIF_VERSION = 1.0.4 +LIBAVIF_SITE = $(call github,AOMediaCodec,libavif,v$(LIBAVIF_VERSION)) +LIBAVIF_LICENSE = BSD-2-Clause, IJG, Apache-2.0 +LIBAVIF_LICENSE_FILES = LICENSE +LIBAVIF_INSTALL_STAGING = YES + +# Only the dav1d decoder is packaged at the moment. +LIBAVIF_DEPENDENCIES = dav1d +LIBAVIF_CONF_OPTS = \ + -DAVIF_BUILD_APPS=OFF \ + -DAVIF_BUILD_EXAMPLES=OFF \ + -DAVIF_BUILD_MAN_PAGES=OFF \ + -DAVIF_BUILD_TESTS=OFF \ + -DAVIF_CODEC_AOM=OFF \ + -DAVIF_CODEC_DAV1D=ON \ + -DAVIF_CODEC_LIBGAV1=OFF \ + -DAVIF_CODEC_RAV1E=OFF \ + -DAVIF_CODEC_SVT=OFF \ + -DAVIF_CODEC_AVM=OFF \ + -DAVIF_ENABLE_GTEST=OFF + +# There is no CMake options to explicitly enable/disable usage of +# libyuv, only autodetection :-( +ifeq ($(BR2_PACKAGE_LIBYUV),y) +LIBAVIF_DEPENDENCIES += libyuv +endif + +$(eval $(cmake-package)) From afbe0fe8f5907f8d5eb4fde428af54721313a4cd Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 22 May 2024 12:16:07 +0300 Subject: [PATCH 1661/3013] package/wpewebkit: use libavif if enabled Make wpewebkit pick a value for the USE_AVIF option depending on BR2_PACKAGE_LIBAVIF. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpewebkit/wpewebkit.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index ecb3b3e352b..1355b65f616 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -28,8 +28,7 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ -DENABLE_WEB_RTC=OFF \ - -DUSE_ATK=OFF \ - -DUSE_AVIF=OFF + -DUSE_ATK=OFF ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ @@ -61,6 +60,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_MEDIA_STREAM=OFF endif +ifeq ($(BR2_PACKAGE_LIBAVIF),y) +WPEWEBKIT_CONF_OPTS += -DUSE_AVIF=ON +WPEWEBKIT_DEPENDENCIES += libavif +else +WPEWEBKIT_CONF_OPTS += -DUSE_AVIF=OFF +endif + ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y) WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON else From 5d02277884e406625c0142e7c3e68dfe30bdf6c4 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 Jul 2024 12:33:29 -0700 Subject: [PATCH 1662/3013] package/go: security bump version to go1.22.5 Fixes CVE: CVE-2024-24791: net/http: denial of service due to improper 100-continue handling https://go.dev/doc/devel/release#go1.22.5 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/go/go-src/go-src.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go-src/go-src.hash b/package/go/go-src/go-src.hash index 7952461f2d5..d300f6e2c90 100644 --- a/package/go/go-src/go-src.hash +++ b/package/go/go-src/go-src.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784 go1.22.4.src.tar.gz +sha256 ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 go1.22.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 91a8fb828f5..bfbe997911d 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.22.4 +GO_VERSION = 1.22.5 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache From d200d8ebe255384cd492ee0f983ec7868df9caec Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 3 Jul 2024 12:42:33 +0200 Subject: [PATCH 1663/3013] package/harfbuzz: bump to version 9.0.0 Since the major release changed all the packages that have direct dependency to harfbuzz have been succesfully built: - efl - libass - mupdf - pango - qt5base - qt5webengine - qt6base - sdl2_ttf - supertuxkart - vlc - webkitgtk - wpewebkit Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 1ea54e8ee99..fa4ee16a9fc 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e harfbuzz-8.4.0.tar.xz +sha256 a41b272ceeb920c57263ec851604542d9ec85ee3030506d94662067c7b6ab89e harfbuzz-9.0.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 848fac4dd6e..946b2b0f703 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.4.0 +HARFBUZZ_VERSION = 9.0.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From c2c2f3a42cb5ca72415d257ee50625730b47e9df Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Wed, 7 Feb 2024 11:51:33 -0600 Subject: [PATCH 1664/3013] package/petitboot: properly shut down before kexec It's good practice to unmount filesystems and gracefully terminate running services before running "kexec -e". So when a boot option has been chosen from the petitboot menu, poke init to shut the system down and kexec the new kernel. One benefit to us in particular is that when pb-console is killed, it notifies the user that we're booting: trap 'reset; echo "SIGTERM received, booting..."; sleep 2' SIGTERM This terminal reset is also useful, exiting the ncurses visual mode so subsequent boot output is raw rather than being confined to the window set up for the petitboot menu. Currently we assume busybox init (using the bb-kexec-reboot script included with petitboot), but do not add an accompanying entry in the inittab to run kexec, so things aren't working. Add a new script kexec-restart that does the right thing for all init systems that Buildroot supports (busybox, sysv, openrc, systemd). OpenRC and systemd have an upstream way to do a kexec-shutdown. For busybox and sysv, we add a line to inittab that does kexec -f -e (after the shutdown scripts have run). Finally, for other cases (where there is no recognized init system) directly use kexec -f -e. Signed-off-by: Reza Arbab [Arnout: - install kexec-restart in /usr/libexec/petitboot, where it was before; - determine init system statically based on config instead of dynamically. ] Signed-off-by: Arnout Vandecappelle --- package/petitboot/kexec-restart.in | 8 ++++++++ package/petitboot/petitboot.mk | 33 +++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 package/petitboot/kexec-restart.in diff --git a/package/petitboot/kexec-restart.in b/package/petitboot/kexec-restart.in new file mode 100644 index 00000000000..d7493914485 --- /dev/null +++ b/package/petitboot/kexec-restart.in @@ -0,0 +1,8 @@ +#!/bin/sh + +@KEXEC_COMMAND@ + +while : +do + sleep 1 +done diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 2eb6461144c..f5231733dcf 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -30,7 +30,7 @@ PETITBOOT_CONF_OPTS = \ --without-twin-x11 \ $(if $(BR2_PACKAGE_BUSYBOX),--enable-busybox,--disable-busybox) \ HOST_PROG_KEXEC=/usr/sbin/kexec \ - HOST_PROG_SHUTDOWN=/usr/libexec/petitboot/bb-kexec-reboot + HOST_PROG_SHUTDOWN=/usr/libexec/petitboot/kexec-restart # HPA and Busybox tftp are supported. HPA tftp is part of Buildroot's tftpd # package. @@ -55,11 +55,37 @@ else PETITBOOT_CONF_OPTS += --without-fdt endif +ifeq ($(BR2_INIT_BUSYBOX),y) +# inittab "restart" runlevel entry runs kexec +PETITBOOT_KEXEC_COMMAND = /bin/kill -QUIT 1 +define PETITBOOT_BUSYBOX_INITTAB + grep -q kexec $(TARGET_DIR)/etc/inittab || \ + printf "\nnull::restart:/usr/sbin/kexec -f -e\n" >> $(TARGET_DIR)/etc/inittab +endef +PETITBOOT_TARGET_FINALIZE_HOOKS += PETITBOOT_BUSYBOX_INITTAB +else ifeq ($(BR2_INIT_SYSV),y) +# inittab runlevel 6 entry runs kexec +PETITBOOT_KEXEC_COMMAND = /sbin/shutdown -r now +define PETITBOOT_SYSV_INITTAB + grep -q kexec $(TARGET_DIR)/etc/inittab || \ + $(SED) 's~^reb0:.*~reb0:6:wait:/usr/sbin/kexec -f -e~' $(TARGET_DIR)/etc/inittab +endef +PETITBOOT_TARGET_FINALIZE_HOOKS += PETITBOOT_SYSV_INITTAB +else ifeq ($(BR2_INIT_OPENRC),y) +PETITBOOT_KEXEC_COMMAND = /sbin/openrc-shutdown --kexec now +else ifeq ($(BR2_INIT_SYSTEMD),y) +PETITBOOT_KEXEC_COMMAND = /usr/bin/systemctl kexec +else # BR2_INIT_NONE +PETITBOOT_KEXEC_COMMAND = /usr/sbin/kexec -f -e +endif + PETITBOOT_GETTY_PORT = $(patsubst %,'%',$(call qstrip,$(BR2_PACKAGE_PETITBOOT_GETTY_PORT))) define PETITBOOT_POST_INSTALL - $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ - $(TARGET_DIR)/usr/libexec/petitboot/bb-kexec-reboot + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/kexec-restart.in \ + $(TARGET_DIR)/usr/libexec/petitboot/kexec-restart + $(SED) 's~@KEXEC_COMMAND@~$(PETITBOOT_KEXEC_COMMAND)~' \ + $(TARGET_DIR)/usr/libexec/petitboot/kexec-restart $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ @@ -77,6 +103,7 @@ define PETITBOOT_POST_INSTALL mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ ln -sf /usr/sbin/pb-udhcpc \ $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ + endef PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL From d5ba2db4011cd577732e26b5c081e57a26d8910f Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Wed, 7 Feb 2024 11:51:34 -0600 Subject: [PATCH 1665/3013] package/petitboot: run script when exiting to shell When the user selects the shell escape option from the petitboot menu, reset the terminal so output is raw rather than being confined to the ncurses window set up for the petitboot menu, and print some helpful text before running the shell. To do this, override the default HOST_PROG_SH (/bin/sh) with a small script. Doing so also enables someone to customize this behavior by overlaying a different script. Signed-off-by: Reza Arbab Signed-off-by: Arnout Vandecappelle --- package/petitboot/pb-shell | 10 ++++++++++ package/petitboot/petitboot.mk | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 package/petitboot/pb-shell diff --git a/package/petitboot/pb-shell b/package/petitboot/pb-shell new file mode 100644 index 00000000000..99887c3f3b8 --- /dev/null +++ b/package/petitboot/pb-shell @@ -0,0 +1,10 @@ +#!/bin/sh + +reset + +cat < Date: Wed, 7 Feb 2024 11:51:35 -0600 Subject: [PATCH 1666/3013] package/petitboot: run UI as non-root user Though the petitboot UI is a user application, it is currently being run by root only because we use getty to display it on the console. Create an unprivileged user to run the UI instead. The unix socket the pb-discover daemon sets up is accessible to "petitgroup", so that should be the gid, with arbitrary uid "petituser" to match. This is currently the chain of processes leading to the UI: 1. /etc/init.d/pb-console start console 2. /usr/libexec/petitboot/pb-console --getty --detach -- -n -i 0 console linux 3. /sbin/getty -l/usr/libexec/petitboot/pb-console -n -i 0 console linux 4. /usr/libexec/petitboot/pb-console 5. /usr/sbin/petitboot-nc Instead of (3) running the pb-console helper directly with "getty -l", we can use "agetty -a" to autologin petituser, and run pb-console via petituser's login shell: 1. /etc/init.d/pb-console start console 2. /usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i console linux 3. /sbin/agetty -a petituser -n -i console linux 4. /home/petituser/.profile 5. /usr/libexec/petitboot/pb-console 6. /usr/sbin/petiboot-nc Here, everything from (4) down is running as petituser. In (4), use $PPID to determine if we're logging in via getty, so that logging in by other means will give a normal shell. Otherwise we would recurse when trying to get a shell from the menu. Signed-off-by: Reza Arbab [Arnout: explicitly select util-linux, even though it comes indirectly through other dependencies] Signed-off-by: Arnout Vandecappelle --- package/petitboot/Config.in | 4 +++- package/petitboot/S15pb-discover | 4 +++- package/petitboot/pb-console | 6 ++++-- package/petitboot/petitboot.mk | 6 ++++++ package/petitboot/shell_profile | 3 +++ 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 package/petitboot/shell_profile diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 66836f31acd..50d5a4da70a 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PETITBOOT bool "petitboot" depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS - depends on BR2_USE_MMU # lvm2 + depends on BR2_USE_MMU # lvm2, agetty depends on BR2_USE_WCHAR # elfutils, kexec-lite depends on !BR2_STATIC_LIBS # elfutils, kexec-lite, lvm2 depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, kexec-lite, lvm2 @@ -17,6 +17,8 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_AGETTY help Petitboot is a small kexec-based bootloader diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover index 71ab62d9985..9e8f6c87f8b 100644 --- a/package/petitboot/S15pb-discover +++ b/package/petitboot/S15pb-discover @@ -12,7 +12,9 @@ fi start() { printf 'Starting %s: ' "$DAEMON" - mkdir -p /var/log/petitboot + # shellcheck disable=SC2174 # only apply -m to deepest dir + mkdir -p -m 0775 /var/log/petitboot + chown petituser:petitgroup /var/log/petitboot # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -b -m -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ diff --git a/package/petitboot/pb-console b/package/petitboot/pb-console index 407ff3b3023..8b23b2233de 100644 --- a/package/petitboot/pb-console +++ b/package/petitboot/pb-console @@ -3,14 +3,16 @@ DAEMON="pb-console" PB_CONSOLE_PORT=${2:-"console"} -PB_CONSOLE_ARGS="--getty --detach -- -n -i 0 $PB_CONSOLE_PORT linux" +PB_CONSOLE_ARGS="--getty=/sbin/agetty --detach -- -a petituser -n -i $PB_CONSOLE_PORT linux" # shellcheck source=/dev/null [ -r "/etc/default/petitboot" ] && . "/etc/default/petitboot" start() { printf 'Starting %s on %s: ' "$DAEMON" "$PB_CONSOLE_PORT" - mkdir -p /var/log/petitboot + # shellcheck disable=SC2174 # only apply -m to deepest dir + mkdir -p -m 0775 /var/log/petitboot + chown petituser:petitgroup /var/log/petitboot # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -x "/usr/libexec/petitboot/$DAEMON" \ diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 6f7789b185b..a6588a68e98 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -97,6 +97,8 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/init.d/pb-console $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-shell \ $(TARGET_DIR)/usr/libexec/petitboot/pb-shell + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_profile \ + $(TARGET_DIR)/home/petituser/.profile mkdir -p $(TARGET_DIR)/etc/udev/rules.d for port in $(PETITBOOT_GETTY_PORT); do \ @@ -111,4 +113,8 @@ endef PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL +define PETITBOOT_USERS + petituser -1 petitgroup -1 * /home/petituser /bin/sh - petitboot user +endef + $(eval $(autotools-package)) diff --git a/package/petitboot/shell_profile b/package/petitboot/shell_profile new file mode 100644 index 00000000000..a958ca4402f --- /dev/null +++ b/package/petitboot/shell_profile @@ -0,0 +1,3 @@ +if [ "$PPID" = "1" ]; then + exec /usr/libexec/petitboot/pb-console +fi From c54134bf6914593caaa9ed4aa11cbe3a17c59eca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 23:59:14 +0200 Subject: [PATCH 1667/3013] package/uvw: bump to 3.4.0 This allows uvw to be again in sync with the libuv package, following the bump of libuv to v1.48 in commit bd2f99246c253739a3d44d8345f2fbb5362b3fb5 ("package/libuv: security bump to version 1.48") The hash of the license file has changed due to a copyright year update. Signed-off-by: Thomas Petazzoni --- package/uvw/uvw.hash | 4 ++-- package/uvw/uvw.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 2dc6e879e1f..d346ac16198 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714 uvw-3.2.0_libuv_v1.46.tar.gz -sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE +sha256 c16600573871a5feeb524234b378ab832c8971b2a68d030c6bd0e3077d416ade uvw-3.4.0_libuv_v1.48.tar.gz +sha256 5e439d0ad6e1b16f2f14023872c49cb2cf1b62a172c30b864cb45a5aa6533454 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 12149d43ca5..a1eff0e4dd7 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 3.2.0_libuv_v1.46 +UVW_VERSION = 3.4.0_libuv_v1.48 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From 6df6286b78eeb97b7bd399b6f75c829262fbdbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Fri, 24 May 2024 17:56:17 +0200 Subject: [PATCH 1668/3013] configs/uevm5432_defconfig: bump Linux and U-Boot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel to v6.8.10. The Devicetree has moved; update our config accordingly. - Bump U-Boot to 2023.04. This is the most recent version we can use as U-Boot 2023.07 dropped support for the uevm. OpenSSL is now required for the build. The default boot method has changed; switch to booting with an extlinux configuration to overcome this. Signed-off-by: Vincent Stehlé Signed-off-by: Thomas Petazzoni --- board/uevm5432/extlinux.conf | 4 ++++ board/uevm5432/genimage.cfg | 6 ++++-- board/uevm5432/post-build.sh | 6 ++++++ configs/uevm5432_defconfig | 13 +++++++------ 4 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 board/uevm5432/extlinux.conf create mode 100755 board/uevm5432/post-build.sh diff --git a/board/uevm5432/extlinux.conf b/board/uevm5432/extlinux.conf new file mode 100644 index 00000000000..50f3cd30fbf --- /dev/null +++ b/board/uevm5432/extlinux.conf @@ -0,0 +1,4 @@ +label uevm5432-buildroot + kernel /zImage + fdt /omap5-uevm.dtb + append root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait console=ttyO2,115200 diff --git a/board/uevm5432/genimage.cfg b/board/uevm5432/genimage.cfg index dfe388227ec..7bb90e198b0 100644 --- a/board/uevm5432/genimage.cfg +++ b/board/uevm5432/genimage.cfg @@ -2,7 +2,10 @@ image boot.vfat { vfat { files = { "MLO", - "u-boot.img" + "u-boot.img", + "zImage", + "omap5-uevm.dtb", + "extlinux" } } @@ -22,6 +25,5 @@ image sdcard.img { partition rootfs { partition-type = 0x83 image = "rootfs.ext4" - size = 512M } } diff --git a/board/uevm5432/post-build.sh b/board/uevm5432/post-build.sh new file mode 100755 index 00000000000..f90f76d8b5b --- /dev/null +++ b/board/uevm5432/post-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/configs/uevm5432_defconfig b/configs/uevm5432_defconfig index 7b9a4309c63..03dc789fa83 100644 --- a/configs/uevm5432_defconfig +++ b/configs/uevm5432_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +# Linux headers same as kernel, a 6.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y # System BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -12,17 +12,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" BR2_SYSTEM_DHCP="eth0" # Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/uevm5432/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/uevm5432/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.10" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap5-uevm" -BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/omap5-uevm" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem @@ -34,8 +34,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap5_uevm" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" From d5ff56ef06c46bc870cc677d34cec2639852c823 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sun, 19 May 2024 11:16:04 +0200 Subject: [PATCH 1669/3013] package/webkitgtk: bump to 2.44.2 A lot has been changed in 2.44.0, please consult the announcement [1], what's new [2], and the security advisory [3] for more details. Specific to this bump: - Libegl is now mandatory [4] and the USE_OPENGL_OR_ES flag has been dropped. While at it, also explicitly add the libepoxy dependency which is now selected by libgtk3. - The WPE renderer has been dropped [2], so drop the wpebackend-fdo dependency. - JPEG2000 has been dropped [2], so drop the OpenJPEG dependency. - GTK4 is now the default, so turn it off, since buildroot has no GTK4 support yet [2]. - USE_LIBBACKTRACE has been added [5], so select it properly. - Support for ENABLE_WEB_CODECS has been added, which will now be enabled together with audio and video support. - ENABLE_WEBASSEMBLY is forbidden when ENABLE_C_LOOP [6], so disable it when compiling for MIPS r6, ARMv5, and ARMv6. In the meantime, a follow-up 2.44.1 and 2.44.2 release has been announced [7][8], which contains a bunch of patches that were accepted upstream. Including build fixes for 32-bit devices, and disabling video. [1]: https://webkitgtk.org/2024/03/16/webkitgtk2.44.0-released.html [2]: https://webkitgtk.org/2024/03/27/webkigit-2.44.html [3]: https://webkitgtk.org/security/WSA-2024-0002.html [4]: https://commits.webkit.org/271345@main [5]: https://commits.webkit.org/268579@main [6]: https://commits.webkit.org/271347@main [7]: https://webkitgtk.org/2024/04/09/webkitgtk2.44.1-released.html [8]: https://webkitgtk.org/2024/05/16/webkitgtk2.44.2-released.html Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro Tested-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 --------------- package/webkitgtk/Config.in | 4 +- package/webkitgtk/webkitgtk.hash | 6 +-- package/webkitgtk/webkitgtk.mk | 50 ++++++++----------- 4 files changed, 26 insertions(+), 73 deletions(-) delete mode 100644 package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch deleted file mode 100644 index c9667fedbdd..00000000000 --- a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 5 Feb 2024 11:00:49 -0600 -Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= - =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= - =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= - =?UTF-8?q?=3D268739?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Unreviewed build fix. Seems a backport went badly, and we didn't notice -because the code is architecture-specific. - -* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: -(JSC::CLoop::execute): - -Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff -Signed-off-by: Peter Korsgaard ---- - Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index 5064ead6cd2e..9a2e2653b121 100644 ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, - UNUSED_VARIABLE(t2); - UNUSED_VARIABLE(t3); - UNUSED_VARIABLE(t5); -- UNUSED_VARIABLE(t6); -- UNUSED_VARIABLE(t7); - - struct StackPointerScope { - StackPointerScope(CLoopStack& stack) --- -2.39.2 - diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index ace1b8739f9..8ee90dda1ca 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -29,6 +29,7 @@ config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" depends on !BR2_STATIC_LIBS # wayland depends on !BR2_BINFMT_FLAT # icu + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 @@ -42,18 +43,17 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_ICU select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_LIBSOUP3 select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 - select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index ac4799d4cf9..7da0e97e5d5 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums -sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz -sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz.sums +sha1 e62b2c545011a2f180a914529a68950c4d34a2ee webkitgtk-2.44.2.tar.xz +sha256 523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b webkitgtk-2.44.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 075a36654f6..468fefab0ef 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.42.5 +WEBKITGTK_VERSION = 2.44.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -14,8 +14,8 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ - enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup3 \ - libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 + enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk3 libsecret \ + libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2 WEBKITGTK_CMAKE_BACKEND = ninja @@ -28,8 +28,8 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ -DUSE_AVIF=OFF \ + -DUSE_GTK4=OFF \ -DUSE_LIBHYPHEN=OFF \ - -DUSE_OPENJPEG=ON \ -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) @@ -45,12 +45,14 @@ endif ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=ON \ - -DENABLE_WEB_AUDIO=ON + -DENABLE_WEB_AUDIO=ON \ + -DENABLE_WEB_CODECS=ON WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base else WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=OFF \ - -DENABLE_WEB_AUDIO=OFF + -DENABLE_WEB_AUDIO=OFF \ + -DENABLE_WEB_CODECS=OFF endif ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y) @@ -73,6 +75,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBBACKTRACE),y) +WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=ON +WEBKITGTK_DEPENDENCIES += libbacktrace +else +WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF +endif + ifeq ($(BR2_PACKAGE_LIBJXL),y) WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON WEBKITGTK_DEPENDENCIES += libjxl @@ -87,13 +96,6 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON -WEBKITGTK_DEPENDENCIES += libgles -else -WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF -endif - ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON WEBKITGTK_DEPENDENCIES += libgbm @@ -111,23 +113,10 @@ endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON -WEBKITGTK_DEPENDENCIES += libegl else WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF endif -# If only the GTK Broadway backend is enabled, EGL is still needed. -ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LIBGTK3_BROADWAY),::y) -WEBKITGTK_DEPENDENCIES += libegl -endif - -ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) -WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON -WEBKITGTK_DEPENDENCIES += wpebackend-fdo -else -WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=OFF -endif - ifeq ($(BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL),y) WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON else @@ -145,14 +134,17 @@ endif # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. # -# Also, we have to disable the sampling profiler, which does NOT work -# with ENABLE_C_LOOP. +# Also, we have to disable the sampling profiler and webassembly, +# which does NOT work with ENABLE_C_LOOP. # # Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 # https://bugs.webkit.org/show_bug.cgi?id=172765 +# https://bugs.webkit.org/show_bug.cgi?id=265218 # ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON \ + -DENABLE_SAMPLING_PROFILER=OFF \ + -DENABLE_WEBASSEMBLY=OFF endif $(eval $(cmake-package)) From 91cd9488005e7f0fce7ead126f1e637deefcaf02 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 13 Jul 2024 00:04:31 +0200 Subject: [PATCH 1670/3013] package/btrfs-progs: update Kconfig package homepage URL The btrfs-progs homepage [1] show a banner: OBSOLETE CONTENT This wiki has been archived and the content is no longer updated. NOTE: this wiki is archived and not updated anymore (02/2023). Contents will be migrated to https://btrfs.readthedocs.io This commit updates the URL to the new one at [2]. [1] https://btrfs.wiki.kernel.org/index.php/Main_Page [2] https://btrfs.readthedocs.io Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/btrfs-progs/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/btrfs-progs/Config.in b/package/btrfs-progs/Config.in index 35dfc391934..bae096061db 100644 --- a/package/btrfs-progs/Config.in +++ b/package/btrfs-progs/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_BTRFS_PROGS help Btrfs filesystem utilities - https://btrfs.wiki.kernel.org/index.php/Main_Page + https://btrfs.readthedocs.io comment "btrfs-progs needs a toolchain w/ threads" depends on BR2_USE_MMU From a5ce48fe456d790612c9b63990f0a4f3e2faa554 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 12 Jul 2024 23:48:38 +0200 Subject: [PATCH 1671/3013] package/octave: add optional libsndfile support GNU Octave supports the --with-sndfile configure option since v4.0.0. For reference, commit 40ea68b4b2 "package/octave: new package" introduced the package at v7.1.0. This commits adds this optional support. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 0c7c4116921..2e2fe0f989e 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -43,6 +43,13 @@ else OCTAVE_CONF_OPTS += --without-curl endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +OCTAVE_CONF_OPTS += --with-sndfile +OCTAVE_DEPENDENCIES += libsndfile +else +OCTAVE_CONF_OPTS += --without-sndfile +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OCTAVE_CONF_OPTS += --with-openssl=yes OCTAVE_DEPENDENCIES += openssl From e167800979b48a449c168c229448e7069d2045e7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Oct 2023 18:52:35 +0200 Subject: [PATCH 1672/3013] package/sunxi-tools: sunxi-fel needs dynamic library Fix the following build failure raised since bump to version 1.4.2-168-ged3039c in commit 2e330dff6a7ce7965ceb0dccdc9dcbcb329167bb: /home/buildroot/autobuild/run/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: attempted static link of dynamic object `libfdt/libfdt-1.6.1.so' Fixes: - http://autobuild.buildroot.org/results/6788d86c10d551b3d617e33c85083b817eb5d0b2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/sunxi-tools/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in index 14f7da5bf20..16550f4e55d 100644 --- a/package/sunxi-tools/Config.in +++ b/package/sunxi-tools/Config.in @@ -23,6 +23,7 @@ config BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO config BR2_PACKAGE_SUNXI_TOOLS_FEL bool "sunxi-fel" + depends on !BR2_STATIC_LIBS # dtc depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_DTC @@ -33,8 +34,8 @@ config BR2_PACKAGE_SUNXI_TOOLS_FEL fel mode. This allows do download code to memory and execute it. -comment "sunxi-fel needs a toolchain w/ threads, gcc >= 4.9" - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ +comment "sunxi-fel needs a toolchain w/ dynamic library, threads, gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_SUNXI_TOOLS_NAND_PART From a320986c44774f3729454249a94904365f020a58 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Sat, 18 Nov 2023 18:13:08 +0000 Subject: [PATCH 1673/3013] package/Makefile.in: add PARALLEL_JOBS to post-build/post-image scripts Post-build, post-image, and other build scripts may run some commands in parallel, for example to parallelize xargs, Makefiles, etc. Export PARALLEL_JOBS to these scripts so they can enforce the same job limits that other Buildroot packages use. Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- docs/manual/customize-post-image.adoc | 4 ++-- docs/manual/customize-rootfs.adoc | 1 + docs/manual/debugging-buildroot.adoc | 1 + package/Makefile.in | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/manual/customize-post-image.adoc b/docs/manual/customize-post-image.adoc index 1f11cf915f4..849e941de37 100644 --- a/docs/manual/customize-post-image.adoc +++ b/docs/manual/customize-post-image.adoc @@ -33,8 +33,8 @@ arguments that are only used for the post-image scripts you can use Again just like for the post-build scripts, the scripts have access to the environment variables +BR2_CONFIG+, +HOST_DIR+, +STAGING_DIR+, -+TARGET_DIR+, +BUILD_DIR+, +BINARIES_DIR+, +CONFIG_DIR+ and -+BASE_DIR+. ++TARGET_DIR+, +BUILD_DIR+, +BINARIES_DIR+, +CONFIG_DIR+, +BASE_DIR+, +and +PARALLEL_JOBS+. The post-image scripts will be executed as the user that executes Buildroot, which should normally _not_ be the root user. Therefore, any diff --git a/docs/manual/customize-rootfs.adoc b/docs/manual/customize-rootfs.adoc index 1384c1d2d33..d334093748a 100644 --- a/docs/manual/customize-rootfs.adoc +++ b/docs/manual/customize-rootfs.adoc @@ -75,6 +75,7 @@ In addition, you may also use these environment variables: - +BINARIES_DIR+: the place where all binary files (aka images) are stored - +BASE_DIR+: the base output directory + - +PARALLEL_JOBS+: the number of jobs to use when running parallel processes. Below three more methods of customizing the target filesystem are described, but they are not recommended. diff --git a/docs/manual/debugging-buildroot.adoc b/docs/manual/debugging-buildroot.adoc index f575fc48ee9..b9068ead527 100644 --- a/docs/manual/debugging-buildroot.adoc +++ b/docs/manual/debugging-buildroot.adoc @@ -41,3 +41,4 @@ The script has access to the following variables: - +BINARIES_DIR+: the place where all binary files (aka images) are stored - +BASE_DIR+: the base output directory + - +PARALLEL_JOBS+: the number of jobs to use when running parallel processes. diff --git a/package/Makefile.in b/package/Makefile.in index 5476234c7e2..47a89f1ae1f 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -331,7 +331,8 @@ EXTRA_ENV = \ BR2_DL_DIR=$(BR2_DL_DIR) \ BUILD_DIR=$(BUILD_DIR) \ CONFIG_DIR=$(CONFIG_DIR) \ - O=$(CANONICAL_O) + O=$(CANONICAL_O) \ + PARALLEL_JOBS=$(PARALLEL_JOBS) ################################################################################ # settings we need to pass to configure From f5f3d8ca007d46c1b4a351e53b619209b232b113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 3 Jul 2024 10:28:47 +0200 Subject: [PATCH 1674/3013] package/erofs-utils: bump to 1.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Čermák Signed-off-by: Arnout Vandecappelle --- package/erofs-utils/erofs-utils.hash | 2 +- package/erofs-utils/erofs-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index a03a0d5a7da..063d3845118 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 2310fa4377b566bf943e8eef992db3990f759528d5973e700efe3e4cb115ec23 erofs-utils-1.5.tar.gz +sha256 196083d63e5e231fb5799e7ce86a944bbca564daabce3de9225a8aca9dcaff15 erofs-utils-1.7.1.tar.gz sha256 0df042de29b44887355db86c79708a4489ce6e6666f6e33ad02040293f09e6a2 COPYING sha256 a400f85dd06d230f1b308cde4290a53f345b6e320a376b7904b31c51c2fd4b1a LICENSES/Apache-2.0 sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 LICENSES/GPL-2.0 diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index df4c652d304..0aed99ba76b 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.5 +EROFS_UTILS_VERSION = 1.7.1 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+, GPL-2.0+ or Apache-2.0 (liberofs) EROFS_UTILS_LICENSE_FILES = COPYING LICENSES/Apache-2.0 LICENSES/GPL-2.0 From d889031e0b70390ea34703071f96a5b750803d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 3 Jul 2024 10:28:48 +0200 Subject: [PATCH 1675/3013] package/erofs-utils: add config option for LZMA compression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Enabled LZMA compression for host build. * Added option for LZMA support on target. Signed-off-by: Jan Čermák Signed-off-by: Arnout Vandecappelle --- package/erofs-utils/Config.in | 6 ++++++ package/erofs-utils/erofs-utils.mk | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/erofs-utils/Config.in b/package/erofs-utils/Config.in index 9d9aa159c03..284b2cd0598 100644 --- a/package/erofs-utils/Config.in +++ b/package/erofs-utils/Config.in @@ -15,6 +15,12 @@ config BR2_PACKAGE_EROFS_UTILS_LZ4 help Support LZ4 compression algorithm +config BR2_PACKAGE_EROFS_UTILS_LZMA + bool "lzma support" + select BR2_PACKAGE_XZ + help + Support LZMA compression algorithm + config BR2_PACKAGE_EROFS_UTILS_EROFSFUSE bool "erofsfuse support" depends on BR2_USE_MMU # libfuse diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index 0aed99ba76b..fbf7795583f 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -21,6 +21,13 @@ else EROFS_UTILS_CONF_OPTS += --disable-lz4 endif +ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZMA),y) +EROFS_UTILS_DEPENDENCIES += xz +EROFS_UTILS_CONF_OPTS += --enable-lzma +else +EROFS_UTILS_CONF_OPTS += --disable-lzma +endif + ifeq ($(BR2_PACKAGE_LIBSELINUX),y) EROFS_UTILS_CONF_OPTS += --with-selinux EROFS_UTILS_DEPENDENCIES += libselinux @@ -35,8 +42,8 @@ else EROFS_UTILS_CONF_OPTS += --disable-fuse endif -HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 -HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 --disable-fuse --without-selinux +HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 host-xz +HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 --enable-lzma --disable-fuse --without-selinux $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 22579ce771bde65dffa8cef22c3e8bb4973ef9ab Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 23 Jul 2023 18:09:07 -0700 Subject: [PATCH 1676/3013] package/docker-cli-buildx: new package buildx is a docker CLI plugin implementing extended build features. buildx is the default builder as of Docker v23.x, and if the plugin is not present, the CLI will output an error warning that it is using the deprecated built-in builder instead of the buildx builder. However, buildx is a separate repository from docker-cli: it is a plugin that needs to be installed at /usr/lib/docker/cli-plugins on the target. https://github.com/docker/buildx Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/docker-cli-buildx/Config.in | 16 +++++++++ .../docker-cli-buildx/docker-cli-buildx.hash | 3 ++ .../docker-cli-buildx/docker-cli-buildx.mk | 36 +++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 package/docker-cli-buildx/Config.in create mode 100644 package/docker-cli-buildx/docker-cli-buildx.hash create mode 100644 package/docker-cli-buildx/docker-cli-buildx.mk diff --git a/package/Config.in b/package/Config.in index a52ed146d93..65d7981773c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2757,6 +2757,7 @@ menu "System tools" source "package/ddrescue/Config.in" source "package/debianutils/Config.in" source "package/docker-cli/Config.in" + source "package/docker-cli-buildx/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" source "package/earlyoom/Config.in" diff --git a/package/docker-cli-buildx/Config.in b/package/docker-cli-buildx/Config.in new file mode 100644 index 00000000000..486f1196c38 --- /dev/null +++ b/package/docker-cli-buildx/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_DOCKER_CLI_BUILDX + bool "docker-cli-buildx" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_DOCKER_CLI + help + buildx is a Docker CLI plugin for extended build + capabilities with BuildKit. + + https://github.com/docker/buildx + +comment "docker-cli-buildx needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-cli-buildx/docker-cli-buildx.hash b/package/docker-cli-buildx/docker-cli-buildx.hash new file mode 100644 index 00000000000..a6e0b0deabc --- /dev/null +++ b/package/docker-cli-buildx/docker-cli-buildx.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 371eb742213ed580179fc4fdfd9a197f0e3115e91979b7907828427d578d49e5 docker-cli-buildx-0.11.2-go2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/docker-cli-buildx/docker-cli-buildx.mk b/package/docker-cli-buildx/docker-cli-buildx.mk new file mode 100644 index 00000000000..b62d09fbcc9 --- /dev/null +++ b/package/docker-cli-buildx/docker-cli-buildx.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# docker-cli-buildx +# +################################################################################ + +DOCKER_CLI_BUILDX_VERSION = 0.11.2 +DOCKER_CLI_BUILDX_SITE = $(call github,docker,buildx,v$(DOCKER_CLI_BUILDX_VERSION)) + +DOCKER_CLI_BUILDX_LICENSE = Apache-2.0 +DOCKER_CLI_BUILDX_LICENSE_FILES = LICENSE + +DOCKER_CLI_BUILDX_DEPENDENCIES = host-pkgconf + +DOCKER_CLI_BUILDX_BUILD_TARGETS = cmd/buildx +DOCKER_CLI_BUILDX_GOMOD = github.com/docker/buildx + +DOCKER_CLI_BUILDX_LDFLAGS = \ + -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Revision=$(DOCKER_CLI_BUILDX_VERSION) \ + -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Version=$(DOCKER_CLI_BUILDX_VERSION) + +# create the go.mod file with required language version go1.20 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_BUILDX_FIX_VENDORING + printf "module $(DOCKER_CLI_BUILDX_GOMOD)\n\ngo 1.20\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_BUILDX_POST_EXTRACT_HOOKS += DOCKER_CLI_BUILDX_FIX_VENDORING + +define DOCKER_CLI_BUILDX_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/bin/buildx \ + $(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-buildx +endef + +$(eval $(golang-package)) From 709cc0f0001d7cc3977bddfee6ca0e6bab1e567b Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 12 Jul 2024 13:59:36 +0200 Subject: [PATCH 1677/3013] package/esp-hosted: bump version to 2024-07-12 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index 3afee5aef4d..ea18c243d1b 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c87d68c2b74dd000b128696abc0cdc76d22abfefb6581ff61b7d7bcdaab51f5 esp-hosted-b1422afc4fe0a2ea1ffd6b5459edddc4d968ee71.tar.gz +sha256 78ab4f10ddce76749d36511591a0a7bb2a982db96ac1ea1b02b5c35dab725d8c esp-hosted-91b093365cc58214532b976dd8749f65523d1e6d.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 70ca7bf572f..4efefc30238 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = b1422afc4fe0a2ea1ffd6b5459edddc4d968ee71 +ESP_HOSTED_VERSION = 91b093365cc58214532b976dd8749f65523d1e6d ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 From 4fad6b3c58abd20c533b67b85658bc66d015110b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Sep 2022 23:02:20 +0200 Subject: [PATCH 1678/3013] package/opengl/libegl: remove BR2_PACKAGE_HAS_LIBEGL_WAYLAND Since wayland 1.15 (upstream commit 549a5ea710f4da1a5749587176d39fef1ded4077), libwayland-egl.so is provided by the wayland package, so there is no longer a question of whether libwayland-egl.so is provided by the particular EGL implementation. See the Wayland commit log: wayland-egl: import libwayland-egl.so frontend library from Mesa Currently the client-facing libwayland-egl API is defined by a header file shipped by Wayland, but the implementation is left to each vendor. This can cause collisions when multiple implementations are installed on the same system. Importing the implementation into Wayland with a stable and versioned driver-facing ABI allows multiple drivers to coexist on the same system. Pull the sample implementation from Mesa commit 677edff5cfd ("wayland-egl: rework and simplify wl_egl_window initialization") It has been used by the Mesa open source drivers, NVIDIA and others[1]. v2: Reword commit message, rebase on top of newer Mesa. [1] https://github.com/thayama/wayland-egl Consequently, we remove the BR2_PACKAGE_HAS_LIBEGL_WAYLAND option. Packages that rely on BR2_PACKAGE_HAS_LIBGLES and BR2_PACKAGE_WAYLAND are guaranteed to have libwayland-egl.so. Note that this doesn't solve the problem that libwayland-egl.so will be provided both by wayland itself and by by the implementation (rockchip-mali, sunxi-mali-utgard, ...). Still, there is a dependency from the implementation on wayland so at least it is predictable which one will end up on the target. Signed-off-by: Thomas Petazzoni [Arnout: remove remaining references in sway and sunxi-mali-utgard] Signed-off-by: Arnout Vandecappelle --- package/cage/Config.in | 4 +--- package/freescale-imx/imx-gpu-viv/Config.in | 1 - package/kodi/Config.in | 1 - package/libgtk3/Config.in | 8 ++++---- package/mesa3d/Config.in | 1 - package/nvidia-driver/Config.in | 1 - package/opengl/libegl/Config.in | 4 ---- package/sunxi-mali-utgard/Config.in | 1 - package/sway/Config.in | 4 +--- package/vte/Config.in | 6 +++--- package/waffle/Config.in | 2 +- package/waylandpp/Config.in | 6 +++--- package/weston/Config.in | 6 +++--- package/weston/weston.mk | 2 +- package/wlroots/Config.in | 5 ++--- package/wpebackend-fdo/Config.in | 6 +++--- package/wpewebkit/Config.in | 4 +--- 17 files changed, 23 insertions(+), 39 deletions(-) diff --git a/package/cage/Config.in b/package/cage/Config.in index 0844d6ff62a..4f823c768c4 100644 --- a/package/cage/Config.in +++ b/package/cage/Config.in @@ -1,6 +1,5 @@ -comment "cage needs udev, EGL w/ Wayland backend and OpenGL ES support" +comment "cage needs udev, EGL and OpenGL ES support" depends on !BR2_PACKAGE_HAS_LIBEGL || \ - !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_PACKAGE_HAS_LIBGLES || \ !BR2_PACKAGE_HAS_UDEV @@ -13,7 +12,6 @@ config BR2_PACKAGE_CAGE depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots depends on BR2_PACKAGE_HAS_LIBGLES # wlroots depends on BR2_PACKAGE_HAS_UDEV # wlroots select BR2_PACKAGE_WLROOTS diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index b8dff8f9ab6..0a1be6ec13b 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -51,7 +51,6 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL bool "Wayland" select BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND endchoice diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 1ba6932de9b..25c5758b850 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -36,7 +36,6 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND bool default y depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp depends on BR2_INSTALL_LIBSTDCPP # waylandpp diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 34b8d49eb37..c07957076e8 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -6,10 +6,10 @@ comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS -comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend" +comment "libgtk3 needs an OpenGL or an OpenGL-EGL backend" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \ + depends on !BR2_PACKAGE_HAS_LIBEGL && \ !BR2_PACKAGE_HAS_LIBGL config BR2_PACKAGE_LIBGTK3 @@ -21,7 +21,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + depends on BR2_PACKAGE_HAS_LIBEGL || \ BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO @@ -69,7 +69,7 @@ comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ h config BR2_PACKAGE_LIBGTK3_WAYLAND bool "Wayland GDK backend" default y - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 459051b2dba..b88f21935ee 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -356,7 +356,6 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND select BR2_PACKAGE_MESA3D_GBM help Use the Khronos EGL APIs. EGL is a window manager for OpenGL diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index a8617a939b5..e4a9dde0a0e 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -26,7 +26,6 @@ config BR2_PACKAGE_NVIDIA_DRIVER_XORG select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND select BR2_PACKAGE_HAS_LIBGLES if BR2_PACKAGE_NVIDIA_DRIVER_XORG diff --git a/package/opengl/libegl/Config.in b/package/opengl/libegl/Config.in index a2369989479..f46d09ed718 100644 --- a/package/opengl/libegl/Config.in +++ b/package/opengl/libegl/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_HAS_LIBEGL bool -config BR2_PACKAGE_HAS_LIBEGL_WAYLAND - bool - depends on BR2_PACKAGE_HAS_LIBEGL - config BR2_PACKAGE_PROVIDES_LIBEGL string depends on BR2_PACKAGE_HAS_LIBEGL diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index f70a6f645ce..49da7e57215 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -53,7 +53,6 @@ config BR2_PACKAGE_SUNXI_MALI_UTGARD_FBDEV config BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND bool "wayland" depends on BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND select BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_WAYLAND diff --git a/package/sway/Config.in b/package/sway/Config.in index 4f6d9fb215b..d78f792c488 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_SWAY depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots depends on BR2_PACKAGE_HAS_LIBGLES # wlroots depends on BR2_PACKAGE_HAS_UDEV # wlroots depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, pango @@ -54,11 +53,10 @@ config BR2_PACKAGE_SWAY_SWAYNAG endif # BR2_PACKAGE_SWAY -comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" +comment "sway needs systemd, udev, EGL and OpenGL ES support" depends on !BR2_PACKAGE_SYSTEMD || \ !BR2_PACKAGE_HAS_UDEV || \ !BR2_PACKAGE_HAS_LIBEGL || \ - !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_PACKAGE_HAS_LIBGLES comment "sway needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" diff --git a/package/vte/Config.in b/package/vte/Config.in index 45d627885fa..8a231a21af6 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_VTE depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + depends on BR2_PACKAGE_HAS_LIBEGL || \ BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGTK3 @@ -31,9 +31,9 @@ comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10 !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ BR2_TOOLCHAIN_USES_MUSL -comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" +comment "vte needs an OpenGL or an OpenGL-EGL backend" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \ + depends on !BR2_PACKAGE_HAS_LIBEGL && \ !BR2_PACKAGE_HAS_LIBGL diff --git a/package/waffle/Config.in b/package/waffle/Config.in index ad622e95825..79cb4ca2ede 100644 --- a/package/waffle/Config.in +++ b/package/waffle/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_WAFFLE_SUPPORTS_GLX config BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND bool - default y if BR2_PACKAGE_WAYLAND && BR2_PACKAGE_HAS_LIBEGL_WAYLAND + default y if BR2_PACKAGE_WAYLAND && BR2_PACKAGE_HAS_LIBEGL config BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL bool diff --git a/package/waylandpp/Config.in b/package/waylandpp/Config.in index 86ca9650563..0713884d3e8 100644 --- a/package/waylandpp/Config.in +++ b/package/waylandpp/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_WAYLANDPP bool "waylandpp" - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_INSTALL_LIBSTDCPP @@ -10,9 +10,9 @@ config BR2_PACKAGE_WAYLANDPP https://github.com/NilsBrause/waylandpp -comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9, C++ support" +comment "waylandpp needs an OpenGL-EGL backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9, C++ support" depends on BR2_PACKAGE_WAYLAND - depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + depends on !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_INSTALL_LIBSTDCPP diff --git a/package/weston/Config.in b/package/weston/Config.in index e83eeb0f746..8af2d191739 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -195,7 +195,7 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS depends on BR2_TOOLCHAIN_HAS_THREADS # pango depends on BR2_USE_WCHAR # pango depends on BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_PANGO help This enables the installation of Weston's demo clients. @@ -212,11 +212,11 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS Note: Weston has two sets of clients. See also the weston "simple clients" option. -comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++, gcc >= 4.9" +comment "demo clients needs an OpenGL ES/EGL provider and a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGLES || \ - !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_PACKAGE_HAS_LIBEGL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 endif diff --git a/package/weston/weston.mk b/package/weston/weston.mk index bd5a0550b12..9292ba14b65 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -49,7 +49,7 @@ else WESTON_CONF_OPTS += -Dimage-webp=false endif -ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy) +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy) WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgbm libgles ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 7622a3033bd..67c1b539690 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -1,6 +1,6 @@ -comment "wlroots needs udev, EGL w/ Wayland backend and OpenGL ES support" +comment "wlroots needs udev, EGL and OpenGL ES support" depends on !BR2_PACKAGE_HAS_LIBEGL || \ - !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBGLES || \ !BR2_PACKAGE_HAS_UDEV @@ -14,7 +14,6 @@ config BR2_PACKAGE_WLROOTS depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland depends on BR2_PACKAGE_HAS_UDEV # libinput depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND depends on BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PNP_IDS diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in index 8a8c820c9b1..9b4dd28741b 100644 --- a/package/wpebackend-fdo/Config.in +++ b/package/wpebackend-fdo/Config.in @@ -1,5 +1,5 @@ -comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend" - depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ +comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and EGL support" + depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_WPEBACKEND_FDO @@ -9,7 +9,7 @@ config BR2_PACKAGE_WPEBACKEND_FDO depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_MMU # libglib2 - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBWPE diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index e4b0320e1da..8016367058f 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -27,8 +27,7 @@ comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gc comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT - depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL \ - || !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL config BR2_PACKAGE_WPEWEBKIT bool "wpewebkit" @@ -41,7 +40,6 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG From 079f5ccdca2e65e21d64a50b7badaa57c04d91dc Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Sun, 27 Nov 2022 17:45:33 +0100 Subject: [PATCH 1679/3013] package/go: disable cgo support with static libs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The go stdlib "plugin" package relies on dlfcn.h which isn't available when we have BR2_STATIC_LIBS=y. Concentrate all cgo decision (including the existing threads part) under the config option BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS that has the proper depends. This should fix this build error from autobuilders: /buildroot/build/host-go-1.19.3/src/plugin/plugin_dlopen.go:11:10: fatal error: dlfcn.h: No such file or directory 11 | #include Fixes: http://autobuild.buildroot.net/results/1f4/1f4b9882986b9df723a1446493d270c29287b505 http://autobuild.buildroot.net/results/a9d/a9de62374c948f773634c694a47abcaa2bc266d0 Signed-off-by: Anisse Astier Reviewed-by: Christian Stewart [Arnout: revert parts to v2, keeping most of the overall logic as it was] Signed-off-by: Arnout Vandecappelle --- package/go/Config.in.host | 4 ++++ package/go/go.mk | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 92c1f4cdc3a..11ce6df3693 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -25,6 +25,10 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS # Go doesn't support CGO linking on MIPS64x platforms # See: https://github.com/karalabe/xgo/issues/46 depends on !BR2_mips64 && !BR2_mips64el + # go uses dlfcn.h + cgo for its plugin module + depends on !BR2_STATIC_LIBS + # cgo supports uses threads + depends on BR2_TOOLCHAIN_HAS_THREADS # Host go packages should depend on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index bfbe997911d..660c7a9bada 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -78,23 +78,24 @@ HOST_GO_TARGET_ENV = \ CGO_LDFLAGS="$(TARGET_LDFLAGS)" \ GOTOOLDIR="$(HOST_GO_TOOLDIR)" -# The go compiler's cgo support uses threads. If BR2_TOOLCHAIN_HAS_THREADS is -# set, build in cgo support for any go programs that may need it. Note that -# any target package needing cgo support must include -# 'depends on BR2_TOOLCHAIN_HAS_THREADS' in its config file. -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +# Allow packages to use cgo support if it is available for the target. They +# will need the toolchain for cgo support; for convenence, include that +# dependency here. +# +# Note that any target package needing cgo support must include 'depends on +# BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS' in its config file. +ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS),y) HOST_GO_DEPENDENCIES_CGO += toolchain HOST_GO_CGO_ENABLED = 1 else HOST_GO_CGO_ENABLED = 0 endif - else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS -# host-go can still be used to build packages for the host. No need to set all -# the arch stuff since we will not be cross-compiling. +# If the target arch does not support go, host-go can still be used to build +# packages for the host, and enable cgo. No need to set all the arch stuff +#since we will not be cross-compiling. HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS - # Ensure the toolchain is available, whatever the provider HOST_GO_DEPENDENCIES += $(HOST_GO_DEPENDENCIES_CGO) From 9d62687d0024f7e3bac68157f1250970ef45abff Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 10:27:06 +0200 Subject: [PATCH 1680/3013] package/x265: replace patch fixing gcc option As we're about to do some other fixes in x265 ARM build, let's replace the patch fixing gcc option by: - A patch generated by git format-patch now that x265 upstream uses Git - Is re-submitted upstream - Only drops the flags, and does not add bogus ARM architecture aliases that don't exist in the CMake world. Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...ists.txt-do-not-force-compiler-flags.patch | 83 +++++++++++++++++ package/x265/0001-fix-gcc-options.patch | 88 ------------------- 3 files changed, 83 insertions(+), 89 deletions(-) create mode 100644 package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch delete mode 100644 package/x265/0001-fix-gcc-options.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0944eb1c2d0..ade6c9fd200 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1488,7 +1488,6 @@ package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch lib_patch.Upstream -package/x265/0001-fix-gcc-options.patch lib_patch.Upstream package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch lib_patch.Upstream package/xen/0002-Fix-build-with-64-bits-time_t.patch lib_patch.Upstream package/xen/0003-libs-light-fix-tv_sec-printf-format.patch lib_patch.Upstream diff --git a/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch b/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch new file mode 100644 index 00000000000..af0e57f2061 --- /dev/null +++ b/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch @@ -0,0 +1,83 @@ +From b56e9125db34614b2157516df3ee724180f2084f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 09:59:26 +0200 +Subject: [PATCH] CMakeLists.txt: do not force compiler flags + +The compiler flags enforced by CMakeLists.txt can be problematic: + +- When CROSS_COMPILE_ARM is set, one is not necessarily building for + armv6 with soft float-abi: one may be using ARMv7 with hard float + +- When CROSS_COMPILE_ARM is not set, forcing -mfloat-abi=hard is + similarly wrong + +Those compiler flags should be passed by the user depending on the +exact target platform. + +Inspired from +https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/x265/files/arm-r1.patch, +and earlier work from Bertrand Jacquin and +Bernd Kuhls . + +Upstream: https://bitbucket.org/multicoreware/x265_git/pull-requests/26 +Signed-off-by: Thomas Petazzoni +--- + source/CMakeLists.txt | 10 +++------- + source/dynamicHDR10/CMakeLists.txt | 6 +++--- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index a407271b4..a34bf4d4f 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -239,11 +239,7 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- if(ARM64) +- set(ARM_ARGS -fPIC) +- else() +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) +- endif() ++ set(ARM_ARGS -fPIC) + message(STATUS "cross compile arm") + elseif(ARM) + if(ARM64) +@@ -252,10 +248,10 @@ if(GCC) + else() + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + endif() +diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt +index 22fb79d44..2cea7c48a 100644 +--- a/source/dynamicHDR10/CMakeLists.txt ++++ b/source/dynamicHDR10/CMakeLists.txt +@@ -43,14 +43,14 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) ++ set(ARM_ARGS -fPIC) + elseif(ARM) + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + add_definitions(${ARM_ARGS}) +-- +2.45.2 + diff --git a/package/x265/0001-fix-gcc-options.patch b/package/x265/0001-fix-gcc-options.patch deleted file mode 100644 index 0283da25ea9..00000000000 --- a/package/x265/0001-fix-gcc-options.patch +++ /dev/null @@ -1,88 +0,0 @@ -# HG changeset patch -# User Bertrand Jacquin -# Date 1444431941 -3600 -# Node ID 5c6d2a6f2f9a0534933cc999b3845be4344e1af0 -# Parent b6156a08b1def3584647f26096866c1a0c11e54a -build: Disable -march selection from CMakeLists.txt - -x32 arch as defined on https://sites.google.com/site/x32abi is neither -X86 nor X64, then forcing -march=i686 leads to build failure as wrong --march is used. - -Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong - -As a global sanity sake, disable all forced -march in CMakeLists - -Backported from upstream pull request: -https://bitbucket.org/multicoreware/x265/pull-requests/21 - -Signed-off-by: Bernd Kuhls -[Bernd: rebased for 3.5 based on - https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/x265/files/arm-r1.patch] - -diff -r 58dddcf01b7d source/CMakeLists.txt ---- a/source/CMakeLists.txt Mon Jan 23 09:50:33 2017 +0530 -+++ b/source/CMakeLists.txt Mon Jan 23 21:03:10 2017 +0100 -@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ - # System architecture detection - string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) - set(X86_ALIASES x86 i386 i686 x86_64 amd64) --set(ARM_ALIASES armv6l armv7l aarch64) -+set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64) - list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) - list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) - set(POWER_ALIASES ppc64 ppc64le) -@@ -239,11 +239,7 @@ if(GCC) - endif() - endif() - if(ARM AND CROSS_COMPILE_ARM) -- if(ARM64) -- set(ARM_ARGS -fPIC) -- else() -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -- endif() -+ set(ARM_ARGS -fPIC) - message(STATUS "cross compile arm") - elseif(ARM) - if(ARM64) -@@ -252,10 +248,10 @@ if(GCC) - else() - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -mfpu=neon -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) -+ set(ARM_ARGS -fPIC) - endif() - endif() - endif() ---- a/source/dynamicHDR10/CMakeLists.txt -+++ b/source/dynamicHDR10/CMakeLists.txt -@@ -43,14 +43,14 @@ if(GCC) - endif() - endif() - if(ARM AND CROSS_COMPILE_ARM) -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -+ set(ARM_ARGS -fPIC) - elseif(ARM) - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) -+ set(ARM_ARGS -fPIC) - endif() - endif() - add_definitions(${ARM_ARGS}) -@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") - option(ENABLE_SHARED "Build shared library" OFF) - - install(FILES hdr10plus.h DESTINATION include) --endif() -\ No newline at end of file -+endif() - From 1fbd26f83169a206bdf9c36c85510a33c0e7a864 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 10:28:40 +0200 Subject: [PATCH 1681/3013] package/x265: fix runtime issue on ARMv6, ensure correctness on ARMv7 The build logic in source/cmake/FindNeon.cmake caused the x265 build system to always think that the CPU supports neon: it was looking in /proc/cpuinfo, which of course is wrong when cross-compilation, but then the sequence of grep was interacting badly with CMake, causing the build system to always conclude that the CPU supports NEON. This causes runtime issues on ARMv6. Setting -DCROSS_COMPILE_ARM=1 fixes this, as it tells the x265 build system we are cross-compiling and it skips its bogus NEON check. So for ARMv6, we pass -DCROSS_COMPILE_ARM=1. But then, we still want NEON for ARMv7 processors with NEON, so this commit adds a patch that allows to explicitly specify whether the CPU supports NEON, in the -DCROSS_COMPILE_ARM=1 case, and we use this option when BR2_ARM_CPU_HAS_NEON. For those wondering why -DCROSS_COMPILE_ARM=1 is not passed for all ARM platforms: it's because from the perspective of x265, only ARM >= v6 is ARM: it has assembly code that needs at least ARMv6. Earlier ARM platforms are not detected as ARM by the x265 build logic, and therefore fallback on generic code. This has been build-tested on: - ARMv5: generic code is used, no assembly - ARMv6: assembly code is used, but not with NEON support - ARMv7 with NEON: assembly code is used, with NEON support Reported-by: David Barbion Signed-off-by: Thomas Petazzoni --- ...s.txt-allow-setting-CPU_HAS_NEON-whe.patch | 40 +++++++++++++++++++ package/x265/x265.mk | 14 +++++++ 2 files changed, 54 insertions(+) create mode 100644 package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch diff --git a/package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch b/package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch new file mode 100644 index 00000000000..51be8f2d020 --- /dev/null +++ b/package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch @@ -0,0 +1,40 @@ +From 0088d29e7c75ea7f100a100aea4e2a797469427f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 10:10:54 +0200 +Subject: [PATCH] source/CMakeLists.txt: allow setting CPU_HAS_NEON when + CROSS_COMPILE_ARM + +The logic in source/cmake/FindNeon.cmake is not appropriate for +cross-compilation scenarios, so in order to allow cross-compiling for +ARM, CROSS_COMPILE_ARM needs to be defined. However that currently +doesn't allow the enabling of NEON support, so let's allow the user to +manually set CPU_HAS_NEON in this case. + +Upstream: https://bitbucket.org/multicoreware/x265_git/pull-requests/26 +Signed-off-by: Thomas Petazzoni +--- + source/CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index a34bf4d4f..072bf62ab 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -239,8 +239,13 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- set(ARM_ARGS -fPIC) + message(STATUS "cross compile arm") ++ if(CPU_HAS_NEON) ++ set(ARM_ARGS -mfpu=neon -fPIC) ++ add_definitions(-DHAVE_NEON) ++ else() ++ set(ARM_ARGS -fPIC) ++ endif() + elseif(ARM) + if(ARM64) + set(ARM_ARGS -fPIC) +-- +2.45.2 + diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 51c39df4cd8..bd5180b24b9 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -13,6 +13,20 @@ X265_CPE_ID_VENDOR = multicorewareinc X265_SUBDIR = source X265_INSTALL_STAGING = YES +# For CPUs before ARMv6, x265 does not consider them "ARM" but generic +# CPUs for which no optimized assembly is provided, hence we don't +# pass -DCROSS_COMPILE_ARM=1. +ifeq ($(BR2_ARM_CPU_ARMV6),y) +X265_CONF_OPTS += -DCROSS_COMPILE_ARM=1 +endif + +ifeq ($(BR2_ARM_CPU_ARMV7A),y) +X265_CONF_OPTS += -DCROSS_COMPILE_ARM=1 +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +X265_CONF_OPTS += -DCPU_HAS_NEON=1 +endif +endif + ifeq ($(BR2_i386)$(BR2_x86_64),y) X265_DEPENDENCIES += host-nasm endif From 9954315fc5b2026552a0f0175307ec8784b51578 Mon Sep 17 00:00:00 2001 From: Sagi Mor Date: Sat, 7 Jan 2023 20:09:43 +0200 Subject: [PATCH 1682/3013] toolchain/toolchain-wrapper: make gcc --help -v work correctly make "gcc --help -v" display all the options, some packages depend on this https://bugs.busybox.net/show_bug.cgi?id=15231 Signed-off-by: Sagi Mor [Arnout: move the handling to the beginning and directly call execv] Signed-off-by: Arnout Vandecappelle --- toolchain/toolchain-wrapper.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index f66e588bfd1..e4368897607 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -310,6 +310,17 @@ int main(int argc, char **argv) perror(__FILE__ ": overflow"); return 3; } + + /* skip all processing --help is specified */ + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "--help")) { + argv[0] = path; + if (execv(path, argv)) + perror(path); + return 1; + } + } + #ifdef BR_CCACHE ret = snprintf(ccache_path, sizeof(ccache_path), "%s/bin/ccache", absbasedir); if (ret >= sizeof(ccache_path)) { From 92a8ad923e33e3fdf8c76caf2825de9b36b2ff43 Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Tue, 18 Jun 2024 09:05:04 +0100 Subject: [PATCH 1683/3013] configs/beaglev_fire: add support for BeagleV Fire Add support for the BeagleV Fire, the Beagleboard SBC powered by Microchip's PolarFire SoC. The configuration file is beaglev_fire_defconfig. It builds a bootable kernel image with an embedded root file system. The image built can be flashed to the board using the eMMC. The yaml configuration file is used by the hss payload generator. It maps the ELF binaries or binary blobs to the application hart. The image generator script sets the partitions of the image. The image tree souce file creates a FIT image. The post image script creates the payload using the payload generator host package and finally, creates the FIT image using the ITS after the kernel build. It also creates the BMAP file for use with the BMAP command line tool to transfer the image to the board. The U-Boot script and additional U-Boot configurations ensure that U-Boot behaves as expected for the BeagleV-Fire and boots the FIT image. The rootfs-overlay contains script for updating the BeagleV-Fire gateware. The README.txt documents how to build and boot the Beagle-V Fire with this configuration. It also explains how to program a custom bitstream. Signed-off-by: Jamie Gibbons Reviewed-by: Valentina Fernandez [Romain: - move board files to board/beagleboard directory - enable BR2_DOWNLOAD_FORCE_CHECK_HASHES and add hashes files - enable BR2_KERNEL_HEADERS_AS_KERNEL for linux-headers to avoid specify BR2_DEFAULT_KERNEL_VERSION - add BR2_PACKAGE_HOST_DOSFSTOOLS for mkdosfs (host variant) ] Signed-off-by: Romain Naour --- DEVELOPERS | 2 + board/beagleboard/beaglev_fire/README.txt | 134 ++++++++++++++++++ .../beagleboard/beaglev_fire/beaglev_fire.its | 55 +++++++ board/beagleboard/beaglev_fire/boot.cmd | 15 ++ board/beagleboard/beaglev_fire/config.yaml | 28 ++++ board/beagleboard/beaglev_fire/genimage.cfg | 35 +++++ .../patches/linux-headers/linux-headers.hash | 1 + .../beaglev_fire/patches/linux/linux.hash | 2 + .../beaglev_fire/patches/uboot/uboot.hash | 2 + board/beagleboard/beaglev_fire/post-image.sh | 14 ++ .../usr/share/microchip/update-gateware.sh | 32 +++++ .../beaglev_fire/uboot-fragment.config | 3 + configs/beaglev_fire_defconfig | 33 +++++ 13 files changed, 356 insertions(+) create mode 100644 board/beagleboard/beaglev_fire/README.txt create mode 100644 board/beagleboard/beaglev_fire/beaglev_fire.its create mode 100644 board/beagleboard/beaglev_fire/boot.cmd create mode 100644 board/beagleboard/beaglev_fire/config.yaml create mode 100644 board/beagleboard/beaglev_fire/genimage.cfg create mode 120000 board/beagleboard/beaglev_fire/patches/linux-headers/linux-headers.hash create mode 100644 board/beagleboard/beaglev_fire/patches/linux/linux.hash create mode 100644 board/beagleboard/beaglev_fire/patches/uboot/uboot.hash create mode 100755 board/beagleboard/beaglev_fire/post-image.sh create mode 100644 board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh create mode 100644 board/beagleboard/beaglev_fire/uboot-fragment.config create mode 100644 configs/beaglev_fire_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 7b0f65fbfb9..5336f0fe769 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1500,7 +1500,9 @@ F: package/swaybg/ F: package/yad/ N: Jamie Gibbons +F: board/beagleboard/beaglev_fire/ F: board/microchip/mpfs_icicle/ +F: configs/beaglev_fire_defconfig F: configs/microchip_mpfs_icicle_defconfig F: package/microchip-hss-payload-generator/ diff --git a/board/beagleboard/beaglev_fire/README.txt b/board/beagleboard/beaglev_fire/README.txt new file mode 100644 index 00000000000..c9a824b67f1 --- /dev/null +++ b/board/beagleboard/beaglev_fire/README.txt @@ -0,0 +1,134 @@ +Beagle-V Fire +============== + +BeagleV Fire is a low-cost RISC-V 64-bit based platform, powered by +Microchip's PolarFire SoC. This file describes how to use the +pre-defined Buildroot configuration for the Beagle-V Fire board. + +Further information about the Beagle-V Fire can be found at +https://docs.beagleboard.org/latest/boards/beaglev/fire/index.html. + + +Building +======== + +Configure Buildroot using the default board configuration: + + '$ make beaglev_fire_defconfig' + +Customise the build as necessary: + + '$ make menuconfig' + +Start the build: + + '$ make' + + +Result of the build +=================== + +Once the build has finished you will have the following files: + + output/images/ + +-- boot.scr + +-- boot.vfat + +-- Image + +-- Image.gz + +-- beaglev_fire.itb + +-- beaglev_fire.its + +-- mpfs-beaglev-fire.dtb + +-- payload.bin + +-- rootfs.ext2 + +-- rootfs.ext4 + +-- rootfs.tar + +-- sdcard.img + +-- u-boot.bin + + +Flashing the image to your eMMC +=============================== + +By default Buildroot builds an image suitable for the eMMC. The first partition +of this image contains a U-Boot binary, embedded in a Hart Software Services +(HSS) payload. The second partition contains a FAT filesystem with a U-Boot env +and an ITB file containing the kernel and the device tree. The third partition +contains the file system. This image can be written directly to the eMMC. + +To do so, follow the below steps: + +1. Connect to BeagleV-Fire UART debug port using a 3.3v USB to UART bridge. + +2. Now you can run `tio ` in a terminal window to access the UART debug +port connection. + e.g `tio /dev/ttyUSB4` + +3. Once you are connected properly, you can press the Reset button which will +show you a progress bar. + +4. Press any key in the terminal application to stop the HSS from booting. This +will give you access to the HSS command line interface and a ">>" for input +will be displayed in the terminal. + +5. Type `usbdmsc` in the HSS command line interface. The HSS `usbdmsc` command +exposes the eMMC as a USB mass storage device using the USB type C connector. +If successful, a message saying "USB Host connected" will be displayed. + +6. The eMMC should now appear as mass storage device/drive on your host PC, as +it is mounted through your USB type C connector. + +7. Now, all you need to do is dd the image to the eMMC, which can be done with +the following command on your development host: + + '$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M' + +You will have to replace /dev/sdX by the actual device name of your eMMC. +Please, be especially cautious not to overwrite the wrong drive as this cannot +be undone. + +8. Once the image transfer has completed you can type `CTRL+C` to disconnect +your device. + +9. Finally, type `boot` or reset your board to boot your new Linux image. + +Customize BeagleV-Fire Cape Gateware Using Verilog (Optional) +============================================================= + +To customize your Beagle-V Fire gateware please follow the guide below to +create your custom bitstream (steps 1 - 6): +https://docs.beagleboard.org/latest/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.html + + + Program BeagleV-Fire With Your Custom Bitstream with Buildroot + ============================================================== + + After following the steps 1-6 from the above tutorial, you should now have a + artifacts.zip file on your local host. + + Unzip the downloaded artifacts.zip file. + + Go to the custom FPGA design directory: + 'cd artifacts/bitstreams/my_custom_fpga_design' + + On your Linux host development computer, copy the bitstream to BeagleV-Fire + board, replacing with the path to your BeagleV-Fire root file + system. + 'cp -r ./LinuxProgramming /path/to/your/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/etc/' + + To apply these changes to your image, make sure to re-build it with: + `make` + + Then, re-flash your image - to ensure you have the necessary firmware files - by + following the above section "Flashing the image to your eMMC". + + On BeagleV-Fire, + 1. Make your update gateware script executable + 'chmod +x /usr/share/microchip/update-gateware.sh' + 2. Create a firmware directory + 'mkdir /lib/firmware' + 3. Change to the directory of your gateware script + `cd /usr/share/microchip/` + 3. initiate the reprogramming of the FPGA with your gateware bitstream: + './update-gateware.sh /etc/LinuxProgramming/' + + Wait for a couple of minutes for the BeagleV-Fire to reprogram itself. diff --git a/board/beagleboard/beaglev_fire/beaglev_fire.its b/board/beagleboard/beaglev_fire/beaglev_fire.its new file mode 100644 index 00000000000..97c878c1184 --- /dev/null +++ b/board/beagleboard/beaglev_fire/beaglev_fire.its @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Flattened Image Tree file for BVF + * + * Copyright (C) 2024 Microchip Technology Inc. and its subsidiaries. + * + */ + +/dts-v1/; + +/ { + description = "U-Boot fitImage for the BeagleV-Fire"; + #address-cells = <2>; + + images { + kernel { + description = "Linux kernel"; + data = /incbin/("./Image.gz"); + type = "kernel"; + arch = "riscv"; + os = "linux"; + compression = "gzip"; + load = <0x80200000>; + entry = <0x80200000>; + hash-1 { + algo = "sha256"; + }; + }; + base_fdt { + description = "Flattened Device Tree blob"; + data = /incbin/("./mpfs-beaglev-fire.dtb"); + type = "flat_dt"; + arch = "riscv"; + compression = "none"; + load = <0x8a000000>; + hash-1 { + algo = "sha256"; + }; + }; + }; + + configurations { + default = "kernel_dtb"; + kernel_dtb { + description = "1 Linux kernel, FDT blob"; + kernel = "kernel"; + fdt = "base_fdt"; + }; + + base_dtb { + description = "Base FDT blob for BeagleV-Fire board"; + fdt = "base_fdt"; + }; + }; +}; diff --git a/board/beagleboard/beaglev_fire/boot.cmd b/board/beagleboard/beaglev_fire/boot.cmd new file mode 100644 index 00000000000..05f4858bac3 --- /dev/null +++ b/board/beagleboard/beaglev_fire/boot.cmd @@ -0,0 +1,15 @@ +# this assumes ${scriptaddr} is already set!! + +# Try to boot a fitImage from eMMC/SD + +setenv fdt_high 0xffffffffffffffff +setenv initrd_high 0xffffffffffffffff + +load mmc 0:${distro_bootpart} ${scriptaddr} beaglev_fire.itb; +bootm start ${scriptaddr}#kernel_dtb; +bootm loados ${scriptaddr}; +# Try to load a ramdisk if available inside fitImage +bootm ramdisk; +bootm prep; +fdt set /soc/ethernet@20110000 mac-address ${beaglevfire_mac_addr0}; +bootm go; diff --git a/board/beagleboard/beaglev_fire/config.yaml b/board/beagleboard/beaglev_fire/config.yaml new file mode 100644 index 00000000000..5fccdfd34f8 --- /dev/null +++ b/board/beagleboard/beaglev_fire/config.yaml @@ -0,0 +1,28 @@ +# +# HSS Payload Generator - buildroot configuration file +# + +# First, we can optionally set a name for our image, otherwise one will be created dynamically +set-name: 'PolarFire-SoC-HSS::U-Boot' + +# +# Next, we'll define the entry point addresses for each hart, as follows: +# +hart-entry-points: {u54_1: '0x80200000', u54_2: '0x80200000', u54_3: '0x80200000', u54_4: '0x80200000'} +# +# Finally, we'll define a payloads (source binary file) that will be placed at certain regions in memory +# The payload section is defined with the keyword payloads, and then a number of individual +# payload descriptors. +# +# Each payload has a name (path to its ELF/bin file), an owner-hart, and optionally 1-3 secondary-harts. +# +# Additionally, it has a privilege mode in which it will start execution. +# * Valid privilege modes are PRV_M, PRV_S and PRV_U. +# +# +# In this case, the only payload is the u-boot s-mode binary. +# +# Case only matters for the ELF path names, not the keywords. +# +payloads: + u-boot.bin: {exec-addr: '0x80200000', owner-hart: u54_1, secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4, priv-mode: prv_s} diff --git a/board/beagleboard/beaglev_fire/genimage.cfg b/board/beagleboard/beaglev_fire/genimage.cfg new file mode 100644 index 00000000000..ef650704c65 --- /dev/null +++ b/board/beagleboard/beaglev_fire/genimage.cfg @@ -0,0 +1,35 @@ +# Image for eMMC boot on the Microchip PolarFire SOC BeagleV-Fire Board +# +image boot.vfat { + vfat { + files = { + "beaglev_fire.itb", + } + + file boot.scr { + image = "boot.scr" + } + } + size = 60M +} + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition uboot { + partition-type-uuid = 21686148-6449-6E6F-744E-656564454649 + image = "payload.bin" + } + + partition kernel { + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = "true" + image = "boot.vfat" + } + + partition root { + image = "rootfs.ext4" + } +} diff --git a/board/beagleboard/beaglev_fire/patches/linux-headers/linux-headers.hash b/board/beagleboard/beaglev_fire/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/beagleboard/beaglev_fire/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/beagleboard/beaglev_fire/patches/linux/linux.hash b/board/beagleboard/beaglev_fire/patches/linux/linux.hash new file mode 100644 index 00000000000..d621dc32015 --- /dev/null +++ b/board/beagleboard/beaglev_fire/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7d634bf425f2ad68c3a6aab0d67a5f0c9f59a4fae02f051054f428854913f58a linux4microchip+fpga-2024.02.tar.gz diff --git a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash new file mode 100644 index 00000000000..684aa15a12b --- /dev/null +++ b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c21209347beac37540f1c7070760498493975052b536fc02677faa2110666bab linux4microchip+fpga-2024.02.tar.gz diff --git a/board/beagleboard/beaglev_fire/post-image.sh b/board/beagleboard/beaglev_fire/post-image.sh new file mode 100755 index 00000000000..43be1356cff --- /dev/null +++ b/board/beagleboard/beaglev_fire/post-image.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +HSS_PAYLOAD_GENERATOR="${HOST_DIR}"/bin/hss-payload-generator +MKIMAGE="${HOST_DIR}"/bin/mkimage +BOARD_DIR="$(pwd)"/"${0%/*}" + +pushd "${BINARIES_DIR}" +"${HSS_PAYLOAD_GENERATOR}" -c "${BOARD_DIR}"/config.yaml payload.bin +cp "${BOARD_DIR}"/beaglev_fire.its "${BINARIES_DIR}"/beaglev_fire.its +gzip -9 Image -c > Image.gz +"${MKIMAGE}" -f beaglev_fire.its beaglev_fire.itb +popd +support/scripts/genimage.sh -c "${BOARD_DIR}"/genimage.cfg diff --git a/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh b/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh new file mode 100644 index 00000000000..f455037b605 --- /dev/null +++ b/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +if [ ! -e "$1"/mpfs_bitstream.spi ]; then + echo "No gateware file found." + exit 1 +fi + +if [ ! -d /lib/firmware ] +then + mkdir /lib/firmware +fi + +cp "$1"/mpfs_dtbo.spi /lib/firmware/mpfs_dtbo.spi +cp "$1"/mpfs_bitstream.spi /lib/firmware/mpfs_bitstream.spi + +mount -t debugfs none /sys/kernel/debug + +# Trash existing device tree overlay in case the rest of the process fails: +flash_erase /dev/mtd0 0 1024 + +# # Write device tree overlay +dd if=/lib/firmware/mpfs_dtbo.spi of=/dev/mtd0 seek=1024 + +# Fake the presence of a golden image for now. +dd if=/dev/zero of=/dev/mtd0 count=4 bs=1 + +# Initiate FPGA update. +echo 1 > /sys/kernel/debug/fpga/microchip_exec_update + +# Reboot Linux for the gateware update to take effect. +# FPGA reprogramming takes places between Linux shut-down and HSS restarting the board. +reboot diff --git a/board/beagleboard/beaglev_fire/uboot-fragment.config b/board/beagleboard/beaglev_fire/uboot-fragment.config new file mode 100644 index 00000000000..e2a5eb94385 --- /dev/null +++ b/board/beagleboard/beaglev_fire/uboot-fragment.config @@ -0,0 +1,3 @@ +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mmcblk0p3 rootwait uio_pdrv_genirq.of_id=generic-uio" +CONFIG_MPFS_PRIORITISE_QSPI_BOOT=n diff --git a/configs/beaglev_fire_defconfig b/configs/beaglev_fire_defconfig new file mode 100644 index 00000000000..d52ec3c7d7b --- /dev/null +++ b/configs/beaglev_fire_defconfig @@ -0,0 +1,33 @@ +BR2_riscv=y +BR2_RISCV_ISA_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglev_fire/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.1-mchp+fpga)/linux4microchip+fpga-2024.02.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="mpfs" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" +BR2_PACKAGE_MTD=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,polarfire-soc,u-boot)linux4microchip+fpga-2024.02.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beaglev_fire" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglev_fire/uboot-fragment.config" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MICROCHIP_HSS_PAYLOAD_GENERATOR=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/beagleboard/beaglev_fire/boot.cmd" From 7c0733c9be8a9f7ea54a1880896686ae7b323100 Mon Sep 17 00:00:00 2001 From: Joseph Burt Date: Thu, 12 Jan 2023 07:55:08 +0000 Subject: [PATCH 1684/3013] package/qemu: reenable Qemu user-land emulation for musl toolchains Compatible "struct sigevent" added upstream in musl 1.2.2 [1]. [1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb Signed-off-by: Joseph Burt Signed-off-by: Arnout Vandecappelle --- package/qemu/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 91e0de884fa..74962f3e266 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -122,16 +122,11 @@ comment "systems emulation needs a toolchain w/ dynamic library" config BR2_PACKAGE_QEMU_LINUX_USER bool "Enable Linux user-land emulation" - # Incompatible "struct sigevent" definition on musl - depends on !BR2_TOOLCHAIN_USES_MUSL help Say 'y' to build Linux user-land emulators. # Note: bsd-user can not be build on Linux -comment "Linux user-land emulation needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_QEMU_CHOOSE_TARGETS bool "Select individual emulator targets" depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER From ad71b415c1bdf1bbf4c37b04c772dc3104187b58 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 23 Dec 2022 14:34:00 +0100 Subject: [PATCH 1685/3013] package/boost: Boost.Atomic needs atomic intrinsics similar to previous problems with nios2 and not-available atomic ints the build for Boost.Atomics also fails for ARC Targets which don't have the ATOMICS_EXT flag set. according to [0] "Boost.Atomic has a hard requirement of the native atomic operations on bytes". The same tests mentioned there fail for ARC without the atomic extension. Disable BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS for BR2_arc without BR2_ARC_ATOMIC_EXT. Fixes: http://autobuild.buildroot.net/results/4ca54a85672d7b9328b1909b457e548c6032a493 [0] https://github.com/boostorg/atomic/issues/42#issuecomment-734130348 Signed-off-by: Michael Nosthoff [Arnout: add to BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS instead of updating all packages] Signed-off-by: Arnout Vandecappelle --- toolchain/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index 1aa17cbfbdb..8acdc62fc2a 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -94,6 +94,7 @@ config BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_ARM_CPU_ARMV5 depends on !BR2_sparc_v8 depends on !BR2_m68k_cf5208 + depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT) # GCC uses thunk functions to adjust the 'this' pointer when calling # C++ member functions in classes derived with multiple inheritance. From aa549fb95f8409c2b364cd1d8257f92a1b693720 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 10:57:09 +0200 Subject: [PATCH 1686/3013] package/cdrkit: replace URL in Config.in cdrkit.org no longer works, and there is no obvious homepage for this dead project. Use the Wikipedia page as a replacement. Signed-off-by: Thomas Petazzoni --- package/cdrkit/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in index 7b5b8865f6c..b3ddcbd1354 100644 --- a/package/cdrkit/Config.in +++ b/package/cdrkit/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_CDRKIT blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD data, and more. - http://www.cdrkit.org/ + https://en.wikipedia.org/wiki/Cdrkit From 347def2fd1f062be5d335d06aaaec577c5fa1d68 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 11:00:00 +0200 Subject: [PATCH 1687/3013] package/cdrkit: convert first patch to Git formatted one Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- ....patch => 0001-fix-build-with-uClibc.patch} | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) rename package/cdrkit/{0001-no-rcmd.patch => 0001-fix-build-with-uClibc.patch} (59%) diff --git a/.checkpackageignore b/.checkpackageignore index ade6c9fd200..6b4412a193e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -395,7 +395,7 @@ package/cache-calibrator/0001-Fix-conflicting-round-function.patch lib_patch.Ups package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch lib_patch.Upstream package/cairo/0002-Fix-mask-usage-in-image-compositor.patch lib_patch.Upstream package/caps/0001-Fix-stdint-types-with-musl.patch lib_patch.Upstream -package/cdrkit/0001-no-rcmd.patch lib_patch.Upstream +package/cdrkit/0001-fix-build-with-uClibc.patch lib_patch.Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch lib_patch.Upstream package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch lib_patch.Upstream package/cfm/S65cfm lib_sysv.Indent lib_sysv.Variables diff --git a/package/cdrkit/0001-no-rcmd.patch b/package/cdrkit/0001-fix-build-with-uClibc.patch similarity index 59% rename from package/cdrkit/0001-no-rcmd.patch rename to package/cdrkit/0001-fix-build-with-uClibc.patch index 294779f7a51..27203eee649 100644 --- a/package/cdrkit/0001-no-rcmd.patch +++ b/package/cdrkit/0001-fix-build-with-uClibc.patch @@ -1,17 +1,20 @@ -[PATCH] fix build with uClibc +From 13823cfe42f33e947f8375f5a3f9ee177c699960 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Sat, 13 Jul 2024 10:57:57 +0200 +Subject: [PATCH] fix build with uClibc cdrkit unconditionally enables code using rcmd(3), which isn't available on uClibc. Signed-off-by: Peter Korsgaard --- - include/xconfig.h.in | 1 - + include/xconfig.h.in | 1 - 1 file changed, 1 deletion(-) -Index: cdrkit-1.1.10/include/xconfig.h.in -=================================================================== ---- cdrkit-1.1.10.orig/include/xconfig.h.in -+++ cdrkit-1.1.10/include/xconfig.h.in +diff --git a/include/xconfig.h.in b/include/xconfig.h.in +index c130600..00f2044 100644 +--- a/include/xconfig.h.in ++++ b/include/xconfig.h.in @@ -187,7 +187,6 @@ * they are placed before the large file tests. */ @@ -20,3 +23,6 @@ Index: cdrkit-1.1.10/include/xconfig.h.in #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ +-- +2.45.2 + From 0a0de4d86cd1fbeb5ff0439259b297756b3a5d98 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 11:38:24 +0200 Subject: [PATCH 1688/3013] package/cdrkit: fix build with gcc 14.x This commit adds a patch, which is already in Debian, fixing the build with gcc 14.x: /home/autobuild/autobuild/instance-7/output-1/build/host-cdrkit-1.1.11/genisoimage/genisoimage.c:1509:17: error: implicit declaration of function 'parse_checksum_algo' [-Wimplicit-function-declaration] 1509 | if (parse_checksum_algo(optarg, &checksum_algo_iso)) | ^~~~~~~~~~~~~~~~~~~ make[3]: *** [genisoimage/CMakeFiles/genisoimage.dir/build.make:76: genisoimage/CMakeFiles/genisoimage.dir/genisoimage.o] Error 1 Fixes: http://autobuild.buildroot.net/results/a9cca8da22774ecafdbb382697aae71f78e348f4/ Signed-off-by: Thomas Petazzoni --- .../0004-Add-missing-header-includes.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/cdrkit/0004-Add-missing-header-includes.patch diff --git a/package/cdrkit/0004-Add-missing-header-includes.patch b/package/cdrkit/0004-Add-missing-header-includes.patch new file mode 100644 index 00000000000..d2a93fe5a72 --- /dev/null +++ b/package/cdrkit/0004-Add-missing-header-includes.patch @@ -0,0 +1,48 @@ +From 8b7852149c45c8a837a9f5124e91812dd475a270 Mon Sep 17 00:00:00 2001 +From: Andrey Rakhmatullin +Date: Sat, 13 Jul 2024 11:37:07 +0200 +Subject: [PATCH] Add missing header includes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug-Debian: https://bugs.debian.org/1066264 + +Fixes: + +genisoimage/genisoimage.c:1509:17: error: implicit declaration of function ‘parse_checksum_algo’ [-Wimplicit-function-declaration] + +Upstream: https://sources.debian.org/patches/cdrkit/9:1.1.11-3.5/fix-implicit-function-declaration.patch/ +Signed-off-by: Thomas Petazzoni +--- + genisoimage/genisoimage.c | 1 + + genisoimage/jte.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c +index 46f0cb7..fa2f8bd 100644 +--- a/genisoimage/genisoimage.c ++++ b/genisoimage/genisoimage.c +@@ -53,6 +53,7 @@ + #include + #include "match.h" + #include "exclude.h" ++#include "checksum.h" + #include /* For UNICODE translation */ + #include + #ifdef UDF +diff --git a/genisoimage/jte.c b/genisoimage/jte.c +index 0dff289..4c4d986 100644 +--- a/genisoimage/jte.c ++++ b/genisoimage/jte.c +@@ -27,6 +27,7 @@ + #include "ifo_read.h" + #include "endianconv.h" + #include "checksum.h" ++#include "md5.h" + #endif + #ifdef APPLE_HYB + #include +-- +2.45.2 + From 7169c9412d11cb0ce22950ae726445018937a65d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 13 Jul 2024 11:37:44 +0200 Subject: [PATCH 1689/3013] configs/beagleboardx15: remove defconfig The beagleboardx15 boards files should be moved to board/beagleboard directory but doing so we noticed that beagleboardx15_defconfig was failing to build on Buildroot's Gitlab-Ci [1] due too old BSP (uboot 2016.11 and kernel 4.9) built with the internal toolchain. [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/7314633702 Signed-off-by: Romain Naour Cc: Theo Debrouwere Signed-off-by: Romain Naour --- .checkpackageignore | 1 - DEVELOPERS | 2 -- board/beagleboardx15/genimage.cfg | 27 ----------------- board/beagleboardx15/readme.txt | 49 ------------------------------- configs/beagleboardx15_defconfig | 29 ------------------ 5 files changed, 108 deletions(-) delete mode 100644 board/beagleboardx15/genimage.cfg delete mode 100644 board/beagleboardx15/readme.txt delete mode 100644 configs/beagleboardx15_defconfig diff --git a/.checkpackageignore b/.checkpackageignore index 6b4412a193e..3fea2d9b39e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -142,7 +142,6 @@ configs/bananapi_m2_berry_defconfig lib_defconfig.ForceCheckHash configs/bananapi_m2_ultra_defconfig lib_defconfig.ForceCheckHash configs/bananapi_m2_zero_defconfig lib_defconfig.ForceCheckHash configs/bananapro_defconfig lib_defconfig.ForceCheckHash -configs/beagleboardx15_defconfig lib_defconfig.ForceCheckHash configs/beaglebone_defconfig lib_defconfig.ForceCheckHash configs/beaglev_defconfig lib_defconfig.ForceCheckHash configs/beelink_gs1_defconfig lib_defconfig.ForceCheckHash diff --git a/DEVELOPERS b/DEVELOPERS index 5336f0fe769..b66fda5fcb2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3029,8 +3029,6 @@ N: Tan En De F: package/libkcapi/ N: Theo Debrouwere -F: board/beagleboardx15/ -F: configs/beagleboardx15_defconfig F: package/pugixml/ N: Thierry Bultel diff --git a/board/beagleboardx15/genimage.cfg b/board/beagleboardx15/genimage.cfg deleted file mode 100644 index b1604105cd3..00000000000 --- a/board/beagleboardx15/genimage.cfg +++ /dev/null @@ -1,27 +0,0 @@ -image boot.vfat { - vfat { - files = { - "MLO", - "u-boot.img" - } - } - - size = 4M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/board/beagleboardx15/readme.txt b/board/beagleboardx15/readme.txt deleted file mode 100644 index 5af2c914ba6..00000000000 --- a/board/beagleboardx15/readme.txt +++ /dev/null @@ -1,49 +0,0 @@ -BeagleBoard X15 - -Intro -===== -This config currently supports the beagleboard x15, -and generates a barebone image. - -The image must be flashed to a SD card to be used. - -How to build it -=============== - - $ make beagleboardx15_defconfig - -Then you can edit the build options using - - $ make menuconfig - -Compile all and build a sdcard image: - - $ make - -Result of the build -------------------- - -After building, you should get a tree like this: - - output/images/ - +-- am57xx-beagle-x15.dtb - +-- am57xx-beagle-x15-revb1.dtb - +-- boot.vfat - +-- MLO - +--rootfs.ext2 - +-- rootfs.ext4 - +-- rootfs.tar - +-- sdcard.img - +-- u-boot.img - +-- u-boot-spl.bin - +-- zImage - -How to write the microSD card -============================= - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/beagleboardx15_defconfig b/configs/beagleboardx15_defconfig deleted file mode 100644 index 039a07b11e3..00000000000 --- a/configs/beagleboardx15_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -BR2_arm=y -BR2_cortex_a15=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboardx15/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" -BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am57xx-beagle-x15 am57xx-beagle-x15-revb1" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" -BR2_TARGET_UBOOT_NEEDS_DTC=y -# BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="MLO" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From 13d564b62ef40dae4cf247ccdce192dca3fbeec0 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 26 Apr 2024 23:35:51 +0200 Subject: [PATCH 1690/3013] package/raspberrypi-usbboot: bump version to 20221215-105525 The "msd" (mass storage device) firmware files in 2021.07.01 don't work with some newer CM4 based devices, the one I had issues with is a RevPi Connect 4. Updating fixes the issue. Mass storage device mode is required to flash the eMMC of CM4 devices. Signed-off-by: Fiona Klute Signed-off-by: Thomas Petazzoni (cherry picked from commit fbd9a3f3114ef52d6ff9a14ec2648926909fd46e) Signed-off-by: Peter Korsgaard --- ...1-Makefile-allow-passing-CFLAGS-LDFLAGS.patch | 16 ++++++++++------ .../raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- .../raspberrypi-usbboot/raspberrypi-usbboot.mk | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch index d482b0b9d40..29a9311651b 100644 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -1,4 +1,4 @@ -From 38b730c00f45abf324caf687b5b00662ff4252c2 Mon Sep 17 00:00:00 2001 +From acd175aa53af1f1b8422bf1f1fe57eafc710cdca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Dec 2016 23:09:44 +0100 Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS @@ -10,21 +10,25 @@ Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 Signed-off-by: Thomas Petazzoni [Rebased on 9324fd7] Signed-off-by: Peter Seiderer +[Rebased on 20221215-105525-0-g1afa26c5] +Signed-off-by: Fiona Klute --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 822e714..875e717 100755 +index dc78cfe..c9d4910 100755 --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ +@@ -1,7 +1,7 @@ + PKG_VER=$(shell grep rpiboot debian/changelog | head -n1 | sed 's/.*(\(.*\)).*/\1/g') + GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h -- $(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0 -+ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) +- $(CC) -Wall -Wextra -g -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" $(LDFLAGS) %.h: %.bin ./bin2c ./bin2c $< $@ -- -2.31.1 +2.45.2 diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index cedc5fb7e10..830ead82431 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz +sha256 2f02dbe9a88e9dfad5f05e513e1f30afd47b1575820f7c3b09665dfefc45bbaa raspberrypi-usbboot-20221215-105525.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 2e4194da0b2..24a1f6d906f 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,9 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_VERSION = 20221215-105525 RASPBERRYPI_USBBOOT_SITE = \ - $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) + $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE From 38b5b420863a1736080b88dff7f541c17c517d0e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Jul 2024 21:39:24 +0200 Subject: [PATCH 1691/3013] package/xfsprogs: update Kconfig package homepage URL The old xfs homepage URL [1] seems defunct at the time of this commit. The http URL redirects to https, the certificate expired on 2024-01-26. If the certificate expiration date is ignored, the site shows a "502 Bad Gateway" error. The package README [2] advertise the homepage as [3]. This commit updates the URL to the new one. [1] http://xfs.org [2] https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/README?h=v6.4.0#n12 [3] https://xfs.wiki.kernel.org Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit daa5d775d729efd529ff7ff8c58c0380018f1e42) Signed-off-by: Peter Korsgaard --- package/xfsprogs/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index d14c3d46986..1a29579d8b8 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -18,4 +18,4 @@ config BR2_PACKAGE_XFSPROGS help The XFS file system utilities and libraries - http://xfs.org + https://xfs.wiki.kernel.org From 2555f47788964d796c8a49e81ce1f5d63b9cb9ac Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 13 Jul 2024 13:48:13 +0200 Subject: [PATCH 1692/3013] Update for 2024.05.1 Signed-off-by: Peter Korsgaard --- CHANGES | 18 ++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 4916eb0bf47..2d97ce2a3f9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,21 @@ +2024.05.1, released July 13th, 2024 + + Important / security related fixes. + + Infrastructure: Ensure support/scripts/apply-patches can be + used outside Buildroot (regression in 2024.05). + + Defconfig: Pine64 rockpro64: Build ethernet driver in kernel + rather than as module. QEMU sh4: Change to initramfs to + workaround regression in QEMU. Visionfive2: Correct kernel + headers version + + Updated/fixed packages: apache, avro-c, daq, dav1d, + fluent-bit, ghostscript, glibc, libmad, libopenssl, + linux-firmware, mesa3d, network-manager, ntp, nut, octave, + openssh, openvpn, php, raspberrypi-usbboot, redis, sentry-cli, + tor, uuu, vlc, xmrig, znc + 2024.05, released June 12th, 2024 Various fixes. diff --git a/Makefile b/Makefile index 4320eeb1b7e..d616c08c0a8 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.05 +export BR2_VERSION := 2024.05.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1718188000 +BR2_VERSION_EPOCH = 1720871000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ce57bc07198..b49ea474250 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.05' +RELEASE='2024.05.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From a882426e37181cc36cd59c2a4fbf93d43fa975e4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 14:01:50 +0200 Subject: [PATCH 1693/3013] package/zstd: fix build following bump to 1.5.6 In commit f7f2903f3ed88ef5c2f10171c93e90bd9ad5d83e, the zstd package was bumped to 1.5.6. Since then, the zstd has been failing to build in our autobuilders, causing over 1400+ build failures. The issue turned out to be a one character typo introduced in an upstream commit. This commit fixes that by introducing a patch, which has been submitted upstream. Fixes: http://autobuild.buildroot.net/results/df983da15a5918566c89a87038d0bdc6cb530485/ Signed-off-by: Thomas Petazzoni --- ...ix-typo-in-the-definition-of-LIB_BIN.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/zstd/0001-lib-libzstd.mk-fix-typo-in-the-definition-of-LIB_BIN.patch diff --git a/package/zstd/0001-lib-libzstd.mk-fix-typo-in-the-definition-of-LIB_BIN.patch b/package/zstd/0001-lib-libzstd.mk-fix-typo-in-the-definition-of-LIB_BIN.patch new file mode 100644 index 00000000000..5fc930128a2 --- /dev/null +++ b/package/zstd/0001-lib-libzstd.mk-fix-typo-in-the-definition-of-LIB_BIN.patch @@ -0,0 +1,47 @@ +From 4de25344f7c01f00d99bc467e76bc6f9b6971dd7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 13:53:53 +0200 +Subject: [PATCH] lib/libzstd.mk: fix typo in the definition of LIB_BINDIR + +Commit f4dbfce79cb2b82fb496fcd2518ecd3315051b7d ("define LIB_SRCDIR +and LIB_BINDIR") significantly reworked the build logic, but in its +introduction of LIB_BINDIR a typo was made. + +It was introduced as such: + ++LIB_SRCDIR ?= $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) ++LIB_BINDIR ?= $(LIBSRC_DIR) + +But the definition of LIB_BINDIR has a typo: it should use +$(LIB_SRCDIR) not $(LIBSRC_DIR). + +Due to this, $(LIB_BINDIR) is empty, therefore in programs/Makefile, +-L$(LIB_BINDIR) is expanded to just -L, and consequently when trying +to link the "zstd" binary with the libzstd library, it cannot find it: + +host/lib/gcc/powerpc64-buildroot-linux-gnu/13.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: cannot find -lzstd: No such file or directory + +This commit fixes the build by fixing this typo. + +Upstream: https://github.com/facebook/zstd/pull/4096 +Signed-off-by: Thomas Petazzoni +--- + lib/libzstd.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/libzstd.mk b/lib/libzstd.mk +index a308a6ef..c7ae2ff4 100644 +--- a/lib/libzstd.mk ++++ b/lib/libzstd.mk +@@ -22,7 +22,7 @@ LIBZSTD_MK_INCLUDED := 1 + + # By default, library's directory is same as this included makefile + LIB_SRCDIR ?= $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) +-LIB_BINDIR ?= $(LIBSRC_DIR) ++LIB_BINDIR ?= $(LIB_SRCDIR) + + # ZSTD_LIB_MINIFY is a helper variable that + # configures a bunch of other variables to space-optimized defaults. +-- +2.45.2 + From 9238ff24090e40a3253412e60a05c1f73e2b4b53 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 13 Jul 2024 13:48:13 +0200 Subject: [PATCH 1694/3013] Update for 2024.05.1 Signed-off-by: Peter Korsgaard (cherry picked from commit 2555f47788964d796c8a49e81ce1f5d63b9cb9ac) Signed-off-by: Peter Korsgaard --- CHANGES | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 4916eb0bf47..2d97ce2a3f9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,21 @@ +2024.05.1, released July 13th, 2024 + + Important / security related fixes. + + Infrastructure: Ensure support/scripts/apply-patches can be + used outside Buildroot (regression in 2024.05). + + Defconfig: Pine64 rockpro64: Build ethernet driver in kernel + rather than as module. QEMU sh4: Change to initramfs to + workaround regression in QEMU. Visionfive2: Correct kernel + headers version + + Updated/fixed packages: apache, avro-c, daq, dav1d, + fluent-bit, ghostscript, glibc, libmad, libopenssl, + linux-firmware, mesa3d, network-manager, ntp, nut, octave, + openssh, openvpn, php, raspberrypi-usbboot, redis, sentry-cli, + tor, uuu, vlc, xmrig, znc + 2024.05, released June 12th, 2024 Various fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ce57bc07198..b49ea474250 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.05' +RELEASE='2024.05.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From f8553fec83c5e269e4056f8a1cd63c92a2869dbf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 13 Jul 2024 14:16:07 +0200 Subject: [PATCH 1695/3013] docs/website: Update for 2024.05.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 5737878cd4d..b9526e24d94 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

buildroot-2024.02.3.tar.xz

-

Latest stable release: 2024.05

+

Latest stable release: 2024.05.1

- +
- +
-

buildroot-2024.05.tar.gz

-

PGP signature

+

buildroot-2024.05.1.tar.gz

+

PGP signature

- +
- +
-

buildroot-2024.05.tar.xz

-

PGP signature

+

buildroot-2024.05.1.tar.xz

+

PGP signature

pkg D ----> pkg F / \ pkg C -' '-> pkg G In the above example a single graph shows pkg {A,B,C} are needed by pkg D, and pkg D is a dependency of pkg {E,F,G}. Makefile help and manual are also updated. Signed-off-by: Steve Hay [Arnout: - remove DEPTH and RDEPTH, their functionality is already covered by BR2_GRAPH_DEPS_OPTS; - remove --rdepth, it was felt to not add sufficient added value; - add the new target to the manual; - fix flake8 errors. ] Signed-off-by: Arnout Vandecappelle --- Makefile | 3 ++ docs/manual/package-make-target.adoc | 4 ++ package/pkg-generic.mk | 3 ++ support/scripts/graph-depends | 67 +++++++++++++++++----------- 4 files changed, 50 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index cd8498edf65..db5244baebd 100644 --- a/Makefile +++ b/Makefile @@ -1171,6 +1171,9 @@ help: @echo ' - Recursively list packages which have as a dependency' @echo ' -graph-depends - Generate a graph of '\''s dependencies' @echo ' -graph-rdepends - Generate a graph of '\''s reverse dependencies' + @echo ' -graph-both-depends' + @echo ' - Generate a graph of both '\''s forward and' + @echo ' reverse dependencies. @echo ' -dirclean - Remove build directory' @echo ' -reconfigure - Restart the build from the configure step' @echo ' -rebuild - Restart the build from the build step' diff --git a/docs/manual/package-make-target.adoc b/docs/manual/package-make-target.adoc index 90a7910e23e..7a7ba7f7a03 100644 --- a/docs/manual/package-make-target.adoc +++ b/docs/manual/package-make-target.adoc @@ -81,6 +81,10 @@ graphs. dependencies (i.e the packages that depend on it, directly or indirectly) +| +graph-both-depends+ | Generate a graph of this package in both + directions (i.e the packages that depend on it and on which it + depends, directly or indirectly) + | +dirclean+ | Remove the whole package build directory | +reinstall+ | Re-run the install commands diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 0d84fc3773f..365d6c748d7 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1042,6 +1042,9 @@ $(1)-graph-depends: graph-depends-requirements $(1)-graph-rdepends: graph-depends-requirements $(call pkg-graph-depends,$(1),--reverse) +$(1)-graph-both-depends: graph-depends-requirements + $(call pkg-graph-depends,$(1),--direct --reverse) + $(1)-all-source: $(1)-source $(1)-all-source: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 3e3373950f6..cda0000c01c 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -159,11 +159,11 @@ def check_circular_deps(deps): # This functions trims down the dependency list of all packages. # It applies in sequence all the dependency-elimination methods. -def remove_extra_deps(deps, rootpkg, transitive, arrow_dir): +def remove_extra_deps(deps, rootpkg, transitive, direct): # For the direct dependencies, find and eliminate mandatory # deps, and add them to the root package. Don't do it for a # reverse graph, because mandatory deps are only direct deps. - if arrow_dir == "forward": + if direct: for pkg in list(deps.keys()): if not pkg == rootpkg: for d in get_mandatory_deps(pkg, deps): @@ -199,12 +199,13 @@ def print_attrs(outfile, pkg, pkg_type, pkg_version, depth, colors): # Print the dependency graph of a package def print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, - arrow_dir, draw_graph, depth, max_depth, pkg, colors, done_deps=None): + direct, draw_graph, depth, max_depth, pkg, colors, done_deps=None): if done_deps is None: done_deps = [] if pkg in done_deps: return done_deps.append(pkg) + if draw_graph: print_attrs(outfile, pkg, dict_types[pkg], dict_versions[pkg], depth, colors) elif depth != 0: @@ -231,9 +232,12 @@ def print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exc break if add: if draw_graph: - outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) + if direct: + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), "forward")) + else: + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(d), pkg_node_name(pkg), "forward")) print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, - arrow_dir, draw_graph, depth + 1, max_depth, d, colors, done_deps) + direct, draw_graph, depth + 1, max_depth, d, colors, done_deps) def parse_args(): @@ -265,9 +269,9 @@ def parse_args(): default=False) parser.add_argument("--no-transitive", dest="transitive", action='store_false', help="Draw (do not draw) transitive dependencies") - parser.add_argument("--direct", dest="direct", action='store_true', default=True, + parser.add_argument("--direct", dest="direct", action='store_true', default=False, help="Draw direct dependencies (the default)") - parser.add_argument("--reverse", dest="direct", action='store_false', + parser.add_argument("--reverse", dest="reverse", action='store_true', default=False, help="Draw reverse dependencies") parser.add_argument("--quiet", '-q', dest="quiet", action='store_true', help="Quiet") @@ -292,6 +296,9 @@ def main(): sys.exit(1) outfile = open(args.outfile, "w") + if not args.direct and not args.reverse: + args.direct = True + if args.package is None: mode = MODE_FULL rootpkg = 'all' @@ -312,13 +319,9 @@ def main(): if args.exclude_mandatory: exclude_list += MANDATORY_DEPS - if args.direct: - arrow_dir = "forward" - else: - if mode == MODE_FULL: - logging.error("--reverse needs a package") - sys.exit(1) - arrow_dir = "back" + if args.reverse and mode == MODE_FULL: + logging.error("--reverse needs a package") + sys.exit(1) draw_graph = not args.flat_list @@ -330,23 +333,33 @@ def main(): logging.error("Error: incorrect color list '%s'" % args.colors) sys.exit(1) - deps, rdeps, dict_types, dict_versions = brpkgutil.get_dependency_tree() - dict_deps = deps if args.direct else rdeps - - check_circular_deps(dict_deps) - if check_only: - sys.exit(0) - - dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, arrow_dir) - # Start printing the graph data - if draw_graph: + if not check_only and draw_graph: outfile.write("digraph G {\n") - print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, - arrow_dir, draw_graph, 0, args.depth, rootpkg, colors) + deps, rdeps, dict_types, dict_versions = brpkgutil.get_dependency_tree() - if draw_graph: + # forward + if args.direct: + dict_deps = deps + direct = True + check_circular_deps(dict_deps) + if not check_only: + dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, direct) + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, + direct, draw_graph, 0, args.depth, rootpkg, colors) + + # reverse + if args.reverse: + dict_deps = rdeps + direct = False + check_circular_deps(dict_deps) + if not check_only: + dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, direct) + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, + direct, draw_graph, 0, args.depth, rootpkg, colors) + + if not check_only and draw_graph: outfile.write("}\n") else: outfile.write("\n") From d68d8c4d34f55cae0bd2421ab18d98e172ef5bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:32 +0200 Subject: [PATCH 1804/3013] skalibs: bump to version 2.14.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Arnout Vandecappelle --- package/skalibs/skalibs.hash | 2 +- package/skalibs/skalibs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/skalibs/skalibs.hash b/package/skalibs/skalibs.hash index d871ee65035..1e6bd966719 100644 --- a/package/skalibs/skalibs.hash +++ b/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3 skalibs-2.14.1.1.tar.gz +sha256 ddfec5730e5b2f19d0381ecf7f796b39a6e473236bda0ad8d3776a3fe7b07e43 skalibs-2.14.2.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk index 67e3c694fca..45f3e15a7be 100644 --- a/package/skalibs/skalibs.mk +++ b/package/skalibs/skalibs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SKALIBS_VERSION = 2.14.1.1 +SKALIBS_VERSION = 2.14.2.0 SKALIBS_SITE = https://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING From e9e0670f3cfbf9b66c868e38d5c5f9de44511dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:33 +0200 Subject: [PATCH 1805/3013] s6: bump to version 2.13.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Arnout Vandecappelle --- package/s6/s6.hash | 2 +- package/s6/s6.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s6/s6.hash b/package/s6/s6.hash index fb5e74e4039..6abeb8066a7 100644 --- a/package/s6/s6.hash +++ b/package/s6/s6.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 c95d51787602e0c8c8e4f92a710cbdaa4ee797ee886e71342727e2974f95c06b s6-2.12.0.4.tar.gz +sha256 7e46f8f55d80bb0e2025a64d5d649af4a4ac21e348020caaadde30ba5e5b4830 s6-2.13.0.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6/s6.mk b/package/s6/s6.mk index fb4910e28b5..7e02c26d03c 100644 --- a/package/s6/s6.mk +++ b/package/s6/s6.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_VERSION = 2.12.0.4 +S6_VERSION = 2.13.0.0 S6_SITE = https://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING From 9dff6c7f48a719ec404a84b54be1e34cc3eb8919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:34 +0200 Subject: [PATCH 1806/3013] execline: bump to version 2.9.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Arnout Vandecappelle --- package/execline/execline.hash | 2 +- package/execline/execline.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/execline/execline.hash b/package/execline/execline.hash index 3f9ff8a1384..76412978b94 100644 --- a/package/execline/execline.hash +++ b/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 df750035d0fb21c7265bffb7ed7e1b661de1e842944a2252bdcddc32d0d97217 execline-2.9.5.1.tar.gz +sha256 ba2a27e97c5eb6bd7ca6a0987a8925e44465a5be996daa0d18f8feca37d7571a execline-2.9.6.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/execline/execline.mk b/package/execline/execline.mk index b3d2d98216c..ee38d3ed3c7 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXECLINE_VERSION = 2.9.5.1 +EXECLINE_VERSION = 2.9.6.0 EXECLINE_SITE = https://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING From 07039e8174c65bea37ccc679a01610d5c335dc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:35 +0200 Subject: [PATCH 1807/3013] s6-networking: bump to version 2.7.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Arnout Vandecappelle --- package/s6-networking/s6-networking.hash | 2 +- package/s6-networking/s6-networking.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s6-networking/s6-networking.hash b/package/s6-networking/s6-networking.hash index df65274b3dd..4eff4d49f43 100644 --- a/package/s6-networking/s6-networking.hash +++ b/package/s6-networking/s6-networking.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 c33c6f1b2be16f89a21af946cfd06242a12f98184c898b755ddb24338671ceb1 s6-networking-2.7.0.2.tar.gz +sha256 db411c54371a17ed7d4543dd86cf9530ce25fcf624bef83ae2b579520e5e70bf s6-networking-2.7.0.3.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index 239d8a679e5..212fae7361b 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.7.0.2 +S6_NETWORKING_VERSION = 2.7.0.3 S6_NETWORKING_SITE = https://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING From f7756e2e24362aafca460a24d72c1b160be80c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:36 +0200 Subject: [PATCH 1808/3013] s6-rc: bump to version 0.5.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The COPYING hash changed because the copyright year was updated. Signed-off-by: J. Neuschäfer Signed-off-by: Arnout Vandecappelle --- package/s6-rc/s6-rc.hash | 4 ++-- package/s6-rc/s6-rc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/s6-rc/s6-rc.hash b/package/s6-rc/s6-rc.hash index a09c08ba3cf..72bd5d42be9 100644 --- a/package/s6-rc/s6-rc.hash +++ b/package/s6-rc/s6-rc.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982 s6-rc-0.5.4.2.tar.gz -sha256 f68451e55e6686dc187df1ca427c574d9ac0d6f6926e1bdb909ad8b657668fe5 COPYING +sha256 e3272796a947904de37ab34ec10430e26107b8ef05210d81059c8b36203e6a9f s6-rc-0.5.4.3.tar.gz +sha256 75b0b50d7bcb9b2fc174d01442536bce03333da1814df3e61cd6ef8f663548f1 COPYING diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk index 61090c9a276..301c7059101 100644 --- a/package/s6-rc/s6-rc.mk +++ b/package/s6-rc/s6-rc.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_RC_VERSION = 0.5.4.2 +S6_RC_VERSION = 0.5.4.3 S6_RC_SITE = https://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING From 31e6a80198fd22aacd57905ac8060a041de9ef04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:37 +0200 Subject: [PATCH 1809/3013] mdevd: bump to version 0.1.6.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The COPYING hash changed because the copyright year was updated. Signed-off-by: J. Neuschäfer Signed-off-by: Arnout Vandecappelle --- package/mdevd/mdevd.hash | 4 ++-- package/mdevd/mdevd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mdevd/mdevd.hash b/package/mdevd/mdevd.hash index 9436ed8b01f..0151b03bd57 100644 --- a/package/mdevd/mdevd.hash +++ b/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 f6ecf0ef7cd48d04efc75acb2dad967d850bc8815bdb0098f1c9ef043394d430 mdevd-0.1.6.3.tar.gz -sha256 b2edd59a202a710440522f05dcbf418b0493540120efcb407876772ee42d2c7c COPYING +sha256 7358ce530b6b9befb715e48190981e9b69a12cca858519e6d2e4b46eab7e2470 mdevd-0.1.6.4.tar.gz +sha256 701e0e7d93a5da6421f69bed2136d4c64fd4bc17f35221297838a3ad9ba6050e COPYING diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk index c92659d961d..a1d9e17ceff 100644 --- a/package/mdevd/mdevd.mk +++ b/package/mdevd/mdevd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDEVD_VERSION = 0.1.6.3 +MDEVD_VERSION = 0.1.6.4 MDEVD_SITE = https://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING From 1282ebc83049949f1373bf78dd09e444aaa33d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:38 +0200 Subject: [PATCH 1810/3013] s6-dns: bump to version 2.3.7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The COPYING hash changed because the copyright year was updated. Signed-off-by: J. Neuschäfer Signed-off-by: Arnout Vandecappelle --- package/s6-dns/s6-dns.hash | 4 ++-- package/s6-dns/s6-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/s6-dns/s6-dns.hash b/package/s6-dns/s6-dns.hash index 334ea1667cd..dd6e6f36325 100644 --- a/package/s6-dns/s6-dns.hash +++ b/package/s6-dns/s6-dns.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 cf0258574ec7d62b654e0c2ad78af4c7d67ac4c9cb37f781480f597e54b30f6d s6-dns-2.3.7.1.tar.gz -sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING +sha256 6aee32bb68d01f5109f71e31a283213c668cd3c0e79fb9e469e6cabb58079f2b s6-dns-2.3.7.2.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-dns/s6-dns.mk b/package/s6-dns/s6-dns.mk index a848f2e6c0d..8e175431a4b 100644 --- a/package/s6-dns/s6-dns.mk +++ b/package/s6-dns/s6-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.7.1 +S6_DNS_VERSION = 2.3.7.2 S6_DNS_SITE = https://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING From 17deaf60f66fc08a796233920a104e5233b501e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 9 Jul 2024 00:45:39 +0200 Subject: [PATCH 1811/3013] tipidee: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also needs a host version to be able to generate the binary config file. The host version is user-selectable so the user has the option of running the compiler in a post-build script some other way. We don't install the config file compiler tipidee-config on target. Signed-off-by: J. Neuschäfer [Arnout: - Remove BR2_PACKAGE_TIPIDEE_CONFIGURATION, use empty value of BR2_PACKAGE_TIPIDEE_CONFIG_FILE to flag false. - Rename BR2_PACKAGE_TIPIDEE_CONFIGURATION_FILE to BR2_PACKAGE_TIPIDEE_CONFIG_FILE. - Default BR2_PACKAGE_TIPIDEE_CONFIG_FILE to empty. - Fix spelling of BR2_PACKAGE_HOST_TIPIDEE. - Add J. to DEVELOPERS. - Install in /usr instead of /. ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/Config.in.host | 1 + package/tipidee/Config.in | 31 +++++++++++++++ package/tipidee/Config.in.host | 8 ++++ package/tipidee/tipidee.hash | 3 ++ package/tipidee/tipidee.mk | 72 ++++++++++++++++++++++++++++++++++ 7 files changed, 119 insertions(+) create mode 100644 package/tipidee/Config.in create mode 100644 package/tipidee/Config.in.host create mode 100644 package/tipidee/tipidee.hash create mode 100644 package/tipidee/tipidee.mk diff --git a/DEVELOPERS b/DEVELOPERS index ba40388982a..9f67e3b02fa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1442,6 +1442,9 @@ N: Ismael Luceno F: package/axel/ F: package/mawk/ +N: J. Neuschäfer +F: package/tipidee + N: Jagan Teki F: board/amarula/ F: board/asus/ diff --git a/package/Config.in b/package/Config.in index f42762140a4..6c390f7bd32 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2606,6 +2606,7 @@ endif source "package/tinc/Config.in" source "package/tinyproxy/Config.in" source "package/tinyssh/Config.in" + source "package/tipidee/Config.in" source "package/tor/Config.in" source "package/traceroute/Config.in" source "package/transmission/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 89e5ca51910..5843210d100 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -114,6 +114,7 @@ menu "Host utilities" source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" source "package/ti-cgt-pru/Config.in.host" + source "package/tipidee/Config.in.host" source "package/uboot-tools/Config.in.host" source "package/util-linux/Config.in.host" source "package/utp_com/Config.in.host" diff --git a/package/tipidee/Config.in b/package/tipidee/Config.in new file mode 100644 index 00000000000..b9e6b4769f2 --- /dev/null +++ b/package/tipidee/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_TIPIDEE + bool "tipidee" + depends on BR2_USE_MMU # skalibs + select BR2_PACKAGE_SKALIBS + select BR2_PACKAGE_HOST_TIPIDEE if BR2_PACKAGE_TIPIDEE_CONFIG_FILE != "" + help + tipidee is a web server. It supports HTTP 1.0 and 1.1. It aims + to be compliant with RFC 9112: while it only implements a very + limited subset of the optional functionality in HTTP 1.1, it + implements all the mandatory parts. It is usable with both + HTTP and HTTPS. + + It runs under a super-server, e.g. inetd, s6-tcpserver, or + s6-tlsserver (for HTTPS). Traditionally, inetd-mode web + servers aren't considered performant, but tipidee aims to eke + out every single drop of performance that is attainable with + its programming model. + + https://skarnet.org/software/tipidee/ + +if BR2_PACKAGE_TIPIDEE + +config BR2_PACKAGE_TIPIDEE_CONFIG_FILE + string "configuration source file" + default "" + help + The configuration file in source (text) format, documented at: + + https://skarnet.org/software/tipidee/tipidee.conf.html + +endif diff --git a/package/tipidee/Config.in.host b/package/tipidee/Config.in.host new file mode 100644 index 00000000000..e120a186fb0 --- /dev/null +++ b/package/tipidee/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_TIPIDEE + bool "host tipidee" + depends on BR2_USE_MMU # skalibs + select BR2_PACKAGE_SKALIBS + help + This package builds the tipidee-config tool for the host. + + https://skarnet.org/software/tipidee/ diff --git a/package/tipidee/tipidee.hash b/package/tipidee/tipidee.hash new file mode 100644 index 00000000000..ecc1ab34b42 --- /dev/null +++ b/package/tipidee/tipidee.hash @@ -0,0 +1,3 @@ +# Locally generated +sha256 d9e91fc719879a43d54329b99b02c6649c54e428e77bc96a0573506b52bf1422 tipidee-0.0.5.0.tar.gz +sha256 8feb7933c6e6506a7f20fbfc03fd37df3caff4becdf3b7a0ffad5016277e441e COPYING diff --git a/package/tipidee/tipidee.mk b/package/tipidee/tipidee.mk new file mode 100644 index 00000000000..1e15782aa49 --- /dev/null +++ b/package/tipidee/tipidee.mk @@ -0,0 +1,72 @@ +################################################################################ +# +# tipidee +# +################################################################################ + +TIPIDEE_VERSION = 0.0.5.0 +TIPIDEE_SITE = https://skarnet.org/software/tipidee +TIPIDEE_LICENSE = ISC +TIPIDEE_LICENSE_FILES = COPYING +TIPIDEE_DEPENDENCIES = skalibs + +TIPIDEE_CONF_OPTS = \ + --prefix=/usr \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ + $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ + $(SHARED_STATIC_LIBS_OPTS) + +define TIPIDEE_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(TIPIDEE_CONF_OPTS)) +endef + +define TIPIDEE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define TIPIDEE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + rm -f $(TARGET_DIR)/bin/tipidee-config + rm -f $(TARGET_DIR)/libexec/tipidee-config-preprocess +endef + +ifneq ($(BR2_PACKAGE_TIPIDEE_CONFIG_FILE),) +TIPIDEE_DEPENDENCIES += host-tipidee + +define TIPIDEE_INSTALL_CONFIG + $(HOST_DIR)/bin/tipidee-config \ + -i $(call qstrip, $(BR2_PACKAGE_TIPIDEE_CONFIG_FILE)) \ + -o $(TARGET_DIR)/etc/tipidee.conf.cdb +endef +TIPIDEE_POST_INSTALL_TARGET_HOOKS += TIPIDEE_INSTALL_CONFIG + +endif + +HOST_TIPIDEE_DEPENDENCIES = host-skalibs + +HOST_TIPIDEE_CONF_OPTS = \ + --prefix=$(HOST_DIR) \ + --with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \ + --with-include=$(HOST_DIR)/include \ + --with-dynlib=$(HOST_DIR)/lib \ + --disable-static \ + --enable-shared \ + --disable-allstatic + +define HOST_TIPIDEE_CONFIGURE_CMDS + (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_TIPIDEE_CONF_OPTS)) +endef + +define HOST_TIPIDEE_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_TIPIDEE_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install-dynlib install-bin install-libexec +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) From 14192d722c09ca5355566303e8808d9f2c83ad31 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 14 Jul 2024 21:47:03 +0200 Subject: [PATCH 1812/3013] configs/orangepi_lite: uboot needs openssl The defconfig fails in uboot build, with output: In file included from tools/imagetool.c:10: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ This commit fixes the issue by adding BR2_TARGET_UBOOT_NEEDS_OPENSSL=y to the defconfig. Fixes: 0e1b6ab700f575226c2290c6a41db333e0b03a60 Signed-off-by: Romain Naour --- configs/orangepi_lite_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index 4298019837a..f1c63f9b1d1 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -32,6 +32,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From 322213e131fabd6aa6879c4f653415a35c93e63e Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 9 Jul 2024 14:16:53 +0000 Subject: [PATCH 1813/3013] .b4-config: configure `b4` for Buildroot `b4` is a commandline tool to make patch-based development easier[1]. It is primarily used for Linux kernel development, but can be configured to support any project that has a public-inbox endpoint. Buildroot has a public-inbox mirror at "https://lore.kernel.org/buildroot/". We configure some basic settings that tell `b4` where to send patches and how to use get-developers. [1] https://b4.docs.kernel.org/en/latest/ Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- .b4-config | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .b4-config diff --git a/.b4-config b/.b4-config new file mode 100644 index 00000000000..1943458f2fb --- /dev/null +++ b/.b4-config @@ -0,0 +1,7 @@ +# Configuration for the `b4` tool +# See https://b4.docs.kernel.org/en/latest/config.html +[b4] + send-series-to = buildroot@buildroot.org + send-auto-cc-cmd = "./utils/get-developers -e -" + +# vim: set filetype=gitconfig: From 2ca698051c50546a70e9f7b625f2ee9a2a6a2840 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 Jul 2024 21:27:19 +0200 Subject: [PATCH 1814/3013] package/ncftp: use correct SPDX license code According to https://spdx.org/licenses/, the correct license code for the "Clarified Artistic License" is ClArtistic. The only other package in Buildroot containing code under this license is google-breakpad, and it is already using the ClArtistic SPDX code. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- package/ncftp/ncftp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index a3aa3fb1940..57c3a5d08b4 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -8,7 +8,7 @@ NCFTP_VERSION = 3.2.7 NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp NCFTP_TARGET_BINS = ncftp -NCFTP_LICENSE = Clarified Artistic License +NCFTP_LICENSE = ClArtistic NCFTP_LICENSE_FILES = doc/LICENSE.txt NCFTP_DEPENDENCIES = host-autoconf From 7d0707cae478461440b328296132b97bb5665b6d Mon Sep 17 00:00:00 2001 From: Matt Staveley-Taylor Date: Mon, 8 Apr 2024 02:38:44 +0100 Subject: [PATCH 1815/3013] package: add support for extracting zstd archives Teach the generic package handling code how to extract zstd (.tar.zst) archives. When zstd is not installed on the host, host-zstd gets built automatically. Signed-off-by: Matt Staveley-Taylor Signed-off-by: Thomas Petazzoni --- Config.in | 7 +++++++ Makefile | 1 + package/pkg-utils.mk | 2 ++ support/dependencies/check-host-zstd.mk | 4 ++++ support/dependencies/check-host-zstd.sh | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 support/dependencies/check-host-zstd.mk create mode 100755 support/dependencies/check-host-zstd.sh diff --git a/Config.in b/Config.in index e0257ba3e8f..df43db7eff1 100644 --- a/Config.in +++ b/Config.in @@ -177,6 +177,13 @@ config BR2_LZCAT Command to be used to extract a lzip'ed file to stdout. Default is "lzip -d -c" +config BR2_ZSTDCAT + string "zstdcat command" + default "zstdcat" + help + Command to be used to extract a zstd'ed file to stdout. + Default is "zstdcat" + config BR2_TAR_OPTIONS string "Tar options" default "" diff --git a/Makefile b/Makefile index db5244baebd..a97ebe78e3b 100644 --- a/Makefile +++ b/Makefile @@ -446,6 +446,7 @@ ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) XZCAT := $(call qstrip,$(BR2_XZCAT)) LZCAT := $(call qstrip,$(BR2_LZCAT)) +ZSTDCAT := $(call qstrip,$(BR2_ZSTDCAT)) TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 3ab9e9fe52c..e8e508e334e 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -59,6 +59,7 @@ INFLATE.tbz = $(BZCAT) INFLATE.tbz2 = $(BZCAT) INFLATE.tgz = $(ZCAT) INFLATE.xz = $(XZCAT) +INFLATE.zst = $(ZSTDCAT) INFLATE.tar = cat # suitable-extractor(filename): returns extractor based on suffix suitable-extractor = $(INFLATE$(suffix $(1))) @@ -66,6 +67,7 @@ suitable-extractor = $(INFLATE$(suffix $(1))) EXTRACTOR_PKG_DEPENDENCY.lzma = $(BR2_XZCAT_HOST_DEPENDENCY) EXTRACTOR_PKG_DEPENDENCY.xz = $(BR2_XZCAT_HOST_DEPENDENCY) EXTRACTOR_PKG_DEPENDENCY.lz = $(BR2_LZIP_HOST_DEPENDENCY) +EXTRACTOR_PKG_DEPENDENCY.zst = $(BR2_ZSTD_HOST_DEPENDENCY) # extractor-pkg-dependency(filename): returns a Buildroot package # dependency needed to extract file based on suffix diff --git a/support/dependencies/check-host-zstd.mk b/support/dependencies/check-host-zstd.mk new file mode 100644 index 00000000000..fa595ef201a --- /dev/null +++ b/support/dependencies/check-host-zstd.mk @@ -0,0 +1,4 @@ +ifeq (,$(call suitable-host-package,zstd,$(ZSTDCAT))) +BR2_ZSTD_HOST_DEPENDENCY = host-zstd +ZSTDCAT = $(HOST_DIR)/bin/zstdcat +endif diff --git a/support/dependencies/check-host-zstd.sh b/support/dependencies/check-host-zstd.sh new file mode 100755 index 00000000000..2f469c46cbc --- /dev/null +++ b/support/dependencies/check-host-zstd.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +candidate="$1" + +zstdcat=$(which "$candidate" 2>/dev/null) +if [ ! -x "$zstdcat" ]; then + zstdcat=$(which zstdcat 2>/dev/null) + if [ ! -x "$zstdcat" ]; then + # echo nothing: no suitable zstdcat found + exit 1 + fi +fi + +echo "$zstdcat" From 6a2b4679accac1cd18030e9e0b76fe76ebf71d43 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 13 Jul 2024 18:30:16 +0200 Subject: [PATCH 1816/3013] configs/ti_am62x_sk: bump Linux to 6.8.12 and U-Boot to 2024.07 The patch bumps the Linux kernel to version 6.8.12 and U-Boot to version 2024.07. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- board/ti/am62x-sk/patches/linux/linux.hash | 2 +- .../am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- board/ti/am62x-sk/patches/uboot/uboot.hash | 2 +- configs/ti_am62x_sk_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash index 2e9aad399eb..5e9df51ecdd 100644 --- a/board/ti/am62x-sk/patches/linux/linux.hash +++ b/board/ti/am62x-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba linux-6.8.8.tar.xz +sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index 97a2b4eaf95..fe9b4f53dc6 100644 --- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/ti/am62x-sk/patches/uboot/uboot.hash b/board/ti/am62x-sk/patches/uboot/uboot.hash index 97a2b4eaf95..fe9b4f53dc6 100644 --- a/board/ti/am62x-sk/patches/uboot/uboot.hash +++ b/board/ti/am62x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 36052dba407..f56669c24fe 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" @@ -27,12 +27,12 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 5d8445138bd466f80dd45dab1b9fb7279f1536eb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:27 +0100 Subject: [PATCH 1817/3013] support/scripts/mkusers: accept user tables without terminating \n Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/scripts/mkusers | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index ee09bbd1f27..08f3344518d 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -409,9 +409,8 @@ main() { fi # Read in all the file in memory, exclude empty lines and comments - while read -r line; do - ENTRIES+=( "${line}" ) - done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) + # mapfile reads all lines, even the last one if it is missing a \n + mapfile -t ENTRIES < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) # We first create groups whose gid is positive, and then we create groups # whose gid is automatic, so that, if a group is defined both with From ac2e6b392791085bc29fa21901265a8eed4ae0ee Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:29 +0100 Subject: [PATCH 1818/3013] support/download/check-hash: accept hash files without terminating \n Lots of people are using broken text editors that 1. do not naturally terminate text files with a final \n as is customary in UNIX text files, and 2. do not respect our .editorconfig settings, which explicitly require adding that final newline. See this nice summary of what a text file is (with references to applicable standards): https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line/12916758#12916758 So, it is not surprising that read does not read the last "line" of a file, when said "line" does not end with a newline, because it is thus not really a line. Even though we do mandate actual text files, let's be a little bit lax in this respect, because people may write packages, and their hash files, in a br2-external tree, and they may not have our .editorconfig in the directory heierarchy (e.g. if buildroot is a submodule of their br2-external tree, or whatever). mapfile does not suffer from this limitation, though, and correctly reads all lines from a file, even the final line-that-is-not-a-line. mapfile was introduced in bash 4.0, released on 2009-01-20, more than 15 years ago. Debian squeeze, released in 2011 already had bash 4.1. Those are really ancient. So, it means we can indeed expect bash version 4.0 or later; which means mapfile is available. "It should be fine!" Fixes: #15976 Reported-by: masonwardle@gmail.com Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/download/check-hash | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/support/download/check-hash b/support/download/check-hash index 9db647885a6..d18ec8b134e 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -78,8 +78,10 @@ nb_checks=0 for h_file in "${h_files[@]}"; do [ -f "${h_file}" ] || continue : $((nb_h_files++)) - # shellcheck disable=SC2094 # we're really reading it only once - while read -r t h f; do + # mapfile reads all lines, even the last one if it is missing a \n + mapfile -t hash_lines <"${h_file}" + for hash_line in "${hash_lines[@]}"; do + read -r t h f <<<"${hash_line}" case "${t}" in ''|'#'*) # Skip comments and empty lines @@ -87,13 +89,12 @@ for h_file in "${h_files[@]}"; do ;; *) if [ "${f}" = "${base}" ]; then - # shellcheck disable=SC2094 # we're only printing the h_file filename check_one_hash "${t}" "${h}" "${file}" "${h_file}" : $((nb_checks++)) fi ;; esac - done <"${h_file}" + done done # shellcheck disable=SC2086 # nb_h_files is a non-empty int From 5c20804afa42cb2efd57a4a333841290d35d9df6 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 12 Jul 2024 17:17:44 +0200 Subject: [PATCH 1819/3013] package/boost: cleanup HOST_BOOST_FLAGS - fix alphabetical ordering - put one module per line - add comment explaining why options are enabled Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle --- package/boost/boost.mk | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 9b1baec5bf7..bb73edfda61 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -13,12 +13,39 @@ BOOST_LICENSE_FILES = LICENSE_1_0.txt BOOST_CPE_ID_VENDOR = boost # keep host variant as minimal as possible +# regex & system are needed by host-riscv-isa-sim HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - contract container coroutine date_time exception fiber filesystem graph \ - graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace test thread timer \ - type_erasure url wave) + --without-libraries=$(subst $(space),$(comma),\ + atomic \ + chrono container \ + context \ + contract \ + coroutine \ + date_time \ + exception \ + fiber \ + filesystem \ + graph \ + graph_parallel \ + iostreams \ + json \ + locale \ + log \ + math \ + mpi \ + nowide \ + program_options \ + python \ + random \ + serialization \ + stacktrace \ + test \ + thread \ + timer \ + type_erasure \ + url \ + wave\ + ) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) From 16abf80368b660b4ec59778ca5060529b77a42c5 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 11 Jul 2024 23:03:41 +0200 Subject: [PATCH 1820/3013] package/boost: cleanup boost-context/fiber/math boost-context - requires C++11 (gcc 4.8) since 1.61 see [0] - dropped the dependency on (boost) thread in 1.77 see [1] boost-fiber - needed C++11 since it's creation in 1.61 [2] boost-math - add comment for gcc version [0] https://www.boost.org/doc/libs/1_82_0/libs/context/doc/html/context/requirements.html [1] https://github.com/boostorg/context/commit/8425e830eab0ad550db937027392c4b4a54df695 [2] https://www.boost.org/doc/libs/1_62_0/libs/fiber/doc/html/fiber/overview.html Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle --- package/boost/Config.in | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 60cc0a11a2f..908a53fea03 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -50,13 +50,14 @@ config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS config BR2_PACKAGE_BOOST_CONTEXT bool "boost-context" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ - || BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - select BR2_PACKAGE_BOOST_THREAD if !BR2_TOOLCHAIN_GCC_AT_LEAST_6 help C++11 context switching library. +comment "boost-context needs a toolchain w/ C++11, gcc>=4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_BOOST_CONTRACT bool "boost-contract" # pthread_condattr_setclock @@ -72,16 +73,20 @@ config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # boost-context depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context, boost-thread select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD help - deprecated coroutine library, the non-depricated coroutine2 + deprecated coroutine library, the non-deprecated coroutine2 library is a header-only library and does not need to be selected. +comment "boost-coroutine needs a toolchain w/ C++11, gcc>=4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + comment "boost-coroutine needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -109,21 +114,20 @@ config BR2_PACKAGE_BOOST_FIBER depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_SYSTEM help C++11 userland threads library. -comment "boost-fiber needs a toolchain w/ NPTL" +comment "boost-fiber needs a toolchain w/ NPTL, C++11, gcc>=4.8" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "boost-fiber needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ - || BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_FILESYSTEM @@ -242,6 +246,9 @@ config BR2_PACKAGE_BOOST_MATH Octonions, like quaternions, are a relative of complex numbers. +comment "boost-math needs a toolchain w/ C++14, gcc>=5.0" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + config BR2_PACKAGE_BOOST_MPI bool "boost-mpi" help From 8fc504e3849cc463da5ec7a581f2cf8fc6ed5eab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jul 2024 20:10:48 +0200 Subject: [PATCH 1821/3013] package/chicken: add CHICKEN_CPE_ID_VENDOR cpe:2.3:a:call-cc:chicken is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6F55B09D-8D4B-4F1C-889C-9B65048AB632 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/chicken/chicken.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/chicken/chicken.mk b/package/chicken/chicken.mk index 9f296a1ce32..2667f7823d8 100644 --- a/package/chicken/chicken.mk +++ b/package/chicken/chicken.mk @@ -8,6 +8,7 @@ CHICKEN_VERSION = 5.3.0 CHICKEN_SITE = https://code.call-cc.org/releases/$(CHICKEN_VERSION) CHICKEN_LICENSE = BSD-3-Clause CHICKEN_LICENSE_FILES = LICENSE +CHICKEN_CPE_ID_VENDOR = call-cc CHICKEN_INSTALL_STAGING = YES # If ARCH is not set, it attempts to autodiscover. But it is anyway not used. From fa241685e7f92311f5fd50ce17c1541748fe285b Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 19 Jun 2024 09:32:52 +0200 Subject: [PATCH 1822/3013] package/attr: add missing libgen.h header Resolves the following error when building against MUSL: tools/attr.c: In function 'main': tools/attr.c:69:20: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration] 69 | progname = basename(argv[0]); | ^~~~~~~~ tools/attr.c:69:18: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 69 | progname = basename(argv[0]); | ^ Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=8a80d895dfd779373363c3a4b62ecce5a549efb2 Fixes: http://autobuild.buildroot.net/results/c61206968eda9913e37e95a61dc3e10399503fcd/ Signed-off-by: Yegor Yefremov [Romain: use upstream patch] Signed-off-by: Romain Naour --- ...-missing-libgen.h-include-for-basena.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch diff --git a/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch b/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch new file mode 100644 index 00000000000..304177257c2 --- /dev/null +++ b/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch @@ -0,0 +1,32 @@ +From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" +Date: Sat, 30 Mar 2024 10:17:10 +0100 +Subject: [PATCH] tools/attr.c: Add missing libgen.h include for basename(3) + +Fixes compilation issue with musl and modern C99 compilers. + +See: https://bugs.gentoo.org/926294 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=8a80d895dfd779373363c3a4b62ecce5a549efb2 + +Signed-off-by: Yegor Yefremov +Signed-off-by: Romain Naour +--- + tools/attr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/attr.c b/tools/attr.c +index f12e4af..6a3c1e9 100644 +--- a/tools/attr.c ++++ b/tools/attr.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.45.0 + From 5513ded8ff80c6647401289a546c269c1cf2bff9 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Wed, 19 Jun 2024 11:13:43 +0100 Subject: [PATCH 1823/3013] configs/versal_vpk180_defconfig: new defconfig This patch adds support for Xilinx Versal VPK180 Evaluation Kit. VPK180 features can be found here: https://www.xilinx.com/products/boards-and-kits/vpk180.html Signed-off-by: Neal Frager Reviewed-by: Brandon Maier Tested-by: Brandon Maier Reviewed-by: Luca Ceresoli Signed-off-by: Romain Naour --- DEVELOPERS | 1 + board/versal/readme.txt | 16 +++++++----- configs/versal_vpk180_defconfig | 44 +++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 configs/versal_vpk180_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 9f67e3b02fa..eea9ba4a80d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2380,6 +2380,7 @@ F: board/zynq/ F: board/zynqmp/ F: boot/xilinx-prebuilt/ F: configs/versal_vck190_defconfig +F: configs/versal_vpk180_defconfig F: configs/zynq_zc702_defconfig F: configs/zynq_zc706_defconfig F: configs/zynqmp_kria_kd240_defconfig diff --git a/board/versal/readme.txt b/board/versal/readme.txt index 9f234be6201..9cf499b35bb 100644 --- a/board/versal/readme.txt +++ b/board/versal/readme.txt @@ -1,16 +1,20 @@ +This document describes the Buildroot support for the following +Xilinx Versal boards: + ****************************************** -Xilinx VCK190 board - Versal +Supported Versal Boards: +Xilinx VCK190 board +Xilinx VPK180 board ****************************************** -This document describes the Buildroot support for the VCK190 -board by Xilinx, based on Versal. It has been tested with the -VCK190 production board. - -Evaluation board features can be found here with the link below. +Evaluation board features can be found here with the links below. VCK190: https://www.xilinx.com/products/boards-and-kits/vck190.html +VPK180: +https://www.xilinx.com/products/boards-and-kits/vpk180.html + How to build it =============== diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig new file mode 100644 index 00000000000..253a6d2cffa --- /dev/null +++ b/configs/versal_vpk180_defconfig @@ -0,0 +1,44 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk180-revA" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="vpk180" +BR2_TARGET_XILINX_PREBUILT_VERSAL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_BOOTGEN=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" From c85e291d40a88c318bf38b8f32793e2069c1039d Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Fri, 10 May 2024 11:45:38 -0500 Subject: [PATCH 1824/3013] configs/ti_am62ax_sk_defconfig: add support for Ti's am62ax-sk Add a board config to support the am62ax-sk reference board for TI's AM62Ax SoC family. Signed-off-by: Bryan Brattlof Tested-by: Paresh Bhagat [Romain: - add Upstream: tag in the kernel patch - use BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62ax" ] Signed-off-by: Romain Naour --- DEVELOPERS | 1 + board/ti/am62ax-sk/genimage.cfg | 33 ++++++++ .../arm-trusted-firmware.hash | 2 + .../patches/linux-headers/linux-headers.hash | 1 + ...-clk-Adding-support-for-non-contiguo.patch | 76 +++++++++++++++++++ board/ti/am62ax-sk/patches/linux/linux.hash | 2 + .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 + board/ti/am62ax-sk/patches/uboot/uboot.hash | 2 + board/ti/am62ax-sk/readme.txt | 39 ++++++++++ configs/ti_am62ax_sk_defconfig | 46 +++++++++++ 10 files changed, 204 insertions(+) create mode 100644 board/ti/am62ax-sk/genimage.cfg create mode 100644 board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/ti/am62ax-sk/patches/linux-headers/linux-headers.hash create mode 100644 board/ti/am62ax-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch create mode 100644 board/ti/am62ax-sk/patches/linux/linux.hash create mode 100644 board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash create mode 100644 board/ti/am62ax-sk/patches/uboot/uboot.hash create mode 100644 board/ti/am62ax-sk/readme.txt create mode 100644 configs/ti_am62ax_sk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index eea9ba4a80d..9539b607247 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -566,6 +566,7 @@ F: board/beagleboard/beagleplay/ F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-r5-loader/ F: configs/beagleplay_defconfig +F: configs/ti_am62ax_sk_defconfig F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig diff --git a/board/ti/am62ax-sk/genimage.cfg b/board/ti/am62ax-sk/genimage.cfg new file mode 100644 index 00000000000..70d38faa589 --- /dev/null +++ b/board/ti/am62ax-sk/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "k3-am62a7-sk.dtb", + "Image" + } + + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..8f60864fbf6 --- /dev/null +++ b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz diff --git a/board/ti/am62ax-sk/patches/linux-headers/linux-headers.hash b/board/ti/am62ax-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/ti/am62ax-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/ti/am62ax-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch b/board/ti/am62ax-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch new file mode 100644 index 00000000000..2f3d80c86dc --- /dev/null +++ b/board/ti/am62ax-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch @@ -0,0 +1,76 @@ +From 750cdf4cb6791c45d479ed73a97728100394fb32 Mon Sep 17 00:00:00 2001 +From: Udit Kumar +Date: Tue, 13 Feb 2024 13:56:40 +0530 +Subject: [PATCH] clk: keystone: sci-clk: Adding support for non contiguous + clocks +X-Developer-Signature: v=1; a=openpgp-sha256; l=1876; i=bb@ti.com; + h=from:subject; bh=CKSvD6FpqwRzx8blynhoCEc3XUR5TlwjFJdcgjQwpgg=; + b=owNCWmg5MUFZJlNZHYzOLwAAZP/////7puP/r7v/9q9s+8t7wa8/97UZO//d+XvPsvfv2/+wA + RsYHaQAAAAAAAAGg09IPUGmgAaAANBoAAAGmnqAPU9Q0DQ0HqMQDQ8ptTeqeogaABoPU0NAPUAA + 0GgDJ6gANAAMg0GmgNGgDEGh6jR6h6hp6mgepoPU2oDTIGho0IaHqA00yDQNBoGTRoDTRkAZNAD + AmTIBkGjIGmQyAZDRkAaANAYIxBk0DQAAHODcFn1CAGBsJeG8ZtU3FQCBdLH7LjDIouHeAszY1j + AFkqjaWIFXEVi8NV3giRplb1JjCYunXimTaK06SgQRYsUGRSbKOVQP2t1LlAYS93QjOMWF6CHXK + 69KzHyBDpXR2mHAAkHcHX0X3SAYJkxPElwJ1ZnHK1RfDKRfJcRQKzxnryM+4x2mCxpIFIIjpVLk + nItd1Vl1SEF2QiWZIYV4b0lawcUqLGgTQZ0+qpJ5QORYrvPXE4DR89JlJYBU4DjxAoyACH6KN0o + AiaknqZTfMwmF8iREpU4SgDEVun3X3OFlkBp3hBO+Ynb12GJoLSFBSz9IWE2ooLKFalh5XJMZfl + +GthEEOnlrMQHOF8qCr+JAKqXEqSrwLGuEIMFbnGEjJYruo4ENGOmGVlkvW+kLRp5ibCXAAcDMM + TPOUZ/i7kinChIDsZnF4A== +X-Developer-Key: i=bb@ti.com; a=openpgp; + fpr=D3D177E40A38DF4D1853FEEF41B90D5D71D56CE0 + +Most of clocks and their parents are defined in contiguous range, +But in few cases, there is gap in clock numbers[0]. +Driver assumes clocks to be in contiguous range, and add their clock +ids incrementally. + +New firmware started returning error while calling get_freq and is_on +API for non-available clock ids. + +In this fix, driver checks and adds only valid clock ids. + +[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html +Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present. + +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ad3ac13c6ec318b43e769cc9ffde67528e58e555 + +Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks") +Signed-off-by: Udit Kumar +Reviewed-by: Nishanth Menon +Signed-off-by: Bryan Brattlof +--- + drivers/clk/keystone/sci-clk.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c +index 35fe197dd303c..eb2ef44869b23 100644 +--- a/drivers/clk/keystone/sci-clk.c ++++ b/drivers/clk/keystone/sci-clk.c +@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) + struct sci_clk *sci_clk, *prev; + int num_clks = 0; + int num_parents; ++ bool state; + int clk_id; + const char * const clk_names[] = { + "clocks", "assigned-clocks", "assigned-clock-parents", NULL +@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) + clk_id = args.args[1] + 1; + + while (num_parents--) { ++ /* Check if this clock id is valid */ ++ ret = provider->ops->is_auto(provider->sci, ++ sci_clk->dev_id, clk_id, &state); ++ ++ if (ret) { ++ clk_id++; ++ continue; ++ } ++ + sci_clk = devm_kzalloc(dev, + sizeof(*sci_clk), + GFP_KERNEL); + +base-commit: 9fbb5fcb41e7e96fb8769a9f5a12a35a984c23bd +-- +2.43.2 + diff --git a/board/ti/am62ax-sk/patches/linux/linux.hash b/board/ti/am62ax-sk/patches/linux/linux.hash new file mode 100644 index 00000000000..2e9aad399eb --- /dev/null +++ b/board/ti/am62ax-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba linux-6.8.8.tar.xz diff --git a/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 00000000000..75de6acf93b --- /dev/null +++ b/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am62ax-sk/patches/uboot/uboot.hash b/board/ti/am62ax-sk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..6f8624c3cc8 --- /dev/null +++ b/board/ti/am62ax-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am62ax-sk/readme.txt b/board/ti/am62ax-sk/readme.txt new file mode 100644 index 00000000000..d7d529c180b --- /dev/null +++ b/board/ti/am62ax-sk/readme.txt @@ -0,0 +1,39 @@ +Texas Instuments SK-AM62A Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM62A +board: https://www.ti.com/tool/SK-AM62A-LP + +How to Build +============ + +Select the default configuration for the target: + +$ make ti_am62ax_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am62ax-{gp/hs-fs/hs}-evm.bin) used on the board. +Use the BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN to name which tiboot3.bin +security variant we want to use. + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62A board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled UART to +communicate with the board. diff --git a/configs/ti_am62ax_sk_defconfig b/configs/ti_am62ax_sk_defconfig new file mode 100644 index 00000000000..25735c28ab2 --- /dev/null +++ b/configs/ti_am62ax_sk_defconfig @@ -0,0 +1,46 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_GLOBAL_PATCH_DIR="board/ti/am62ax-sk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am62a7-sk.dtb -l am62ax-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62ax-sk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.8" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am62a7-sk" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62ax" +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62ax_evm_r5" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62ax_evm_a53" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 2da40a2fd7a0007ff1a51bc957980f516746a6ad Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 8 Feb 2024 21:15:59 +0100 Subject: [PATCH 1825/3013] support/testing: add attr runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + support/testing/tests/package/test_attr.py | 75 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 support/testing/tests/package/test_attr.py diff --git a/DEVELOPERS b/DEVELOPERS index 9539b607247..2650fb7f48e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1822,6 +1822,7 @@ F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py +F: support/testing/tests/package/test_attr.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_bcc.py F: support/testing/tests/package/test_bcc/ diff --git a/support/testing/tests/package/test_attr.py b/support/testing/tests/package/test_attr.py new file mode 100644 index 00000000000..1b43f7daf68 --- /dev/null +++ b/support/testing/tests/package/test_attr.py @@ -0,0 +1,75 @@ +import os + + +import infra.basetest + + +class TestAttr(infra.basetest.BRTest): + # Note: this test uses extended attributes (xattr). We use a ext4 + # rootfs (which fully supports xattrs). Note that tmpfs has + # partial support of xattrs, and cpio initrd has not. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ATTR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk_file = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv5", + kernel="builtin", + kernel_cmdline=["rootwait", "root=/dev/sda"], + options=["-drive", f"file={disk_file},if=scsi,format=raw"]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfattr --version") + self.assertRunOk("setfattr --version") + + test_file = "/root/file.txt" + attr_name = "buildroot" + attr_value = "is-great" + + # Create a test file. + self.assertRunOk(f"echo 'Hello Buildroot!' > {test_file}") + + # Set an extended attribute. + cmd = f"setfattr -n user.{attr_name} -v {attr_value} {test_file}" + self.assertRunOk(cmd) + + # Read back the attribute value. We add an extra "echo" to add + # a new line. getfattr --only-values prints raw attribute + # values and lack of a new line. + cmd = "getfattr" + cmd += f" -n user.{attr_name} --absolute-names --only-values" + cmd += f" {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # We read back the attribute value again, but with the "attr" + # command this time. + cmd = f"attr -q -g {attr_name} {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # List extended attributes with "attr", and check we see our + # test attribute. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn(attr_name, "\n".join(out)) + + # Remove the test attribute with setfattr. + cmd = f"setfattr -x user.{attr_name} {test_file}" + self.assertRunOk(cmd) + + # We check the test attribute is no longer listed by the attr + # command. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertNotIn(attr_name, "\n".join(out)) From d429d5d399acc9921a9a86f4ae3d589d599605e4 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 01:00:57 +0100 Subject: [PATCH 1826/3013] support/testing: add python-msgpack runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- .../testing/tests/package/sample_python_msgpack.py | 5 +++++ support/testing/tests/package/test_python_msgpack.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 support/testing/tests/package/sample_python_msgpack.py create mode 100644 support/testing/tests/package/test_python_msgpack.py diff --git a/support/testing/tests/package/sample_python_msgpack.py b/support/testing/tests/package/sample_python_msgpack.py new file mode 100644 index 00000000000..1940f708214 --- /dev/null +++ b/support/testing/tests/package/sample_python_msgpack.py @@ -0,0 +1,5 @@ +import msgpack + +packaed = msgpack.packb([1, 2, 3], use_bin_type=True) + +assert msgpack.unpackb(packaed, raw=False) == [1, 2, 3] diff --git a/support/testing/tests/package/test_python_msgpack.py b/support/testing/tests/package/test_python_msgpack.py new file mode 100644 index 00000000000..e5876e400d8 --- /dev/null +++ b/support/testing/tests/package/test_python_msgpack.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MsgPack(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MSGPACK=y + """ + sample_scripts = ["tests/package/sample_python_msgpack.py"] + timeout = 40 From 1fa58814c09a71444f961b61a9a2c399b9163fc2 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 7 Feb 2024 20:31:22 +0100 Subject: [PATCH 1827/3013] package/cairo: move to the meson build system - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy since they are not selectable anymore in the meson-build options. BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG option already selects that one. This is now in sync with the meson build options. - Note that the dependencies for the various options are slightly changed, but there is not much mentioned about that, the meson introduction is done in one big commit: [1]. - Added xlib_libXrender dependency, which was optional when using autotools (--enable-xlib-xrender), but became mandatory when using meson [2]. - Added two patches to fix cross compiling, upstream: [3] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/596a82f2d185b101bd74645492821fe2f9e0daa0 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/blame/1.17.4/meson.build#L277 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 Signed-off-by: Thomas Devoogdt [Arnout: edit patch 0005 so it applies with fuzz 0] Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 35 ++++ ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 +++++++ ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 41 +++++ package/cairo/Config.in | 28 +-- package/cairo/cairo.mk | 160 +++++------------- package/libgtk2/Config.in | 5 +- package/libgtk3/Config.in | 5 +- package/librsvg/Config.in | 2 +- package/libsvg-cairo/Config.in | 2 +- package/rrdtool/Config.in | 4 +- 10 files changed, 194 insertions(+), 150 deletions(-) create mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch create mode 100644 package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/Config.in.legacy b/Config.in.legacy index d942576d1e8..414a14944ee 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,41 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged into cairo zlib. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged into cairo zlib. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged into cairo zlib. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged into cairo zlib. + config BR2_GDB_VERSION_12 bool "gdb 12.x has been removed" select BR2_LEGACY diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch new file mode 100644 index 00000000000..193a2103912 --- /dev/null +++ b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch @@ -0,0 +1,62 @@ +From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 25 Feb 2021 10:52:45 +0000 +Subject: [PATCH] meson: allow skipping of run check for + IPC_RMID_DEFERRED_RELEASE + +The run check is particularly annoying in cross-compile scenarios, +so allow bypassing the check by having the user provide the value +via a cross file or native file: + + [properties] + ipc_rmid_deferred_release = true + +Closes #408 + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b159b4071..5f593e54d 100644 +--- a/meson.build ++++ b/meson.build +@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() + ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], + ] + deps += [x11_dep, xext_dep] +- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), +- dependencies: [x11_dep, xext_dep], +- name: 'shmctl IPC_RMID allowes subsequent attaches') + +- if res.returncode() == 0 +- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) ++ # Can skip the run check by providing the result in a cross file or ++ # native file as bool property value. ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ # We don't know the type of prop (bool, string) but need to differentiate ++ # between a set value (bool) or the fallback value (string), so convert to ++ # a string and chec the string value. ++ prop_str = '@0@'.format(prop) ++ if prop_str in ['true', 'false'] ++ ipc_rmid_deferred_release = (prop_str == 'true') ++ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) ++ elif prop_str == 'auto' ++ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), ++ dependencies: [x11_dep, xext_dep], ++ name: 'shmctl IPC_RMID allowes subsequent attaches') ++ ++ ipc_rmid_deferred_release = (res.returncode() == 0) ++ else ++ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) + endif ++ ++ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) + endif + + if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 +-- +2.34.1 + diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch new file mode 100644 index 00000000000..ce0e7919b60 --- /dev/null +++ b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -0,0 +1,41 @@ +From 8d5037ed642b02cdb018e49866aa286f30a7b59a Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 5 Feb 2024 17:47:07 +0100 +Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when + cross-compiling + +../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: +ERROR: Can not run test applications in this cross environment. + +Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define +ipc_rmid_deferred_release in a cross-compile config, but still kept +the default to auto, which anyhow results in an error when cross-compiling. + +There is only one usage of the ipc_rmid_deferred_release compile declarative +which was originally added in this commit: 5041b462d084de8552336275914d30c23bf5dd35. + +If ipc_rmid_deferred_release is set to FALSE, an additional XSync is performed. +This doesn't sound very harmful, so that is why this commit defaults to FALSE +and thus avoids any cross-compile errors. + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9efe91978..6a670bf94 100644 +--- a/meson.build ++++ b/meson.build +@@ -267,7 +267,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and chec the string value. +-- +2.34.1 diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 0c87a2904b2..c41a12fe81b 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include @@ -15,34 +16,15 @@ config BR2_PACKAGE_CAIRO if BR2_PACKAGE_CAIRO -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - config BR2_PACKAGE_CAIRO_PNG - bool "png support" + bool "png support (png and svg surfaces)" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_TEE bool "tee support" -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG +config BR2_PACKAGE_CAIRO_ZLIB + bool "zlib support (script, ps, pdf, and xml surfaces)" + select BR2_PACKAGE_ZLIB endif diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4515b760752..3d2a67a6c52 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -17,168 +17,96 @@ CAIRO_IGNORE_CVES += CVE-2019-6462 # 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 -CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" +CAIRO_CFLAGS = $(TARGET_CFLAGS) +CAIRO_LDFLAGS = $(TARGET_LDFLAGS) # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +CAIRO_CFLAGS += -mxgot endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_LIBS += -latomic +CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman + -Dfontconfig=enabled \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 +CAIRO_DEPENDENCIES = \ + host-pkgconf \ + fontconfig \ + pixman # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --enable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --enable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dpng=enabled \ + -Dtee=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dzlib=enabled \ + -Dtests=disabled \ + -Dglib=enabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ host-libglib2 \ host-libpng \ host-pixman \ - host-pkgconf + host-pkgconf \ + host-zlib -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb +ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_DEPENDENCIES += lzo endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft +CAIRO_CONF_OPTS += -Dfreetype=enabled CAIRO_DEPENDENCIES += freetype else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -CAIRO_DEPENDENCIES += libexecinfo -CAIRO_LIBS += -lexecinfo +CAIRO_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject +CAIRO_CONF_OPTS += -Dglib=enabled CAIRO_DEPENDENCIES += libglib2 else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo +CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png +CAIRO_CONF_OPTS += -Dpng=enabled CAIRO_DEPENDENCIES += libpng else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg +CAIRO_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee +CAIRO_CONF_OPTS += -Dtee=enabled else -CAIRO_CONF_OPTS += --disable-tee +CAIRO_CONF_OPTS += -Dtee=disabled endif -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml +ifeq ($(BR2_PACKAGE_CAIRO_ZLIB),y) +CAIRO_CONF_OPTS += -Dzlib=enabled +CAIRO_DEPENDENCIES += zlib else -CAIRO_CONF_OPTS += --disable-xml +CAIRO_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index f2888b2f518..f8821ba246a 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index c07957076e8..52ee50db492 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -25,9 +25,8 @@ config BR2_PACKAGE_LIBGTK3 BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 270b524b376..d74359dfc91 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_SCRIPT + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in index 9577c69bf03..4602e93c2ae 100644 --- a/package/libsvg-cairo/Config.in +++ b/package/libsvg-cairo/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG_CAIRO bool "libsvg-cairo" select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBSVG help Libsvg-cairo provides the ability to render SVG content from diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5ffdc926185..d954fd1214d 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -19,10 +19,8 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_PANGO help This enables the graphing capabilities ('rrdgraph'). From f041540ef5b7b22b77906aaf55a7837a343f3a33 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 7 Feb 2024 20:31:23 +0100 Subject: [PATCH 1828/3013] package/cairo: bump to 1.18.0 News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/3468c67fe91f0c37e0ec5d335082653a6fa609b6 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be [4]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 Signed-off-by: Thomas Devoogdt [Arnout: fix patch so it has fuzz 0] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 - ...or_tolerance_normalized-fix-infinite.patch | 39 ------------ ...rivate.h-fix-missing-FT_Color-error.patch} | 0 ...2-Fix-mask-usage-in-image-compositor.patch | 56 ----------------- ...-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} | 4 +- ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 ------------------- package/cairo/cairo.hash | 6 +- package/cairo/cairo.mk | 21 ++++--- 8 files changed, 16 insertions(+), 174 deletions(-) delete mode 100644 package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename package/cairo/{0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch => 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch} (100%) delete mode 100644 package/cairo/0002-Fix-mask-usage-in-image-compositor.patch rename package/cairo/{0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch => 0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} (94%) delete mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8ed68f580fb..2f229b931ad 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -387,8 +387,6 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch lib_pat package/c-icap/S96cicap Shellcheck lib_sysv.Indent lib_sysv.Variables package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch lib_patch.Upstream package/cache-calibrator/0001-Fix-conflicting-round-function.patch lib_patch.Upstream -package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch lib_patch.Upstream -package/cairo/0002-Fix-mask-usage-in-image-compositor.patch lib_patch.Upstream package/caps/0001-Fix-stdint-types-with-musl.patch lib_patch.Upstream package/cdrkit/0001-fix-build-with-uClibc.patch lib_patch.Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch lib_patch.Upstream diff --git a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch deleted file mode 100644 index 078e90fa423..00000000000 --- a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] -Signed-off-by: Quentin Schulz ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch similarity index 100% rename from package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch rename to package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch diff --git a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch deleted file mode 100644 index 54a95593c5f..00000000000 --- a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[Retrieved from -https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] -[Removed changes in test/ directory to remove binary diff so that the -patch can be applied by `patch` tool] -Signed-off-by: Quentin Schulz ---- - src/cairo-image-compositor.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index bbf4cf228..2352c478e 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; --- -2.38.1 - diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch similarity index 94% rename from package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch rename to package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch index ce0e7919b60..5a5c438a97e 100644 --- a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch +++ b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -28,7 +28,7 @@ diff --git a/meson.build b/meson.build index 9efe91978..6a670bf94 100644 --- a/meson.build +++ b/meson.build -@@ -267,7 +267,7 @@ if x11_dep.found() and xext_dep.found() +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() # Can skip the run check by providing the result in a cross file or # native file as bool property value. @@ -36,6 +36,6 @@ index 9efe91978..6a670bf94 100644 + prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto') # We don't know the type of prop (bool, string) but need to differentiate # between a set value (bool) or the fallback value (string), so convert to - # a string and chec the string value. + # a string and check the string value. -- 2.34.1 diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch deleted file mode 100644 index 193a2103912..00000000000 --- a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 25 Feb 2021 10:52:45 +0000 -Subject: [PATCH] meson: allow skipping of run check for - IPC_RMID_DEFERRED_RELEASE - -The run check is particularly annoying in cross-compile scenarios, -so allow bypassing the check by having the user provide the value -via a cross file or native file: - - [properties] - ipc_rmid_deferred_release = true - -Closes #408 - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index b159b4071..5f593e54d 100644 ---- a/meson.build -+++ b/meson.build -@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() - ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], - ] - deps += [x11_dep, xext_dep] -- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -- dependencies: [x11_dep, xext_dep], -- name: 'shmctl IPC_RMID allowes subsequent attaches') - -- if res.returncode() == 0 -- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) -+ # Can skip the run check by providing the result in a cross file or -+ # native file as bool property value. -+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ # We don't know the type of prop (bool, string) but need to differentiate -+ # between a set value (bool) or the fallback value (string), so convert to -+ # a string and chec the string value. -+ prop_str = '@0@'.format(prop) -+ if prop_str in ['true', 'false'] -+ ipc_rmid_deferred_release = (prop_str == 'true') -+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) -+ elif prop_str == 'auto' -+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -+ dependencies: [x11_dep, xext_dep], -+ name: 'shmctl IPC_RMID allowes subsequent attaches') -+ -+ ipc_rmid_deferred_release = (res.returncode() == 0) -+ else -+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) - endif -+ -+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) - endif - - if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 --- -2.34.1 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index fca9ff678c4..df9c693bad7 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,5 @@ -# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 -sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz -# Calculated based on the hash above -sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum +sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 3d2a67a6c52..4ace04ebbe7 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,14 @@ # ################################################################################ -CAIRO_VERSION = 1.17.4 +CAIRO_VERSION = 1.18.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES -# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch -CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0002-Fix-mask-usage-in-image-compositor.patch -CAIRO_IGNORE_CVES += CVE-2020-35492 - CAIRO_CFLAGS = $(TARGET_CFLAGS) CAIRO_LDFLAGS = $(TARGET_LDFLAGS) @@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ + -Dquartz=disabled \ -Dtests=disabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 CAIRO_DEPENDENCIES = \ host-pkgconf \ @@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \ # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ -Dfreetype=enabled \ -Dpng=enabled \ + -Dquartz=disabled \ -Dtee=disabled \ -Dxcb=disabled \ -Dxlib=disabled \ @@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dglib=enabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ @@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) From b3410239818fd8b03c41d9a75806ad6b5032e6bb Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Wed, 5 Jun 2024 13:13:46 +0200 Subject: [PATCH 1829/3013] package/busybox: add crond init script The init script will be installed only if no other package provides cron (currently that could be package/dcron). Our current default location for crontabs was the Busybox default of /var/spool/cron/, but /var/spool is stored on tmpfs. This isn't convenient as crontabs should normally be persistent, so we change this default to /etc/cron, which is much more sensible. We also create it to make sure to create this directory. Signed-off-by: Fiona Klute [Thomas: - Change default location of crontab - Rework init script according to the latest coding style rules] Signed-off-by: Thomas Petazzoni --- package/busybox/S50crond | 60 ++++++++++++++++++++++++++++++++++ package/busybox/busybox.config | 2 +- package/busybox/busybox.mk | 14 ++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 package/busybox/S50crond diff --git a/package/busybox/S50crond b/package/busybox/S50crond new file mode 100644 index 00000000000..74a0c0849bc --- /dev/null +++ b/package/busybox/S50crond @@ -0,0 +1,60 @@ +#!/bin/sh + +DAEMON="crond" +PIDFILE="/var/run/$DAEMON.pid" + +CROND_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +# BusyBox' crond does not create a pidfile, so pass "-f" on the crond +# command line and use "--make-pidfile" to instruct start-stop-daemon +# to create one. +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" \ + -- -f $CROND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/sbin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 35c01181bd4..69d896bebdf 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -782,7 +782,7 @@ CONFIG_CROND=y # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set CONFIG_FEATURE_CROND_SPECIAL_TIMES=y -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_FEATURE_CROND_DIR="/etc/cron" CONFIG_CRONTAB=y # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index eb5e7ad9222..f1e0a7e6da3 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -312,6 +312,18 @@ define BUSYBOX_INSTALL_SYSCTL_SCRIPT endef endif +# Only install our crond script if no other package does it. +ifeq ($(BR2_PACKAGE_DCRON),) +define BUSYBOX_INSTALL_CROND_SCRIPT + if grep -q CONFIG_CROND=y $(@D)/.config; \ + then \ + mkdir -p $(TARGET_DIR)/etc/cron/crontabs ; \ + $(INSTALL) -m 0755 -D package/busybox/S50crond \ + $(TARGET_DIR)/etc/init.d/S50crond; \ + fi; +endef +endif + ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_INSTALL_INITTAB if test ! -e $(TARGET_DIR)/etc/inittab; then \ @@ -407,6 +419,7 @@ define BUSYBOX_INSTALL_INIT_OPENRC $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) endef @@ -419,6 +432,7 @@ define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) $(BUSYBOX_INSTALL_SYSCTL_SCRIPT) + $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) endef From 8841eb005d90e7e49bc0c9bb64a48fa468f2b1db Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Wed, 5 Jun 2024 13:13:47 +0200 Subject: [PATCH 1830/3013] package/busybox: add ifplugd init script The init script will be installed only if no other package provides ifplugd (currently that could be package/ifplugd). Users can configure the interface(s) which ifplugd should watch either using /etc/default/ifplugd (for one interface) or using per-interface symlinks to the script in /etc/init.d (for any number of interfaces). The action script that ifplugd runs when a link change is detected must be supplied separately. Signed-off-by: Fiona Klute Signed-off-by: Thomas Petazzoni --- package/busybox/S41ifplugd | 85 ++++++++++++++++++++++++++++++++++++++ package/busybox/busybox.mk | 13 ++++++ 2 files changed, 98 insertions(+) create mode 100644 package/busybox/S41ifplugd diff --git a/package/busybox/S41ifplugd b/package/busybox/S41ifplugd new file mode 100644 index 00000000000..8c2c1a50388 --- /dev/null +++ b/package/busybox/S41ifplugd @@ -0,0 +1,85 @@ +#!/bin/sh + +DAEMON="ifplugd" + +# Each ifplugd instance handles only one interface, so this script is +# designed to be symlinked per interface. For each interface create a +# symlink with .IFACE appended to the name. E.g. to launch ifplugd for +# eth1 create a symlink from /etc/init.d/S41ifplugd.eth1 to this +# script. DEFAULT_IFACE sets the interface the non-symlink script will +# use, set it to empty in /etc/default/ifplugd to disable the default +# instance and use symlinked instances only. +DEFAULT_IFACE="eth0" +# If your action script is not in the default location +# /etc/ifplugd/ifplugd.action, use the "-r" option to set the +# location. +IFPLUGD_ARGS="-M" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +NAME_IFACE="$(basename "$0" | cut -s -d. -f2)" +if [ -n "$NAME_IFACE" ]; then + IFACE="${NAME_IFACE}" +elif [ -n "$DEFAULT_IFACE" ]; then + IFACE="${DEFAULT_IFACE}" +else + # no interface configured + exit 0 +fi + +# check-package disable Variables +PIDFILE="/var/run/${DAEMON}.${IFACE}.pid" +IFPLUGD_ARGS="${IFPLUGD_ARGS} -i ${IFACE}" + +# BusyBox' ifplugd does not create a pidfile, so pass "-n" in the +# command line and use "--make-pidfile" to instruct start-stop-daemon +# to create one. +start() { + printf 'Starting %s for %s: ' "$DAEMON" "$IFACE" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" \ + -- -n $IFPLUGD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s for %s: ' "$DAEMON" "$IFACE" + start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + return "$status" + fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/sbin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f1e0a7e6da3..6c20a98d2d3 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -324,6 +324,17 @@ define BUSYBOX_INSTALL_CROND_SCRIPT endef endif +# Only install our ifplugd script if no other package does it. +ifeq ($(BR2_PACKAGE_IFPLUGD),) +define BUSYBOX_INSTALL_IFPLUGD_SCRIPT + if grep -q CONFIG_IFPLUGD=y $(@D)/.config; \ + then \ + $(INSTALL) -m 0755 -D package/busybox/S41ifplugd \ + $(TARGET_DIR)/etc/init.d/S41ifplugd; \ + fi; +endef +endif + ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_INSTALL_INITTAB if test ! -e $(TARGET_DIR)/etc/inittab; then \ @@ -419,6 +430,7 @@ define BUSYBOX_INSTALL_INIT_OPENRC $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_IFPLUGD_SCRIPT) $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) endef @@ -432,6 +444,7 @@ define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) $(BUSYBOX_INSTALL_SYSCTL_SCRIPT) + $(BUSYBOX_INSTALL_IFPLUGD_SCRIPT) $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) endef From 455637e8010840ee76c6ad8ae36c189606919262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Apr 2024 10:57:32 +0200 Subject: [PATCH 1831/3013] package/dbus: set runstatedir to /run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DBus 1.14.x now has the Containers1 interface which uses path in runstatedir (by default set to /var/run) for creating sockets. With the default, Systemd complains about it being a legacy directory: systemd-tmpfiles[102]: /usr/lib/tmpfiles.d/dbus.conf:13: Line references path below legacy directory /var/run/, updating /var/run/dbus/containers → /run/dbus/containers; please update the tmpfiles.d/ drop-in file accordingly. Set the configure option runstatedir to /run to use the preferred path to avoid the warning and use the /run directory consistently. Setting the value only affects the path of these sockets and to the PID file, which is already explicitly set by another option. We already tried to set the --runstatedir option globally, but that confuses older autotools, so in the end it got reverted in c8af4eef4982ada8f890eea9fb15fee51e1db4fd. Signed-off-by: Jan Čermák Signed-off-by: Arnout Vandecappelle --- package/dbus/dbus.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 097b89205e0..c60bf473cd3 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -33,7 +33,8 @@ DBUS_CONF_OPTS = \ --disable-xml-docs \ --disable-doxygen-docs \ --with-system-socket=/run/dbus/system_bus_socket \ - --with-system-pid-file=/run/messagebus.pid + --with-system-pid-file=/run/messagebus.pid \ + --runstatedir=/run ifeq ($(BR2_STATIC_LIBS),y) DBUS_CONF_OPTS += LIBS='-pthread' From 9a66711be1786b90f94cbb1648fa470def3486f8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Jun 2024 23:09:38 +0200 Subject: [PATCH 1832/3013] package/tar: fix linking with libiconv Backport two patches from upstream to fix linking with libiconv, e.g. with this defconfig: BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_SYSTEM_ENABLE_NLS=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_LIBICONV=y BR2_PACKAGE_TAR=y It is interesting to note that the first patch we backport is the first commit in the tar repository after the 1.35 tag, and was comitted the same day the release was cut... Fixes: https://gitlab.com/buildroot.org/buildroot/-/issues/4 http://autobuild.buildroot.net/results/c074c2e22a7f764400ecc7dd1a6cd6022fa87fb9/ Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- .../tar/0002-Fix-savannah-bug-#64441.patch | 28 +++++++++++++++++ package/tar/0003-tests-fix-LDADD.patch | 30 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 package/tar/0002-Fix-savannah-bug-#64441.patch create mode 100644 package/tar/0003-tests-fix-LDADD.patch diff --git a/package/tar/0002-Fix-savannah-bug-#64441.patch b/package/tar/0002-Fix-savannah-bug-#64441.patch new file mode 100644 index 00000000000..049e08c27b6 --- /dev/null +++ b/package/tar/0002-Fix-savannah-bug-#64441.patch @@ -0,0 +1,28 @@ +From 8632df398b2f548465ebe68b8f494c0d6f8d913d Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Tue, 18 Jul 2023 17:02:23 +0300 +Subject: Fix savannah bug #64441 + +* src/Makefile.am (tar_LDADD): Add libiconv libraries. + +[yann.morin.1998@free.fr: backport from upstream] +Upstream: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=8632df398b2f548465ebe68b8f494c0d6f8d913d +Signed-off-by: Yann E. MORIN +--- + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 36c9543..e2ec58d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,4 +52,5 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) + tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\ + $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\ + $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\ +- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) ++ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \ ++ $(LIBINTL) $(LIBICONV) +-- +cgit v1.1 + diff --git a/package/tar/0003-tests-fix-LDADD.patch b/package/tar/0003-tests-fix-LDADD.patch new file mode 100644 index 00000000000..c00f14d2c1c --- /dev/null +++ b/package/tar/0003-tests-fix-LDADD.patch @@ -0,0 +1,30 @@ +From 71530f72d21d9af00b5688948111666f62f5ec4b Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 19 Jul 2023 15:48:25 -0700 +Subject: tests: fix LDADD + +Problem reported by Christian Weisgerber in: +https://lists.gnu.org/r/bug-tar/2023-07/msg00015.html +* tests/Makefile.am (LDADD): Add $(LIBINTL), $(LIBICONV). + +[yann.morin.1998@free.fr: backport from upstream] +Upstream: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=71530f72d21d9af00b5688948111666f62f5ec4b +Signed-off-by: Yann E. MORIN +--- + tests/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 1884b72..b696f01 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -337,4 +337,5 @@ AM_CPPFLAGS = \ + LDADD = ../gnu/libgnu.a\ + $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\ + $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\ +- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) ++ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \ ++ $(LIBINTL) $(LIBICONV) +-- +cgit v1.1 + From a14c862c08865e053d5fce90a0d0323b8f9e4bc0 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 26 Jun 2024 16:49:01 +0000 Subject: [PATCH 1833/3013] Create a .gitignore file in the CANONICAL_O directory This .gitignore file ignores all files in an output directory and hence doesn't change the git status. Remove "/output" entry from the main .gitignore file as it is already handled by this general approach. Signed-off-by: Yegor Yefremov Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- .gitignore | 1 - Makefile | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f5727..14b7ca5040f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index a97ebe78e3b..faaf0f165c3 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) $(error The build directory can not contain a '@') endif +# Create a default .gitignore file that ignores everything +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") + CANONICAL_CURDIR = $(realpath $(CURDIR)) REQ_UMASK = 0022 From 95013777cf93548eee7ac3010b513d354e8b0a30 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 11:12:14 +0200 Subject: [PATCH 1834/3013] package/dhrystone: cleanup patch stack dhrystone is basically a dead project, so there is no Git repo available anywhere, no new release, nothing. Despite that, let's reformat the patches with "git format-patch", keep the original authorship but add my SoB since I'm reintroducing the patches, and indicate the Upstream: status. Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 5 ---- ...y-the-number-of-runs-on-the-command.patch} | 22 ++++++++++---- ...m-system-rather-than-requiring-via-C.patch | 29 +++++++++++++++++++ package/dhrystone/0002-HZ.patch | 17 ----------- package/dhrystone/0003-exit.patch | 14 --------- ...trust-the-exit-status-of-the-program.patch | 26 +++++++++++++++++ ...et-prototypes-for-malloc-exit-strcpy.patch | 27 +++++++++++++++++ package/dhrystone/0004-headers.patch | 15 ---------- ...-with-C-library-using-NO_PROTOTYPES.patch} | 20 ++++++++++--- 9 files changed, 115 insertions(+), 60 deletions(-) rename package/dhrystone/{0001-cmdline-nruns.patch => 0001-let-people-specify-the-number-of-runs-on-the-command.patch} (66%) create mode 100644 package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch delete mode 100644 package/dhrystone/0002-HZ.patch delete mode 100644 package/dhrystone/0003-exit.patch create mode 100644 package/dhrystone/0003-trust-the-exit-status-of-the-program.patch create mode 100644 package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch delete mode 100644 package/dhrystone/0004-headers.patch rename package/dhrystone/{0005-prototypes.patch => 0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch} (59%) diff --git a/.checkpackageignore b/.checkpackageignore index 2f229b931ad..0613483a135 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -444,11 +444,6 @@ package/dhcp/S80dhcp-relay Shellcheck lib_sysv.Variables package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables -package/dhrystone/0001-cmdline-nruns.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0002-HZ.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0003-exit.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0004-headers.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0005-prototypes.patch lib_patch.Sob lib_patch.Upstream package/dht/0001-cmake.patch lib_patch.Upstream package/dillo/0001-usr-local-include.patch lib_patch.Upstream package/dillo/0002-Fix-openssl-detection.patch lib_patch.Upstream diff --git a/package/dhrystone/0001-cmdline-nruns.patch b/package/dhrystone/0001-let-people-specify-the-number-of-runs-on-the-command.patch similarity index 66% rename from package/dhrystone/0001-cmdline-nruns.patch rename to package/dhrystone/0001-let-people-specify-the-number-of-runs-on-the-command.patch index 1164610cca1..b1858268471 100644 --- a/package/dhrystone/0001-cmdline-nruns.patch +++ b/package/dhrystone/0001-let-people-specify-the-number-of-runs-on-the-command.patch @@ -1,10 +1,19 @@ -let people specify the number of runs on the command line +From 16d84fa7ecea8102680c9610d4186c4f54936b07 Mon Sep 17 00:00:00 2001 +From: Vivi Li +Date: Mon, 15 Jul 2024 11:07:11 +0200 +Subject: [PATCH] let people specify the number of runs on the command line -Patch by Vivi Li +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry_1.c | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) +diff --git a/dhry_1.c b/dhry_1.c +index 7ab02a8..97bd30f 100644 --- a/dhry_1.c +++ b/dhry_1.c -@@ -66,7 +70,7 @@ +@@ -66,7 +66,7 @@ float Microseconds, /* end of variables for time measurement */ @@ -13,7 +22,7 @@ Patch by Vivi Li /*****/ /* main program, corresponds to procedures */ -@@ -101,6 +105,13 @@ +@@ -101,6 +101,13 @@ main () /* Warning: With 16-Bit processors and Number_Of_Runs > 32000, */ /* overflow may occur for this array element. */ @@ -27,7 +36,7 @@ Patch by Vivi Li printf ("\n"); printf ("Dhrystone Benchmark, Version 2.1 (Language: C)\n"); printf ("\n"); -@@ -114,13 +125,17 @@ +@@ -114,13 +121,17 @@ main () printf ("Program compiled without 'register' attribute\n"); printf ("\n"); } @@ -51,3 +60,6 @@ Patch by Vivi Li printf ("Execution starts, %d runs through Dhrystone\n", Number_Of_Runs); +-- +2.45.2 + diff --git a/package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch b/package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch new file mode 100644 index 00000000000..064a1a95244 --- /dev/null +++ b/package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch @@ -0,0 +1,29 @@ +From 7d890402dc5a32a72d5bc0532c87576937c18eb7 Mon Sep 17 00:00:00 2001 +From: Robin Getz +Date: Mon, 15 Jul 2024 11:07:54 +0200 +Subject: [PATCH] Get HZ value from system rather than requiring via CPPFLAGS + +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dhry.h b/dhry.h +index 1714562..482d343 100644 +--- a/dhry.h ++++ b/dhry.h +@@ -359,6 +359,10 @@ + /* for "times" */ + #endif + ++#ifndef HZ ++#include ++#endif ++ + #define Mic_secs_Per_Second 1000000.0 + /* Berkeley UNIX C returns process times in seconds/HZ */ + +-- +2.45.2 + diff --git a/package/dhrystone/0002-HZ.patch b/package/dhrystone/0002-HZ.patch deleted file mode 100644 index e3b8a0e05d0..00000000000 --- a/package/dhrystone/0002-HZ.patch +++ /dev/null @@ -1,17 +0,0 @@ -Get HZ value from system rather than requiring via CPPFLAGS - -Patch by Robin Getz - ---- a/dhry.h -+++ b/dhry.h -@@ -359,6 +359,10 @@ - /* for "times" */ - #endif - -+#ifndef HZ -+#include -+#endif -+ - #define Mic_secs_Per_Second 1000000.0 - /* Berkeley UNIX C returns process times in seconds/HZ */ - diff --git a/package/dhrystone/0003-exit.patch b/package/dhrystone/0003-exit.patch deleted file mode 100644 index 8d99f4e5d75..00000000000 --- a/package/dhrystone/0003-exit.patch +++ /dev/null @@ -1,14 +0,0 @@ -trust the exit status of the program - -Patch by Robin Getz - ---- a/dhry_1.c -+++ b/dhry_1.c -@@ -274,6 +289,7 @@ - printf ("\n"); - } - -+ exit(0); - } - - diff --git a/package/dhrystone/0003-trust-the-exit-status-of-the-program.patch b/package/dhrystone/0003-trust-the-exit-status-of-the-program.patch new file mode 100644 index 00000000000..b7bc2b306c0 --- /dev/null +++ b/package/dhrystone/0003-trust-the-exit-status-of-the-program.patch @@ -0,0 +1,26 @@ +From acd266448386c805c0afded780a5d7e6903bb485 Mon Sep 17 00:00:00 2001 +From: Robin Getz +Date: Mon, 15 Jul 2024 11:08:43 +0200 +Subject: [PATCH] trust the exit status of the program + +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry_1.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dhry_1.c b/dhry_1.c +index 97bd30f..358bdc3 100644 +--- a/dhry_1.c ++++ b/dhry_1.c +@@ -285,6 +285,7 @@ main(int argc, char *argv[]) + printf ("\n"); + } + ++ exit(0); + } + + +-- +2.45.2 + diff --git a/package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch b/package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch new file mode 100644 index 00000000000..e925f1e781f --- /dev/null +++ b/package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch @@ -0,0 +1,27 @@ +From 85dcf4ca20a60689479bcb143ecf8c0402822abe Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 15 Jul 2024 11:09:18 +0200 +Subject: [PATCH] get prototypes for malloc/exit/strcpy + +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dhry.h b/dhry.h +index 482d343..825ef35 100644 +--- a/dhry.h ++++ b/dhry.h +@@ -388,6 +388,8 @@ + /* General definitions: */ + + #include ++#include ++#include + /* for strcpy, strcmp */ + + #define Null 0 +-- +2.45.2 + diff --git a/package/dhrystone/0004-headers.patch b/package/dhrystone/0004-headers.patch deleted file mode 100644 index 82bb60d92d4..00000000000 --- a/package/dhrystone/0004-headers.patch +++ /dev/null @@ -1,15 +0,0 @@ -get prototypes for malloc/exit/strcpy - -Patch by Mike Frysinger - ---- a/dhry.h -+++ b/dhry.h -@@ -388,6 +388,8 @@ - /* General definitions: */ - - #include -+#include -+#include - /* for strcpy, strcmp */ - - #define Null 0 diff --git a/package/dhrystone/0005-prototypes.patch b/package/dhrystone/0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch similarity index 59% rename from package/dhrystone/0005-prototypes.patch rename to package/dhrystone/0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch index 7fdcf94ee98..4cffc25a8d2 100644 --- a/package/dhrystone/0005-prototypes.patch +++ b/package/dhrystone/0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch @@ -1,10 +1,19 @@ -Avoid collision with C library using NO_PROTOTYPES found in code already +From 9a701143fc38fd9f5373af70dfd5f0da0bc8e04a Mon Sep 17 00:00:00 2001 +From: Robin Getz +Date: Mon, 15 Jul 2024 11:09:55 +0200 +Subject: [PATCH] Avoid collision with C library using NO_PROTOTYPES -Patch by Robin Getz +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry_1.c | 6 ++++++ + 1 file changed, 6 insertions(+) +diff --git a/dhry_1.c b/dhry_1.c +index 358bdc3..3ed1716 100644 --- a/dhry_1.c +++ b/dhry_1.c -@@ -28,7 +28,9 @@ +@@ -28,7 +28,9 @@ char Ch_1_Glob, int Arr_1_Glob [50]; int Arr_2_Glob [50] [50]; @@ -14,7 +23,7 @@ Patch by Robin Getz Enumeration Func_1 (); /* forward declaration necessary since Enumeration may not simply be int */ -@@ -45,14 +45,18 @@ +@@ -45,14 +47,18 @@ Enumeration Func_1 (); #ifdef TIMES struct tms time_info; @@ -33,3 +42,6 @@ Patch by Robin Getz #define Too_Small_Time 2 /* Measurements should last at least 2 seconds */ #endif +-- +2.45.2 + From 3847a145c23234b3bddae3a9ceb9d2d4e6a90fc5 Mon Sep 17 00:00:00 2001 From: Steffen Persvold Date: Thu, 27 Jun 2024 12:34:40 +0200 Subject: [PATCH 1835/3013] package/dhrystone: fix build with GCC 14.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC14 will give errors for missing function declarations and missing return types : dhry_1.c:75:1: error: return type defaults to ‘int’ [-Wimplicit-int] 75 | main(int argc, char *argv[]) | ^~~~ dhry_1.c: In function ‘main’: dhry_1.c:159:5: error: implicit declaration of function ‘Proc_5’ [-Wimplicit-function-declaration] 159 | Proc_5(); | ^~~~~~ Fixes: http://autobuild.buildroot.net/results/8e65ba30efd5a6bca197f24ced2db1f8226b2c51/ Signed-off-by: Steffen Persvold Signed-off-by: Thomas Petazzoni --- ...06-Add-missing-function-declarations.patch | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 package/dhrystone/0006-Add-missing-function-declarations.patch diff --git a/package/dhrystone/0006-Add-missing-function-declarations.patch b/package/dhrystone/0006-Add-missing-function-declarations.patch new file mode 100644 index 00000000000..0518340e3fd --- /dev/null +++ b/package/dhrystone/0006-Add-missing-function-declarations.patch @@ -0,0 +1,152 @@ +From fd7ce4b6a9e268e60071c94852f7f00f6e60ef11 Mon Sep 17 00:00:00 2001 +From: Steffen Persvold +Date: Mon, 15 Jul 2024 11:16:36 +0200 +Subject: [PATCH] Add missing function declarations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + +GCC14 will give errors for missing function declarations and +missing return types : + +dhry_1.c:75:1: error: return type defaults to ‘int’ [-Wimplicit-int] + 75 | main(int argc, char *argv[]) + | ^~~~ +dhry_1.c: In function ‘main’: +dhry_1.c:159:5: error: implicit declaration of function ‘Proc_5’ [-Wimplicit-function-declaration] + 159 | Proc_5(); + | ^~~~~~ + +Upstream: dead +Signed-off-by: Steffen Persvold +--- + dhry_1.c | 26 +++++++++++++++++--------- + dhry_2.c | 8 ++++---- + 2 files changed, 21 insertions(+), 13 deletions(-) + +diff --git a/dhry_1.c b/dhry_1.c +index 3ed1716..cad5840 100644 +--- a/dhry_1.c ++++ b/dhry_1.c +@@ -32,6 +32,7 @@ int Arr_2_Glob [50] [50]; + extern char *malloc (); + #endif + Enumeration Func_1 (); ++Boolean Func_2 (); + /* forward declaration necessary since Enumeration may not simply be int */ + + #ifndef REG +@@ -71,8 +72,17 @@ float Microseconds, + + /* end of variables for time measurement */ + +- +-main(int argc, char *argv[]) ++/* forward declarations */ ++void Proc_1 (); ++void Proc_2 (); ++void Proc_3 (); ++void Proc_4 (); ++void Proc_5 (); ++void Proc_6 (); ++void Proc_7 (); ++void Proc_8 (); ++ ++int main(int argc, char *argv[]) + /*****/ + + /* main program, corresponds to procedures */ +@@ -295,7 +305,7 @@ main(int argc, char *argv[]) + } + + +-Proc_1 (Ptr_Val_Par) ++void Proc_1 (Ptr_Val_Par) + /******************/ + + REG Rec_Pointer Ptr_Val_Par; +@@ -329,7 +339,7 @@ REG Rec_Pointer Ptr_Val_Par; + } /* Proc_1 */ + + +-Proc_2 (Int_Par_Ref) ++void Proc_2 (Int_Par_Ref) + /******************/ + /* executed once */ + /* *Int_Par_Ref == 1, becomes 4 */ +@@ -352,7 +362,7 @@ One_Fifty *Int_Par_Ref; + } /* Proc_2 */ + + +-Proc_3 (Ptr_Ref_Par) ++void Proc_3 (Ptr_Ref_Par) + /******************/ + /* executed once */ + /* Ptr_Ref_Par becomes Ptr_Glob */ +@@ -367,7 +377,7 @@ Rec_Pointer *Ptr_Ref_Par; + } /* Proc_3 */ + + +-Proc_4 () /* without parameters */ ++void Proc_4 () /* without parameters */ + /*******/ + /* executed once */ + { +@@ -379,7 +389,7 @@ Proc_4 () /* without parameters */ + } /* Proc_4 */ + + +-Proc_5 () /* without parameters */ ++void Proc_5 () /* without parameters */ + /*******/ + /* executed once */ + { +@@ -399,5 +409,3 @@ register int l; + while (l--) *d++ = *s++; + } + #endif +- +- +diff --git a/dhry_2.c b/dhry_2.c +index 63a3d3e..25051e7 100644 +--- a/dhry_2.c ++++ b/dhry_2.c +@@ -26,8 +26,9 @@ + extern int Int_Glob; + extern char Ch_1_Glob; + ++Boolean Func_3 (); + +-Proc_6 (Enum_Val_Par, Enum_Ref_Par) ++void Proc_6 (Enum_Val_Par, Enum_Ref_Par) + /*********************************/ + /* executed once */ + /* Enum_Val_Par == Ident_3, Enum_Ref_Par becomes Ident_2 */ +@@ -61,7 +62,7 @@ Enumeration *Enum_Ref_Par; + } /* Proc_6 */ + + +-Proc_7 (Int_1_Par_Val, Int_2_Par_Val, Int_Par_Ref) ++void Proc_7 (Int_1_Par_Val, Int_2_Par_Val, Int_Par_Ref) + /**********************************************/ + /* executed three times */ + /* first call: Int_1_Par_Val == 2, Int_2_Par_Val == 3, */ +@@ -81,7 +82,7 @@ One_Fifty *Int_Par_Ref; + } /* Proc_7 */ + + +-Proc_8 (Arr_1_Par_Ref, Arr_2_Par_Ref, Int_1_Par_Val, Int_2_Par_Val) ++void Proc_8 (Arr_1_Par_Ref, Arr_2_Par_Ref, Int_1_Par_Val, Int_2_Par_Val) + /*********************************************************************/ + /* executed once */ + /* Int_Par_Val_1 == 3 */ +@@ -189,4 +190,3 @@ Enumeration Enum_Par_Val; + else /* not executed */ + return (false); + } /* Func_3 */ +- +-- +2.45.2 + From 9d0bb0e67bb878858d359101dfdc0aebe8fd2179 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 14 Jul 2024 18:55:27 +0200 Subject: [PATCH 1836/3013] support/testing: new dmidecode runtime test Note: this test was not working in Buildroot test infrastructure before commit [1] was merged, because dmidecode has the string "# " in its output. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/0cad947b964be5612a182413da136fcf0dc5a1f2 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + .../testing/tests/package/test_dmidecode.py | 67 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 support/testing/tests/package/test_dmidecode.py diff --git a/DEVELOPERS b/DEVELOPERS index 2650fb7f48e..552f02e5157 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1837,6 +1837,7 @@ F: support/testing/tests/package/test_cryptsetup.py F: support/testing/tests/package/test_cryptsetup/ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ +F: support/testing/tests/package/test_dmidecode.py F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_ed.py F: support/testing/tests/package/test_ethtool.py diff --git a/support/testing/tests/package/test_dmidecode.py b/support/testing/tests/package/test_dmidecode.py new file mode 100644 index 00000000000..33c19f0d96a --- /dev/null +++ b/support/testing/tests/package/test_dmidecode.py @@ -0,0 +1,67 @@ +import os + +import infra.basetest + + +class TestDmidecode(infra.basetest.BRTest): + # We use a x86_64 arch for this dmidecode test because aarch64 + # SMBIOS is not supported in non-UEFI use-cases (and using a UEFI + # aarch64 would make the test longer). + config = \ + """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.39" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_DMIDECODE=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + + # An arbitrary SMBIOS OEM string for the test + oem_string = "Hello Buildroot SMBIOS" + + kernel = os.path.join(self.builddir, "images", "bzImage") + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + self.emulator.boot( + arch="x86_64", + kernel=kernel, + kernel_cmdline=["console=ttyS0"], + options=["-cpu", "Nehalem", "-m", "256", "-initrd", cpio_file, + "-smbios", f"type=11,value={oem_string}"], + ) + self.emulator.login() + + # Check the program can run + cmd = "dmidecode --version" + self.assertRunOk(cmd) + + # Check a simple invocation of "dmidecode" + self.assertRunOk("dmidecode") + + # Check a simple invocation of "biosdecode" + self.assertRunOk("biosdecode") + + # Check dmidecode detects SMBIOS + cmd = "dmidecode | grep -E '^SMBIOS .* present\\.$'" + self.assertRunOk(cmd) + + # Check the system-manufacturer is QEMU + cmd = "dmidecode -s system-manufacturer" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "QEMU") + + # Check we read back our OEM string + cmd = "dmidecode --oem-string 1" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], oem_string) From 009f9106d991c9adbf8e57869d4355e0f71da31b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 14 Jul 2024 23:35:30 +0200 Subject: [PATCH 1837/3013] support/testing: fs: new btrfs runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 + support/testing/tests/fs/test_btrfs.py | 56 +++++++++++++++++++ .../tests/fs/test_btrfs/linux-btrfs.fragment | 1 + 3 files changed, 59 insertions(+) create mode 100644 support/testing/tests/fs/test_btrfs.py create mode 100644 support/testing/tests/fs/test_btrfs/linux-btrfs.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 552f02e5157..22867fea07c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1809,6 +1809,8 @@ F: package/z3/ F: package/zynaddsubfx/ F: support/testing/tests/boot/test_optee_os.py F: support/testing/tests/boot/test_optee_os/ +F: support/testing/tests/fs/test_btrfs.py +F: support/testing/tests/fs/test_btrfs/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py diff --git a/support/testing/tests/fs/test_btrfs.py b/support/testing/tests/fs/test_btrfs.py new file mode 100644 index 00000000000..90b868a955a --- /dev/null +++ b/support/testing/tests/fs/test_btrfs.py @@ -0,0 +1,56 @@ +import os + +import infra.basetest + + +class TestBtrfs(infra.basetest.BRTest): + kern_frag = \ + infra.filepath("tests/fs/test_btrfs/linux-btrfs.fragment") + btrfs_label = "BR_TEST" + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.39" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_BTRFS_PROGS=y + BR2_TARGET_ROOTFS_BTRFS=y + BR2_TARGET_ROOTFS_BTRFS_LABEL="{btrfs_label}" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk = os.path.join(self.builddir, "images", "rootfs.btrfs") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = ["root=/dev/vda", "console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-drive", f"file={disk},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # We check our root filesystem is in btrfs format. + cmd = "mount | grep '/dev/root on / type btrfs'" + self.assertRunOk(cmd) + + # We show the root filesystem info with btrfs-progs, using the + # target btrfs-progs. + self.assertRunOk("btrfs filesystem show /") + + # We query the label and check it is the one from the + # Buildroot config. + out, ret = self.emulator.run("btrfs filesystem label /") + self.assertEqual(ret, 0) + self.assertEqual(out[0], self.btrfs_label) + + # We try to write data on the root filesystem. + self.assertRunOk("echo 'Hello Buildroot' > /root/file.txt") + self.assertRunOk("sync") diff --git a/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment b/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment new file mode 100644 index 00000000000..605c1837e10 --- /dev/null +++ b/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment @@ -0,0 +1 @@ +CONFIG_BTRFS_FS=y From 246763308bfca93977c4ad5bee7c8654fcf7dfd3 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Sat, 13 Jul 2024 22:35:58 +0200 Subject: [PATCH 1838/3013] package/qt6/qt6base: fix missing plugins and qml2 imports When using the default value "." for of ArchData, qt6-applications that require QML2 imports or plugins, will not run: In my case the wayland-egl platform plugin is not found: qt.qpa.plugin: Could not find the Qt platform plugin "wayland-egl" in "" And I also get a lot of qml related warnings: qrc:/qml/main.qml:3:1: module "QtQuick.Layouts" is not installed Prior to this fix, we had to set the QML2_IMPORT_PATH and QT_PLUGIN_PATH or make sure qt.conf is available. After this fix, ArchData starts with "lib", which is necessary (according to my own experiments) for qt6-applications to find plugins and qml2 imports. The root cause is still unknown, but I think the current solution is sufficient. Setting ArchData to "lib/qt6" is also a good first step towards a better qt6 filesystem layout. I will continue improving the qt6 filesystem layout in a later patch. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Arnout Vandecappelle --- package/qt6/qt6base/qt6base.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 6cb82d9a942..5ab61ba3e0f 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -42,6 +42,7 @@ QT6BASE_INSTALL_STAGING = YES QT6BASE_CONF_OPTS = \ -DQT_HOST_PATH=$(HOST_DIR) \ + -DINSTALL_ARCHDATADIR=lib/qt6 \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=OFF \ -DFEATURE_sql=OFF \ From 8dc7445056d1c21e4e4205cfcd92c0b539597e12 Mon Sep 17 00:00:00 2001 From: Aleksandr Makarov Date: Fri, 12 Jul 2024 22:00:16 +0300 Subject: [PATCH 1839/3013] package/libest: Add support for openssl v3 libest uses functions that are no longer available in OpenSSL 3.0. Add a wrapper that calls the proper replacements depending on the version. Fixes: http://autobuild.buildroot.net/results/89024d6c1f10959282470b120d332fb32922b3b6 Signed-off-by: Aleksandr Makarov [Arnout: add Upstream: tag to patches] Signed-off-by: Arnout Vandecappelle --- ...ix-error-implicit-declaration-of-fun.patch | 64 +++++ ...libest-Add-OpenSSL-3.0-compatibility.patch | 225 ++++++++++++++++++ 2 files changed, 289 insertions(+) create mode 100644 package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch create mode 100644 package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch diff --git a/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch b/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch new file mode 100644 index 00000000000..6fd952170e3 --- /dev/null +++ b/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch @@ -0,0 +1,64 @@ +From 28c65fd9dff2f30438b98f0b71f387468259a2c3 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Fri, 12 Jul 2024 21:07:10 +0300 +Subject: [PATCH] =?UTF-8?q?package/libest:=20fix=20error:=20implicit?= + =?UTF-8?q?=20declaration=20of=20function=20=E2=80=98ERR=5Ferror=5Fstring?= + =?UTF-8?q?=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Added necessary header includes to fix 'implicit declaration' errors which occur when +using -Wimplicit-function-declaration flag. + +Upstream: https://github.com/cisco/libest/pull/132 +Signed-off-by: Aleksandr Makarov +--- + src/est/est.c | 4 +++- + src/est/est_client.c | 1 + + src/est/est_server_http.c | 2 ++ + 3 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/est/est.c b/src/est/est.c +index 8a65f87..24474c0 100644 +--- a/src/est/est.c ++++ b/src/est/est.c +@@ -42,7 +42,9 @@ + #include + #endif /* DISABLE_BACKTRACE*/ + #endif /* WIN32*/ +- ++#include ++#include ++#include + #ifndef ENABLE_CLIENT_ONLY + static char hex_chpw[] = {0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, + 0xF7, 0x0D, 0x01, 0x09, 0x07}; +diff --git a/src/est/est_client.c b/src/est/est_client.c +index 8dff9d9..5c25d4f 100644 +--- a/src/est/est_client.c ++++ b/src/est/est_client.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #include "est.h" + #include "est_locl.h" + #include "est_ossl_util.h" +diff --git a/src/est/est_server_http.c b/src/est/est_server_http.c +index 2bd08d5..ce1cece 100644 +--- a/src/est/est_server_http.c ++++ b/src/est/est_server_http.c +@@ -42,6 +42,8 @@ + #include + #include + #include ++#include ++#include + #if defined(_WIN32) + #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005 + #else +-- +2.40.1 + diff --git a/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch b/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch new file mode 100644 index 00000000000..a4c74e424a0 --- /dev/null +++ b/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch @@ -0,0 +1,225 @@ +From ad5ce7ff1cae92c151dc6f350ef943106ddd852f Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Fri, 12 Jul 2024 21:07:36 +0300 +Subject: [PATCH] package/libest: Add OpenSSL 3.0 compatibility + +The functions `FIPS_mode` and `FIPS_mode_set` are deprecated in OpenSSL 3.0, replaced by +`EVP_default_properties_is_fips_enabled` and `EVP_default_properties_enable_fips` respectively. + +This commit introduces wrappers for these new EVP APIs to maintain compatibility with OpenSSL 3.0, +while ensuring continued support for older versions of OpenSSL. + +- Implemented `is_fips_enabled` wrapper around `EVP_default_properties_is_fips_enabled` +- Implemented `enable_fips` wrapper around `EVP_default_properties_enable_fips` +- Added conditional compilation to support both new and legacy OpenSSL versions + +Upstream: https://github.com/cisco/libest/pull/132 +Signed-off-by: Aleksandr Makarov +--- + example/client-brski/estclient-brski.c | 2 +- + example/client/estclient.c | 2 +- + example/proxy/estproxy.c | 2 +- + example/server/estserver.c | 2 +- + java/jni/client.c | 2 +- + src/est/est_client.c | 12 ++++++------ + src/est/est_ossl_util.c | 18 ++++++++++++++++++ + src/est/est_ossl_util.h | 2 ++ + src/est/est_server.c | 2 +- + test/UT/US1864/us1864.c | 4 ++-- + 10 files changed, 34 insertions(+), 14 deletions(-) + +diff --git a/example/client-brski/estclient-brski.c b/example/client-brski/estclient-brski.c +index 9e63af5..6e03052 100644 +--- a/example/client-brski/estclient-brski.c ++++ b/example/client-brski/estclient-brski.c +@@ -388,7 +388,7 @@ int main (int argc, char **argv) + break; + case 'f': + /* Turn FIPS on if requested and exit if failure */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (!set_fips_return) { + printf("\nERROR setting FIPS MODE ON ...\n"); + ERR_load_crypto_strings(); +diff --git a/example/client/estclient.c b/example/client/estclient.c +index a8a2d6f..75b1272 100644 +--- a/example/client/estclient.c ++++ b/example/client/estclient.c +@@ -1280,7 +1280,7 @@ int main (int argc, char **argv) + break; + case 'f': + /* Turn FIPS on if requested and exit if failure */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (!set_fips_return) { + printf("\nERROR setting FIPS MODE ON ...\n"); + ERR_load_crypto_strings(); +diff --git a/example/proxy/estproxy.c b/example/proxy/estproxy.c +index 114bd65..6dbdbda 100644 +--- a/example/proxy/estproxy.c ++++ b/example/proxy/estproxy.c +@@ -593,7 +593,7 @@ int main (int argc, char **argv) + /* + * Turn FIPS on if user requested it and exit if failure + */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (set_fips_return != 1) { + set_fips_error = ERR_get_error(); + printf("\nERROR WHILE SETTING FIPS MODE ON exiting ....\n"); +diff --git a/example/server/estserver.c b/example/server/estserver.c +index 3539dc4..90886cf 100644 +--- a/example/server/estserver.c ++++ b/example/server/estserver.c +@@ -2285,7 +2285,7 @@ int main (int argc, char **argv) + /* turn FIPS on if user requested it + * and exit if failure. + */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (set_fips_return != 1) { + set_fips_error = ERR_get_error(); + printf("\nERROR WHILE SETTING FIPS MODE ON exiting ....\n"); +diff --git a/java/jni/client.c b/java/jni/client.c +index c5bc28e..f58d5c0 100644 +--- a/java/jni/client.c ++++ b/java/jni/client.c +@@ -179,7 +179,7 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ + */ + JNIEXPORT jint JNICALL Java_com_cisco_c3m_est_ESTClient_enable_1fips( + JNIEnv *env, jclass obj) { +- if (!FIPS_mode() && !FIPS_mode_set(1)) { ++ if (!est_is_fips_enabled() && !est_enable_fips(1)) { + ERR_print_errors_fp(stderr); + return -1; + } else { +diff --git a/src/est/est_client.c b/src/est/est_client.c +index 5c25d4f..63069af 100644 +--- a/src/est/est_client.c ++++ b/src/est/est_client.c +@@ -3183,7 +3183,7 @@ EST_ERROR est_client_enroll_internal (EST_CTX *ctx, char *cn, int *pkcs7_len, in + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -3594,7 +3594,7 @@ EST_ERROR est_client_reenroll (EST_CTX *ctx, X509 *cert, int *pkcs7_len, EVP_PKE + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -3680,7 +3680,7 @@ static EST_ERROR est_client_enroll_csr_internal (EST_CTX *ctx, X509_REQ *csr, in + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -5872,7 +5872,7 @@ static EST_ERROR est_client_brski_send_get_voucher (EST_CTX *ctx, int *cacert_le + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -6366,7 +6366,7 @@ EST_ERROR est_client_brski_send_voucher_status (EST_CTX *ctx, EST_BRSKI_STATUS_V + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -6535,7 +6535,7 @@ EST_ERROR est_client_brski_send_enroll_status (EST_CTX *ctx, EST_BRSKI_STATUS_VA + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +diff --git a/src/est/est_ossl_util.c b/src/est/est_ossl_util.c +index daa54f2..0887daa 100644 +--- a/src/est/est_ossl_util.c ++++ b/src/est/est_ossl_util.c +@@ -500,3 +500,21 @@ char *est_find_ser_num_in_subj(X509 *cert) + return(ser_num_str); + } + #endif ++ ++int est_is_fips_enabled() ++{ ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++ return EVP_default_properties_is_fips_enabled(NULL); ++#else ++ return FIPS_mode(); ++#endif ++} ++ ++int est_enable_fips(int enable) ++{ ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++ return EVP_default_properties_enable_fips(NULL, enable); ++#else ++ return FIPS_mode_set(enable); ++#endif ++} +diff --git a/src/est/est_ossl_util.h b/src/est/est_ossl_util.h +index 68ad290..2389e45 100644 +--- a/src/est/est_ossl_util.h ++++ b/src/est/est_ossl_util.h +@@ -44,4 +44,6 @@ LIBEST_TEST_API void ossl_dump_ssl_errors(void); + EST_ERROR ossl_init_cert_store(X509_STORE *store, + unsigned char *raw1, int size1); + ++int est_is_fips_enabled(); ++int est_enable_fips(int); + #endif +diff --git a/src/est/est_server.c b/src/est/est_server.c +index d047b48..979ae53 100644 +--- a/src/est/est_server.c ++++ b/src/est/est_server.c +@@ -3355,7 +3355,7 @@ EST_ERROR est_server_set_auth_mode (EST_CTX *ctx, EST_HTTP_AUTH_MODE amode) + /* + * Since HTTP digest auth uses MD5, make sure we're not in FIPS mode. + */ +- if (FIPS_mode()) { ++ if (est_is_fips_enabled()) { + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + return (EST_ERR_BAD_MODE); + } +diff --git a/test/UT/US1864/us1864.c b/test/UT/US1864/us1864.c +index 3e41cd7..1f57494 100644 +--- a/test/UT/US1864/us1864.c ++++ b/test/UT/US1864/us1864.c +@@ -218,12 +218,12 @@ static void us1864_test1 (void) + /* + * Make sure we don't allow DIGEST mode when in FIPS mode + */ +- if (!FIPS_mode_set(1)) { ++ if (!est_enable_fips(1)) { + printf("FIPS mode not supported, skipping test to prevent digest auth when in FIPS mode"); + } else { + est_rv = est_server_set_auth_mode(ctx, AUTH_DIGEST); + CU_ASSERT(est_rv == EST_ERR_BAD_MODE); +- FIPS_mode_set(0); ++ est_enable_fips(0); + } + + X509_free(x); +-- +2.40.1 + From 34857f644b594b1c6f9abc1c24d3045446afd46c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 15:25:08 +0200 Subject: [PATCH 1840/3013] package/qt5/qt5webengine-chromium: backport upstream patch to fix Python 3.12 issue Two Python scripts from the upstream Chromium code base uselessly imported the "imp" module, causing the build to fail with Python 3.12. This commit backports an upstream patch that fixes this issue. Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/mojo/public/tools/mojom/mojom_parser.py", line 23, in from mojom.generate import translate File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate.py", line 17, in from mojom.generate import generator File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator.py", line 12, in from mojom import fileutil File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py", line 6, in import imp ModuleNotFoundError: No module named 'imp' Signed-off-by: Thomas Petazzoni --- .../0003-Remove-unused-python-import.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0003-Remove-unused-python-import.patch diff --git a/package/qt5/qt5webengine-chromium/0003-Remove-unused-python-import.patch b/package/qt5/qt5webengine-chromium/0003-Remove-unused-python-import.patch new file mode 100644 index 00000000000..df9e9cfe24a --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0003-Remove-unused-python-import.patch @@ -0,0 +1,47 @@ +From f684c6fb3532138e3408fa17d4b6610162647365 Mon Sep 17 00:00:00 2001 +From: Bruno Pitrus +Date: Tue, 25 Jul 2023 18:34:09 +0000 +Subject: [PATCH] Remove unused python import + +The `imp` module has been removed in Python 3.12 causing these scripts to error out. + +Change-Id: Ic7c038d21b86052bdda13015f80934db52a2143e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4714859 +Auto-Submit: Bruno Pitrus +Reviewed-by: Ken Rockot +Commit-Queue: Ken Rockot +Cr-Commit-Position: refs/heads/main@{#1174966} +Upstream: https://github.com/chromium/chromium/commit/f5f6e361d037c31630661186e7bd7b31d2784cb8 +Signed-off-by: Thomas Petazzoni +--- + chromium/mojo/public/tools/mojom/mojom/fileutil.py | 1 - + chromium/mojo/public/tools/mojom/mojom/parse/lexer.py | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/chromium/mojo/public/tools/mojom/mojom/fileutil.py +index bf626f54798..e1c823daa3c 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/fileutil.py ++++ b/chromium/mojo/public/tools/mojom/mojom/fileutil.py +@@ -3,7 +3,6 @@ + # found in the LICENSE file. + + import errno +-import imp + import os.path + import sys + +diff --git a/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py +index 3e084bbf22b..1e8b49f245f 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py ++++ b/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py +@@ -2,7 +2,6 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-import imp + import os.path + import sys + +-- +2.25.1 + From b5cdce85e8dc27f192634556556ac56dadea3433 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 15:47:35 +0200 Subject: [PATCH 1841/3013] package/qt5/qt5webengine-chromium: fix another Python 3.x issue Backport an upstream Chromium patch that fixes: FAILED: gen/services/metrics/public/cpp/ukm_builders.cc gen/services/metrics/public/cpp/ukm_builders.h gen/services/metrics/public/cpp/ukm_decode.cc gen/services/metrics/public/cpp/ukm_decode.h /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/host-bin/python ../../3rdparty/chromium/tools/metrics/ukm/gen_builders.py --input ../../3rdparty/chromium/tools/metrics/ukm/ukm.xml --output gen/services/metrics/public/cpp /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/metrics/ukm/../common/models.py:247: SyntaxWarning: invalid escape sequence '\w' """A complex node type that has attributes or other nodes as children. Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/tools/metrics/ukm/gen_builders.py", line 59, in sys.exit(main(sys.argv)) ^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/tools/metrics/ukm/gen_builders.py", line 27, in main data = ReadFilteredData(args.input) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/tools/metrics/ukm/gen_builders.py", line 48, in ReadFilteredData data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/metrics/ukm/../common/models.py", line 439, in Parse return self._ParseMinidom(input_file) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/metrics/ukm/../common/models.py", line 418, in _ParseMinidom return self.root_type.Unmarshall(root) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/metrics/ukm/../common/models.py", line 324, in Unmarshall child.node_type.Unmarshall(n) for n in nodes] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/metrics/ukm/../common/models.py", line 302, in Unmarshall if not re.match(attr_re, attr_val): ^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/host/lib/python3.12/re/__init__.py", line 167, in match return _compile(pattern, flags).match(string) ^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/host/lib/python3.12/re/__init__.py", line 307, in _compile p = _compiler.compile(pattern, flags) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/host/lib/python3.12/re/_compiler.py", line 745, in compile p = _parser.parse(p, flags) ^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/host/lib/python3.12/re/_parser.py", line 979, in parse p = _parse_sub(source, state, flags & SRE_FLAG_VERBOSE, 0) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/host/lib/python3.12/re/_parser.py", line 460, in _parse_sub itemsappend(_parse(source, state, verbose, nested + 1, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/host/lib/python3.12/re/_parser.py", line 840, in _parse raise source.error('global flags not at the start ' re.error: global flags not at the start of the expression at position 1 Signed-off-by: Thomas Petazzoni --- .../0004-Migrate-presubmit-to-python3.patch | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0004-Migrate-presubmit-to-python3.patch diff --git a/package/qt5/qt5webengine-chromium/0004-Migrate-presubmit-to-python3.patch b/package/qt5/qt5webengine-chromium/0004-Migrate-presubmit-to-python3.patch new file mode 100644 index 00000000000..9314e30c5cc --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0004-Migrate-presubmit-to-python3.patch @@ -0,0 +1,132 @@ +From 71d96b9be632b5231b28277d9e72f6a6c5308e24 Mon Sep 17 00:00:00 2001 +From: Dan Harrington +Date: Fri, 4 Jun 2021 16:46:25 +0000 +Subject: [PATCH] Migrate presubmit to python3 + +Fixed a couple warnings I found when running the unit +tests in python3. + +Bug: 1212110 +Change-Id: I3d1b5859b5c517ad5eea30cb816fad0389715f73 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2934203 +Reviewed-by: Jesse Doherty +Commit-Queue: Dan H +Cr-Commit-Position: refs/heads/master@{#889331} +Upstream: https://github.com/chromium/chromium/commit/f90f49df8db04dcb72f7ce0c4d0b2fe329bab00c +Signed-off-by: Thomas Petazzoni +--- + chromium/tools/metrics/ukm/PRESUBMIT.py | 2 + + .../tools/metrics/ukm/gen_builders_test.py | 4 +- + chromium/tools/metrics/ukm/ukm_model.py | 56 +++++++++++-------- + 3 files changed, 37 insertions(+), 25 deletions(-) + +diff --git a/chromium/tools/metrics/ukm/PRESUBMIT.py b/chromium/tools/metrics/ukm/PRESUBMIT.py +index 28fab1cffb7..99b13be681b 100644 +--- a/chromium/tools/metrics/ukm/PRESUBMIT.py ++++ b/chromium/tools/metrics/ukm/PRESUBMIT.py +@@ -8,6 +8,8 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts + for more details on the presubmit API built into gcl. + """ + ++USE_PYTHON3 = True ++ + UKM_XML = 'ukm.xml' + + +diff --git a/chromium/tools/metrics/ukm/gen_builders_test.py b/chromium/tools/metrics/ukm/gen_builders_test.py +index 1ca15e52c9a..0015320a524 100755 +--- a/chromium/tools/metrics/ukm/gen_builders_test.py ++++ b/chromium/tools/metrics/ukm/gen_builders_test.py +@@ -25,8 +25,8 @@ class GenBuildersTest(unittest.TestCase): + + def testGenerateCode(self): + relpath = '.' +- data = ukm_model.UKM_XML_TYPE.Parse( +- open('../../tools/metrics/ukm/ukm.xml').read()) ++ with open('../../tools/metrics/ukm/ukm.xml') as f: ++ data = ukm_model.UKM_XML_TYPE.Parse(f.read()) + event = data[ukm_model._EVENT_TYPE.tag][0] + metric = event[ukm_model._METRIC_TYPE.tag][0] + self.assertIsNotNone(event) +diff --git a/chromium/tools/metrics/ukm/ukm_model.py b/chromium/tools/metrics/ukm/ukm_model.py +index ec24dd57360..b36899db189 100644 +--- a/chromium/tools/metrics/ukm/ukm_model.py ++++ b/chromium/tools/metrics/ukm/ukm_model.py +@@ -39,15 +39,16 @@ _INDEX_TYPE = models.ObjectNodeType( + ], + single_line=True) + +-_STATISTICS_TYPE = models.ObjectNodeType( ++_STATISTICS_TYPE = models.ObjectNodeType( + 'statistics', + attributes=[ +- ('export', str, r'^(?i)(|true|false)$'), ++ ('export', str, r'(?i)^(|true|false)$'), + ], + children=[ + models.ChildType(_QUANTILES_TYPE.tag, _QUANTILES_TYPE, multiple=False), +- models.ChildType( +- _ENUMERATION_TYPE.tag, _ENUMERATION_TYPE, multiple=False), ++ models.ChildType(_ENUMERATION_TYPE.tag, ++ _ENUMERATION_TYPE, ++ multiple=False), + ]) + + _HISTORY_TYPE = models.ObjectNodeType( +@@ -90,25 +91,34 @@ _METRIC_TYPE = models.ObjectNodeType( + _AGGREGATION_TYPE.tag, _AGGREGATION_TYPE, multiple=True), + ]) + +-_EVENT_TYPE = models.ObjectNodeType( +- 'event', +- attributes=[ +- ('name', str, r'^[A-Za-z0-9.]+$'), +- ('singular', str, r'^(?i)(|true|false)$'), +- ], +- alphabetization=[ +- (_OBSOLETE_TYPE.tag, _KEEP_ORDER), +- (_OWNER_TYPE.tag, _KEEP_ORDER), +- (_SUMMARY_TYPE.tag, _KEEP_ORDER), +- (_METRIC_TYPE.tag, _LOWERCASE_FN('name')), +- ], +- extra_newlines=(1, 1, 1), +- children=[ +- models.ChildType(_OBSOLETE_TYPE.tag, _OBSOLETE_TYPE, multiple=False), +- models.ChildType(_OWNER_TYPE.tag, _OWNER_TYPE, multiple=True), +- models.ChildType(_SUMMARY_TYPE.tag, _SUMMARY_TYPE, multiple=False), +- models.ChildType(_METRIC_TYPE.tag, _METRIC_TYPE, multiple=True), +- ]) ++_EVENT_TYPE = models.ObjectNodeType('event', ++ attributes=[ ++ ('name', str, r'^[A-Za-z0-9.]+$'), ++ ('singular', str, ++ r'(?i)^(|true|false)$'), ++ ], ++ alphabetization=[ ++ (_OBSOLETE_TYPE.tag, _KEEP_ORDER), ++ (_OWNER_TYPE.tag, _KEEP_ORDER), ++ (_SUMMARY_TYPE.tag, _KEEP_ORDER), ++ (_METRIC_TYPE.tag, ++ _LOWERCASE_FN('name')), ++ ], ++ extra_newlines=(1, 1, 1), ++ children=[ ++ models.ChildType(_OBSOLETE_TYPE.tag, ++ _OBSOLETE_TYPE, ++ multiple=False), ++ models.ChildType(_OWNER_TYPE.tag, ++ _OWNER_TYPE, ++ multiple=True), ++ models.ChildType(_SUMMARY_TYPE.tag, ++ _SUMMARY_TYPE, ++ multiple=False), ++ models.ChildType(_METRIC_TYPE.tag, ++ _METRIC_TYPE, ++ multiple=True), ++ ]) + + _UKM_CONFIGURATION_TYPE = models.ObjectNodeType( + 'ukm-configuration', +-- +2.25.1 + From 98dc9a933e28e2a83990b67cacd4ce88f5f4e9b6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 15:29:47 +0200 Subject: [PATCH 1842/3013] package/qt5/qt5webengine-chromium-catapult: bump version to fix build issue We have the qt5webengine-chromium-catapult package to override the catapult code from qtwebengine-chromium with a newer version. It was initially introduced because the catapult code in qtwebengine-chromium was not Python 3.x compatible. Turns out that the catapult version we're using exhibits new build issues related to Python 3.12 (and perhaps others), so let's update it again to fix: FAILED: gen/content/browser/tracing/about_tracing.js gen/content/browser/tracing/about_tracing.html /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/host-bin/python ../../3rdparty/chromium/third_party/catapult/tracing/bin/generate_about_tracing_contents --outdir gen/content/browser/tracing /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py:21: SyntaxWarning: invalid escape sequence '\(' if re.search('url\(.+\)', contents): /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py:63: SyntaxWarning: invalid escape sequence '\(' return re.sub('url\((?P"|\'|)(?P[^"\'()]*)(?P=quote)\)', /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py:75: SyntaxWarning: invalid escape sequence '\(' 'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)', /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py:7: SyntaxWarning: invalid escape sequence '\/' return js.replace('', '<\/script>') /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py:302: SyntaxWarning: invalid escape sequence '\/' raise Exception('Escape script tags with <\/script>') Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_module.py", line 28, in Parse parser_results = parse_html_deps.HTMLModuleParser().Parse(self.contents) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py", line 304, in Parse return HTMLModuleParserResults(html) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py", line 170, in __init__ self._soup = bs4.BeautifulSoup(html, 'html5lib') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/third_party/beautifulsoup4-4.9.3/py3k/bs4/__init__.py", line 243, in __init__ raise FeatureNotFound( bs4.FeatureNotFound: Couldn't find a tree builder with the features you requested: html5lib. Do you need to install a parser library? During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/third_party/catapult/tracing/bin/generate_about_tracing_contents", line 14, in sys.exit(generate_about_tracing_contents.Main(sys.argv[1:])) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/tracing/tracing_build/generate_about_tracing_contents.py", line 32, in Main load_sequence = vulcanizer.CalcLoadSequenceForModuleNames(names) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/project.py", line 146, in CalcLoadSequenceForModuleNames modules = [self.loader.LoadModule(module_name=name, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/resource_loader.py", line 149, in LoadModule m.Parse(excluded_scripts) File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_module.py", line 30, in Parse raise Exception('While parsing %s: %s' % (self.name, str(ex))) Exception: While parsing tracing.ui.extras.about_tracing.about_tracing: Couldn't find a tree builder with the features you requested: html5lib. Do you need to install a parser library? Signed-off-by: Thomas Petazzoni --- .../qt5webengine-chromium-catapult.hash | 2 +- .../qt5webengine-chromium-catapult.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash index 5a99c52e1fa..18bee4f58ff 100644 --- a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cb1b81c3d9612185b9e981b7329cd49ef057d1afb6de84b88a2af58154d3a0ca qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-git4.tar.gz +sha256 3dfcab349fd82c854b72fcc3f64e2e08f9a0d72c712a0d86a30d3a9994f244ba qt5webengine-chromium-catapult-7534569f99827c0ed4df818254ba7daca4606bca-git4.tar.gz sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk index 5d0db1e7903..bf577873ae6 100644 --- a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 7534569f99827c0ed4df818254ba7daca4606bca QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause From 245dab795ef9ad92be73ccdb5e717c644c4d8190 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 16:04:33 +0200 Subject: [PATCH 1843/3013] package/qt5/qt5webengine-chromium: fix another Python 3.12 issue Further down into the build, another issue pops up: /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/host-bin/python ../../3rdparty/chromium/tools/grit/grit.py update_resource_ids -o gen/tools/gritsettings/default_resource_ids --add-header --depfile gen/tools/gritsettings/default_resource_ids.d ../../3rdparty/chromium/tools/gritsettings/resource_ids.spec Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/tools/grit/grit.py", line 14, in import grit.grit_runner File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/grit_runner.py", line 19, in from grit import util File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/util.py", line 21, in from six.moves import html_entities as entities ModuleNotFoundError: No module named 'six.moves' Let's fix it with the partial backport of a much bigger upstream commit. Signed-off-by: Thomas Petazzoni --- ...-util.py-fix-Python-3.12-build-issue.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0005-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch diff --git a/package/qt5/qt5webengine-chromium/0005-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch b/package/qt5/qt5webengine-chromium/0005-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch new file mode 100644 index 00000000000..f08f6467e21 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0005-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch @@ -0,0 +1,70 @@ +From 5201c34a4c0f2fed56f6cff3acada3da2405a363 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 16:02:38 +0200 +Subject: [PATCH] tools/grit/grit/util.py: fix Python 3.12 build issue + +This commit is an extract from upstream commit +https://github.com/chromium/chromium/commit/b3abd7e4c9467415da3a5e13d9500d2ab3abc2ec +which is too large to be backported. + +It fixes: + +Traceback (most recent call last): + File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/tools/grit/grit.py", line 14, in + import grit.grit_runner + File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/grit_runner.py", line 19, in + from grit import util + File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/util.py", line 21, in + from six.moves import html_entities as entities +ModuleNotFoundError: No module named 'six.moves' + +Upstream: https://github.com/chromium/chromium/commit/b3abd7e4c9467415da3a5e13d9500d2ab3abc2ec (part of) +Signed-off-by: Thomas Petazzoni +--- + chromium/tools/grit/grit/util.py | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py +index 528d766ad6b..77db06adffb 100644 +--- a/chromium/tools/grit/grit/util.py ++++ b/chromium/tools/grit/grit/util.py +@@ -8,6 +8,7 @@ + from __future__ import print_function + + import codecs ++import html.entities + import io + import os + import re +@@ -17,8 +18,6 @@ import tempfile + from xml.sax import saxutils + + import six +-from six import StringIO +-from six.moves import html_entities as entities + + from grit import lazy_re + +@@ -226,7 +225,7 @@ def WrapOutputStream(stream, encoding = 'utf-8'): + def ChangeStdoutEncoding(encoding = 'utf-8'): + '''Changes STDOUT to print characters using the specified encoding.''' + # If we're unittesting, don't reconfigure. +- if isinstance(sys.stdout, StringIO): ++ if isinstance(sys.stdout, io.StringIO): + return + + if sys.version_info.major < 3: +@@ -280,8 +279,8 @@ def UnescapeHtml(text, replace_nbsp=True): + if name == 'nbsp' and not replace_nbsp: + return match.group() # Don't replace   + assert name != None +- if name in entities.name2codepoint: +- return six.unichr(entities.name2codepoint[name]) ++ if name in html.entities.name2codepoint: ++ return six.unichr(html.entities.name2codepoint[name]) + else: + return match.group() # Unknown HTML character entity - don't replace + +-- +2.25.1 + From 638babd596141e74572c57f0b7ff65d4665a58de Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 16:09:18 +0200 Subject: [PATCH 1844/3013] package/qt5/qt5webengine-chromium: fix another Python 3.12 issue Further down the build, another issue: Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/tools/grit/grit.py", line 29, in sys.exit(grit.grit_runner.Main(sys.argv[1:])) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/grit_runner.py", line 314, in Main return toolobject.Run(options, args[1:]) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/tool/build.py", line 254, in Run self.res = grd_reader.Parse(opts.input, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/grd_reader.py", line 231, in Parse handler.root.AssignFirstIds(filename_or_stream, defines) File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/node/misc.py", line 592, in AssignFirstIds src_root_dir, first_ids = _ReadFirstIdsFromFile(first_ids_filename, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/node/misc.py", line 56, in _ReadFirstIdsFromFile first_ids_dict = eval(util.ReadFile(filename, 'utf-8')) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/tools/grit/grit/util.py", line 215, in ReadFile with io.open(abs(filename), mode, encoding=encoding) as f: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ValueError: invalid mode: 'rU' Let's backport an upstream Chromium commit fixing this. Signed-off-by: Thomas Petazzoni --- ...build-in-Python-3.11-invalid-mode-rU.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch diff --git a/package/qt5/qt5webengine-chromium/0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch b/package/qt5/qt5webengine-chromium/0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch new file mode 100644 index 00000000000..61d45b1876a --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch @@ -0,0 +1,55 @@ +From fad0069037ec39d853e215fcddd3d130d9781ffe Mon Sep 17 00:00:00 2001 +From: Joanmarie Diggs +Date: Tue, 30 Aug 2022 06:00:13 +0000 +Subject: [PATCH] Fix build in Python 3.11 (invalid mode: 'rU') + +In Python 3.11, 'U' ("universal newline") is no longer accepted in +the file mode, having been deprecated in Python 3.3. The "universal +newline" is used by default when a file is open in text mode. + +This commit removes the 'U' from the two (non-third-party) places +it is used. + +Bug: 1357549 +Change-Id: I3305707858d8ba7a9f518656a9b97dc1702bbe94 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3859535 +Reviewed-by: Mike Pinkerton +Commit-Queue: Joanmarie Diggs +Reviewed-by: Nico Weber +Cr-Commit-Position: refs/heads/main@{#1040794} +Upstream: https://github.com/chromium/chromium/commit/0991fc6acd3c85472000f2055af542515c3c6297 +Signed-off-by: Thomas Petazzoni +--- + chromium/PRESUBMIT_test_mocks.py | 2 +- + chromium/tools/grit/grit/util.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/chromium/PRESUBMIT_test_mocks.py b/chromium/PRESUBMIT_test_mocks.py +index 0a9e5a54ecd..6b0eca1e1c2 100644 +--- a/chromium/PRESUBMIT_test_mocks.py ++++ b/chromium/PRESUBMIT_test_mocks.py +@@ -119,7 +119,7 @@ class MockInputApi(object): + def PresubmitLocalPath(self): + return self.presubmit_local_path + +- def ReadFile(self, filename, mode='rU'): ++ def ReadFile(self, filename, mode='r'): + if hasattr(filename, 'AbsoluteLocalPath'): + filename = filename.AbsoluteLocalPath() + for file_ in self.files: +diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py +index 77db06adffb..27f9aba5aa3 100644 +--- a/chromium/tools/grit/grit/util.py ++++ b/chromium/tools/grit/grit/util.py +@@ -210,7 +210,7 @@ def ReadFile(filename, encoding): + mode = 'rb' + encoding = None + else: +- mode = 'rU' ++ mode = 'r' + + with io.open(abs(filename), mode, encoding=encoding) as f: + return f.read() +-- +2.25.1 + From ca7cedaa8cab0a0ac0fc48c2f40c4e6a84fb6877 Mon Sep 17 00:00:00 2001 From: Kadir Yilmaz Date: Wed, 25 Oct 2023 23:29:24 +0200 Subject: [PATCH 1845/3013] package/qt5/qt5webengine: use bundled icu With the "-webengine-icu" config option qt5webengine uses icu headers on the build host. Unfortunately, the build fails with: /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/host-bin/python "../../3rdparty/chromium/build/toolchain/gcc_link_wrapper.py" --output="v8_snapshot/gen-regexp-special-case" -- /usr/bin/g++ -pie -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -m32 -pie -Wl,--disable-new-dtags -Wl,-O2 -Wl,--gc-sections -L/usr/lib -o "v8_snapshot/gen-regexp-special-case" -Wl,--start-group @"v8_snapshot/gen-regexp-special-case.rsp" -Wl,--end-group -ldl -lpthread -lrt -licui18n -licuuc -licudata /usr/bin/ld: skipping incompatible /usr/lib/x86_64-linux-gnu/libicui18n.so when searching for -licui18n /usr/bin/ld: skipping incompatible /usr/lib/x86_64-linux-gnu/libicui18n.a when searching for -licui18n /usr/bin/ld: cannot find -licui18n /usr/bin/ld: skipping incompatible /usr/lib/x86_64-linux-gnu/libicuuc.so when searching for -licuuc /usr/bin/ld: skipping incompatible /usr/lib/x86_64-linux-gnu/libicuuc.a when searching for -licuuc /usr/bin/ld: cannot find -licuuc /usr/bin/ld: skipping incompatible /usr/lib/x86_64-linux-gnu/libicudata.so when searching for -licudata /usr/bin/ld: skipping incompatible /usr/lib/x86_64-linux-gnu/libicudata.a when searching for -licudata /usr/bin/ld: cannot find -licudata /usr/bin/ld: skipping incompatible /usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1 collect2: error: ld returned 1 exit status So use the bundled icu instead, as it needs an icu with a bitness matching the bitness of the target, and other complexities. Signed-off-by: Kadir Yilmaz Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/qt5webengine.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 836ba621899..56f951fdbe6 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -61,7 +61,6 @@ QT5WEBENGINE_DEPENDENCIES += \ host-freetype \ host-gperf \ host-harfbuzz \ - host-icu \ host-ninja \ host-nodejs \ host-pkgconf \ @@ -87,7 +86,6 @@ QT5WEBENGINE_DEPENDENCIES += \ QT5WEBENGINE_CONF_OPTS += \ -webengine-embedded-build \ -webengine-ffmpeg \ - -webengine-icu \ -webengine-opus \ -webengine-webchannel \ -webengine-webp \ From efc5e6ad52150d2724867df672677eb668eb4807 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 16:25:18 +0200 Subject: [PATCH 1846/3013] package/qt5/qt5webengine-chromium: another fix for Python 3.12 issue Further down the build: FAILED: gen/components/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/host-bin/python ../../3rdparty/chromium/components/resources/ssl/ssl_error_assistant/gen_ssl_error_assistant_proto.py -w -i ../../3rdparty/chromium/components/resources/ssl/ssl_error_assistant/ssl_error_assistant.asciipb -d gen/components/resources/ssl/ssl_error_assistant -o ssl_error_assistant.pb -p pyproto -p pyproto/components/security_interstitials/content/ Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/components/resources/ssl/ssl_error_assistant/gen_ssl_error_assistant_proto.py", line 23, in from binary_proto_generator import BinaryProtoGenerator File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py", line 12, in import imp ModuleNotFoundError: No module named 'imp' Backport an upstream patch fixing this. Signed-off-by: Thomas Petazzoni --- ...oad_source-with-importlib-equivalent.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0007-Replace-imp.load_source-with-importlib-equivalent.patch diff --git a/package/qt5/qt5webengine-chromium/0007-Replace-imp.load_source-with-importlib-equivalent.patch b/package/qt5/qt5webengine-chromium/0007-Replace-imp.load_source-with-importlib-equivalent.patch new file mode 100644 index 00000000000..d001a887fa7 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0007-Replace-imp.load_source-with-importlib-equivalent.patch @@ -0,0 +1,55 @@ +From d08221f81f35f2755088c2a174cfdc230eb1dcc4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= +Date: Wed, 25 Oct 2023 06:20:54 +0000 +Subject: [PATCH] Replace imp.load_source with importlib equivalent. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The imp module has been deprecated for years and the function +load_source was even removed from the documentation long ago. + +It will be removed in Python 3.12, which will be part of Fedora +version 39, due in late October 2023. + +Bug: 1487454 +Change-Id: If06a2f139225b62c7bdc70c3eaef6e5acb8972d2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4894238 +Reviewed-by: Mustafa Emre Acer +Commit-Queue: Jacobo Aragunde Pérez +Cr-Commit-Position: refs/heads/main@{#1214660} +Upstream: https://github.com/chromium/chromium/commit/9e0c89a3b5638ba2b9b107fea34a01c774aa7805 +Signed-off-by: Thomas Petazzoni +--- + .../resources/protobufs/binary_proto_generator.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 16365515f26..c8b11f1071a 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -9,7 +9,7 @@ + """ + from __future__ import print_function + import abc +-import imp ++from importlib import util as imp_util + import optparse + import os + import re +@@ -68,7 +68,11 @@ class GoogleProtobufModuleImporter: + raise ImportError(fullname) + + filepath = self._fullname_to_filepath(fullname) +- return imp.load_source(fullname, filepath) ++ spec = imp_util.spec_from_file_location(fullname, filepath) ++ loaded = imp_util.module_from_spec(spec) ++ spec.loader.exec_module(loaded) ++ ++ return loaded + + class BinaryProtoGenerator: + +-- +2.25.1 + From 649101f6e65c5345e97229d31f19ea1f8e7b16c4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 17:36:15 +0200 Subject: [PATCH 1847/3013] package/qt5/qt5webengine-chromium: fix Python 3.12 issue in protobuf copy Fixes: Traceback (most recent call last): File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/components/resources/ssl/ssl_error_assistant/gen_ssl_error_assistant_proto.py", line 71, in sys.exit(main()) ^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/components/resources/ssl/ssl_error_assistant/gen_ssl_error_assistant_proto.py", line 68, in main return SSLErrorAssistantProtoGenerator().Run() ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py", line 200, in Run self._ImportProtoModules(opts.path) File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py", line 107, in _ImportProtoModules self.ImportProtoModule() File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/../../3rdparty/chromium/components/resources/ssl/ssl_error_assistant/gen_ssl_error_assistant_proto.py", line 33, in ImportProtoModule import ssl_error_assistant_pb2 File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/pyproto/components/security_interstitials/content/ssl_error_assistant_pb2.py", line 9, in from google.protobuf import reflection as _reflection File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/pyproto/google/protobuf/reflection.py", line 51, in from google.protobuf import message_factory File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/pyproto/google/protobuf/message_factory.py", line 49, in from google.protobuf.internal import python_message as message_impl File "/home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.14/src/core/release/pyproto/google/protobuf/internal/python_message.py", line 59, in from six.moves import range ModuleNotFoundError: No module named 'six.moves' Signed-off-by: Thomas Petazzoni --- ...google-protobuf-internal-python_mess.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0008-protobuf-python-google-protobuf-internal-python_mess.patch diff --git a/package/qt5/qt5webengine-chromium/0008-protobuf-python-google-protobuf-internal-python_mess.patch b/package/qt5/qt5webengine-chromium/0008-protobuf-python-google-protobuf-internal-python_mess.patch new file mode 100644 index 00000000000..810e71475af --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0008-protobuf-python-google-protobuf-internal-python_mess.patch @@ -0,0 +1,51 @@ +From f01ebcd09a0b43589671fc8573bd0c00781c618e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 17:34:13 +0200 +Subject: [PATCH] protobuf/python/google/protobuf/internal/python_message.py: + fix Python 3.12 compatibility + +This is a part of the larger commit +29527fb6f77bdf5f2393f2327fec590c6deab27f from Chromium, which updates +their internal copy of protobuf to 3.20.0. + +Upstream: https://github.com/chromium/chromium/commit/29527fb6f77bdf5f2393f2327fec590c6deab27f (part of) +Signed-off-by: Thomas Petazzoni +--- + .../python/google/protobuf/internal/python_message.py | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py b/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py +index 803ae848493..a1954ce88c9 100755 +--- a/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py ++++ b/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py +@@ -55,9 +55,6 @@ import struct + import sys + import weakref + +-import six +-from six.moves import range +- + # We use "as" to avoid name collisions with variables. + from google.protobuf.internal import api_implementation + from google.protobuf.internal import containers +@@ -467,7 +464,7 @@ def _ReraiseTypeErrorWithFieldName(message_name, field_name): + exc = TypeError('%s for field %s.%s' % (str(exc), message_name, field_name)) + + # re-raise possibly-amended exception with original traceback: +- six.reraise(type(exc), exc, sys.exc_info()[2]) ++ raise exc.with_traceback(sys.exc_info()[2]) + + + def _AddInitMethod(message_descriptor, cls): +@@ -480,7 +477,7 @@ def _AddInitMethod(message_descriptor, cls): + enum_type with the same name. If the value is not a string, it's + returned as-is. (No conversion or bounds-checking is done.) + """ +- if isinstance(value, six.string_types): ++ if isinstance(value, str): + try: + return enum_type.values_by_name[value].number + except KeyError: +-- +2.25.1 + From 430edbdc8820087a31be9e1c0e8c922753d24021 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:19:30 +0200 Subject: [PATCH 1848/3013] package/qt5/qt5webengine-chromium: add patch fixing a C++ build issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport a small subset of an upstream patch to fix: ../../3rdparty/chromium/gpu/command_buffer/service/program_manager.cc: In member function ‘std::string gpu::gles2::Program::ProcessLogInfo(const std::string&)’: ../../3rdparty/chromium/gpu/command_buffer/service/program_manager.cc:623:25: error: ‘using re2::StringPiece = class absl::string_view’ {aka ‘class absl::string_view’} has no member named ‘as_string’ 623 | return output + input.as_string(); | ^~~~~~~~~ Signed-off-by: Thomas Petazzoni --- ...mand_buffer-service-program_manager..patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0009-chromium-gpu-command_buffer-service-program_manager..patch diff --git a/package/qt5/qt5webengine-chromium/0009-chromium-gpu-command_buffer-service-program_manager..patch b/package/qt5/qt5webengine-chromium/0009-chromium-gpu-command_buffer-service-program_manager..patch new file mode 100644 index 00000000000..4dc8514d37b --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0009-chromium-gpu-command_buffer-service-program_manager..patch @@ -0,0 +1,38 @@ +From dbb4ea2d1f410df29eee5a0a06bfb8318b0781dc Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 18:17:25 +0200 +Subject: [PATCH] chromium/gpu/command_buffer/service/program_manager.cc: + StringPiece::as_string() is gone +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix: + +chromium/gpu/command_buffer/service/program_manager.cc:623:25: error: ‘using re2::StringPiece = class absl::string_view’ {aka ‘class absl::string_view’} has no member named ‘as_string’ + +By taking a small subset of upstream commit +https://github.com/chromium/chromium/commit/8d7cdb7b45abb2725200cde990d795024b405e79; + +Upstream: https://github.com/chromium/chromium/commit/8d7cdb7b45abb2725200cde990d795024b405e79 +Signed-off-by: Thomas Petazzoni +--- + chromium/gpu/command_buffer/service/program_manager.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/gpu/command_buffer/service/program_manager.cc b/chromium/gpu/command_buffer/service/program_manager.cc +index 021530c7e39..5fb3e2b768e 100644 +--- a/chromium/gpu/command_buffer/service/program_manager.cc ++++ b/chromium/gpu/command_buffer/service/program_manager.cc +@@ -620,7 +620,7 @@ std::string Program::ProcessLogInfo(const std::string& log) { + output += hashed_name; + } + +- return output + input.as_string(); ++ return output + std::string(input); + } + + void Program::UpdateLogInfo() { +-- +2.25.1 + From 31d676229dff5134f3dda66d08a6ce409ab81e99 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:21:31 +0200 Subject: [PATCH 1849/3013] package/qt5/qt5webengine: use bundled ffmpeg Buildroot has moved to a modern ffmpeg, and the version of Chromium part of qtwebengine is not ready to work with this modern version of ffmpeg. While Chromium has been updated upstream to support a more recent ffmpeg, it requires the backport of too many patches, so let's use the bundled ffmpeg. Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/Config.in | 3 +-- package/qt5/qt5webengine/qt5webengine.mk | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 67c843e5f6a..57cbe301f0a 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2 - depends on BR2_TOOLCHAIN_HAS_THREADS # ffmpeg, libglib2, libvpx, qt5base-dbus + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs @@ -40,7 +40,6 @@ config BR2_PACKAGE_QT5WEBENGINE # flag (for 64-bits, it adds the -m64 flag). # https://github.com/v8/v8/blob/5.6.326.55/gypfiles/toolchain.gypi#L1036-L1037 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium - select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LCMS2 select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBGLIB2 diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 56f951fdbe6..bccd460aa72 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -70,7 +70,6 @@ QT5WEBENGINE_DEPENDENCIES += \ host-python3 \ host-webp \ host-zlib \ - ffmpeg \ freetype \ jpeg \ lcms2 \ @@ -85,7 +84,6 @@ QT5WEBENGINE_DEPENDENCIES += \ QT5WEBENGINE_CONF_OPTS += \ -webengine-embedded-build \ - -webengine-ffmpeg \ -webengine-opus \ -webengine-webchannel \ -webengine-webp \ From 3c998848b4c75601f8e55a886d79b4d51bb6f83f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 21:27:30 +0200 Subject: [PATCH 1850/3013] package/qt5/qt5webengine-chromium: fix build with recent libxml2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport upstream qtwebengine-chromium patch to fix: ./../../3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc: In function ‘xmlDoc* blink::DocLoaderFunc(const xmlChar*, xmlDictPtr, int, void*, xsltLoadType)’: ./../../3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc:127:32: error: invalid conversion from ‘void (*)(void*, xmlError*)’ {aka ‘void (*)(void*, _xmlError*)’} to ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void*, const _xmlError*)’} [-fpermissive] 127 | xmlSetStructuredErrorFunc(console, XSLTProcessor::ParseErrorFunc); | ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)} Signed-off-by: Thomas Petazzoni --- ...010-Fix-building-with-system-libxml2.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium/0010-Fix-building-with-system-libxml2.patch diff --git a/package/qt5/qt5webengine-chromium/0010-Fix-building-with-system-libxml2.patch b/package/qt5/qt5webengine-chromium/0010-Fix-building-with-system-libxml2.patch new file mode 100644 index 00000000000..4a4dade2030 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0010-Fix-building-with-system-libxml2.patch @@ -0,0 +1,57 @@ +From 67ceca4b097a2d3de28020c9461641d9670009cc Mon Sep 17 00:00:00 2001 +From: Martin Negyokru +Date: Thu, 7 Dec 2023 15:37:53 +0100 +Subject: [PATCH] Fix building with system libxml2 + +Libxml2 2.12.0 has changed the const-ness of the +xmlError pointers, which results in a build error. + +Change-Id: Id86fcfbfe004f89109808b9bdb11c01133553884 +Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/523633 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 159dff274a7f32f9b53711df6a5b6fbae8c64b4a) +Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/525714 +Reviewed-by: Qt Cherry-pick Bot +Upstream: https://github.com/qt/qtwebengine-chromium/commit/c98d28f2f0f23721 +Signed-off-by: Thomas Petazzoni +--- + .../third_party/blink/renderer/core/xml/xslt_processor.h | 5 +++++ + .../blink/renderer/core/xml/xslt_processor_libxslt.cc | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/chromium/third_party/blink/renderer/core/xml/xslt_processor.h b/chromium/third_party/blink/renderer/core/xml/xslt_processor.h +index e501cf17c37..e4550ec5009 100644 +--- a/chromium/third_party/blink/renderer/core/xml/xslt_processor.h ++++ b/chromium/third_party/blink/renderer/core/xml/xslt_processor.h +@@ -79,7 +79,12 @@ class XSLTProcessor final : public ScriptWrappable { + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void ParseErrorFunc(void* user_data, const xmlError*); ++#else + static void ParseErrorFunc(void* user_data, xmlError*); ++#endif ++ + static void GenericErrorFunc(void* user_data, const char* msg, ...); + + // Only for libXSLT callbacks +diff --git a/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc +index b3ce345f320..2174d1df1da 100644 +--- a/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc ++++ b/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc +@@ -60,7 +60,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { ++#else + void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { ++#endif + FrameConsole* console = static_cast(user_data); + if (!console) + return; +-- +2.25.1 + From 33b5412b7869bba90ffc63fa00da763a64c981a8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 11:29:29 +0200 Subject: [PATCH 1851/3013] package/qt5/qt5webengine: use bundled re2 When we use Buildroot's re2 package to build qt5webengine, there is an issue at link time as the qt5webengine mistakenly uses the abseil-cpp headers of its built-in copy rather than the ones of our abseil-cpp library, built as a dependency of re2. However, we build our abseil-cpp differently than the one bundled, and that causes some conflicts. Since teaching Chromium's build system to not use its own abseil-cpp headers is an adventure we'd rather not engage into, we fallback to use the bundled re2. Therefore, we drop in Config.in all dependencies that were inherited from Buildroot's re2 package. This warrants a few comments: - BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS should be dropped because the list of architectures supported by our Buildroot abseil-cpp package may be different than the set of architectures supported by the bundled abseil-cpp in Chromium. In addition, the list of architectures in BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS is also a very limited subset of BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS, so this change will not expose the build of qt5webengine to additional architectures. - We're dropping BR2_TOOLCHAIN_GCC_AT_LEAST_8 because it was inherited from re2. The main qt5 package anyway depends on gcc >= 5.x. We will figure out thanks to the autobuilders exactly which gcc version is needed. Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/Config.in | 9 ++------- package/qt5/qt5webengine/qt5webengine.mk | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 57cbe301f0a..28786bd2c8a 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -9,13 +9,11 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus - depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # re2 -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ host gcc >= 4.9, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR comment "qt5webengine needs an OpenGL and EGL-capable backend" @@ -25,10 +23,8 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend" config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS # re2 depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs @@ -50,7 +46,6 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_MINIZIP select BR2_PACKAGE_OPUS - select BR2_PACKAGE_RE2 select BR2_PACKAGE_SNAPPY select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index bccd460aa72..529a83df6cc 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -78,7 +78,6 @@ QT5WEBENGINE_DEPENDENCIES += \ libvpx \ libxml2 \ libxslt \ - re2 \ snappy \ webp @@ -104,7 +103,6 @@ QT5WEBENGINE_CONF_OPTS += \ -feature-webengine-system-ninja \ -feature-webengine-system-nss \ -feature-webengine-system-png \ - -feature-webengine-system-re2 \ -feature-webengine-system-snappy \ -feature-webengine-system-zlib From c53455ea4ffaaee050e1e43a3c15fa98324d5235 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 15:12:13 +0200 Subject: [PATCH 1852/3013] package/qt5/qt5webengine-chromium: bump version after qtwebengine bump In commit ca9e08277c473de1d0119768661ce0ba96559a7a ("package/qt5: bump packages to latest kde submodule versions"), the version of Qt5 was bumped to 5.15.14. This means that the version of qt5webengine being built is now qtwebengine-v5.15.14-lts.tar.bz2. However, qt5webengine-chromium is packaging a submodule of qtwebengine, so we must keep them in sync, and therefore it should have been updated. The current version of qt5webengine-chromium, 0ad2814370799a2161057d92231fe3ee00e2fe98, was matching with 5.15.11-lts, but for 5.15.14-lts, we need to use 18c9261dc5b8aa57a0bdd5b62ce6f648cca1ef5e, as can be seen at: https://github.com/qt/qtwebengine/tree/v5.15.14-lts/src (thirdparty submodule) Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash | 2 +- package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash index 103e27d8892..270da153c65 100644 --- a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 +sha256 fb0953b0cc7b980f128d5f66b8345eb4fbf2e05b70db3926958fb657953b64dc qtwebengine-chromium-18c9261dc5b8aa57a0bdd5b62ce6f648cca1ef5e.tar.bz2 # Locally calculated with: # for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk index 2b061815b5c..fc48945e0d4 100644 --- a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_VERSION = 18c9261dc5b8aa57a0bdd5b62ce6f648cca1ef5e QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult From c3068530747157cb130be2765ce1fd20d28e7ba9 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 12:49:31 +0100 Subject: [PATCH 1853/3013] package/tio: install bash-completions See meson_options.txt file [1]. [1] https://github.com/tio/tio/blob/master/meson_options.txt Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/tio/tio.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tio/tio.mk b/package/tio/tio.mk index d7b554ee847..95831e8ce69 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -11,4 +11,10 @@ TIO_LICENSE = GPL-2.0+ TIO_LICENSE_FILES = LICENSE TIO_DEPENDENCIES = inih +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions +else +TIO_CONF_OPTS +=-Dbashcompletiondir=no +endif + $(eval $(meson-package)) From 2fe638af2632424b826843675311f9a258a57b71 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 13:56:49 +0100 Subject: [PATCH 1854/3013] support/testing: add python-asn1crypto runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ .../tests/package/sample_python_asn1crypto.py | 11 +++++++++++ .../testing/tests/package/test_python_asn1crypto.py | 13 +++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 support/testing/tests/package/sample_python_asn1crypto.py create mode 100644 support/testing/tests/package/test_python_asn1crypto.py diff --git a/DEVELOPERS b/DEVELOPERS index 22867fea07c..4a22b747790 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2180,6 +2180,8 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/selinux-python/ +F: support/testing/tests/package/sample_python_asn1crypto.py +F: support/testing/tests/package/test_python_asn1crypto.py F: utils/config F: utils/diffconfig diff --git a/support/testing/tests/package/sample_python_asn1crypto.py b/support/testing/tests/package/sample_python_asn1crypto.py new file mode 100644 index 00000000000..0b104875726 --- /dev/null +++ b/support/testing/tests/package/sample_python_asn1crypto.py @@ -0,0 +1,11 @@ +from asn1crypto import pem, x509 + + +with open('/etc/ssl/certs/ISRG_Root_X2.pem', 'rb') as f: + der_bytes = f.read() + if pem.detect(der_bytes): + type_name, headers, der_bytes = pem.unarmor(der_bytes) + +cert = x509.Certificate.load(der_bytes) + +assert cert.subject.native["common_name"] == "ISRG Root X2" diff --git a/support/testing/tests/package/test_python_asn1crypto.py b/support/testing/tests/package/test_python_asn1crypto.py new file mode 100644 index 00000000000..97df3d3ac83 --- /dev/null +++ b/support/testing/tests/package/test_python_asn1crypto.py @@ -0,0 +1,13 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Asn1Crypto(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ASN1CRYPTO=y + """ + sample_scripts = ["tests/package/sample_python_asn1crypto.py"] + timeout = 40 From 4574edef7fabb3c1fb5279c0fcfb5c83c3f0e057 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 12 Apr 2024 23:43:06 +0200 Subject: [PATCH 1855/3013] package/libnpth: add host variant This is needed to support a host build of gnupg2. It is not directly selectable. Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/libnpth/libnpth.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index 3fa5e1f9055..634da6ed3a7 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -13,5 +13,7 @@ LIBNPTH_INSTALL_STAGING = YES # 0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch LIBNPTH_AUTORECONF = YES LIBNPTH_CONF_OPTS = --disable-tests +HOST_LIBNPTH_CONF_OPTS = --disable-tests $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 89ff62a0f4c3a97161af38518b3964e32d54341b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 14:19:20 +0200 Subject: [PATCH 1856/3013] package/libgpgme: drop HOST_LIBGPGME_CONFIG_SCRIPTS This variable was added in commit 6a4ad23a07236348034a54997dd09e79166f2d11 ("package/libgpgme: add host variant"), but in fact does not make sense for a host package. Indeed, config scripts only need to be tweaked for target packages, and in any case, the _CONFIG_SCRIPTS variable is only used during staging installation (to tweak the config scripts) and during target installation (to remove them), and neither staging nor target installation are relevant for host packages. Therefore, let's remove this small piece of dead code. Signed-off-by: Thomas Petazzoni --- package/libgpgme/libgpgme.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 7e224e1962c..635aea49550 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -48,7 +48,6 @@ LIBGPGME_CONF_OPTS += --disable-linux-getdents endif HOST_LIBGPGME_DEPENDENCIES = host-libassuan host-libgpg-error -HOST_LIBGPGME_CONFIG_SCRIPTS = gpgme-config # C++ bindings require a C++11 capable gcc, and -Wsuggest-override support # Let's assume the host toolchain always has C++ From fc8355c7f56e775b6aa801270a0c679d3f78198d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 14:21:30 +0200 Subject: [PATCH 1857/3013] package/libassuan: drop HOST_LIBGPGME_CONFIG_SCRIPTS This variable was added in commit 62c7857dfa5036e26d5b921c199e66621a4bc508 ("package/libassuan: add host variant"), but in fact does not make sense for a host package. Indeed, config scripts only need to be tweaked for target packages, and in any case, the _CONFIG_SCRIPTS variable is only used during staging installation (to tweak the config scripts) and during target installation (to remove them), and neither staging nor target installation are relevant for host packages. Therefore, let's remove this small piece of dead code. Signed-off-by: Thomas Petazzoni --- package/libassuan/libassuan.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk index 8e827bdb808..9cdc34bda28 100644 --- a/package/libassuan/libassuan.mk +++ b/package/libassuan/libassuan.mk @@ -16,7 +16,6 @@ LIBASSUAN_CONF_OPTS = \ LIBASSUAN_CONFIG_SCRIPTS = libassuan-config HOST_LIBASSUAN_DEPENDENCIES = host-libgpg-error -HOST_LIBASSUAN_CONFIG_SCRIPTS = libassuan-config HOST_LIBASSUAN_CONF_OPTS = --with-gpg-error-prefix=$(HOST_DIR) # Force the path to "gpgrt-config" (from the libgpg-error package) to From e49102f93483f47edce321876e450639f40f5df2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 12 Apr 2024 23:43:08 +0200 Subject: [PATCH 1858/3013] package/libgcrypt: add host variant This is needed to support a host build of gnupg2. It is not directly selectable. Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/libgcrypt/libgcrypt.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 7a68a95c98f..ae50ead3436 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -31,4 +31,10 @@ ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) LIBGCRYPT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif +HOST_LIBGCRYPT_DEPENDENCIES = host-libgpg-error +HOST_LIBGCRYPT_CONF_OPTS = \ + --disable-tests \ + --with-gpg-error-prefix=$(HOST_DIR) + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From c0734f68612b39e5dc863cbc8262afbb6af07e93 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 12 Apr 2024 23:43:09 +0200 Subject: [PATCH 1859/3013] package/libksba: add host variant This is needed to support a host build of gnupg2. It is not directly selectable. Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/libksba/libksba.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index b87efda2263..03e455145a3 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -13,9 +13,13 @@ LIBKSBA_CPE_ID_VENDOR = gnupg LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr +HOST_LIBKSBA_DEPENDENCIES = host-libgpg-error +HOST_LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(HOST_DIR) # Force the path to "gpgrt-config" (from the libgpg-error package) to # avoid using the one on host, if present. LIBKSBA_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config +HOST_LIBKSBA_CONF_ENV += GPGRT_CONFIG=$(HOST_DIR)/bin/gpgrt-config $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 54c92715dd2293c8e649a619ddfaa6b036b4b3a4 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 12 Apr 2024 23:43:10 +0200 Subject: [PATCH 1860/3013] package/gnupg2: add host variant Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/gnupg2/Config.in.host | 13 +++++++++++++ package/gnupg2/gnupg2.mk | 16 ++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 package/gnupg2/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 5843210d100..4340e6e8c95 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -43,6 +43,7 @@ menu "Host utilities" source "package/genimage/Config.in.host" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" + source "package/gnupg2/Config.in.host" source "package/go/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" diff --git a/package/gnupg2/Config.in.host b/package/gnupg2/Config.in.host new file mode 100644 index 00000000000..c636cbee8b4 --- /dev/null +++ b/package/gnupg2/Config.in.host @@ -0,0 +1,13 @@ +config BR2_PACKAGE_HOST_GNUPG2 + bool "host gnupg2" + depends on !BR2_PACKAGE_HOST_GNUPG + help + GnuPG is the GNU project's complete and free implementation + of the OpenPGP standard as defined by RFC4880. GnuPG allows + to encrypt and sign your data and communication, features a + versatile key management system as well as access modules + for all kinds of public key directories. GnuPG, also known + as GPG, is a command line tool with features for easy + integration with other applications. + + http://gnupg.org/ diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 39b0a066f67..d38aaeec1af 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -14,6 +14,8 @@ GNUPG2_CPE_ID_PRODUCT = gnupg GNUPG2_SELINUX_MODULES = gpg GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf +HOST_GNUPG2_DEPENDENCIES = host-zlib host-libgpg-error host-libgcrypt host-libassuan \ + host-libksba host-libnpth host-pkgconf GNUPG2_CONF_OPTS = \ --disable-rpath \ @@ -23,9 +25,22 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr +HOST_GNUPG2_CONF_OPTS = \ + --with-gpg-error-prefix=$(HOST_DIR) \ + --with-libgcrypt-prefix=$(HOST_DIR) \ + --with-libassuan-prefix=$(HOST_DIR) \ + --with-ksba-prefix=$(HOST_DIR) \ + --with-npth-prefix=$(HOST_DIR) \ + --disable-bzip2 \ + --disable-gnutls \ + --disable-ccid-driver \ + --without-readline \ + --disable-sqlite + # Force the path to "gpgrt-config" (from the libgpg-error package) to # avoid using the one on host, if present. GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config +HOST_GNUPG2_CONF_ENV += GPGRT_CONFIG=$(HOST_DIR)/bin/gpgrt-config ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) define GNUPG2_REMOVE_GPGV @@ -71,3 +86,4 @@ GNUPG2_CONF_OPTS += --disable-sqlite endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 6889056f1eb4293de67c28b1ff6ee34be05d2ee4 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 21 Apr 2024 11:53:52 +0200 Subject: [PATCH 1861/3013] support/scripts/genimage.sh: support creating a bmap image The patch adds the possibility to create, in addition to the usual image, an image of type bmap that drastically reduces the amount of data that needs to be written to an SD card, resulting in time savings. It looks at whether BR2_PACKAGE_HOST_BMAP_TOOLS is enabled to decide whether it should or not generate bmap tool images. It generates bmap images for all images referenced in the genimage configuration file, as long as they exist in $(BINARIES_DIR). Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- support/scripts/genimage.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh index 2796e19eb77..b479ec9e0b0 100755 --- a/support/scripts/genimage.sh +++ b/support/scripts/genimage.sh @@ -46,3 +46,14 @@ genimage \ --inputpath "${BINARIES_DIR}" \ --outputpath "${BINARIES_DIR}" \ --config "${GENIMAGE_CFG}" + +if grep -Eq "^BR2_PACKAGE_HOST_BMAP_TOOLS=y$" "${BR2_CONFIG}"; then + while IFS= read -r image; do + image_path="${BINARIES_DIR}/${image}" + if ! test -f "${image_path}"; then + continue + fi + bmaptool create "${image_path}" -o "${image_path}.bmap" + gzip -c "${image_path}" > "${image_path}.gz" + done < <(grep '^image ' "${GENIMAGE_CFG}" | cut -d ' ' -f 2) +fi From 64fb66537bfddd197d09549b007a7f8b29a3507f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Mon, 15 Jul 2024 16:17:56 +0200 Subject: [PATCH 1862/3013] Makefile: fix make help MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing ' to fix `make help'. This fixes the following error: /bin/bash: -c: line 1: unexpected EOF while looking for matching `'' make: *** [Makefile:1180: help] Error 2 Fixes: ca6c896bdd75cf334ac9a02a6dd786415221f55e Signed-off-by: Vincent Stehlé Cc: Steve Hay Signed-off-by: Arnout Vandecappelle --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index faaf0f165c3..0432a014abe 100644 --- a/Makefile +++ b/Makefile @@ -1177,7 +1177,7 @@ help: @echo ' -graph-rdepends - Generate a graph of '\''s reverse dependencies' @echo ' -graph-both-depends' @echo ' - Generate a graph of both '\''s forward and' - @echo ' reverse dependencies. + @echo ' reverse dependencies.' @echo ' -dirclean - Remove build directory' @echo ' -reconfigure - Restart the build from the configure step' @echo ' -rebuild - Restart the build from the build step' From 51aa8da4e5bd3006a045a5202392888eb6b9fc1f Mon Sep 17 00:00:00 2001 From: Romain Gantois Date: Thu, 11 Jul 2024 11:12:06 +0200 Subject: [PATCH 1863/3013] package/gcnano-binaries: Add STM32MP2 support and bump to 6.4.15 Add initial support for STM32MP257 GPU drivers. gcnano-binaries will be configured for STM32MP1 platforms on ARM 32-bits and STM32MP2 on ARM 64-bits. Update to the latest version of the gcnano-binaries blobs, which are compatible with the last v6.1-stm32mp-r2 kernel from the STMicroelectronics BSP. Signed-off-by: Romain Gantois Signed-off-by: Kory Maincent Signed-off-by: Arnout Vandecappelle --- package/gcnano-binaries/Config.in | 6 +++--- package/gcnano-binaries/gcnano-binaries.hash | 2 +- package/gcnano-binaries/gcnano-binaries.mk | 20 +++++++++++++++----- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/package/gcnano-binaries/Config.in b/package/gcnano-binaries/Config.in index 89f909f2c30..f01468f09ff 100644 --- a/package/gcnano-binaries/Config.in +++ b/package/gcnano-binaries/Config.in @@ -1,15 +1,15 @@ comment "gcnano-binaries needs a Linux kernel to be built" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_LINUX_KERNEL comment "gcnano-binaries needs a glibc toolchain w/ threads, dynamic library" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS \ || BR2_STATIC_LIBS config BR2_PACKAGE_GCNANO_BINARIES bool "gcnano-binaries" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_LINUX_KERNEL depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index 3192b0d8548..d3c64d44a39 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8bb1f6ee633f3c30e16b33ff6913286edf31f77b69105a14d147509beba3ea94 gcnano-binaries-5d02efd5cb4cfa85307633891f3cf87550a8bc1d.tar.gz +sha256 4c7454ac44c9e3ead20a978a5c009e8489fa90ce5cf291be31016a7f497bea26 gcnano-binaries-bbaae49a0e4859ed53f898a250269c8a237261bc.tar.gz sha256 29c78804b097b5cfee0e802bef9f60348a635640eadd8a91b7ce82ddf17fbf5a EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index c3aa5d48d22..03912ea585d 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,11 +4,20 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4.13 +GCNANO_BINARIES_LIB_VERSION = 6.4.15 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20230517 -GCNANO_BINARIES_VERSION = 5d02efd5cb4cfa85307633891f3cf87550a8bc1d + GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) +GCNANO_BINARIES_VERSION = bbaae49a0e4859ed53f898a250269c8a237261bc +ifeq ($(BR2_arm),y) +GCNANO_BINARIES_USERLAND_VERSION = stm32mp1-$(GCNANO_BINARIES_LIB_VERSION)-20240206 +GCNANO_BINARIES_ARCH_TYPE = arm +GCNANO_BINARIES_SOC_PLATFORM = st-mp1 +else +GCNANO_BINARIES_USERLAND_VERSION = stm32mp2-$(GCNANO_BINARIES_LIB_VERSION)-20240517 +GCNANO_BINARIES_ARCH_TYPE = arm64 +GCNANO_BINARIES_SOC_PLATFORM = st-mp2 +endif GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms GCNANO_BINARIES_LICENSE_FILES = EULA @@ -38,8 +47,9 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER GCNANO_BINARIES_MODULE_SUBDIRS = gcnano-driver-stm32mp GCNANO_BINARIES_MODULE_MAKE_OPTS = \ + ARCH_TYPE=$(GCNANO_BINARIES_ARCH_TYPE) \ KERNEL_DIR=$(LINUX_DIR) \ - SOC_PLATFORM=st-mp1 \ + SOC_PLATFORM=$(GCNANO_BINARIES_SOC_PLATFORM) \ AQROOT=$(@D)/gcnano-driver-stm32mp \ DEBUG=0 @@ -58,7 +68,7 @@ define GCNANO_BINARIES_INSTALL cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/ cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \ for file in *.pc ; do \ - sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|22.0.3|" $$file > $$file.temp ; \ + sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|23.0.3|" $$file > $$file.temp ; \ $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \ done endef From 664f02a60c98536e516ba8a802bceba40418a34c Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 11 Jul 2024 11:27:28 +0200 Subject: [PATCH 1864/3013] boot/optee-os: Add support to build with host-cmake Some specific versions of OP-TEE need cmake on the host to build the scmi firmware, like the newly release STMicroelectronics 3.19.0-stm32mp-r2 version. To allow building such OP-TEE OS versions, this commit adds the option BR2_TARGET_OPTEE_OS_NEEDS_CMAKE which when enabled ensures that host-cmake is built before OP-TEE OS. Signed-off-by: Kory Maincent [Arnout: use BR2_CMAKE_HOST_DEPENDENCY] Signed-off-by: Arnout Vandecappelle --- boot/optee-os/Config.in | 6 ++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 34ea9931367..78706297325 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -91,6 +91,12 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY python-cryptography. Select this option if optee-os needs python-cryptography to be built. +config BR2_TARGET_OPTEE_OS_NEEDS_CMAKE + bool "OP-TEE OS needs cmake" + help + Select this option if your OP-TEE OS platform configuration + requires the cmake build system to be available. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 33b4e2e1ab4..6b04a0f5e13 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -30,6 +30,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_CMAKE),y) +OPTEE_OS_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) +endif + ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) OPTEE_OS_DEPENDENCIES += host-python-cryptography else From 69cbb563a124002fcb3e2725c3516b502587f9cc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 16:26:14 +0200 Subject: [PATCH 1865/3013] package/tar: properly handle autoreconf Commit 9a66711be1786b90f94cbb1648fa470def3486f8 ("package/tar: fix linking with libiconv") added two patches that patch Makefile.am files, but it forgot to add TAR_AUTORECONF = YES. However, a gotcha is that TAR_AUTORECONF = YES would apply to both the target tar, but also the host tar. But for host-tar, we can't accept to do an autoreconf, because this would cause host-tar to have a dependency on host-{autoconf,automake,libtool}, which in turn would have a dependency on host-tar. Since anyway the patches 0002/0003 that modify Makefile.am are only useful to fix a libiconv problem that occurs when building target tar, we disable autoreconf for host-tar, and we prevent automatic autoreconf by touching the right Makefile.in files. This mess can be dropped next time we update tar, as 0002/0003 will be part of the next tar release. Fixes: http://autobuild.buildroot.net/results/efdf7cf9ede810ed7f766cc4138b16054bc0c18a/ Signed-off-by: Thomas Petazzoni --- package/tar/tar.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index b9de082603b..ab8d0fc6831 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -12,6 +12,9 @@ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu TAR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) TAR_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +# 0002-Fix-savannah-bug-#64441.patch +# 0003-tests-fix-LDADD.patch +TAR_AUTORECONF = YES # The package is a dependency to ccache so ccache cannot be a dependency HOST_TAR_ADD_CCACHE_DEPENDENCY = NO @@ -61,4 +64,19 @@ HOST_TAR_CONF_ENV = \ CC="$(HOSTCC_NOCCACHE)" \ CXX="$(HOSTCXX_NOCCACHE)" +# Patches 0002-Fix-savannah-bug-#64441.patch and +# 0003-tests-fix-LDADD.patch are patching Makefile.am, so they do +# require TAR_AUTORECONF = YES above. However, for the host-tar +# package we can't do this: we can't have host-tar depend on +# host-{autoconf,automake,libtool} as those in turn might depend on +# host-tar. Since the patches 0002 and 0003 are only related to +# linking against libiconv, which is only an issue for the target tar, +# we do not autoreconf, and touch the corresponding Makefile.in to +# prevent them from being re-generated. +HOST_TAR_AUTORECONF = NO +define HOST_TAR_NO_AUTORECONF + touch $(@D)/src/Makefile.in $(@D)/tests/Makefile.in +endef +HOST_TAR_POST_PATCH_HOOKS += HOST_TAR_NO_AUTORECONF + $(eval $(host-autotools-package)) From d501775773c473dd2ece04c23dbfa8c74706d19c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Jul 2024 15:09:38 +0200 Subject: [PATCH 1866/3013] package/lua: bump to version 5.4.7 Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 6 +++--- package/lua/5.4.6/lua.hash | 5 ----- package/lua/{5.4.6 => 5.4.7}/0001-root-path.patch | 0 package/lua/{5.4.6 => 5.4.7}/0002-shared-libs-for-lua.patch | 0 .../0011-linenoise.patch => 5.4.7/0003-linenoise.patch} | 2 +- package/lua/5.4.7/lua.hash | 5 +++++ package/lua/lua.mk | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 package/lua/5.4.6/lua.hash rename package/lua/{5.4.6 => 5.4.7}/0001-root-path.patch (100%) rename package/lua/{5.4.6 => 5.4.7}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.4.6/0011-linenoise.patch => 5.4.7/0003-linenoise.patch} (97%) create mode 100644 package/lua/5.4.7/lua.hash diff --git a/.checkpackageignore b/.checkpackageignore index 0613483a135..50fd71663e3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -894,9 +894,9 @@ package/lua/5.1.5/0012-fix-reader-at-eoz.patch lib_patch.Upstream package/lua/5.3.6/0001-root-path.patch lib_patch.Upstream package/lua/5.3.6/0002-shared-libs-for-lua.patch lib_patch.Upstream package/lua/5.3.6/0003-linenoise.patch lib_patch.Upstream -package/lua/5.4.6/0001-root-path.patch lib_patch.Upstream -package/lua/5.4.6/0002-shared-libs-for-lua.patch lib_patch.Upstream -package/lua/5.4.6/0011-linenoise.patch lib_patch.Upstream +package/lua/5.4.7/0001-root-path.patch lib_patch.Upstream +package/lua/5.4.7/0002-shared-libs-for-lua.patch lib_patch.Upstream +package/lua/5.4.7/0003-linenoise.patch lib_patch.Upstream package/luajit/0001-no-bin-symlink.patch lib_patch.Upstream package/luajit/0002-install-inc.patch lib_patch.Upstream package/luasyslog/0001-remove-AX_LUA_LIBS.patch lib_patch.Upstream diff --git a/package/lua/5.4.6/lua.hash b/package/lua/5.4.6/lua.hash deleted file mode 100644 index 0b03fd563c6..00000000000 --- a/package/lua/5.4.6/lua.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz - -# Locally computed -sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html diff --git a/package/lua/5.4.6/0001-root-path.patch b/package/lua/5.4.7/0001-root-path.patch similarity index 100% rename from package/lua/5.4.6/0001-root-path.patch rename to package/lua/5.4.7/0001-root-path.patch diff --git a/package/lua/5.4.6/0002-shared-libs-for-lua.patch b/package/lua/5.4.7/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.4.6/0002-shared-libs-for-lua.patch rename to package/lua/5.4.7/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.4.6/0011-linenoise.patch b/package/lua/5.4.7/0003-linenoise.patch similarity index 97% rename from package/lua/5.4.6/0011-linenoise.patch rename to package/lua/5.4.7/0003-linenoise.patch index 5054ae19e24..2fcbc49f6aa 100644 --- a/package/lua/5.4.6/0011-linenoise.patch +++ b/package/lua/5.4.7/0003-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -438,6 +438,14 @@ +@@ -447,6 +447,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.7/lua.hash b/package/lua/5.4.7/lua.hash new file mode 100644 index 00000000000..d67fdcf6cfa --- /dev/null +++ b/package/lua/5.4.7/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30 lua-5.4.7.tar.gz + +# Locally computed +sha256 33a975a766520bc54de2d71e45442e504effa0519e331e31ee3fc46eca4f98bd doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 93d4803812a..15772dbdf3e 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.6 +LUA_VERSION = 5.4.7 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else From 52df03ba50c2b7bc473650015ccebd67216cc8bf Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Jul 2024 15:09:39 +0200 Subject: [PATCH 1867/3013] package/lua: use Upstream: tag in patches that are upstream Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 4 ---- package/lua/5.1.5/0011-linenoise.patch | 3 +-- package/lua/5.1.5/0012-fix-reader-at-eoz.patch | 3 +-- package/lua/5.3.6/0003-linenoise.patch | 3 +-- package/lua/5.4.7/0003-linenoise.patch | 3 +-- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 50fd71663e3..7a76b57f0f5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -889,14 +889,10 @@ package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch lib_patc package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch lib_patch.Upstream package/lua/5.1.5/0001-root-path.patch lib_patch.Upstream package/lua/5.1.5/0002-shared-libs-for-lua.patch lib_patch.Upstream -package/lua/5.1.5/0011-linenoise.patch lib_patch.Upstream -package/lua/5.1.5/0012-fix-reader-at-eoz.patch lib_patch.Upstream package/lua/5.3.6/0001-root-path.patch lib_patch.Upstream package/lua/5.3.6/0002-shared-libs-for-lua.patch lib_patch.Upstream -package/lua/5.3.6/0003-linenoise.patch lib_patch.Upstream package/lua/5.4.7/0001-root-path.patch lib_patch.Upstream package/lua/5.4.7/0002-shared-libs-for-lua.patch lib_patch.Upstream -package/lua/5.4.7/0003-linenoise.patch lib_patch.Upstream package/luajit/0001-no-bin-symlink.patch lib_patch.Upstream package/luajit/0002-install-inc.patch lib_patch.Upstream package/luasyslog/0001-remove-AX_LUA_LIBS.patch lib_patch.Upstream diff --git a/package/lua/5.1.5/0011-linenoise.patch b/package/lua/5.1.5/0011-linenoise.patch index 488c080a1ea..c0ab200bd83 100644 --- a/package/lua/5.1.5/0011-linenoise.patch +++ b/package/lua/5.1.5/0011-linenoise.patch @@ -1,7 +1,6 @@ Add support of linenoise (replace readline) -see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html - +Upstream: http://lua-users.org/lists/lua-l/2010-03/msg00879.html Signed-off-by: Francois Perrad Index: b/src/luaconf.h diff --git a/package/lua/5.1.5/0012-fix-reader-at-eoz.patch b/package/lua/5.1.5/0012-fix-reader-at-eoz.patch index 17a28ba4c33..fd92147ea53 100644 --- a/package/lua/5.1.5/0012-fix-reader-at-eoz.patch +++ b/package/lua/5.1.5/0012-fix-reader-at-eoz.patch @@ -1,7 +1,6 @@ When loading a file, Lua may call the reader function again after it returned end of input. -Fetch from: http://www.lua.org/bugs.html#5.1.5-2 - +Upstream: https://www.lua.org/bugs.html#5.1.5-2 Signed-off-by: Francois Perrad Index: b/src/lzio.c diff --git a/package/lua/5.3.6/0003-linenoise.patch b/package/lua/5.3.6/0003-linenoise.patch index 574e6c8f0b0..495177c32d3 100644 --- a/package/lua/5.3.6/0003-linenoise.patch +++ b/package/lua/5.3.6/0003-linenoise.patch @@ -1,7 +1,6 @@ Add support of linenoise (replace readline) -see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html - +Upstream: http://lua-users.org/lists/lua-l/2010-03/msg00879.html Signed-off-by: Francois Perrad Index: b/src/lua.c diff --git a/package/lua/5.4.7/0003-linenoise.patch b/package/lua/5.4.7/0003-linenoise.patch index 2fcbc49f6aa..a82c8801adf 100644 --- a/package/lua/5.4.7/0003-linenoise.patch +++ b/package/lua/5.4.7/0003-linenoise.patch @@ -1,7 +1,6 @@ Add support of linenoise (replace readline) -see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html - +Upstream: http://lua-users.org/lists/lua-l/2010-03/msg00879.html Signed-off-by: Francois Perrad Index: b/src/lua.c From ebccc2130379708daba70dfdcc5269c6eadf08e3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Jul 2024 15:09:40 +0200 Subject: [PATCH 1868/3013] package/lua: add tag Upstream in patches not sent upstream Add "Upstream: N/A" tag for patches that were not sent upstream. These are all patches that would not be acceptable for upstream. Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 6 ------ package/lua/5.1.5/0001-root-path.patch | 1 + package/lua/5.1.5/0002-shared-libs-for-lua.patch | 1 + package/lua/5.3.6/0001-root-path.patch | 1 + package/lua/5.3.6/0002-shared-libs-for-lua.patch | 1 + package/lua/5.4.7/0001-root-path.patch | 1 + package/lua/5.4.7/0002-shared-libs-for-lua.patch | 1 + 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 7a76b57f0f5..2e6e8a9cac4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -887,12 +887,6 @@ package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch l package/lua-lunix/0001-remove-link-with-librt.patch lib_patch.Upstream package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch lib_patch.Upstream package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch lib_patch.Upstream -package/lua/5.1.5/0001-root-path.patch lib_patch.Upstream -package/lua/5.1.5/0002-shared-libs-for-lua.patch lib_patch.Upstream -package/lua/5.3.6/0001-root-path.patch lib_patch.Upstream -package/lua/5.3.6/0002-shared-libs-for-lua.patch lib_patch.Upstream -package/lua/5.4.7/0001-root-path.patch lib_patch.Upstream -package/lua/5.4.7/0002-shared-libs-for-lua.patch lib_patch.Upstream package/luajit/0001-no-bin-symlink.patch lib_patch.Upstream package/luajit/0002-install-inc.patch lib_patch.Upstream package/luasyslog/0001-remove-AX_LUA_LIBS.patch lib_patch.Upstream diff --git a/package/lua/5.1.5/0001-root-path.patch b/package/lua/5.1.5/0001-root-path.patch index fd0da6eb578..41de4ba2b93 100644 --- a/package/lua/5.1.5/0001-root-path.patch +++ b/package/lua/5.1.5/0001-root-path.patch @@ -1,5 +1,6 @@ Adjust installation location to /usr. +Upstream: N/A specific for Buildroot build Signed-off-by: Francois Perrad Index: b/etc/lua.pc diff --git a/package/lua/5.1.5/0002-shared-libs-for-lua.patch b/package/lua/5.1.5/0002-shared-libs-for-lua.patch index 3f863a530cb..5ae0756c4c4 100644 --- a/package/lua/5.1.5/0002-shared-libs-for-lua.patch +++ b/package/lua/5.1.5/0002-shared-libs-for-lua.patch @@ -3,6 +3,7 @@ Compile the lua binary with the shared library. And install the shared library. The variable BUILDMODE allows to switch between static and dynamic mode. +Upstream: N/A specific for Buildroot build Signed-off-by: Francois Perrad Index: b/Makefile diff --git a/package/lua/5.3.6/0001-root-path.patch b/package/lua/5.3.6/0001-root-path.patch index a44c55c9551..b41df3ecb74 100644 --- a/package/lua/5.3.6/0001-root-path.patch +++ b/package/lua/5.3.6/0001-root-path.patch @@ -1,5 +1,6 @@ Adjust installation location to /usr. +Upstream: N/A specific for Buildroot build Signed-off-by: Francois Perrad Index: b/src/luaconf.h diff --git a/package/lua/5.3.6/0002-shared-libs-for-lua.patch b/package/lua/5.3.6/0002-shared-libs-for-lua.patch index 493828c9da7..0821007474c 100644 --- a/package/lua/5.3.6/0002-shared-libs-for-lua.patch +++ b/package/lua/5.3.6/0002-shared-libs-for-lua.patch @@ -3,6 +3,7 @@ Compile the lua binary with the shared library. And install the shared library. The variable BUILDMODE allows to switch between static and dynamic mode. +Upstream: N/A specific for Buildroot build Signed-off-by: Francois Perrad Index: b/Makefile diff --git a/package/lua/5.4.7/0001-root-path.patch b/package/lua/5.4.7/0001-root-path.patch index 5e3037b7865..cec9066eee9 100644 --- a/package/lua/5.4.7/0001-root-path.patch +++ b/package/lua/5.4.7/0001-root-path.patch @@ -1,5 +1,6 @@ Adjust installation location to /usr. +Upstream: N/A specific for Buildroot build Signed-off-by: Francois Perrad Index: b/src/luaconf.h diff --git a/package/lua/5.4.7/0002-shared-libs-for-lua.patch b/package/lua/5.4.7/0002-shared-libs-for-lua.patch index 388aa9966a8..61159609569 100644 --- a/package/lua/5.4.7/0002-shared-libs-for-lua.patch +++ b/package/lua/5.4.7/0002-shared-libs-for-lua.patch @@ -3,6 +3,7 @@ Compile the lua binary with the shared library. And install the shared library. The variable BUILDMODE allows to switch between static and dynamic mode. +Upstream: N/A specific for Buildroot build Signed-off-by: Francois Perrad Index: b/Makefile From ae1ddbabc933fd8d3447c47293bebb9ad06427ae Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Jul 2024 15:41:09 +0200 Subject: [PATCH 1869/3013] package/gdbm: bump to version 1.24 Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/gdbm/gdbm.hash | 6 +++--- package/gdbm/gdbm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gdbm/gdbm.hash b/package/gdbm/gdbm.hash index 7449d5dc9da..a9df48908f7 100644 --- a/package/gdbm/gdbm.hash +++ b/package/gdbm/gdbm.hash @@ -1,6 +1,6 @@ # From https://www.gnu.org.ua/software/gdbm/download.html -md5 8551961e36bf8c70b7500d255d3658ec gdbm-1.23.tar.gz -sha1 50ba1b1d45ce33fd44e4fdaaf3b55a9d8f3dc418 gdbm-1.23.tar.gz +md5 c780815649e52317be48331c1773e987 gdbm-1.24.tar.gz +sha1 7bd455f28c9e4afacc042e0c712aac1b2391fef2 gdbm-1.24.tar.gz # Locally computed -sha256 74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd gdbm-1.23.tar.gz +sha256 695e9827fdf763513f133910bc7e6cfdb9187943a4fec943e57449723d2b8dbf gdbm-1.24.tar.gz sha256 690d762f2e8e149ab1e2d6a409a3853b6151a2533b2382fae549a176d6bedecf COPYING diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk index e807a8e1e79..1a2c352d710 100644 --- a/package/gdbm/gdbm.mk +++ b/package/gdbm/gdbm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDBM_VERSION = 1.23 +GDBM_VERSION = 1.24 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm GDBM_LICENSE = GPL-3.0+ GDBM_LICENSE_FILES = COPYING From 99381a141ecc6101801e905e20c8bfa1944206ae Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Jul 2024 15:41:19 +0200 Subject: [PATCH 1870/3013] package/nano: bump to version 8.1 Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index fc9a0947a35..04e3c6290a1 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v8/nano-8.0.tar.xz.asc +# https://www.nano-editor.org/dist/v8/nano-8.1.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4 nano-8.0.tar.xz +sha256 93b3e3e9155ae389fe9ccf9cb7ab380eac29602835ba3077b22f64d0f0cbe8cb nano-8.1.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 72f4de6a0ac..db614feb754 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 8 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).1 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From 9ba1fa13e43cc67869f0319cdc95db53f289b9ea Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 15 Jul 2024 15:51:33 +0200 Subject: [PATCH 1871/3013] boot/uboot: allow taking the entire default environment from a text file By default U-Boot builds a default environment from its own configuration and a board-specific set of variables. However it also allows to bypass this entirely and define the entire default environment from a text file. Expose this feature to Buildroot. This allows to have a file e.g. in board/.../uboot.env which contains an easy to maintain text file with the wanted default environment, without patching the U-Boot source code. Signed-off-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- boot/uboot/Config.in | 29 +++++++++++++++++++++++++++++ boot/uboot/uboot.mk | 9 +++++++++ 2 files changed, 38 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 626585b378d..57aac06e205 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -136,6 +136,35 @@ config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES that will be merged to the main U-Boot configuration file. endif +config BR2_TARGET_UBOOT_DEFAULT_ENV_FILE + string "Text file with default environment" + select BR2_TARGET_UBOOT_NEEDS_XXD + help + Text file containing the variables to be used as the default + environment in U-Boot. + + If empty, let U-Boot generate the default enviromnent from the + source code and other U-Boot configuration values, which is + the default behaviour. + + If set to the path to a file, instructs U-Boot to define the + entire U-Boot default environment from the provided file, + disabling all the default behaviour. + + From the U-Boot documentation: + + The format is the same as accepted by the mkenvimage tool, + with lines containing key=value pairs. Blank lines and + lines beginning with '#' are ignored. + + Based on the USE_DEFAULT_ENV_FILE and DEFAULT_ENV_FILE U-Boot + configuration variables. + + For more info see: + https://docs.u-boot.org/en/latest/usage/environment.html#external-environment-file + + Requires U-Boot >= v2018.05. + config BR2_TARGET_UBOOT_NEEDS_DTC bool "U-Boot needs dtc" select BR2_PACKAGE_HOST_DTC diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 19f4cdb557e..6cc87b35d3d 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -390,6 +390,14 @@ UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig # override again. In addition, host-ccache is not ready at kconfig # time, so use HOSTCC_NOCCACHE. UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS="" + +UBOOT_DEFAULT_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE)) +ifneq ($(UBOOT_DEFAULT_ENV_FILE),) +define UBOOT_KCONFIG_DEFAULT_ENV_FILE + $(call KCONFIG_SET_OPT,CONFIG_USE_DEFAULT_ENV_FILE,y) + $(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENV_FILE,"$(shell readlink -f $(UBOOT_DEFAULT_ENV_FILE))") +endef +endif endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY UBOOT_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) @@ -530,6 +538,7 @@ define UBOOT_KCONFIG_FIXUP_CMDS $(UBOOT_ZYNQMP_KCONFIG_PMUFW) $(UBOOT_ZYNQMP_KCONFIG_PM_CFG) $(UBOOT_ZYNQMP_KCONFIG_PSU_INIT) + $(UBOOT_KCONFIG_DEFAULT_ENV_FILE) endef ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy) From 9b843284d2196fc345b7415efb7336487f7894e7 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 15 Jul 2024 14:00:52 +0000 Subject: [PATCH 1872/3013] support/testing: fix package/test_s6_networking.py This test fails with the following error -sh: s6-tcpserver4: not found In release 2.6.0.0 of s6-networking the `s6-tcpserver4` was unified into a new `s6-tcpserver` command[1]. [1] https://github.com/skarnet/s6-networking/blob/master/NEWS#L33 Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_s6_networking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_s6_networking.py b/support/testing/tests/package/test_s6_networking.py index 1fe1b816684..bbbaefdf94c 100644 --- a/support/testing/tests/package/test_s6_networking.py +++ b/support/testing/tests/package/test_s6_networking.py @@ -28,7 +28,7 @@ def test_run(self): self.assertEqual(output[1][0:5], "after") # Test the TCP server and client - _, exit_code = self.emulator.run("s6-tcpserver4 127.0.0.1 1024 cat &") + _, exit_code = self.emulator.run("s6-tcpserver 127.0.0.1 1024 cat &") self.emulator.run("sleep 2") cmd = "echo foobar | s6-tcpclient 127.0.0.1 1024 s6-ioconnect -67" output, exit_code = self.emulator.run(cmd) From aacca7f0639bac6bb3fb262d0b1738c4387edeb0 Mon Sep 17 00:00:00 2001 From: Nicolas Carrier Date: Tue, 17 Jan 2023 12:04:40 +0100 Subject: [PATCH 1873/3013] package/pkg-generic.mk: local and override support in legal-info Sources of packages which are using the 'local' _METHOD_SITE or which declare an _OVERRIDE_SRC_DIR are not archived when generating the legal-info target. This is problematic since those packages are the most likely to require being published, because it's highly probable that their sources have been modified. A typical use case is a package (e.g. linux) that is maintained as a git submodule of the BR2_EXTERNAL and with the LINUX_OVERRIDE_SRCDIR set appropriately, or with a tool like repo putting it in a well-known location. This patch generates a tar.gz archive on the fly, containing the result of the rsync of the package's source directory, using the same arguments as during the preparation of a build. Note that is not possible to archive the builddir, since it may contain artifacts of previous compilations. In order to create a tarball that is reproducible, we reuse the mk_tar_gz function from the download helpers. We have to provide it with the TAR variable. We also have to cd to the build directory first, because the script generates a temporary file in the current directory. That script needs a date. We unforuntately don't have a good reproducible data. The timestamps of the files in the override srcdir itself aren't useful either: if they come from git, they typically have the time of checkout. Therefore, we fix the date at Jan 1, 1970 (which we can do with @0). The mk_tar_gz function could actually work directly in the override srcdir without the need for an rsync - except for one limitation: it doesn't have the equivalent of RSYNC_VCS_EXCLUSIONS. It would be nice to refactor the script so it could accept a list of exclusions instead of a single one and also work at any level instead of just the toplevel. But that is for future improvement. It is not possible to consider rsync as a "normal" download method either (which would have solved the initial problem), because if we do that: * the DL dir's content would be altered improperly * the rsync + tar gz overhead would be paid on compilation and is significant, for example, for a linux kernel * a hash file would be necessary, which would be a burden to maintain, for sources frequently modified Signed-off-by: Nicolas Carrier [Arnout: - Drop the auxiliary variables: their use is contained within one code block and it's easier to read with being explicit. - Put it in an additional subdirectory .legal-info-rsync of the build directory, to reduce the chance of conflict with an existing file/directory. - Archive the directory (e.g. linux-custom) rather than its contents, so that it matches a normal tarball. - Use the mk_tar_gz function from download helpers to create a reproducible tarball. - Split long lines. ] Signed-off-by: Arnout Vandecappelle --- package/pkg-generic.mk | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 365d6c748d7..171163dcb44 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1155,13 +1155,20 @@ else endif # license files ifeq ($$($(2)_REDISTRIBUTE),YES) -ifeq ($$($(2)_SITE_METHOD),local) -# Packages without a tarball: don't save and warn - @$$(call legal-warning-nosource,$$($(2)_RAWNAME),local) - -else ifneq ($$($(2)_OVERRIDE_SRCDIR),) - @$$(call legal-warning-nosource,$$($(2)_RAWNAME),override) - +ifneq ($$($(2)_OVERRIDE_SRCDIR),) +# local/override packages: copy it and archive the copy + @echo "Package is of type local or override, archive sources" + $$(Q)rm -rf $$($(2)_BUILDDIR)/.legal-info-rsync + $$(Q)mkdir -p $$($(2)_BUILDDIR)/.legal-info-rsync + $$(Q)rsync -au --chmod=u=rwX,go=rX $$(RSYNC_VCS_EXCLUSIONS) \ + $(call qstrip,$$($(2)_OVERRIDE_SRCDIR))/ \ + $$($(2)_BUILDDIR)/.legal-info-rsync/ + $$(Q). support/download/helpers; set -x; cd $$($(2)_BUILDDIR); TAR=$$(TAR) mk_tar_gz \ + $$($(2)_BUILDDIR)/.legal-info-rsync/ \ + $$($(2)_BASENAME_RAW) \ + @0 \ + $$($(2)_REDIST_SOURCES_DIR)/$$($(2)_BASENAME_RAW).tar.gz + $$(Q)rm -rf $$($(2)_BUILDDIR)/.legal-info-rsync else # Other packages From 5511e26b4f39c42c57a202d5da53c3cb570961d9 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 28 Feb 2024 21:24:12 +0100 Subject: [PATCH 1874/3013] package/pico-sdk: new package Add the pi-pico sdk as a dependency for picotool. This is a bit of a weird package, because you normally clone the git repository and point the picotool (or rp2040 firmware project) build to it. For picotool specifically, only headers are used from the sdk, for building a firmware project, it is included as source files via cmake, so this pretty much has the same semantics for that as well. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/pico-sdk/Config.in | 9 +++++++++ package/pico-sdk/pico-sdk.hash | 3 +++ package/pico-sdk/pico-sdk.mk | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/pico-sdk/Config.in create mode 100644 package/pico-sdk/pico-sdk.hash create mode 100644 package/pico-sdk/pico-sdk.mk diff --git a/DEVELOPERS b/DEVELOPERS index 4a22b747790..7e709feb3a2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2186,6 +2186,7 @@ F: utils/config F: utils/diffconfig N: Marcus Hoffmann +F: package/pico-sdk/ F: package/python-jc/ F: package/python-ruamel-yaml-clib/ F: support/testing/tests/package/test_python_fastapi.py diff --git a/package/Config.in b/package/Config.in index 6c390f7bd32..0ba816d378f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1807,6 +1807,7 @@ menu "Hardware handling" source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" + source "package/pico-sdk/Config.in" source "package/rpi-rgb-led-matrix/Config.in" source "package/tslib/Config.in" source "package/uhd/Config.in" diff --git a/package/pico-sdk/Config.in b/package/pico-sdk/Config.in new file mode 100644 index 00000000000..962139925cb --- /dev/null +++ b/package/pico-sdk/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PICO_SDK + bool "pico-sdk" + help + Raspberry Pi Pico SDK. Provides the headers, libraries + and build system necessary to write programs for the + RP2040-based devices such as the Raspberry Pi Pico in + C, C++ or assembly language. + + https://github.com/raspberrypi/pico-sdk diff --git a/package/pico-sdk/pico-sdk.hash b/package/pico-sdk/pico-sdk.hash new file mode 100644 index 00000000000..5db7e8bdb41 --- /dev/null +++ b/package/pico-sdk/pico-sdk.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c pico-sdk-1.5.1.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/pico-sdk/pico-sdk.mk b/package/pico-sdk/pico-sdk.mk new file mode 100644 index 00000000000..27930651b9a --- /dev/null +++ b/package/pico-sdk/pico-sdk.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# pico-sdk +# +################################################################################ + +PICO_SDK_VERSION = 1.5.1 +PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION)) +PICO_SDK_LICENSE = BSD-3-Clause +PICO_SDK_LICENSE_FILES = LICENSE.TXT +PICO_SDK_INSTALL_STAGING = YES +# Header-only lib, as far as buildroot is concerned +PICO_SDK_INSTALL_TARGET = NO + +define PICO_SDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/share/pico-sdk + cp -r $(@D)/* $(STAGING_DIR)/usr/share/pico-sdk +endef + +$(eval $(generic-package)) From f7aac1c008f9c59f8c669bade17864b099221065 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 28 Feb 2024 21:24:13 +0100 Subject: [PATCH 1875/3013] package/picotool: new package Add the raspberry pi picotool for interacting with rp2040 binaries and devices. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/picotool/Config.in | 16 ++++++++++++++++ package/picotool/picotool.hash | 3 +++ package/picotool/picotool.mk | 14 ++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/picotool/Config.in create mode 100644 package/picotool/picotool.hash create mode 100644 package/picotool/picotool.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7e709feb3a2..f7b7db53ce9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2187,6 +2187,7 @@ F: utils/diffconfig N: Marcus Hoffmann F: package/pico-sdk/ +F: package/picotool/ F: package/python-jc/ F: package/python-ruamel-yaml-clib/ F: support/testing/tests/package/test_python_fastapi.py diff --git a/package/Config.in b/package/Config.in index 0ba816d378f..b9f5c4d7c26 100644 --- a/package/Config.in +++ b/package/Config.in @@ -585,6 +585,7 @@ endmenu source "package/pciutils/Config.in" source "package/pdbg/Config.in" source "package/picocom/Config.in" + source "package/picotool/Config.in" source "package/pifmrds/Config.in" source "package/pigpio/Config.in" source "package/powertop/Config.in" diff --git a/package/picotool/Config.in b/package/picotool/Config.in new file mode 100644 index 00000000000..0046f8ad618 --- /dev/null +++ b/package/picotool/Config.in @@ -0,0 +1,16 @@ +comment "picotool needs a toolchain w/ C++ and gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_PICOTOOL + bool "picotool" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOST_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_PICO_SDK + help + picotool is a tool for inspecting rp2040 binaries and + interacting with rp2040 devices when they are in bootsel + mode or devices USBstdio support from the Raspberry Pi Pico + SDK. + + https://github.com/raspberrypi/picotool diff --git a/package/picotool/picotool.hash b/package/picotool/picotool.hash new file mode 100644 index 00000000000..26b790d9684 --- /dev/null +++ b/package/picotool/picotool.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f1746ead7815c13be1152f0645db8ea3b277628eb0110d42a0a186db37d40a91 picotool-1.1.2.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/picotool/picotool.mk b/package/picotool/picotool.mk new file mode 100644 index 00000000000..42f74fb244d --- /dev/null +++ b/package/picotool/picotool.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# picotool +# +################################################################################ + +PICOTOOL_VERSION = 1.1.2 +PICOTOOL_SITE = $(call github,raspberrypi,picotool,$(PICOTOOL_VERSION)) +PICOTOOL_CONF_OPTS = -DPICO_SDK_PATH=$(STAGING_DIR)/usr/share/pico-sdk +PICOTOOL_DEPENDENCIES = libusb pico-sdk +PICOTOOL_LICENSE = BSD-3-Clause +PICOTOOL_LICENSE_FILES = LICENSE.TXT + +$(eval $(cmake-package)) From e52605c092d8eaa926da8720ae498a38eddb5205 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 11 Jun 2024 09:21:59 -0600 Subject: [PATCH 1876/3013] package/libjcat: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libjcat/Config.in | 15 +++++++++++++ package/libjcat/libjcat.hash | 3 +++ package/libjcat/libjcat.mk | 43 ++++++++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/libjcat/Config.in create mode 100644 package/libjcat/libjcat.hash create mode 100644 package/libjcat/libjcat.mk diff --git a/DEVELOPERS b/DEVELOPERS index f7b7db53ce9..e181382fe91 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1484,6 +1484,7 @@ F: package/fxdiv/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/libjcat/ F: package/libucontext/ F: package/lilv/ F: package/lv2/ diff --git a/package/Config.in b/package/Config.in index b9f5c4d7c26..4a38c282a39 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1531,6 +1531,7 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" source "package/libdeflate/Config.in" + source "package/libjcat/Config.in" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" diff --git a/package/libjcat/Config.in b/package/libjcat/Config.in new file mode 100644 index 00000000000..cf7bc334f5b --- /dev/null +++ b/package/libjcat/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBJCAT + bool "libjcat" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBGLIB2 + help + Library for reading and writing Jcat files. + + https://github.com/hughsie/libjcat + +comment "fwupd needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libjcat/libjcat.hash b/package/libjcat/libjcat.hash new file mode 100644 index 00000000000..b6dc8d2f695 --- /dev/null +++ b/package/libjcat/libjcat.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a6232aeca3c3fab6dbb3bed06ec3832088b49a4b278a7119558d72be60ce921f libjcat-0.2.1.tar.xz +sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 LICENSE diff --git a/package/libjcat/libjcat.mk b/package/libjcat/libjcat.mk new file mode 100644 index 00000000000..e13e5dbfb74 --- /dev/null +++ b/package/libjcat/libjcat.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# libjcat +# +################################################################################ + +LIBJCAT_VERSION = 0.2.1 +LIBJCAT_SITE = https://github.com/hughsie/libjcat/releases/download/$(LIBJCAT_VERSION) +LIBJCAT_SOURCE = libjcat-$(LIBJCAT_VERSION).tar.xz +LIBJCAT_LICENSE = LGPL-2.1+ +LIBJCAT_LICENSE_FILES = LICENSE +LIBJCAT_INSTALL_STAGING = YES +LIBJCAT_DEPENDENCIES = host-pkgconf json-glib libglib2 + +LIBJCAT_CONF_OPTS = \ + -Dgtkdoc=false \ + -Dtests=false \ + -Ded25519=false \ + -Dman=false \ + -Dcli=true + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBJCAT_DEPENDENCIES += host-vala gobject-introspection +LIBJCAT_CONF_OPTS += -Dintrospection=true -Dvapi=true +else +LIBJCAT_CONF_OPTS += -Dintrospection=false -Dvapi=false +endif + +ifeq ($(BR2_PACKAGE_LIBGPG_ERROR)$(BR2_PACKAGE_LIBGPGME),yy) +LIBJCAT_DEPENDENCIES += libgpg-error libgpgme +LIBJCAT_CONF_OPTS += -Dgpg=true +else +LIBJCAT_CONF_OPTS += -Dgpg=false +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBJCAT_DEPENDENCIES += gnutls +LIBJCAT_CONF_OPTS += -Dpkcs7=true +else +LIBJCAT_CONF_OPTS += -Dpkcs7=false +endif + +$(eval $(meson-package)) From 37dded43ae681e8319d7b76f9a612c71991467a9 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 11 Jun 2024 09:22:01 -0600 Subject: [PATCH 1877/3013] package/flashrom: switch to meson build system The meson build system will be useful in future commits to have a proper installation in staging with pkg-config files. Drop Makefile patch which is no longer relevant. Backport a patch removing _LARGEFILE64_SOURCE which can result in a redefinition build error. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...G_INTERNAL-depends-on-raw-mem-access.patch | 35 -------- ...et_enable.c-Drop-_LARGEFILE64_SOURCE.patch | 38 +++++++++ package/flashrom/flashrom.mk | 80 +++++++++++++------ 3 files changed, 94 insertions(+), 59 deletions(-) delete mode 100644 package/flashrom/0001-Makefile-CONFIG_INTERNAL-depends-on-raw-mem-access.patch create mode 100644 package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch diff --git a/package/flashrom/0001-Makefile-CONFIG_INTERNAL-depends-on-raw-mem-access.patch b/package/flashrom/0001-Makefile-CONFIG_INTERNAL-depends-on-raw-mem-access.patch deleted file mode 100644 index 9d3f3d9c51a..00000000000 --- a/package/flashrom/0001-Makefile-CONFIG_INTERNAL-depends-on-raw-mem-access.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aac91025386aa9d7b8214f8ad1746ef5c02f2d8d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 5 Nov 2023 10:38:32 +0100 -Subject: [PATCH] Makefile: CONFIG_INTERNAL depends on raw mem access - -CONFIG_INTERNAL depends on raw mem access resulting in the following -build failure on sh4 since version 1.3.0: - -/home/thomas/autobuild/instance-3/output-1/per-package/flashrom/host/bin/../lib/gcc/sh4a-buildroot-linux-gnu/12.3.0/../../../../sh4a-buildroot-linux-gnu/bin/ld: libflashrom.a(internal.o): in function `internal_chip_readn': -internal.c:(.text+0x8): undefined reference to `mmio_readn' - -Fixes: - - http://autobuild.buildroot.org/results/f74a9d315fb519f284428234713f43fcf4e35fd0 - -Signed-off-by: Fabrice Fontaine -Upstream: https://review.coreboot.org/c/flashrom/+/78930 ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index bf01d0f8..cd21f22f 100644 ---- a/Makefile -+++ b/Makefile -@@ -115,6 +115,7 @@ DEPENDS_ON_RAW_MEM_ACCESS := \ - CONFIG_ATAPROMISE \ - CONFIG_DRKAISER \ - CONFIG_GFXNVIDIA \ -+ CONFIG_INTERNAL \ - CONFIG_INTERNAL_X86 \ - CONFIG_IT8212 \ - CONFIG_NICINTEL \ --- -2.42.0 - diff --git a/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch b/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch new file mode 100644 index 00000000000..1ee8d0f7e36 --- /dev/null +++ b/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch @@ -0,0 +1,38 @@ +From 59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1 Mon Sep 17 00:00:00 2001 +From: Angel Pons +Date: Tue, 16 May 2023 11:13:17 +0200 +Subject: [PATCH] chipset_enable.c: Drop `_LARGEFILE64_SOURCE` + +This file does not access any large files, so there's no need to define +this feature test macro. + +Change-Id: I866cfa2f996eeea5846e5d9189647ad7a4a4e3e4 +Signed-off-by: Angel Pons +Reviewed-on: https://review.coreboot.org/c/flashrom/+/75271 +Tested-by: build bot (Jenkins) +Reviewed-by: Nico Huber +Reviewed-by: Anastasia Klimchuk +Reviewed-by: Alexander Goncharov + +Upstream: https://github.com/flashrom/flashrom/commit/59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1 +Signed-off-by: James Hilliard +--- + chipset_enable.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/chipset_enable.c b/chipset_enable.c +index 9d3df5f8..3846ecfb 100644 +--- a/chipset_enable.c ++++ b/chipset_enable.c +@@ -24,8 +24,6 @@ + * Contains the chipset specific flash enables. + */ + +-#define _LARGEFILE64_SOURCE +- + #include + #include + #include +-- +2.34.1 + diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 86bfec40cce..ed11b4ed31a 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -9,41 +9,73 @@ FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING -FLASHROM_MAKE_OPTS = WARNERROR=no +FLASHROM_CONF_OPTS = \ + -Dclassic_cli=enabled \ + -Dclassic_cli_print_wiki=disabled \ + -Dich_descriptors_tool=enabled \ + -Dtests=disabled \ + -Duse_internal_dmi=true + +FLASHROM_PROGRAMMERS = \ + buspirate_spi \ + linux_mtd \ + linux_spi \ + parade_lspcon \ + mediatek_i2c_spi \ + mstarddc_spi \ + pony_spi \ + realtek_mst_i2c_spi \ + serprog + +ifeq ($(BR2_i386)$(BR2_x86_64),y) +FLASHROM_PROGRAMMERS += rayer_spi +endif ifeq ($(BR2_PACKAGE_LIBFTDI1),y) FLASHROM_DEPENDENCIES += host-pkgconf libftdi1 -FLASHROM_MAKE_OPTS += \ - CONFIG_FT2232_SPI=yes \ - CONFIG_USBBLASTER_SPI=yes -else -FLASHROM_MAKE_OPTS += \ - CONFIG_FT2232_SPI=no \ - CONFIG_USBBLASTER_SPI=no +FLASHROM_PROGRAMMERS += \ + ft2232_spi \ + usbblaster_spi endif ifeq ($(BR2_PACKAGE_LIBUSB),y) FLASHROM_DEPENDENCIES += host-pkgconf libusb -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=yes -else -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no +FLASHROM_PROGRAMMERS += \ + ch341a_spi \ + dediprog \ + developerbox_spi \ + digilent_spi \ + dirtyjtag_spi \ + pickit2_spi \ + raiden_debug_spi \ + stlinkv3_spi endif ifeq ($(BR2_PACKAGE_PCIUTILS),y) FLASHROM_DEPENDENCIES += pciutils -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes -else -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no -endif +FLASHROM_PROGRAMMERS += \ + atavia \ + drkaiser \ + gfxnvidia \ + internal \ + it8212 \ + nicintel \ + nicintel_eeprom \ + nicintel_spi \ + ogp_spi \ + satamv \ + satasii -define FLASHROM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" \ - $(FLASHROM_MAKE_OPTS) -C $(@D) -endef +ifeq ($(BR2_i386)$(BR2_x86_64),y) +FLASHROM_PROGRAMMERS += \ + atahpt \ + atapromise \ + nic3com \ + nicnatsemi \ + nicrealtek +endif +endif -define FLASHROM_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/sbin/flashrom -endef +FLASHROM_CONF_OPTS += -Dprogrammer=$(subst $(space),$(comma),$(strip $(FLASHROM_PROGRAMMERS))) -$(eval $(generic-package)) +$(eval $(meson-package)) From a845781866a5de8ae5a60bc447ee130ccc012e49 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 15 Jul 2024 21:54:12 +0200 Subject: [PATCH 1878/3013] package/flashrom: install to staging This will be needed for the upcoming fwupd package. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/flashrom/flashrom.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index ed11b4ed31a..60774b96210 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -9,6 +9,7 @@ FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING +FLASHROM_INSTALL_STAGING = YES FLASHROM_CONF_OPTS = \ -Dclassic_cli=enabled \ -Dclassic_cli_print_wiki=disabled \ From dd5bd455de145f98d858bc30cf84d53aecd31207 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 16 Jul 2024 10:57:46 +0200 Subject: [PATCH 1879/3013] package/sysklogd: bump to v2.6.0 - New command line flag -l to control klogctl(2) on/off and allow raw kernel logs to console, use with 'quiet' kernel cmdline option - Add reload command for systemd service - Add *.conf support for rotate_size and rotate_count - Add *.conf support for listen addr:port - Fix blocking delay for unresolvable DNS names when logging to remote - Fix failure to bind to not-yet-set IP address by retrying every 5 sec Full ChangeLog at https://github.com/troglobit/sysklogd/releases/tag/v2.6.0 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 7e009901743..361d68a157d 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 9da4444285772ce2bfc9c687be8f978b7a9fe7d3937347cd4938eda0c4545e05 sysklogd-2.5.2.tar.gz +sha256 c5ae067b479b54ef90fa9352c277d44ff7b4314023fc6ee0a37e81b99a78a917 sysklogd-2.6.0.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 083f505a2b2..7abb8301196 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.5.2 +SYSKLOGD_VERSION = 2.6.0 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From a4a1e36e1a085ce589c112c0ce089bf129633808 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 16 Jul 2024 10:57:47 +0200 Subject: [PATCH 1880/3013] package/sysklogd: new setting Expose --with-dns-delay=SEC configure option to fine tune retry interval to match that of the system resolver. Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/sysklogd/Config.in | 12 +++++++++++- package/sysklogd/sysklogd.mk | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index 3315a6ddc9f..c9b9fe8c357 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -15,8 +15,18 @@ config BR2_PACKAGE_SYSKLOGD if BR2_PACKAGE_SYSKLOGD +config BR2_PACKAGE_SYSKLOGD_DNS_DELAY + int "Retry DNS delay (sec)" + default "60" + help + Retry delay (seconds) for attempting to resolve DNS names of + remote syslog servers. This is the internal retry delay, not + that of the resolver in your C library or DNS cache. + + Default: 60 seconds + config BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY - int "Retry delay (sec)" + int "Retry remote delay (sec)" default "180" help Retry delay (seconds) for sending to remote syslog servers. diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 7abb8301196..59081f27341 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -16,6 +16,7 @@ SYSKLOGD_CPE_ID_VALID = YES SYSKLOGD_CONF_OPTS = \ --bindir=/usr/bin \ --sbindir=/sbin \ + --with-dns-delay=$(BR2_PACKAGE_SYSKLOGD_DNS_DELAY) \ --with-suspend-time=$(BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY) # Disable/Enable utilities From bffb6a2339bbfe28a0ca2399716c3966af4a623c Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 16 Jul 2024 11:43:05 +0200 Subject: [PATCH 1881/3013] package/nodejs: security bump to v20.15.1 Release Notes: https://nodejs.org/en/blog/release/v20.15.1 Fixes the following CVE's: CVE-2024-36138 - Bypass incomplete fix of CVE-2024-27980 (High) CVE-2024-22020 - Bypass network import restriction via data URL (Medium) CVE-2024-22018 - fs.lstat bypasses permission model (Low) CVE-2024-36137 - fs.fchown/fchmod bypasses permission model (Low) CVE-2024-37372 - Permission model improperly processes UNC paths (Low) Also these additional CVE's were fixed in the v20.12.1 and v20.12.2 releases [1][2]: CVE-2024-27983 - Assertion failed in node::http2::Http2Session::~Http2Session() leads to HTTP/2 server crash- (High) CVE-2024-27982 - HTTP Request Smuggling via Content Length Obfuscation - (Medium) CVE-2024-27980 - Command injection via args parameter of child_process.spawn without shell option enabled on Windows NodeJS tests are passing: $ ./support/testing/run-tests -o ./outputs/ -k tests.package.test_nodejs -d dl 12:02:58 TestNodeJSModuleHostSrc Starting 12:02:58 TestNodeJSModuleHostSrc Building 13:17:15 TestNodeJSModuleHostSrc Building done 13:17:23 TestNodeJSModuleHostSrc Cleaning up .13:17:23 TestNodeJSModuleHostBin Starting 13:17:23 TestNodeJSModuleHostBin Building 14:06:15 TestNodeJSModuleHostBin Building done 14:06:20 TestNodeJSModuleHostBin Cleaning up .14:06:20 TestNodeJSBasic Starting 14:06:20 TestNodeJSBasic Building 14:55:40 TestNodeJSBasic Building done 14:55:45 TestNodeJSBasic Cleaning up LICENSE hash changed due to changes in vendored components: * copyright year update and adding spdx identifier [1] [1] https://nodejs.org/en/blog/release/v20.12.1 [2] https://nodejs.org/en/blog/release/v20.12.2 [3] https://github.com/nodejs/node/commit/d5a316f5ea3fade3140c2ae35c144b500fb5d758 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2cbbf766f5c..61bda55098f 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.12.0/SHASUMS256.txt.asc -sha256 007ca2699cf6e84290e5bed844ed66ef9d707d23561dfaf117212b7dce216ba7 node-v20.12.0-linux-arm64.tar.xz -sha256 668fb421a24be596c98f00a31049fbf6ada14d221b7382e0f1caa55ab421431a node-v20.12.0-linux-armv7l.tar.xz -sha256 78dc3b7ad993c332684802e35c1f0de2b76193d13394bc89e3bab216828587c7 node-v20.12.0-linux-ppc64le.tar.xz -sha256 0a126adf5b6a5eb11a37bad76a0c626a18f20b6811322e68aae0e3cf9bf580bd node-v20.12.0-linux-x64.tar.xz -sha256 76e5346cebfd581528f699f764f4d1a6e87cb818b696708f235ddcb625a0f78d node-v20.12.0.tar.xz +# From https://nodejs.org/dist/v20.15.1/SHASUMS256.txt.asc +sha256 10d47a46ef208b3e4b226e4d595a82659123b22397ed77b7975d989114ec317e node-v20.15.1-linux-arm64.tar.xz +sha256 7bc120efdd8018f6915471b963d9b80adf4ed406d6dc9edb4ae944b85f505c4c node-v20.15.1-linux-armv7l.tar.xz +sha256 b33e684802251397ad62ad3f8a1836267ee8b7723f87f669470018ad0035287b node-v20.15.1-linux-ppc64le.tar.xz +sha256 26700f8d3e78112ad4a2618a9c8e2816e38a49ecf0213ece80e54c38cb02563f node-v20.15.1-linux-x64.tar.xz +sha256 fdd53a5729d936691a2a1151046fb4897721cb8b0fca2af957823a9b40fe0c34 node-v20.15.1.tar.xz # Locally calculated -sha256 d3a9fbfe0a1fb78627ee296cd5ca5b498822d4d1c5da3b8e8100c41bd7b791fd LICENSE +sha256 49cd410e0fe6a8879a40d0764092d1e6114cc85fe41d4efed990d028eec25582 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9ed51fbe9ba..104d2cf258c 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.12.0 +NODEJS_COMMON_VERSION = 20.15.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From 34fbdb0d99d00df578f825f9bf5d211e67413076 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 16 Jul 2024 12:28:08 +0200 Subject: [PATCH 1882/3013] package/c-ares: bump to 1.32.2 Changelog: https://c-ares.org/changelog.html#1_32_2 License hash changed due to whitespace changes: https://github.com/c-ares/c-ares/commit/ce4c20afcbf9a05d36d02893e8ebb66726d8396c Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/c-ares/c-ares.hash | 4 ++-- package/c-ares/c-ares.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index 9a2b69c7311..e1cf9f657a5 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz +sha256 072ff6b30b9682d965b87eb9b77851dc1cd8e6d8090f6821a56bd8fa89595061 c-ares-1.32.2.tar.gz # Hash for license file -sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md +sha256 8a9994f85a8e531e1a3217ab7ba509787c6b93056aabe702137ce662db8321c2 LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index c2403b9c4cb..4b7342cadb1 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,8 +4,8 @@ # ################################################################################ -C_ARES_VERSION = 1.27.0 -C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/cares-1_27_0 +C_ARES_VERSION = 1.32.2 +C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/v1.32.2 C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT From 3d85e9df431af790930e03d860bfa098108888a0 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 16 Jul 2024 14:40:21 +0200 Subject: [PATCH 1883/3013] package/tio: bump to 3.5 Dependencies changed: inih dependency was removed, glib2 and lua added. Tio's meson build system fails to find luajit, so exclude that, otherwise all versions of lua >= 5.1 are supported. Retested the build for sparc and sparc64 and the compile issues have been resolved upstream by reworking the baudrate selection code quite a while ago[1]. Disable installation of man pages with new build option. [1] https://github.com/tio/tio/commit/a23be7f2c2bacef428b0e50aa93e37e5b52bdd56 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/tio/Config.in | 23 +++++++++++++---------- package/tio/tio.hash | 4 ++-- package/tio/tio.mk | 6 ++++-- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/package/tio/Config.in b/package/tio/Config.in index e4241fa5e14..953b26a349b 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_TIO bool "tio" - depends on !BR2_sparc64 && !BR2_sparc depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_INIH + depends on BR2_USE_MMU # glib2 + depends on BR2_USE_WCHAR # glib2 + depends on BR2_PACKAGE_HAS_LUAINTERPRETER + depends on !BR2_PACKAGE_LUAJIT help "tio" is a simple TTY terminal application which features a straightforward commandline interface to easily connect to @@ -10,12 +12,13 @@ config BR2_PACKAGE_TIO https://tio.github.io/ -# tio is disabled for sparc and sparc64 architectures because it fails -# to build with a redefinition of 'struct termio' error, with no proper -# fix or workaround for now -comment "tio is disabled for sparc and sparc64 architectures" - depends on BR2_sparc64 || BR2_sparc - -comment "tio needs a toolchain w/ threads" +comment "tio needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU depends on !BR2_sparc64 && !BR2_sparc - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + +comment "tio needs lua (but not luajit)" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_PACKAGE_LUAJIT diff --git a/package/tio/tio.hash b/package/tio/tio.hash index 02699fdeb43..d1caeeebc67 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz.sha256sum: -sha256 bf8fe434848c2c1b6540af0b42503c986068176ddc1a988cf02e521e7de5daa5 tio-2.7.tar.xz +# From https://github.com/tio/tio/releases/download/v3.5/tio-3.5.tar.xz.sha256sum: +sha256 efd3e9a406f827ac22d4157e345079dde15ee5a948b24156561d6c97a54e6ec0 tio-3.5.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 95831e8ce69..637a7bdd831 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,12 +4,14 @@ # ################################################################################ -TIO_VERSION = 2.7 +TIO_VERSION = 3.5 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ TIO_LICENSE_FILES = LICENSE -TIO_DEPENDENCIES = inih +TIO_DEPENDENCIES = libglib2 luainterpreter + +TIO_CONF_OPTS += -Dinstall_man_pages=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions From 3d7e6cdf54683c6e84fc7f93b5fad886526223e1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 16 Jul 2024 10:24:12 -0600 Subject: [PATCH 1884/3013] package/libjcat: fix package name in comment Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libjcat/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libjcat/Config.in b/package/libjcat/Config.in index cf7bc334f5b..3e3718de3ac 100644 --- a/package/libjcat/Config.in +++ b/package/libjcat/Config.in @@ -10,6 +10,6 @@ config BR2_PACKAGE_LIBJCAT https://github.com/hughsie/libjcat -comment "fwupd needs a toolchain w/ wchar, threads" +comment "libjcat needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS From bcf05650bfdaacbec4a09c73a661ec3ef1d4a09b Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Tue, 16 Jul 2024 20:32:59 +0200 Subject: [PATCH 1885/3013] package/evemu: needs autoreconf for python 3.12 compatibility evemu ships with an ancient py-compile script (from 2011) depending the imp module, which was finally removed in Python 3.12. Set autoreconf in order to get an up to date version of py-compile which automatically handles the different python versions. This is a similar problem as in 42eae73ef1 package/cracklib: python needs autoreconf Fixes: http://autobuild.buildroot.org/results/a52/a520583be6e86993d268d6535f727a352bd92028/ and many other configs where Python3 is selected and thus evemu is configured to build the python-bindings. Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- package/evemu/evemu.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 886ceb1142a..6bba59cf82e 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -9,6 +9,7 @@ EVEMU_SITE = http://www.freedesktop.org/software/evemu EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPL-3.0 (library), GPL-3.0 (tools) EVEMU_LICENSE_FILES = COPYING +EVEMU_AUTORECONF = YES EVEMU_INSTALL_STAGING = YES # asciidoc used to generate manpages, which we don't need, and if it's From 531fc0a60e3bef6b04c61a21c1f258825e169d23 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Tue, 16 Jul 2024 06:19:08 -0700 Subject: [PATCH 1886/3013] package/crun: bump to version 1.15 Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- ...ile-error-without-libseccomp-and-lib.patch | 59 ------------------- package/crun/crun.hash | 2 +- package/crun/crun.mk | 2 +- 3 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch diff --git a/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch b/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch deleted file mode 100644 index 81b08d34b7e..00000000000 --- a/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ea27b1363ef709ce4b169138017b67ef624b127b Mon Sep 17 00:00:00 2001 -From: Xiangyu Chen -Date: Tue, 12 Dec 2023 10:47:42 +0800 -Subject: [PATCH] libcrun: fix compile error without libseccomp and libcap - -Fixed compile error without libseccomp and libcap, running -clang-format to format the code style. - -Upstream: https://github.com/containers/crun/commit/ea27b1363ef709ce4b169138017b67ef624b127b -Signed-off-by: Xiangyu Chen ---- - src/libcrun/container.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/libcrun/container.c b/src/libcrun/container.c -index 34649f8..ffcdb24 100644 ---- a/src/libcrun/container.c -+++ b/src/libcrun/container.c -@@ -23,7 +23,9 @@ - #include "container.h" - #include "utils.h" - #include "seccomp.h" --#include -+#ifdef HAVE_SECCOMP -+# include -+#endif - #include "scheduler.h" - #include "seccomp_notify.h" - #include "custom-handler.h" -@@ -47,7 +49,9 @@ - #include - #include - #include --#include -+#ifdef HAVE_CAP -+# include -+#endif - #include - #include - #include -@@ -3829,6 +3833,7 @@ populate_array_field (char ***field, char *array[], size_t num_elements) - (*field)[i] = NULL; - } - -+#ifdef HAVE_CAP - static void - populate_capabilities (struct features_info_s *info, char ***capabilities, size_t *num_capabilities) - { -@@ -3876,6 +3881,7 @@ populate_capabilities (struct features_info_s *info, char ***capabilities, size_ - (*capabilities)[index] = NULL; // Terminate the array with NULL - populate_array_field (&(info->linux.capabilities), *capabilities, *num_capabilities); - } -+#endif - - static void - retrieve_mount_options (struct features_info_s **info) --- -2.34.1 - diff --git a/package/crun/crun.hash b/package/crun/crun.hash index c461d78d97f..b111e941ddb 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a76982ac076a5c9bf9f85bd8d25b1dc6344e252399a7e9231504357fc019f7cc crun-1.12.tar.gz +sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 005d5fb3973..b48f15304bf 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.12 +CRUN_VERSION = 1.15 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl From ec531a271b4973a5b622525f10b7451c5fbacea1 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 16 Jul 2024 09:58:02 -0500 Subject: [PATCH 1887/3013] package/python3: use depth first search for directory removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, Python builds could intermittently fail when removing files if `find` removed a directory before searching within it [0]. An arbitrary example: /tmp/tmp.h9KMUse5zO $ find . -type d -name __pycache__ -exec rm -rvf {} \; ; echo -e "RETURN CODE: $?" removed directory './a/b/c/d/e/__pycache__' find: ‘./a/b/c/d/e/__pycache__’: No such file or directory removed directory './a/b/c/d/e/f/__pycache__' find: ‘./a/b/c/d/e/f/__pycache__’: No such file or directory removed directory './a/b/c/d/e/f/g/__pycache__' RETURN CODE: 1 Now, pass the `-depth` argument to `find` so a depth-first search is performed to avoid trying to search within an already deleted folder. Fixes: 54d48c8cad4e ("package/python3: miscellaneous fixups") Fixes: http://autobuild.buildroot.net/results/ba1d4213ae9912d53412ded6d8e257b67a4f7c0e/ Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- package/python3/python3.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index a82bc47a57d..f85dcfad309 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -205,8 +205,8 @@ define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config rm -f $(TARGET_DIR)/usr/bin/python3-config find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)*/ \ - -type f -not -name Makefile -exec rm -rf {} \; - find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -type d \ + -depth -type f -not -name Makefile -exec rm -rf {} \; + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -depth -type d \ -name __pycache__ -exec rm -rf {} \; endef From 676347851143e30551d7d39c0131639bd4f1773c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 16 Jul 2024 20:34:29 +0200 Subject: [PATCH 1888/3013] package/libfribidi: bump to version 1.0.15 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index b37fb92236f..29948fbba88 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a fribidi-1.0.14.tar.xz +sha256 0bbc7ff633bfa208ae32d7e369cf5a7d20d5d2557a0b067c9aa98bcbf9967587 fribidi-1.0.15.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 7c6d32fb76b..ab7fe703074 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.14 +LIBFRIBIDI_VERSION = 1.0.15 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ From 0dc115478e77998488aa88eaac152022ac9fce36 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 16 Jul 2024 20:34:40 +0200 Subject: [PATCH 1889/3013] package/pango: bump to version 1.54.0 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 69b6b0adf68..9f321eea62e 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pango/1.52/pango-1.52.2.sha256sum -sha256 d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b pango-1.52.2.tar.xz +# From https://download.gnome.org/sources/pango/1.54/pango-1.54.0.sha256sum +sha256 8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8 pango-1.54.0.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index ec0f5127e74..df82b456fb2 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -4,8 +4,8 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.52 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).2 +PANGO_VERSION_MAJOR = 1.54 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).0 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From cd7c8a2528cf81cef27b4fa7170f6f1f880bf148 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Wed, 17 Jul 2024 09:21:20 +0200 Subject: [PATCH 1890/3013] package/openssh: fix typo in init script Now that the sshd init script is nice & new & shiny, fix an ancient typo, introduced with commit e0fc615 (add runlevel script for later use) Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- package/openssh/S50sshd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index 56db6ebff95..7e5ccf079de 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -6,7 +6,7 @@ DAEMON="sshd" PIDFILE="/var/run/$DAEMON.pid" -# Make sure the ssh-keygen progam exists +# Make sure the ssh-keygen program exists [ -f /usr/bin/ssh-keygen ] || exit 0 umask 077 From a22f17881cce09c285067be096a683c523620826 Mon Sep 17 00:00:00 2001 From: Fred Lefranc Date: Wed, 17 Jul 2024 14:11:46 +0200 Subject: [PATCH 1891/3013] package/busybox: fix build with glibc 2.39 When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97, it removed the deprecated libcrypt support. Until the upgrade of glibc to 2.39, Busybox could rely on the libcrypt provided by glibc. Since version 2.39, glibc no longer provides libcrypt, causing a build failure with Busybox configurations that have CONFIG_USE_BB_CRYPT disabled. To fix this, add the libxcrypt dependency to Busybox when BR2_PACKAGE_LIBXCRYPT is selected. The user is still responsible for enabling BR2_PACKAGE_LIBXCRYPT when their Busybox configuration has CONFIG_USE_BB_CRYPT disabled. Signed-off-by: Fred Lefranc Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 6c20a98d2d3..204ebe0106e 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -164,6 +164,10 @@ define BUSYBOX_SET_MDEV endef endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +BUSYBOX_DEPENDENCIES += libxcrypt +endif + # sha passwords need USE_BB_CRYPT_SHA ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) define BUSYBOX_SET_CRYPT_SHA From f30386f50868be278fe50f07dcce255851d84d08 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Wed, 17 Jul 2024 06:37:02 -0700 Subject: [PATCH 1892/3013] package/crun: drop libgcrypt dependency This reverts commit 4d5fd84496 (package/crun: add libgcrypt optional dependency, 2022-12-30). Since bump to 1.15, libgcrypt is not an optional dependency anymore as it has been droped in 1.14 with https://github.com/containers/crun/commit/8d96f0884b46765693b6d86125216c895e095ed6 Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- package/crun/crun.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index b48f15304bf..be5897dbc25 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -26,10 +26,6 @@ else CRUN_CONF_OPTS += --disable-caps endif -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -CRUN_DEPENDENCIES += libgcrypt -endif - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) CRUN_DEPENDENCIES += libseccomp CRUN_CONF_OPTS += --enable-seccomp From e67ab71bf68c378fe3ea430fd325003d0b16c5b6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:48:06 +0200 Subject: [PATCH 1893/3013] package/graphene: new package a dependency for gtk4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/graphene/Config.in | 6 +++++ package/graphene/graphene.hash | 3 +++ package/graphene/graphene.mk | 44 ++++++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+) create mode 100644 package/graphene/Config.in create mode 100644 package/graphene/graphene.hash create mode 100644 package/graphene/graphene.mk diff --git a/DEVELOPERS b/DEVELOPERS index e181382fe91..fb4955351cb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1148,6 +1148,7 @@ F: package/copas/ F: package/coxpcall/ F: package/dado/ F: package/ficl/ +F: package/graphene/ F: package/janet/ F: package/libtomcrypt/ F: package/libtommath/ diff --git a/package/Config.in b/package/Config.in index 4a38c282a39..5823ab1b767 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1662,6 +1662,7 @@ menu "Graphics" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" + source "package/graphene/Config.in" source "package/graphite2/Config.in" source "package/gtkmm3/Config.in" source "package/gtksourceview/Config.in" diff --git a/package/graphene/Config.in b/package/graphene/Config.in new file mode 100644 index 00000000000..60f6073a106 --- /dev/null +++ b/package/graphene/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_GRAPHENE + bool "graphene" + help + A thin layer of types for graphic libraries. + + https://ebassi.github.io/graphene/ diff --git a/package/graphene/graphene.hash b/package/graphene/graphene.hash new file mode 100644 index 00000000000..7d2b5694565 --- /dev/null +++ b/package/graphene/graphene.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 922dc109d2dc5dc56617a29bd716c79dd84db31721a8493a13a5f79109a4a4ed graphene-1.10.8.tar.gz +sha256 cfd9fd7b2be592d2c0910d32dc1d8910c08dc0670b1d9ce417a82fa9eb788df9 LICENSE.txt diff --git a/package/graphene/graphene.mk b/package/graphene/graphene.mk new file mode 100644 index 00000000000..efdae914093 --- /dev/null +++ b/package/graphene/graphene.mk @@ -0,0 +1,44 @@ +################################################################################ +# +# graphene +# +################################################################################ + +GRAPHENE_VERSION = 1.10.8 +GRAPHENE_SITE = $(call github,ebassi,graphene,$(GRAPHENE_VERSION)) +GRAPHENE_LICENSE = MIT +GRAPHENE_LICENSE_FILES = LICENSE.txt +GRAPHENE_INSTALL_STAGING = YES + +GRAPHENE_CONF_OPTS = \ + -Dtests=false \ + -Dinstalled_tests=false \ + -Dgtk_doc=false + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +GRAPHENE_CONF_OPTS += -Dgobject_types=true +GRAPHENE_DEPENDENCIES += libglib2 +else +GRAPHENE_CONF_OPTS += -Dgobject_types=false +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GRAPHENE_CONF_OPTS += -Dintrospection=enabled +GRAPHENE_DEPENDENCIES += gobject-introspection +else +GRAPHENE_CONF_OPTS += -Dintrospection=disabled +endif + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +GRAPHENE_CONF_OPTS += -Dsse2=true +else +GRAPHENE_CONF_OPTS += -Dsse2=false +endif + +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +GRAPHENE_CONF_OPTS += -Darm_neon=true +else +GRAPHENE_CONF_OPTS += -Darm_neon=false +endif + +$(eval $(meson-package)) From faf2a1d2abfbff79fc0603def835066587144420 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:48:07 +0200 Subject: [PATCH 1894/3013] package/libgtk4: new package Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libgtk4/Config.in | 102 +++++++++++++++++++++++++++ package/libgtk4/libgtk4.hash | 5 ++ package/libgtk4/libgtk4.mk | 129 +++++++++++++++++++++++++++++++++++ 5 files changed, 238 insertions(+) create mode 100644 package/libgtk4/Config.in create mode 100644 package/libgtk4/libgtk4.hash create mode 100644 package/libgtk4/libgtk4.mk diff --git a/DEVELOPERS b/DEVELOPERS index fb4955351cb..b39df9bae23 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1150,6 +1150,7 @@ F: package/dado/ F: package/ficl/ F: package/graphene/ F: package/janet/ +F: package/libgtk4/ F: package/libtomcrypt/ F: package/libtommath/ F: package/libwpe/ diff --git a/package/Config.in b/package/Config.in index 5823ab1b767..a7cb768dcd9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1703,6 +1703,7 @@ menu "Graphics" source "package/libgta/Config.in" source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" + source "package/libgtk4/Config.in" source "package/libjxl/Config.in" source "package/libmediaart/Config.in" source "package/libmng/Config.in" diff --git a/package/libgtk4/Config.in b/package/libgtk4/Config.in new file mode 100644 index 00000000000..af7f57b80e3 --- /dev/null +++ b/package/libgtk4/Config.in @@ -0,0 +1,102 @@ +comment "libgtk4 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS + +comment "libgtk4 needs an OpenGL(ES) EGL backend" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_LIBGTK4 + bool "libgtk4" + depends on BR2_USE_WCHAR # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz + # Even in the case of X11/OpenGL, libgtk4 needs epoxy built + # with EGL support, see + # https://gitlab.gnome.org/GNOME/gtk/-/issues/6866. + depends on BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GRAPHENE + select BR2_PACKAGE_LIBEPOXY + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PANGO + select BR2_PACKAGE_TIFF + # At least one backend is required + select BR2_PACKAGE_LIBGTK4_BROADWAY if \ + !(BR2_PACKAGE_LIBGTK4_X11 || BR2_PACKAGE_LIBGTK4_WAYLAND) + help + The GTK version 4 graphical user interface library + + https://www.gtk.org/ + +if BR2_PACKAGE_LIBGTK4 + +config BR2_PACKAGE_LIBGTK4_BROADWAY + bool "Broadway GDK backend" + default y + help + This enables the Broadway backend for GDK, which provides + support for displaying GTK+ applications in a web browser, + using HTML5 and web sockets. + + For example, to run gtk4-demo on a target which IP address is + 192.168.0.1 and use it from a web browser, execute the + following commands: + + $ broadwayd -a 192.168.0.1 -p 8080 :2 & + $ export GDK_BACKEND=broadway + $ export BROADWAY_DISPLAY=:2 + $ gtk4-demo + + Then open a web browser at address http://192.168.0.1:8080. + Javascript and web sockets should be enabled. + +config BR2_PACKAGE_LIBGTK4_WAYLAND + bool "Wayland GDK backend" + default y + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_LIBXKBCOMMON + help + This enables the Wayland backend for GDK. + +comment "X11 GDK backend needs an OpenGL provider" + depends on !BR2_PACKAGE_HAS_LIBGL + +config BR2_PACKAGE_LIBGTK4_X11 + bool "X11 GDK backend" + default y + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XLIB_LIBXI + select BR2_PACKAGE_XLIB_LIBXINERAMA + help + This enables the X11 backend for GDK. + +config BR2_PACKAGE_LIBGTK4_GSTREAMER + bool "gstreamer support" + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL + select BR2_PACKAGE_GST1_PLUGINS_BAD + help + Enable gstreamer support. + +config BR2_PACKAGE_LIBGTK4_DEMO + bool "Install libgtk4 demo/example programs" + select BR2_PACKAGE_SHARED_MIME_INFO + select BR2_PACKAGE_HICOLOR_ICON_THEME + help + The GTK source base contains demo/exmaple programs. + This option allows to install them to the target. + +endif diff --git a/package/libgtk4/libgtk4.hash b/package/libgtk4/libgtk4.hash new file mode 100644 index 00000000000..efb944f2aea --- /dev/null +++ b/package/libgtk4/libgtk4.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/gtk/4.12/gtk-4.12.4.sha256sum +sha256 ba67c6498e5599f928edafb9e08a320adfaa50ab2f0da6fc6ab2252fc2d57520 gtk-4.12.4.tar.xz + +# Hash for license file: +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk4/libgtk4.mk b/package/libgtk4/libgtk4.mk new file mode 100644 index 00000000000..8cb7fd03848 --- /dev/null +++ b/package/libgtk4/libgtk4.mk @@ -0,0 +1,129 @@ +################################################################################ +# +# libgtk4 +# +################################################################################ + +LIBGTK4_VERSION_MAJOR = 4.12 +LIBGTK4_VERSION = $(LIBGTK4_VERSION_MAJOR).4 +LIBGTK4_SOURCE = gtk-$(LIBGTK4_VERSION).tar.xz +LIBGTK4_SITE = https://download.gnome.org/sources/gtk/$(LIBGTK4_VERSION_MAJOR) +LIBGTK4_LICENSE = LGPL-2.0+ +LIBGTK4_LICENSE_FILES = COPYING +LIBGTK4_CPE_ID_VENDOR = gnome +LIBGTK4_CPE_ID_PRODUCT = gtk +LIBGTK4_INSTALL_STAGING = YES + +LIBGTK4_DEPENDENCIES = \ + host-pkgconf \ + host-libgtk4 \ + gdk-pixbuf \ + graphene \ + libepoxy \ + libglib2 \ + pango \ + $(TARGET_NLS_DEPENDENCIES) + +LIBGTK4_CONF_OPTS = \ + -Dbuild-tests=false \ + -Dmedia-ffmpeg=disabled \ + -Dprint-cpdb=disabled \ + -Dvulkan=disabled \ + -Dcloudproviders=disabled \ + -Dsysprof=disabled \ + -Dtracker=disabled \ + -Dcolord=disabled \ + -Dintrospection=disabled \ + -Ddocumentation=false \ + -Dscreenshots=false \ + -Dman-pages=false + +ifeq ($(BR2_PACKAGE_LIBGTK4_X11),y) +LIBGTK4_DEPENDENCIES += xlib_libXcursor xlib_libXi xlib_libXinerama +LIBGTK4_CONF_OPTS += -Dx11-backend=true +else +LIBGTK4_CONF_OPTS += -Dx11-backend=false +endif + +ifeq ($(BR2_PACKAGE_LIBGTK4_WAYLAND),y) +LIBGTK4_DEPENDENCIES += wayland wayland-protocols libxkbcommon +LIBGTK4_CONF_OPTS += -Dwayland-backend=true +else +LIBGTK4_CONF_OPTS += -Dwayland-backend=false +endif + +ifeq ($(BR2_PACKAGE_LIBGTK4_BROADWAY),y) +LIBGTK4_CONF_OPTS += -Dbroadway-backend=true +else +LIBGTK4_CONF_OPTS += -Dbroadway-backend=false +endif + +ifeq ($(BR2_PACKAGE_LIBGTK4_GSTREAMER),y) +LIBGTK4_CONF_OPTS += -Dmedia-gstreamer=enabled +LIBGTK4_DEPENDENCIES += gstreamer1 gst1-plugins-base gst1-plugins-bad +else +LIBGTK4_CONF_OPTS += -Dmedia-gstreamer=disabled +endif + +ifeq ($(BR2_PACKAGE_CUPS),y) +LIBGTK4_CONF_OPTS += -Dprint-cups=enabled +LIBGTK4_DEPENDENCIES += cups +else +LIBGTK4_CONF_OPTS += -Dprint-cups=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGTK4_DEMO),y) +LIBGTK4_CONF_OPTS += -Dbuild-demos=true -Dbuild-examples=true +LIBGTK4_DEPENDENCIES += hicolor-icon-theme shared-mime-info +else +LIBGTK4_CONF_OPTS += -Dbuild-demos=false -Dbuild-examples=false +endif + +define LIBGTK4_COMPILE_GLIB_SCHEMAS + $(HOST_DIR)/bin/glib-compile-schemas \ + $(TARGET_DIR)/usr/share/glib-2.0/schemas +endef +LIBGTK4_POST_INSTALL_TARGET_HOOKS += LIBGTK4_COMPILE_GLIB_SCHEMAS + +# here, we build a native gtk4-update-icon-cache as host-libgtk4 + +HOST_LIBGTK4_DEPENDENCIES = \ + host-gdk-pixbuf \ + host-libglib2 \ + host-pkgconf + +HOST_LIBGTK4_CFLAGS = \ + -I $(@D)/gtk \ + `$(HOST_MAKE_ENV) $(PKG_CONFIG_HOST_BINARY) --cflags --libs gdk-pixbuf-2.0` + +define HOST_LIBGTK4_CONFIGURE_CMDS + echo "#define BUILD_TOOLS 1" >> $(@D)/gtk/config.h + echo "#define GETTEXT_PACKAGE \"gtk40\"" >> $(@D)/gtk/config.h + echo "#define GTK_LOCALEDIR \"/usr/share/locale\"" >> $(@D)/gtk/config.h + echo "#define HAVE_UNISTD_H 1" >> $(@D)/gtk/config.h + echo "#define HAVE_FTW_H 1" >> $(@D)/gtk/config.h +endef + +define HOST_LIBGTK4_BUILD_CMDS + $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ + $(@D)/tools/updateiconcache.c $(@D)/gtk/gtkiconcachevalidator.c\ + $(HOST_LIBGTK4_CFLAGS) \ + -o $(@D)/tools/gtk4-update-icon-cache +endef + +define HOST_LIBGTK4_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/tools/gtk4-update-icon-cache \ + $(HOST_DIR)/bin/gtk4-update-icon-cache +endef + +# Create icon-theme.cache for each of the icon directories/themes +# It's not strictly necessary but speeds up lookups +define LIBGTK4_UPDATE_ICON_CACHE + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; +endef +LIBGTK4_TARGET_FINALIZE_HOOKS += LIBGTK4_UPDATE_ICON_CACHE + +$(eval $(meson-package)) +$(eval $(host-generic-package)) From f761a8c4516d88d70ae6f5d192fdb99cafa761a6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 17 Jul 2024 17:12:54 +0200 Subject: [PATCH 1895/3013] package/uclibc: add patch for libucontext usage *ucontext functions are only implemented for a subset of uClibc supported architectures. To allow the external library libucontext to be used this small patch is required. Tested for riscv64. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../0001-allow-to-use-sys-ucontext.h.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/uclibc/0001-allow-to-use-sys-ucontext.h.patch diff --git a/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch new file mode 100644 index 00000000000..b6bd5602d94 --- /dev/null +++ b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch @@ -0,0 +1,35 @@ +From 903da45dde43836e35a295226c5b1efccd413c08 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 17 Jul 2024 15:41:40 +0200 +Subject: [PATCH] allow to use + +For architectures without ucontext implementation it is possible +to use libucontext with this small adaptation. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/MZCPGG56TL7SVOZY2L3AGHLREJ76BYZE/ +--- + include/ucontext.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/ucontext.h b/include/ucontext.h +index 4ce114ef1..76b4f375e 100644 +--- a/include/ucontext.h ++++ b/include/ucontext.h +@@ -23,11 +23,11 @@ + + #include + +-#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ +- + /* Get machine dependent definition of data structures. */ + #include + ++#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ ++ + __BEGIN_DECLS + + /* Get user context and store it in variable pointed to by UCP. */ +-- +2.30.2 + From 7d9ada3c7cd8fb30fa1f98fb464421bce7d082eb Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Wed, 17 Jul 2024 21:48:08 +0200 Subject: [PATCH 1896/3013] package/qt6/qt6opcua: new package Add qt6 version of qtopcua from git as it's not contained in the official qt release submodule directory. Fulfill the mandatory dependency on qt6base, and qt6base-network in particular, as well as the need for host tool qopcuaxmldatatypes2cpp which is provided by host-qt6opcua. For host-qt6opcua set the dependency on host-qt6base-network as well. Existence of the optional dependency openssl enables FEATURE_open62541_security. (This has changed from qt5opcua where mbedtls was supported.) Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/qt6/Config.in | 1 + package/qt6/qt6opcua/Config.in | 14 ++++++++++ package/qt6/qt6opcua/qt6opcua.hash | 9 ++++++ package/qt6/qt6opcua/qt6opcua.mk | 44 ++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 package/qt6/qt6opcua/Config.in create mode 100644 package/qt6/qt6opcua/qt6opcua.hash create mode 100644 package/qt6/qt6opcua/qt6opcua.mk diff --git a/DEVELOPERS b/DEVELOPERS index b39df9bae23..9462fe0459f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2384,6 +2384,7 @@ F: package/evemu/ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ +F: package/qt6/qt6opcua/ N: Neal Frager F: board/versal/ diff --git a/package/qt6/Config.in b/package/qt6/Config.in index e84806d5e49..29c1c25c7fd 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -48,6 +48,7 @@ source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6declarative/Config.in" source "package/qt6/qt6languageserver/Config.in" source "package/qt6/qt6mqtt/Config.in" +source "package/qt6/qt6opcua/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" diff --git a/package/qt6/qt6opcua/Config.in b/package/qt6/qt6opcua/Config.in new file mode 100644 index 00000000000..84a51f544f8 --- /dev/null +++ b/package/qt6/qt6opcua/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_QT6OPCUA + bool "qt6opcua" + select BR2_PACKAGE_QT6BASE_NETWORK + # qt6opcuda needs host-qt6opcua, and host-qt6opcua needs + # network support in qt6base. + select BR2_PACKAGE_HOST_QT6BASE_NETWORK + + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6opcua module. + + https://doc.qt.io/qt-6/qtopcua-index.html diff --git a/package/qt6/qt6opcua/qt6opcua.hash b/package/qt6/qt6opcua/qt6opcua.hash new file mode 100644 index 00000000000..cf54bef98e6 --- /dev/null +++ b/package/qt6/qt6opcua/qt6opcua.hash @@ -0,0 +1,9 @@ +sha256 653597e2926ddb512f078bab1e5d2a059202ba1bc1f68ff0b4a0e053ab1272b2 qt6opcua-6.7.2-git4.tar.gz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6opcua/qt6opcua.mk b/package/qt6/qt6opcua/qt6opcua.mk new file mode 100644 index 00000000000..6c8ff7af89e --- /dev/null +++ b/package/qt6/qt6opcua/qt6opcua.mk @@ -0,0 +1,44 @@ +################################################################################ +# +# qt6opcua +# +################################################################################ + +QT6OPCUA_VERSION = $(QT6_VERSION) +QT6OPCUA_SITE = $(QT6_GIT)/qt/qtopcua.git +QT6OPCUA_SITE_METHOD = git +QT6OPCUA_INSTALL_STAGING = YES +QT6OPCUA_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6OPCUA_CMAKE_BACKEND = ninja + +QT6OPCUA_LICENSE = \ + GPL-2.0 or GPL-3.0 or LGPL-3.0, \ + GFDL-1.3 no invariants (docs), \ + BSD-3-Clause (examples + buildsystem) + +QT6OPCUA_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt + +QT6OPCUA_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF + +HOST_QT6OPCUA_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF + +QT6OPCUA_DEPENDENCIES = \ + qt6base \ + host-qt6opcua + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +QT6OPCUA_DEPENDENCIES += openssl +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From c0aae3e42403277d033e371d49b1cb27954a28a7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 17 Jul 2024 22:53:46 +0200 Subject: [PATCH 1897/3013] DEVELOPERS: put Andreas Naumann at the right place Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9462fe0459f..08c120a60f0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -174,6 +174,13 @@ F: package/wine/ N: Andreas Klinger F: package/ply/ +N: Andreas Naumann +F: package/evemu/ +F: package/libevdev/ +F: package/pkg-qmake.mk +F: package/qt5/qt5opcua/ +F: package/qt6/qt6opcua/ + N: Andreas Ziegler F: package/mpd/ @@ -2379,13 +2386,6 @@ N: Nathaniel Roach F: package/bandwidthd/ F: package/libgudev/ -N: Naumann Andreas -F: package/evemu/ -F: package/libevdev/ -F: package/pkg-qmake.mk -F: package/qt5/qt5opcua/ -F: package/qt6/qt6opcua/ - N: Neal Frager F: board/versal/ F: board/xilinx/ From 01eb0e21a167eeda78ba79c4976a573d537cf04a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 17 Jul 2024 22:59:58 +0200 Subject: [PATCH 1898/3013] package/qt6/qt6opcua: fix indentation of comment It was intended with spaces instead of a tab. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6opcua/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6opcua/Config.in b/package/qt6/qt6opcua/Config.in index 84a51f544f8..68b73f7c50d 100644 --- a/package/qt6/qt6opcua/Config.in +++ b/package/qt6/qt6opcua/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_QT6OPCUA bool "qt6opcua" select BR2_PACKAGE_QT6BASE_NETWORK - # qt6opcuda needs host-qt6opcua, and host-qt6opcua needs - # network support in qt6base. + # qt6opcuda needs host-qt6opcua, and host-qt6opcua needs + # network support in qt6base. select BR2_PACKAGE_HOST_QT6BASE_NETWORK help From c51f9881d6737ba63ae4ce6f1ea436eeec364e09 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 17 Jul 2024 19:02:56 +0200 Subject: [PATCH 1899/3013] package/libgtk3: security bump to version 3.24.43 fix CVE-2024-6655 (Library injection from CWD) Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index a1d8b1694d1..6a682a74121 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.sha256sum -sha256 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2 gtk+-3.24.42.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.43.sha256sum +sha256 7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7 gtk+-3.24.43.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 547fd194a5a..d6d7c64a547 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).42 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).43 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From 68967524427d8a53dd6458fe408960d1383980f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:52 +0200 Subject: [PATCH 1900/3013] configs/raspberrypi: install Raspberry Pi rev 1.0 device-tree blob MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This installs Raspberry Pi Model B rev 1.0 device-tree blob. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- board/raspberrypi/readme.txt | 1 + configs/raspberrypi_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index aa6421ea017..cbd9a57a633 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -87,6 +87,7 @@ Result of the build After building, you should obtain this tree: output/images/ + +-- bcm2708-rpi-b-rev1.dtb [1] +-- bcm2708-rpi-b.dtb [1] +-- bcm2708-rpi-b-plus.dtb [1] +-- bcm2708-rpi-cm.dtb [1] diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 03c81ebf39f..c6b296e1afe 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b-rev1 broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From e84f74dadbde5d7840f8a98ca83680267aac1625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:53 +0200 Subject: [PATCH 1901/3013] configs/raspberrypi2: install Raspberry Pi 2 rev 1.2 device-tree blob MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This installs Raspberry Pi 2 Model B rev 1.2 device-tree blob. Note: Raspberry Pi 2 Model B vev 1.2 switched to BCM2837[1][2]. [1]: https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#flagship-series [2]: https://www.raspberrypi.com/documentation/computers/processors.html#bcm2837 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- board/raspberrypi/readme.txt | 1 + configs/raspberrypi2_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index cbd9a57a633..0499fe0d51b 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -95,6 +95,7 @@ After building, you should obtain this tree: +-- bcm2708-rpi-zero-w.dtb [1] +-- bcm2710-rpi-zero-2-w.dtb [1] +-- bcm2709-rpi-2-b.dtb [1] + +-- bcm2710-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] +-- bcm2710-rpi-cm3.dtb [1] diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 05870cc6e1f..75310fdb287 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From b0ceb0ac5833aeec4c86e992ff324810a860ba84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:54 +0200 Subject: [PATCH 1902/3013] configs/raspberrypi3_64: install Compute Module 3 device-tree blob MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This installs the device-tree blob for the Compute Module 3. Note: The 32-bit raspberrypi3_defconfig installs this Device Tree since a726c7dff8 (configs/raspberrypi3_defconfig: add raspberry pi 3 compute module support). Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- configs/raspberrypi3_64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index ec309b2badc..d6cae400ae7 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3 broadcom/bcm2837-rpi-3-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 51090999ca3c817237b35022ce245a89562236c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:55 +0200 Subject: [PATCH 1903/3013] configs/raspberrypi3_64: remove upstream device-tree blob MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are two kind of device-tree blobs up to the Rasperry Pi 3[1][2]: - the downstream dtbs are named after the die name (i.e. BCM27xx) - the upstream dtbs are name after the package name (i.e. BCM283x) Every defconfigs install exclusively the downstream device-tree blob, at the exception of the raspberrypi3_64_defconfig that installs both since the begining. This removes the upstream device-tree blob for the beauty of consistency. Note: It is possible to load the upstream device-tree using the upstream_kernel property[3]. Raspberry Pi, Compute Module, Raspberry Pi Zero and Raspberry Pi Zero W use bcm2835 for upstream and bcm2708 for downstream. Raspberry Pi 2 uses bcm2836 for upstream and bcm2709 for downstream. Raspberry Pi 2 rev 1.2, Raspberry Pi 3, Compute Module 3/3+ and Raspberry Zero 2 W use bcm2837 for upstream and bcm2709 for downstream. Raspberry Pi 4/400 and Compute Module 4/4s uses bcm2711 and Raspberry Pi 5 uses bcm2712. [1]: https://github.com/raspberrypi/linux/issues/3237 [2]: https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#flagship-series [3]: https://www.raspberrypi.com/documentation/computers/legacy_config_txt.html#upstream_kernel Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- board/raspberrypi/readme.txt | 1 - configs/raspberrypi3_64_defconfig | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 0499fe0d51b..78c551579ab 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -102,7 +102,6 @@ After building, you should obtain this tree: +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] +-- bcm2712-rpi-5-b.dtb [1] - +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index d6cae400ae7..f4ecf2575f9 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3 broadcom/bcm2837-rpi-3-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From b872f0c72493a8e28f31c13d3dd167411b780179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:56 +0200 Subject: [PATCH 1904/3013] configs/raspberrypi4*: install Raspberry Pi 400 device-tree blob MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This installs the device-tree blob for the Raspberry Pi 400. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- board/raspberrypi/readme.txt | 1 + configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 78c551579ab..485a8d88270 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -100,6 +100,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-3-b-plus.dtb [1] +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] + +-- bcm2711-rpi-400.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] +-- bcm2712-rpi-5-b.dtb [1] +-- boot.vfat diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 5c6698fb370..7ac0ad49cc1 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index c14b77eacdd..241f78f2c12 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From f93f0d6a1451584db31689589868c5367dbcb7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:57 +0200 Subject: [PATCH 1905/3013] configs/raspberrypi4*: install Compute Module 4/4s device-tree blobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This installs the device-tree blobs for the Compute Module 4 and Compute Module 4s. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- board/raspberrypi/readme.txt | 1 + configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 485a8d88270..24b7f619a3f 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -102,6 +102,7 @@ After building, you should obtain this tree: +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-400.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2711-rpi-cm4s.dtb [1] +-- bcm2712-rpi-5-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 7ac0ad49cc1..b7336e334f0 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 241f78f2c12..2cf533e32ef 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 13ac570c9f7d1b29c5ffcc351d104a63c2557e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:58 +0200 Subject: [PATCH 1906/3013] configs/raspberrypi5: install BCM2712D0 device-tree blob MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This installs the new Raspberry Pi 5 BCM2712D0 device-tree blob[1]. [1]: https://github.com/raspberrypi/linux/commit/0328374ae09c7856e06a63af0c065822474a2985 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- board/raspberrypi/readme.txt | 1 + configs/raspberrypi5_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 24b7f619a3f..81cd81a7f3c 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -104,6 +104,7 @@ After building, you should obtain this tree: +-- bcm2711-rpi-cm4.dtb [1] +-- bcm2711-rpi-cm4s.dtb [1] +-- bcm2712-rpi-5-b.dtb [1] + +-- bcm2712d0-rpi-5-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig index 3c88ce46cd7..67026e0d6d7 100644 --- a/configs/raspberrypi5_defconfig +++ b/configs/raspberrypi5_defconfig @@ -17,7 +17,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 281134f346ad8652dffd89b4488beb00e8ccd5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 16 Jul 2024 07:43:59 +0200 Subject: [PATCH 1907/3013] configs/raspberrypi*: sort some configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This moves some configs in the defconfigs and removes some comments so the defconfig files look similar. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- configs/raspberrypi0_defconfig | 3 --- configs/raspberrypi0w_defconfig | 1 + configs/raspberrypi2_defconfig | 6 ++---- configs/raspberrypi3_64_defconfig | 6 ++---- configs/raspberrypi3_defconfig | 6 ++---- configs/raspberrypi3_qt5we_defconfig | 15 +++++++-------- configs/raspberrypi4_64_defconfig | 6 ++---- configs/raspberrypi4_defconfig | 6 ++---- configs/raspberrypi5_defconfig | 11 +++++------ configs/raspberrypi_defconfig | 2 -- configs/raspberrypicm4io_64_defconfig | 6 ++---- configs/raspberrypicm4io_defconfig | 6 ++---- configs/raspberrypizero2w_defconfig | 5 +++-- 13 files changed, 30 insertions(+), 49 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index b2b7351ac1b..23ea25eb6f5 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -15,9 +15,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" - -# Build the DTBs for A/B from the kernel sources: the zero is the same -# as the A+ model, just in a different form-factor BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero" diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index a198596b40e..fc40471b77d 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -17,6 +17,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc1 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero-w" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 75310fdb287..30b7ff9fdec 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -7,19 +7,17 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b" diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index f4ecf2575f9..bfef4683b39 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -6,19 +6,17 @@ BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index ba2d5b6eed8..d55410777d3 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -6,19 +6,17 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 450a82f8f37..826181a2ecb 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -6,20 +6,18 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" @@ -34,13 +32,14 @@ BR2_PACKAGE_QT5BASE_JPEG=y BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5WEBENGINE=y BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y +BR2_PACKAGE_RPI_USERLAND=y +BR2_PACKAGE_CA_CERTIFICATES=y +BR2_PACKAGE_NTP=y + BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3_qt5we.txt" -BR2_PACKAGE_RPI_USERLAND=y -BR2_PACKAGE_CA_CERTIFICATES=y -BR2_PACKAGE_NTP=y # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index b7336e334f0..d5fa72d57d0 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -6,19 +6,17 @@ BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 2cf533e32ef..d7d5ec24997 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -6,19 +6,17 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig index 67026e0d6d7..268bf2892ae 100644 --- a/configs/raspberrypi5_defconfig +++ b/configs/raspberrypi5_defconfig @@ -2,20 +2,22 @@ BR2_aarch64=y BR2_cortex_a76_a55=y BR2_ARM_FPU_VFPV4=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +# patches +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b" @@ -45,6 +47,3 @@ BR2_PACKAGE_KMOD_TOOLS=y BR2_PACKAGE_XZ=y BR2_PACKAGE_KMOD=y BR2_PACKAGE_HOST_KMOD_XZ=y - -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/raspberrypi5/patches" diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index c6b296e1afe..97cb4e734df 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -17,8 +17,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" - -# Build the DTBs for A/B, A+/B+ and compute module from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b-rev1 broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm" diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index e9d57091b54..cff9270ed6a 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -6,19 +6,17 @@ BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 537d077b71f..2972419ac71 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -6,19 +6,17 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 37922909f39..7f83e9a258b 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -6,7 +6,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, 6.6 series +# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -19,6 +19,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-zero-2-w" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y @@ -26,7 +27,7 @@ BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypizero2w/config_zero2w.txt" -# MicroSD images generation tools +# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From 23fd1f85543f2aa048914834252a659989c81db2 Mon Sep 17 00:00:00 2001 From: Torben Voltmer Date: Mon, 15 Jul 2024 21:46:35 +0200 Subject: [PATCH 1908/3013] package/espflash: new package This package provides espflash. A serial flasher utilities for Espressif devices, based loosely on esptool.py. Supports the ESP32, ESP32-C2/C3/C6, ESP32-H2, ESP32-P4, and ESP32-S2/S3. Signed-off-by: Torben Voltmer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/espflash/Config.in | 10 ++++++++++ package/espflash/espflash.hash | 4 ++++ package/espflash/espflash.mk | 13 +++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/espflash/Config.in create mode 100644 package/espflash/espflash.hash create mode 100644 package/espflash/espflash.mk diff --git a/DEVELOPERS b/DEVELOPERS index 08c120a60f0..e51d56daa22 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3193,6 +3193,9 @@ F: support/testing/tests/package/test_redis.py N: Tobias Waldekranz F: package/kmemd/ +N: Torben Voltmer +F: package/espflash/ + N: Tudor Holton F: package/openjdk/ diff --git a/package/Config.in b/package/Config.in index a7cb768dcd9..d6658f185ff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -508,6 +508,7 @@ endmenu source "package/edk2-non-osi/Config.in" source "package/edk2-platforms/Config.in" source "package/esp-hosted/Config.in" + source "package/espflash/Config.in" source "package/eudev/Config.in" source "package/ev3dev-linux-drivers/Config.in" source "package/evemu/Config.in" diff --git a/package/espflash/Config.in b/package/espflash/Config.in new file mode 100644 index 00000000000..2a7a0f6b38a --- /dev/null +++ b/package/espflash/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_ESPFLASH + bool "espflash" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Serial flasher utilities for Espressif devices, based + loosely on esptool.py. Supports the ESP32, + ESP32-C2/C3/C6, ESP32-H2, ESP32-P4, and ESP32-S2/S3. + + https://github.com/esp-rs/espflash diff --git a/package/espflash/espflash.hash b/package/espflash/espflash.hash new file mode 100644 index 00000000000..ebe24ef51fb --- /dev/null +++ b/package/espflash/espflash.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 8e5da5e90d03135a1b2af6c0b551e4f2504ad64e659b0e88e8a4ecd98cc6a6b6 espflash-3.1.0-cargo2.tar.gz +sha256 0886cf791a43c02d71c105b4835b53293704ec407a72f84a87f73e20cb2d3251 LICENSE-APACHE +sha256 a75018ab59a13738ed2024a0090ae8f91b7693ae84568aa0e52c3dff99e6748d LICENSE-MIT diff --git a/package/espflash/espflash.mk b/package/espflash/espflash.mk new file mode 100644 index 00000000000..43532de58c0 --- /dev/null +++ b/package/espflash/espflash.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# espflash +# +################################################################################ + +ESPFLASH_VERSION = 3.1.0 +ESPFLASH_SITE = $(call github,esp-rs,espflash,v$(ESPFLASH_VERSION)) +ESPFLASH_SUBDIR = espflash +ESPFLASH_LICENSE = Apache-2.0 or MIT +ESPFLASH_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) From c624eee120b6ee0c81e636bd47abe92452610cf7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 27 Jun 2024 09:54:37 +0200 Subject: [PATCH 1909/3013] package/tpm2-openssl: new package Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tpm2-openssl/Config.in | 17 +++++++++++++++++ package/tpm2-openssl/tpm2-openssl.hash | 3 +++ package/tpm2-openssl/tpm2-openssl.mk | 19 +++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 package/tpm2-openssl/Config.in create mode 100644 package/tpm2-openssl/tpm2-openssl.hash create mode 100644 package/tpm2-openssl/tpm2-openssl.mk diff --git a/DEVELOPERS b/DEVELOPERS index e51d56daa22..7d6b364e58e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2834,6 +2834,7 @@ F: package/supertux/ F: package/supertuxkart/ F: package/terminology/ F: package/tk/ +F: package/tpm2-openssl/ F: package/upower/ F: package/waffle/ F: package/xenomai/ diff --git a/package/Config.in b/package/Config.in index d6658f185ff..5f0e7491c85 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1584,6 +1584,7 @@ menu "Crypto" source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" source "package/tinydtls/Config.in" + source "package/tpm2-openssl/Config.in" source "package/tpm2-pkcs11/Config.in" source "package/tpm2-tss/Config.in" source "package/trousers/Config.in" diff --git a/package/tpm2-openssl/Config.in b/package/tpm2-openssl/Config.in new file mode 100644 index 00000000000..0e151a94d3e --- /dev/null +++ b/package/tpm2-openssl/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_TPM2_OPENSSL + bool "tpm2-openssl" + depends on !BR2_STATIC_LIBS # tpm2-tss + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_TPM2_TSS + help + Provider for integration of TPM 2.0 to OpenSSL 3.0. + + tpm2-openssl is based on a major refactoring of the + tpm2-tss-engine. The code is still there, but largely + reshuffled to match the new OpenSSL API. + + https://github.com/tpm2-software/tpm2-openssl + +comment "tpm2-openssl needs a toolchain w/ dynamic library, threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/tpm2-openssl/tpm2-openssl.hash b/package/tpm2-openssl/tpm2-openssl.hash new file mode 100644 index 00000000000..ee15ee885fb --- /dev/null +++ b/package/tpm2-openssl/tpm2-openssl.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 2ee15da2dceae1466ffba868e75a00b119d752babc1b6a2792286336a3324fb0 tpm2-openssl-1.2.0.tar.gz +sha256 7ffba9d66226eb67abb9747ce1cd47477d566143a8ded597bbd974c6fb5fe9f5 LICENSE diff --git a/package/tpm2-openssl/tpm2-openssl.mk b/package/tpm2-openssl/tpm2-openssl.mk new file mode 100644 index 00000000000..ed590c2f47b --- /dev/null +++ b/package/tpm2-openssl/tpm2-openssl.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# tpm2-openssl +# +################################################################################ + +TPM2_OPENSSL_VERSION = 1.2.0 +TPM2_OPENSSL_SITE = https://github.com/tpm2-software/tpm2-openssl/releases/download/$(TPM2_OPENSSL_VERSION) +TPM2_OPENSSL_LICENSE = BSD-3-Clause +TPM2_OPENSSL_LICENSE_FILES = LICENSE +TPM2_OPENSSL_INSTALL_STAGING = YES +TPM2_OPENSSL_DEPENDENCIES = host-pkgconf openssl tpm2-tss + +# Provide --with-modulesdir to avoid using abs_builddir and DESTDIR +# (also defined as absolute path) at the same time to define modules +# install path (am__installdirs). +TPM2_OPENSSL_CONF_OPTS = --with-modulesdir="/usr/lib/ossl-modules" + +$(eval $(autotools-package)) From 8d0f6ecc5a53c7197a1a1642702ea0fd8e370db6 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Thu, 18 Jul 2024 12:19:55 +0000 Subject: [PATCH 1910/3013] package/cairo: fix build on toolchains without c++ support This issue was occurring since the conversion of cairo to meson-package in commit 1fa58814c09a71444f961b61a9a2c399b9163fc2 ("package/cairo: move to the meson build system") Fixes: http://autobuild.buildroot.net/results/98b62ab7ed3092f9f9085f723baf7d6267451e5c/ Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- ...3-meson-only-require-cpp-for-windows.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/cairo/0003-meson-only-require-cpp-for-windows.patch diff --git a/package/cairo/0003-meson-only-require-cpp-for-windows.patch b/package/cairo/0003-meson-only-require-cpp-for-windows.patch new file mode 100644 index 00000000000..3ce396f66f2 --- /dev/null +++ b/package/cairo/0003-meson-only-require-cpp-for-windows.patch @@ -0,0 +1,38 @@ +From e93ef3feb69994e3aa4e0ab66ccd66139b097e49 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Thu, 18 Jul 2024 12:16:51 +0200 +Subject: [PATCH] meson: only require cpp for windows + +Allow to compile cairo without c++ toolchain. + +Fixes: + - http://autobuild.buildroot.net/results/98b62ab7ed3092f9f9085f723baf7d6267451e5c/ + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/573 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9100152ee..297482b03 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,4 +1,4 @@ +-project('cairo', 'c', 'cpp', ++project('cairo', 'c', + meson_version: '>= 0.59.0', + version: run_command(find_program('version.py'), check: true).stdout().strip(), + default_options: ['warning_level=2'], +@@ -489,6 +489,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled() + endif + + if host_machine.system() == 'windows' ++ add_languages('cpp') ++ + add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp']) + + win32_extra_deps = [ +-- +2.45.2 + From eb5f194fcf7da0ce6338e594012e3d7e003f2898 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 18 Jul 2024 20:13:09 +0200 Subject: [PATCH 1911/3013] package/lua-lsdbus: bump to version ca7509b41a26b4a3c9b9d2c523be090bdbcc89fe Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-lsdbus/lua-lsdbus.hash | 2 +- package/lua-lsdbus/lua-lsdbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-lsdbus/lua-lsdbus.hash b/package/lua-lsdbus/lua-lsdbus.hash index 369370d63ad..93a086f16cb 100644 --- a/package/lua-lsdbus/lua-lsdbus.hash +++ b/package/lua-lsdbus/lua-lsdbus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b515cd00c844abc80993e9552d884c71a80a680e47b90a628f1f7bd18b9b821a lua-lsdbus-d132f8b2bd390d0b1c7d17b300190279f92bd494.tar.gz +sha256 9a967720736b0f6ff9b3f527846de28aaf74f58775af6358c13c31c0ac37b832 lua-lsdbus-ca7509b41a26b4a3c9b9d2c523be090bdbcc89fe.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/lua-lsdbus/lua-lsdbus.mk b/package/lua-lsdbus/lua-lsdbus.mk index cbd7ee9d4bf..865a5f8f344 100644 --- a/package/lua-lsdbus/lua-lsdbus.mk +++ b/package/lua-lsdbus/lua-lsdbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LSDBUS_VERSION = d132f8b2bd390d0b1c7d17b300190279f92bd494 +LUA_LSDBUS_VERSION = ca7509b41a26b4a3c9b9d2c523be090bdbcc89fe LUA_LSDBUS_SITE = $(call github,kmarkus,lsdbus,$(LUA_LSDBUS_VERSION)) LUA_LSDBUS_DEPENDENCIES = luainterpreter mxml systemd LUA_LSDBUS_LICENSE = LGPL-2.1 From 9fecf2811cb7cecc47c9f1d160a713720850efa5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 15:23:40 -0600 Subject: [PATCH 1912/3013] package/python-pypika-tortoise: new package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-pypika-tortoise/Config.in | 6 ++++++ .../python-pypika-tortoise.hash | 5 +++++ .../python-pypika-tortoise.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-pypika-tortoise/Config.in create mode 100644 package/python-pypika-tortoise/python-pypika-tortoise.hash create mode 100644 package/python-pypika-tortoise/python-pypika-tortoise.mk diff --git a/package/Config.in b/package/Config.in index 5f0e7491c85..f314140df46 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1291,6 +1291,7 @@ menu "External python modules" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" source "package/python-pyphen/Config.in" + source "package/python-pypika-tortoise/Config.in" source "package/python-pypng/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" diff --git a/package/python-pypika-tortoise/Config.in b/package/python-pypika-tortoise/Config.in new file mode 100644 index 00000000000..62e14c6d505 --- /dev/null +++ b/package/python-pypika-tortoise/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYPIKA_TORTOISE + bool "python-pypika-tortoise" + help + Forked from pypika and streamline just for tortoise-orm. + + https://github.com/tortoise/pypika-tortoise diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.hash b/package/python-pypika-tortoise/python-pypika-tortoise.hash new file mode 100644 index 00000000000..629762f4f7a --- /dev/null +++ b/package/python-pypika-tortoise/python-pypika-tortoise.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pypika-tortoise/json +md5 98c9677516f06f61f211f834d51949a6 pypika-tortoise-0.1.6.tar.gz +sha256 d802868f479a708e3263724c7b5719a26ad79399b2a70cea065f4a4cadbebf36 pypika-tortoise-0.1.6.tar.gz +# Locally computed sha256 checksums +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.mk b/package/python-pypika-tortoise/python-pypika-tortoise.mk new file mode 100644 index 00000000000..84aa19cfbb2 --- /dev/null +++ b/package/python-pypika-tortoise/python-pypika-tortoise.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pypika-tortoise +# +################################################################################ + +PYTHON_PYPIKA_TORTOISE_VERSION = 0.1.6 +PYTHON_PYPIKA_TORTOISE_SOURCE = pypika-tortoise-$(PYTHON_PYPIKA_TORTOISE_VERSION).tar.gz +PYTHON_PYPIKA_TORTOISE_SITE = https://files.pythonhosted.org/packages/86/55/1bfd4150f664d2e07b36c8f442178cc1f717bb9ae6cae20f21e851c208c6 +PYTHON_PYPIKA_TORTOISE_SETUP_TYPE = pep517 +PYTHON_PYPIKA_TORTOISE_LICENSE = Apache-2.0 +PYTHON_PYPIKA_TORTOISE_LICENSE_FILES = LICENSE +PYTHON_PYPIKA_TORTOISE_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) From 500070c1050c0a718026a43f620af6c443e003e6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 15:23:41 -0600 Subject: [PATCH 1913/3013] package/python-tortoise-orm: new package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-tortoise-orm/Config.in | 10 ++++++++++ .../python-tortoise-orm/python-tortoise-orm.hash | 5 +++++ .../python-tortoise-orm/python-tortoise-orm.mk | 15 +++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-tortoise-orm/Config.in create mode 100644 package/python-tortoise-orm/python-tortoise-orm.hash create mode 100644 package/python-tortoise-orm/python-tortoise-orm.mk diff --git a/package/Config.in b/package/Config.in index f314140df46..e58b8eebc9d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1397,6 +1397,7 @@ menu "External python modules" source "package/python-toml/Config.in" source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" + source "package/python-tortoise-orm/Config.in" source "package/python-tqdm/Config.in" source "package/python-trafaret/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tortoise-orm/Config.in b/package/python-tortoise-orm/Config.in new file mode 100644 index 00000000000..62b1a5a86e8 --- /dev/null +++ b/package/python-tortoise-orm/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_TORTOISE_ORM + bool "python-tortoise-orm" + select BR2_PACKAGE_PYTHON_AIOSQLITE # runtime + select BR2_PACKAGE_PYTHON_ISO8601 # runtime + select BR2_PACKAGE_PYTHON_PYPIKA_TORTOISE # runtime + select BR2_PACKAGE_PYTHON_PYTZ # runtime + help + Easy async ORM for python, built with relations in mind. + + https://github.com/tortoise/tortoise-orm diff --git a/package/python-tortoise-orm/python-tortoise-orm.hash b/package/python-tortoise-orm/python-tortoise-orm.hash new file mode 100644 index 00000000000..4796c8277fc --- /dev/null +++ b/package/python-tortoise-orm/python-tortoise-orm.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tortoise-orm/json +md5 aa5efa50e69d0a67b75c187f7550acd7 tortoise_orm-0.20.0.tar.gz +sha256 283af584d685dcc58d6cc1da35b9115bb1e41c89075eae2a19c493b39b9b41f7 tortoise_orm-0.20.0.tar.gz +# Locally computed sha256 checksums +sha256 f955d347b975d5867ee364f978476b3012878a706d468571b9758cac74de6041 LICENSE.txt diff --git a/package/python-tortoise-orm/python-tortoise-orm.mk b/package/python-tortoise-orm/python-tortoise-orm.mk new file mode 100644 index 00000000000..cc1c2126b7e --- /dev/null +++ b/package/python-tortoise-orm/python-tortoise-orm.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-tortoise-orm +# +################################################################################ + +PYTHON_TORTOISE_ORM_VERSION = 0.20.0 +PYTHON_TORTOISE_ORM_SOURCE = tortoise_orm-$(PYTHON_TORTOISE_ORM_VERSION).tar.gz +PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/3b/84/8ca142fe370d59c4e3135825b2822d199c4f885ae855657c1a7361e68511 +PYTHON_TORTOISE_ORM_SETUP_TYPE = pep517 +PYTHON_TORTOISE_ORM_LICENSE = Apache-2.0 +PYTHON_TORTOISE_ORM_LICENSE_FILES = LICENSE.txt +PYTHON_TORTOISE_ORM_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) From c90e275718f210d488a6958eec65772c120f9e68 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 15:23:42 -0600 Subject: [PATCH 1914/3013] package/python-dictdiffer: new package We need to set --skip-dependency-check to prevent pytest-runner from being required to build python-dictdiffer. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-dictdiffer/Config.in | 7 +++++++ package/python-dictdiffer/python-dictdiffer.hash | 5 +++++ package/python-dictdiffer/python-dictdiffer.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-dictdiffer/Config.in create mode 100644 package/python-dictdiffer/python-dictdiffer.hash create mode 100644 package/python-dictdiffer/python-dictdiffer.mk diff --git a/package/Config.in b/package/Config.in index e58b8eebc9d..3e69f55c04e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1071,6 +1071,7 @@ menu "External python modules" source "package/python-decouple/Config.in" source "package/python-defusedxml/Config.in" source "package/python-dialog3/Config.in" + source "package/python-dictdiffer/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-dicttoxml2/Config.in" source "package/python-distro/Config.in" diff --git a/package/python-dictdiffer/Config.in b/package/python-dictdiffer/Config.in new file mode 100644 index 00000000000..636b4f7c4ea --- /dev/null +++ b/package/python-dictdiffer/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_DICTDIFFER + bool "python-dictdiffer" + help + Dictdiffer is a library that helps you to diff and patch + dictionaries. + + https://github.com/inveniosoftware/dictdiffer diff --git a/package/python-dictdiffer/python-dictdiffer.hash b/package/python-dictdiffer/python-dictdiffer.hash new file mode 100644 index 00000000000..4984595346d --- /dev/null +++ b/package/python-dictdiffer/python-dictdiffer.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dictdiffer/json +md5 524b353b969300d4dc6aa6720c953657 dictdiffer-0.9.0.tar.gz +sha256 17bacf5fbfe613ccf1b6d512bd766e6b21fb798822a133aa86098b8ac9997578 dictdiffer-0.9.0.tar.gz +# Locally computed sha256 checksums +sha256 1f9e05b3b9a6fad24cc67455578bcdfd3e89b09a25c45369a5254203bbe2bdd3 LICENSE diff --git a/package/python-dictdiffer/python-dictdiffer.mk b/package/python-dictdiffer/python-dictdiffer.mk new file mode 100644 index 00000000000..569f923a9a5 --- /dev/null +++ b/package/python-dictdiffer/python-dictdiffer.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-dictdiffer +# +################################################################################ + +PYTHON_DICTDIFFER_VERSION = 0.9.0 +PYTHON_DICTDIFFER_SOURCE = dictdiffer-$(PYTHON_DICTDIFFER_VERSION).tar.gz +PYTHON_DICTDIFFER_SITE = https://files.pythonhosted.org/packages/61/7b/35cbccb7effc5d7e40f4c55e2b79399e1853041997fcda15c9ff160abba0 +PYTHON_DICTDIFFER_SETUP_TYPE = setuptools +PYTHON_DICTDIFFER_LICENSE = MIT +PYTHON_DICTDIFFER_LICENSE_FILES = LICENSE +PYTHON_DICTDIFFER_DEPENDENCIES = host-python-setuptools-scm +PYTHON_DICTDIFFER_BUILD_OPTS = --skip-dependency-check + +$(eval $(python-package)) From 8a549a1bad51f1ef0ede2666a52e8f389babbc22 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 15:23:43 -0600 Subject: [PATCH 1915/3013] package/python-tomlkit: new package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-tomlkit/Config.in | 6 ++++++ package/python-tomlkit/python-tomlkit.hash | 5 +++++ package/python-tomlkit/python-tomlkit.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-tomlkit/Config.in create mode 100644 package/python-tomlkit/python-tomlkit.hash create mode 100644 package/python-tomlkit/python-tomlkit.mk diff --git a/package/Config.in b/package/Config.in index 3e69f55c04e..017c6f21e67 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1397,6 +1397,7 @@ menu "External python modules" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" source "package/python-tomli/Config.in" + source "package/python-tomlkit/Config.in" source "package/python-tornado/Config.in" source "package/python-tortoise-orm/Config.in" source "package/python-tqdm/Config.in" diff --git a/package/python-tomlkit/Config.in b/package/python-tomlkit/Config.in new file mode 100644 index 00000000000..6d9afdd8d1a --- /dev/null +++ b/package/python-tomlkit/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TOMLKIT + bool "python-tomlkit" + help + Style preserving TOML library. + + https://github.com/sdispater/tomlkit diff --git a/package/python-tomlkit/python-tomlkit.hash b/package/python-tomlkit/python-tomlkit.hash new file mode 100644 index 00000000000..8c6d3c2377b --- /dev/null +++ b/package/python-tomlkit/python-tomlkit.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomlkit/json +md5 e182df9625d617692a9ae035266634fe tomlkit-0.12.4.tar.gz +sha256 7ca1cfc12232806517a8515047ba66a19369e71edf2439d0f5824f91032b6cc3 tomlkit-0.12.4.tar.gz +# Locally computed sha256 checksums +sha256 f2f9b460ba719da6626add264d3782f275a4ff7aab677beda08b330911e23adb LICENSE diff --git a/package/python-tomlkit/python-tomlkit.mk b/package/python-tomlkit/python-tomlkit.mk new file mode 100644 index 00000000000..ad82719ee2a --- /dev/null +++ b/package/python-tomlkit/python-tomlkit.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-tomlkit +# +################################################################################ + +PYTHON_TOMLKIT_VERSION = 0.12.4 +PYTHON_TOMLKIT_SOURCE = tomlkit-$(PYTHON_TOMLKIT_VERSION).tar.gz +PYTHON_TOMLKIT_SITE = https://files.pythonhosted.org/packages/7d/49/4c0764898ee67618996148bdba4534a422c5e698b4dbf4001f7c6f930797 +PYTHON_TOMLKIT_SETUP_TYPE = pep517 +PYTHON_TOMLKIT_LICENSE = MIT +PYTHON_TOMLKIT_LICENSE_FILES = LICENSE +PYTHON_TOMLKIT_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) From c1d9e4b9f74e840f6bb805743f3872310369506e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 15:23:44 -0600 Subject: [PATCH 1916/3013] package/python-aerich: new package We need to backport a patch so that the correct poetry build backend is used. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + ...ild-backend-to-support-editable-inst.patch | 29 +++++++++++++++++++ package/python-aerich/Config.in | 12 ++++++++ package/python-aerich/python-aerich.hash | 5 ++++ package/python-aerich/python-aerich.mk | 15 ++++++++++ 5 files changed, 62 insertions(+) create mode 100644 package/python-aerich/0001-update-poetry-build-backend-to-support-editable-inst.patch create mode 100644 package/python-aerich/Config.in create mode 100644 package/python-aerich/python-aerich.hash create mode 100644 package/python-aerich/python-aerich.mk diff --git a/package/Config.in b/package/Config.in index 017c6f21e67..c6e9611ca93 100644 --- a/package/Config.in +++ b/package/Config.in @@ -963,6 +963,7 @@ endif if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" + source "package/python-aerich/Config.in" source "package/python-aexpect/Config.in" source "package/python-aioblescan/Config.in" source "package/python-aiocoap/Config.in" diff --git a/package/python-aerich/0001-update-poetry-build-backend-to-support-editable-inst.patch b/package/python-aerich/0001-update-poetry-build-backend-to-support-editable-inst.patch new file mode 100644 index 00000000000..67d7c45bfbb --- /dev/null +++ b/package/python-aerich/0001-update-poetry-build-backend-to-support-editable-inst.patch @@ -0,0 +1,29 @@ +From e729bb9b602ba74dea7ccc978dac709283a0934a Mon Sep 17 00:00:00 2001 +From: strayge +Date: Fri, 18 Aug 2023 15:03:38 +0400 +Subject: [PATCH] update poetry build-backend to support editable install + +Signed-off-by: James Hilliard +Upstream: https://github.com/tortoise/aerich/commit/e729bb9b602ba74dea7ccc978dac709283a0934a +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index b9390e1..7673d70 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -45,8 +45,8 @@ location = "./migrations" + src_folder = "./." + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" + + [tool.poetry.scripts] + aerich = "aerich.cli:main" +-- +2.34.1 + diff --git a/package/python-aerich/Config.in b/package/python-aerich/Config.in new file mode 100644 index 00000000000..3aa39e176da --- /dev/null +++ b/package/python-aerich/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_AERICH + bool "python-aerich" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_DICTDIFFER # runtime + select BR2_PACKAGE_PYTHON_PYDANTIC # runtime + select BR2_PACKAGE_PYTHON_TOMLKIT # runtime + select BR2_PACKAGE_PYTHON_TORTOISE_ORM # runtime + help + A database migrations tool for Tortoise ORM. + + https://github.com/tortoise/aerich diff --git a/package/python-aerich/python-aerich.hash b/package/python-aerich/python-aerich.hash new file mode 100644 index 00000000000..c104c3d58e2 --- /dev/null +++ b/package/python-aerich/python-aerich.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aerich/json +md5 26a99a2c6c604a370b228b74e12c7981 aerich-0.7.2.tar.gz +sha256 31d67de7b96184636b89de99062e059e5e6204b6251d24c33eb21fc9cf982e09 aerich-0.7.2.tar.gz +# Locally computed sha256 checksums +sha256 4cc00f0e33ac8e089b37d8a1474be441b26311bdc16fe035c75b51201515f617 LICENSE diff --git a/package/python-aerich/python-aerich.mk b/package/python-aerich/python-aerich.mk new file mode 100644 index 00000000000..63343e0b96c --- /dev/null +++ b/package/python-aerich/python-aerich.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-aerich +# +################################################################################ + +PYTHON_AERICH_VERSION = 0.7.2 +PYTHON_AERICH_SOURCE = aerich-$(PYTHON_AERICH_VERSION).tar.gz +PYTHON_AERICH_SITE = https://files.pythonhosted.org/packages/ca/cd/ae9c60ffc21e2d41e22c62cbf24a60dfad937222d880489703842d179746 +PYTHON_AERICH_SETUP_TYPE = pep517 +PYTHON_AERICH_LICENSE = Apache-2.0 +PYTHON_AERICH_LICENSE_FILES = LICENSE +PYTHON_AERICH_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) From c3faf4f71623562480629d550f89cf7bf454e680 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 23:08:25 -0600 Subject: [PATCH 1917/3013] package/python-grpclib: new package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-grpclib/Config.in | 8 ++++++++ package/python-grpclib/python-grpclib.hash | 5 +++++ package/python-grpclib/python-grpclib.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-grpclib/Config.in create mode 100644 package/python-grpclib/python-grpclib.hash create mode 100644 package/python-grpclib/python-grpclib.mk diff --git a/package/Config.in b/package/Config.in index c6e9611ca93..acdc72c441b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1126,6 +1126,7 @@ menu "External python modules" source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" + source "package/python-grpclib/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpclib/Config.in b/package/python-grpclib/Config.in new file mode 100644 index 00000000000..42cc011097b --- /dev/null +++ b/package/python-grpclib/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_GRPCLIB + bool "python-grpclib" + select BR2_PACKAGE_PYTHON_H2 # runtime + select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + help + Pure-Python gRPC implementation for asyncio. + + https://github.com/vmagamedov/grpclib diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash new file mode 100644 index 00000000000..cc652091380 --- /dev/null +++ b/package/python-grpclib/python-grpclib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpclib/json +md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz +sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk new file mode 100644 index 00000000000..0bec0a18796 --- /dev/null +++ b/package/python-grpclib/python-grpclib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpclib +# +################################################################################ + +PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SETUP_TYPE = setuptools +PYTHON_GRPCLIB_LICENSE = BSD-3-Clause +PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From c1d3b7f97a080a0a278fdaab7f28f9fbbc82a743 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 1 Apr 2024 23:08:26 -0600 Subject: [PATCH 1918/3013] package/python-betterproto: new package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-betterproto/Config.in | 8 ++++++++ .../python-betterproto/python-betterproto.hash | 5 +++++ package/python-betterproto/python-betterproto.mk | 15 +++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-betterproto/Config.in create mode 100644 package/python-betterproto/python-betterproto.hash create mode 100644 package/python-betterproto/python-betterproto.mk diff --git a/package/Config.in b/package/Config.in index acdc72c441b..3b66ee29001 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1015,6 +1015,7 @@ menu "External python modules" source "package/python-backcall/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" + source "package/python-betterproto/Config.in" source "package/python-bidict/Config.in" source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in new file mode 100644 index 00000000000..8548fd43ba6 --- /dev/null +++ b/package/python-betterproto/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_BETTERPROTO + bool "python-betterproto" + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + help + A better Protobuf / gRPC generator & library. + + http://github.com/danielgtaylor/python-betterproto diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash new file mode 100644 index 00000000000..8d23d2ae567 --- /dev/null +++ b/package/python-betterproto/python-betterproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/betterproto/json +md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz +sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +# Locally computed sha256 checksums +sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk new file mode 100644 index 00000000000..37f72f8166f --- /dev/null +++ b/package/python-betterproto/python-betterproto.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-betterproto +# +################################################################################ + +PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 +PYTHON_BETTERPROTO_SETUP_TYPE = pep517 +PYTHON_BETTERPROTO_LICENSE = MIT +PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md +PYTHON_BETTERPROTO_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) From eb519ad7cc716347dbf0f9707ff282a97b21f623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Wed, 3 Apr 2024 21:30:38 +0000 Subject: [PATCH 1919/3013] docs/manual: promote using fixed version for kernel headers when contributing a board MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the default (newest) kernel headers series changes the build can break. Example error message: Incorrect selection of kernel headers: expected 6.8.x, got 6.5.x In the above case the defconfig used: BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.9" The kernel headers were not specified, so the build defaulted to using the kernel sources as header source and the default (newest) header series. From .config: BR2_KERNEL_HEADERS_AS_KERNEL=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y Signed-off-by: Gero Schwäricke Signed-off-by: Arnout Vandecappelle --- docs/manual/adding-board-support.adoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-board-support.adoc b/docs/manual/adding-board-support.adoc index 9501262086a..be7699668d1 100644 --- a/docs/manual/adding-board-support.adoc +++ b/docs/manual/adding-board-support.adoc @@ -32,7 +32,11 @@ Always use fixed versions or commit hashes for the different components, not the "latest" version. For example, set +BR2_LINUX_KERNEL_CUSTOM_VERSION=y+ and +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE+ to the kernel version you tested -with. +with. If you are using the buildroot toolchain +BR2_TOOLCHAIN_BUILDROOT+ +(which is the default), additionally ensure that the same kernel headers +are used (+BR2_KERNEL_HEADERS_AS_KERNEL+, which is also the default) and +set the custom kernel headers series to match your kernel version +(+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_*+). It is recommended to use as much as possible upstream versions of the Linux kernel and bootloaders, and to use as much as possible default From 490c5570c2cbdac7d70d9537539dd928d883330a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 27 Jun 2024 09:54:38 +0200 Subject: [PATCH 1920/3013] package/python-asn1crypto: add host-variant Required to build python-tpm2-pytss. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/python-asn1crypto/python-asn1crypto.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-asn1crypto/python-asn1crypto.mk b/package/python-asn1crypto/python-asn1crypto.mk index 480b70d17aa..d8d61761506 100644 --- a/package/python-asn1crypto/python-asn1crypto.mk +++ b/package/python-asn1crypto/python-asn1crypto.mk @@ -12,3 +12,4 @@ PYTHON_ASN1CRYPTO_LICENSE = MIT PYTHON_ASN1CRYPTO_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) From 4533db8f6460c9b945afeddac864a4f4d6f61a75 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 27 Jun 2024 09:54:39 +0200 Subject: [PATCH 1921/3013] package/python-pkgconfig: new host package Required to build python-tpm2-pytss. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/python-pkgconfig/python-pkgconfig.hash | 5 +++++ package/python-pkgconfig/python-pkgconfig.mk | 16 ++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/python-pkgconfig/python-pkgconfig.hash create mode 100644 package/python-pkgconfig/python-pkgconfig.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7d6b364e58e..ab6482703d3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2827,6 +2827,7 @@ F: package/openpowerlink/ F: package/physfs/ F: package/piglit/ F: package/python-libevdev/ +F: package/python-pkgconfig/ F: package/qemu/ F: package/solarus/ F: package/stress-ng/ diff --git a/package/python-pkgconfig/python-pkgconfig.hash b/package/python-pkgconfig/python-pkgconfig.hash new file mode 100644 index 00000000000..2fa57a7be51 --- /dev/null +++ b/package/python-pkgconfig/python-pkgconfig.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pkgconfig/json +md5 12523e11b91b050ca49975cc033689a4 pkgconfig-1.5.5.tar.gz +sha256 deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899 pkgconfig-1.5.5.tar.gz +# Locally computed sha256 checksums +sha256 cdfc7f89d8c93b15d447c9ed71d5a533b4e44b82ec86daaefb10f6db37b9e13a LICENSE diff --git a/package/python-pkgconfig/python-pkgconfig.mk b/package/python-pkgconfig/python-pkgconfig.mk new file mode 100644 index 00000000000..239dd90a5d4 --- /dev/null +++ b/package/python-pkgconfig/python-pkgconfig.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pkgconfig +# +################################################################################ + +PYTHON_PKGCONFIG_VERSION = 1.5.5 +PYTHON_PKGCONFIG_SOURCE = pkgconfig-$(PYTHON_PKGCONFIG_VERSION).tar.gz +PYTHON_PKGCONFIG_SITE = https://files.pythonhosted.org/packages/c4/e0/e05fee8b5425db6f83237128742e7e5ef26219b687ab8f0d41ed0422125e +PYTHON_PKGCONFIG_SETUP_TYPE = setuptools +PYTHON_PKGCONFIG_LICENSE = MIT +PYTHON_PKGCONFIG_LICENSE_FILES = LICENSE + +HOST_PYTHON_PKGCONFIG_DEPENDENCIES = host-python-poetry-core + +$(eval $(host-python-package)) From c72c6f26ed706474f6607f97be2925834c8baa03 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 27 Jun 2024 09:54:40 +0200 Subject: [PATCH 1922/3013] package/python-tpm2-pytss: new package Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-tpm2-pytss/Config.in | 14 ++++++++++++ .../python-tpm2-pytss/python-tpm2-pytss.hash | 5 +++++ .../python-tpm2-pytss/python-tpm2-pytss.mk | 22 +++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/python-tpm2-pytss/Config.in create mode 100644 package/python-tpm2-pytss/python-tpm2-pytss.hash create mode 100644 package/python-tpm2-pytss/python-tpm2-pytss.mk diff --git a/DEVELOPERS b/DEVELOPERS index ab6482703d3..c4f1565edd1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2828,6 +2828,7 @@ F: package/physfs/ F: package/piglit/ F: package/python-libevdev/ F: package/python-pkgconfig/ +F: package/python-tpm2-pytss/ F: package/qemu/ F: package/solarus/ F: package/stress-ng/ diff --git a/package/Config.in b/package/Config.in index 3b66ee29001..f2e10b2b5e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1403,6 +1403,7 @@ menu "External python modules" source "package/python-tomlkit/Config.in" source "package/python-tornado/Config.in" source "package/python-tortoise-orm/Config.in" + source "package/python-tpm2-pytss/Config.in" source "package/python-tqdm/Config.in" source "package/python-trafaret/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tpm2-pytss/Config.in b/package/python-tpm2-pytss/Config.in new file mode 100644 index 00000000000..60d9e8b9d32 --- /dev/null +++ b/package/python-tpm2-pytss/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_PYTHON_TPM2_PYTSS + bool "python-tpm2-pytss" + depends on !BR2_STATIC_LIBS # tpm2-tss + select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_TPM2_TSS + help + TPM 2.0 TSS Bindings for Python. + + https://github.com/tpm2-software/tpm2-pytss + +comment "python-tpm2-pytss needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/python-tpm2-pytss/python-tpm2-pytss.hash b/package/python-tpm2-pytss/python-tpm2-pytss.hash new file mode 100644 index 00000000000..10a9f112b74 --- /dev/null +++ b/package/python-tpm2-pytss/python-tpm2-pytss.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tpm2-pytss/json +md5 069a02c99d3203fada940c3dd43b699c tpm2-pytss-2.2.1.tar.gz +sha256 b8f15473422f377f59c7217dcd1479165cce62dfa33934ec976a278baf2e9efe tpm2-pytss-2.2.1.tar.gz +# Locally computed sha256 checksums +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/python-tpm2-pytss/python-tpm2-pytss.mk b/package/python-tpm2-pytss/python-tpm2-pytss.mk new file mode 100644 index 00000000000..80491aac46e --- /dev/null +++ b/package/python-tpm2-pytss/python-tpm2-pytss.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# python-tpm2-pytss +# +################################################################################ + +PYTHON_TPM2_PYTSS_VERSION = 2.2.1 +PYTHON_TPM2_PYTSS_SOURCE = tpm2-pytss-$(PYTHON_TPM2_PYTSS_VERSION).tar.gz +PYTHON_TPM2_PYTSS_SITE = https://files.pythonhosted.org/packages/13/e5/8d4a9ac91579c741ec9fb63befcf6577107f22f3508c364fd53e277d7237 +PYTHON_TPM2_PYTSS_SETUP_TYPE = setuptools +PYTHON_TPM2_PYTSS_LICENSE = BSD-2-Clause +PYTHON_TPM2_PYTSS_LICENSE_FILES = LICENSE + +PYTHON_TPM2_PYTSS_DEPENDENCIES = host-pkgconf \ + host-python-asn1crypto \ + host-python-cffi \ + host-python-cryptography \ + host-python-pkgconfig \ + host-python-pycparser \ + tpm2-tss + +$(eval $(python-package)) From 89e3b2fb846506217b4767fe9165f1641a407314 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 27 Jun 2024 09:54:41 +0200 Subject: [PATCH 1923/3013] package/tpm2-pkcs11: install tpm2_ptool utility The tpm2_ptool script appears on several TPM2 tutorials and it's packaged as the "tpm2-pkcs11-tools" package in several Linux distribution. Add a new tpm2-pkcs11 option to install tpm2_ptool script along with its dependencies. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/tpm2-pkcs11/Config.in | 22 ++++++++++++++++++++++ package/tpm2-pkcs11/tpm2-pkcs11.mk | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/package/tpm2-pkcs11/Config.in b/package/tpm2-pkcs11/Config.in index 5d457032238..93aa4a847a3 100644 --- a/package/tpm2-pkcs11/Config.in +++ b/package/tpm2-pkcs11/Config.in @@ -11,5 +11,27 @@ config BR2_PACKAGE_TPM2_PKCS11 https://github.com/tpm2-software/tpm2-pkcs11 +if BR2_PACKAGE_TPM2_PKCS11 + +config BR2_PACKAGE_TPM2_PKCS11_PYTHON_TOOLS + bool "Install python tools (tpm2_ptool)" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-bcrypt, python-cryptography + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_BCRYPT # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_PYASN1 # runtime + select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime + select BR2_PACKAGE_PYTHON_TPM2_PYTSS # runtime + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + help + Enable Python-related tools (tpm2_ptool) + +comment "python tools needs python3" + depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + +endif + comment "tpm2-pkcs11 needs a toolchain w/ dynamic library, threads" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/tpm2-pkcs11/tpm2-pkcs11.mk b/package/tpm2-pkcs11/tpm2-pkcs11.mk index 18f04157e30..c6218d772e2 100644 --- a/package/tpm2-pkcs11/tpm2-pkcs11.mk +++ b/package/tpm2-pkcs11/tpm2-pkcs11.mk @@ -44,4 +44,24 @@ TPM2_PKCS11_CONF_OPTS += \ --with-p11kitconfigdir=/usr/share/p11-kit/modules endif +ifeq ($(BR2_PACKAGE_TPM2_PKCS11_PYTHON_TOOLS),y) +TPM2_PKCS11_DEPENDENCIES += python-tpm2-pytss + +define TPM2_PKCS11_BUILD_TOOLS + (cd $(@D)/tools; \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ + $(HOST_DIR)/bin/python setup.py build) +endef +TPM2_PKCS11_POST_BUILD_HOOKS += TPM2_PKCS11_BUILD_TOOLS + +define TPM2_PKCS11_INSTALL_TARGET_TOOLS + (cd $(@D)/tools; \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ + $(HOST_DIR)/bin/python setup.py install \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ + --root=$(TARGET_DIR)) +endef +TPM2_PKCS11_POST_INSTALL_TARGET_HOOKS += TPM2_PKCS11_INSTALL_TARGET_TOOLS +endif + $(eval $(autotools-package)) From 27e7b0bf14cf2321e2aae64e490671f5cfa2281d Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 19 Jul 2024 20:03:53 +0200 Subject: [PATCH 1924/3013] package/tipidee: fix install without config file When the tipidee package was added in commit 17deaf60f66fc08a796233920a104e5233b501e0, the committer refactored it so no separate boolean option is required to enable the config file. However, in doing so, the case where the config file is empty was not correctly handled: BR2_PACKAGE_TIPIDEE_CONFIG_FILE is never empty because even with the empty string it contains "". Fox by qstrip'ing before checking for empty. Signed-off-by: Arnout Vandecappelle --- package/tipidee/tipidee.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/tipidee/tipidee.mk b/package/tipidee/tipidee.mk index 1e15782aa49..915b4f84bdd 100644 --- a/package/tipidee/tipidee.mk +++ b/package/tipidee/tipidee.mk @@ -33,12 +33,13 @@ define TIPIDEE_INSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/libexec/tipidee-config-preprocess endef -ifneq ($(BR2_PACKAGE_TIPIDEE_CONFIG_FILE),) +TIPIDEE_CONFIG_FILE = $(call qstrip, $(BR2_PACKAGE_TIPIDEE_CONFIG_FILE)) +ifneq ($(TIPIDEE_CONFIG_FILE),) TIPIDEE_DEPENDENCIES += host-tipidee define TIPIDEE_INSTALL_CONFIG $(HOST_DIR)/bin/tipidee-config \ - -i $(call qstrip, $(BR2_PACKAGE_TIPIDEE_CONFIG_FILE)) \ + -i "$(TIPIDEE_CONFIG_FILE)" \ -o $(TARGET_DIR)/etc/tipidee.conf.cdb endef TIPIDEE_POST_INSTALL_TARGET_HOOKS += TIPIDEE_INSTALL_CONFIG From 144a817f4ff9c768de7a9daf2ea7ae406119d1f9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 20 Jul 2024 10:26:13 +0200 Subject: [PATCH 1925/3013] package/openssh: add CVE ignore for CVE-2024-6387 Commit e7f124e9b632 (package/openssh: disable async-signal-unsafe code in sshsigdie()) add a patch for CVE-2024-6387 but forgot to add an _IGNORE_CVES entry. Fix that. Signed-off-by: Peter Korsgaard --- package/openssh/openssh.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 5a568d5fd17..9a1dee2a3d8 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -16,6 +16,9 @@ OPENSSH_LICENSE_FILES = LICENCE # 0001-Improve-detection-of-fzero-call-used-regs-used.patch OPENSSH_AUTORECONF = YES +# 0002-sshsigdie-async-signal-unsafe.patch +OPENSSH_IGNORE_CVES += CVE-2024-6387 + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From 3bb426628c19f04cbad6821c1a68f008043d7808 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 14:29:08 +0200 Subject: [PATCH 1926/3013] package/mpir: fix build with host gcc >= 14 Fix the following build failure with host gcc >= 14 which enables -Werror=implicit-function-declaration (https://gcc.gnu.org/gcc-14/porting_to.html): configure:9998: checking build system compiler /usr/bin/gcc configure:10011: /usr/bin/gcc conftest.c conftest.c: In function 'main': conftest.c:4:3: error: implicit declaration of function 'exit' [-Wimplicit-function-declaration] 4 | exit(0); | ^~~~ conftest.c:1:1: note: include '' or provide a declaration of 'exit' +++ |+#include 1 | int conftest.c:4:3: warning: incompatible implicit declaration of built-in function 'exit' [-Wbuiltin-declaration-mismatch] 4 | exit(0); | ^~~~ conftest.c:4:3: note: include '' or provide a declaration of 'exit' configure:10014: $? = 1 configure:10021: result: no configure:10026: error: Specified CC_FOR_BUILD doesn't seem to work Fixes: - http://autobuild.buildroot.org/results/3ab381f06d5dc030039b6f6f8d19feb55cf3367d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-Fix-configure-failures-with-Xcode12.patch | 116 ++++++++++++++++++ package/mpir/mpir.mk | 2 + 2 files changed, 118 insertions(+) create mode 100644 package/mpir/0002-Fix-configure-failures-with-Xcode12.patch diff --git a/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch b/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch new file mode 100644 index 00000000000..453515f9267 --- /dev/null +++ b/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch @@ -0,0 +1,116 @@ +From bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb Mon Sep 17 00:00:00 2001 +From: Mitchell Blank Jr +Date: Mon, 21 Dec 2020 12:05:19 +0000 +Subject: [PATCH] Fix configure failures with Xcode12 + +Changes are needed becuase Xcode12 includes a default of +-Werror,-Wimplicit-function-declaration which means that +even something like calling "exit(0);" is a compile failure +if you haven't done a "#include " first (as C99 +requires, but most other compilers will just warn about) + +I don't know if the "long long reliability test 2" test which +tries to provoke a crash on a particular gcc 3.3 build still +does what it was originally intended to do with my change. +Of course, I doubt anyone has tried to use that compiler in +years. + +Fixes #290 + +Upstream: https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb +Signed-off-by: Fabrice Fontaine +--- + acinclude.m4 | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 91c35bc23..620a629ef 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -589,9 +589,9 @@ extern + #endif + __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) + {t1 c,x,r;int i;if(v0){c=1;for(i=1;iconftest.c <conftest.c < + int + main () + { +- exit(0); ++ return 0; + } + double d; + double diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk index 5dbd760aa1f..46cd35e4365 100644 --- a/package/mpir/mpir.mk +++ b/package/mpir/mpir.mk @@ -11,6 +11,8 @@ MPIR_LICENSE = LGPL-3.0+ MPIR_LICENSE_FILES = COPYING.LIB MPIR_INSTALL_STAGING = YES MPIR_DEPENDENCIES = gmp host-yasm +# 0002-Fix-configure-failures-with-Xcode12.patch +MPIR_AUTORECONF = YES ifeq ($(BR2_MIPS_NABI32),y) MPIR_CONF_OPTS += ABI=n32 From d3e1821cc6496bfab19e4fe3be9fe6223e8f8176 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 14:40:08 +0200 Subject: [PATCH 1927/3013] package/cpuload: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: read_cpu_stat.c: In function 'cpudata_new': read_cpu_stat.c:49:17: error: implicit declaration of function 'error'; did you mean 'perror'? [-Wimplicit-function-declaration] 49 | error("too many cpus"); | ^~~~~ | perror Fixes: - http://autobuild.buildroot.org/results/3bca2659011d123d7b7a0ca19c4e868643d45766 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Changed-error-calls-to-perror.patch | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 package/cpuload/0001-Changed-error-calls-to-perror.patch diff --git a/package/cpuload/0001-Changed-error-calls-to-perror.patch b/package/cpuload/0001-Changed-error-calls-to-perror.patch new file mode 100644 index 00000000000..6672bec6779 --- /dev/null +++ b/package/cpuload/0001-Changed-error-calls-to-perror.patch @@ -0,0 +1,115 @@ +From ffd61eaa72acf123dea0c80ed3774656289ab49f Mon Sep 17 00:00:00 2001 +From: roiec +Date: Wed, 5 Jan 2022 17:12:05 +0200 +Subject: [PATCH] Changed 'error' calls to 'perror' + +Upstream: https://github.com/kelvincheung/cpuload/pull/1 +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 60 ++++++++++++++++++++++++++++++++++++++++++++ + src/graph_cpu_load.c | 4 +-- + src/read_cpu_stat.c | 2 +- + 3 files changed, 63 insertions(+), 3 deletions(-) + create mode 100644 .gitignore + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..c2ae907 +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,60 @@ ++# Prerequisites ++*.d ++ ++# Object files ++*.o ++*.ko ++*.obj ++*.elf ++ ++# Linker output ++*.ilk ++*.map ++*.exp ++ ++# Precompiled Headers ++*.gch ++*.pch ++ ++# Libraries ++*.lib ++*.a ++*.la ++*.lo ++ ++# Shared objects (inc. Windows DLLs) ++*.dll ++*.so ++*.so.* ++*.dylib ++ ++# Executables ++*.exe ++*.out ++*.app ++*.i*86 ++*.x86_64 ++*.hex ++ ++# Debug files ++*.dSYM/ ++*.su ++*.idb ++*.pdb ++ ++# Kernel Module Compile Results ++*.mod* ++*.cmd ++.tmp_versions/ ++modules.order ++Module.symvers ++Mkfile.old ++dkms.conf ++ ++#images ++*.tgz ++*.img ++ ++ ++#build ++configure +diff --git a/src/graph_cpu_load.c b/src/graph_cpu_load.c +index e4b7785..525d9ed 100644 +--- a/src/graph_cpu_load.c ++++ b/src/graph_cpu_load.c +@@ -132,7 +132,7 @@ void graph_new_line(char *str, unsigned long color) + graph_last_x = graph_last_y = -1; + + if (graph_data_index >= MAX_GRAPH_DATA - 2) +- error("Too many graph data."); ++ perror("Too many graph data."); + + graph_data[graph_data_index++] = DATUM_COLOR; + graph_data[graph_data_index++] = color; +@@ -145,7 +145,7 @@ void graph_new_line(char *str, unsigned long color) + void graph_add_point(int size, int amount) + { + if (graph_data_index >= MAX_GRAPH_DATA - 4) +- error("Too many graph data."); ++ perror("Too many graph data."); + + graph_data[graph_data_index++] = DATUM_SIZE; + graph_data[graph_data_index++] = size; +diff --git a/src/read_cpu_stat.c b/src/read_cpu_stat.c +index 3d014be..ff51d7f 100644 +--- a/src/read_cpu_stat.c ++++ b/src/read_cpu_stat.c +@@ -46,7 +46,7 @@ ProcessList *cpudata_new(void) + fclose(file); + + if (cpu > cpus -1) { +- error("too many cpus"); ++ perror("too many cpus"); + exit(1); + } + From 65672b9cd099b71dcfec1d982af1f35824b851d4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 16:26:29 +0200 Subject: [PATCH 1928/3013] package/autossh: fix build with gcc >= 14 Include stdio.h to avoid that __progname check wrongly returned that the function is unavailable with gcc >= 14 which enables -Werror=implicit-function-declaration (https://gcc.gnu.org/gcc-14/porting_to.html): configure:5231: checking if libc defines __progname configure:5249: /home/autobuild/autobuild/instance-7/output-1/host/bin/sh4-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c >&5 conftest.c: In function 'main': conftest.c:73:27: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration] 73 | extern char *__progname; printf("%s", __progname); | ^~~~~~ conftest.c:1:1: note: include '' or provide a declaration of 'printf' 1 | /* confdefs.h */ conftest.c:73:27: warning: incompatible implicit declaration of built-in function 'printf' [-Wbuiltin-declaration-mismatch] 73 | extern char *__progname; printf("%s", __progname); | ^~~~~~ conftest.c:73:27: note: include '' or provide a declaration of 'printf' resulting in the following static build failure: /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/sh4-buildroot-linux-musl/14.1.0/../../../../sh4-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/sh4-buildroot-linux-musl/sysroot/lib/libc.a(libc.o):(.bss.__progname+0x0): multiple definition of `__progname'; autossh.o:(.bss+0x120): first defined here Fixes: - http://autobuild.buildroot.org/results/5d80a8096d0f5529cbd86903a74f3bab3d230f4a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ....ac-fix-__progname-check-with-gcc-14.patch | 52 +++++++++++++++++++ package/autossh/autossh.mk | 1 + 2 files changed, 53 insertions(+) create mode 100644 package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch diff --git a/package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch b/package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch new file mode 100644 index 00000000000..a5173281107 --- /dev/null +++ b/package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch @@ -0,0 +1,52 @@ +From 3a74eff481f37975e04f00db4923b1c16f93497d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 20 Jul 2024 16:06:37 +0200 +Subject: [PATCH] configure.ac: fix __progname check with gcc >= 14 + +Include stdio.h to avoid that __progname check wrongly returns that +the function is unavailable with gcc >= 14 which enables +-Werror=implicit-function-declaration +(https://gcc.gnu.org/gcc-14/porting_to.html): + +configure:5231: checking if libc defines __progname +configure:5249: /home/autobuild/autobuild/instance-7/output-1/host/bin/sh4-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c >&5 +conftest.c: In function 'main': +conftest.c:73:27: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration] + 73 | extern char *__progname; printf("%s", __progname); + | ^~~~~~ +conftest.c:1:1: note: include '' or provide a declaration of 'printf' + 1 | /* confdefs.h */ +conftest.c:73:27: warning: incompatible implicit declaration of built-in function 'printf' [-Wbuiltin-declaration-mismatch] + 73 | extern char *__progname; printf("%s", __progname); + | ^~~~~~ +conftest.c:73:27: note: include '' or provide a declaration of 'printf' + +resulting in the following static build failure: + +/home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/sh4-buildroot-linux-musl/14.1.0/../../../../sh4-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/sh4-buildroot-linux-musl/sysroot/lib/libc.a(libc.o):(.bss.__progname+0x0): multiple definition of `__progname'; autossh.o:(.bss+0x120): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/5d80a8096d0f5529cbd86903a74f3bab3d230f4a + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/Autossh/autossh/pull/9 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4bb9380..dadb523 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -132,7 +132,7 @@ AC_CHECK_LIB(socket, connect) + # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ +- AC_TRY_LINK([], ++ AC_TRY_LINK([ #include ], + [ extern char *__progname; printf("%s", __progname); ], + [ ac_cv_libc_defines___progname="yes" ], + [ ac_cv_libc_defines___progname="no" ] +-- +2.43.0 + diff --git a/package/autossh/autossh.mk b/package/autossh/autossh.mk index 899e5cdb525..fbb525bcca2 100644 --- a/package/autossh/autossh.mk +++ b/package/autossh/autossh.mk @@ -10,6 +10,7 @@ AUTOSSH_SOURCE = autossh-$(AUTOSSH_VERSION).tgz AUTOSSH_LICENSE = Modified BSD AUTOSSH_LICENSE_FILES = autossh.c # Fix AC_ARG_WITH code generation for --with-ssh +# 0001-configure.ac-fix-__progname-check-with-gcc-14.patch AUTOSSH_AUTORECONF = YES AUTOSSH_CONF_OPTS = --with-ssh=/usr/bin/ssh From 9e5022a12c1f79139e446b2583e06aa430fad195 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 12:08:20 +0200 Subject: [PATCH 1929/3013] package/httping: fix patch fuzz Fix patch fuzz to avoid the following build failure raised since commit 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 which reduced the fuzz factor: Applying 0001-fix-math-library-linking.patch using patch: patching file Makefile Hunk #1 FAILED at 37. 1 out of 2 hunks FAILED -- saving rejects to file Makefile.rej Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 - http://autobuild.buildroot.org/results/f9cfb6f55d1f2cb855e6959c2381eeddea3e4936 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/httping/0001-fix-math-library-linking.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/httping/0001-fix-math-library-linking.patch b/package/httping/0001-fix-math-library-linking.patch index 0078f41c61e..582fb9e9178 100644 --- a/package/httping/0001-fix-math-library-linking.patch +++ b/package/httping/0001-fix-math-library-linking.patch @@ -2,12 +2,14 @@ Move LDFLAGS+=-lm option to the end. The order of the math library directive '-lm' matters. Signed-off-by: Yuvaraj Patil +[Fabrice: make the patch to be applied with fuzz factor 0] +Signed-off-by: Fabrice Fontaine --- diff -Nurp httping-2.3.4_orig/Makefile httping-2.3.4/Makefile --- httping-2.3.4_orig/Makefile 2014-07-23 16:16:36.495546288 +0530 +++ httping-2.3.4/Makefile 2014-07-23 16:18:42.547541002 +0530 -@@ -37,7 +37,6 @@ DEBUG=yes - WFLAGS=-Wall -W +@@ -36,7 +36,6 @@ DEBUG=yes + WFLAGS=-Wall -W -Wextra -pedantic -D_FORTIFY_SOURCE=2 OFLAGS= CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -LDFLAGS+=-lm From a5466a4303d7652c217139bf0dc0b1eb9d6ba0c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 11:37:43 +0200 Subject: [PATCH 1930/3013] package/libcli: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: libcli.c: In function 'cli_register_command': libcli.c:430:27: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] 430 | if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; | ^~~~~~ libcli.c:430:27: note: earlier argument should specify number of elements, later size of each element Fixes: - http://autobuild.buildroot.org/results/a170d27689e069cf58f830bdd74f604364ee503b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...rameters-for-Wcalloc-transposed-args.patch | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch diff --git a/package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch b/package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch new file mode 100644 index 00000000000..909de2b74dd --- /dev/null +++ b/package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch @@ -0,0 +1,96 @@ +From 42e798e3f8b4a092be26bc91c9f87e5593f0d302 Mon Sep 17 00:00:00 2001 +From: Gwyn Ciesla +Date: Wed, 31 Jan 2024 14:40:42 -0600 +Subject: [PATCH] Swap calloc parameters for -Wcalloc-transposed-args + +Upstream: https://github.com/dparrish/libcli/pull/93 +Signed-off-by: Fabrice Fontaine +--- + libcli.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/libcli.c b/libcli.c +index 88c23d8..32ceeae 100644 +--- a/libcli.c ++++ b/libcli.c +@@ -427,7 +427,7 @@ struct cli_command *cli_register_command(struct cli_def *cli, struct cli_command + struct cli_command *c; + + if (!command) return NULL; +- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; ++ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL; + c->command_type = CLI_REGULAR_COMMAND; + c->callback = callback; + c->next = NULL; +@@ -597,7 +597,7 @@ struct cli_def *cli_init() { + struct cli_def *cli; + struct cli_command *c; + +- if (!(cli = calloc(sizeof(struct cli_def), 1))) return 0; ++ if (!(cli = calloc(1, sizeof(struct cli_def)))) return 0; + + cli->buf_size = 1024; + if (!(cli->buffer = calloc(cli->buf_size, 1))) { +@@ -1957,7 +1957,7 @@ int cli_match_filter_init(struct cli_def *cli, int argc, char **argv, struct cli + char *search_flags = cli_get_optarg_value(cli, "search_flags", NULL); + + filt->filter = cli_match_filter; +- filt->data = state = calloc(sizeof(struct cli_match_filter_state), 1); ++ filt->data = state = calloc(1, sizeof(struct cli_match_filter_state)); + if (!state) return CLI_ERROR; + + if (!strcmp(cli->pipeline->current_stage->words[0], "include")) { +@@ -2050,7 +2050,7 @@ int cli_range_filter_init(struct cli_def *cli, int argc, char **argv, struct cli + // from the command line processing and continue + + filt->filter = cli_range_filter; +- filt->data = state = calloc(sizeof(struct cli_range_filter_state), 1); ++ filt->data = state = calloc(1, sizeof(struct cli_range_filter_state)); + if (state) { + state->from = from; + state->to = to; +@@ -2087,7 +2087,7 @@ int cli_count_filter_init(struct cli_def *cli, int argc, UNUSED(char **argv), st + } + + filt->filter = cli_count_filter; +- if (!(filt->data = calloc(sizeof(int), 1))) return CLI_ERROR; ++ if (!(filt->data = calloc(1, sizeof(int)))) return CLI_ERROR; + + return CLI_OK; + } +@@ -2144,7 +2144,7 @@ struct cli_command *cli_register_filter(struct cli_def *cli, const char *command + struct cli_command *c; + + if (!command) return NULL; +- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; ++ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL; + + c->command_type = CLI_FILTER_COMMAND; + c->init = init; +@@ -2256,7 +2256,7 @@ struct cli_optarg *cli_register_optarg(struct cli_command *cmd, const char *name + goto CLEANUP; + } + } +- if (!(optarg = calloc(sizeof(struct cli_optarg), 1))) goto CLEANUP; ++ if (!(optarg = calloc(1, sizeof(struct cli_optarg)))) goto CLEANUP; + if (!(optarg->name = strdup(name))) goto CLEANUP; + if (help && !(optarg->help = strdup(help))) goto CLEANUP; + +@@ -2532,7 +2532,7 @@ struct cli_command *cli_int_register_buildmode_command(struct cli_def *cli, stru + struct cli_command *c; + + if (!command) return NULL; +- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; ++ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL; + + c->flags = flags; + c->callback = callback; +@@ -3095,7 +3095,7 @@ int cli_int_execute_pipeline(struct cli_def *cli, struct cli_pipeline *pipeline) + struct cli_pipeline_stage *stage = &pipeline->stage[stage_num]; + pipeline->current_stage = stage; + cli->found_optargs = stage->found_optargs; +- *filt = calloc(sizeof(struct cli_filter), 1); ++ *filt = calloc(1, sizeof(struct cli_filter)); + if (*filt) { + if ((rc = stage->command->init(cli, stage->num_words, stage->words, *filt) != CLI_OK)) { + break; From 321e065516a64198f586632bd83411767d98fe6c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 22:22:31 +0200 Subject: [PATCH 1931/3013] package/augeas: bump to version 1.14.1 This bump will fix the following build failure with gcc >= 14 thanks to https://github.com/hercules-team/augeas/commit/792fb220a31a42043de6962fac6a1f6c030d67c5: internal.c: In function 'xstrerror': internal.c:436:12: error: returning 'int' from a function with return type 'const char *' makes pointer from integer without a cast [-Wint-conversion] 436 | return strerror_r(errnum, buf, len); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/hercules-team/augeas/blob/release-1.14.1/NEWS Fixes: - http://autobuild.buildroot.org/results/65014642966721115ae4050c23b083a7f39e1300 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/augeas/augeas.hash | 5 ++--- package/augeas/augeas.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/augeas/augeas.hash b/package/augeas/augeas.hash index 03b71349acb..b3b2a2427c8 100644 --- a/package/augeas/augeas.hash +++ b/package/augeas/augeas.hash @@ -1,4 +1,3 @@ -# Locally calculated after checking pgp signature from -# http://download.augeas.net/augeas-1.12.0.tar.gz.sig -sha256 321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87 augeas-1.12.0.tar.gz +# Locally calculated +sha256 368bfdd782e4b9c7163baadd621359c82b162734864b667051ff6bcb57b9edff augeas-1.14.1.tar.gz sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/package/augeas/augeas.mk b/package/augeas/augeas.mk index a0bc2945654..ac4bc7d0bee 100644 --- a/package/augeas/augeas.mk +++ b/package/augeas/augeas.mk @@ -4,8 +4,8 @@ # ################################################################################ -AUGEAS_VERSION = 1.12.0 -AUGEAS_SITE = http://download.augeas.net +AUGEAS_VERSION = 1.14.1 +AUGEAS_SITE = https://github.com/hercules-team/augeas/releases/download/release-$(AUGEAS_VERSION) AUGEAS_INSTALL_STAGING = YES AUGEAS_LICENSE = LGPL-2.1+ AUGEAS_LICENSE_FILES = COPYING From e66a1a5e864ba78f78b01ea373bbb6ad31f0cba4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 22:43:41 +0200 Subject: [PATCH 1932/3013] package/gtkiostream: fix version Update GTKIOSTREAM_VERSION to make it compatible with what is returned by https://release-monitoring.org/project/373420/ Fixes: fab48302865e5c0c98d91b696bc90e75e38189bb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gtkiostream/gtkiostream.hash | 2 +- package/gtkiostream/gtkiostream.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash index 90c754f48c2..225504be1b1 100644 --- a/package/gtkiostream/gtkiostream.hash +++ b/package/gtkiostream/gtkiostream.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-1.8.0.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk index 36905d7e7d2..970644d6dfc 100644 --- a/package/gtkiostream/gtkiostream.mk +++ b/package/gtkiostream/gtkiostream.mk @@ -4,8 +4,8 @@ # ################################################################################ -GTKIOSTREAM_VERSION = v1.8.0 -GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) +GTKIOSTREAM_VERSION = 1.8.0 +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,v$(GTKIOSTREAM_VERSION)) GTKIOSTREAM_LICENSE = GPL-2.0+ GTKIOSTREAM_LICENSE_FILES = gpl.txt From 16598146fbbbf492283f7b42d7c02e0d9fde2000 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 23:01:14 +0200 Subject: [PATCH 1933/3013] package/gtkiostream: fix build with alsa-lib Select BR2_PACKAGE_ALSA_LIB_MIXER if needed to fix the following build failure with alsa-lib raised since the addition of the package in commit fab48302865e5c0c98d91b696bc90e75e38189bb: In file included from ../include/ALSA/MixerElement.H:20, from ../include/ALSA/Mixer.H:20, from ../include/ALSA/ALSA.H:56, from ALSAControlMonitor.C:19: ../include/ALSA/MixerElementTypes.H:26:5: error: 'snd_mixer_selem_channel_id_t' does not name a type 26 | snd_mixer_selem_channel_id_t channel; ///< The ALSA channel ID | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: fab48302865e5c0c98d91b696bc90e75e38189bb - http://autobuild.buildroot.org/results/6be71c9fbdccbdf4f5e540bafa748dda833aeedb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gtkiostream/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in index 17480b8ff81..1d1ec273461 100644 --- a/package/gtkiostream/Config.in +++ b/package/gtkiostream/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GTKIOSTREAM bool "gtkiostream" depends on BR2_INSTALL_LIBSTDCPP # eigen depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_ALSA_LIB_MIXER if BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_EIGEN select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_DOUBLE From 910e91f3b0311bc9dc5ef00c43b6e3c930eac300 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 21:55:05 +0200 Subject: [PATCH 1934/3013] package/zsh: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: termcap.c:45:14: error: conflicting types for 'boolcodes'; have 'char *[]' 45 | static char *boolcodes[] = { | ^~~~~~~~~ In file included from ../../Src/zshterm.h:1, from ../../Src/zsh_system.h:932, from ../../Src/zsh.mdh:17, from termcap.mdh:17, from termcap.c:38: /home/autobuild/autobuild/instance-0/output-1/host/or1k-buildroot-linux-uclibc/sysroot/usr/include/term.h:764:56: note: previous declaration of 'boolcodes' with type 'const char * const[]' 764 | extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[]; | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/fe2f7170465e96cc1de3dae139a25f615331f4b9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...er-types-in-terminfo-global-variable.patch | 51 +++++++++++++++++++ package/zsh/zsh.mk | 2 + 2 files changed, 53 insertions(+) create mode 100644 package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch diff --git a/package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch b/package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch new file mode 100644 index 00000000000..c67c374918f --- /dev/null +++ b/package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch @@ -0,0 +1,51 @@ +From 4c89849c98172c951a9def3690e8647dae76308f Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 8 Dec 2023 21:58:07 +0100 +Subject: [PATCH] 52383: Avoid incompatible pointer types in terminfo global + variable checks + +Upstream: https://sourceforge.net/p/zsh/code/ci/4c89849c98172c951a9def3690e8647dae76308f +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 3 +++ + configure.ac | 12 ++++++------ + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2a8221e1f..2871dcb7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1768,27 +1768,27 @@ if test x$zsh_cv_path_term_header != xnone; then + fi + + AC_MSG_CHECKING(if boolcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) + AC_MSG_RESULT($boolcodes) + + AC_MSG_CHECKING(if numcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) + AC_MSG_RESULT($numcodes) + + AC_MSG_CHECKING(if strcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) + AC_MSG_RESULT($strcodes) + + AC_MSG_CHECKING(if boolnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) + AC_MSG_RESULT($boolnames) + + AC_MSG_CHECKING(if numnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) + AC_MSG_RESULT($numnames) + + AC_MSG_CHECKING(if strnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) + AC_MSG_RESULT($strnames) + + dnl There are apparently defective terminal library headers on some diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index e790bf4c5ea..7e577fa9e1d 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -13,6 +13,8 @@ ZSH_CONF_ENV = zsh_cv_sys_nis=no zsh_cv_sys_nis_plus=no ZSH_LICENSE = MIT-like ZSH_LICENSE_FILES = LICENCE ZSH_CPE_ID_VENDOR = zsh +# 0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch +ZSH_AUTORECONF = YES # zsh uses TRY_RUN to determine these ZSH_CONF_OPTS += \ From 29d29569ebde681d28db9d6bc123d3487e240134 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 21:31:42 +0200 Subject: [PATCH 1935/3013] package/openswan: select libxcrypt if needed Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-7/output-1/build/openswan-3.0.0/programs/pluto/xauth.c:36:10: fatal error: crypt.h: No such file or directory 36 | #include | ^~~~~~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/df7cce809e3e4aa92e700a3fc5105c6c20f21f6b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/openswan/Config.in | 1 + package/openswan/openswan.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/openswan/Config.in b/package/openswan/Config.in index 724654e984d..31c4a66b35c 100644 --- a/package/openswan/Config.in +++ b/package/openswan/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_OPENSWAN depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 select BR2_PACKAGE_GMP select BR2_PACKAGE_IPROUTE2 + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Openswan is an implementation of IPsec for Linux diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index 4c6a779f0da..64218810f80 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -22,6 +22,10 @@ OPENSWAN_DEPENDENCIES += libcurl OPENSWAN_MAKE_OPTS += USE_LIBCURL=true endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +OPENSWAN_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENSWAN_DEPENDENCIES += openssl OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true From 33d25f08f97450cea7a415582dc2110b2bc828c2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 21:01:40 +0200 Subject: [PATCH 1936/3013] package/libcoap: enable required libopenssl options libcoap unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859 libcoap also unconditionally uses PSK Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/6bd3e1390cbbc59b9b3d030c2a401e45e9d173da - http://autobuild.buildroot.org/results/f243209454feed4f33f759786c2023c576a2cd3d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcoap/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcoap/Config.in b/package/libcoap/Config.in index 6e0c1905bcb..950aee5279b 100644 --- a/package/libcoap/Config.in +++ b/package/libcoap/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBCOAP bool "libcoap" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help libcoap is a C implementation of a lightweight application-protocol for devices that are constrained their From da45ae33040a55d9eaa6a05c75c5e7f24fe73cf4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:23:54 +0200 Subject: [PATCH 1937/3013] package/liburing: bump to version 2.6 - Drop patch (already in version) - Update hash of README (typo fixed with https://github.com/axboe/liburing/commit/2c89b57f3d55b2e3098a629e8aabe659fd5ec138) https://github.com/axboe/liburing/blob/liburing-2.6/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-src-arch-aarch64-fix-uclibc-build.patch | 39 ------------------- package/liburing/liburing.hash | 4 +- package/liburing/liburing.mk | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch diff --git a/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch deleted file mode 100644 index 4468105e4fa..00000000000 --- a/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f03f8da34fe96ac35a916ca3058b0f41971eae3b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Feb 2024 18:59:42 +0100 -Subject: [PATCH] src/arch/aarch64: fix uclibc build - -Fix the following build failure with uclibc-ng raised since version 2.3 -and -https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: - -In file included from lib.h:12, - from setup.c:4: -arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory - 7 | #include - | ^~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/axboe/liburing/commit/32f9c27a76c43627f79bb77469d2da8583e4d3df ---- - src/arch/aarch64/lib.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/arch/aarch64/lib.h b/src/arch/aarch64/lib.h -index 3b701b1..41bcfc9 100644 ---- a/src/arch/aarch64/lib.h -+++ b/src/arch/aarch64/lib.h -@@ -4,7 +4,6 @@ - #define LIBURING_ARCH_AARCH64_LIB_H - - #include --#include - #include "../../syscall.h" - - static inline long __get_page_size(void) --- -2.43.0 - diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash index 30458c6b9f3..f06dd187a79 100644 --- a/package/liburing/liburing.hash +++ b/package/liburing/liburing.hash @@ -1,8 +1,8 @@ # Locally calculated -sha256 319ff9096a5655362a9741c5145b45494db810e38679a1de82e2f440c17181a6 liburing-2.5.tar.bz2 +sha256 78bcc0dc0d004a238d8b5f597adbb4ec74926352a3983b872db7f0efdb72565d liburing-2.6.tar.bz2 # Hash for license files sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 2ec12f7934cdfce25ff72b0557738989d79fc7a496d1cf9b2d3f9464fd61edbe LICENSE -sha256 51e124279343177cb3c214ffddc011f1355b6eba0bbefca4f4c41fbc56574c92 README +sha256 b0731ca09e6f4718d456a989d32b6c61bf27e5d4bab6ca31e409d75c5120d19e README diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index 2c448d6a87a..fc3993b38cd 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURING_VERSION = 2.5 +LIBURING_VERSION = 2.6 LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT From 3a4bd98d11550081db622327fd8cab570c0ad077 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:27:51 +0200 Subject: [PATCH 1938/3013] package/libupnp: bump to version 1.4.19 https://github.com/pupnp/pupnp/blob/release-1.14.19/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libupnp/libupnp.hash | 2 +- package/libupnp/libupnp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 6fd4678c0d7..86437a7339b 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 16a7cee93ce2868ae63ab1a8164dc7de43577c59983b9f61293a310d6888dceb libupnp-1.14.18.tar.bz2 +sha256 b6423c573b758d09539f5e6c4712c1a9fd35dccf835f81d99473d50a50ad49b0 libupnp-1.14.19.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 61e52c095a4..cd148d14d06 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.14.18 +LIBUPNP_VERSION = 1.14.19 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = \ http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) From f3461d083b53ac262dd31e2b93281cecdc8d3147 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:41:18 +0200 Subject: [PATCH 1939/3013] package/libxslt: bump to version 1.1.42 https://gitlab.gnome.org/GNOME/libxslt/-/blob/v1.1.42/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libxslt/libxslt.hash | 4 ++-- package/libxslt/libxslt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 7597e7954de..dd67940c8a8 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.sha256sum -sha256 2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0 libxslt-1.1.39.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.42.sha256sum +sha256 85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb libxslt-1.1.42.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 8098937ef39..b5bb22f9aed 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.39 +LIBXSLT_VERSION = 1.1.42 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES From b409766234a3aabb33918b935b58704822345e9e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:46:10 +0200 Subject: [PATCH 1940/3013] package/ksmbd-tools: bump to version 3.5.2 https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index c3e6ebefe5c..3367886d553 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ab377b3044c48382303f3f7ec95f2e1a17592c774d70b2a11f32952099dbb214 ksmbd-tools-3.5.1.tar.gz +sha256 5da7fb4cb4368f9abf56f6f9fbc17b25e387876bed9ff7ee0d6f1140ef07c8d7 ksmbd-tools-3.5.2.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index c56c6e10bbc..261eddad7c5 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.5.1 +KSMBD_TOOLS_VERSION = 3.5.2 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING From 124087c51c6bf751b0caa5cd6327f7ce3d89d0e1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 11:52:13 +0200 Subject: [PATCH 1941/3013] package/edid-decode: switch to meson-package Switch to meson-package to fix the following build failure raised since bump to 6f117a8 in commit 4f5790116b42768bd1bd982245e00483440a6311 and https://git.linuxtv.org/edid-decode.git/commit/?id=cdf81907def8658a66041a76ef2542e9a888cbed: make[1]: *** No targets specified and no makefile found. Stop. Fixes: 4f5790116b42768bd1bd982245e00483440a6311 - http://autobuild.buildroot.org/results/c569b0484dcd33f6ea88a9b6f11df5b54401db96 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/edid-decode/edid-decode.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index be0c4f1a0e5..3e1d861f22b 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -10,14 +10,4 @@ EDID_DECODE_SITE_METHOD = git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = LICENSE -define EDID_DECODE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CXXFLAGS) -std=c++11" WARN_FLAGS= -endef - -define EDID_DECODE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) From f04a95f79f087869a44ea3d63d55ce7b27b8e922 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Jul 2024 13:45:57 +0200 Subject: [PATCH 1942/3013] support/testing: add mawk runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_mawk.py | 114 +++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 support/testing/tests/package/test_mawk.py diff --git a/DEVELOPERS b/DEVELOPERS index c4f1565edd1..06eef3740f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1901,6 +1901,7 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py diff --git a/support/testing/tests/package/test_mawk.py b/support/testing/tests/package/test_mawk.py new file mode 100644 index 00000000000..5caf77c1169 --- /dev/null +++ b/support/testing/tests/package/test_mawk.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestMawk(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MAWK=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def basic_mawk_tests(self): + # Check the program can execute + self.assertRunOk("mawk --version") + + # Check "mawk" can return a specific exit code + code = 123 + cmd = "mawk 'BEGIN { exit(" + str(code) + "); }'" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, code) + + # Run a basic print program + test_string = "Hello Buildroot" + cmd = "mawk 'BEGIN {print \"" + test_string + "\"; }'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], test_string) + + def create_test_data(self): + # Create some test data + entries = ["one", "two", "three", "four"] + for entry in entries: + self.assertRunOk(f"echo {entry} >> data1.txt") + + def add_line_numbers(self): + # Add line numbers with mawk + cmd = "mawk '{ print NR \"\\t\" $1; }' data1.txt > data2.txt" + self.assertRunOk(cmd) + + def sum_column(self): + # Check the sum of the first column is 1+2+3+4 == 10 + awk_prg = "BEGIN { SUM = 0; } { SUM = SUM + $1; } END { print SUM; }" + cmd = f"mawk '{awk_prg}' data2.txt" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(int(output[0]), 10) + + def uppercase_column(self): + # Extract only column 2 and convert it to upper case + cmd = "mawk '{ print toupper($2); }' data2.txt > data3.txt" + self.assertRunOk(cmd) + + # Prepare the same output using "data1.txt" and the "tr" command, + # for verification + cmd = "tr a-z A-Z < data1.txt > data3-tr.txt" + self.assertRunOk(cmd) + + # "mawk" and "tr" output are expected to be the same + self.assertRunOk("cmp data3.txt data3-tr.txt") + + def mawk_head(self): + # Show the first 2 lines of a file + cmd = "mawk 'NR <= 2 { print $0; }' data2.txt > data4.txt" + self.assertRunOk(cmd) + + # Prepare the same output using the "head" command + cmd = "head -2 data2.txt > data4-head.txt" + self.assertRunOk(cmd) + + # "mawk" and "tr" output are expected to be the same + self.assertRunOk("cmp data4.txt data4-head.txt") + + def mawk_specific(self): + # Use the "-W dump" mawk specific option. + # See: https://invisible-island.net/mawk/manpage/mawk.html + # We create an arbitrary awk program with an integer and + # string constant. We then check those constants are in the + # mawk "assembler" output. + awk_int = 12345 + awk_str = "Buildroot" + awk_expr = f"print ($1 + {awk_int}) \"{awk_str}\";" + awk_prg = "BEGIN { " + awk_expr + " }" + cmd = f"mawk -W dump '{awk_prg}'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + out_str = "\n".join(output) + self.assertIn(str(awk_int), out_str) + self.assertIn(awk_str, out_str) + + def mawk_numeric(self): + value = 1234 + squared_value = value * value + cmd = "mawk 'BEGIN { print sqrt(" + str(squared_value) + "); }'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(int(output[0]), value) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.basic_mawk_tests() + self.create_test_data() + self.add_line_numbers() + self.sum_column() + self.uppercase_column() + self.mawk_head() + self.mawk_specific() + self.mawk_numeric() From 58983179e4f8849ca4e9d6bb063c2f5bd232235a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 16:48:31 +0200 Subject: [PATCH 1943/3013] package/flashrom: disable -Werror Disable -Werror to avoid the following build failure raised since switch to meson-package in commit 37dded43ae681e8319d7b76f9a612c71991467a9: ../stlinkv3_spi.c: In function 'stlinkv3_spi_init': ../stlinkv3_spi.c:508:12: error: 'stlinkv3_handle' may be used uninitialized [-Werror=maybe-uninitialized] 508 | if (!stlinkv3_handle) { | ^ ../stlinkv3_spi.c:485:31: note: 'stlinkv3_handle' was declared here 485 | libusb_device_handle *stlinkv3_handle; | ^~~~~~~~~~~~~~~ Fixes: 37dded43ae681e8319d7b76f9a612c71991467a9 - http://autobuild.buildroot.org/results/eecabbdd0d21344991379a57e605845e73ef679e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/flashrom.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 60774b96210..0b474caab47 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -15,7 +15,8 @@ FLASHROM_CONF_OPTS = \ -Dclassic_cli_print_wiki=disabled \ -Dich_descriptors_tool=enabled \ -Dtests=disabled \ - -Duse_internal_dmi=true + -Duse_internal_dmi=true \ + -Dwerror=false FLASHROM_PROGRAMMERS = \ buspirate_spi \ From 6084d904de77ddb99daad7fb9d67dad06fd42526 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 16:50:18 +0200 Subject: [PATCH 1944/3013] package/flashrom: fix satamv handling satamv is only available on x86 resulting in the following build failure since switch to meson-package in commit 37dded43ae681e8319d7b76f9a612c71991467a9: ../output-1/build/flashrom-1.3.0/meson.build:475:6: ERROR: Problem encountered: satamv selected but not supported on this platform Fixes: 37dded43ae681e8319d7b76f9a612c71991467a9 - http://autobuild.buildroot.org/results/c689bf039d7686a9b42c6fcb84f87b555a9bcfb6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/flashrom.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 0b474caab47..478b53e1ac7 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -65,7 +65,6 @@ FLASHROM_PROGRAMMERS += \ nicintel_eeprom \ nicintel_spi \ ogp_spi \ - satamv \ satasii ifeq ($(BR2_i386)$(BR2_x86_64),y) @@ -74,7 +73,8 @@ FLASHROM_PROGRAMMERS += \ atapromise \ nic3com \ nicnatsemi \ - nicrealtek + nicrealtek \ + satamv endif endif From 183f5399cef8b09b675ef7386a0e4984294e5f59 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 17:31:13 +0200 Subject: [PATCH 1945/3013] package/zabbix: fix patch fuzz Fix patch fuzz to avoid the following build failure raised since commit 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 which reduced the fuzz factor: Applying 0002-fix-build-with-libressl-3.5.0.patch using patch: patching file include/zbxcomms.h Hunk #1 succeeded at 210 (offset -43 lines). patching file src/libs/zbxcomms/tls.c Hunk #1 FAILED at 30. 1 out of 1 hunk FAILED -- saving rejects to file src/libs/zbxcomms/tls.c.rej While at it, also fix Upstream tags Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 - http://autobuild.buildroot.org/results/75dfe12312b5479669fcdfea623d93880c675e13 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 -- .../0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch | 2 +- package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 2e6e8a9cac4..975a7f21f4d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1486,8 +1486,6 @@ package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch lib_patch.Ups package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch lib_patch.Upstream package/ympd/0001-only-c-language.patch lib_patch.Upstream package/ympd/0002-added-forward-declarations.patch lib_patch.Upstream -package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch lib_patch.Upstream -package/zabbix/0002-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream package/zic/0001-remove-dependency-check-on-version-file.patch lib_patch.Upstream package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch lib_patch.Upstream package/zip/0002-configure-Don-t-use-host-CPP.patch lib_patch.Upstream diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch index ffb1f54ba23..6c742b0d0a2 100644 --- a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zabbix/zabbix/pull/61] +Upstream: https://github.com/zabbix/zabbix/pull/61 --- m4/netsnmp.m4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch index acb5cfc9a67..ad6960f3291 100644 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -30,7 +30,7 @@ Fixes: - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (no feedback on first patch)] +Upstream: not sent (no feedback on first patch) --- include/zbxcomms.h | 3 ++- src/libs/zbxcomms/tls.c | 5 +++-- @@ -54,9 +54,9 @@ diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c index 54ab0a6ef4..bd4075b3e4 100644 --- a/src/libs/zbxcomms/tls.c +++ b/src/libs/zbxcomms/tls.c -@@ -30,8 +30,9 @@ - #include "zbxstr.h" - #include "zbxtime.h" +@@ -28,8 +28,9 @@ + #include "log.h" + #include "zbxcrypto.h" -#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ From 4649372e87bd33f6e159b585796137bbedf4fd3a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:15:24 +0200 Subject: [PATCH 1946/3013] package/libmaxminddb: bump to version 1.10.0 https://github.com/maxmind/libmaxminddb/blob/1.10.0/Changes.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmaxminddb/libmaxminddb.hash | 2 +- package/libmaxminddb/libmaxminddb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmaxminddb/libmaxminddb.hash b/package/libmaxminddb/libmaxminddb.hash index f5c84fc9053..567a428e421 100644 --- a/package/libmaxminddb/libmaxminddb.hash +++ b/package/libmaxminddb/libmaxminddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a80682a89d915fdf60b35d316232fb04ebf36fff27fda9bd39fe8a38d3cd3f12 libmaxminddb-1.9.1.tar.gz +sha256 5e6db72df423ae225bfe8897069f6def40faa8931f456b99d79b8b4d664c6671 libmaxminddb-1.10.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/libmaxminddb/libmaxminddb.mk b/package/libmaxminddb/libmaxminddb.mk index 1a1a2e302a8..84fc3d11dda 100644 --- a/package/libmaxminddb/libmaxminddb.mk +++ b/package/libmaxminddb/libmaxminddb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.9.1 +LIBMAXMINDDB_VERSION = 1.10.0 LIBMAXMINDDB_SITE = \ https://github.com/maxmind/libmaxminddb/releases/download/$(LIBMAXMINDDB_VERSION) LIBMAXMINDDB_INSTALL_STAGING = YES From 9c8f6dc5e4d7244b493e290c055202cadc9a12cb Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Jul 2024 19:38:34 +0200 Subject: [PATCH 1947/3013] support/testing: add gpsd runtime testing Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_gpsd.py | 56 +++++++++++++++++++ .../rootfs-overlay/root/udp-nmea.log | 6 ++ 3 files changed, 64 insertions(+) create mode 100644 support/testing/tests/package/test_gpsd.py create mode 100644 support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log diff --git a/DEVELOPERS b/DEVELOPERS index 06eef3740f2..e5fe7b25a5d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1870,6 +1870,8 @@ F: support/testing/tests/package/test_gnuplot.py F: support/testing/tests/package/test_gnuplot/ F: support/testing/tests/package/test_gnuradio.py F: support/testing/tests/package/test_gnuradio/ +F: support/testing/tests/package/test_gpsd.py +F: support/testing/tests/package/test_gpsd/ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py new file mode 100644 index 00000000000..deed586c17b --- /dev/null +++ b/support/testing/tests/package/test_gpsd.py @@ -0,0 +1,56 @@ +import os +import time + +import infra.basetest + + +class TestGpsd(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_gpsd/rootfs-overlay") + # This test is using the gpsfake Python script. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GPSD=y + BR2_PACKAGE_PYTHON3=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can execute. + self.assertRunOk("gpsd --version") + + # Since gpsd needs a real GPS device, we stop the service. + self.assertRunOk("/etc/init.d/S50gpsd stop") + + # We start the "gpsfake" GPS emulator instead. + cmd = "gpsfake" + cmd += " --slow --cycle 0.1 --quiet" + cmd += "/root/udp-nmea.log &> /dev/null &" + self.assertRunOk(cmd) + + # Wait a bit, to let the gpsfake and gpsd to settle... + time.sleep(3 * self.timeout_multiplier) + + # List the GPS devices. We should see our local UDP test GPS. + out, ret = self.emulator.run("gpsctl") + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith("udp://127.0.0.1")) + self.assertIn("NMEA0183", out[0]) + + # Collect some of our fake GPS data, and check we got the + # coordinates from our test data file. + # Our expected coordinates are: + # https://www.openstreetmap.org/#map=19/43.60439/1.44336 + out, ret = self.emulator.run("gpscsv --header 0 --count 3") + self.assertEqual(ret, 0) + _, gps_lat, gps_long, _ = out[0].split(",") + self.assertAlmostEqual(float(gps_lat), 43.60439) + self.assertAlmostEqual(float(gps_long), 1.44336) diff --git a/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log new file mode 100644 index 00000000000..f3730da7c50 --- /dev/null +++ b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log @@ -0,0 +1,6 @@ +# Name: NMEA 0183 messages for gpsd Buildroot test +# Transport: UDP +# For packet format, see: +# https://gpsd.gitlab.io/gpsd/NMEA.html +$GPGGA,123456.789,4336.2634,N,0126.6016,E,1,04,1.7,143.5,M,,,,*3A +$GPZDA,123456.789,20,07,2024,2,00*64 From acdcc4c98ad7b04fa1def79c3e8b42dbb866b91b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 19 Jul 2024 19:37:23 +0200 Subject: [PATCH 1948/3013] package/kexec: bump to version 2.0.29 For release announce, see [1]. This commit removes the package patch, which is now included in this new version. The license hash also changed, due to a FSF address update. See [2]. This commit also adds a comment in the hash file about the pgp signature check. [1] https://lists.infradead.org/pipermail/kexec/2024-July/030452.html [2] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=f53bcef5063c70960b2b8eb8990722d5c9d1b99e Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...uilding-on-x86_64-with-binutils-2-41.patch | 94 ------------------- package/kexec/kexec.hash | 6 +- package/kexec/kexec.mk | 2 +- 3 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch diff --git a/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch b/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch deleted file mode 100644 index ae44c21fe12..00000000000 --- a/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001 -From: Michel Lind -Date: Tue, 30 Jan 2024 04:14:31 -0600 -Subject: Fix building on x86_64 with binutils 2.41 - -Newer versions of the GNU assembler (observed with binutils 2.41) will -complain about the ".arch i386" in files assembled with "as --64", -with the message "Error: 64bit mode not supported on 'i386'". - -Fix by moving ".arch i386" below the relevant ".code32" directive, so -that the assembler is no longer expecting 64-bit instructions to be used -by the time that the ".arch i386" directive is encountered. - -Based on similar iPXE fix: -https://github.com/ipxe/ipxe/commit/6ca597eee - -Signed-off-by: Michel Lind -Signed-off-by: Simon Horman -Upstream: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=328de8e00e298f00d7ba6b25dc3950147e9642e6 -Signed-off-by: Fabrice Fontaine ---- - purgatory/arch/i386/entry32-16-debug.S | 2 +- - purgatory/arch/i386/entry32-16.S | 2 +- - purgatory/arch/i386/entry32.S | 2 +- - purgatory/arch/i386/setup-x86.S | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S -index 5167944d..12e11649 100644 ---- a/purgatory/arch/i386/entry32-16-debug.S -+++ b/purgatory/arch/i386/entry32-16-debug.S -@@ -25,10 +25,10 @@ - .globl entry16_debug_pre32 - .globl entry16_debug_first32 - .globl entry16_debug_old_first32 -- .arch i386 - .balign 16 - entry16_debug: - .code32 -+ .arch i386 - /* Compute where I am running at (assumes esp valid) */ - call 1f - 1: popl %ebx -diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S -index c051aab0..eace0958 100644 ---- a/purgatory/arch/i386/entry32-16.S -+++ b/purgatory/arch/i386/entry32-16.S -@@ -20,10 +20,10 @@ - #undef i386 - .text - .globl entry16, entry16_regs -- .arch i386 - .balign 16 - entry16: - .code32 -+ .arch i386 - /* Compute where I am running at (assumes esp valid) */ - call 1f - 1: popl %ebx -diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S -index f7a494f1..8ce9e316 100644 ---- a/purgatory/arch/i386/entry32.S -+++ b/purgatory/arch/i386/entry32.S -@@ -20,10 +20,10 @@ - #undef i386 - - .text -- .arch i386 - .globl entry32, entry32_regs - entry32: - .code32 -+ .arch i386 - - /* Setup a gdt that should that is generally usefully */ - lgdt %cs:gdt -diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S -index 201bb2cb..a212eed4 100644 ---- a/purgatory/arch/i386/setup-x86.S -+++ b/purgatory/arch/i386/setup-x86.S -@@ -21,10 +21,10 @@ - #undef i386 - - .text -- .arch i386 - .globl purgatory_start - purgatory_start: - .code32 -+ .arch i386 - - /* Load a gdt so I know what the segment registers are */ - lgdt %cs:gdt --- -cgit 1.2.3-korg - diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index cfa8790bb11..91496c06fcf 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,6 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 d2f0ef872f39e2fe4b1b01feb62b0001383207239b9f8041f98a95564161d053 kexec-tools-2.0.28.tar.xz +# After checking pgp signature with key: +# B8868C80BA62A1FFFAF5FDA9632D3A06589DA6B1 +sha256 67b1ac503aade45a54db0bc79228a8830a35d5d4f83cee932cff3e7a81a4a9ec kexec-tools-2.0.29.tar.xz # locally calculated -sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 1fd8c0f0ab3..5f798b6a3f2 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.28 +KEXEC_VERSION = 2.0.29 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From ade6e41831c2b1f82028dda9744c6b64907e20ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 19 Jul 2024 16:17:59 +0200 Subject: [PATCH 1949/3013] package/micropython: change URL to HTTPS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 849a5452f45..b466fbaf2d2 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_MICROPYTHON 3 programming language that is optimised to run on a microcontroller. - http://micropython.org + https://micropython.org if BR2_PACKAGE_MICROPYTHON From 161c25aee11650a4a6b22ca2a88fa0f84ee6b357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 19 Jul 2024 16:18:00 +0200 Subject: [PATCH 1950/3013] package/micropython: adjust name in description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the name from "Micro Python" (two words) to "MicroPython" (camelcase), to match the official website and documentation. Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index b466fbaf2d2..f532b3bdb5e 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MICROPYTHON depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS help - Micro Python is a lean and fast implementation of the Python + MicroPython is a lean and fast implementation of the Python 3 programming language that is optimised to run on a microcontroller. From 8637884057ddc3c1aeb9f0dd285fc6fcf378c26b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 23:18:41 +0200 Subject: [PATCH 1951/3013] package/flashrom: bump to version 1.4.0-rc2 - Drop patch (already in version) - This bump will fix the following static build failure raised since switch to meson-package in commit 37dded43ae681e8319d7b76f9a612c71991467a9 thanks to https://github.com/flashrom/flashrom/commit/67ca4a71c477320d4b726acd152b7536344e227f (which doesn't apply cleanly above version 1.3.0): ld (ld-elf2flt): -shared used without passing a shared library ID - With above patch, classic_cli can't be built without a static library (i.e. with BR2_SHARED_LIBS) Fixes: 37dded43ae681e8319d7b76f9a612c71991467a9 - http://autobuild.buildroot.org/results/ee61dc30056b6c3335d64054c875bfb40526033d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...et_enable.c-Drop-_LARGEFILE64_SOURCE.patch | 38 ------------------- package/flashrom/flashrom.hash | 5 +-- package/flashrom/flashrom.mk | 12 ++++-- 3 files changed, 10 insertions(+), 45 deletions(-) delete mode 100644 package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch diff --git a/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch b/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch deleted file mode 100644 index 1ee8d0f7e36..00000000000 --- a/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1 Mon Sep 17 00:00:00 2001 -From: Angel Pons -Date: Tue, 16 May 2023 11:13:17 +0200 -Subject: [PATCH] chipset_enable.c: Drop `_LARGEFILE64_SOURCE` - -This file does not access any large files, so there's no need to define -this feature test macro. - -Change-Id: I866cfa2f996eeea5846e5d9189647ad7a4a4e3e4 -Signed-off-by: Angel Pons -Reviewed-on: https://review.coreboot.org/c/flashrom/+/75271 -Tested-by: build bot (Jenkins) -Reviewed-by: Nico Huber -Reviewed-by: Anastasia Klimchuk -Reviewed-by: Alexander Goncharov - -Upstream: https://github.com/flashrom/flashrom/commit/59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1 -Signed-off-by: James Hilliard ---- - chipset_enable.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/chipset_enable.c b/chipset_enable.c -index 9d3df5f8..3846ecfb 100644 ---- a/chipset_enable.c -+++ b/chipset_enable.c -@@ -24,8 +24,6 @@ - * Contains the chipset specific flash enables. - */ - --#define _LARGEFILE64_SOURCE -- - #include - #include - #include --- -2.34.1 - diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index d3bfbad7810..cecec5273f8 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,4 +1,3 @@ -# Locally computed after checking pgp signature -# https://download.flashrom.org/releases/flashrom-v1.3.0.tar.bz2.asc -sha256 a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623 flashrom-v1.3.0.tar.bz2 +# Locally computed +sha256 318c54a4143a1a05b30cecd64fbff41a0f5cd35a020622864c11fb44f8ed04d4 flashrom-1.4.0-rc2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 478b53e1ac7..1e7d332daee 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,14 +4,12 @@ # ################################################################################ -FLASHROM_VERSION = 1.3.0 -FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 -FLASHROM_SITE = https://download.flashrom.org/releases +FLASHROM_VERSION = 1.4.0-rc2 +FLASHROM_SITE = $(call github,flashrom,flashrom,v$(FLASHROM_VERSION)) FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING FLASHROM_INSTALL_STAGING = YES FLASHROM_CONF_OPTS = \ - -Dclassic_cli=enabled \ -Dclassic_cli_print_wiki=disabled \ -Dich_descriptors_tool=enabled \ -Dtests=disabled \ @@ -80,4 +78,10 @@ endif FLASHROM_CONF_OPTS += -Dprogrammer=$(subst $(space),$(comma),$(strip $(FLASHROM_PROGRAMMERS))) +ifeq ($(BR2_SHARED_LIBS),) +FLASHROM_CONF_OPTS += -Dclassic_cli=enabled +else +FLASHROM_CONF_OPTS += -Dclassic_cli=disabled +endif + $(eval $(meson-package)) From a8b788e19448bf06603f37666a54abec3f6af6e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 23:33:47 +0200 Subject: [PATCH 1952/3013] package/gengetopt: fix patch fuzz Use upstream patch to fix patch fuzz and avoid the following build failure raised since commit 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 which reduced the fuzz factor: Applying 0001-configure.ac-add-disable-doc-option.patch using patch: patching file Makefile.am Hunk #1 FAILED at 18. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej Fixes: - http://autobuild.buildroot.org/results/4cfa513e024ea2cb2058fde4ffdd727bd379dae7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-configure.ac-add-disable-doc-option.patch | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 975a7f21f4d..6505cd6f763 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -604,7 +604,6 @@ package/gdb/15.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.U package/gdb/15.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream package/gdb/15.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream package/gdb/15.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream -package/gengetopt/0001-configure.ac-add-disable-doc-option.patch lib_patch.Upstream package/genpart/0001-fix-return-code.patch lib_patch.Upstream package/genromfs/0001-build-system.patch lib_patch.Sob lib_patch.Upstream package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch lib_patch.Upstream diff --git a/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch b/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch index d43714a3dff..80bda9b7216 100644 --- a/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch +++ b/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch @@ -1,22 +1,22 @@ -From 250bee9e02546846d70dbe88ac36bb83c6a7ebdf Mon Sep 17 00:00:00 2001 +From e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 22 Sep 2019 09:27:24 +0200 -Subject: [PATCH] configure.ac: add --disable-doc option +Subject: configure.ac: add --disable-doc option Add --disable-doc option to allow the user to disable documentation Signed-off-by: Fabrice Fontaine -[Sent upstream: https://savannah.gnu.org/bugs/index.php?56931] +Upstream: https://git.savannah.gnu.org/cgit/gengetopt.git/commit/?id=e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a --- Makefile.am | 6 +++++- configure.ac | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index dbb5719..2db307a 100644 +index 1f184c2..76ac21a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -18,6 +18,10 @@ +@@ -18,7 +18,11 @@ ACLOCAL_AMFLAGS = -I m4 -I gl/m4 EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4 @@ -28,6 +28,7 @@ index dbb5719..2db307a 100644 +endif gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE + diff --git a/configure.ac b/configure.ac index 0ee89db..915706c 100644 --- a/configure.ac @@ -47,5 +48,5 @@ index 0ee89db..915706c 100644 [gengen], [ --with-gengen=mygengen gengen to use], -- -2.23.0 +cgit v1.1 From e6b912132ffb910fa2e04540f355b0073266db3b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 08:53:02 +0200 Subject: [PATCH 1953/3013] package/sysprof: needs C++ sysprof needs C++ since bump to version 46.0 in commit 0d57555407f2a0708515e7c377f57a6466c78b1b and https://gitlab.gnome.org/GNOME/sysprof/-/commit/a4b5ea6160135ae4ee2916b6a93b281302d5ddc8 Fixes: 0d57555407f2a0708515e7c377f57a6466c78b1b - http://autobuild.buildroot.org/results/6ab455b9287220d4353154ba3b54df4ce57748df Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/sysprof/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in index 1d1b2fa264e..be4f7653b0f 100644 --- a/package/sysprof/Config.in +++ b/package/sysprof/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_SYSPROF depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # libunwind, polkit depends on !BR2_OPTIMIZE_FAST # polkit + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDEX select BR2_PACKAGE_LIBGLIB2 @@ -18,12 +19,12 @@ config BR2_PACKAGE_SYSPROF http://sysprof.com -comment "sysprof needs a toolchain w/ dynamic libraray, wchar, threads, gcc >= 7" +comment "sysprof needs a toolchain w/ dynamic libraray, wchar, threads, C++, gcc >= 7" depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP comment "sysprof can't be built with Optimize for fast" depends on BR2_OPTIMIZE_FAST From 7ecca28e209b811b1ece19f114a2bde4bf5639be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 09:01:47 +0200 Subject: [PATCH 1954/3013] package/iproute2: bump to version 6.10 This bump will fix the following build failure with gcc >= 14 thanks to https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=53a89bfd86fff1a00cc77cabb8457a03eaa3bc7d: ../include/json_print.h: In function 'print_tv': ../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types] 58 | value); \ | ^~~~~ | | | const struct timeval * Fixes: - http://autobuild.buildroot.org/results/c47c1e13659e4bfcccd98ebd22949e9dd278079e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index a716bf75a18..0760183b9e6 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0 iproute2-6.9.0.tar.xz +sha256 91a62f82737b44905a00fa803369c447d549e914e9a2a4018fdd75b1d54e8dce iproute2-6.10.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 525101aff11..08b890b3311 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.9.0 +IPROUTE2_VERSION = 6.10.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 18e25b023c193ffb088296e346bc0978b78e38ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 09:49:13 +0200 Subject: [PATCH 1955/3013] package/librelp: select BR2_PACKAGE_LIBOPENSSL_ENGINES librelp unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859: tcp.c: In function 'relpTcpExitTLS_ossl': tcp.c:1992:17: error: implicit declaration of function 'ENGINE_cleanup'; did you mean 'EVP_PBE_cleanup'? [-Wimplicit-function-declaration] 1992 | ENGINE_cleanup(); | ^~~~~~~~~~~~~~ | EVP_PBE_cleanup Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/68a1e94e077d8d57690a2543e557ba3f2974b03e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/librelp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/librelp/Config.in b/package/librelp/Config.in index c0ae5fbe89b..f1744bb60c5 100644 --- a/package/librelp/Config.in +++ b/package/librelp/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBRELP bool "librelp" depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help Reliable Event Logging Protocol library From d00c2409a59ac7529b0175c7207a446713489cf3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 09:40:52 +0200 Subject: [PATCH 1956/3013] package/ibm-sw-tpm2: bump to version rev183-2024-03-27 - Refresh first patch - Drop second patch (fix differentl by https://sourceforge.net/p/ibmswtpm2/tpm2/ci/ebe82ac82fef97feddc558f3c3ad16baf67e6921/) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-Use-LONG_BIT-to-define-RADIX_BITS.patch | 65 +++++++++---------- .../0002-Add-support-for-OpenSSL-3-2-x.patch | 28 -------- package/ibm-sw-tpm2/ibm-sw-tpm2.hash | 2 +- package/ibm-sw-tpm2/ibm-sw-tpm2.mk | 2 +- 4 files changed, 33 insertions(+), 64 deletions(-) delete mode 100644 package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch diff --git a/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch index bb5d3a96ee5..8d83116dfcb 100644 --- a/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch +++ b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch @@ -14,52 +14,49 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio [Bernd: rebased for git rev 5452af422edeff70fcae8ea99dd28a0922051d7b] Signed-off-by: Bernd Kuhls +[Fabrice: rebase for rev183-2024-03-27] +Signed-off-by: Fabrice Fontaine --- src/LibSupport.h | 21 +++------------------ src/TcpServerPosix.c | 1 + src/makefile | 2 ++ 3 files changed, 6 insertions(+), 18 deletions(-) -diff --git a/src/LibSupport.h b/src/LibSupport.h +diff --git a/src/tpm_radix.h b/src/tpm_radix.h index 5055560..48b1e16 100644 ---- a/src/LibSupport.h -+++ b/src/LibSupport.h -@@ -64,32 +64,9 @@ - #ifndef _LIB_SUPPORT_H_ - #define _LIB_SUPPORT_H_ - --/* kgold added power and s390 */ +--- a/src/tpm_radix.h ++++ b/src/tpm_radix.h +@@ -61,27 +61,9 @@ + //** Introduction + // Common defines for supporting large numbers and cryptographic buffer sizing. + //********************* -#ifndef RADIX_BITS --# if defined(__x86_64__) || defined(__x86_64) \ -- || defined(__amd64__) || defined(__amd64) \ -- || defined(_WIN64) || defined(_M_X64) \ -- || defined(_M_ARM64) || defined(__aarch64__) \ -- || defined(__powerpc64__) || defined(__PPC64__) || defined(__ppc64__) \ -- || defined(__s390x__) --# define RADIX_BITS 64 --# elif defined(__i386__) || defined(__i386) || defined(i386) \ -- || defined(_WIN32) || defined(_M_IX86) \ -- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__) \ -- || defined(__powerpc__) || defined(__PPC__) --# define RADIX_BITS 32 --# elif defined(__riscv) || defined(__riscv__) --# if __riscv_xlen == 32 --# define RADIX_BITS 32 --# elif __riscv_xlen == 64 --# define RADIX_BITS 64 --# else --# error Unsupported __riscv_xlen value --# endif --# else --# error Unable to determine RADIX_BITS from compiler environment --# endif --#endif // RADIX_BITS +-# if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) \ +- || defined(__amd64) || defined(_WIN64) || defined(_M_X64) || defined(_M_ARM64) \ +- || defined(__aarch64__) || defined(__PPC64__) || defined(__s390x__) \ +- || defined(__powerpc64__) || defined(__ppc64__) +-# define RADIX_BITS 64 +-# elif defined(__i386__) || defined(__i386) || defined(i386) || defined(_WIN32) \ +- || defined(_M_IX86) +-# define RADIX_BITS 32 +-# elif defined(_M_ARM) || defined(__arm__) || defined(__thumb__) +-# define RADIX_BITS 32 +-# elif defined(__riscv) +-// __riscv and __riscv_xlen are standardized by the RISC-V community and should be available +-// on any compliant compiler. +-// +-// https://github.com/riscv-non-isa/riscv-toolchain-conventions +-# define RADIX_BITS __riscv_xlen +-# else +-# error Unable to determine RADIX_BITS from compiler environment +-# endif +-#endif // RADIX_BITS +#include + +#define RADIX_BITS LONG_BIT - // These macros use the selected libraries to the proper include files. - #define LIB_QUOTE(_STRING_) #_STRING_ + #if RADIX_BITS == 64 + # define RADIX_BYTES 8 diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c index cad0402..6293cdd 100644 --- a/src/TcpServerPosix.c diff --git a/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch b/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch deleted file mode 100644 index 6732efce8cd..00000000000 --- a/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch +++ /dev/null @@ -1,28 +0,0 @@ -From beea0f97b3c95ec69f3e269df1af87eb2cdd3c46 Mon Sep 17 00:00:00 2001 -From: Otto Hollmann -Date: Tue, 12 Dec 2023 13:58:32 +0100 -Subject: [PATCH] Add support for OpenSSL 3.2.x - -Upstream: https://github.com/kgoldman/ibmswtpm2/pull/13 -Signed-off-by: Fabrice Fontaine ---- - src/TpmToOsslMath.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/TpmToOsslMath.h b/src/TpmToOsslMath.h -index 0b18191..1271937 100644 ---- a/src/TpmToOsslMath.h -+++ b/src/TpmToOsslMath.h -@@ -76,10 +76,10 @@ - * As of release 3.0.0, OPENSSL_VERSION_NUMBER is a combination of the - * major (M), minor (NN) and patch (PP) version into a single integer 0xMNN00PP0L - */ --#if OPENSSL_VERSION_NUMBER > 0x30100ff0L -+#if OPENSSL_VERSION_NUMBER > 0x30200ff0L - // Check the bignum_st definition in crypto/bn/bn_lcl.h or crypto/bn/bn_local.h and either update - // the version check or provide the new definition for this version. --// Currently safe for all 3.1.x -+// Currently safe for all 3.2.x - # error Untested OpenSSL version - #elif OPENSSL_VERSION_NUMBER >= 0x10100000L - // from crypto/bn/bn_lcl.h diff --git a/package/ibm-sw-tpm2/ibm-sw-tpm2.hash b/package/ibm-sw-tpm2/ibm-sw-tpm2.hash index 392fb598156..3c2d0e758fd 100644 --- a/package/ibm-sw-tpm2/ibm-sw-tpm2.hash +++ b/package/ibm-sw-tpm2/ibm-sw-tpm2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 da7799baa1d38cd9d2f491006de45d38805db9d5a77c38af6e78728bd318f93e ibm-sw-tpm2-5452af422edeff70fcae8ea99dd28a0922051d7b-git4.tar.gz +sha256 239cea3ec99cb31fb25c1ba4fe9b98a862bb20daefefeba8908d370bedd42a31 ibm-sw-tpm2-rev183-2024-03-27-git4.tar.gz sha256 dd2d31b560011ea673e197251e710e52669d911367d83cd3cfd018f8ed58bde9 LICENSE diff --git a/package/ibm-sw-tpm2/ibm-sw-tpm2.mk b/package/ibm-sw-tpm2/ibm-sw-tpm2.mk index 4df61fe0281..67ecd459238 100644 --- a/package/ibm-sw-tpm2/ibm-sw-tpm2.mk +++ b/package/ibm-sw-tpm2/ibm-sw-tpm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IBM_SW_TPM2_VERSION = 5452af422edeff70fcae8ea99dd28a0922051d7b +IBM_SW_TPM2_VERSION = rev183-2024-03-27 IBM_SW_TPM2_SITE = https://git.code.sf.net/p/ibmswtpm2/tpm2 IBM_SW_TPM2_SITE_METHOD = git IBM_SW_TPM2_LICENSE = BSD-3-Clause From 75ec656c36ba2b5bf617acc6e946ef7aa97f948e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 09:40:53 +0200 Subject: [PATCH 1957/3013] package/ibm-sw-tpm2: fix build with openssl 3.3.x Fix the following build failure with openssl 3.3.x raised since commit 6d5ce8609f17a3403d1148a0bbf7a2bdb5ec7f67: In file included from BnValues.h:327, from Global.h:80, from Tpm.h:78, from AuditCommands.c:62: TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version 83 | # error Untested OpenSSL version | ^~~~~ Fixes: 6d5ce8609f17a3403d1148a0bbf7a2bdb5ec7f67 - http://autobuild.buildroot.org/results/2fb5e1cb792fe25ef860ff8111622cd1ff3770bf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...lMath.h-fix-build-with-openssl-3.3.x.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch diff --git a/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch b/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch new file mode 100644 index 00000000000..a349c05d4cc --- /dev/null +++ b/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch @@ -0,0 +1,40 @@ +From 1b5d9eb91f0d24d09d711ef839d301ee8b640d61 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jul 2024 09:08:39 +0200 +Subject: [PATCH] src/BnToOsslMath.h: fix build with openssl 3.3.x + +Fix the following build failure with openssl 3.3.x: + +In file included from BnValues.h:327, + from Global.h:80, + from Tpm.h:78, + from AuditCommands.c:62: +TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version + 83 | # error Untested OpenSSL version + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/2fb5e1cb792fe25ef860ff8111622cd1ff3770bf + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/kgoldman/ibmswtpm2/pull/15 +--- + src/BnToOsslMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h +index df4bcfb..72939ea 100644 +--- a/src/BnToOsslMath.h ++++ b/src/BnToOsslMath.h +@@ -77,7 +77,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x30200ff0L ++#if OPENSSL_VERSION_NUMBER >= 0x30300ff0L + // Check the bignum_st definition against the one below and either update the + // version check or provide the new definition for this version. + # error Untested OpenSSL version +-- +2.43.0 + From 13c0b7cd08c8300d288409ab88907f97b1a95687 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 10:25:42 +0200 Subject: [PATCH 1958/3013] package/rabbitmq-c: bump to version 0.14.0 - Drop patch (already in version) - Update hash of README.md (updates unrelated to license: https://github.com/alanxz/rabbitmq-c/commit/ea9acb88814a9240327bd27a30cdc06e5b69735c https://github.com/alanxz/rabbitmq-c/commit/7dab48f03419661133abdf12d53733a4d4369b76 https://github.com/alanxz/rabbitmq-c/commit/8f8a320c5a9a58647f2f39d66107e7f116f4bc4a) - This bump will fix the following build failure without the deprecated libopenssl engines raised since commit 623d3bbe43e9193aa8e3395367d01af59071b859: /home/autobuild/autobuild/instance-1/output-1/build/rabbitmq-c-0.13.0/librabbitmq/amqp_openssl.c:602:42: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function) 602 | if (ENGINE_set_default(openssl_engine, ENGINE_METHOD_ALL) == 0) { | ^~~~~~~~~~~~~~~~~ https://github.com/alanxz/rabbitmq-c/releases/tag/v0.14.0 Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/b95d080a0de635baaea2f08a888746cddcd1f26e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-to-read-username-password-from-file.patch | 130 ------------------ package/rabbitmq-c/rabbitmq-c.hash | 4 +- package/rabbitmq-c/rabbitmq-c.mk | 5 +- 3 files changed, 3 insertions(+), 136 deletions(-) delete mode 100644 package/rabbitmq-c/0001-Add-option-to-read-username-password-from-file.patch diff --git a/package/rabbitmq-c/0001-Add-option-to-read-username-password-from-file.patch b/package/rabbitmq-c/0001-Add-option-to-read-username-password-from-file.patch deleted file mode 100644 index 347063cfb3b..00000000000 --- a/package/rabbitmq-c/0001-Add-option-to-read-username-password-from-file.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001 -From: Christian Kastner -Date: Tue, 13 Jun 2023 14:21:52 +0200 -Subject: [PATCH] Add option to read username/password from file (#781) - -* Add option to read username/password from file - -Upstream: https://github.com/alanxz/rabbitmq-c/commit/463054383fbeef889b409a7f843df5365288e2a0 -Signed-off-by: Fabrice Fontaine ---- - tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - -diff --git a/tools/common.c b/tools/common.c -index 73b47e25..7efe557b 100644 ---- a/tools/common.c -+++ b/tools/common.c -@@ -18,6 +18,11 @@ - #include "compat.h" - #endif - -+/* For when reading auth data from a file */ -+#define MAXAUTHTOKENLEN 128 -+#define USERNAMEPREFIX "username:" -+#define PASSWORDPREFIX "password:" -+ - void die(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); -@@ -125,6 +130,7 @@ static char *amqp_vhost; - static char *amqp_username; - static char *amqp_password; - static int amqp_heartbeat = 0; -+static char *amqp_authfile; - #ifdef WITH_SSL - static int amqp_ssl = 0; - static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; -@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { - "the password to login with", "password"}, - {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, - "heartbeat interval, set to 0 to disable", "heartbeat"}, -+ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, -+ "path to file containing username/password for authentication", "file"}, - #ifdef WITH_SSL - {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, - {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, -@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { - #endif /* WITH_SSL */ - {NULL, '\0', 0, NULL, 0, NULL, NULL}}; - -+void read_authfile(const char *path) { -+ size_t n; -+ FILE *fp = NULL; -+ char token[MAXAUTHTOKENLEN]; -+ -+ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || -+ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { -+ die("Out of memory"); -+ } else if ((fp = fopen(path, "r")) == NULL) { -+ die("Could not read auth data file %s", path); -+ } -+ -+ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || -+ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { -+ die("Malformed auth file (missing username)"); -+ } -+ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); -+ /* Missing newline means token was cut off */ -+ n = strlen(amqp_username); -+ if (amqp_username[n - 1] != '\n') { -+ die("Username too long"); -+ } else { -+ amqp_username[n - 1] = '\0'; -+ } -+ -+ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || -+ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { -+ die("Malformed auth file (missing password)"); -+ } -+ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); -+ /* Missing newline means token was cut off */ -+ n = strlen(amqp_password); -+ if (amqp_password[n - 1] != '\n') { -+ die("Password too long"); -+ } else { -+ amqp_password[n - 1] = '\0'; -+ } -+ -+ (void)fgetc(fp); -+ if (!feof(fp)) { -+ die("Malformed auth file (trailing data)"); -+ } -+} -+ - static void init_connection_info(struct amqp_connection_info *ci) { - ci->user = NULL; - ci->password = NULL; -@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { - if (amqp_username) { - if (amqp_url) { - die("--username and --url options cannot be used at the same time"); -+ } else if (amqp_authfile) { -+ die("--username and --authfile options cannot be used at the same time"); - } - - ci->user = amqp_username; -@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { - if (amqp_password) { - if (amqp_url) { - die("--password and --url options cannot be used at the same time"); -+ } else if (amqp_authfile) { -+ die("--password and --authfile options cannot be used at the same time"); - } - - ci->password = amqp_password; - } - -+ if (amqp_authfile) { -+ if (amqp_url) { -+ die("--authfile and --url options cannot be used at the same time"); -+ } -+ -+ read_authfile(amqp_authfile); -+ ci->user = amqp_username; -+ ci->password = amqp_password; -+ } -+ - if (amqp_vhost) { - if (amqp_url) { - die("--vhost and --url options cannot be used at the same time"); diff --git a/package/rabbitmq-c/rabbitmq-c.hash b/package/rabbitmq-c/rabbitmq-c.hash index 66768ef34f5..3eed467826b 100644 --- a/package/rabbitmq-c/rabbitmq-c.hash +++ b/package/rabbitmq-c/rabbitmq-c.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8b224e41bba504fc52b02f918d8df7e4bf5359d493cbbff36c06078655c676e6 rabbitmq-c-0.13.0.tar.gz +sha256 839b28eae20075ac58f45925fe991d16a3138cbde015db0ee11df1acb1c493df rabbitmq-c-0.14.0.tar.gz sha256 3111fdaa26e86dd844d7c6cbb2723d0ed31702a840978ef116c86963c2429b0f LICENSE -sha256 defee723621ff1c556539af42780f449f258e47e3dcc8254bcbc095863f02b7c README.md +sha256 8d661859c72634a4f9315f134ba00d193e1b7308940bc44e82be9a376a490a06 README.md diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk index 5a0775f3535..4545a43a13a 100644 --- a/package/rabbitmq-c/rabbitmq-c.mk +++ b/package/rabbitmq-c/rabbitmq-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -RABBITMQ_C_VERSION = 0.13.0 +RABBITMQ_C_VERSION = 0.14.0 RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,v$(RABBITMQ_C_VERSION)) RABBITMQ_C_LICENSE = MIT RABBITMQ_C_LICENSE_FILES = LICENSE README.md @@ -14,9 +14,6 @@ RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ -DBUILD_TOOLS_DOCS=OFF -# 0001-Add-option-to-read-username-password-from-file.patch -RABBITMQ_C_IGNORE_CVES += CVE-2023-35789 - # BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable ifeq ($(BR2_SHARED_STATIC_LIBS),y) RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON From b22828cb0b4c6e467c86c10588bea2e247eca7ec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 11:06:17 +0200 Subject: [PATCH 1959/3013] package/rtmpdump: bump to latest git Drop patch (not needed since https://git.ffmpeg.org/gitweb/rtmpdump.git/commit/06142d3ef4754c9ebd6c4c5f52c858aa63811161) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/rtmpdump/0001-include-limits.h.patch | 39 -------------------- package/rtmpdump/rtmpdump.hash | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- 4 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 package/rtmpdump/0001-include-limits.h.patch diff --git a/.checkpackageignore b/.checkpackageignore index 6505cd6f763..905d14178fb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1225,7 +1225,6 @@ package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch lib_patc package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch lib_patch.Upstream package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch lib_patch.Upstream package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch lib_patch.Upstream -package/rtmpdump/0001-include-limits.h.patch lib_patch.Upstream package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patch.Upstream package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream package/rubix/0001-dont-use-legacy-functions.patch lib_patch.Upstream diff --git a/package/rtmpdump/0001-include-limits.h.patch b/package/rtmpdump/0001-include-limits.h.patch deleted file mode 100644 index 172a9630f71..00000000000 --- a/package/rtmpdump/0001-include-limits.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b9d010d2c07e07eeffa510f14ff833ecb10dc0c8 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 24 Jun 2019 21:11:33 +0200 -Subject: [PATCH] include - -Needed after -https://repo.or.cz/rtmpdump.git/commitdiff/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 - -to fix - -rtmp.c: In function 'HTTP_read': -rtmp.c:4459:26: error: 'INT_MAX' undeclared (first use in this function); did you mean 'INT8_MAX'? - -reported by buildroot autobuilders: -http://autobuild.buildroot.net/?reason=rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 - -Patch sent upstream by e-mail to author of -https://repo.or.cz/rtmpdump.git/patch/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 - -Signed-off-by: Bernd Kuhls ---- - librtmp/rtmp.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h -index 6d7dd89..48d4fc3 100644 ---- a/librtmp/rtmp.h -+++ b/librtmp/rtmp.h -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include "amf.h" - --- -2.20.1 - diff --git a/package/rtmpdump/rtmpdump.hash b/package/rtmpdump/rtmpdump.hash index feec5f48782..3aca9bda390 100644 --- a/package/rtmpdump/rtmpdump.hash +++ b/package/rtmpdump/rtmpdump.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 810908e60c8f4e453bc828775937e4bad996fafac89b9546652f17e08a3dac81 rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3-git4.tar.gz +sha256 372b5574af90ad3ec8cb7fde9bb3db76f7f7379c135a31d7af2c1ebba3051526 rtmpdump-6f6bb1353fc84f4cc37138baa99f586750028a01-git4.tar.gz sha256 03fe7ca91cc28e99b4003d5b3bd4ce3b084d4c475fdf9975cf0e7fdf4dc739cd librtmp/COPYING diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk index 4c8ecfe1276..4dfacb594ac 100644 --- a/package/rtmpdump/rtmpdump.mk +++ b/package/rtmpdump/rtmpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTMPDUMP_VERSION = c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 +RTMPDUMP_VERSION = 6f6bb1353fc84f4cc37138baa99f586750028a01 RTMPDUMP_SITE = https://git.ffmpeg.org/rtmpdump RTMPDUMP_SITE_METHOD = git RTMPDUMP_INSTALL_STAGING = YES From d4a84e61615553ff678d3c3b52ed33f898e9fcc9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 12:24:30 +0200 Subject: [PATCH 1960/3013] package/tftpd: bump to latest git commit - Update hash of tftpd.c (changes not related to license) - --include=$(@D)/autoconf/m4 and --disable-tcpwrappers must be passed since https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/commit/?id=fefaa2cc5c2ae1537fccbb552496787130feeeaa - This bump will also fix the following musl build failure raised since latest bump in ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb: In file included from tftpsubs.h:41, from tftpsubs.c:34: /home/autobuild/autobuild/instance-9/output-1/build/tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0/config.h:209:13: error: conflicting types for 'socklen_t'; have 'int' 209 | typedef int socklen_t; | ^~~~~~~~~ Fixes: ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb - http://autobuild.buildroot.org/results/4b5320013d8ab50499a459d64a71e0b71814fb2f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tftpd/tftpd.hash | 4 ++-- package/tftpd/tftpd.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tftpd/tftpd.hash b/package/tftpd/tftpd.hash index 3fab9dba073..5a4e87f689c 100644 --- a/package/tftpd/tftpd.hash +++ b/package/tftpd/tftpd.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9bdb3e2ab2b68e4d8cd057d102395c362baf07c7b052f1d5e40e5190afecc15e tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0-git4.tar.gz +sha256 452b2d630f884d80a7c4c324aa8248470224048ffb9473e3490460658b8ebea4 tftpd-2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1-git4.tar.gz # Hash for license file -sha256 5936d0764cb6e8f2f5ce8a11c249d81037b5f275f5983e8538ee4fbe57195369 tftpd/tftpd.c +sha256 9c46847a03d4cf290616a173d526b9bbdfcaf6846cbc01f361989b4e61f2d72e tftpd/tftpd.c diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 81b67f82cec..73ac7006a48 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -TFTPD_VERSION = e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0 +TFTPD_VERSION = 2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1 TFTPD_SITE = https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git TFTPD_SITE_METHOD = git -TFTPD_CONF_OPTS = --without-tcpwrappers +TFTPD_CONF_OPTS = --disable-tcpwrappers TFTPD_LICENSE = BSD-4-Clause TFTPD_LICENSE_FILES = tftpd/tftpd.c TFTPD_CPE_ID_VENDOR = tftpd-hpa_project @@ -15,6 +15,7 @@ TFTPD_CPE_ID_PRODUCT = tftpd-hpa TFTPD_SELINUX_MODULES = tftp # From git TFTPD_AUTORECONF = YES +TFTPD_AUTORECONF_OPTS = --include=$(@D)/autoconf/m4 define TFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp From 998c12bc1567a27f5e55035af80f1eb95f0b078c Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Sun, 21 Jul 2024 13:51:12 +0200 Subject: [PATCH 1961/3013] package/mxt-app: bump to version 1.38 Release notes: https://github.com/atmel-maxtouch/mxt-app/releases/tag/v1.38 Signed-off-by: Saeed Kazemi Signed-off-by: Thomas Petazzoni --- package/mxt-app/mxt-app.hash | 2 +- package/mxt-app/mxt-app.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mxt-app/mxt-app.hash b/package/mxt-app/mxt-app.hash index b7851cea37c..2f5ea814d83 100644 --- a/package/mxt-app/mxt-app.hash +++ b/package/mxt-app/mxt-app.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3639720ae1ea033bd982d68c5cab84432ce046fe14a66d9b2de07f115b642722 mxt-app-1.36.tar.gz +sha256 38fdf7954d2184d122f6f1b1493fba1955c0e3c7dfd5196dbc3d536afc9c672a mxt-app-1.38.tar.gz sha256 3682b125a40a4da00b6ab69bdbd38c25ed4beae69b3fe32458d2e32638477c4c LICENSE diff --git a/package/mxt-app/mxt-app.mk b/package/mxt-app/mxt-app.mk index 3da14589784..4921803e4cd 100644 --- a/package/mxt-app/mxt-app.mk +++ b/package/mxt-app/mxt-app.mk @@ -4,7 +4,7 @@ # ################################################################################ -MXT_APP_VERSION = 1.36 +MXT_APP_VERSION = 1.38 MXT_APP_SITE = $(call github,atmel-maxtouch,mxt-app,v$(MXT_APP_VERSION)) MXT_APP_LICENSE = BSD-2-Clause MXT_APP_LICENSE_FILES = LICENSE From 2d76e7e5fc05c7c6bec131168a108fa3ac00343b Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Sun, 21 Jul 2024 14:11:07 +0200 Subject: [PATCH 1962/3013] package/eza: bump to version 0.18.22 Release notes: https://github.com/eza-community/eza/releases/tag/v0.18.22 Signed-off-by: Saeed Kazemi Signed-off-by: Thomas Petazzoni --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 3bc55b26ef2..18d437abd14 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c01f11ba19956108e42244f0b094bbb6bc74c13ea2c68feecf6f0ff2f127df97 eza-0.18.17-cargo2.tar.gz +sha256 4ecb6221b28aaae309043b8403555eb6835de671c519c224a3807cea50f48001 eza-0.18.22-cargo2.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index 5a44fd78264..79fd2d36339 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.18.17 +EZA_VERSION = 0.18.22 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE From ec7ae882e048ce4ca5c2b72cb884b8d1ef33c6cc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 17:00:11 +0200 Subject: [PATCH 1963/3013] package/unbound: select BR2_PACKAGE_LIBOPENSSL_ENGINES unbound unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859: sldns/keyraw.c:167:35: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function) 167 | if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { | ^~~~~~~~~~~~~~~~~ Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/b7782f5ba54543df53a835552632f58d4ad6c082 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/unbound/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/Config.in b/package/unbound/Config.in index ae2ebfd9757..c8d697113ca 100644 --- a/package/unbound/Config.in +++ b/package/unbound/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_UNBOUND depends on !BR2_STATIC_LIBS select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help Unbound is a validating, recursive, and caching DNS resolver. From 7ce07b7b29d08e09f52ca81c9d25728726c87d57 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 17:01:16 +0200 Subject: [PATCH 1964/3013] package/unbound: security bump to version 1.20.0 This release has a fix for the DNSBomb issue CVE-2024-33655. This has a low severity for Unbound, since it makes Unbound complicit in targeting others, but does not affect Unbound so much. This security release also fixes CVE-2024-1931. https://nlnetlabs.nl/news/2024/May/08/unbound-1.20.0-released https://nlnetlabs.nl/news/2024/Mar/14/unbound-1.19.3-released https://nlnetlabs.nl/news/2024/Mar/07/unbound-1.19.2-released Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 843026abc78..96ee80b0ecc 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 -sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.20.0.tar.gz.sha256 +sha256 56b4ceed33639522000fd96775576ddf8782bb3617610715d7f1e777c5ec1dbf unbound-1.20.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 5128d0e420e..ff0262bef10 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.19.1 +UNBOUND_VERSION = 1.20.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From 6282b4eceb1821bc281a0710f93b52140fd9d36b Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Sun, 21 Jul 2024 16:27:47 +0200 Subject: [PATCH 1965/3013] package/parsec-tool: new package The Parsec Command Line Interface This tool can be used to communicate with the PARSEC service. https://github.com/parallaxsecond/parsec-tool.git Signed-off-by: Saeed Kazemi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/parsec-tool/Config.in | 9 +++++++++ package/parsec-tool/parsec-tool.hash | 3 +++ package/parsec-tool/parsec-tool.mk | 12 ++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/parsec-tool/Config.in create mode 100644 package/parsec-tool/parsec-tool.hash create mode 100644 package/parsec-tool/parsec-tool.mk diff --git a/DEVELOPERS b/DEVELOPERS index e5fe7b25a5d..333e26d74e5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2862,6 +2862,7 @@ F: package/biosdevname/ N: Saeed Kazemi F: package/eza/ +F: package/parsec-tool/ F: package/procs/ F: package/mxt-app/ F: package/zoxide/ diff --git a/package/Config.in b/package/Config.in index f2e10b2b5e3..a0d78518b6c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1589,6 +1589,7 @@ menu "Crypto" source "package/mbedtls/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" + source "package/parsec-tool/Config.in" source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" source "package/tinydtls/Config.in" diff --git a/package/parsec-tool/Config.in b/package/parsec-tool/Config.in new file mode 100644 index 00000000000..7607017bb1b --- /dev/null +++ b/package/parsec-tool/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PARSEC_TOOL + bool "parsec-tool" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + The Parsec Command Line Interface + This tool can be used to communicate with the PARSEC service. + + https://github.com/parallaxsecond/parsec-tool.git diff --git a/package/parsec-tool/parsec-tool.hash b/package/parsec-tool/parsec-tool.hash new file mode 100644 index 00000000000..bd01bc4980b --- /dev/null +++ b/package/parsec-tool/parsec-tool.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5b994e10305a682c22fb6f566b57874a22ed8b9120d9fd253f5fa17c40ff759a parsec-tool-0.7.0-cargo2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/parsec-tool/parsec-tool.mk b/package/parsec-tool/parsec-tool.mk new file mode 100644 index 00000000000..6fe2a8f320b --- /dev/null +++ b/package/parsec-tool/parsec-tool.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# parsec-tool +# +################################################################################ + +PARSEC_TOOL_VERSION = 0.7.0 +PARSEC_TOOL_SITE = $(call github,parallaxsecond,parsec-tool,$(PARSEC_TOOL_VERSION)) +PARSEC_TOOL_LICENSE = Apache-2.0 +PARSEC_TOOL_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) From d4c1ab5305e85230af9704e3579ea69aad84a00a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 23:26:50 +0200 Subject: [PATCH 1966/3013] package/libbytesize: bump to version 2.10 https://github.com/storaged-project/libbytesize/blob/2.10/NEWS.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libbytesize/libbytesize.hash | 2 +- package/libbytesize/libbytesize.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index 7dd572842d1..a52a2803e57 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8bae8287af6ef5624c320f70defdcd84ddc0c2057d3b59a5871897f27697811e libbytesize-2.7.tar.gz +sha256 1d1ce3be8ac59fd59511d0794c7327d5cf33f1e83496837b17e19ac49400cad1 libbytesize-2.10.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index a95ee083577..7f56cbcb793 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.7 +LIBBYTESIZE_VERSION = 2.10 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE From 8bb67c230b9d32d91bc85e5563f3453cb50d7a38 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 23:16:28 +0200 Subject: [PATCH 1967/3013] package/apr-util: requires DES in openssl Enable DES in openssl to avoid the following build failure raised since commit a83d41867c8d69a77d5cd0a665aa216af5340359: crypto/apr_crypto_openssl.c: In function 'crypto_cipher_mechanism': crypto/apr_crypto_openssl.c:385:27: error: implicit declaration of function 'EVP_des_ede3_cbc'; did you mean 'NID_des_ede3_cbc'? [-Wimplicit-function-declaration] 385 | key->cipher = EVP_des_ede3_cbc(); | ^~~~~~~~~~~~~~~~ | NID_des_ede3_cbc Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359 - http://autobuild.buildroot.org/results/4b1088a705f8564f85e629316f5cfc92953f0047 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/apr-util/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index f7c119db485..06b6c2684cf 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_APR_UTIL depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help The utility library for the apache runtime project From 5510d2890fc628bf08805f83e3430d759c15a8ec Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Jul 2024 22:57:31 +0200 Subject: [PATCH 1968/3013] support/testing: add nmap runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + support/testing/tests/package/test_nmap.py | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 support/testing/tests/package/test_nmap.py diff --git a/DEVELOPERS b/DEVELOPERS index 333e26d74e5..60f6b740c70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1918,6 +1918,7 @@ F: support/testing/tests/package/test_netsnmp/ F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_nmap.py F: support/testing/tests/package/test_ntp.py F: support/testing/tests/package/test_ntp/ F: support/testing/tests/package/test_numactl.py diff --git a/support/testing/tests/package/test_nmap.py b/support/testing/tests/package/test_nmap.py new file mode 100644 index 00000000000..92b085ece9a --- /dev/null +++ b/support/testing/tests/package/test_nmap.py @@ -0,0 +1,42 @@ +import os +import time + +import infra.basetest + + +class TestNmap(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_NMAP=y + BR2_PACKAGE_NMAP_NCAT=y + BR2_PACKAGE_NMAP_NMAP=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("nmap --version") + + # We open few ports, using the nmap netcat "nc" commands. + ports = [21, 23, 25, 80] + for port in ports: + cmd = f"nc -l -p {port} /dev/null &" + self.assertRunOk(cmd) + + time.sleep(1 * self.timeout_multiplier) + + # We run a local port scan. We should see in the output the + # ports we previously opened. + out, ret = self.emulator.run("nmap -n -sS 127.0.0.1", timeout=20) + self.assertEqual(ret, 0) + nmap_out = "\n".join(out) + for port in ports: + self.assertRegex(nmap_out, f"{port}/tcp *open") From a1bd5b31f255a8864a53a54de22a3b07fe799931 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 22:04:30 +0200 Subject: [PATCH 1969/3013] package/vorbis-tools: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: codec_skeleton.c: In function 'skeleton_process_fisbone_message_header': codec_skeleton.c:119:9: error: implicit declaration of function 'utf8_decode' [-Wimplicit-function-declaration] 119 | if (utf8_decode(header, &decoded) < 0) { | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/bb5d56d836e7d0f2a62daa9954878ad6e0b190ed Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .../0001-fix-build-with-gcc-14.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/vorbis-tools/0001-fix-build-with-gcc-14.patch diff --git a/package/vorbis-tools/0001-fix-build-with-gcc-14.patch b/package/vorbis-tools/0001-fix-build-with-gcc-14.patch new file mode 100644 index 00000000000..a05ce8a5849 --- /dev/null +++ b/package/vorbis-tools/0001-fix-build-with-gcc-14.patch @@ -0,0 +1,51 @@ +From f4a31fe975ea37537f39ace4420aee893b7e0b1a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jul 2024 21:57:38 +0200 +Subject: [PATCH] fix build with gcc >= 14 + +Add missing includes to avoid the following build failure with gcc >= +14: + +codec_skeleton.c: In function 'skeleton_process_fisbone_message_header': +codec_skeleton.c:119:9: error: implicit declaration of function 'utf8_decode' [-Wimplicit-function-declaration] + 119 | if (utf8_decode(header, &decoded) < 0) { + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/bb5d56d836e7d0f2a62daa9954878ad6e0b190ed + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/xiph/vorbis-tools/pull/48 +--- + ogginfo/codec_skeleton.c | 2 ++ + share/utf8.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/ogginfo/codec_skeleton.c b/ogginfo/codec_skeleton.c +index a27f8da..f906f8c 100644 +--- a/ogginfo/codec_skeleton.c ++++ b/ogginfo/codec_skeleton.c +@@ -28,6 +28,8 @@ + + #include "private.h" + ++#include "utf8.h" ++ + typedef struct { + bool supported; + uint16_t version_major; +diff --git a/share/utf8.c b/share/utf8.c +index be378d1..e819b67 100644 +--- a/share/utf8.c ++++ b/share/utf8.c +@@ -28,6 +28,7 @@ + #include + #include + ++#include "charset.h" + #include "utf8.h" + + +-- +2.43.0 + From f807855b4d77cd277702e8764f8877d7643f87bf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 21:47:39 +0200 Subject: [PATCH 1970/3013] package/libp11: select BR2_PACKAGE_LIBOPENSSL_ENGINES libp11 unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859: eng_front.c:25:2: error: #error did not get engine.h 25 | #error did not get engine.h | ^~~~~ Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/b03cc27a60f9e6794b3341517196fbf8dc3ec2d4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libp11/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libp11/Config.in b/package/libp11/Config.in index 3c7ccdee277..3bf13a6051d 100644 --- a/package/libp11/Config.in +++ b/package/libp11/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBP11 bool "libp11" depends on !BR2_STATIC_LIBS # dlopen depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBOPENSSL_ENGINES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help From 3d266f280b452ae9d2bd5e50d2b36849ff03dc7d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 21:18:39 +0200 Subject: [PATCH 1971/3013] package/mtd: select BR2_PACKAGE_LIBOPENSSL_ENGINES mtd ubifs unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859: CCLD mkfs.ubifs /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/powerpc64-buildroot-linux-gnu/13.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: ubifs-utils/mkfs.ubifs/mkfs_ubifs-sign.o: in function `sign_superblock_node': sign.c:(.text+0x328): undefined reference to `ENGINE_load_builtin_engines' Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/1fd49b193a3623d244ace602c46f15914bfbcff4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/mtd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 57a562c1084..0c95e3cc54a 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_MTD_JFFS_UTILS config BR2_PACKAGE_MTD_UBIFS_UTILS bool + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID From 89c9c131fe96235768bdb68fd67a3fc3626b8a39 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 22 Jul 2024 12:20:44 +0200 Subject: [PATCH 1972/3013] package/ruby: update to 3.3.4 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 4ac6200bca9..3831e701fb0 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -sha512 c58e9be9b5ab48191fbf7d67e13f0ec42ee71ed338170e0f7b246708e9cfc617ce65098f5ce7ab32d4305e785642d3e44253462104d5b9c4abcb1a4113f48347 ruby-3.3.1.tar.xz +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +sha512 b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb ruby-3.3.4.tar.xz # License files, Locally calculated sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index fcc637c5ea0..08ecbf5941e 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).4 RUBY_VERSION_EXT = 3.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From 6f34e68217264fb62c48ce28c48bf759b30fef0e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 12:48:59 +0200 Subject: [PATCH 1973/3013] package/apr: fix musl build strerror_r on musl always returns an int since its addition back in 2011 with https://git.musl-libc.org/cgit/musl/commit/src/string/strerror_r.c?id=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01 As a result, setting ac_cv_strerror_r_rc_int to no results in the following build failure since bump to version 1.7.2 in commit 783cd8d90d37b5e0b59d6f0bfca6667855b2b9e1: misc/unix/errorcodes.c: In function 'native_strerror': misc/unix/errorcodes.c:385:9: error: assignment to 'const char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 385 | msg = strerror_r(statcode, buf, bufsize); | ^ Fixes: 783cd8d90d37b5e0b59d6f0bfca6667855b2b9e1 - http://autobuild.buildroot.org/results/9a42a4427ff64d47da61c731abb99d7585781cdd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/apr/apr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/apr/apr.mk b/package/apr/apr.mk index cb8c12dd657..d4526a41725 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -39,7 +39,7 @@ APR_CONF_ENV = \ ac_cv_sizeof_struct_iovec=8 \ ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ - ac_cv_strerror_r_rc_int=no \ + ac_cv_strerror_r_rc_int=$(if $(BR2_TOOLCHAIN_USES_MUSL),yes,no) \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes \ apr_cv_epoll=yes \ From b2c1a8d2e258a07e69666dab4ef8f1267711a0ae Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 22 Jul 2024 13:11:23 +0200 Subject: [PATCH 1974/3013] package/python-uvicorn: bump to 0.30.3 Changelog: * https://github.com/encode/uvicorn/releases/tag/0.30.3 * https://github.com/encode/uvicorn/releases/tag/0.30.2 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index 318fc65e21c..70323199995 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a000939f41470e55bad5cec475489b4c uvicorn-0.30.1.tar.gz -sha256 d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8 uvicorn-0.30.1.tar.gz +md5 433c22f6ac3bbc2e7011a5623b772e25 uvicorn-0.30.3.tar.gz +sha256 0d114d0831ff1adbf231d358cbf42f17333413042552a624ea6a9b4c33dcfd81 uvicorn-0.30.3.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 092c640abd3..00c3b953a34 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.30.1 +PYTHON_UVICORN_VERSION = 0.30.3 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/37/16/9f5ccaa1a76e5bfbaa0c67640e2db8a5214ca08d92a1b427fa1677b3da88 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/77/40/b650be95700dc83d14c5f2b9eac9deb23cbca757a12ee20e473b5ef1ac48 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md From a0ebcac06b76c4f3c6b7c2d2382ddfeee85d5c1d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 12:10:28 +0200 Subject: [PATCH 1975/3013] package/brcm-patchram-plus: bump to latest git commit This bump will fix the following build failure with gcc >= 14: main.c: In function 'read_event': main.c:715:25: error: implicit declaration of function 'read'; did you mean 'fread'? [-Wimplicit-function-declaration] 715 | while ((count = read(fd, &buffer[i], len)) < len) { | ^~~~ | fread Fixes: - http://autobuild.buildroot.org/results/67965a5245c3d98d683e2c788352bf7c1cf4f00e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/brcm-patchram-plus/brcm-patchram-plus.hash | 2 +- package/brcm-patchram-plus/brcm-patchram-plus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/brcm-patchram-plus/brcm-patchram-plus.hash b/package/brcm-patchram-plus/brcm-patchram-plus.hash index f6910e714be..20bc56034c6 100644 --- a/package/brcm-patchram-plus/brcm-patchram-plus.hash +++ b/package/brcm-patchram-plus/brcm-patchram-plus.hash @@ -1,3 +1,3 @@ # locally computed -sha256 febad69fbc9185b4c6a31188cf381fd280b88d93cb7f5a40dfdbab9c599c29a7 brcm-patchram-plus-95b7b6916d661a4da3f9c0adf52d5e1f4f8ab042.tar.gz +sha256 1287021683e0e71b679b157020f047a44032f3af879b257ff0b94d8d4c3d016d brcm-patchram-plus-15bd6638dd6d3a37d22dbc18059f6d9eb885f057.tar.gz sha256 26324f5c563b7e338c2876c8abe90c3681c1e9a6163fc59b494c94ad6493eda4 COPYING diff --git a/package/brcm-patchram-plus/brcm-patchram-plus.mk b/package/brcm-patchram-plus/brcm-patchram-plus.mk index 329571d9a9c..d8733307690 100644 --- a/package/brcm-patchram-plus/brcm-patchram-plus.mk +++ b/package/brcm-patchram-plus/brcm-patchram-plus.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRCM_PATCHRAM_PLUS_VERSION = 95b7b6916d661a4da3f9c0adf52d5e1f4f8ab042 +BRCM_PATCHRAM_PLUS_VERSION = 15bd6638dd6d3a37d22dbc18059f6d9eb885f057 BRCM_PATCHRAM_PLUS_SITE = $(call github,AsteroidOS,brcm-patchram-plus,$(BRCM_PATCHRAM_PLUS_VERSION)) BRCM_PATCHRAM_PLUS_LICENSE = Apache-2.0 BRCM_PATCHRAM_PLUS_LICENSE_FILES = COPYING From 701cf686bdfd6c579c4d90768a6a3dab6858d942 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 11:54:45 +0200 Subject: [PATCH 1976/3013] package/sconeserver: select libxcrypt if needed Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: In file included from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/ScriptBase.h:25, from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.h:26, from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.cpp:23: /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/sconex.h:124:12: fatal error: crypt.h: No such file or directory 124 | # include | ^~~~~~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/24461bdb0a5d9a062b682ae3aeefa73c0408040b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/sconeserver/Config.in | 1 + package/sconeserver/sconeserver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index cce21fc860e..d1a8a031bec 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 10a0a22597f..bb0da12d4ce 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,6 +10,7 @@ SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_DEPENDENCIES = \ host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ pcre \ zlib # disable image as it fails to build with ImageMagick From 1c955f89ab2d0ff9df1d1ae638685f2c0383c81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Mon, 22 Jul 2024 11:37:10 +0200 Subject: [PATCH 1977/3013] configs/qemu_arm_ebbr: linux needs host-openssl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The kernel build needs host-openssl; add it to the configuration. In practice the documented build recipe works fine and the build failures can only be seen with highly parallel builds using per-package directories. This fixes the following compilation error: certs/extract-cert.c:21:10: fatal error: openssl/bio.h: No such file or directory Fixes: 7115ab39189a6c660745267d8bf0bf41cf8b3db7 Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/qemu_arm_ebbr_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index 7c436449d7f..bdcd41bbde5 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -19,6 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_OPTEE_CLIENT=y From 4521734348dd075fe7e1224ce4688c4fc683536a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 10:57:32 +0200 Subject: [PATCH 1978/3013] package/erofs-utils: add libdeflate and zlib optional dependencies libdeflate and zlib are optional dependencies and zlib is enabled by default since bump to version 1.7.1 in commit f5f3d8ca007d46c1b4a351e53b619209b232b113 and https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=29b9e71401621d3417599067a75bd9b13154c6a7: checking for zlib... no configure: error: Package requirements (zlib) were not met: Package 'zlib', required by 'virtual:world', not found Fixes: f5f3d8ca007d46c1b4a351e53b619209b232b113 - http://autobuild.buildroot.org/results/a56d5917b5a1e8c75368349f75ec425aeba1ff15 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/erofs-utils/erofs-utils.mk | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index fbf7795583f..f994ea9d070 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -42,8 +42,28 @@ else EROFS_UTILS_CONF_OPTS += --disable-fuse endif +ifeq ($(BR2_PACKAGE_LIBDEFLATE),y) +EROFS_UTILS_DEPENDENCIES += libdeflate +EROFS_UTILS_CONF_OPTS += --with-libdeflate +else +EROFS_UTILS_CONF_OPTS += --without-libdeflate +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +EROFS_UTILS_DEPENDENCIES += zlib +EROFS_UTILS_CONF_OPTS += --with-zlib +else +EROFS_UTILS_CONF_OPTS += --without-zlib +endif + HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 host-xz -HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 --enable-lzma --disable-fuse --without-selinux +HOST_EROFS_UTILS_CONF_OPTS += \ + --enable-lz4 \ + --enable-lzma \ + --disable-fuse \ + --without-libdeflate \ + --without-selinux \ + --without-zlib $(eval $(autotools-package)) $(eval $(host-autotools-package)) From f463a4953534df13397ce113bfbbc03d4b8e4df7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 22 Jul 2024 10:24:11 +0200 Subject: [PATCH 1979/3013] package/uclibc: fix compile error Fix compile error with older Linux kernel headers. Fixes: http://autobuild.buildroot.net/results/dfa46b243aa6e289333cbd98e3162d62ee6fa865 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...-compilation-with-4.x-kernel-headers.patch | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch diff --git a/package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch b/package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch new file mode 100644 index 00000000000..ad3efa9638f --- /dev/null +++ b/package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch @@ -0,0 +1,80 @@ +From 839bae66a376631ee7d5b1f5b2f5b4094c519ea8 Mon Sep 17 00:00:00 2001 +From: Dmitry Chestnykh +Date: Sat, 20 Jul 2024 17:23:45 +0300 +Subject: [PATCH] Fix compilation with 4.x kernel headers + +- Fallback to __NR_stat syscall in ld.so if we use 4.x kernel headers. +4.x kernel doesn't support 64-bit time so we can use old syscall +- Add preprocessor conditions to have fstat64 and fstatat64 in libc +with old kernel headers + +Signed-off-by: Dmitry Chestnykh +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=839bae66a376631ee7d5b1f5b2f5b4094c519ea8 +--- + ldso/include/dl-syscall.h | 4 +++- + libc/sysdeps/linux/common/fstat64.c | 3 ++- + libc/sysdeps/linux/common/fstatat64.c | 3 ++- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h +index 4f41034ad..9ec0eac60 100644 +--- a/ldso/include/dl-syscall.h ++++ b/ldso/include/dl-syscall.h +@@ -17,6 +17,8 @@ extern int _dl_errno; + #define __set_errno(X) {(_dl_errno) = (X);} + #endif + ++#include ++ + /* Pull in the arch specific syscall implementation */ + #include + /* For MAP_ANONYMOUS -- differs between platforms */ +@@ -139,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name, + { + return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); + } +-#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) ++#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) + # define __NR__dl_stat __NR_stat + static __always_inline _syscall2(int, _dl_stat, const char *, file_name, + struct stat *, buf) +diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c +index 359c22af6..121b21fc8 100644 +--- a/libc/sysdeps/linux/common/fstat64.c ++++ b/libc/sysdeps/linux/common/fstat64.c +@@ -8,8 +8,9 @@ + + #include <_lfs_64.h> + #include ++#include + +-#if defined(__NR_fstat64) && !defined(__UCLIBC_USE_TIME64__) ++#if defined(__NR_fstat64) && (!defined(__UCLIBC_USE_TIME64__) || LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) + # include + # include + # include "xstatconv.h" +diff --git a/libc/sysdeps/linux/common/fstatat64.c b/libc/sysdeps/linux/common/fstatat64.c +index 16dbf9215..739e84081 100644 +--- a/libc/sysdeps/linux/common/fstatat64.c ++++ b/libc/sysdeps/linux/common/fstatat64.c +@@ -9,6 +9,7 @@ + #include <_lfs_64.h> + #include + #include ++#include + + #if defined __mips__ + # include +@@ -23,7 +24,7 @@ + # define __NR_fstatat64 __NR_newfstatat + #endif + +-#if defined(__NR_fstatat64) && !defined(__UCLIBC_USE_TIME64__) ++#if defined(__NR_fstatat64) && (!defined(__UCLIBC_USE_TIME64__) || LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) + # include + # include "xstatconv.h" + int fstatat64(int fd, const char *file, struct stat64 *buf, int flag) +-- +2.30.2 + From 758b424582afdad7e7adc2b1ff06e06db7a1296f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 10:21:54 +0200 Subject: [PATCH 1980/3013] package/gtkiostream: disable octave Disable octave support which was added in commit fab48302865e5c0c98d91b696bc90e75e38189bb but untested as octave is not installed to staging and raises the following build failure: sparc64-linux-g++: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include/octave-3.8.1' Fixing those issues is useless, as gtkiostream is not compatible with latest octave version as it raises a bunch of errors: Octave.C: In member function 'void Octave::startOctave(const std::vector >&)': Octave.C:85:5: error: 'octave_main' was not declared in this scope; did you mean 'octave_map'? 85 | octave_main((int)argsIn.size(), (char**)&argsIn[0], embedded); | ^~~~~~~~~~~ | octave_map Octave.C: In member function 'int Octave::setGlobalVariable(const std::string&, Matrix&)': Octave.C:283:50: error: use of deleted function 'octave::symbol_table::symbol_table()' 283 | octave_value ov=octave::symbol_table().global_varval(string(baseName)); | ^ In file included from /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/octave-config.h:99, from /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/parse.h:29, from Octave.C:18: /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/symtab.h:63:39: note: declared here 63 | OCTAVE_DISABLE_CONSTRUCT_COPY_MOVE (symbol_table) | ^~~~~~~~~~~~ /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/oct-conf-post-public.h:354:3: note: in definition of macro 'OCTAVE_DISABLE_CONSTRUCT_COPY_MOVE' 354 | X () = delete; \ | ^ Octave.C:284:34: error: use of deleted function 'octave::symbol_table::symbol_table()' 284 | octave::symbol_table().global_assign (string(baseName), setGlobalSubVariable(varNames, m, 0, ov)); | ^ /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/symtab.h:63:39: note: declared here 63 | OCTAVE_DISABLE_CONSTRUCT_COPY_MOVE (symbol_table) | ^~~~~~~~~~~~ /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/oct-conf-post-public.h:354:3: note: in definition of macro 'OCTAVE_DISABLE_CONSTRUCT_COPY_MOVE' 354 | X () = delete; \ | ^ Octave.C:286:34: error: use of deleted function 'octave::symbol_table::symbol_table()' 286 | octave::symbol_table().global_assign (string(baseName), m); | ^ /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/symtab.h:63:39: note: declared here 63 | OCTAVE_DISABLE_CONSTRUCT_COPY_MOVE (symbol_table) | ^~~~~~~~~~~~ /home/fabrice/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/octave-9.2.0/octave/oct-conf-post-public.h:354:3: note: in definition of macro 'OCTAVE_DISABLE_CONSTRUCT_COPY_MOVE' 354 | X () = delete; \ | ^ Octave.C: In member function 'octave_map Octave::setGlobalSubVariable(const std::vector >&, const Matrix&, int, octave_value&)': Octave.C:302:38: error: 'class string_vector' has no member named 'lookup' 302 | whichIdx=base.map_keys().lookup(varNames[index+1]); // map_keys returns a string_vector | ^~~~~~ Fixes: fab48302865e5c0c98d91b696bc90e75e38189bb - http://autobuild.buildroot.org/results/9cfc420a4e41503635792472176583a8f81bb2a3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gtkiostream/gtkiostream.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk index 970644d6dfc..bc3d859d4eb 100644 --- a/package/gtkiostream/gtkiostream.mk +++ b/package/gtkiostream/gtkiostream.mk @@ -19,16 +19,10 @@ GTKIOSTREAM_DEPENDENCIES = \ host-pkgconf GTKIOSTREAM_CONF_OPTS = \ + --disable-octave \ --disable-tests \ $(if $(BR2_TOOLCHAIN_HAS_OPENMP),--disable,--enable)-openmp -ifeq ($(BR2_PACKAGE_OCTAVE),y) -GTKIOSTREAM_DEPENDENCIES += octave -GTKIOSTREAM_CONF_OPTS += --enable-octave -else -GTKIOSTREAM_CONF_OPTS += --disable-octave -endif - # For the optional packages below, there's unfortunately no # ./configure option to explicitly enable/disable them. They are # checked by the ./configure script using pkg-config. From d30c1e3c582545a770d40a63be5b7b477d6b1cba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 19:38:31 +0200 Subject: [PATCH 1981/3013] package/picotool: fix libusb dependencies libusb dependencies are wrong since the addition of the package in commit f7aac1c008f9c59f8c669bade17864b099221065: - BR2_HOST_GCC_AT_LEAST_4_9 is used instead of BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - BR2_TOOLCHAIN_HAS_THREADS is missing Fixes: f7aac1c008f9c59f8c669bade17864b099221065 - http://autobuild.buildroot.org/results/22689afc092e33b6e3c1c7ffea0d0e3b5bf76d99 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/picotool/Config.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/picotool/Config.in b/package/picotool/Config.in index 0046f8ad618..bbbcef405db 100644 --- a/package/picotool/Config.in +++ b/package/picotool/Config.in @@ -1,10 +1,13 @@ -comment "picotool needs a toolchain w/ C++ and gcc >= 4.9" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_9 +comment "picotool needs a toolchain w/ C++, threads, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || \ + BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_PICOTOOL bool "picotool" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_9 # libusb + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_PICO_SDK help From 3c9a5cee94ee767272290e071bf8bd3e7b98fda8 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Sun, 21 Jul 2024 19:36:04 +0200 Subject: [PATCH 1982/3013] package/mpd: rebase init script on layout introduced by openssh Rebase S95mpd on commit 1f743f4 (package/openssh: tidy up init script) $ utils/check-package package/mpd/S95mpd 61 lines processed 0 warnings generated (smoke test on live system) Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/mpd/S95mpd | 64 ++++++++++++++++++++++++++++++++------------- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 905d14178fb..5d5919340c9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -947,7 +947,6 @@ package/mono/0002-Ongoing-work-on-the-cmake-build.patch lib_patch.Upstream package/mosquitto/S50mosquitto Shellcheck lib_sysv.Indent lib_sysv.Variables package/motion/S99motion Shellcheck lib_sysv.Indent lib_sysv.Variables package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch lib_patch.Upstream -package/mpd/S95mpd lib_sysv.Variables package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch lib_patch.Upstream package/mpv/0001-fix-powerpc64-altivec.patch lib_patch.Upstream package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch lib_patch.Upstream diff --git a/package/mpd/S95mpd b/package/mpd/S95mpd index a258930b3ec..ac971e04a2a 100644 --- a/package/mpd/S95mpd +++ b/package/mpd/S95mpd @@ -1,33 +1,61 @@ #!/bin/sh +# +# S95mpd Starts Music Player daemon. +# +# shellcheck disable=SC2317 # functions are called via variable + +DAEMON="mpd" +PIDFILE="/var/run/$DAEMON.pid" # Sanity checks -test -f /etc/mpd.conf || exit 0 +[ -f /etc/$DAEMON.conf ] || exit 0 start() { - printf "Starting mpd: " - start-stop-daemon --start --quiet --background --exec /usr/bin/mpd \ - && echo "OK" || echo "FAIL" + printf "Starting %s: " "$DAEMON" + start-stop-daemon --start --pidfile "$PIDFILE" \ + --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } stop() { - printf "Stopping mpd: " - start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid \ - && echo "OK" || echo "FAIL" + printf "Stopping %s: " "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + # $DAEMON deletes its PID file on exit, wait for it to be gone + while [ -f "$PIDFILE" ]; do + sleep 0.1 + done + return "$status" +} + +restart() { + stop + start +} + +reload() { + restart } case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - sleep 1 - start + start|stop|reload|restart) + "$1" ;; *) - echo "Usage: $0 {start|stop|restart}" + echo "Usage: $0 {start|stop|reload|restart}" exit 1 esac + +exit $? From d1e812e739d0de9554c4e8a62fbc8743746b4aa7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 19:28:43 +0200 Subject: [PATCH 1983/3013] package/libfreefare: bump to latest git commit This bump will fix the following build failure with gcc >= 14 thanks to https://github.com/nfc-tools/libfreefare/commit/494233d33b3a9d21da1bb0f1c59606820afe4691 mifare_desfire_crypto.c: In function 'cmac': mifare_desfire_crypto.c:139:23: error: implicit declaration of function 'malloc' [-Wimplicit-function-declaration] 139 | uint8_t *buffer = malloc (padded_data_length (len, kbs)); | ^~~~~~ mifare_desfire_crypto.c:69:1: note: include '' or provide a declaration of 'malloc' 68 | #include "freefare_internal.h" +++ |+#include 69 | Fixes: - http://autobuild.buildroot.org/results/778be216f62b8c2e05aba1b3e297dab0c6c6ccd0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libfreefare/libfreefare.hash | 4 ++-- package/libfreefare/libfreefare.mk | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/libfreefare/libfreefare.hash b/package/libfreefare/libfreefare.hash index 9115518a3f3..6ef30513d14 100644 --- a/package/libfreefare/libfreefare.hash +++ b/package/libfreefare/libfreefare.hash @@ -1,5 +1,5 @@ -# From https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-0.4.0/libfreefare-0.4.0.tar.bz2 -sha256 bfa31d14a99a1247f5ed49195d6373de512e3eb75bf1627658b40cf7f876bc64 libfreefare-0.4.0.tar.bz2 +# Locally computed +sha256 48db20cccdf3435a9f205bcbb67dbd4eec055991d21840fb419874efd9ce9df8 libfreefare-c2b0cfa4b9fb0e4be88604f00b7a2405618d5abc.tar.gz # Hash for license file: sha256 be6209dfd763a0ba77fbe990cfd2512804441d8b5f0cad927baa3341b50fcade COPYING diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk index 16f15b34e4e..7065c441dcd 100644 --- a/package/libfreefare/libfreefare.mk +++ b/package/libfreefare/libfreefare.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBFREEFARE_VERSION = 0.4.0 -LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2 -# Do not use the github helper here, the generated tarball is *NOT* -# the same as the one uploaded by upstream for the release. -LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION) +LIBFREEFARE_VERSION = c2b0cfa4b9fb0e4be88604f00b7a2405618d5abc +LIBFREEFARE_SITE = $(call github,nfc-tools,libfreefare,$(LIBFREEFARE_VERSION)) LIBFREEFARE_DEPENDENCIES = host-pkgconf libnfc openssl LIBFREEFARE_LICENSE = LGPL-3.0+ with exception LIBFREEFARE_LICENSE_FILES = COPYING +# From git +LIBFREEFARE_AUTORECONF = YES LIBFREEFARE_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` $(eval $(autotools-package)) From 91738f5093f80eeda8637b9a73636539d6937475 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Jul 2024 19:09:12 +0200 Subject: [PATCH 1984/3013] support/testing: add iproute2 runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../testing/tests/package/test_iproute2.py | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 support/testing/tests/package/test_iproute2.py diff --git a/DEVELOPERS b/DEVELOPERS index 60f6b740c70..65dc7e6bddf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1878,6 +1878,7 @@ F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_iproute2.py F: support/testing/tests/package/test_iptables.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py diff --git a/support/testing/tests/package/test_iproute2.py b/support/testing/tests/package/test_iproute2.py new file mode 100644 index 00000000000..91d9006e23c --- /dev/null +++ b/support/testing/tests/package/test_iproute2.py @@ -0,0 +1,77 @@ +import os + +import infra.basetest + + +class TestIpRoute2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPROUTE2=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. This also check we are + # actually using the version from the iproute2 package, rather + # than the BusyBox version (which does not understand this + # option). + self.assertRunOk("ip -Version") + + # We run simple invocations of iproute2 tools. + self.assertRunOk("ifstat") + self.assertRunOk("ip link show dev lo") + + # Buildroot is supposed to have setup the loopback "lo" + # interface. We should be able to ping any address in + # the 127.0.0.0/8 subnet. + addrs = ["127.0.0.1", "127.0.1.2", "127.1.2.3"] + ping_cmd = "ping -c 3 -i 0.2" + for addr in addrs: + self.assertRunOk(f"{ping_cmd} {addr}") + + # We now change this 127.0.0.1/8 to a /16. + self.assertRunOk("ip addr del 127.0.0.1/8 dev lo") + self.assertRunOk("ip addr add 127.0.0.1/16 dev lo") + + # The IPs in the 127.0.0.0/16 subnet are still supposed to + # ping... + addrs = ["127.0.0.1", "127.0.1.2"] + for addr in addrs: + self.assertRunOk(f"{ping_cmd} {addr}") + # ...but the IP outside is supposed to fail. + _, ret = self.emulator.run(f"{ping_cmd} 127.1.2.3") + self.assertNotEqual(ret, 0) + + # We add a prohibited route. + self.assertRunOk("ip route add prohibit 127.0.1.0/24") + + # Now, only 127.0.0.1 is supposed to ping... + self.assertRunOk(f"{ping_cmd} 127.0.0.1") + # ...while the other IPs expected to fail. + addrs = ["127.0.1.2", "127.1.2.3"] + for addr in addrs: + _, ret = self.emulator.run(f"{ping_cmd} {addr}") + self.assertNotEqual(ret, 0) + + # We should be able to see our prohibited route. + out, ret = self.emulator.run("ip route list") + self.assertEqual(ret, 0) + self.assertEqual(out[0].strip(), "prohibit 127.0.1.0/24") + + # We create a new network namespace, and create a new shell + # process in it. + self.assertRunOk("ip netns add br-test") + self.assertRunOk("ip netns exec br-test /bin/sh") + + # Since we are in a new namespace, we should no longer see the + # prohibited route. The route list output should be empty. + out, ret = self.emulator.run("ip route list") + self.assertEqual(ret, 0) + self.assertEqual(len(out), 0) From 1b8e5c93d3789c900fbd5ab62badfe4d4eec61a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 18:57:17 +0200 Subject: [PATCH 1985/3013] package/gnutls: disable tpm2-tss Disable tpm2-tss to avoid the following circular dependency if BR2_PACKAGE_TPM2_TSS_FAPI is selected: tpm2-tss -> libcurl -> gnutls -> tmp2-tss resulting in the following build failure of libcurl or rtmpdump since commit caff4179a4481233257f5f475ca57ce9061af900: configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more. Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this. [...] In file included from rtmp.c:32: rtmp_sys.h:110:10: fatal error: gnutls/gnutls.h: No such file or directory 110 | #include | ^~~~~~~~~~~~~~~~~ Fixes: caff4179a4481233257f5f475ca57ce9061af900 - http://autobuild.buildroot.org/results/72e1843de650c9ed4795f1141e9fd485b71a14c3 - http://autobuild.buildroot.org/results/918f0f7efa810b17f6d2266a890bf0150cbed146 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 83021948126..cf2f02cc9d6 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -30,6 +30,7 @@ GNUTLS_CONF_OPTS = \ --without-librt-prefix \ --without-libz-prefix \ --without-tpm \ + --without-tpm2 \ $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \ $(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),--enable,--disable)-ssl2-support \ $(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),--enable,--disable)-gost @@ -99,13 +100,6 @@ else GNUTLS_CONF_OPTS += --without-p11-kit endif -ifeq ($(BR2_PACKAGE_TPM2_TSS),y) -GNUTLS_CONF_OPTS += --with-tpm2 -GNUTLS_DEPENDENCIES += tpm2-tss -else -GNUTLS_CONF_OPTS += --without-tpm2 -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) GNUTLS_CONF_OPTS += --with-zlib GNUTLS_DEPENDENCIES += zlib From 7103da7c96fc188e8470c39d967a677365ec8398 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 18:50:23 +0200 Subject: [PATCH 1986/3013] package/sysprof: needs headers >= 5.12 sysprof unconditionally uses PERF_RECORD_MISC_MMAP_BUILD_ID which is only available since kernel 5.12 and https://github.com/torvalds/linux/commit/88a16a1309333e43d328621ece3e9fa37027e8eb resulting in the following build failure with kernel < 5.12 since bump to version 46.0 in commit 0d57555407f2a0708515e7c377f57a6466c78b1b: ../src/libsysprof/sysprof-sampler.c: In function 'sysprof_sampler_perf_event_stream_cb': ../src/libsysprof/sysprof-sampler.c:186:33: error: 'PERF_RECORD_MISC_MMAP_BUILD_ID' undeclared (first use in this function); did you mean 'PERF_RECORD_MISC_MMAP_DATA'? 186 | if ((event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) != 0) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | PERF_RECORD_MISC_MMAP_DATA While at it, also fix a typo in "library" Fixes: 0d57555407f2a0708515e7c377f57a6466c78b1b - http://autobuild.buildroot.org/results/9a9f8462bd1d7127dc80de7f280ab9d100db47fe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/sysprof/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in index be4f7653b0f..32a5f997983 100644 --- a/package/sysprof/Config.in +++ b/package/sysprof/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_SYSPROF depends on !BR2_STATIC_LIBS # libunwind, polkit depends on !BR2_OPTIMIZE_FAST # polkit depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDEX select BR2_PACKAGE_LIBGLIB2 @@ -19,12 +20,13 @@ config BR2_PACKAGE_SYSPROF http://sysprof.com -comment "sysprof needs a toolchain w/ dynamic libraray, wchar, threads, C++, gcc >= 7" +comment "sysprof needs a toolchain w/ dynamic library, wchar, threads, C++, gcc >= 7, headers >= 5.12" depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 comment "sysprof can't be built with Optimize for fast" depends on BR2_OPTIMIZE_FAST From 41cc0f22722e3fbb2581a4f399c2e304fdb061a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 14:29:41 +0200 Subject: [PATCH 1987/3013] package/bandwidthd: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: parser.c: In function 'yyparse': parser.c:1196:16: error: implicit declaration of function 'yylex' [-Wimplicit-function-declaration] 1196 | yychar = yylex (); | ^~~~~ While at it, update Upstream tag of first patch Fixes: - http://autobuild.buildroot.org/results/33364071de4e5e51a2ac2337b82d145f71e0e64a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...c-bandwidthd.h-fix-build-with-gcc-10.patch | 2 +- ...2-src-parser.y-fix-build-with-gcc-14.patch | 36 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5d5919340c9..e20a747da50 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -342,7 +342,6 @@ package/avahi/S05avahi-setup.sh lib_sysv.Indent lib_sysv.Variables package/avahi/S50avahi-daemon lib_sysv.Indent lib_sysv.Variables package/babeld/S50babeld Shellcheck lib_sysv.Indent lib_sysv.Variables package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch lib_patch.Upstream -package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/bash/0001-input.h-add-missing-include-on-stdio.h.patch lib_patch.Upstream package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch lib_patch.Upstream package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch lib_patch.Upstream diff --git a/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch b/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch index e7d0dec8d6b..727e18ea84f 100644 --- a/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch +++ b/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch @@ -15,7 +15,7 @@ Fixes: - http://autobuild.buildroot.org/results/6308c8ee38b6017215038d47c009b238113bd36f Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nroach44/bandwidthd/pull/1] +Upstream: https://github.com/nroach44/bandwidthd/commit/dde68ed77114d7b19bfed3068edefc9dc0644445 --- src/bandwidthd.h | 4 ++-- src/graph.c | 1 + diff --git a/package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch b/package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch new file mode 100644 index 00000000000..d31070855cf --- /dev/null +++ b/package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch @@ -0,0 +1,36 @@ +From 96f5ad56b1bb872c2c24f0c83d06d94ae2936838 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 22 Jul 2024 14:08:45 +0200 +Subject: [PATCH] src/parser.y: fix build with gcc >= 14 + +Fix the following build failure with gcc >= 14: + +parser.c: In function 'yyparse': +parser.c:1196:16: error: implicit declaration of function 'yylex' [-Wimplicit-function-declaration] + 1196 | yychar = yylex (); + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/33364071de4e5e51a2ac2337b82d145f71e0e64a + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/nroach44/bandwidthd/pull/3 +--- + src/parser.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser.y b/src/parser.y +index d9acc10..15ce61c 100644 +--- a/src/parser.y ++++ b/src/parser.y +@@ -11,6 +11,7 @@ + #include + #include "bandwidthd.h" + ++extern int yylex (void); + extern unsigned int SubnetCount; + extern struct SubnetData SubnetTable[]; + extern struct config config; +-- +2.43.0 + From 4e4554eeb76e8b516c6cbcd66f15868492aac594 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 22 Jul 2024 15:15:28 +0200 Subject: [PATCH 1988/3013] package/luvi: needs engine support in OpenSSL When OpenSSL support is enabled, luvi needs the engine support, otherwise it fails with: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-none-linux-gnu/13.2.1/../../../../aarch64_be-none-linux-gnu/bin/ld: liblua_openssl.a(pkey.c.o): in function `openssl_pkey_set_engine': pkey.c:(.text+0xac0): undefined reference to `ENGINE_get_DH' /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-none-linux-gnu/13.2.1/../../../../aarch64_be-none-linux-gnu/bin/ld: pkey.c:(.text+0xaf4): undefined reference to `ENGINE_get_EC' /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-none-linux-gnu/13.2.1/../../../../aarch64_be-none-linux-gnu/bin/ld: pkey.c:(.text+0xb20): undefined reference to `ENGINE_get_DSA' /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-none-linux-gnu/13.2.1/../../../../aarch64_be-none-linux-gnu/bin/ld: pkey.c:(.text+0xb4c): undefined reference to `ENGINE_get_RSA' collect2: error: ld returned 1 exit status Fixes: http://autobuild.buildroot.net/results/722c767985d75b82baec8c3ac55f8eaf1ed6d07b/ https://gitlab.com/buildroot.org/buildroot/-/jobs/7391793024 Signed-off-by: Thomas Petazzoni --- package/luvi/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luvi/Config.in b/package/luvi/Config.in index 3a724acebb7..19d3307f122 100644 --- a/package/luvi/Config.in +++ b/package/luvi/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_LUVI select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LUV select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help A project in-between luv and luvit. The goal of this is to make building luvit and derivatives much easier. From 209103c756b4b5fd3637f290face7122b2fbd1e7 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 18 Jul 2024 20:22:05 -0700 Subject: [PATCH 1989/3013] package/docker-cli-buildx: bump version to v0.16.1 Drop the vendor/ workaround as it is no longer necessary. https://github.com/docker/buildx/releases/tag/v0.16.1 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli-buildx/docker-cli-buildx.hash | 2 +- package/docker-cli-buildx/docker-cli-buildx.mk | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package/docker-cli-buildx/docker-cli-buildx.hash b/package/docker-cli-buildx/docker-cli-buildx.hash index a6e0b0deabc..26b187d12a3 100644 --- a/package/docker-cli-buildx/docker-cli-buildx.hash +++ b/package/docker-cli-buildx/docker-cli-buildx.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371eb742213ed580179fc4fdfd9a197f0e3115e91979b7907828427d578d49e5 docker-cli-buildx-0.11.2-go2.tar.gz +sha256 8c9dd3fb18ccba399223ba0f623c9fe09fa38fb2a05283131be8e4e139b2d8fa docker-cli-buildx-0.16.1-go2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/docker-cli-buildx/docker-cli-buildx.mk b/package/docker-cli-buildx/docker-cli-buildx.mk index b62d09fbcc9..ea77a86077e 100644 --- a/package/docker-cli-buildx/docker-cli-buildx.mk +++ b/package/docker-cli-buildx/docker-cli-buildx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_BUILDX_VERSION = 0.11.2 +DOCKER_CLI_BUILDX_VERSION = 0.16.1 DOCKER_CLI_BUILDX_SITE = $(call github,docker,buildx,v$(DOCKER_CLI_BUILDX_VERSION)) DOCKER_CLI_BUILDX_LICENSE = Apache-2.0 @@ -19,15 +19,6 @@ DOCKER_CLI_BUILDX_LDFLAGS = \ -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Revision=$(DOCKER_CLI_BUILDX_VERSION) \ -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Version=$(DOCKER_CLI_BUILDX_VERSION) -# create the go.mod file with required language version go1.20 -# remove the conflicting vendor/modules.txt -# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 -define DOCKER_CLI_BUILDX_FIX_VENDORING - printf "module $(DOCKER_CLI_BUILDX_GOMOD)\n\ngo 1.20\n" > $(@D)/go.mod - rm -f $(@D)/vendor/modules.txt -endef -DOCKER_CLI_BUILDX_POST_EXTRACT_HOOKS += DOCKER_CLI_BUILDX_FIX_VENDORING - define DOCKER_CLI_BUILDX_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/bin/buildx \ $(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-buildx From 46ce2253761d6eacba3035066363215675aeb582 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 18 Jul 2024 20:33:30 -0700 Subject: [PATCH 1990/3013] package/docker-engine: bump version to v27.0.3 https://github.com/moby/moby/releases/tag/v27.0.3 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 86de5ca7855..b72b37223bb 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2705abdd7a8a47ec88c0d2f0f31eede01ba4aa5ae8b5ab0e2c4ee25e7c314521 docker-engine-27.0.2-go2.tar.gz +sha256 db02d9b5d98e85284538d6ead43b549c025acf937e98c09d18395bb331c1e607 docker-engine-27.0.3-go2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 1de112e4de1..c7c51c5ef59 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 27.0.2 +DOCKER_ENGINE_VERSION = 27.0.3 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 55a12db736ea85bf3786dcaa87026d0174c7bc36 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 18 Jul 2024 20:33:31 -0700 Subject: [PATCH 1991/3013] package/docker-cli: bump version to 27.0.3 https://github.com/docker/cli/releases/tag/v27.0.3 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index af26294378f..78e73112964 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2b31d4c8143c8b126e98a359639f51727fc83fc1e61670efbdeaa7dea92fd5a docker-cli-27.0.2-go2.tar.gz +sha256 f992e895c949852686abef9a6fa9efd622826c4f4d70b83876569a4641c4c8fc docker-cli-27.0.3-go2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 1e29f008b65..1478bdca2e9 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 27.0.2 +DOCKER_CLI_VERSION = 27.0.3 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From c7ad03ca187718a9f6b20411e611ac9cd86338de Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 18 Jul 2024 20:34:39 -0700 Subject: [PATCH 1992/3013] package/containerd: bump version to v1.7.20 https://github.com/containerd/containerd/releases/tag/v1.7.20 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 03964ace3f1..02c19945b0a 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 containerd-1.7.18-go2.tar.gz +sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 containerd-1.7.20-go2.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index b8225169389..afd03d7d3f7 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.18 +CONTAINERD_VERSION = 1.7.20 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From b0e565d7bf4f44eed90000be8675285b0d9c162b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Mon, 22 Jul 2024 12:36:28 -0300 Subject: [PATCH 1993/3013] package/python-sqlalchemy: bump version to 2.0.31 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- package/python-sqlalchemy/python-sqlalchemy.hash | 4 ++-- package/python-sqlalchemy/python-sqlalchemy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index d047719d546..a413fcc266c 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 c13a21626c7ae00b42a08880af574e3c SQLAlchemy-2.0.30.tar.gz -sha256 2b1708916730f4830bc69d6f49d37f7698b5bd7530aca7f04f785f8849e95255 SQLAlchemy-2.0.30.tar.gz +md5 dfa687701ddf1416cba19024e6f9ec3d SQLAlchemy-2.0.31.tar.gz +sha256 b607489dd4a54de56984a0c7656247504bd5523d9d0ba799aef59d4add009484 SQLAlchemy-2.0.31.tar.gz # Locally computed sha256 checksums sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index e1180a4e1a7..567ffbbb87d 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.30 +PYTHON_SQLALCHEMY_VERSION = 2.0.31 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/36/d0/0137ebcf0dc230c2e82a621b3af755b8788a2a9dd6fd1b8cd6d5e7f6b00d +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/ba/7d/e3312ae374fe7a4af7e1494735125a714a0907317c829ab8d8a31d89ded4 PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE From 061b5806d13a4bb9c4941e4564c2e681ef36a618 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 17:59:09 +0200 Subject: [PATCH 1994/3013] package/faifa: bump to latest git commit - Drop patches (already in version) - libevent is mandatory since https://github.com/ffainelli/faifa/commit/d2339c2a7680e7c87555650e19123e27e1f12031 - This bump will fix the following build failure with gcc >= 14: hpav_cfg.c: In function 'pushbutton_request': hpav_cfg.c:256:37: error: passing argument 2 of 'send_vendor_pkt' makes pointer from integer without a cast [-Wint-conversion] 256 | return send_vendor_pkt(ctx, mac, HPAV_MMTYPE_MS_PB_ENC, | ^~~ | | | uint8_t {aka unsigned char} hpav_cfg.c:123:64: note: expected 'const uint8_t *' {aka 'const unsigned char *'} but argument is of type 'uint8_t' {aka 'unsigned char'} 123 | static int send_vendor_pkt(struct context *ctx, const uint8_t *to, | ~~~~~~~~~~~~~~~^~ hpav_cfg.c: In function 'main': hpav_cfg.c:406:48: error: passing argument 2 of 'pushbutton_request' makes integer from pointer without a cast [-Wint-conversion] 406 | ret = pushbutton_request(&ctx, mac); | ^~~ | | | uint8_t * {aka unsigned char *} hpav_cfg.c:254:60: note: expected 'uint8_t' {aka 'unsigned char'} but argument is of type 'uint8_t *' {aka 'unsigned char *'} 254 | static int pushbutton_request(struct context *ctx, uint8_t mac) | ~~~~~~~~^~~ Fixes: - http://autobuild.buildroot.org/results/5a65337366e52c6234d8d154b7e9a0296e02f1dd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 -- ...y-include-endian.h-for-BYTE_ORDER-ma.patch | 32 ------------------- ...t-include-linux-if_ether.h-for-musl-.patch | 32 ------------------- ...-fix-asbolute-symlink-of-libfaifa.so.patch | 32 ------------------- package/faifa/Config.in | 1 + package/faifa/faifa.hash | 2 +- package/faifa/faifa.mk | 6 ++-- 7 files changed, 5 insertions(+), 103 deletions(-) delete mode 100644 package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch delete mode 100644 package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch delete mode 100644 package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch diff --git a/.checkpackageignore b/.checkpackageignore index e20a747da50..760ae29cfb0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -518,9 +518,6 @@ package/exim/0003-Skip-version-check-and-symlink-installation.patch lib_patch.Up package/exim/S86exim lib_sysv.Indent lib_sysv.Variables package/expect/0001-enable-cross-compilation.patch lib_patch.Upstream package/expect/0002-allow-tcl-build-directory.patch lib_patch.Upstream -package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch lib_patch.Upstream -package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch lib_patch.Upstream -package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch lib_patch.Upstream package/fail2ban/S60fail2ban Shellcheck lib_sysv.Variables package/fakedate/fakedate Shellcheck package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch lib_patch.Upstream diff --git a/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch b/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch deleted file mode 100644 index 79da360807a..00000000000 --- a/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bfe43f4b4f249cee8c77059d7c89ebbc521d4d93 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 14 Sep 2015 22:25:12 +0200 -Subject: [PATCH] sha2.c: explicitly include endian.h for BYTE_ORDER macro - -Fixes a build issue with the musl C library, which doesn't indirectly -include endian.h from any of the included system headers: - -http://autobuild.buildroot.net/results/17b/17bde543db253c008079b04c5e341f804160f59c/build-end.log - -Upstream-Status: submitted (https://github.com/ffainelli/faifa/pull/12) - -Signed-off-by: Peter Korsgaard ---- - sha2.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sha2.c b/sha2.c -index f2f5132..4c8a72d 100644 ---- a/sha2.c -+++ b/sha2.c -@@ -40,6 +40,7 @@ - #include - #include - -+#include "endian.h" - #include "sha2.h" - - /* --- -2.1.4 - diff --git a/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch b/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch deleted file mode 100644 index c5547a5e10a..00000000000 --- a/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 36eed08a3783df6bb8d92d3c80cd47d0660eeb12 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 16:27:37 +0100 -Subject: [PATCH] hpav_cfg.c: do not include linux/if_ether.h for musl - compatibility - -Fixes a build issue with the musl C library -http://autobuild.buildroot.net/results/dc6/dc6e4d7327d2031ef921cccd814605dec73a0f9c/build-end.log - -Patch sent upstream: https://github.com/ffainelli/faifa/pull/13 - -Signed-off-by: Bernd Kuhls ---- - hpav_cfg.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/hpav_cfg.c b/hpav_cfg.c -index 7cc53af..45d3f0a 100644 ---- a/hpav_cfg.c -+++ b/hpav_cfg.c -@@ -53,8 +53,6 @@ - #include - #include - --#include -- - #include "homeplug_av.h" - #include "crypto.h" - --- -2.7.0.rc3 - diff --git a/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch b/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch deleted file mode 100644 index 876d2a60f47..00000000000 --- a/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d16abf61049947c451a6411a13fc15dda32feb47 Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Sat, 6 Sep 2014 11:23:02 -0700 -Subject: [PATCH] Makefile.in: fix asbolute symlink of libfaifa.so - -Fixes #7 - -Signed-off-by: Florian Fainelli -[Upstream: da2e279fd736d05bcd0ee6e4609c44fece017ba8] -Signed-off-by: Thomas Petazzoni ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index ba65bee..9dec7ee 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -98,9 +98,9 @@ install: installman strip - $(INSTALL) -m0755 hpav_cfg $(DESTDIR)$(sbindir) - $(INSTALL) -d $(DESTDIR)$(libdir) - $(INSTALL) -m0644 $(LIB_SONAME) $(DESTDIR)$(libdir) -- ln -sf $(DESTDIR)$(libdir)/$(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SHARED_SO) - $(INSTALL) -d $(DESTDIR)$(includedir)/faifa - cp $(HEADERS) $(DESTDIR)$(includedir)/faifa -+ cd $(DESTDIR)$(libdir) && ln -sf $(LIB_SONAME) $(LIB_SHARED_SO) - - strip: - $(STRIP) $(APP) --- -2.23.0 - diff --git a/package/faifa/Config.in b/package/faifa/Config.in index 486f35d5089..202b69bcd28 100644 --- a/package/faifa/Config.in +++ b/package/faifa/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FAIFA bool "faifa" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBPCAP help Faifa can configure any Intellon-based Power Line diff --git a/package/faifa/faifa.hash b/package/faifa/faifa.hash index 658dae4a719..1b0608b898a 100644 --- a/package/faifa/faifa.hash +++ b/package/faifa/faifa.hash @@ -1,3 +1,3 @@ # locally computed -sha256 6eada81f3d21f80b5848338b627784981064d728f8e377e5cf973d31640d4489 faifa-0.1.tar.gz +sha256 bae36f77d02ea25a0f8e2fa3db0b0efe7e5cb7331cf0ea97470036b7f299a5c1 faifa-fb91bf684fd19f03115b8dc76b57bb5a5a4ec05b.tar.gz sha256 9b62e4601b2b9cd5719a393e88ed71a8304048862502db765ed9d6ff8cf38c5e COPYING diff --git a/package/faifa/faifa.mk b/package/faifa/faifa.mk index e5dc1574822..1cc7795e0f4 100644 --- a/package/faifa/faifa.mk +++ b/package/faifa/faifa.mk @@ -4,10 +4,10 @@ # ################################################################################ -FAIFA_VERSION = 0.1 -FAIFA_SITE = $(call github,ffainelli,faifa,v$(FAIFA_VERSION)) +FAIFA_VERSION = fb91bf684fd19f03115b8dc76b57bb5a5a4ec05b +FAIFA_SITE = $(call github,ffainelli,faifa,$(FAIFA_VERSION)) FAIFA_INSTALL_STAGING = YES -FAIFA_DEPENDENCIES = libpcap host-autoconf +FAIFA_DEPENDENCIES = libevent libpcap host-autoconf FAIFA_LICENSE = BSD-3-Clause FAIFA_LICENSE_FILES = COPYING From ad0d6d468c0efb310ca8cd01ce73df21a36d13ac Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 18 Jul 2024 22:26:32 -0600 Subject: [PATCH 1995/3013] package/python-pydantic: bump to version 2.8.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pydantic/python-pydantic.hash | 4 ++-- package/python-pydantic/python-pydantic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index caac7f89578..6127dcaf378 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 38edaad5e8687f1b238577ee05a4c968 pydantic-2.8.0.tar.gz -sha256 d970ffb9d030b710795878940bd0489842c638e7252fc4a19c3ae2f7da4d6141 pydantic-2.8.0.tar.gz +md5 940d760de174d3567d4f5be28fd215f5 pydantic-2.8.2.tar.gz +sha256 6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a pydantic-2.8.2.tar.gz # Locally computed sha256 checksums sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 4c2becc9c9d..c549970db92 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 2.8.0 +PYTHON_PYDANTIC_VERSION = 2.8.2 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/8b/7b/23dc30fba5793d7be3307f33bebb36e08f78f8af9c03fce608833f01bebd +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/8c/99/d0a5dca411e0a017762258013ba9905cd6e7baa9a3fd1fe8b6529472902e PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From 2002c368f23b9a847d260185648015c8ff761f71 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 18 Jul 2024 22:37:39 -0600 Subject: [PATCH 1996/3013] package/python-pydantic-core: bump to version 2.20.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pydantic-core/python-pydantic-core.hash | 2 +- package/python-pydantic-core/python-pydantic-core.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index 1703fcff3d7..3554d0c0f61 100644 --- a/package/python-pydantic-core/python-pydantic-core.hash +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 a3597bcb7a6c9aabee543ba5797ba4997eb5a91b36bc6c596be4640bccf98daf pydantic_core-2.20.0.tar.gz +sha256 87cee9e796c31e3470dd13675286f13d58084e4362dae9288a9fa45b1264c084 pydantic_core-2.20.1.tar.gz # Locally computed sha256 checksums sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk index 2e37c370040..4332c4f6a6d 100644 --- a/package/python-pydantic-core/python-pydantic-core.mk +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_CORE_VERSION = 2.20.0 +PYTHON_PYDANTIC_CORE_VERSION = 2.20.1 PYTHON_PYDANTIC_CORE_SOURCE = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz -PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/7d/fa/9802d053f33dbcf110d46e3f28667b06cd764b164f1e3f4189848cdd6e78 +PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/12/e3/0d5ad91211dba310f7ded335f4dad871172b9cc9ce204f5a56d76ccd6247 PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE From 9c41875680f3165704f015558bfb3d502ab283e6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 18 Jul 2024 22:56:39 -0600 Subject: [PATCH 1997/3013] package/python-maturin: bump to version 1.7.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index 9807260ebdb..3c5f836ad55 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 53d51f5e2decca9af248748684aefa9245910757f19ae147dcf566172ecb0907 python-maturin-1.4.0-cargo2.tar.gz +sha256 56c18b09d38080f9975fb679be1fda01b936d21f5ef233967cda3dd74905e683 maturin-1.7.0.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 37479dd7e79..70cdb15949e 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,10 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 1.4.0 -PYTHON_MATURIN_SOURCE_PYPI = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE_PYPI = https://files.pythonhosted.org/packages/20/90/43a3aa35f037e91582ec7516a92084a71f84e89e39ef580813bed072b154 -PYTHON_MATURIN_SITE = $(PYTHON_MATURIN_SITE_PYPI)/$(PYTHON_MATURIN_SOURCE_PYPI)?buildroot-path=filename +PYTHON_MATURIN_VERSION = 1.7.0 +PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/80/da/a4bbd6e97f3645f4ebd725321aa235e22e31037dfd92caf4539f721c0a5a PYTHON_MATURIN_SETUP_TYPE = setuptools-rust PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From 42e46a5f1348573ab778584b0dfd35c546eda359 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 18 Jul 2024 23:01:34 -0600 Subject: [PATCH 1998/3013] package/python-setuptools-rust: bump to version 1.9.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-setuptools-rust/python-setuptools-rust.hash | 4 ++-- package/python-setuptools-rust/python-setuptools-rust.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.hash b/package/python-setuptools-rust/python-setuptools-rust.hash index a83288e43ac..61d2c8a1509 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.hash +++ b/package/python-setuptools-rust/python-setuptools-rust.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-rust/json -md5 c5ca990845902dbaa1885f9ad9399988 setuptools-rust-1.8.1.tar.gz -sha256 94b1dd5d5308b3138d5b933c3a2b55e6d6927d1a22632e509fcea9ddd0f7e486 setuptools-rust-1.8.1.tar.gz +md5 e3be6366d0d71304ca859edca3c89606 setuptools-rust-1.9.0.tar.gz +sha256 704df0948f2e4cc60c2596ad6e840ea679f4f43e58ed4ad0c1857807240eab96 setuptools-rust-1.9.0.tar.gz # Locally computed sha256 checksums sha256 b20668c1590582b3882854050ccfbdb7aee1f71a1ffe9eacc4c5aeb08a14161b LICENSE diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index 1203fbf6161..14930501d07 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_RUST_VERSION = 1.8.1 +PYTHON_SETUPTOOLS_RUST_VERSION = 1.9.0 PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools-rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz -PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/f2/40/f1e9fedb88462248e94ea4383cda0065111582a4d5a32ca84acf60ab1107 +PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/9d/f1/2cb8887cad0726a5e429cc9c58e30767f58d22c34d55b075d2f845d4a2a5 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE From ec052de2fb744ebfa3de700b0d7a900e509cd660 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 18 Jul 2024 23:27:00 -0600 Subject: [PATCH 1999/3013] package/python-setuptools: bump to version 71.0.3 Rebase add executable patch. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../0001-add-executable.patch | 18 +++++++++--------- .../python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/python-setuptools/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch index d93298e1187..da1bc68b396 100644 --- a/package/python-setuptools/0001-add-executable.patch +++ b/package/python-setuptools/0001-add-executable.patch @@ -1,4 +1,4 @@ -From 975379e84ae3229fac94cd0499fd4ba7baa574ba Mon Sep 17 00:00:00 2001 +From a35dffe950d7bb0f7988d78ec4a963c5ce67e3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 7 Dec 2015 01:14:33 +0100 Subject: [PATCH] add executable @@ -22,10 +22,10 @@ Signed-off-by: James Hilliard 2 files changed, 11 insertions(+) diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index 606cce9d8..f158e1b51 100644 +index c49fcda93..851950522 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py -@@ -16,6 +16,7 @@ class install(orig.install): +@@ -18,6 +18,7 @@ class install(orig.install): """Use easy_install to install the package, w/dependencies""" user_options = orig.install.user_options + [ @@ -33,19 +33,19 @@ index 606cce9d8..f158e1b51 100644 ('old-and-unmanageable', None, "Try not to use this!"), ( 'single-version-externally-managed', -@@ -48,6 +49,7 @@ class install(orig.install): +@@ -50,6 +51,7 @@ class install(orig.install): ) - orig.install.initialize_options(self) + super().initialize_options() + self.executable = None self.old_and_unmanageable = None self.single_version_externally_managed = None diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index 72b2e45cb..146a0bb58 100644 +index f44281b49..9e91cad87 100644 --- a/setuptools/command/install_scripts.py +++ b/setuptools/command/install_scripts.py -@@ -12,6 +12,13 @@ class install_scripts(orig.install_scripts): +@@ -14,6 +14,13 @@ class install_scripts(orig.install_scripts): def initialize_options(self): orig.install_scripts.initialize_options(self) self.no_ep = False @@ -57,9 +57,9 @@ index 72b2e45cb..146a0bb58 100644 + ('executable','executable') + ) - def run(self): + def run(self) -> None: self.run_command("egg_info") -@@ -38,6 +45,8 @@ class install_scripts(orig.install_scripts): +@@ -40,6 +47,8 @@ class install_scripts(orig.install_scripts): ) bs_cmd = self.get_finalized_command('build_scripts') exec_param = getattr(bs_cmd, 'executable', None) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 123c9a14552..29237427a0f 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools/json -md5 940ffdb3a2ce4f6a5ee80032aa115fc7 setuptools-69.2.0.tar.gz -sha256 0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e setuptools-69.2.0.tar.gz +md5 f404be507829989fcff7a8b63d92f357 setuptools-71.0.3.tar.gz +sha256 3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d setuptools-71.0.3.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index afc7348eb24..cf7016ecff0 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 69.2.0 +PYTHON_SETUPTOOLS_VERSION = 71.0.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/4d/5b/dc575711b6b8f2f866131a40d053e30e962e633b332acf7cd2c24843d83d +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/d1/8e/1d0b941ce1151009c6d98a0a590a608f346d4d272ce95ca09ee2bbb592cd PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From f40757781ffca285053ef2fa8ea9e0971fd65678 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 15:17:50 +0200 Subject: [PATCH 2000/3013] package/pkg-meson: support building both libraries meson supports building both libraries (i.e. static and shared). This will avoid the following build failure with flashrom and BR2_SHARED_STATIC_LIBS raised since bump to version 1.4.0-rc2 in commit 8637884057ddc3c1aeb9f0dd285fc6fcf378c26b: ../output-1/build/flashrom-1.4.0-rc2/meson.build:18:2: ERROR: Problem encountered: Cannot build cli_classic with shared libflashrom. Use \'-Dclassic_cli=disabled\' to disable the cli, or use \'--default-library=both\' to also build the classic_cli Fixes: 8637884057ddc3c1aeb9f0dd285fc6fcf378c26b - http://autobuild.buildroot.org/results/6d484857ff1674bf81986505827e54f3f1b9aaec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pkg-meson.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 65cabf23bae..bc805b799cc 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -82,6 +82,14 @@ else PKG_MESON_TARGET_FC = /bin/false endif +ifeq ($(BR2_STATIC_LIBS),y) +PKG_MESON_DEFAULT_LIBRARY=static +else ifeq ($(BR2_SHARED_LIBS),y) +PKG_MESON_DEFAULT_LIBRARY=shared +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +PKG_MESON_DEFAULT_LIBRARY=both +endif + # Generates sed patterns for patching the cross-compilation.conf template, # since Flags might contain commas the arguments are passed indirectly by # variable name (stripped to deal with whitespaces). @@ -152,7 +160,7 @@ define $(2)_CONFIGURE_CMDS $$(MESON) setup \ --prefix=/usr \ --libdir=lib \ - --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ + --default-library=$(PKG_MESON_DEFAULT_LIBRARY) \ --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ -Db_pie=false \ From 4f828733c51f3db095920ef93d019293d03005cc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 14:45:07 +0200 Subject: [PATCH 2001/3013] package/gnutls: add tpm2-tss comment As suggested by Thomas Petazzoni, add a comment about tpm2-tss dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index cf2f02cc9d6..eae017aac26 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -14,6 +14,8 @@ GNUTLS_LICENSE_FILES = doc/COPYING.LESSER GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu +# Don't add an optional dependency on tpm2-tss as it creates a +# circular dependency: tpm2-tss -> libcurl -> gnutls -> tmp2-tss. GNUTLS_CONF_OPTS = \ --disable-doc \ --disable-libdane \ From fd50b9be374726006f72e7e81ca4cef6808f17f7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 22 Jul 2024 18:17:40 +0200 Subject: [PATCH 2002/3013] package/zxing-cpp: bump to version 2.2.1 Release notes: https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.2.0 https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.2.1 The added patch fixes the library compilation when only the writer support is enabled. Co-Developed-by: Francesco Nicoletta Puzzillo Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...-when-only-writer-support-is-enabled.patch | 164 ++++++++++++++++++ package/zxing-cpp/zxing-cpp.hash | 2 +- package/zxing-cpp/zxing-cpp.mk | 2 +- 3 files changed, 166 insertions(+), 2 deletions(-) create mode 100644 package/zxing-cpp/0001-Fix-building-when-only-writer-support-is-enabled.patch diff --git a/package/zxing-cpp/0001-Fix-building-when-only-writer-support-is-enabled.patch b/package/zxing-cpp/0001-Fix-building-when-only-writer-support-is-enabled.patch new file mode 100644 index 00000000000..0d2a90f7a54 --- /dev/null +++ b/package/zxing-cpp/0001-Fix-building-when-only-writer-support-is-enabled.patch @@ -0,0 +1,164 @@ +From aef33b66df0ad6f085dc55b50d7847e0b8a2ccd8 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Wed, 17 Jul 2024 14:53:35 +0200 +Subject: [PATCH] Fix building when only writer support is enabled + +The compilation of the following code, which links the zxing-cpp library +built with only the writer (encoder) support, raises the following +linking errors: + +using namespace ZXing; + +int main(void) +{ + std::string str = "01"; + BitHacks::NumberOfLeadingZeros(0); + auto writer = MultiFormatWriter(BarcodeFormat::Code128); + writer.setEncoding(CharacterSet::UTF8); + writer.setMargin(0); + auto matrix = writer.encode(str, 0, 0 /*scaledImageWidth, pixelHeight*/); + + return EXIT_SUCCESS; +} + +arm-buildroot-linux-uclibcgnueabihf/bin/ld:host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libZXing.so: +undefined reference to `ZXing::TextDecoder::GuessEncoding(unsigned char const*, unsigned int, ZXing::CharacterSet)' +arm-buildroot-linux-uclibcgnueabihf/bin/ld: host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libZXing.so: +undefined reference to `ZXing::HRIFromGS1[abi:cxx11](std::basic_string_view >)' +arm-buildroot-linux-uclibcgnueabihf/bin/ld: host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libZXing.so: +undefined reference to `ZXing::TextDecoder::Append(std::__cxx11::basic_string, std::allocator >&, unsigned char const*, unsigned int, ZXing::CharacterSet, bool)' +arm-buildroot-linux-uclibcgnueabihf/bin/ld: host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libZXing.so: +undefined reference to `ZXing::HRIFromISO15434[abi:cxx11](std::basic_string_view >)' +collect2: error: ld returned 1 exit status + +The patch fixes these errors. + +Co-Developed-by: Francesco Nicoletta Puzzillo +Signed-off-by: Dario Binacchi +Upstream: backport from upstream https://github.com/zxing-cpp/zxing-cpp/pull/811 +--- + core/src/Content.cpp | 4 ++++ + core/src/Content.h | 6 ++++++ + core/src/DecoderResult.h | 2 ++ + core/src/GTIN.cpp | 2 ++ + core/src/GTIN.h | 2 ++ + 5 files changed, 16 insertions(+) + +diff --git a/core/src/Content.cpp b/core/src/Content.cpp +index 4d3c44657cf9..569d4e35614a 100644 +--- a/core/src/Content.cpp ++++ b/core/src/Content.cpp +@@ -93,6 +93,7 @@ bool Content::canProcess() const + return std::all_of(encodings.begin(), encodings.end(), [](Encoding e) { return CanProcess(e.eci); }); + } + ++#ifdef ZXING_READERS + std::string Content::render(bool withECI) const + { + if (empty() || !canProcess()) +@@ -165,6 +166,7 @@ std::wstring Content::utfW() const + { + return FromUtf8(render(false)); + } ++#endif // ZXING_READERS + + ByteArray Content::bytesECI() const + { +@@ -188,6 +190,7 @@ ByteArray Content::bytesECI() const + return ByteArray(res); + } + ++#ifdef ZXING_READERS + CharacterSet Content::guessEncoding() const + { + // assemble all blocks with unknown encoding +@@ -236,5 +239,6 @@ ContentType Content::type() const + + return ContentType::Mixed; + } ++#endif // ZXING_READERS + + } // namespace ZXing +diff --git a/core/src/Content.h b/core/src/Content.h +index 99e5a01e7140..aa77bda94d54 100644 +--- a/core/src/Content.h ++++ b/core/src/Content.h +@@ -38,7 +38,9 @@ class Content + void ForEachECIBlock(FUNC f) const; + + void switchEncoding(ECI eci, bool isECI); ++#ifdef ZXING_READERS + std::string render(bool withECI) const; ++#endif // ZXING_READERS + + public: + struct Encoding +@@ -75,13 +77,17 @@ public: + bool empty() const { return bytes.empty(); } + bool canProcess() const; + ++#ifdef ZXING_READERS + std::string text(TextMode mode) const; + std::wstring utfW() const; // utf16 or utf32 depending on the platform, i.e. on size_of(wchar_t) + std::string utf8() const { return render(false); } ++#endif // ZXING_READERS + + ByteArray bytesECI() const; ++#ifdef ZXING_READERS + CharacterSet guessEncoding() const; + ContentType type() const; ++#endif // ZXING_READERS + }; + + } // ZXing +diff --git a/core/src/DecoderResult.h b/core/src/DecoderResult.h +index 02b285084195..3117b03a923a 100644 +--- a/core/src/DecoderResult.h ++++ b/core/src/DecoderResult.h +@@ -50,7 +50,9 @@ public: + Content&& content() && { return std::move(_content); } + + // to keep the unit tests happy for now: ++#ifdef ZXING_READERS + std::wstring text() const { return _content.utfW(); } ++#endif // ZXING_READERS + std::string symbologyIdentifier() const { return _content.symbology.toString(false); } + + // Simple macro to set up getter/setter methods that save lots of boilerplate. +diff --git a/core/src/GTIN.cpp b/core/src/GTIN.cpp +index 256855a03070..690901062301 100644 +--- a/core/src/GTIN.cpp ++++ b/core/src/GTIN.cpp +@@ -199,6 +199,7 @@ std::string LookupCountryIdentifier(const std::string& GTIN, const BarcodeFormat + return it != std::end(COUNTRIES) && prefix >= it->first && prefix <= it->last ? it->id : std::string(); + } + ++#ifdef ZXING_READERS + std::string EanAddOn(const Result& result) + { + if (!(BarcodeFormat::EAN13 | BarcodeFormat::UPCA | BarcodeFormat::UPCE | BarcodeFormat::EAN8) +@@ -208,6 +209,7 @@ std::string EanAddOn(const Result& result) + auto pos = txt.find(' '); + return pos != std::string::npos ? std::string(txt.substr(pos + 1)) : std::string(); + } ++#endif // ZXING_READERS + + std::string IssueNr(const std::string& ean2AddOn) + { +diff --git a/core/src/GTIN.h b/core/src/GTIN.h +index d56b604e5f71..9af0b01200ce 100644 +--- a/core/src/GTIN.h ++++ b/core/src/GTIN.h +@@ -47,7 +47,9 @@ bool IsCheckDigitValid(const std::basic_string& s) + */ + std::string LookupCountryIdentifier(const std::string& GTIN, const BarcodeFormat format = BarcodeFormat::None); + ++#ifdef ZXING_READERS + std::string EanAddOn(const Result& result); ++#endif // ZXING_READERS + + std::string IssueNr(const std::string& ean2AddOn); + std::string Price(const std::string& ean5AddOn); +-- +2.43.0 + diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index 6c6917ed865..ff11896f4b7 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe zxing-cpp-2.1.0.tar.gz +sha256 02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635 zxing-cpp-2.2.1.tar.gz # License files sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index 077d7e75d3d..5f91bf2f716 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZXING_CPP_VERSION = 2.1.0 +ZXING_CPP_VERSION = 2.2.1 ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 ZXING_CPP_LICENSE_FILES = LICENSE From 4c4afb415788efdb720b9a084af80b8a6bbfa12c Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 19 Jul 2024 14:50:26 +0000 Subject: [PATCH 2003/3013] boot/uboot: fix Kconfig warning for DEFAULT_ENV_FILE The following warning occurs from commit "boot/uboot: allow taking the entire default environment from a text file". boot/uboot/Config.in:141:warning: config symbol 'BR2_TARGET_UBOOT_DEFAULT_ENV_FILE' uses select, but is not bool or tristate Add a hidden 'bool' config so we can enable dependencies. In addition, the DEFAULT_ENV_FILE works by setting Kconfig options, therefore we also need to depend on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG. Signed-off-by: Brandon Maier Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 9 ++++++++- boot/uboot/uboot.mk | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 57aac06e205..c4d052595c3 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -136,9 +136,16 @@ config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES that will be merged to the main U-Boot configuration file. endif +# Hidden boolean that allows to select BR2_TARGET_UBOOT_NEEDS_XXD when +# needed. +config BR2_TARGET_UBOOT_DEFAULT_ENV_FILE_ENABLED + bool + default y if BR2_TARGET_UBOOT_DEFAULT_ENV_FILE != "" + select BR2_TARGET_UBOOT_NEEDS_XXD + config BR2_TARGET_UBOOT_DEFAULT_ENV_FILE string "Text file with default environment" - select BR2_TARGET_UBOOT_NEEDS_XXD + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG help Text file containing the variables to be used as the default environment in U-Boot. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 6cc87b35d3d..45ad1c880f7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -391,8 +391,8 @@ UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig # time, so use HOSTCC_NOCCACHE. UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS="" +ifeq ($(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE_ENABLED),y) UBOOT_DEFAULT_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE)) -ifneq ($(UBOOT_DEFAULT_ENV_FILE),) define UBOOT_KCONFIG_DEFAULT_ENV_FILE $(call KCONFIG_SET_OPT,CONFIG_USE_DEFAULT_ENV_FILE,y) $(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENV_FILE,"$(shell readlink -f $(UBOOT_DEFAULT_ENV_FILE))") From a1a2f498d7ecdd643b5c057f1c737e082a105384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 19 Jul 2024 17:27:19 +0200 Subject: [PATCH 2004/3013] package/Makefile.in: ban textrels on musl toolchains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit musl-libc doesn't support TEXTRELs[1] and programs with TEXTRELs will crash on start-up under musl. This patch forbids the use of TEXTRELs on musl toolchains with dynamic linking. To verify this patch: - Delete package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch - Build micropython (before v1.23) with a musl toolchain and BR2_SHARED_LIBS. The build should abort while linking micropython. [1]: https://www.openwall.com/lists/musl/2020/09/25/4 Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index 47a89f1ae1f..1cedfefa7e7 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -149,6 +149,15 @@ endif TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) +# musl's dynamic loader doesn't support DT_TEXTREL, which results in a runtime +# crash if it gets used. The "-z text" linker option issues a build-time error +# when DT_TEXREL is used, so we capture the problem earlier. +# +# See also: https://www.openwall.com/lists/musl/2020/09/25/4 +ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_STATIC_LIBS),y:) +TARGET_LDFLAGS += -Wl,-z,text +endif + # By design, _FORTIFY_SOURCE requires gcc optimization to be enabled. # Therefore, we need to pass _FORTIFY_SOURCE and the optimization level # through the same mechanism, i.e currently through CFLAGS. Passing From 5ed1fab018db9a001b072fd7bcb3dd3db280aabe Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 15 Jul 2024 14:50:40 +0000 Subject: [PATCH 2005/3013] support/testing: fix TestInitSystemNone for non-login shell This test started failing at commit 0cad947b964be5612a182413da136fcf0dc5a1f2 "support/testing/infra/emulator.py: fix qemu prompt detection" with the error message AttributeError: 'NoneType' object has no attribute 'run_command' This is because we changed emulator.run() so that emulator.login() must be called first. But this test skips the login and goes directly to a shell. Use the new emulator.connect_shell() function which prepares the shell without logging in. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- support/testing/tests/init/test_none.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/support/testing/tests/init/test_none.py b/support/testing/tests/init/test_none.py index fc4a46efd9c..5bfcc3d5c9a 100644 --- a/support/testing/tests/init/test_none.py +++ b/support/testing/tests/init/test_none.py @@ -18,10 +18,8 @@ def test_run(self): if index != 0: self.emulator.logfile.write("==> System does not boot") raise SystemError("System does not boot") - index = self.emulator.qemu.expect(["#", pexpect.TIMEOUT], timeout=60) - if index != 0: - self.emulator.logfile.write("==> System does not boot") - raise SystemError("System does not boot") + + self.emulator.connect_shell() out, exit_code = self.emulator.run("sh -c 'echo $PPID'") self.assertEqual(exit_code, 0) From 95e10430131fb524a27985b82ee70ae8d0fe71d9 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 15 Jul 2024 14:50:39 +0000 Subject: [PATCH 2006/3013] support/testing/infra/emulator.py: support init=/bin/sh The TestInitSystemNone bypasses the normal init and instead launches directly into a shell. So it needs to bypass the login code and go directly to a shell. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- support/testing/infra/emulator.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 950843e37d5..be26d4caa4e 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -133,6 +133,9 @@ def login(self, password=None, timeout=60): self.qemu.expect("Password:") self.qemu.sendline(password) + self.connect_shell() + + def connect_shell(self): extra_init_cmd = " && ".join([ 'export PAGER=cat', 'dmesg -n 1', From f17fa2c905845c5a9c5aa55866cd44af176e558a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Mon, 22 Jul 2024 18:57:16 +0200 Subject: [PATCH 2007/3013] package/zfs: fix uClibc support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update addresses the issue of uClibc support by skipping ZFS tests that require SEEK_DATA support. This is a work-in-progress patch while we wait for an upstream fix. Current upstream efforts can be followed here: https://github.com/openzfs/zfs/pull/16169 Context: - OpenZFS includes a test for a bug that occurs when copying a large number of PUNCHED files. - OpenZFS has backported this test to v2.2.x. - uClibc does not support SEEK_DATA and SEEK_HOLE. - The ZFS test `cp_stress` can not be compiled using uClibc. This commit fix: - https://gitlab.com/buildroot.org/buildroot/-/jobs/7391793226 Signed-off-by: José Luis Salvador Rufo Signed-off-by: Thomas Petazzoni --- ...s-ignore-if-SEEK_DATA-is-not-defined.patch | 162 ++++++++++++++++++ package/zfs/zfs.mk | 2 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch diff --git a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch new file mode 100644 index 00000000000..f47c615d109 --- /dev/null +++ b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch @@ -0,0 +1,162 @@ +From 93e7f8889072047276da11fe6a525d3f0ea16205 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= + +Date: Sat, 11 May 2024 22:40:12 +0200 +Subject: [PATCH] tests/cp_files: ignore if SEEK_DATA is not defined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case +cp_files if SEEK_DATA is not defined. + +Signed-off-by: José Luis Salvador Rufo +Upstream: https://github.com/openzfs/zfs/pull/16169 +--- + config/user-unistd.m4 | 24 ++++++++++++++++++++++++ + config/user.m4 | 1 + + config/zfs-build.m4 | 1 + + tests/test-runner/bin/zts-report.py.in | 1 + + tests/zfs-tests/Makefile.am | 2 ++ + tests/zfs-tests/cmd/Makefile.am | 6 +++++- + tests/zfs-tests/tests/Makefile.am | 14 +++++++++----- + 7 files changed, 43 insertions(+), 6 deletions(-) + create mode 100644 config/user-unistd.m4 + +diff --git a/config/user-unistd.m4 b/config/user-unistd.m4 +new file mode 100644 +index 000000000..302bc0bde +--- /dev/null ++++ b/config/user-unistd.m4 +@@ -0,0 +1,24 @@ ++dnl # ++dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case. ++dnl # ++AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [ ++ AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA) ++ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++ #ifndef _GNU_SOURCE ++ #define _GNU_SOURCE ++ #endif ++ #include ++ #if defined(SEEK_DATA) ++ int ok; ++ #else ++ error fail ++ #endif ++ ]])], [ ++ user_unistd_seek_data=yes ++ AC_MSG_RESULT([yes]) ++ ], [ ++ user_unistd_seek_data=no ++ AC_MSG_RESULT([no]) ++ ]) ++]) +diff --git a/config/user.m4 b/config/user.m4 +index 6ec27a5b2..2326a44be 100644 +--- a/config/user.m4 ++++ b/config/user.m4 +@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ + ZFS_AC_CONFIG_USER_LIBAIO + ZFS_AC_CONFIG_USER_LIBATOMIC + ZFS_AC_CONFIG_USER_LIBFETCH ++ ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA + ZFS_AC_CONFIG_USER_AIO_H + ZFS_AC_CONFIG_USER_CLOCK_GETTIME + ZFS_AC_CONFIG_USER_PAM +diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 +index bb5a85d81..578692676 100644 +--- a/config/zfs-build.m4 ++++ b/config/zfs-build.m4 +@@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ + [test "x$qatsrc" != x ]) + AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) + AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) ++ AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ]) + AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) + ]) + +diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in +index ecc50f487..3a00345ed 100755 +--- a/tests/test-runner/bin/zts-report.py.in ++++ b/tests/test-runner/bin/zts-report.py.in +@@ -162,6 +162,7 @@ known = { + ['FAIL', rewind_reason], + 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], + 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], ++ 'cp_files/cp_stress': ['SKIP', 16169], + 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], + 'privilege/setup': ['SKIP', na_reason], + 'refreserv/refreserv_004_pos': ['FAIL', known_reason], +diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am +index 3dd1a6452..8ae790057 100644 +--- a/tests/zfs-tests/Makefile.am ++++ b/tests/zfs-tests/Makefile.am +@@ -13,8 +13,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test + %C%_tests_functional_hkdf_hkdf_test_LDADD = \ + libzpool.la + ++if WANT_UNISTD_SEEK_DATA + scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files + scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood ++endif + + if BUILD_LINUX + scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile +diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am +index 23848a82f..69bba3039 100644 +--- a/tests/zfs-tests/cmd/Makefile.am ++++ b/tests/zfs-tests/cmd/Makefile.am +@@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec + scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile + scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached + scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write +-scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files + scripts_zfs_tests_bin_PROGRAMS += %D%/ctime + scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update + scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write +@@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test + scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket + + ++if WANT_UNISTD_SEEK_DATA ++scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files ++endif ++ ++ + scripts_zfs_tests_bin_PROGRAMS += %D%/badsend + %C%_badsend_LDADD = \ + libzfs_core.la \ +diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am +index cc66d762f..1e9f06a7e 100644 +--- a/tests/zfs-tests/tests/Makefile.am ++++ b/tests/zfs-tests/tests/Makefile.am +@@ -1394,11 +1394,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ + functional/compression/l2arc_encrypted.ksh \ + functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ + functional/compression/setup.ksh \ +- functional/cp_files/cleanup.ksh \ +- functional/cp_files/cp_files_001_pos.ksh \ +- functional/cp_files/cp_files_002_pos.ksh \ +- functional/cp_files/cp_stress.ksh \ +- functional/cp_files/setup.ksh \ + functional/crtime/cleanup.ksh \ + functional/crtime/crtime_001_pos.ksh \ + functional/crtime/setup.ksh \ +@@ -2108,3 +2103,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ + functional/idmap_mount/idmap_mount_003.ksh \ + functional/idmap_mount/idmap_mount_004.ksh \ + functional/idmap_mount/idmap_mount_005.ksh ++ ++if WANT_UNISTD_SEEK_DATA ++nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ ++ functional/cp_files/cleanup.ksh \ ++ functional/cp_files/cp_files_001_pos.ksh \ ++ functional/cp_files/cp_files_002_pos.ksh \ ++ functional/cp_files/cp_stress.ksh \ ++ functional/cp_files/setup.ksh ++endif +-- +2.45.2 + diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index fa6d282f8c3..e0fa3926704 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,7 +12,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-config-user-check-for-aio.h.patch +# 0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch ZFS_AUTORECONF = YES ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux From b09ae4f0454105afd2b41b2a49f4682d9ee57769 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Apr 2024 13:31:20 +0200 Subject: [PATCH 2008/3013] support/testing: add 4th runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_4th.py | 55 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 support/testing/tests/package/test_4th.py diff --git a/DEVELOPERS b/DEVELOPERS index 65dc7e6bddf..a1e6a74600e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1830,6 +1830,7 @@ F: support/testing/tests/package/sample_python_mpmath.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/sample_python_sympy.py +F: support/testing/tests/package/test_4th.py F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ diff --git a/support/testing/tests/package/test_4th.py b/support/testing/tests/package/test_4th.py new file mode 100644 index 00000000000..c020c825b31 --- /dev/null +++ b/support/testing/tests/package/test_4th.py @@ -0,0 +1,55 @@ +import os +from math import sqrt + +import infra.basetest + + +class Test4th(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_4TH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We set the DIR4TH variable where 4th demos and libraries are + # installed. + self.assertRunOk("export DIR4TH=/usr/share/4th/") + + # We run a simple "hello world" demo. + out, ret = self.emulator.run("4th cxq demo/hello.4th") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello world!") + + # We run a demo doing some square root maths. + out, ret = self.emulator.run("4th cxq demo/squares.4th") + self.assertEqual(ret, 0) + self.assertTrue(len(out) > 1) + for line in out[1:]: + columns = line.split() + value = float(columns[0]) + value_sqrt = float(columns[1]) + result_check = sqrt(value) + self.assertAlmostEqual(value_sqrt, result_check, delta=0.1) + + # We run a word count demo and the 4th source file. We save + # the word count for a later check. + out, ret = self.emulator.run("4th cxq wc.4th /usr/share/4th/wc.4th") + self.assertEqual(ret, 0) + wc_out = out[0].split() + + # We run the same command using system "wc" command. We expect + # the same numbers. + out, ret = self.emulator.run("wc /usr/share/4th/wc.4th") + self.assertEqual(ret, 0) + self.assertEqual(out[0].split(), wc_out) + + # We run a slightly more complex computation example. + self.assertRunOk("4th cxq fractals.4th") From 2dc37e5c5b216b2e93f05c015a16a52b9402693f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 14 May 2024 12:36:29 +0200 Subject: [PATCH 2009/3013] package/hostapd: drop duplicate host-pkgconf dependency host-pkgconf already defined as dependency in package ingress. Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/hostapd/hostapd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 8981d9247e4..5756510e1dd 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -25,7 +25,7 @@ HOSTAPD_CONFIG_DISABLE = # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -HOSTAPD_DEPENDENCIES += host-pkgconf libopenssl +HOSTAPD_DEPENDENCIES += libopenssl HOSTAPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' else From a6c3222f89c29e13ba5b188dd0b1b90b8555302b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 22 Jul 2024 19:48:46 +0200 Subject: [PATCH 2010/3013] package/kodi-pvr-stalker: bump version to 21.1.1-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index fe5af447df5..2bed6159fff 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e6fdf2d3654d267135bff45c94d72b4c82b10483dbb46600a8e0df4b0676746 kodi-pvr-stalker-21.1.0-Omega.tar.gz +sha256 61b76dd9917577fdf63078c552ae96b497167fd78e5524e056c77bbf3699634d kodi-pvr-stalker-21.1.1-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index 0714dd8d782..9ae5ee9fe08 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 21.1.0-Omega +KODI_PVR_STALKER_VERSION = 21.1.1-Omega KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md From a1230d443373d42601cec1db1caa3d2694777214 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 22 Jul 2024 19:48:47 +0200 Subject: [PATCH 2011/3013] package/kodi-pvr-waipu: bump version to 21.8.6-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 0ceb3446571..3a78f23b350 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd394177247bb7ad24160246e0c368e946d0205ce3284a55f0dacd2d31d51bff kodi-pvr-waipu-21.8.4-Omega.tar.gz +sha256 11819542b32a8dc9a4b6f5cc2fb98153298be1156bbf36a1b2aaf569be9842ab kodi-pvr-waipu-21.8.6-Omega.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index 2a03bcb2c97..15a25a871a7 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 21.8.4-Omega +KODI_PVR_WAIPU_VERSION = 21.8.6-Omega KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt From 5206e1dba2ccb8e65fc960362017c72799b0e5df Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 27 Jun 2024 22:53:32 +0200 Subject: [PATCH 2012/3013] package/am335x-pru-package: fix download issue am335x-pru-package is downloaded with the github helper, so the tarball is generated "on-the-fly" by github. It looks like the process to generate those tarballs has changed, again. The hash for the archive has recently changed. The delta is in the way directories are stored in the tarball: it looks like the "basename" of the directory path has been split off from the "dirname", into a separate field: @@ -270078,8 +270078,8 @@ 0041efd0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041efe0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041eff0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +0041f000 50 52 55 5f 50 52 55 74 6f 50 52 55 5f 49 6e 74 |PRU_PRUtoPRU_Int| +0041f010 65 72 72 75 70 74 2f 00 00 00 00 00 00 00 00 00 |errupt/.........| 0041f020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| @@ -270104,8 +270104,8 @@ 0041f170 34 61 64 35 37 63 63 31 39 35 66 32 38 62 66 35 |4ad57cc195f28bf5| 0041f180 65 35 38 35 63 33 64 34 34 36 61 62 61 36 65 65 |e585c3d446aba6ee| 0041f190 37 30 39 36 2f 70 72 75 5f 73 77 2f 65 78 61 6d |7096/pru_sw/exam| -0041f1a0 70 6c 65 5f 61 70 70 73 2f 50 52 55 5f 50 52 55 |ple_apps/PRU_PRU| -0041f1b0 74 6f 50 52 55 5f 49 6e 74 65 72 72 75 70 74 00 |toPRU_Interrupt.| +0041f1a0 70 6c 65 5f 61 70 70 73 00 00 00 00 00 00 00 00 |ple_apps........| +0041f1b0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1d0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| Switch to using a git download, which uses our reproducible way of generating archives. Once extracted, the files have been verified to be identical to the ones in the archive on s.b.o. Signed-off-by: Yann E. MORIN Cc: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/am335x-pru-package/am335x-pru-package.hash | 2 +- package/am335x-pru-package/am335x-pru-package.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/am335x-pru-package/am335x-pru-package.hash b/package/am335x-pru-package/am335x-pru-package.hash index ad386fe04be..157fa566eb8 100644 --- a/package/am335x-pru-package/am335x-pru-package.hash +++ b/package/am335x-pru-package/am335x-pru-package.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz +sha256 bd90d57d210c2ec1835d701c5d12e228801cb41afebf591e2c146a4dc49c296f am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096-git4.tar.gz sha256 f0fcdf9b2090896389eb4b784f23be96d5544c5ce5282d84f82ae9a8e8331beb pru_sw/utils/LICENCE.txt diff --git a/package/am335x-pru-package/am335x-pru-package.mk b/package/am335x-pru-package/am335x-pru-package.mk index 24a5df4815a..9c65ee13873 100644 --- a/package/am335x-pru-package/am335x-pru-package.mk +++ b/package/am335x-pru-package/am335x-pru-package.mk @@ -5,7 +5,8 @@ ################################################################################ AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096 -AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION)) +AM335X_PRU_PACKAGE_SITE = https://github.com/beagleboard/am335x_pru_package +AM335X_PRU_PACKAGE_SITE_METHOD = git AM335X_PRU_PACKAGE_LICENSE = BSD-3-Clause AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt AM335X_PRU_PACKAGE_DEPENDENCIES = host-am335x-pru-package From a10979754ffbf41b2fb09da934213b60065c26ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Fri, 23 Feb 2024 17:13:53 -0300 Subject: [PATCH 2013/3013] =?UTF-8?q?DEVELOPERS:=20add=20Fl=C3=A1vio=20Tap?= =?UTF-8?q?aj=C3=B3s=20for=20python-paho-mqtt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index a1e6a74600e..3650321d6f6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1112,6 +1112,7 @@ F: package/python-pyasyncore/ N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/python-paho-mqtt/ F: package/python-sqlalchemy/ F: package/rsyslog/ From 0d582054e131bb6e13d27b2bdfc76a1a30067775 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 13:37:52 +0100 Subject: [PATCH 2014/3013] package/python-can/Config.in: sort selects Sort python builtin modules before external python libs. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-can/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index a00c9263cff..61955a2b00b 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. From b16821b9e268804d190e4f71143b7cb4d7a530f2 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 28 Jun 2024 09:12:27 -0700 Subject: [PATCH 2015/3013] package/containerd: bump version to v1.7.18 https://github.com/containerd/containerd/releases/tag/v1.7.18 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (cherry picked from commit 4e01942d83c57ce4973e549afa4735a52394de35) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 1b2609e880d..03964ace3f1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 containerd-1.7.14-go2.tar.gz +sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 containerd-1.7.18-go2.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 81875f763c0..b8225169389 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.14 +CONTAINERD_VERSION = 1.7.18 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From ce8793f80a56a95a8c64dced14e818903c5734cc Mon Sep 17 00:00:00 2001 From: Lance Fredrickson Date: Mon, 22 Jul 2024 15:23:05 -0600 Subject: [PATCH 2016/3013] package/hostapd: bump version to 2.11 Update hostapd to the latest release v2.11. Enable 802.11be support. Drop patch as it has been upstreamed. README's copyright year was updated. Signed-off-by: Lance Fredrickson Signed-off-by: Thomas Petazzoni --- ...ic-name-for-IEEE802.11-CRC-32-routin.patch | 102 ------------------ package/hostapd/hostapd.hash | 4 +- package/hostapd/hostapd.mk | 3 +- 3 files changed, 4 insertions(+), 105 deletions(-) delete mode 100644 package/hostapd/0001-use-a-less-generic-name-for-IEEE802.11-CRC-32-routin.patch diff --git a/package/hostapd/0001-use-a-less-generic-name-for-IEEE802.11-CRC-32-routin.patch b/package/hostapd/0001-use-a-less-generic-name-for-IEEE802.11-CRC-32-routin.patch deleted file mode 100644 index bf85e97f21c..00000000000 --- a/package/hostapd/0001-use-a-less-generic-name-for-IEEE802.11-CRC-32-routin.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 9896d8c116f054cebc49928404018a75c9b892cb Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich -Date: Fri, 16 Sep 2022 23:18:50 +0300 -Subject: [PATCH] hostapd: use a less generic name for IEEE802.11 CRC-32 routine - -Hostapd uses 'crc32' name for IEEE802.11 CRC-32 routine. This name is -too generic. Buildroot autobuilder detected build configuration that -failed to build due to the naming conflict: static linking with openssl -using zlib-ng as a zlib provider, e.g. see: -- http://autobuild.buildroot.net/results/9901df820d3afa4cde78e8ad6d62cb8ce7e69fdb/ -- http://autobuild.buildroot.net/results/ac19975f0bf77f4a8ca574c374092ba81cd5a332/ - -Use a less generic name ieee80211_crc32 for IEEE802.11 CRC-32 routine -to avoid such naming conflicts. - -Upstream: https://w1.fi/cgit/hostap/commit/?id=0c7b3814ca6070a8e930dea09fde08b4058a4ca6 -Signed-off-by: Sergey Matyukevich ---- - hostapd/config_file.c | 4 ++-- - src/ap/hostapd.c | 3 ++- - src/ap/neighbor_db.c | 2 +- - src/utils/crc32.c | 2 +- - src/utils/crc32.h | 2 +- - 5 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/hostapd/config_file.c b/hostapd/config_file.c -index b14728d1b..b38a84647 100644 ---- a/hostapd/config_file.c -+++ b/hostapd/config_file.c -@@ -2407,7 +2407,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, - } - os_memcpy(ssid->ssid, pos, ssid->ssid_len); - ssid->ssid_set = 1; -- ssid->short_ssid = crc32(ssid->ssid, ssid->ssid_len); -+ ssid->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); - } else if (os_strcmp(buf, "ssid2") == 0) { - struct hostapd_ssid *ssid = &bss->ssid; - size_t slen; -@@ -2421,7 +2421,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, - os_memcpy(ssid->ssid, str, slen); - ssid->ssid_len = slen; - ssid->ssid_set = 1; -- ssid->short_ssid = crc32(ssid->ssid, ssid->ssid_len); -+ ssid->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); - os_free(str); - } else if (os_strcmp(buf, "utf8_ssid") == 0) { - bss->ssid.utf8_ssid = atoi(pos) > 0; -diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c -index 4b88641a2..56c8fb90e 100644 ---- a/src/ap/hostapd.c -+++ b/src/ap/hostapd.c -@@ -1230,7 +1230,8 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first) - * Short SSID calculation is identical to FCS and it is defined in - * IEEE P802.11-REVmd/D3.0, 9.4.2.170.3 (Calculating the Short-SSID). - */ -- conf->ssid.short_ssid = crc32(conf->ssid.ssid, conf->ssid.ssid_len); -+ conf->ssid.short_ssid = ieee80211_crc32(conf->ssid.ssid, -+ conf->ssid.ssid_len); - - if (!hostapd_drv_none(hapd)) { - wpa_printf(MSG_DEBUG, "Using interface %s with hwaddr " MACSTR -diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c -index 229edd2a9..ef17634c3 100644 ---- a/src/ap/neighbor_db.c -+++ b/src/ap/neighbor_db.c -@@ -136,7 +136,7 @@ int hostapd_neighbor_set(struct hostapd_data *hapd, const u8 *bssid, - - os_memcpy(entry->bssid, bssid, ETH_ALEN); - os_memcpy(&entry->ssid, ssid, sizeof(entry->ssid)); -- entry->short_ssid = crc32(ssid->ssid, ssid->ssid_len); -+ entry->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); - - entry->nr = wpabuf_dup(nr); - if (!entry->nr) -diff --git a/src/utils/crc32.c b/src/utils/crc32.c -index 12d9e2a70..371254994 100644 ---- a/src/utils/crc32.c -+++ b/src/utils/crc32.c -@@ -72,7 +72,7 @@ static const u32 crc32_table[256] = { - }; - - --u32 crc32(const u8 *frame, size_t frame_len) -+u32 ieee80211_crc32(const u8 *frame, size_t frame_len) - { - size_t i; - u32 crc; -diff --git a/src/utils/crc32.h b/src/utils/crc32.h -index dc31399be..71a19dc5f 100644 ---- a/src/utils/crc32.h -+++ b/src/utils/crc32.h -@@ -9,6 +9,6 @@ - #ifndef CRC32_H - #define CRC32_H - --u32 crc32(const u8 *frame, size_t frame_len); -+u32 ieee80211_crc32(const u8 *frame, size_t frame_len); - - #endif /* CRC32_H */ --- -2.37.1 - diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index 4e130d01caf..7921586172a 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d hostapd-2.10.tar.gz -sha256 af01e1d1ee065a1054d20ebe8a78a016f1fb1133b73e6a9d50801b165bb280c7 README +sha256 2b3facb632fd4f65e32f4bf82a76b4b72c501f995a4f62e330219fe7aed1747a hostapd-2.11.tar.gz +sha256 f1b5992bbdd015c3ccb7faaadd62ef58ed821e15b9329bf2ceb27511ccc3f562 README diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 5756510e1dd..3eda1c7e83b 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOSTAPD_VERSION = 2.10 +HOSTAPD_VERSION = 2.11 HOSTAPD_SITE = http://w1.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config @@ -53,6 +53,7 @@ endif ifeq ($(BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS),y) HOSTAPD_CONFIG_ENABLE += \ CONFIG_HS20 \ + CONFIG_IEEE80211BE \ CONFIG_IEEE80211AX \ CONFIG_IEEE80211AC \ CONFIG_IEEE80211N \ From 2822fdd0bc2a961544e38cf0f8c6f4bd22855714 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 00:09:22 +0200 Subject: [PATCH 2017/3013] package/coreutils: fix glibc build with gcc >= 14 ac_cv_func_strerror_r_char_p is hardcoded to no since commit 74b9bf9945921a7b0504b4b546a4bc26f2adcc45 back in 2005 however strerror_r only returns an int with musl. With glibc or uclibc, strerror_r returns a char* or an int depending on _GNU_SOURCE value resulting in the following build failure with gcc >= 14: strerror_r.c: In function 'rpl_strerror_r': strerror_r.c:207:9: error: assignment to 'int' from 'char *' makes integer from pointer without a cast [-Wint-conversion] 207 | ret = strerror_r (errnum, buf, buflen); | ^ To fix this build failure, don't hardcode ac_cv_func_strerror_r_char_p to let coreutils pick the correct value Fixes: - http://autobuild.buildroot.org/results/8bc649ca5490b0c29c90383edfa2e693f154ebc4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/coreutils/coreutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 846d4fa5672..89f494310e7 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -27,7 +27,6 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ ac_cv_func_getgroups=yes \ ac_cv_func_getgroups_works=yes \ ac_cv_func_getloadavg=no \ - ac_cv_func_strerror_r_char_p=no \ ac_cv_func_strnlen_working=yes \ ac_cv_have_decl_strerror_r=yes \ ac_cv_have_decl_strnlen=yes \ From 49156a0fa4a48d5d80f03c3854f631f312b486d4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 23 Jul 2024 00:39:22 +0200 Subject: [PATCH 2018/3013] support/testing: package: gpsd: fix gpsfake command line The gpsfake command line has a typo (a missing space), which makes the next gpsctl command to always fail. This commit fixes the issue by adding the missing space. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7391792948 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_gpsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index deed586c17b..7ca59739814 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -33,7 +33,7 @@ def test_run(self): # We start the "gpsfake" GPS emulator instead. cmd = "gpsfake" cmd += " --slow --cycle 0.1 --quiet" - cmd += "/root/udp-nmea.log &> /dev/null &" + cmd += " /root/udp-nmea.log &> /dev/null &" self.assertRunOk(cmd) # Wait a bit, to let the gpsfake and gpsd to settle... From e30d507cbb42e9f061aac93310aef98a02d06eca Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Mon, 22 Jul 2024 20:32:06 -0500 Subject: [PATCH 2019/3013] boot/optee-os: bump to 4.3.0 Update OP-TEE to its latest tag Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 4 ++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 78706297325..2f996cbafce 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "4.2.0" + bool "4.3.0" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help @@ -70,7 +70,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "4.2.0" if BR2_TARGET_OPTEE_OS_LATEST + default "4.3.0" if BR2_TARGET_OPTEE_OS_LATEST default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 663640b2cec..16b3d7430e0 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/4.2.0/optee-os-4.2.0.tar.gz -sha256 ce70f0d177001bf4855cd6cd6396f515af6126e4bba9b12c716a437a5cb40c7b optee-os-4.2.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/4.3.0/optee-os-4.3.0.tar.gz +sha256 390b271905c828d6def9fa6a77bbaa425f3b434d733c8eb18f582ccbc6896096 optee-os-4.3.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From 280a045705a065bd67114e31561209ffd0e1ba90 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Mon, 22 Jul 2024 20:32:07 -0500 Subject: [PATCH 2020/3013] package/optee-client: bump to 4.3.0 Bump to the latest version of optee-client Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index b0c6dfcb5e1..8904c930ee6 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/4.2.0/optee-client-4.2.0.tar.gz -sha256 ba0dad79cec2dabb7b6a6d3e391804f0184863ee9810e90bf97a392d3c1ad5eb optee-client-4.2.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/4.3.0/optee-client-4.3.0.tar.gz +sha256 a9a91bdb433df795c87a6d15198effbd648e3671ae611f2a3f8b41229d61cce0 optee-client-4.3.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 6600a9c4fc9..c1813cd9b11 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 4.2.0 +OPTEE_CLIENT_VERSION = 4.3.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE From 74b62df953b3bb6be469c7659a4ef2aa67cd6cfb Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Mon, 22 Jul 2024 20:32:08 -0500 Subject: [PATCH 2021/3013] package/optee-examples: bump to 4.3.0 Update optee-examples to the latest tagged release Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index a60b6619f14..a6ecd2caec5 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/4.2.0/optee-examples-4.2.0.tar.gz -sha256 fcc032f84c0c7c90fbc3936c6d4d10e502797da7a7c23780ce2a5a88a720887d optee-examples-4.2.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/4.3.0/optee-examples-4.3.0.tar.gz +sha256 ee1576617365b5fe9d20d72c16cf6b39159eb79b1401189bd37a91ef03371820 optee-examples-4.3.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 7d52a277d2b..8eb8724ff62 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 4.2.0 +OPTEE_EXAMPLES_VERSION = 4.3.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE From eed618fc76e59bc99680d193f5d4cb94e44a693f Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Mon, 22 Jul 2024 20:32:09 -0500 Subject: [PATCH 2022/3013] package/optee-test: bump to 4.3.0 Update optee-test to the latest tagged release Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 269b7a31655..5922487a627 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/4.2.0/optee-test-4.2.0.tar.gz -sha256 e976d3dccf38947d79e358a0385b581fc3d48efa10b6eebd3b3b048facb1235d optee-test-4.2.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/4.3.0/optee-test-4.3.0.tar.gz +sha256 7bb181b74be88593df48321b816837acaad8e4d45e883f25a2e039978e5ec415 optee-test-4.3.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 69e84fdbd2f..9037678b1d9 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 4.2.0 +OPTEE_TEST_VERSION = 4.3.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md From 618aaf07af50bdf302c88716a8ff15d3aec3f024 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 10:16:37 +0200 Subject: [PATCH 2023/3013] package/fluent-bit: bump to version 3.1.3 - Rebase second patch - This bump will fix the following build failure with gcc >= 14 thanks to https://github.com/fluent/fluent-bit/commit/1f8a672dbd8121ff5fbbd955dfbdda7cf4357fd7: In file included from /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/flb_tls.c:24: /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/openssl.c: In function 'tls_context_server_alpn_select_callback': /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/openssl.c:220:40: error: passing argument 1 of 'SSL_select_next_proto' from incompatible pointer type [-Wincompatible-pointer-types] 220 | result = SSL_select_next_proto(out, | ^~~ | | | const unsigned char ** https://fluentbit.io/announcements/v3.1.3/ https://fluentbit.io/announcements/v3.1.2/ https://fluentbit.io/announcements/v3.1.1/ https://fluentbit.io/announcements/v3.1.0/ https://fluentbit.io/announcements/v3.0.7/ https://fluentbit.io/announcements/v3.0.6/ https://fluentbit.io/announcements/v3.0.5/ Fixes: - http://autobuild.buildroot.org/results/8f9fcc0ec9c915a40fe402d7c643fa83f7f6a261 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...fka-CMakeLists.txt-allow-compilation-with.patch | 14 ++++++++------ package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch index bcfe3ea8591..fd3d9ce7223 100644 --- a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch +++ b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch @@ -9,15 +9,17 @@ e.g. fluent-bit is a c-only library, so allow compilation without cxx Upstream: https://github.com/confluentinc/librdkafka/pull/4366 Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt +[Fabrice: update for 3.1.3] +Signed-off-by: Fabrice Fontaine --- lib/librdkafka-2.3.0/CMakeLists.txt | 18 ++++++++++-- lib/librdkafka-2.3.0/examples/CMakeLists.txt | 31 +++++++++++++------- 2 files changed, 35 insertions(+), 14 deletions(-) -diff --git a/lib/librdkafka-2.3.0/CMakeLists.txt b/lib/librdkafka-2.3.0/CMakeLists.txt +diff --git a/lib/librdkafka-2.4.0/CMakeLists.txt b/lib/librdkafka-2.4.0/CMakeLists.txt index 7f3dd0fc6..c1ee93062 100644 ---- a/lib/librdkafka-2.3.0/CMakeLists.txt -+++ b/lib/librdkafka-2.3.0/CMakeLists.txt +--- a/lib/librdkafka-2.4.0/CMakeLists.txt ++++ b/lib/librdkafka-2.4.0/CMakeLists.txt @@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2) include("packaging/cmake/parseversion.cmake") parseversion("src/rdkafka.h") @@ -57,10 +59,10 @@ index 7f3dd0fc6..c1ee93062 100644 if(RDKAFKA_BUILD_EXAMPLES) add_subdirectory(examples) -diff --git a/lib/librdkafka-2.3.0/examples/CMakeLists.txt b/lib/librdkafka-2.3.0/examples/CMakeLists.txt +diff --git a/lib/librdkafka-2.4.0/examples/CMakeLists.txt b/lib/librdkafka-2.4.0/examples/CMakeLists.txt index 8c0079abe..c9336b729 100644 ---- a/lib/librdkafka-2.3.0/examples/CMakeLists.txt -+++ b/lib/librdkafka-2.3.0/examples/CMakeLists.txt +--- a/lib/librdkafka-2.4.0/examples/CMakeLists.txt ++++ b/lib/librdkafka-2.4.0/examples/CMakeLists.txt @@ -5,8 +5,10 @@ endif(WIN32) add_executable(producer producer.c ${win32_sources}) target_link_libraries(producer PUBLIC rdkafka) diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 6fcf4fac3e7..a3dbf5f5448 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b439f89e879e538849e9106fe450bcf58da5034dfc316af4d2a837423786ed11 fluent-bit-3.0.4.tar.gz +sha256 4c745066223811047e3911c19db118eadec579ca62ef833a1b1fb573acd8cb85 fluent-bit-3.1.3.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13bd4ddecb1..5463682e454 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 3.0.4 +FLUENT_BIT_VERSION = 3.1.3 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From e996d399b82aac7ebd7565bd33afe4d1b3635395 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 10:02:50 +0200 Subject: [PATCH 2024/3013] package/fluent-bit: renumber patch Commit 94e072849e6c86a8c75402b1e600642673ebfb57 forgot to renumber latest patch Fixes: 94e072849e6c86a8c75402b1e600642673ebfb57 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...04-Enhance-setting-write-gs-base-with-cmake-variable-30.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/fluent-bit/{0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch => 0004-Enhance-setting-write-gs-base-with-cmake-variable-30.patch} (100%) diff --git a/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch b/package/fluent-bit/0004-Enhance-setting-write-gs-base-with-cmake-variable-30.patch similarity index 100% rename from package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch rename to package/fluent-bit/0004-Enhance-setting-write-gs-base-with-cmake-variable-30.patch From b6f3278539216f55fb18ff7e63ce2da39ed0c3e1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 8 Jan 2024 23:01:23 -0700 Subject: [PATCH 2025/3013] package/python-autocommand: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-autocommand/Config.in | 6 ++++++ package/python-autocommand/python-autocommand.hash | 5 +++++ package/python-autocommand/python-autocommand.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-autocommand/Config.in create mode 100644 package/python-autocommand/python-autocommand.hash create mode 100644 package/python-autocommand/python-autocommand.mk diff --git a/package/Config.in b/package/Config.in index a0d78518b6c..3f60d2f037e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1009,6 +1009,7 @@ menu "External python modules" source "package/python-attrs/Config.in" source "package/python-augeas/Config.in" source "package/python-autobahn/Config.in" + source "package/python-autocommand/Config.in" source "package/python-automat/Config.in" source "package/python-avro/Config.in" source "package/python-babel/Config.in" diff --git a/package/python-autocommand/Config.in b/package/python-autocommand/Config.in new file mode 100644 index 00000000000..41533e644ec --- /dev/null +++ b/package/python-autocommand/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_AUTOCOMMAND + bool "python-autocommand" + help + A library to create a command-line program from a function. + + https://github.com/Lucretiel/autocommand diff --git a/package/python-autocommand/python-autocommand.hash b/package/python-autocommand/python-autocommand.hash new file mode 100644 index 00000000000..9513010d0eb --- /dev/null +++ b/package/python-autocommand/python-autocommand.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/autocommand/json +md5 0cab5141bad0dfb363b086e93fd4125e autocommand-2.2.2.tar.gz +sha256 878de9423c5596491167225c2a455043c3130fb5b7286ac83443d45e74955f34 autocommand-2.2.2.tar.gz +# Locally computed sha256 checksums +sha256 ade78d04982d69972d444a8e14a94f87a2334dd3855cc80348ea8e240aa0df2d LICENSE diff --git a/package/python-autocommand/python-autocommand.mk b/package/python-autocommand/python-autocommand.mk new file mode 100644 index 00000000000..37b421e4183 --- /dev/null +++ b/package/python-autocommand/python-autocommand.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-autocommand +# +################################################################################ + +PYTHON_AUTOCOMMAND_VERSION = 2.2.2 +PYTHON_AUTOCOMMAND_SOURCE = autocommand-$(PYTHON_AUTOCOMMAND_VERSION).tar.gz +PYTHON_AUTOCOMMAND_SITE = https://files.pythonhosted.org/packages/5b/18/774bddb96bc0dc0a2b8ac2d2a0e686639744378883da0fc3b96a54192d7a +PYTHON_AUTOCOMMAND_SETUP_TYPE = setuptools +PYTHON_AUTOCOMMAND_LICENSE = LGPL-3.0+ +PYTHON_AUTOCOMMAND_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From dece0a512daf03f20bcf9048e3f702da952b8546 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 8 Jan 2024 23:01:24 -0700 Subject: [PATCH 2026/3013] package/python-inflect: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-inflect/Config.in | 10 ++++++++++ package/python-inflect/python-inflect.hash | 5 +++++ package/python-inflect/python-inflect.mk | 15 +++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-inflect/Config.in create mode 100644 package/python-inflect/python-inflect.hash create mode 100644 package/python-inflect/python-inflect.mk diff --git a/package/Config.in b/package/Config.in index 3f60d2f037e..daf7206957b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1149,6 +1149,7 @@ menu "External python modules" source "package/python-idna/Config.in" source "package/python-ifaddr/Config.in" source "package/python-incremental/Config.in" + source "package/python-inflect/Config.in" source "package/python-inflection/Config.in" source "package/python-influxdb/Config.in" source "package/python-iniconfig/Config.in" diff --git a/package/python-inflect/Config.in b/package/python-inflect/Config.in new file mode 100644 index 00000000000..daf6bd4a323 --- /dev/null +++ b/package/python-inflect/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_INFLECT + bool "python-inflect" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_PYDANTIC # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + help + Correctly generate plurals, singular nouns, ordinals, + indefinite articles; convert numbers to words. + + https://github.com/jaraco/inflect diff --git a/package/python-inflect/python-inflect.hash b/package/python-inflect/python-inflect.hash new file mode 100644 index 00000000000..3faa4cc5a53 --- /dev/null +++ b/package/python-inflect/python-inflect.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/inflect/json +md5 61c670cf5c4d09314f6a4d3b99d3b98d inflect-7.0.0.tar.gz +sha256 63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e inflect-7.0.0.tar.gz +# Locally computed sha256 checksums +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-inflect/python-inflect.mk b/package/python-inflect/python-inflect.mk new file mode 100644 index 00000000000..cef4c066273 --- /dev/null +++ b/package/python-inflect/python-inflect.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-inflect +# +################################################################################ + +PYTHON_INFLECT_VERSION = 7.0.0 +PYTHON_INFLECT_SOURCE = inflect-$(PYTHON_INFLECT_VERSION).tar.gz +PYTHON_INFLECT_SITE = https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8 +PYTHON_INFLECT_SETUP_TYPE = setuptools +PYTHON_INFLECT_LICENSE = MIT +PYTHON_INFLECT_LICENSE_FILES = LICENSE +PYTHON_INFLECT_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From 0971cbddea49110619d73fec2b5d7b80184024f5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 8 Jan 2024 23:01:25 -0700 Subject: [PATCH 2027/3013] package/python-jaraco-context: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-jaraco-context/Config.in | 6 ++++++ .../python-jaraco-context.hash | 5 +++++ .../python-jaraco-context.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-jaraco-context/Config.in create mode 100644 package/python-jaraco-context/python-jaraco-context.hash create mode 100644 package/python-jaraco-context/python-jaraco-context.mk diff --git a/package/Config.in b/package/Config.in index daf7206957b..dbe3c8a495b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1166,6 +1166,7 @@ menu "External python modules" source "package/python-iwlib/Config.in" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" + source "package/python-jaraco-context/Config.in" source "package/python-jaraco-functools/Config.in" source "package/python-jc/Config.in" source "package/python-jedi/Config.in" diff --git a/package/python-jaraco-context/Config.in b/package/python-jaraco-context/Config.in new file mode 100644 index 00000000000..afdc8fa9407 --- /dev/null +++ b/package/python-jaraco-context/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_JARACO_CONTEXT + bool "python-jaraco-context" + help + Context managers by jaraco. + + https://github.com/jaraco/jaraco.context diff --git a/package/python-jaraco-context/python-jaraco-context.hash b/package/python-jaraco-context/python-jaraco-context.hash new file mode 100644 index 00000000000..f8daa913642 --- /dev/null +++ b/package/python-jaraco-context/python-jaraco-context.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jaraco.context/json +md5 b40aeeda6a07dd283f2a407f622cda5b jaraco.context-4.3.0.tar.gz +sha256 4dad2404540b936a20acedec53355bdaea223acb88fd329fa6de9261c941566e jaraco.context-4.3.0.tar.gz +# Locally computed sha256 checksums +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-jaraco-context/python-jaraco-context.mk b/package/python-jaraco-context/python-jaraco-context.mk new file mode 100644 index 00000000000..668855c98a2 --- /dev/null +++ b/package/python-jaraco-context/python-jaraco-context.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-jaraco-context +# +################################################################################ + +PYTHON_JARACO_CONTEXT_VERSION = 4.3.0 +PYTHON_JARACO_CONTEXT_SOURCE = jaraco.context-$(PYTHON_JARACO_CONTEXT_VERSION).tar.gz +PYTHON_JARACO_CONTEXT_SITE = https://files.pythonhosted.org/packages/7c/b4/fa71f82b83ebeed95fe45ce587d6cba85b7c09ef3d9f61602f92f45e90db +PYTHON_JARACO_CONTEXT_SETUP_TYPE = setuptools +PYTHON_JARACO_CONTEXT_LICENSE = MIT +PYTHON_JARACO_CONTEXT_LICENSE_FILES = LICENSE +PYTHON_JARACO_CONTEXT_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From 591f6d108bbb3df288a473393abdab511b56b6dc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 8 Jan 2024 23:01:26 -0700 Subject: [PATCH 2028/3013] package/python-jaraco-text: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-jaraco-text/Config.in | 12 ++++++++++++ .../python-jaraco-text/python-jaraco-text.hash | 5 +++++ package/python-jaraco-text/python-jaraco-text.mk | 15 +++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/python-jaraco-text/Config.in create mode 100644 package/python-jaraco-text/python-jaraco-text.hash create mode 100644 package/python-jaraco-text/python-jaraco-text.mk diff --git a/package/Config.in b/package/Config.in index dbe3c8a495b..1e80912851f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1168,6 +1168,7 @@ menu "External python modules" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-context/Config.in" source "package/python-jaraco-functools/Config.in" + source "package/python-jaraco-text/Config.in" source "package/python-jc/Config.in" source "package/python-jedi/Config.in" source "package/python-jeepney/Config.in" diff --git a/package/python-jaraco-text/Config.in b/package/python-jaraco-text/Config.in new file mode 100644 index 00000000000..5044ea32332 --- /dev/null +++ b/package/python-jaraco-text/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_JARACO_TEXT + bool "python-jaraco-text" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-inflect -> python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_AUTOCOMMAND # runtime + select BR2_PACKAGE_PYTHON_INFLECT # runtime + select BR2_PACKAGE_PYTHON_JARACO_CONTEXT # runtime + select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime + select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime + help + Module for text manipulation. + + https://github.com/jaraco/jaraco.text diff --git a/package/python-jaraco-text/python-jaraco-text.hash b/package/python-jaraco-text/python-jaraco-text.hash new file mode 100644 index 00000000000..704e75d6be7 --- /dev/null +++ b/package/python-jaraco-text/python-jaraco-text.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jaraco.text/json +md5 9f63a5cdd56061ebd84d8175d1df3b70 jaraco.text-3.12.0.tar.gz +sha256 389e25c8d4b32e9715bf530596fab0f5cd3aa47296e43969392e18a541af592c jaraco.text-3.12.0.tar.gz +# Locally computed sha256 checksums +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-jaraco-text/python-jaraco-text.mk b/package/python-jaraco-text/python-jaraco-text.mk new file mode 100644 index 00000000000..06b028d65f5 --- /dev/null +++ b/package/python-jaraco-text/python-jaraco-text.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-jaraco-text +# +################################################################################ + +PYTHON_JARACO_TEXT_VERSION = 3.12.0 +PYTHON_JARACO_TEXT_SOURCE = jaraco.text-$(PYTHON_JARACO_TEXT_VERSION).tar.gz +PYTHON_JARACO_TEXT_SITE = https://files.pythonhosted.org/packages/53/30/52edc6c9997d48b0d9fbedb6a29edab2b397968f637b76aae299a9128c34 +PYTHON_JARACO_TEXT_SETUP_TYPE = setuptools +PYTHON_JARACO_TEXT_LICENSE = MIT +PYTHON_JARACO_TEXT_LICENSE_FILES = LICENSE +PYTHON_JARACO_TEXT_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From f7c48e2ca40fa3f5622210a8c553405d35364c6f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 8 Jan 2024 23:01:27 -0700 Subject: [PATCH 2029/3013] package/python-jaraco-collections: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-jaraco-collections/Config.in | 8 ++++++++ .../python-jaraco-collections.hash | 5 +++++ .../python-jaraco-collections.mk | 15 +++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-jaraco-collections/Config.in create mode 100644 package/python-jaraco-collections/python-jaraco-collections.hash create mode 100644 package/python-jaraco-collections/python-jaraco-collections.mk diff --git a/package/Config.in b/package/Config.in index 1e80912851f..09347f79446 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1166,6 +1166,7 @@ menu "External python modules" source "package/python-iwlib/Config.in" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" + source "package/python-jaraco-collections/Config.in" source "package/python-jaraco-context/Config.in" source "package/python-jaraco-functools/Config.in" source "package/python-jaraco-text/Config.in" diff --git a/package/python-jaraco-collections/Config.in b/package/python-jaraco-collections/Config.in new file mode 100644 index 00000000000..a6fa721d4d5 --- /dev/null +++ b/package/python-jaraco-collections/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_JARACO_COLLECTIONS + bool "python-jaraco-collections" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-jaraco-text -> python-inflect -> python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_JARACO_TEXT # runtime + help + Collection objects similar to those in stdlib by jaraco. + + https://github.com/jaraco/jaraco.collections diff --git a/package/python-jaraco-collections/python-jaraco-collections.hash b/package/python-jaraco-collections/python-jaraco-collections.hash new file mode 100644 index 00000000000..0308d48641c --- /dev/null +++ b/package/python-jaraco-collections/python-jaraco-collections.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jaraco.collections/json +md5 2b12f44216432f1ce2ead377fd7a2b93 jaraco.collections-5.0.0.tar.gz +sha256 1680e8d09f295f625c7ba926880175a26fdbe7092b4c76d198e30476b21cfe68 jaraco.collections-5.0.0.tar.gz +# Locally computed sha256 checksums +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-jaraco-collections/python-jaraco-collections.mk b/package/python-jaraco-collections/python-jaraco-collections.mk new file mode 100644 index 00000000000..1400e286ee1 --- /dev/null +++ b/package/python-jaraco-collections/python-jaraco-collections.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-jaraco-collections +# +################################################################################ + +PYTHON_JARACO_COLLECTIONS_VERSION = 5.0.0 +PYTHON_JARACO_COLLECTIONS_SOURCE = jaraco.collections-$(PYTHON_JARACO_COLLECTIONS_VERSION).tar.gz +PYTHON_JARACO_COLLECTIONS_SITE = https://files.pythonhosted.org/packages/e6/85/9c4ab9772bcc2c9b4beffd56aca70f646e4a1f3a576579fa401d742b46a8 +PYTHON_JARACO_COLLECTIONS_SETUP_TYPE = setuptools +PYTHON_JARACO_COLLECTIONS_LICENSE = MIT +PYTHON_JARACO_COLLECTIONS_LICENSE_FILES = LICENSE +PYTHON_JARACO_COLLECTIONS_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From 3ebd06c0b13031191919caca07df86268cd758e4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 8 Jan 2024 23:01:28 -0700 Subject: [PATCH 2030/3013] package/python-cherrypy: bump to version 18.9.0 Add new host-python-setuptools-scm-git-archive build dependency. Add new python-jaraco-collections runtime dependency. Add new python-more-itertools runtime dependency. Add new python-zc-lockfile runtime dependency. Drop no longer required python-six and python-jaraco-classes runtime dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-cherrypy/Config.in | 6 ++++-- package/python-cherrypy/python-cherrypy.hash | 4 ++-- package/python-cherrypy/python-cherrypy.mk | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/python-cherrypy/Config.in b/package/python-cherrypy/Config.in index 7548dcf91b1..fd67872873e 100644 --- a/package/python-cherrypy/Config.in +++ b/package/python-cherrypy/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_PYTHON_CHERRYPY bool "python-cherrypy" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-jaraco-collections -> python-jaraco-text -> python-inflect -> python-pydantic -> python-pydantic-core select BR2_PACKAGE_PYTHON_CHEROOT # runtime - select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime + select BR2_PACKAGE_PYTHON_JARACO_COLLECTIONS # runtime + select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime select BR2_PACKAGE_PYTHON_PORTEND # runtime + select BR2_PACKAGE_PYTHON_ZC_LOCKFILE # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help A minimalist web framework diff --git a/package/python-cherrypy/python-cherrypy.hash b/package/python-cherrypy/python-cherrypy.hash index cd8f8756d85..92697e5f06e 100644 --- a/package/python-cherrypy/python-cherrypy.hash +++ b/package/python-cherrypy/python-cherrypy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cherrypy/json -md5 033c58bf3da497f283b039911d1c882b CherryPy-18.8.0.tar.gz -sha256 9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b CherryPy-18.8.0.tar.gz +md5 014dbd400aeda9d2b098ed01c95b4a30 CherryPy-18.9.0.tar.gz +sha256 6b06c191ce71a86461f30572a1ab57ffc09f43143ba8e42c103c7b3347220eb1 CherryPy-18.9.0.tar.gz # Locally computed sha256 checksums sha256 45ade933c280ece37e3e01d3a91afeed9505746a456f72ad10b0897c49e65104 LICENSE.md diff --git a/package/python-cherrypy/python-cherrypy.mk b/package/python-cherrypy/python-cherrypy.mk index 9b6ad0e99ac..244491a040b 100644 --- a/package/python-cherrypy/python-cherrypy.mk +++ b/package/python-cherrypy/python-cherrypy.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_CHERRYPY_VERSION = 18.8.0 +PYTHON_CHERRYPY_VERSION = 18.9.0 PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz -PYTHON_CHERRYPY_SITE = https://files.pythonhosted.org/packages/60/ea/6c4d16b0cd1f4f64a478bac8a37d75a585e854afb5693ce80a9711efdc4a +PYTHON_CHERRYPY_SITE = https://files.pythonhosted.org/packages/bd/5f/e265a49883bfcfb7f2c3d3d9e96197cfe8136783e96c5ce20e201550aaa0 PYTHON_CHERRYPY_LICENSE = BSD-3-Clause PYTHON_CHERRYPY_LICENSE_FILES = LICENSE.md PYTHON_CHERRYPY_SETUP_TYPE = setuptools -PYTHON_CHERRYPY_DEPENDENCIES = host-python-setuptools-scm +PYTHON_CHERRYPY_DEPENDENCIES = \ + host-python-setuptools-scm \ + host-python-setuptools-scm-git-archive $(eval $(python-package)) From 1395330fe6d9729bd46ad3a6c6497ee6e5a66487 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Tue, 23 Jul 2024 18:27:58 +0900 Subject: [PATCH 2031/3013] package/flannel: bump to version 0.25.5 Signed-off-by: Geoff Levand Signed-off-by: Thomas Petazzoni --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 85bc184368e..d1f03a9d388 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e4946abe7212d0a3f89f64ff9d4310dd21fafa782d7e5c1c7d44ea264ab25d5c flannel-0.25.4-go2.tar.gz +sha256 e6f312d8a7e635ef707f3811313f045f0f80312d96dfcc722de973ffa2910204 flannel-0.25.5-go2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 5231d41de8b..7705bdbefe9 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANNEL_VERSION = 0.25.4 +FLANNEL_VERSION = 0.25.5 FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 From ef420e2016c4f1746e9aa72e160639e14ae7f406 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 11:56:14 +0200 Subject: [PATCH 2032/3013] package/mtd: fix zlib build Commit bb19ffeaab5ba4be0a1033ca326b25d4d4e8203f forgot to move host-pkgconf dependency from BR2_PACKAGE_MTD_JFFS_UTILS condition to the new BR2_PACKAGE_ZLIB condition resulting in the following build failure: hecking for ZLIB... no configure: error: cannot find zlib Fixes: bb19ffeaab5ba4be0a1033ca326b25d4d4e8203f - http://autobuild.buildroot.org/results/7cbeead738af6302d5f0048a443e3b57d6776bb2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mtd/mtd.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index fe40cf6c060..d3444c88f2f 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -28,7 +28,7 @@ MTD_CONF_OPTS += --without-lzo endif ifeq ($(BR2_PACKAGE_ZLIB),y) -MTD_DEPENDENCIES += zlib +MTD_DEPENDENCIES += host-pkgconf zlib MTD_CONF_OPTS += --with-zlib else MTD_CONF_OPTS += --without-zlib @@ -37,7 +37,6 @@ endif MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)" ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) -MTD_DEPENDENCIES += host-pkgconf MTD_CONF_OPTS += --with-jffs else MTD_CONF_OPTS += --without-jffs From ce00b93d5ad9691b73bba1501847eac8679e3c01 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 12:48:41 +0200 Subject: [PATCH 2033/3013] package/gamin: drop package As advocated by Thomas Petazzoni [1], drop gamin as package is not maintained anymore. This will also avoid the following build failure with gcc 14: gam_api.c: In function 'gamin_get_user_name': gam_api.c:123:9: error: implicit declaration of function 'strncpy' [-Wimplicit-function-declaration] 123 | strncpy(user_name, pw->pw_name, 99); | ^~~~~~~ [1] https://patchwork.ozlabs.org/project/buildroot/patch/20240723085645.732060-1-fontaine.fabrice@gmail.com/ Fixes: - http://autobuild.buildroot.org/results/b267f53ba6035d256c013dbbbbd1bcdfe0ef111f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 - Config.in.legacy | 7 +++ package/gamin/0001-no-abstract-sockets.patch | 61 ------------------- package/gamin/0002-no-const-return.patch | 57 ----------------- ...x-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch | 39 ------------ package/gamin/Config.in | 14 ----- package/gamin/gamin.hash | 3 - package/gamin/gamin.mk | 21 ------- package/samba4/samba4.mk | 8 +-- 9 files changed, 8 insertions(+), 205 deletions(-) delete mode 100644 package/gamin/0001-no-abstract-sockets.patch delete mode 100644 package/gamin/0002-no-const-return.patch delete mode 100644 package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch delete mode 100644 package/gamin/Config.in delete mode 100644 package/gamin/gamin.hash delete mode 100644 package/gamin/gamin.mk diff --git a/.checkpackageignore b/.checkpackageignore index 760ae29cfb0..bd93f87dfb9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -562,9 +562,6 @@ package/ftop/0001-overflow.patch lib_patch.Upstream package/fwts/0001-build-do-not-use-Werror.patch lib_patch.Upstream package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch lib_patch.Upstream package/fxload/0001-fix-static-build.patch lib_patch.Upstream -package/gamin/0001-no-abstract-sockets.patch lib_patch.Upstream -package/gamin/0002-no-const-return.patch lib_patch.Sob lib_patch.Upstream -package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch lib_patch.Upstream package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 414a14944ee..94ac60b668c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_GAMIN + bool "gamin package removed" + select BR2_LEGACY + help + The gamin package was removed as it is not maintained + anymore (no commit since 2016). + config BR2_PACKAGE_CAIRO_SVG bool "cairo svg support" select BR2_LEGACY diff --git a/package/gamin/0001-no-abstract-sockets.patch b/package/gamin/0001-no-abstract-sockets.patch deleted file mode 100644 index 3d659015ec3..00000000000 --- a/package/gamin/0001-no-abstract-sockets.patch +++ /dev/null @@ -1,61 +0,0 @@ -[PATCH]: Remove abstract socket namespace check breaking cross compilation - -Taken from openembedded: - -http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/gamin/files/no-abstract-sockets.patch - -Signed-off-by: Peter Korsgaard ---- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200 -+++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200 -@@ -354,51 +354,6 @@ - AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) - fi - --#### Abstract sockets -- --AC_MSG_CHECKING(abstract socket namespace) --AC_LANG_PUSH(C) --AC_RUN_IFELSE([AC_LANG_PROGRAM( --[[ --#include --#include --#include --#include --#include --#include --#include --]], --[[ -- int listen_fd; -- struct sockaddr_un addr; -- -- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -- -- if (listen_fd < 0) -- { -- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- memset (&addr, '\0', sizeof (addr)); -- addr.sun_family = AF_UNIX; -- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); -- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -- -- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -- { -- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -- strerror (errno)); -- exit (1); -- } -- else -- exit (0); --]])], -- [have_abstract_sockets=yes], -- [have_abstract_sockets=no]) --AC_LANG_POP(C) --AC_MSG_RESULT($have_abstract_sockets) -- - if test x$enable_abstract_sockets = xyes; then - if test x$have_abstract_sockets = xno; then - AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) diff --git a/package/gamin/0002-no-const-return.patch b/package/gamin/0002-no-const-return.patch deleted file mode 100644 index 3e6e9052148..00000000000 --- a/package/gamin/0002-no-const-return.patch +++ /dev/null @@ -1,57 +0,0 @@ -G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid -build failures. - -Upstream-Status: Pending - -Index: gamin-0.1.10/server/gam_node.c -=================================================================== ---- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100 -+++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100 -@@ -122,7 +122,7 @@ - * it has finished with the string. If it must keep it longer, it - * should makes its own copy. The returned string must not be freed. - */ --G_CONST_RETURN char * -+const char * - gam_node_get_path(GamNode * node) - { - g_assert(node); -Index: gamin-0.1.10/server/gam_node.h -=================================================================== ---- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100 -+++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100 -@@ -58,7 +58,7 @@ - void gam_node_set_is_dir (GamNode *node, - gboolean is_dir); - --G_CONST_RETURN char *gam_node_get_path (GamNode *node); -+const char *gam_node_get_path (GamNode *node); - - GList *gam_node_get_subscriptions (GamNode *node); - -Index: gamin-0.1.10/server/gam_subscription.c -=================================================================== ---- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100 -+++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100 -@@ -141,7 +141,7 @@ - * @param sub the GamSubscription - * @returns The path being monitored. It should not be freed. - */ --G_CONST_RETURN char * -+const char * - gam_subscription_get_path(GamSubscription * sub) - { - if (sub == NULL) -Index: gamin-0.1.10/server/gam_subscription.h -=================================================================== ---- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100 -+++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100 -@@ -21,7 +21,7 @@ - - int gam_subscription_get_reqno (GamSubscription *sub); - --G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); -+const char *gam_subscription_get_path (GamSubscription *sub); - - GamListener *gam_subscription_get_listener (GamSubscription *sub); - diff --git a/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch b/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch deleted file mode 100644 index b5f2e6c521e..00000000000 --- a/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix missing PTHREAD_MUTEX_RECURSIVE_NP - -The musl C library does not provide the non portable -PTHREAD_MUTEX_RECURSIVE_NP. In addition, uClibc does not define it as -a #define, but as an enum value, so doing a #if defined() check -doesn't work properly. Instead, add a AC_CHECK_DECL() autoconf check. - -Signed-off-by: Baruch Siach -[Thomas: switch to an autoconf check.] -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -294,6 +294,10 @@ - AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)]) - AC_DEFINE([HAVE_PTHREAD_H], [], [Define if is there]) - WITH_THREADS="1"])) -+ -+ AC_CHECK_DECL([PTHREAD_MUTEX_RECURSIVE_NP], -+ [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], [], [whether HAVE_PTHREAD_MUTEX_RECURSIVE_NP is defined])], -+ [], [#include ]) - fi - - dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps -Index: b/libgamin/gam_data.c -=================================================================== ---- a/libgamin/gam_data.c -+++ b/libgamin/gam_data.c -@@ -470,7 +470,7 @@ - } - if (is_threaded > 0) { - pthread_mutexattr_init(&attr); --#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP) -+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE_NP) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); - #else - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); diff --git a/package/gamin/Config.in b/package/gamin/Config.in deleted file mode 100644 index 55e037a4a40..00000000000 --- a/package/gamin/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_GAMIN - bool "gamin" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - the File Alteration Monitor - - http://www.gnome.org/~veillard/gamin/sources - -comment "gamin needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gamin/gamin.hash b/package/gamin/gamin.hash deleted file mode 100644 index e28660dded4..00000000000 --- a/package/gamin/gamin.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 gamin-0.1.10.tar.gz -sha256 7f9ffc38883325f011f331a9d6074ffd0175fbcecd57f69c577fb3845f333876 COPYING diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk deleted file mode 100644 index 4621b1646f3..00000000000 --- a/package/gamin/gamin.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# gamin -# -################################################################################ - -GAMIN_VERSION = 0.1.10 -GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources -GAMIN_AUTORECONF = YES -GAMIN_INSTALL_STAGING = YES -GAMIN_LICENSE = LGPL-2.0+ -GAMIN_LICENSE_FILES = COPYING - -# python support broken -GAMIN_CONF_OPTS += --without-python - -GAMIN_CONF_ENV = have_abstract_sockets=no - -GAMIN_DEPENDENCIES = libglib2 - -$(eval $(autotools-package)) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 5536b6b1214..ec0ffd70bfb 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -79,13 +79,6 @@ else SAMBA4_CONF_OPTS += --disable-avahi endif -ifeq ($(BR2_PACKAGE_GAMIN),y) -SAMBA4_CONF_OPTS += --with-fam -SAMBA4_DEPENDENCIES += gamin -else -SAMBA4_CONF_OPTS += --without-fam -endif - ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) SAMBA4_CONF_OPTS += --with-libarchive SAMBA4_DEPENDENCIES += libarchive @@ -139,6 +132,7 @@ define SAMBA4_CONFIGURE_CMDS --disable-rpath \ --disable-rpath-install \ --disable-iprint \ + --without-fam \ --without-pam \ --without-dmapi \ --without-gpgme \ From 7e2f295681a359b908ef0448c9b36f1ccfe65041 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Wed, 10 Jul 2024 11:41:38 +0200 Subject: [PATCH 2034/3013] package/rauc-hawkbit-updater: add systemd optional dependency Take the systemd into account if present. Signed-off-by: Bartosz Bilas Signed-off-by: Thomas Petazzoni (cherry picked from commit 4aa7a4ad8a6f729ad6ee6baf16f01d657559b3e6) Signed-off-by: Peter Korsgaard --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 3836d3c84e3..da1c020bb6c 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -12,4 +12,11 @@ RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl RAUC_HAWKBIT_UPDATER_CFLAGS = $(TARGET_CFLAGS) -std=c99 +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +RAUC_HAWKBIT_UPDATER_DEPENDENCIES += systemd +RAUC_HAWKBIT_UPDATER_CONF_OPTS += -Dsystemd=enabled +else +RAUC_HAWKBIT_UPDATER_CONF_OPTS += -Dsystemd=disabled +endif + $(eval $(meson-package)) From 9c29e72aefaf4b123c2063d8d68ec9c4d933073a Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 Jun 2024 23:00:53 +0300 Subject: [PATCH 2035/3013] package/wpewebkit: add backported patch to fix NEON build Import a patch that has been backported by upstream to the 2.44 release branch that fixes the build when the target is an ARM processor that supports NEON instructions. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 8502ac71aad426792aa51923ef0f14b83c4bf2c7) Signed-off-by: Peter Korsgaard --- ...-specific-declarations-in-FELighting.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch diff --git a/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch b/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch new file mode 100644 index 00000000000..9e2bc86fef0 --- /dev/null +++ b/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch @@ -0,0 +1,68 @@ +From 8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 27 May 2024 02:09:58 +0300 +Subject: [PATCH] Cherry-pick 279334@main (36d1b5d7c0ef). + + Remove ARM-specific declarations in FELighting.h unneeded after 272873@main + + Unreviewed build fix. + + * Source/WebCore/platform/graphics/filters/FELighting.h: Remove unneeded + declarations for the getPowerCoefficients() and platformApplyNeon() + functions, which are now defined elsewhere; and were causing a build + failure due to usage of the protected LightingData type. + * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp: + (WebCore::FELightingNeonParallelApplier::applyPlatformParallel const): + Add missing LightType:: namespace to uses of LS_POINT and LS_SPOT. + + Canonical link: https://commits.webkit.org/279334@main + +Canonical link: https://commits.webkit.org/274313.261@webkitglib/2.44 + +Signed-off-by: Adrian Perez de Castro +Upstream: https://github.com/WebKit/WebKit/commit/8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 +--- + .../cpu/arm/filters/FELightingNeonParallelApplier.cpp | 4 ++-- + Source/WebCore/platform/graphics/filters/FELighting.h | 5 ----- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp +index 04d855fa6d71..5f4250d87b61 100644 +--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp ++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp +@@ -542,14 +542,14 @@ void FELightingNeonParallelApplier::applyPlatformParallel(const LightingData& da + floatArguments.colorBlue = color.blue; + floatArguments.padding4 = 0; + +- if (data.lightSource->type() == LS_POINT) { ++ if (data.lightSource->type() == LightType::LS_POINT) { + neonData.flags |= FLAG_POINT_LIGHT; + auto& pointLightSource = downcast(*data.lightSource); + floatArguments.lightX = pointLightSource.position().x(); + floatArguments.lightY = pointLightSource.position().y(); + floatArguments.lightZ = pointLightSource.position().z(); + floatArguments.padding2 = 0; +- } else if (data.lightSource->type() == LS_SPOT) { ++ } else if (data.lightSource->type() == LightType::LS_SPOT) { + neonData.flags |= FLAG_SPOT_LIGHT; + auto& spotLightSource = downcast(*data.lightSource); + floatArguments.lightX = spotLightSource.position().x(); +diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h +index 4efab920b1c3..dcd80b6f42b7 100644 +--- a/Source/WebCore/platform/graphics/filters/FELighting.h ++++ b/Source/WebCore/platform/graphics/filters/FELighting.h +@@ -68,11 +68,6 @@ protected: + + std::unique_ptr createSoftwareApplier() const override; + +-#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) +- static int getPowerCoefficients(float exponent); +- inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); +-#endif +- + Color m_lightingColor; + float m_surfaceScale; + float m_diffuseConstant; +-- +2.45.2 + From f907f52c0c24d83bfcbbab62f8310ce6d31233b9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 10 Jul 2024 15:41:34 +0200 Subject: [PATCH 2036/3013] DEVELOPERS: drop Mathieu Audat Mathieu privately informed me that he no longer has access to the TS4900 board, he is therefore unable to maintain this board moving forward. Let's drop his entry from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni (cherry picked from commit 39d23ce823bed1ab9db25ec32a924980ef4b91c1) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index bb346b3619a..ef833f00f72 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2209,11 +2209,6 @@ N: Masahiro Yamada F: board/arm/foundation-v8/ F: configs/arm_foundationv8_defconfig -N: Mathieu Audat -F: board/technologic/ts4900/ -F: configs/ts4900_defconfig -F: package/ts4900-fpga/ - N: Matt Silva F: package/rlwrap/ From 169284cd1f901fbf22c7b1f8ef9d85de0523ba27 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jun 2024 23:25:47 +0200 Subject: [PATCH 2037/3013] package/exim: update patches to be applied with fuzz 0 Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, exim fails to build with output: Applying 0004-exim_lock-fix-lstat-related-build-errors.patch using patch: patching file src/exim_lock.c Hunk #1 FAILED at 13. Hunk #2 succeeded at 27 (offset 1 line). 1 out of 2 hunks FAILED -- saving rejects to file src/exim_lock.c.rej This commit rebases the package patches on the current package version when needed. Fixes: http://autobuild.buildroot.net/results/ff27d5ebd7f24ac8cb236b83c67c2c75255e51c6/ Signed-off-by: Bernd Kuhls Reviewed-by: Luca Ceresoli Reviewed-by: Yann E. MORIN Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN (cherry picked from commit 20973140c14d528d91ecea12ebac6428d78d3340) Signed-off-by: Peter Korsgaard --- package/exim/0001-Build-buildconfig-for-the-host.patch | 4 +++- ...0002-Don-t-make-backup-copies-of-installed-files.patch | 4 +++- ...0003-Skip-version-check-and-symlink-installation.patch | 8 ++++---- .../0004-exim_lock-fix-lstat-related-build-errors.patch | 8 +++++--- package/exim/0005-sieve-fix-build-errors.patch | 4 +++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package/exim/0001-Build-buildconfig-for-the-host.patch b/package/exim/0001-Build-buildconfig-for-the-host.patch index 87eb527974a..e9da80765ac 100644 --- a/package/exim/0001-Build-buildconfig-for-the-host.patch +++ b/package/exim/0001-Build-buildconfig-for-the-host.patch @@ -2,6 +2,8 @@ buildconfig is meant to be executed on the host, so it has to be compiled using $(HOSTCC), not $(CC). Signed-off-by: Luca Ceresoli +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- OS/Makefile-Base | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) @@ -10,7 +12,7 @@ diff --git a/OS/Makefile-Base b/OS/Makefile-Base index 29a6ad3..420ba60 100644 --- a/OS/Makefile-Base +++ b/OS/Makefile-Base -@@ -114,8 +114,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ +@@ -258,8 +258,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ # Targets for special-purpose configuration header builders buildconfig: buildconfig.c diff --git a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch index 0cdaa744bcc..3c115f8d020 100644 --- a/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch +++ b/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch @@ -5,6 +5,8 @@ This leads to useless duplicated files on the target, so disable this piece of code. Signed-off-by: Luca Ceresoli +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- scripts/exim_install | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) @@ -13,7 +15,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install index 616ab3c..e68e7d5 100755 --- a/scripts/exim_install +++ b/scripts/exim_install -@@ -344,15 +344,15 @@ while [ $# -gt 0 ]; do +@@ -348,15 +348,15 @@ while [ $# -gt 0 ]; do else if ../scripts/newer ${name} ${BIN_DIRECTORY}/${name}; then diff --git a/package/exim/0003-Skip-version-check-and-symlink-installation.patch b/package/exim/0003-Skip-version-check-and-symlink-installation.patch index a342d6ed347..55166f108b9 100644 --- a/package/exim/0003-Skip-version-check-and-symlink-installation.patch +++ b/package/exim/0003-Skip-version-check-and-symlink-installation.patch @@ -9,8 +9,8 @@ Inspired by: http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch Signed-off-by: Luca Ceresoli -(rebased against exim 4.89) -Signed-off-by: Bernd Kuhls +[Bernd: rebased for version 4.89 & 4.97.1] +Signed-off-by: Bernd Kuhls --- scripts/exim_install | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) @@ -19,7 +19,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install index e68e7d5..487a4e1 100755 --- a/scripts/exim_install +++ b/scripts/exim_install -@@ -58,6 +58,8 @@ +@@ -61,6 +61,8 @@ shift done @@ -28,7 +28,7 @@ index e68e7d5..487a4e1 100755 # Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK, # SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build # directory). EXE is empty except in the Cygwin environment. In each case, keep -@@ -217,9 +219,7 @@ +@@ -220,9 +223,7 @@ # The exim binary is handled specially if [ $name = exim${EXE} ]; then diff --git a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch index a0a279fc43f..616ada50264 100644 --- a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch +++ b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch @@ -22,6 +22,8 @@ Fixes: Signed-off-by: Luca Ceresoli Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- src/exim_lock.c | 3 +++ 1 file changed, 3 insertions(+) @@ -30,8 +32,8 @@ diff --git a/src/exim_lock.c b/src/exim_lock.c index 068216816054..cb140aff6436 100644 --- a/src/exim_lock.c +++ b/src/exim_lock.c -@@ -13,6 +13,8 @@ Argument: the name of the lock file - Copyright (c) The Exim Maintainers 2016 +@@ -14,6 +14,8 @@ Copyright (c) The Exim Maintainers 2016 - 2021 + SPDX-License-Identifier: GPL-2.0-or-later */ +#define _XOPEN_SOURCE @@ -39,7 +41,7 @@ index 068216816054..cb140aff6436 100644 #include "os.h" #include -@@ -26,6 +28,7 @@ Copyright (c) The Exim Maintainers 2016 +@@ -27,6 +29,7 @@ Copyright (c) The Exim Maintainers 2016 #include #include #include diff --git a/package/exim/0005-sieve-fix-build-errors.patch b/package/exim/0005-sieve-fix-build-errors.patch index f4b95d50bcd..20323c17cd7 100644 --- a/package/exim/0005-sieve-fix-build-errors.patch +++ b/package/exim/0005-sieve-fix-build-errors.patch @@ -21,6 +21,8 @@ buildsystem. Signed-off-by: Luca Ceresoli Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +[Bernd: rebased for version 4.97.1] +Signed-off-by: Bernd Kuhls --- src/sieve.c | 2 ++ 1 file changed, 2 insertions(+) @@ -29,7 +31,7 @@ diff --git a/src/sieve.c b/src/sieve.c index 5e8d1e6f4776..9632f2d43810 100644 --- a/src/sieve.c +++ b/src/sieve.c -@@ -12,6 +12,8 @@ +@@ -14,6 +14,8 @@ /* Sieve mail filter. */ From 3d1d01f92838d712553b85272a19c8c4cd75ad06 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Jul 2024 18:19:27 +0200 Subject: [PATCH 2038/3013] package/exim: security bump version to 4.98 Release notes: https://lists.exim.org/lurker/message/20240710.155945.8823670d.en.html Fixes CVE-2024-39929: https://bugs.exim.org/show_bug.cgi?id=3099#c4 Removed patch 0004 due to removal of codesourcery arm/aarch64 toolchains with commit 53a8c5150e5eeeb6dbbead0275dbf9141f507511. Patch 0005 (renamed to 0004) is still necessary with gcc-13.x, reformatted Upstream trailer. Removed patches 0006, 0007 & 0008 which are included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 1a409fafb0ea24e8e8f07529623d55e8d3435598) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ..._lock-fix-lstat-related-build-errors.patch | 53 ----------------- ...atch => 0004-sieve-fix-build-errors.patch} | 2 +- .../0006-OpenSSL-fix-non-DANE-build.patch | 28 --------- package/exim/0007-typoes.patch | 58 ------------------- ...nssl.c-fix-build-with-libressl-3.5.0.patch | 43 -------------- package/exim/exim.hash | 4 +- package/exim/exim.mk | 2 +- 8 files changed, 4 insertions(+), 188 deletions(-) delete mode 100644 package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch rename package/exim/{0005-sieve-fix-build-errors.patch => 0004-sieve-fix-build-errors.patch} (95%) delete mode 100644 package/exim/0006-OpenSSL-fix-non-DANE-build.patch delete mode 100644 package/exim/0007-typoes.patch delete mode 100644 package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8a21b3f155b..a7553198244 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -595,8 +595,6 @@ package/evemu/0004-src-evemu.c-fix-build-with-kernels-4.16.patch lib_patch.Upstr package/exim/0001-Build-buildconfig-for-the-host.patch lib_patch.Upstream package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch lib_patch.Upstream package/exim/0003-Skip-version-check-and-symlink-installation.patch lib_patch.Upstream -package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch lib_patch.Upstream -package/exim/0005-sieve-fix-build-errors.patch lib_patch.Upstream package/exim/S86exim lib_sysv.Indent lib_sysv.Variables package/expect/0001-enable-cross-compilation.patch lib_patch.Upstream package/expect/0002-allow-tcl-build-directory.patch lib_patch.Upstream diff --git a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch deleted file mode 100644 index 616ada50264..00000000000 --- a/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bbcf4320134efd8a01ce5a02bb9af62019ca05f6 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Tue, 4 Feb 2020 15:57:48 +0100 -Subject: [PATCH] exim_lock: fix lstat-related build errors - -exim_lock fails to cross-compile with the Sourcery CodeBench ARM 2014.05 -toolchain due the a missing include of sys/types.h, needed for the -constants used by fstat() and lstat(). - -Discovered when cross-compiling with the Buildroot embedded Linux -buildsystem. - -Fixes: - - exim_lock.c:427:30: error: 'S_IFMT' undeclared (first use in this function) - if ((statbuf.st_mode & S_IFMT) == S_IFLNK) - ^ - exim_lock.c:427:30: note: each undeclared identifier is reported only once for each function it appears in - exim_lock.c:427:41: error: 'S_IFLNK' undeclared (first use in this function) - if ((statbuf.st_mode & S_IFMT) == S_IFLNK) - ^ - -Signed-off-by: Luca Ceresoli -Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 -[Bernd: rebased for version 4.97.1] -Signed-off-by: Bernd Kuhls ---- - src/exim_lock.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/exim_lock.c b/src/exim_lock.c -index 068216816054..cb140aff6436 100644 ---- a/src/exim_lock.c -+++ b/src/exim_lock.c -@@ -14,6 +14,8 @@ Copyright (c) The Exim Maintainers 2016 - 2021 - SPDX-License-Identifier: GPL-2.0-or-later - */ - -+#define _XOPEN_SOURCE -+ - #include "os.h" - - #include -@@ -27,6 +29,7 @@ Copyright (c) The Exim Maintainers 2016 - #include - #include - #include -+#include - #include - #include - #include --- -2.25.0 diff --git a/package/exim/0005-sieve-fix-build-errors.patch b/package/exim/0004-sieve-fix-build-errors.patch similarity index 95% rename from package/exim/0005-sieve-fix-build-errors.patch rename to package/exim/0004-sieve-fix-build-errors.patch index 20323c17cd7..c1a2c45b8dc 100644 --- a/package/exim/0005-sieve-fix-build-errors.patch +++ b/package/exim/0004-sieve-fix-build-errors.patch @@ -20,7 +20,7 @@ Discovered when cross-compiling with the Buildroot embedded Linux buildsystem. Signed-off-by: Luca Ceresoli -Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +Upstream: https://bugs.exim.org/show_bug.cgi?id=2523 [Bernd: rebased for version 4.97.1] Signed-off-by: Bernd Kuhls --- diff --git a/package/exim/0006-OpenSSL-fix-non-DANE-build.patch b/package/exim/0006-OpenSSL-fix-non-DANE-build.patch deleted file mode 100644 index 8ae63d22266..00000000000 --- a/package/exim/0006-OpenSSL-fix-non-DANE-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 37b849dca4dfd855212a763662825e967a4d77b1 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Tue, 7 Nov 2023 15:02:18 +0000 -Subject: [PATCH] OpenSSL: fix non-DANE build - -Upstream: https://git.exim.org/exim.git/commitdiff/37b849dca4dfd855212a763662825e967a4d77b1 - -Signed-off-by: Bernd Kuhls ---- - src/tls-openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c -index ef11de593..851ac77c5 100644 ---- a/src/tls-openssl.c -+++ b/src/tls-openssl.c -@@ -2605,7 +2605,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) - asking for certificate-status under DANE, so this callback won't run for - that combination. It still will for non-DANE. */ - --#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER -+#if defined(EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER) && defined(SUPPORT_DANE) - X509 * signer; - - if ( tls_out.dane_verified --- -2.30.2 - diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch deleted file mode 100644 index 6bbfc9eecd4..00000000000 --- a/package/exim/0007-typoes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 8 Nov 2023 14:22:37 +0000 -Subject: [PATCH] typoes - -Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3 -Signed-off-by: Fabrice Fontaine ---- - src/src/tls-openssl.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/tls-openssl.c b/src/tls-openssl.c -index 851ac77c5..237303ba9 100644 ---- a/src/tls-openssl.c -+++ b/src/tls-openssl.c -@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */ - # define EXIM_HAVE_OPENSSL_KEYLOG - # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID - # define EXIM_HAVE_SESSION_TICKET --# define EXIM_HAVE_OPESSL_TRACE --# define EXIM_HAVE_OPESSL_GET0_SERIAL --# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS -+# define EXIM_HAVE_OPENSSL_TRACE -+# define EXIM_HAVE_OPENSSL_GET0_SERIAL -+# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS - # define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN - # ifndef DISABLE_OCSP - # define EXIM_HAVE_OCSP -@@ -1756,7 +1756,7 @@ level. */ - DEBUG(D_tls) - { - SSL_CTX_set_info_callback(ctx, info_callback); --#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) -+#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) - /* this needs a debug build of OpenSSL */ - SSL_CTX_set_msg_callback(ctx, SSL_trace); - #endif -@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP; - if (!olist) - return SSL_TLSEXT_ERR_NOACK; - --#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL -+#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL - { - const X509 * cert_sent = SSL_get_certificate(s); - const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent); -@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) - - debug_printf("certs contained in basicresp:\n"); - x509_stack_dump_cert_s_names( --#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS -+#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS - OCSP_resp_get0_certs(bs) - #else - bs->certs --- -2.30.2 - diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index 67d96fc1af0..00000000000 --- a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 11 Feb 2024 21:45:42 +0100 -Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0 - -OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and -https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954 -resulting in the following build failure since version 4.97 and -https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: - -In file included from tls.c:473: -tls-openssl.c: In function 'tls_client_stapling_cb': -tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} - 2652 | bs->certs - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d - -Signed-off-by: Fabrice Fontaine -Upstream: https://bugs.exim.org/show_bug.cgi?id=3074 ---- - src/src/tls-openssl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/tls-openssl.c b/src/tls-openssl.c -index 237303ba9..c7f94c160 100644 ---- a/src/tls-openssl.c -+++ b/src/tls-openssl.c -@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */ - # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID - #endif - -+#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL -+# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS -+#endif -+ - #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L) - # define EXIM_HAVE_EXPORT_CHNL_BNGNG - # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS --- -2.43.0 - diff --git a/package/exim/exim.hash b/package/exim/exim.hash index a3822302fbd..de803bb27bd 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,6 +1,6 @@ # From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt -sha256 bd782057509a793593508528590626d185ea160ce32cb34beda262e99cefdfa9 exim-4.97.1.tar.xz +sha256 0ebc108a779f9293ba4b423c20818f9a3db79b60286d96abc6ba6b85a15852f7 exim-4.98.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc exim-4.97.1.tar.xz +sha512 13dd963dd0899bb4d64bee44c20883e720e469a4d77456b877d6693cfc4419805a045cb561508cdf763dbb37cc84fbdc6177d68acc2183934c3224fbd03caf15 exim-4.98.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index d78b95ad15b..45708d3941b 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.97.1 +EXIM_VERSION = 4.98 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ From b68fa4c31a3d7300e36a7b33ebbf537f04b66b59 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 23 Jul 2024 18:43:26 +0000 Subject: [PATCH 2039/3013] package/gamin: remove stale Config.in include breaking build The previous commit ce00b93d5 (package/gamin: drop package) forgot to remove the package/gamin/Config include from package/Config.in, which triggers the following error. package/Config.in:1645: can't open file "package/gamin/Config.in" make: *** [Makefile:1027: raspberrypi2_defconfig] Error 1 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index 09347f79446..20585d53d09 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1642,7 +1642,6 @@ endif endmenu menu "Filesystem" - source "package/gamin/Config.in" source "package/libconfig/Config.in" source "package/libconfuse/Config.in" source "package/libfuse/Config.in" From 482a27a7be85e17f689b77d5d21e55cacbfd06fa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 20:55:53 +0200 Subject: [PATCH 2040/3013] package/libdex: fix build without SSP Fix the following build failure without stack-protector raised since the addition of the package in commit 70319b47f646f74f407ed3355baf5b581a10518a: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: src/libdex-1.a.p/dex-async-pair.c.o: in function `dex_async_pair_ready_callback': dex-async-pair.c:(.text+0x118): undefined reference to `__stack_chk_guard' Fixes: 70319b47f646f74f407ed3355baf5b581a10518a - http://autobuild.buildroot.org/results/f53768f654a9eddd95b583a366cd7386d9ddb285 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-add-stack-protector-option.patch | 45 +++++++++++++++++++ package/libdex/libdex.mk | 1 + 2 files changed, 46 insertions(+) create mode 100644 package/libdex/0001-add-stack-protector-option.patch diff --git a/package/libdex/0001-add-stack-protector-option.patch b/package/libdex/0001-add-stack-protector-option.patch new file mode 100644 index 00000000000..9021831a39f --- /dev/null +++ b/package/libdex/0001-add-stack-protector-option.patch @@ -0,0 +1,45 @@ +From 107efb2f1a014c4475e122677faddbe0dbef1000 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 23 Jul 2024 14:54:59 +0200 +Subject: [PATCH] add stack-protector option + +Allow the user to disable stack-protector as it is not supported by all +toolchains + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.gnome.org/GNOME/libdex/-/commit/a65d33aebbe43024a046b3f3cc4a1c6c533838d0 +--- + meson.build | 2 +- + meson_options.txt | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index d0ca81d..2f7aac2 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,7 +126,7 @@ test_c_args = [ + ['-Werror=format-security', '-Werror=format=2'], + '-FImsvc_recommended_pragmas.h', + ] +-if get_option('buildtype') != 'plain' ++if get_option('buildtype') != 'plain' and get_option('stack-protector') + if host_machine.system() != 'windows' + test_c_args += '-fstack-protector-strong' + endif +diff --git a/meson_options.txt b/meson_options.txt +index 519cd97..9e3364a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -4,6 +4,9 @@ option('docs', + option('examples', + type: 'boolean', value: true, + description: 'Build example programs') ++option('stack-protector', ++ type: 'boolean', value: true, ++ description: 'Enable stack-protector') + option('vapi', + type: 'boolean', value: true, + description: 'Generate vapi data (requires vapigen)') +-- +GitLab + diff --git a/package/libdex/libdex.mk b/package/libdex/libdex.mk index 530dfc2babf..7c652a04093 100644 --- a/package/libdex/libdex.mk +++ b/package/libdex/libdex.mk @@ -15,6 +15,7 @@ LIBDEX_DEPENDENCIES = libglib2 LIBDEX_CONF_OPTS = \ -Ddocs=false \ -Dexamples=false \ + -Dstack-protector=false \ -Dsysprof=false \ -Dtests=false \ -Dvapi=false \ From 2f7f3d00fa40381b5898cc5228dde37c7d70a136 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 19:14:35 +0200 Subject: [PATCH 2041/3013] package/libcamera-apps: bump to version 1.5.0 - Use official tarball - Switch to meson-package - libcamera-apps unconditionally uses linux/dma-heap.h since version 1.3.0 and https://github.com/raspberrypi/rpicam-apps/commit/11338687635cc5564c348c2f60c8c58c5779151d which is only available since kernel >= 5.5 and https://github.com/torvalds/linux/commit/a69b0e855d3fd278ff6f09a23e1edf929538e304 - This bump will fix the following build failure raised since bump of libcamera to version 0.3.0 in commit 82efc2faa923e8881748738963be1fbe3cb2bb45: /workdir/instance-1/output-1/build/libcamera-apps-1.2.1/core/libcamera_app.cpp: In member function 'void LibcameraApp::ConfigureViewfinder()': /workdir/instance-1/output-1/build/libcamera-apps-1.2.1/core/libcamera_app.cpp:327:25: error: 'class libcamera::CameraConfiguration' has no member named 'transform' 327 | configuration_->transform = options_->transform; | ^~~~~~~~~ It shall be noted that upstream changed its name from libcamera-apps to rpicam-apps perhaps the package shall also be renamed on buildroot side Fixes: 82efc2faa923e8881748738963be1fbe3cb2bb45 - http://autobuild.buildroot.org/results/18bb6d9c88c1a813a350658b251293744e161916 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcamera-apps/Config.in | 9 ++++-- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 32 ++++++++++------------ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index 711fd6de05f..f169d8c52e2 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libcamera depends on !BR2_STATIC_LIBS # gnutls/libcamera depends on BR2_USE_WCHAR # gnutls/libcamera/boost + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_JPEG @@ -24,7 +25,9 @@ config BR2_PACKAGE_LIBCAMERA_APPS https://github.com/raspberrypi/libcamera-apps -comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8" +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, headers >= 5.5" depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index 1437a0e8fa0..00b499d2471 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e6b74a0ba10a962f1930199d7dd828c8d9ee370dfe1fdfd8ae2638df744f1344 libcamera-apps-1.2.1.tar.gz +sha256 576bcd585f1c8d8bc80e37fa3c8a172e9d1c8406490438cf6d0fbc7ba4996ec1 rpicam-apps-1.5.0.tar.xz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 2a217f095f9..17983bb8ca7 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.2.1 -LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_VERSION = 1.5.0 +LIBCAMERA_APPS_SOURCE = rpicam-apps-$(LIBCAMERA_APPS_VERSION).tar.xz +LIBCAMERA_APPS_SITE = https://github.com/raspberrypi/rpicam-apps/releases/download/v$(LIBCAMERA_APPS_VERSION) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt LIBCAMERA_APPS_DEPENDENCIES = \ @@ -18,42 +19,37 @@ LIBCAMERA_APPS_DEPENDENCIES = \ tiff LIBCAMERA_APPS_CONF_OPTS = \ - -DENABLE_COMPILE_FLAGS_FOR_TARGET=disabled \ - -DENABLE_OPENCV=0 \ - -DENABLE_TFLITE=0 + -Denable_opencv=disabled \ + -Denable_tflite=disabled ifeq ($(BR2_PACKAGE_LIBDRM),y) LIBCAMERA_APPS_DEPENDENCIES += libdrm -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +LIBCAMERA_APPS_CONF_OPTS += -Denable_drm=enabled else -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +LIBCAMERA_APPS_CONF_OPTS += -Denable_drm=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +LIBCAMERA_APPS_CONF_OPTS += -Denable_libav=enabled else -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +LIBCAMERA_APPS_CONF_OPTS += -Denable_libav=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11) -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=1 +LIBCAMERA_APPS_CONF_OPTS += -Denable_egl=enabled else -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_X11=0 +LIBCAMERA_APPS_CONF_OPTS += -Denable_egl=disabled endif ifeq ($(BR2_PACKAGE_QT5),y) LIBCAMERA_APPS_DEPENDENCIES += qt5base -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=1 +LIBCAMERA_APPS_CONF_OPTS += -Denable_qt=enabled else -LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 +LIBCAMERA_APPS_CONF_OPTS += -Denable_qt=disabled endif -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -endif - -$(eval $(cmake-package)) +$(eval $(meson-package)) From 3f31c4ef33eff191fc17cd0f8aa4d3d4ad9ed2c4 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 23 Jul 2024 19:28:15 +0300 Subject: [PATCH 2042/3013] package/uuu: update upstream link NXP repositories moved to a new location. The old URL redirects to the new one. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/uuu/Config.in.host | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/Config.in.host b/package/uuu/Config.in.host index 0ed064feb6e..99f20ee0709 100644 --- a/package/uuu/Config.in.host +++ b/package/uuu/Config.in.host @@ -12,7 +12,7 @@ config BR2_PACKAGE_HOST_UUU sudo sh -c "uuu -udev >> /etc/udev/rules.d/70-uuu.rules" sudo udevadm control --reload - https://github.com/NXPmicro/mfgtools + https://github.com/nxp-imx/mfgtools comment "host uuu needs a toolchain w/ host gcc >= 4.9" depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 63556b9938a..e57828a0ca6 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -6,7 +6,7 @@ UUU_VERSION = 1.5.182 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz -UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) +UUU_SITE = https://github.com/nxp-imx/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE HOST_UUU_DEPENDENCIES = \ From bfa3c1932fd5127b73eae1549a84b9c4125e3e0a Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 23 Jul 2024 18:30:25 +0200 Subject: [PATCH 2043/3013] board/qemu/arm-vexpress-tz: fix typos in readme file Fix typos in QEMU arm-vexpress-tz readme file where 'i.e.' occurrences should be replaced with 'e.g.'. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- board/qemu/arm-vexpress-tz/readme.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 3e84fe63919..920777afd46 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -26,7 +26,7 @@ If you want to emulate more cores, use "-smp {1|2|3|4}" to select the number of cores. Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" -brings network support that is used i.e. in OP-TEE regression tests. +brings network support that is used e.g. in OP-TEE regression tests. -- Boot Details -- @@ -38,7 +38,7 @@ non-secure bootloader (BL33 stage). QEMU natively hosts and loads in RAM the QEMU ARM target device tree. OP-TEE reads and modifies its content according to OP-TEE configuration. -Enable TF-A traces from LOG_LEVEL (I.e LOG_LEVEL=40) from +Enable TF-A traces from LOG_LEVEL (e.g. LOG_LEVEL=40) from BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. @@ -53,7 +53,7 @@ serial interface. The OP-TEE OS uses the QEMU second serial interface. To get the OP-TEE OS traces, append a second -serial argument after --serial stdio in the QEMU command line. I.e, the following enables 2 serial +-serial stdio in the QEMU command line. E.g., the following enables 2 serial consoles over telnet connections: cd output/images && ../host/bin/qemu-system-arm \ From 7fbc163cf2eb83db289fdf4615c6d5d8ec5665fb Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Tue, 23 Jul 2024 17:03:47 +0200 Subject: [PATCH 2044/3013] package/nilfs-utils: bump to 2.2.11 Signed-off-by: Kurt Van Dijck Signed-off-by: Thomas Petazzoni --- package/nilfs-utils/nilfs-utils.hash | 2 +- package/nilfs-utils/nilfs-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nilfs-utils/nilfs-utils.hash b/package/nilfs-utils/nilfs-utils.hash index ec71751b00b..750243216f4 100644 --- a/package/nilfs-utils/nilfs-utils.hash +++ b/package/nilfs-utils/nilfs-utils.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha512 dd8ab20ee0d6750a6d81f86fe4d1ad94a8a71aa53ee7cd38550ea32fffcc9527db1c75d34f732f0f8f6379a808249f8eec2619e54c595566a3fc434a87d9e66d nilfs-utils-2.2.9.tar.bz2 +sha512 8c238f961f429c12674695d2481202c8fac4582d04e838ce7244647b8a9997e38b4dafa280314acb57ae40137711c7678de6aaf65708c110028df97c1c76089e nilfs-utils-2.2.11.tar.bz2 sha512 4fc92d3998910acb108f81b1aee70a55a572b661a2766d0e57a55e48e2b737eea41415356cbd62593f26aec5797ab9fbb40211d7782b5834b4855ff1ce6ad5f7 COPYING diff --git a/package/nilfs-utils/nilfs-utils.mk b/package/nilfs-utils/nilfs-utils.mk index 9f9bd091c3e..1c8b7e245cc 100644 --- a/package/nilfs-utils/nilfs-utils.mk +++ b/package/nilfs-utils/nilfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NILFS_UTILS_VERSION = 2.2.9 +NILFS_UTILS_VERSION = 2.2.11 NILFS_UTILS_SOURCE = nilfs-utils-$(NILFS_UTILS_VERSION).tar.bz2 NILFS_UTILS_SITE = https://nilfs.sourceforge.io/download NILFS_UTILS_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) From fcfc399b1dfca3601a0d5734ad1ceaaf91f9f50f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 18:25:33 +0200 Subject: [PATCH 2045/3013] package/dvb-apps: fix build with gcc >= 14 Workaround for glibc 2.31 added by commit bbe170dbcf4ddb63e76299214e2c18b16e5cf016 back in 2020 is incorrect as it writes new_time (a pointer on time_t) into timespec.tv_sec (i.e. time_t). This mistake raises the following build failure with gcc >= 14: dvbdate.c: In function 'set_time': dvbdate.c:313:18: error: assignment to '__time_t' {aka 'long int'} from 'time_t *' {aka 'long int *'} makes integer from pointer without a cast [-Wint-conversion] 313 | s.tv_sec = new_time; | ^ It shall be noted that gentoo also spotted this mistake: https://gitweb.gentoo.org/repo/gentoo.git/commit/media-tv/linuxtv-dvb-apps/files?id=81e99f1c753d1cb564be29b22dcd8927830c4b9a Fixes: bbe170dbcf4ddb63e76299214e2c18b16e5cf016 - http://autobuild.buildroot.org/results/e99b9ebf602d307fbc32f2a367e95177f53a68f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dvb-apps/0006-fix-glibc-2.31.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/dvb-apps/0006-fix-glibc-2.31.patch b/package/dvb-apps/0006-fix-glibc-2.31.patch index 079a24f1498..51c03d3e2e2 100644 --- a/package/dvb-apps/0006-fix-glibc-2.31.patch +++ b/package/dvb-apps/0006-fix-glibc-2.31.patch @@ -4,6 +4,8 @@ as stime func doesn't exists anymore in newer versions of glibc >= 2.31 due to obseletion, a replacment with clock_settime is inorder to fix the issue. Signed-off-by: Dagg Stompler +[Fabrice: fix for gcc >= 14] +Signed-off-by: Fabrice Fontaine --- a/util/dvbdate/dvbdate.c +++ b/util/dvbdate/dvbdate.c @@ -13,7 +15,7 @@ Signed-off-by: Dagg Stompler { - if (stime(new_time)) { + struct timespec s = {0}; -+ s.tv_sec = new_time; ++ s.tv_sec = *new_time; + + if (clock_settime(CLOCK_REALTIME, &s)) { perror("Unable to set time"); From 213c5c0191be022671aa726902dd7dfef5899c6e Mon Sep 17 00:00:00 2001 From: Lance Fredrickson Date: Tue, 23 Jul 2024 14:24:23 -0600 Subject: [PATCH 2046/3013] package/wireless-regdb: bump version to 2024.07.04 Signed-off-by: Lance Fredrickson Signed-off-by: Thomas Petazzoni --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 71f92aaf916..ca115515790 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 26d4c2a727cc59239b84735aad856b7c7d0b04e30aa5c235c4f7f47f5f053491 wireless-regdb-2023.09.01.tar.xz +sha256 9832a14e1be24abff7be30dee3c9a1afb5fdfcf475a0d91aafef039f8d85f5eb wireless-regdb-2024.07.04.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 5c8ef963983..b1ec4cb97e4 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2023.09.01 +WIRELESS_REGDB_VERSION = 2024.07.04 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From a73ef093f7b40297d69c6813c44fd4626883632e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 22:37:37 +0200 Subject: [PATCH 2047/3013] package/libdex: needs ucontext libdex needs ucontext since its addition in commit 70319b47f646f74f407ed3355baf5b581a10518a: /home/autobuild/autobuild/instance-11/output-1/host/lib/gcc/aarch64-buildroot-linux-musl/13.3.0/../../../../aarch64-buildroot-linux-musl/bin/ld: src/libdex-1.a.p/dex-fiber.c.o: in function `dex_fiber_context_init': /home/autobuild/autobuild/instance-11/output-1/build/libdex-0.6.1/build/../src/dex-fiber-context-private.h:131:(.text+0x30c): undefined reference to `getcontext' [...] In file included from ../src/dex-fiber-private.h:34, from ../src/dex-scheduler.c:25: ../src/dex-fiber-context-private.h: In function '_dex_fiber_context_makecontext': ../src/dex-fiber-context-private.h:108:3: error: implicit declaration of function 'makecontext' [-Werror=implicit-function-declaration] 108 | makecontext (ucontext, | ^~~~~~~~~~~ Fixes: 70319b47f646f74f407ed3355baf5b581a10518a - http://autobuild.buildroot.org/results/5f23b0e41f2957b0562c5d168f35e42f13bdad0b - http://autobuild.buildroot.org/results/67d958e9a8e1dfb147ac7be4fcb74fcafbbce987 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libdex/Config.in | 10 ++++++++-- package/libdex/libdex.mk | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/libdex/Config.in b/package/libdex/Config.in index f10bdac46f1..5f94a79b73b 100644 --- a/package/libdex/Config.in +++ b/package/libdex/Config.in @@ -3,7 +3,11 @@ config BR2_PACKAGE_LIBDEX depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2, gettext depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_TOOLCHAIN_HAS_UCONTEXT || \ + BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBUCONTEXT if \ + BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS && !BR2_TOOLCHAIN_HAS_UCONTEXT help Dex provides Future-based programming for GLib-based applications. It both integrates with and brings new @@ -12,6 +16,8 @@ config BR2_PACKAGE_LIBDEX https://gitlab.gnome.org/GNOME/libdex -comment "libdex needs a toolchain w/ wchar, threads" +comment "libdex needs a toolchain w/ wchar, threads, ucontext" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !(BR2_TOOLCHAIN_HAS_UCONTEXT || \ + BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS) diff --git a/package/libdex/libdex.mk b/package/libdex/libdex.mk index 7c652a04093..360b3892551 100644 --- a/package/libdex/libdex.mk +++ b/package/libdex/libdex.mk @@ -22,6 +22,11 @@ LIBDEX_CONF_OPTS = \ -Deventfd=enabled \ -Dintrospection=disabled +ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) +LIBDEX_DEPENDENCIES += libucontext +LIBDEX_LDFLAGS += $(TARGET_LDFLAGS) -lucontext +endif + ifeq ($(BR2_PACKAGE_LIBURING),y) LIBDEX_CONF_OPTS += -Dliburing=enabled LIBDEX_DEPENDENCIES += liburing From 28be64c1e0ad0ba014257cda116c2f07236d0d4b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 22:53:06 +0200 Subject: [PATCH 2048/3013] package/speex: ARM5E needs ARM mode Add a dependency on ARM mode for ARM5E to fix the following build failure on Cortex-M3 which only supports Thumb2 mode: /tmp/ccJHSu7y.s:158: Error: selected processor does not support `smulbb r1,r6,lr' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1575da3a8ea2bcde7fa9885df317a12d5c36918f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speex/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/speex/Config.in b/package/speex/Config.in index c4e3df5dcd3..134e6e4b35b 100644 --- a/package/speex/Config.in +++ b/package/speex/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_SPEEX_ARM4 config BR2_PACKAGE_SPEEX_ARM5E bool default y - depends on BR2_arm && !BR2_PACKAGE_SPEEX_ARM4 + depends on BR2_arm && BR2_ARM_CPU_HAS_ARM && \ + !BR2_PACKAGE_SPEEX_ARM4 endif From 380cdf5c95f2e962b63269d8cf45a8939275d8e0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 22:55:43 +0200 Subject: [PATCH 2049/3013] package/xz: fix largefile option Fix typo in --enable-largefile added by commit 25254458bde6befcbf93b746d994f94665741c42 Fixes: 25254458bde6befcbf93b746d994f94665741c42 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xz/xz.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index e295144ed1b..8dfd76f8b9b 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -38,7 +38,7 @@ XZ_CONF_OPTS = \ --enable-sandbox=auto \ --enable-symbol-versions \ --enable-rpath \ - --enable-largfile \ + --enable-largefile \ --enable-unaligned-access=auto \ --disable-unsafe-type-punning \ --disable-werror \ From d79f40dbbe98983bc657d4c82d46b38b8283351b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 14:01:40 +0200 Subject: [PATCH 2050/3013] package/procps-ng: security bump to version 4.0.4 - Fixes CVE-2023-4016 - Drop all patches (already in version) and so also drop autoreconf - This bump will also fix the following build failure with gcc >= 14: pgrep.c: In function 'main': pgrep.c:1066:37: error: implicit declaration of function 'pidfd_open'; did you mean 'fdopen'? [-Wimplicit-function-declaration] 1066 | int pidfd = pidfd_open(procs[i].num, 0); | ^~~~~~~~~~ | fdopen https://gitlab.com/procps-ng/procps/-/blob/v4.0.4/NEWS Fixes: - http://autobuild.buildroot.org/results/bd7b49123905c580842a3dd3b7a338d5aedf55d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 - .../0001-configure-Add--disable-w.patch | 93 ------------------- ...ssing-nl_langinfo-on-certain-configs.patch | 34 ------- .../procps-ng/0003-fix-pifd_open-check.patch | 59 ------------ package/procps-ng/procps-ng.hash | 8 +- package/procps-ng/procps-ng.mk | 4 +- 6 files changed, 5 insertions(+), 196 deletions(-) delete mode 100644 package/procps-ng/0001-configure-Add--disable-w.patch delete mode 100644 package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch delete mode 100644 package/procps-ng/0003-fix-pifd_open-check.patch diff --git a/.checkpackageignore b/.checkpackageignore index bd93f87dfb9..53b55fb993c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1115,9 +1115,6 @@ package/pptp-linux/0002-fix-parallel-build.patch lib_patch.Upstream package/prboom/0001-libpng-1.4.patch lib_patch.Upstream package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch lib_patch.Upstream package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch lib_patch.Upstream -package/procps-ng/0001-configure-Add--disable-w.patch lib_patch.Upstream -package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch lib_patch.Upstream -package/procps-ng/0003-fix-pifd_open-check.patch lib_patch.Upstream package/procps-ng/S02sysctl lib_sysv.Variables package/proftpd/S50proftpd Shellcheck lib_sysv.Indent lib_sysv.Variables package/prosody/0001-enable-syslog.patch lib_patch.Upstream diff --git a/package/procps-ng/0001-configure-Add--disable-w.patch b/package/procps-ng/0001-configure-Add--disable-w.patch deleted file mode 100644 index 8a699df5a62..00000000000 --- a/package/procps-ng/0001-configure-Add--disable-w.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 1524a625e693b956ce0b5091c9f89f24fb7e8614 Mon Sep 17 00:00:00 2001 -From: "Issam E. Maghni" -Date: Fri, 23 Apr 2021 15:58:36 -0400 -Subject: [PATCH] configure: Add --disable-w - -[Retrieved (and backported) from: -https://gitlab.com/procps-ng/procps/-/commit/1524a625e693b956ce0b5091c9f89f24fb7e8614] -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 21 +++++++++++++++------ - configure.ac | 6 ++++++ - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index de15e137..d2356872 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -47,8 +47,7 @@ bin_PROGRAMS = \ - pwdx \ - tload \ - uptime \ -- vmstat \ -- w -+ vmstat - if BUILD_PWAIT - bin_PROGRAMS += pwait - endif -@@ -60,8 +59,7 @@ usrbin_exec_PROGRAMS += \ - pkill \ - pmap \ - uptime \ -- vmstat \ -- w -+ vmstat - endif - - lib_LTLIBRARIES = \ -@@ -74,7 +72,6 @@ dist_man_MANS = \ - pmap.1 \ - uptime.1 \ - vmstat.8 \ -- w.1 \ - ps/procps.1 - - if !CYGWIN -@@ -137,6 +134,19 @@ else - EXTRA_DIST += kill.1 - endif - -+if BUILD_W -+if CYGWIN -+usrbin_exec_PROGRAMS += w -+else -+bin_PROGRAMS += w -+endif -+ -+dist_man_MANS += w.1 -+w_SOURCES = w.c lib/fileutils.c -+else -+ EXTRA_DIST += w.1 -+endif -+ - if WITH_NCURSES - if !CYGWIN - bin_PROGRAMS += \ -@@ -213,7 +223,6 @@ endif - tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c - uptime_SOURCES = uptime.c lib/fileutils.c - vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c --w_SOURCES = w.c lib/fileutils.c - - # proc/libprocps.la - -diff --git a/configure.ac b/configure.ac -index 750c0fbb..3e83fb88 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -234,6 +234,12 @@ AC_ARG_ENABLE([kill], - [], [enable_kill=yes] - ) - AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes) -+AC_ARG_ENABLE([w], -+ AS_HELP_STRING([--disable-w], [do not build w]), -+ [], [enable_w=yes] -+) -+AM_CONDITIONAL(BUILD_W, test "x$enable_w" = xyes) -+ - AM_CONDITIONAL(LINUX, test "x$host_os" = xlinux-gnu) - AM_CONDITIONAL(CYGWIN, test "x$host_os" = xcygwin) - --- -GitLab - diff --git a/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch b/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch deleted file mode 100644 index f3e2b126a6f..00000000000 --- a/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2763b9880a7aab569694d6ee3170dd7341a26b84 Mon Sep 17 00:00:00 2001 -From: "Issam E. Maghni" -Date: Fri, 23 Apr 2021 16:53:39 -0400 -Subject: [PATCH] escape.c: Fix missing nl_langinfo on certain configs - -[Retrieved from: -https://gitlab.com/procps-ng/procps/-/commit/2763b9880a7aab569694d6ee3170dd7341a26b84] -Signed-off-by: Fabrice Fontaine ---- - proc/escape.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/proc/escape.c b/proc/escape.c -index 2e8fb7dd..cf4a80de 100644 ---- a/proc/escape.c -+++ b/proc/escape.c -@@ -24,13 +24,13 @@ - #include "procps.h" - #include "escape.h" - #include "readproc.h" -+#include "nls.h" - - #if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - # include - # include - # include /* MB_CUR_MAX */ - # include --# include - #endif - - #define SECURE_ESCAPE_ARGS(dst, bytes, cells) do { \ --- -GitLab - diff --git a/package/procps-ng/0003-fix-pifd_open-check.patch b/package/procps-ng/0003-fix-pifd_open-check.patch deleted file mode 100644 index 7152901e707..00000000000 --- a/package/procps-ng/0003-fix-pifd_open-check.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0cce3e981540c28d2f703b9ab16c04d0df8fa03d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 3 Nov 2022 18:24:53 +0100 -Subject: [PATCH] fix pifd_open check - -Replace AC_CHECK_FUNC by AC_CHECK_FUNCS otherwise HAVE_PIDFD_OPEN will -never be defined resulting in the following build failure if pidfd_open -is available but __NR_pidfd_open is not available: - -pgrep.c: In function 'pidfd_open': -pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? - 748 | return syscall(__NR_pidfd_open, pid, flags); - | ^~~~~~~~~~~~~~~ - | pidfd_open - -This build failure is raised since the addition of pwait in version -3.3.17 and -https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da - -Fixes: - - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/procps-ng/procps/-/merge_requests/166] ---- - configure.ac | 2 +- - src/pgrep.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 629881a6..1a3ccdb8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,7 +160,7 @@ AC_TRY_COMPILE([#include ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - --AC_CHECK_FUNC([pidfd_open], [enable_pwait=yes], [ -+AC_CHECK_FUNCS([pidfd_open], [enable_pwait=yes], [ - AC_MSG_CHECKING([for __NR_pidfd_open]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include -diff --git a/pgrep.c b/pgrep.c -index c4ad5da3..29cfedf7 100644 ---- a/pgrep.c -+++ b/pgrep.c -@@ -38,7 +38,7 @@ - #include - #include - --#if defined(ENABLE_PWAIT) && !defined(HAVE_PIDFD_OPEN) -+#if defined(ENABLE_PWAIT) - #include - #include - #endif --- -2.35.1 - diff --git a/package/procps-ng/procps-ng.hash b/package/procps-ng/procps-ng.hash index 09f2ebd0cb0..0d9cd9a8358 100644 --- a/package/procps-ng/procps-ng.hash +++ b/package/procps-ng/procps-ng.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 d60613e88c2f442ebd462b5a75313d56 procps-ng-3.3.17.tar.xz -sha1 a52952e8bc6aaab812176c00d25adc4d4e1552e2 procps-ng-3.3.17.tar.xz +md5 2f747fc7df8ccf402d03e375c565cf96 procps-ng-4.0.4.tar.xz +sha1 2b859acd7060e9898ac457dbd26dbebf563cc44b procps-ng-4.0.4.tar.xz # Locally calculated after checking signature -# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.17.tar.xz.asc -sha256 4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4 procps-ng-3.3.17.tar.xz +# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.4.tar.xz.asc +sha256 22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e procps-ng-4.0.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LIB diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index ba8958d146e..c5675e2ee6e 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -4,15 +4,13 @@ # ################################################################################ -PROCPS_NG_VERSION = 3.3.17 +PROCPS_NG_VERSION = 4.0.4 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB PROCPS_NG_CPE_ID_VALID = YES PROCPS_NG_INSTALL_STAGING = YES -# We're patching configure.ac -PROCPS_NG_AUTORECONF = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) From 940d2ccfbb488acb45fb106e41ae5f0b06a116aa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 14:31:45 +0200 Subject: [PATCH 2051/3013] package/quotatool: bump to version 1.6.4 - Switch site to get latest release - Send patch upstream - This bump will fix the following build failure with gcc >= 14: src/main.c: In function 'main': src/main.c:211:17: error: implicit declaration of function 'quota_reset_grace'; did you mean 'xfs_reset_grace'? [-Wimplicit-function-declaration] 211 | if (! quota_reset_grace(quota, (argdata->block_reset ? GRACE_BLOCK : GRACE_INODE))) | ^~~~~~~~~~~~~~~~~ | xfs_reset_grace https://github.com/ekenberg/quotatool/blob/v1.6.4/ChangeLog Fixes: - http://autobuild.buildroot.org/results/1855bc61fb231fadab77840dcd7ef75c414fe5be Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-fix-missing-__P-definition-for-musl-compile.patch | 1 + package/quotatool/quotatool.hash | 2 +- package/quotatool/quotatool.mk | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 53b55fb993c..b84fa90bbd8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1186,7 +1186,6 @@ package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch lib_patch.Upstream package/quagga/0001-fix-ipctl-forwarding.patch lib_patch.Upstream package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/quagga/0003-Fix-build-with-gcc-10.patch lib_patch.Upstream -package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch lib_patch.Upstream package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream diff --git a/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch b/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch index 927e62ba8cf..534c7fe945f 100644 --- a/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch +++ b/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch @@ -15,6 +15,7 @@ Fixes: ^~~ Signed-off-by: Peter Seiderer +Upstream: https://github.com/ekenberg/quotatool/pull/28 --- src/linux/linux_quota.h | 1 + 1 file changed, 1 insertion(+) diff --git a/package/quotatool/quotatool.hash b/package/quotatool/quotatool.hash index d41fd4ed1b3..9ce9ceaec1d 100644 --- a/package/quotatool/quotatool.hash +++ b/package/quotatool/quotatool.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 e53adc480d54ae873d160dc0e88d78095f95d9131e528749fd982245513ea090 quotatool-1.6.2.tar.gz +sha256 ef6b0494c505278ae140d1e105417d73703b4b9e08a1ee1f95dca1e0c19497b7 quotatool-1.6.4.tar.gz # Hash for license files: sha256 94686eeb98a40edc64106c6f8644068d8a08816a510a3cde75e50f1bf470564d COPYING diff --git a/package/quotatool/quotatool.mk b/package/quotatool/quotatool.mk index 7b63c01316c..5a60ff7bc1b 100644 --- a/package/quotatool/quotatool.mk +++ b/package/quotatool/quotatool.mk @@ -4,8 +4,8 @@ # ################################################################################ -QUOTATOOL_VERSION = 1.6.2 -QUOTATOOL_SITE = http://quotatool.ekenberg.se +QUOTATOOL_VERSION = 1.6.4 +QUOTATOOL_SITE = $(call github,ekenberg,quotatool,v$(QUOTATOOL_VERSION)) QUOTATOOL_LICENSE = GPL-2.0 QUOTATOOL_LICENSE_FILES = COPYING From 00c10e5fcef2ea98fd492e9c5a371ec960039d7a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 23:13:00 +0200 Subject: [PATCH 2052/3013] package/dvb-apps: drop package As advocated by Thomas Petazzoni [1], drop dvb-apps as package is not maintained anymore. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20240723162533.549929-1-fontaine.fabrice@gmail.com Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 6 --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - .../dvb-apps/0001-Fix-generate-keynames.patch | 30 ----------- .../0002-Fix-compiler-warning-flags.patch | 44 ---------------- ...0003-handle-static-shared-only-build.patch | 44 ---------------- .../dvb-apps/0004-Makefile-remove-test.patch | 27 ---------- ...s-fix-build-with-kernel-headers-4.14.patch | 52 ------------------- package/dvb-apps/0006-fix-glibc-2.31.patch | 23 -------- package/dvb-apps/Config.in | 14 ----- package/dvb-apps/dvb-apps.hash | 6 --- package/dvb-apps/dvb-apps.mk | 44 ---------------- 13 files changed, 7 insertions(+), 292 deletions(-) delete mode 100644 package/dvb-apps/0001-Fix-generate-keynames.patch delete mode 100644 package/dvb-apps/0002-Fix-compiler-warning-flags.patch delete mode 100644 package/dvb-apps/0003-handle-static-shared-only-build.patch delete mode 100644 package/dvb-apps/0004-Makefile-remove-test.patch delete mode 100644 package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch delete mode 100644 package/dvb-apps/0006-fix-glibc-2.31.patch delete mode 100644 package/dvb-apps/Config.in delete mode 100644 package/dvb-apps/dvb-apps.hash delete mode 100644 package/dvb-apps/dvb-apps.mk diff --git a/.checkpackageignore b/.checkpackageignore index b84fa90bbd8..5e45edf7658 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -470,12 +470,6 @@ package/dropbear/S50dropbear Shellcheck lib_sysv.Indent lib_sysv.Variables package/dt/0001-adjust-os-symlink.patch lib_patch.Upstream package/dt/0002-dt-default-source-define.patch lib_patch.Upstream package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch lib_patch.Upstream -package/dvb-apps/0001-Fix-generate-keynames.patch lib_patch.Upstream -package/dvb-apps/0002-Fix-compiler-warning-flags.patch lib_patch.Upstream -package/dvb-apps/0003-handle-static-shared-only-build.patch lib_patch.Upstream -package/dvb-apps/0004-Makefile-remove-test.patch lib_patch.Upstream -package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch lib_patch.Upstream -package/dvb-apps/0006-fix-glibc-2.31.patch lib_patch.Upstream package/dvblast/0001-missing-lm.patch lib_patch.Upstream package/dvblast/0002-fix-int-types.patch lib_patch.Upstream package/dvbsnoop/0001-musl-types-h.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 94ac60b668c..da6f24366cb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_DVB_APPS + bool "dvb-apps package removed" + select BR2_LEGACY + help + The dvb-apps package was removed as it is not maintained + anymore (no commit since 2014). + config BR2_PACKAGE_GAMIN bool "gamin package removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 3650321d6f6..9a8c92f122a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3339,7 +3339,6 @@ F: package/dahdi-tools/ F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ -F: package/dvb-apps/ F: package/freerdp/ F: package/keyutils/ F: package/libbsd/ diff --git a/package/Config.in b/package/Config.in index 20585d53d09..90f1ecc8771 100644 --- a/package/Config.in +++ b/package/Config.in @@ -502,7 +502,6 @@ endmenu source "package/dtbocfg/Config.in" source "package/dtv-scan-tables/Config.in" source "package/dump1090/Config.in" - source "package/dvb-apps/Config.in" source "package/dvbsnoop/Config.in" source "package/edid-decode/Config.in" source "package/edk2-non-osi/Config.in" diff --git a/package/dvb-apps/0001-Fix-generate-keynames.patch b/package/dvb-apps/0001-Fix-generate-keynames.patch deleted file mode 100644 index 498607d97db..00000000000 --- a/package/dvb-apps/0001-Fix-generate-keynames.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix generate-keynames.sh script for cross-compilation - -generate-keynames.sh reads /usr/include/linux to find the keyname -symbols. However, when cross-compiling, the include path points -somewhere else. Allow the user to pass CROSS_ROOT to point to the -root of the cross-compilation environment. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh ---- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh 2012-12-06 10:38:07.000000000 +0100 -+++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh 2013-08-29 21:47:09.717991439 +0200 -@@ -18,7 +18,7 @@ echo "};" >> $1 - echo >> $1 - echo >> $1 - echo "static struct input_key_name key_name [] = {" >> $1 --for x in $(cat /usr/include/linux/input.h input_fake.h | \ -+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \ - egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \ - cut -f 1 | cut -f 2 -d " " | sort -u) ; do - echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 -@@ -26,7 +26,7 @@ done - echo "};" >> $1 - echo >> $1 - echo "static struct input_key_name btn_name [] = {" >> $1 --for x in $(cat /usr/include/linux/input.h input_fake.h | \ -+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \ - egrep "#define[ \t]+BTN_" | \ - cut -f 1 | cut -f 2 -d " " | sort -u) ; do - echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 diff --git a/package/dvb-apps/0002-Fix-compiler-warning-flags.patch b/package/dvb-apps/0002-Fix-compiler-warning-flags.patch deleted file mode 100644 index 9c6276beb7d..00000000000 --- a/package/dvb-apps/0002-Fix-compiler-warning-flags.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9b8f1df41f7579da63c27763ff184d351e4c7fef Mon Sep 17 00:00:00 2001 -From: Simon Dawson -Date: Sun, 4 Jan 2015 12:06:18 +0100 -Subject: [PATCH] Fix compiler warning flags - - When building for bfin, the build fails as follows. - - cc1: error: unrecognized command line option "-Wno-packed-bitfield-compat" - -An example of an autobuild failure arising from this is the following. - - http://autobuild.buildroot.net/results/92e/92e472004812a3616f62d766a9ea07a997a66e89/ - http://autobuild.buildroot.net/results/6e7/6e7b48ad9768349d983985c3067c4267cde80541/ - -Clearly, not all toolchains provide a gcc that understands -the -Wno-packed-bitfield-compat flag; remove usage of this flag. - -Wno-packed-bitfield-compat option was added in gcc 4.4. - -[Romain: - - This patch is also needed for bfin toolchains which use gcc 4.3.5 - - Add a link to bfin build failure] -Signed-off-by: Simon Dawson -Signed-off-by: Romain Naour ---- - util/scan/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/scan/Makefile b/util/scan/Makefile -index d48c478..88667c5 100644 ---- a/util/scan/Makefile -+++ b/util/scan/Makefile -@@ -14,7 +14,7 @@ inst_bin = $(binaries) - - removing = atsc_psip_section.c atsc_psip_section.h - --CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES -+CPPFLAGS += -D__KERNEL_STRICT_NAMES - - .PHONY: all - --- -1.9.3 - diff --git a/package/dvb-apps/0003-handle-static-shared-only-build.patch b/package/dvb-apps/0003-handle-static-shared-only-build.patch deleted file mode 100644 index 4dc7c68ac2c..00000000000 --- a/package/dvb-apps/0003-handle-static-shared-only-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a826c7c722db40bfedf00e51ce38411550ae8216 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 25 Dec 2014 19:22:16 +0100 -Subject: [PATCH] Make.rules: Handle static/shared only build - -Do not build .a library when enable_static is set to "no" -Do not build .so library when enable_shared is set to "no" - -Signed-off-by: Romain Naour ---- - Make.rules | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Make.rules b/Make.rules -index 3410d7b..d274e16 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -9,7 +9,13 @@ ifneq ($(lib_name),) - CFLAGS_LIB ?= -fPIC - CFLAGS += $(CFLAGS_LIB) - --libraries = $(lib_name).so $(lib_name).a -+ifneq ($(enable_static),no) -+libraries += $(lib_name).a -+endif -+ -+ifneq ($(enable_shared),no) -+libraries += $(lib_name).so -+endif - - .PHONY: library - -@@ -23,7 +29,7 @@ prerequisites = $(subst .o,.d,$(objects)) $(addsuffix .d,$(binaries)) - - .PHONY: clean install - --ifeq ($(static),1) -+ifneq ($(enable_static),no) - LDFLAGS += -static - endif - --- -1.9.3 - diff --git a/package/dvb-apps/0004-Makefile-remove-test.patch b/package/dvb-apps/0004-Makefile-remove-test.patch deleted file mode 100644 index 45bfad914c2..00000000000 --- a/package/dvb-apps/0004-Makefile-remove-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c578772d6abc5fdf3ec83f632c371373e5baf9f1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 26 Dec 2014 01:04:58 +0100 -Subject: [PATCH] Makefile: remove test - -Tests needs static libraries, remove them for shared only build. - -Signed-off-by: Romain Naour ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 65a2273..105c460 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,6 @@ DVB_API_MINOR := $(word 3, $(shell grep -m1 "DVB_API_VERSION_MINOR" $(VERSION_FI - - all clean install: - $(MAKE) -C lib $@ -- $(MAKE) -C test $@ - $(MAKE) -C util $@ - - update: --- -1.9.3 - diff --git a/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch b/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch deleted file mode 100644 index 279cdecb776..00000000000 --- a/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch +++ /dev/null @@ -1,52 +0,0 @@ -# HG changeset patch -# User "Yann E. MORIN" -# Date 1511772629 -3600 -# Mon Nov 27 09:50:29 2017 +0100 -# Branch yem/fixes -# Node ID 0848fa96c6eb13cf37249d317eff12cbd2f59ff7 -# Parent 3d43b280298c39a67d1d889e01e173f52c12da35 -utils: fix build with kernel headers >= 4.14 - -In kernel 4.14, CA_SET_PID was removed, in commit 833ff5e7feda (media: -ca.h: get rid of CA_SET_PID). - -Fix dst-util to not fail the build when this is missing. - -Fiuxes build failures such as: - http://autobuild.buildroot.org/results/708/708f11809b2cafc2a3375dc515803c87b376ed4d/build-end.log - http://autobuild.buildroot.org/results/e39/e3939d44376e92e8a35fb179d9890510334d8304/build-end.log - -Signed-off-by: "Yann E. MORIN" - -diff --git a/util/dst-utils/dst_test.c b/util/dst-utils/dst_test.c ---- a/util/dst-utils/dst_test.c -+++ b/util/dst-utils/dst_test.c -@@ -111,6 +111,7 @@ - return 0; - } - -+#if defined CA_SET_PID - static int dst_set_pid(int cafd) - { - if ((ioctl(cafd, CA_SET_PID)) < 0) { -@@ -120,6 +121,7 @@ - - return 0; - } -+#endif - - static int dst_get_descr(int cafd) - { -@@ -230,8 +232,12 @@ - dst_reset(cafd); - break; - case 'p': -+#if defined CA_SET_PID - printf("%s: PID\n", __FUNCTION__); - dst_set_pid(cafd); -+#else -+ printf("%s: PID not supported\n", __FUNCTION__); -+#endif - break; - case 'g': - printf("%s: Get Desc\n", __FUNCTION__); diff --git a/package/dvb-apps/0006-fix-glibc-2.31.patch b/package/dvb-apps/0006-fix-glibc-2.31.patch deleted file mode 100644 index 51c03d3e2e2..00000000000 --- a/package/dvb-apps/0006-fix-glibc-2.31.patch +++ /dev/null @@ -1,23 +0,0 @@ -dvbdate: fix compilation error with glibc 2.31 - -as stime func doesn't exists anymore in newer versions of glibc >= 2.31 due -to obseletion, a replacment with clock_settime is inorder to fix the issue. - -Signed-off-by: Dagg Stompler -[Fabrice: fix for gcc >= 14] -Signed-off-by: Fabrice Fontaine - ---- a/util/dvbdate/dvbdate.c -+++ b/util/dvbdate/dvbdate.c -@@ -309,7 +309,10 @@ - */ - int set_time(time_t * new_time) - { -- if (stime(new_time)) { -+ struct timespec s = {0}; -+ s.tv_sec = *new_time; -+ -+ if (clock_settime(CLOCK_REALTIME, &s)) { - perror("Unable to set time"); - return -1; - } diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in deleted file mode 100644 index 75cc14eb9b5..00000000000 --- a/package/dvb-apps/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_DVB_APPS - bool "dvb-apps" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Install a small number of DVB test and utility programs, - including szap and dvbscan. - - http://linuxtv.org/projects.php - http://linuxtv.org/hg/dvb-apps - -comment "dvb-apps utils needs a toolchain w/ threads, headers >= 3.3" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/package/dvb-apps/dvb-apps.hash b/package/dvb-apps/dvb-apps.hash deleted file mode 100644 index d394ced131d..00000000000 --- a/package/dvb-apps/dvb-apps.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Locally computed: -sha256 926208b7e711b4bab1a909ff9bf4e6ae54acdd30a46f5d5bd700ecb088fe1f57 dvb-apps-3d43b280298c39a67d1d889e01e173f52c12da35.tar.gz - -# Hash for license files: -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk deleted file mode 100644 index 161c1f8495f..00000000000 --- a/package/dvb-apps/dvb-apps.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# dvb-apps -# -################################################################################ - -DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35 -DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps -DVB_APPS_SITE_METHOD = hg -DVB_APPS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+ -DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL - -ifeq ($(BR2_ENABLE_LOCALE),) -DVB_APPS_DEPENDENCIES += libiconv -DVB_APPS_LDLIBS += -liconv -endif - -DVB_APPS_MAKE_OPTS = PERL5LIB=$(@D)/util/scan - -ifeq ($(BR2_STATIC_LIBS),y) -DVB_APPS_MAKE_OPTS += enable_shared=no -else ifeq ($(BR2_SHARED_LIBS),y) -DVB_APPS_MAKE_OPTS += enable_static=no -endif - -DVB_APPS_INSTALL_STAGING = YES - -define DVB_APPS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DVB_APPS_LDLIBS)" \ - $(MAKE1) -C $(@D) CROSS_ROOT=$(STAGING_DIR) \ - $(DVB_APPS_MAKE_OPTS) -endef - -define DVB_APPS_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(DVB_APPS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -endef - -define DVB_APPS_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(DVB_APPS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) From 8ce17e304b02c6969e4fd51f0bde97798d49eb3b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 10:53:02 +0200 Subject: [PATCH 2053/3013] package/btrfs-progs: don't install host udev files Pass an empty value for udevdir to avoid the following host build failure on one of the autobuilders: /usr/bin/install -c -m755 -d /usr/lib/udev/rules.d /usr/bin/install -c -m644 64-btrfs-dm.rules 64-btrfs-zoned.rules /usr/lib/udev/rules.d /usr/bin/install: cannot create regular file '/usr/lib/udev/rules.d/64-btrfs-dm.rules': Permission denied /usr/bin/install: cannot create regular file '/usr/lib/udev/rules.d/64-btrfs-zoned.rules': Permission denied This build failure can be raised since the addition of the host variant in commit ed69859a7261ee86e71aa666d30a28e374769e15. udev rules were added by upstream in 2016 by https://github.com/kdave/btrfs-progs/commit/62c0666378eb70285b6a3052bf4144d2132a5891 Fixes: ed69859a7261ee86e71aa666d30a28e374769e15 - http://autobuild.buildroot.org/results/c46238afe8d23cf4bff4e7290a5eaebd0640eb6e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/btrfs-progs/btrfs-progs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 800c0e30820..69424a2d729 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -62,5 +62,7 @@ HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-python \ --disable-convert +HOST_BTRFS_PROGS_INSTALL_OPTS = udevdir= install + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From ee00cfd09e4ffa97019c4e9384cc761995912e28 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 18:38:06 +0200 Subject: [PATCH 2054/3013] package/libressl: fix powerpc64 build Fix the following build failure with powerpc64 raised since bump to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: In file included from /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/rc4/rc4_enc.c:61: /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' 75 | RC4_INT x, y; | ^~~~~~~ Fixes: 21eca49ed5110872407b76ab9337d2877c4cda24 - http://autobuild.buildroot.org/results/2533f8f642f435b40ce687b6df482c51a3fa0250 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ists-txt-Fix-HOST-variable-for-ppc64.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch diff --git a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch new file mode 100644 index 00000000000..8da8fedae27 --- /dev/null +++ b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch @@ -0,0 +1,26 @@ +From e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Fri, 19 Jul 2024 11:41:46 +0200 +Subject: [PATCH] CMakeLists.txt: Fix HOST variable for ppc64 + +The code here defined HOST_PPC64, but the rest of the build system expects HOST_POWERPC64. + +Upstream: https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c496ad97b5..670aa9a1a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -373,7 +373,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") + set(HOST_POWERPC true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") +- set(HOST_PPC64 true) ++ set(HOST_POWERPC64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") + set(HOST_RISCV64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64") From 3720250420d6b35bd217950d7a0648a0ecd0a2b5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 13:01:26 +0200 Subject: [PATCH 2055/3013] package/can-utils: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: j1939acd.c: In function 'main': j1939acd.c:489:38: error: passing argument 1 of 'asprintf' from incompatible pointer type [-Wincompatible-pointer-types] 489 | if (asprintf(&program_invocation_name, "%s.%s", | ^~~~~~~~~~~~~~~~~~~~~~~~ | | | const char ** Fixes: - http://autobuild.buildroot.org/results/1e2a533a936624249cd79d34983c889c3c4c2e3b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...y-poption-prefix-to-use-when-logging.patch | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch diff --git a/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch b/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch new file mode 100644 index 00000000000..36c96d59e45 --- /dev/null +++ b/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch @@ -0,0 +1,79 @@ +From d337863d9189501dbbb15467cc3dcba85946a2a3 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 22 Jul 2024 16:12:04 +0200 +Subject: [PATCH] j1939acd: remove legacy '-p' option (prefix to use when + logging) + +- remove legacy '-p' option (prefix to use when logging), fixes uclibc + compile + +Fixes: + + j1939acd.c: In function 'main': + j1939acd.c:489:38: error: passing argument 1 of 'asprintf' from incompatible pointer type [-Wincompatible-pointer-types] + 489 | if (asprintf(&program_invocation_name, "%s.%s", + | ^~~~~~~~~~~~~~~~~~~~~~~~ + | | + | const char ** + +Signed-off-by: Peter Seiderer +Upstream: https://github.com/linux-can/can-utils/commit/d337863d9189501dbbb15467cc3dcba85946a2a3 +Signed-off-by: Fabrice Fontaine +--- + j1939acd.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/j1939acd.c b/j1939acd.c +index 44bb826c..ae4e58ac 100644 +--- a/j1939acd.c ++++ b/j1939acd.c +@@ -38,7 +38,6 @@ static const char help_msg[] = + " e.g. 80,50-100,200-210 (defaults to 0-253)" "\n" + " -c, --cache=FILE Cache file to save/restore the source address" "\n" + " -a, --address=ADDRESS Start with Source Address ADDRESS" "\n" +- " -p, --prefix=STR Prefix to use when logging" "\n" + "\n" + "NAME is the 64bit nodename" "\n" + "\n" +@@ -54,14 +53,13 @@ static struct option long_opts[] = { + { "range", required_argument, NULL, 'r', }, + { "cache", required_argument, NULL, 'c', }, + { "address", required_argument, NULL, 'a', }, +- { "prefix", required_argument, NULL, 'p', }, + { }, + }; + #else + #define getopt_long(argc, argv, optstring, longopts, longindex) \ + getopt((argc), (argv), (optstring)) + #endif +-static const char optstring[] = "vr:c:a:p:?"; ++static const char optstring[] = "vr:c:a:?"; + + /* byte swap functions */ + static inline int host_is_little_endian(void) +@@ -466,9 +464,6 @@ int main(int argc, char *argv[]) + struct sockaddr_can saddr; + uint64_t cmd_name; + +-#ifdef _GNU_SOURCE +- program_invocation_name = program_invocation_short_name; +-#endif + /* argument parsing */ + while ((opt = getopt_long(argc, argv, optstring, long_opts, NULL)) != -1) + switch (opt) { +@@ -484,15 +479,6 @@ int main(int argc, char *argv[]) + case 'a': + s.current_sa = strtoul(optarg, 0, 0); + break; +- case 'p': +-#ifdef _GNU_SOURCE +- if (asprintf(&program_invocation_name, "%s.%s", +- program_invocation_short_name, optarg) < 0) +- err(1, "asprintf(program invocation name)"); +-#else +- err(0, "compile with -D_GNU_SOURCE to use -p"); +-#endif +- break; + default: + fputs(help_msg, stderr); + exit(1); From 7d684de63f11195c024108d0da72650aafc31f73 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 13:13:58 +0200 Subject: [PATCH 2056/3013] package/wireless-regdb: fix crda build Fix the following build failure raised since bump to version 2024.07.04 in commit 213c5c0191be022671aa726902dd7dfef5899c6e and https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git/commit/?id=37dcea0e6e5effb4228fe385e906edba3cbee389: /usr/bin/install -m 644 -D -T /home/buildroot/autobuild/instance-3/output-1/build/wireless-regdb-2024.07.04/sforshee.key.pub.pem /home/buildroot/autobuild/instance-3/output-1/target/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem /usr/bin/install: cannot stat '/home/buildroot/autobuild/instance-3/output-1/build/wireless-regdb-2024.07.04/sforshee.key.pub.pem': No such file or directory Fixes: 213c5c0191be022671aa726902dd7dfef5899c6e - http://autobuild.buildroot.org/results/9ace181735305cf8e29e0bbace1aec3796c32978 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wireless-regdb/wireless-regdb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index b1ec4cb97e4..fae21687ded 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -14,8 +14,8 @@ ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS $(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \ $(TARGET_DIR)/usr/lib/crda/regulatory.bin - $(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \ - $(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem + $(INSTALL) -m 644 -D -T $(@D)/wens.key.pub.pem \ + $(TARGET_DIR)/etc/wireless-regdb/pubkeys/wens.key.pub.pem endef endif From e7c0125754f12acd18fa29a9ea21e7ca371ffc83 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 25 Jul 2024 11:22:09 +0200 Subject: [PATCH 2057/3013] package/lrzsz: drop unused LRZSZ_POST_CONFIGURE_HOOKS As already done for LRZSZ_BUILD_HOOKS in commit 5fde4abc8d67ac2317b1de7a1b4cde8091f4e3c7, drop bogus LRZSZ_POST_CONFIGURE_HOOKS as this hook added in 2010 is also never called Fixes: 4f3f291a3bfc1893cbfb4d9803c35a4f6752784d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lrzsz/lrzsz.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index d9be23540eb..7247a4bd597 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -13,11 +13,6 @@ LRZSZ_CPE_ID_VALID = YES LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) -define LRZSZ_POST_CONFIGURE_HOOKS - $(SED) "s/-lnsl//;" $(@D)/src/Makefile - $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h -endef - define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz From f97f9bfb5f4d7560cba22967f8437e6a480affb2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 25 Jul 2024 17:30:27 +0200 Subject: [PATCH 2058/3013] package/libtracefs: bump to version 1.8.1 Let's drop local patches since they have been committed. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...-meson-build-tracefs-mmap-by-default.patch | 34 ---------------- ...ATH_MAX-if-it-is-not-already-defined.patch | 40 ------------------- package/libtracefs/libtracefs.hash | 2 +- package/libtracefs/libtracefs.mk | 2 +- 4 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch delete mode 100644 package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch diff --git a/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch b/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch deleted file mode 100644 index 4a462aab66b..00000000000 --- a/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7d15d7744d957b1721d8e202bd5095b7c449570f Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 10 Jan 2024 21:39:25 +0100 -Subject: [PATCH] libtracefs meson: build tracefs-mmap by default - -Accordingly to Makefile let's add tracefs-mmap.c to build, this is needed -for linking by other object files. - -Link: https://lore.kernel.org/linux-trace-devel/20240110203925.266999-1-giulio.benetti@benettiengineering.com - -Signed-off-by: Giulio Benetti -Signed-off-by: Steven Rostedt (Google) -Upstream: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/commit/?id=7d15d7744d957b1721d8e202bd5095b7c449570f -[yann.morin.1998@free.fr: do an actual backport] -Signed-off-by: Yann E. MORIN ---- - src/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/meson.build b/src/meson.build -index 5b76554..f7a98b9 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -11,6 +11,7 @@ sources= [ - 'tracefs-instance.c', - 'tracefs-kprobes.c', - 'tracefs-marker.c', -+ 'tracefs-mmap.c', - 'tracefs-record.c', - 'tracefs-sqlhist.c', - 'tracefs-tools.c', --- -2.43.0 - diff --git a/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch b/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch deleted file mode 100644 index 121fee5adf2..00000000000 --- a/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ba750812f68f0f3314494558496c23f934f8faff Mon Sep 17 00:00:00 2001 -From: "Steven Rostedt (Google)" -Date: Thu, 22 Feb 2024 11:02:46 -0500 -Subject: libtracefs utest: Add PATH_MAX if it is not already defined - -In some setups PATH_MAX may not be defined (it is usually defined in -linux/limits.h), but we just use PATH_MAX as something to hold the paths -to the tracing files. In that case, just define it to 1024 if it's not -already defined. - -Link: https://lore.kernel.org/linux-trace-devel/20240222-utest-fixes-v2-1-7b8ee8dca0b7@gmail.com/ - -Fixes: 845f16976929 ("libtracefs: Add unit tests") -Reported-by: Miko Larsson -Signed-off-by: Steven Rostedt (Google) - -Upstream: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/commit/?id=ba750812f68f0f3314494558496c23f934f8faff -Signed-off-by: Fabrice Fontaine ---- - utest/tracefs-utest.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c -index 963fac7..07ecd32 100644 ---- a/utest/tracefs-utest.c -+++ b/utest/tracefs-utest.c -@@ -26,6 +26,10 @@ - - #define gettid() syscall(__NR_gettid) - -+#ifndef PATH_MAX -+#define PATH_MAX 1024 -+#endif -+ - #define TRACEFS_SUITE "tracefs library" - #define TEST_INSTANCE_NAME "cunit_test_iter" - #define TEST_TRACE_DIR "/tmp/trace_utest.XXXXXX" --- -cgit 1.2.3-korg - diff --git a/package/libtracefs/libtracefs.hash b/package/libtracefs/libtracefs.hash index ebc562eb40e..e728e6431f2 100644 --- a/package/libtracefs/libtracefs.hash +++ b/package/libtracefs/libtracefs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 f92475d5c4cb509983697fb359ee615bef4f08ed8bdc9c690f6118ba68886de0 libtracefs-1.8.0.tar.gz +sha256 d295aa20d711c313a9e229dbd15ba14026f0c1a50d57ae8b0823cc561b23745f libtracefs-1.8.1.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk index ed45fcbc505..86baa5d9cde 100644 --- a/package/libtracefs/libtracefs.mk +++ b/package/libtracefs/libtracefs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEFS_VERSION = 1.8.0 +LIBTRACEFS_VERSION = 1.8.1 LIBTRACEFS_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot LIBTRACEFS_INSTALL_STAGING = YES LIBTRACEFS_LICENSE = GPL-2.0, LGPL-2.1 From 9973fc77fa7f781b80fb5a88c3a973f6bf7f955c Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 25 Jul 2024 17:30:28 +0200 Subject: [PATCH 2059/3013] package/libtraceevent: bump to version 1.8.3 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libtraceevent/libtraceevent.hash | 2 +- package/libtraceevent/libtraceevent.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtraceevent/libtraceevent.hash b/package/libtraceevent/libtraceevent.hash index c338491f26d..d59e0a9188a 100644 --- a/package/libtraceevent/libtraceevent.hash +++ b/package/libtraceevent/libtraceevent.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 919f0c024c7b5059eace52d854d4df00ae7e361a4033e1b4d6fe01d97064a1b9 libtraceevent-1.8.2.tar.gz +sha256 233d88adf5bae6b4511980f0f6314f348326b55fdb3dc9c4212c810e1ab06789 libtraceevent-1.8.3.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtraceevent/libtraceevent.mk b/package/libtraceevent/libtraceevent.mk index da0aa575d70..35e1152d373 100644 --- a/package/libtraceevent/libtraceevent.mk +++ b/package/libtraceevent/libtraceevent.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEEVENT_VERSION = 1.8.2 +LIBTRACEEVENT_VERSION = 1.8.3 LIBTRACEEVENT_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot LIBTRACEEVENT_LICENSE = GPL-2.0, LGPL-2.1 LIBTRACEEVENT_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 From 0a5260130c6933af04c13ed61efad09b47e62c3c Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 25 Jul 2024 17:30:29 +0200 Subject: [PATCH 2060/3013] package/libnss: bump version to 3.102.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 8c21316b7b9..ae82e7eaa84 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_102_RTM/src/SHA256SUMS -sha256 c29b03f24856db18a34fbcde737fcca6407c27b5f3f60baba5111460e6cb307b nss-3.102.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_102_1_RTM/src/SHA256SUMS +sha256 54982d3587e41579c94f2036ba084438b073f8456bbd873b7a942c057e9737cc nss-3.102.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 6cc60080389..93fc1cb543e 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.102 +LIBNSS_VERSION = 3.102.1 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From b5e2f8287a73f33ac82da78f4b75c6289612510e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:49:58 +0200 Subject: [PATCH 2061/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 34057a48935..1542edc0e99 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.9.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.9.10" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d412aafa130..b059ecd8921 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281 linux-6.9.8.tar.xz -sha256 f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214 linux-6.6.37.tar.xz -sha256 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af linux-6.1.97.tar.xz +sha256 efd12e335fa67d13a3eae30e4b7b7546e74b8ccc90682e4c3fffab0b22654da1 linux-6.9.10.tar.xz +sha256 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef linux-6.6.41.tar.xz +sha256 b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 linux-6.1.100.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz -sha256 da1dd47febac4f7856654038a47703666da3afba348b8e96e39584e0972e2725 linux-5.10.221.tar.xz -sha256 b298436b26395b5c3ace6963836ba70d57cd61e01cff254b0e5443636c324a5e linux-5.4.279.tar.xz +sha256 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302 linux-5.15.163.tar.xz +sha256 7b2d06803b5abb03c85f171100ca9d7acd6ba245036fe9a16eb998f088b150cb linux-5.10.222.tar.xz +sha256 a976c67eb8270cac310faf1acc61305d1f9967955aca38fbdfcb0bc77d033d42 linux-5.4.280.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 062b70cc132378e1c685df44ddf7e05bab4752b690ada17b080655a63f993581 linux-4.19.317.tar.xz +sha256 0d5fa562a3c53f524f02fc11abe502c01096df73dd27d57736875e8590007493 linux-4.19.318.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8ae267c2c85..daa54b4ef1b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -419,13 +419,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.317" if BR2_KERNEL_HEADERS_4_19 - default "5.4.279" if BR2_KERNEL_HEADERS_5_4 - default "5.10.221" if BR2_KERNEL_HEADERS_5_10 - default "5.15.162" if BR2_KERNEL_HEADERS_5_15 - default "6.1.97" if BR2_KERNEL_HEADERS_6_1 - default "6.6.37" if BR2_KERNEL_HEADERS_6_6 - default "6.9.8" if BR2_KERNEL_HEADERS_6_9 + default "4.19.318" if BR2_KERNEL_HEADERS_4_19 + default "5.4.280" if BR2_KERNEL_HEADERS_5_4 + default "5.10.222" if BR2_KERNEL_HEADERS_5_10 + default "5.15.163" if BR2_KERNEL_HEADERS_5_15 + default "6.1.100" if BR2_KERNEL_HEADERS_6_1 + default "6.6.41" if BR2_KERNEL_HEADERS_6_6 + default "6.9.10" if BR2_KERNEL_HEADERS_6_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 92a1e80ba4f7c8349acc7dc67bc0611ca67b8e9b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:49:59 +0200 Subject: [PATCH 2062/3013] {toolchain, linux-headers}: add support for 6.10 headers And add (and default to) 6.10 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index b059ecd8921..2d2b6d35465 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 70109dfd1cd1c5f8a58eb1cb37122b9bf93f9c6a6280bf91019263c7339cf76b linux-6.10.1.tar.xz sha256 efd12e335fa67d13a3eae30e4b7b7546e74b8ccc90682e4c3fffab0b22654da1 linux-6.9.10.tar.xz sha256 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef linux-6.6.41.tar.xz sha256 b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 linux-6.1.100.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index daa54b4ef1b..707f2ad0263 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_9 + default BR2_KERNEL_HEADERS_6_10 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_9 bool "Linux 6.9.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 + +config BR2_KERNEL_HEADERS_6_10 + bool "Linux 6.10.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -128,8 +132,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10 + bool "6.10.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9 - bool "6.9.x or later" + bool "6.9.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8 @@ -426,6 +434,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.100" if BR2_KERNEL_HEADERS_6_1 default "6.6.41" if BR2_KERNEL_HEADERS_6_6 default "6.9.10" if BR2_KERNEL_HEADERS_6_9 + default "6.10.1" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 8acdc62fc2a..6e91ab756cd 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -652,6 +652,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -665,6 +669,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 45a87fb3c89..0daa1e35835 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -166,8 +166,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_10 + bool "6.10.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_9 - bool "6.9.x or later" + bool "6.9.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_8 From 2b6dba00be27a09bc7e88faf0871f82bf95589cf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:50:00 +0200 Subject: [PATCH 2063/3013] linux: bump latest version to 6.10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 1542edc0e99..9da1db16d12 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.9)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.10)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.9.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From bac05f9b21219a209484b7df8d3b89f5d90feb99 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:50:53 +0200 Subject: [PATCH 2064/3013] package/apache: security bump version to 2.4.62 Fixes CVE-2024-40725 & CVE-2024-40898. Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.62 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 2ed9c17f9a7..b281b4beabf 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.61.tar.bz2.{sha256,sha512} -sha256 ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6 httpd-2.4.61.tar.bz2 -sha512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff httpd-2.4.61.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.62.tar.bz2.{sha256,sha512} +sha256 674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec httpd-2.4.62.tar.bz2 +sha512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77 httpd-2.4.62.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 0319a968153..0a0a0b3de4a 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.61 +APACHE_VERSION = 2.4.62 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 3da0a950e02932c81e516d818a5b3731134376d6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:51:43 +0200 Subject: [PATCH 2065/3013] package/openvpn: bump version to 2.6.12 Release notes: https://sourceforge.net/p/openvpn/mailman/message/58796813/ Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index a4ba458bd82..7ba3ea3f200 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 d60adf413d37e11e6e63531cacf2655906756046b4edffe88a13b9e2fec40d5e openvpn-2.6.11.tar.gz +sha256 1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929 openvpn-2.6.12.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 3b39d62519e..4bf5b54656d 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.11 +OPENVPN_VERSION = 2.6.12 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From 5226e5f664e1ef59654fc70be94064f1614a9c25 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:52:18 +0200 Subject: [PATCH 2066/3013] package/fetchmail: bump version to 6.4.39 Release notes: https://sourceforge.net/p/fetchmail/mailman/message/58797299/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3c0403fa78b..12612ecc489 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ -sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/58797299/ +sha256 75109a1f307b538155fa05f5ef298e8298cb4deae95aed24c16b38d36ff0a186 fetchmail-6.4.39.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index c74b2596987..a9239d08556 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).39 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From 51aaee73f35730872f8e6362e3100d825e9269a1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 23:28:03 +0200 Subject: [PATCH 2067/3013] package/intel-mediadriver: bump version to 24.3.0 Added upstream fix for build issues with GCC 14.x. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Refactor-for-build-issue.patch | 142 ++++++++++++++++++ .../intel-mediadriver/intel-mediadriver.hash | 2 +- .../intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 package/intel-mediadriver/0001-Refactor-for-build-issue.patch diff --git a/package/intel-mediadriver/0001-Refactor-for-build-issue.patch b/package/intel-mediadriver/0001-Refactor-for-build-issue.patch new file mode 100644 index 00000000000..5badc985cc4 --- /dev/null +++ b/package/intel-mediadriver/0001-Refactor-for-build-issue.patch @@ -0,0 +1,142 @@ +From 47bae3c809c9f5b11793b76b5edfd7704adb4080 Mon Sep 17 00:00:00 2001 +From: Chen_Ke +Date: Fri, 12 Jul 2024 11:42:04 +0800 +Subject: [PATCH] [VP] Refactor for build issue + +Refactor for build issue: Avoid storing the address of local variable + +Upstream: https://github.com/intel/media-driver/commit/47bae3c809c9f5b11793b76b5edfd7704adb4080 + +Signed-off-by: Bernd Kuhls +--- + media_common/agnostic/common/hw/mhw_render.h | 1 + + media_common/agnostic/common/hw/mhw_state_heap.h | 2 -- + .../agnostic/common/hw/mhw_render_cmdpar.h | 1 + + .../shared/packet/media_render_cmd_packet.cpp | 4 ++-- + .../shared/packet/media_render_cmd_packet.h | 4 ++-- + .../common/vp/hal/packet/vp_render_kernel_obj.cpp | 15 +++++---------- + .../common/vp/hal/packet/vp_render_kernel_obj.h | 3 ++- + 7 files changed, 13 insertions(+), 17 deletions(-) + +diff --git a/media_common/agnostic/common/hw/mhw_render.h b/media_common/agnostic/common/hw/mhw_render.h +index b551ab1337..36c895c299 100644 +--- a/media_common/agnostic/common/hw/mhw_render.h ++++ b/media_common/agnostic/common/hw/mhw_render.h +@@ -312,6 +312,7 @@ typedef struct _MHW_GPGPU_WALKER_PARAMS + + bool hasBarrier; + PMHW_INLINE_DATA_PARAMS inlineDataParamBase; ++ uint32_t inlineDataParamSize; + + } MHW_GPGPU_WALKER_PARAMS, *PMHW_GPGPU_WALKER_PARAMS; + +diff --git a/media_common/agnostic/common/hw/mhw_state_heap.h b/media_common/agnostic/common/hw/mhw_state_heap.h +index 49add60823..2f9afff0af 100644 +--- a/media_common/agnostic/common/hw/mhw_state_heap.h ++++ b/media_common/agnostic/common/hw/mhw_state_heap.h +@@ -83,8 +83,6 @@ typedef struct MHW_BLOCK_MANAGER *PMHW_BLOCK_MANAGER; + + #define MHW_INVALID_SYNC_TAG 0xFFFFFFFF + +-#define MAX_INLINE_DATA_PARAMS 32 +- + enum MW_RENDER_ENGINE_ADDRESS_SHIFT + { + MHW_STATE_HEAP_SURFACE_STATE_SHIFT = 0 +diff --git a/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h b/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h +index 4c01d351ce..a8004bbbb9 100644 +--- a/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h ++++ b/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h +@@ -65,6 +65,7 @@ struct MHW_HEAPS_RESOURCE + { + PMOS_RESOURCE presInstructionBuffer = nullptr; + PMHW_INLINE_DATA_PARAMS inlineDataParamsBase = nullptr; ++ uint32_t inlineDataParamSize = 0; + }; + + enum MHW_VFE_SLICE_DISABLE +diff --git a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp +index dc9d6896ba..c18cbf4b4f 100644 +--- a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp ++++ b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp +@@ -1264,8 +1264,8 @@ MOS_STATUS RenderCmdPacket::PrepareComputeWalkerParams(KERNEL_WALKER_PARAMS para + + gpgpuWalker.SLMSize = params.slmSize; + gpgpuWalker.hasBarrier = params.hasBarrier; +- gpgpuWalker.inlineDataParamBase = params.inlineDataParams; +- ++ gpgpuWalker.inlineDataParamBase = params.inlineDataParamBase; ++ gpgpuWalker.inlineDataParamSize = params.inlineDataParamSize; + return MOS_STATUS_SUCCESS; + } + +diff --git a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h +index 89ac89d9a5..7e6b0aa8a1 100644 +--- a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h ++++ b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h +@@ -120,8 +120,8 @@ typedef struct _KERNEL_WALKER_PARAMS + + bool hasBarrier; + uint32_t slmSize; +- MHW_INLINE_DATA_PARAMS inlineDataParams[MAX_INLINE_DATA_PARAMS]; +- uint32_t inlineDataParamNum; ++ PMHW_INLINE_DATA_PARAMS inlineDataParamBase; ++ uint32_t inlineDataParamSize; + }KERNEL_WALKER_PARAMS, * PKERNEL_WALKER_PARAMS; + + typedef struct _KERNEL_PACKET_RENDER_DATA +diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp +index d6630cbd5f..dbd5b12d1d 100644 +--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp ++++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp +@@ -740,7 +740,7 @@ void VpRenderKernelObj::DumpSurface(VP_SURFACE* pSurface, PCCHAR fileName) + #endif + } + +-MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KERNEL_WALKER_PARAMS &walkerParam, KRN_ARG args, RENDERHAL_INTERFACE *renderhal) ++MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KRN_ARG args, RENDERHAL_INTERFACE *renderhal) + { + VP_FUNC_CALL(); + MHW_INLINE_DATA_PARAMS inlineDataPar = {}; +@@ -762,15 +762,10 @@ MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KERNEL_WALKER_PARAMS &walke + { + inlineDataPar.isPtrType = false; + } +- if (walkerParam.inlineDataParamNum < MAX_INLINE_DATA_PARAMS) +- { +- walkerParam.inlineDataParams[walkerParam.inlineDataParamNum] = inlineDataPar; +- walkerParam.inlineDataParamNum++; +- } +- else +- { +- VP_RENDER_ASSERTMESSAGE("Exceed max inline data params!"); +- } ++ ++ // walkerParam.inlineDataParamBase will add m_inlineDataParams.data() in each kernel ++ // walkerParam.inlineDataParamSize will add m_inlineDataParams.size() in each kernel ++ m_inlineDataParams.push_back(inlineDataPar); + + return MOS_STATUS_SUCCESS; + } +\ No newline at end of file +diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h +index 8b9abf9dca..8d095730cd 100644 +--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h ++++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h +@@ -537,7 +537,7 @@ class VpRenderKernelObj + + virtual MOS_STATUS InitRenderHalSurfaceCMF(MOS_SURFACE* src, PRENDERHAL_SURFACE renderHalSurface); + +- virtual MOS_STATUS SetInlineDataParameter(KERNEL_WALKER_PARAMS &walkerParam, KRN_ARG args, RENDERHAL_INTERFACE *renderhal); ++ virtual MOS_STATUS SetInlineDataParameter(KRN_ARG args, RENDERHAL_INTERFACE *renderhal); + + virtual MOS_STATUS UpdateBindlessSurfaceResource(SurfaceType surf, std::set surfStateOffset) + { +@@ -617,6 +617,7 @@ class VpRenderKernelObj + bool m_useIndependentSamplerGroup = false; //true means multi kernels has their own stand alone sampler states group. only can be true when m_isAdvKernel is true. + + std::shared_ptr m_veboxItf = nullptr; ++ std ::vector m_inlineDataParams = {}; + + MEDIA_CLASS_DEFINE_END(vp__VpRenderKernelObj) + }; diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 89aaab8721e..4fa24fba7ae 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dec2210c1f824a721e4ea6f66f5899e300801b3e7fae232d3f8a94db38c2edd1 intel-media-24.2.5.tar.gz +sha256 b6728607e4d05739bce27124605993011b468781043ce34bb1a51919196f2d15 intel-media-24.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 943956ec50b..5283631df47 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.2.5 +INTEL_MEDIADRIVER_VERSION = 24.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 7a61f08540670881db17b1d49ffd773e17d79201 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 23:28:04 +0200 Subject: [PATCH 2068/3013] package/intel-vpl-gpu-rt: bump version to 24.3.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash | 2 +- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash index 9c9f6e720d3..2b42c7b0503 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ccb76812642d84d4d8a56d28df60ef6d450cbb09969a59ee6c4a819098617b5d intel-vpl-gpu-rt-24.2.5.tar.gz +sha256 02b01dd73f7c5a4a46860ec01470b484286709cc13f9333a34a089d7e457295e intel-vpl-gpu-rt-24.3.0.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk index a4daa8d29c9..1566b87b497 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_VPL_GPU_RT_VERSION = 24.2.5 +INTEL_VPL_GPU_RT_VERSION = 24.3.0 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION)) INTEL_VPL_GPU_RT_LICENSE = MIT INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE From 90e22ff48bb5705c146a64b75556157667b551d3 Mon Sep 17 00:00:00 2001 From: Martin Wetterwald Date: Thu, 25 Jul 2024 19:37:09 +0200 Subject: [PATCH 2069/3013] package/tinyssh: fix static-only build When using BR2_STATIC_LIBS=y, tinysshd's build was successful, but the binary didn't work on the final target: this is because a dynamically linked ELF was produced, on a target having no dynamic loader at all. Using $(TARGET_CONFIGURE_OPTS) propagates all the options and not only "CC", resulting in a correct static binary able to run on the target. Without the patch: > tinysshd: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), > dynamically linked, interpreter /lib/ld-musl-armhf.so.1, stripped With the patch: > tinysshd: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), > statically linked, stripped Fixes: a7b3de8a3b1b446c081593192c3acb847f6f5f05 Signed-off-by: Martin Wetterwald Signed-off-by: Thomas Petazzoni --- package/tinyssh/tinyssh.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyssh/tinyssh.mk b/package/tinyssh/tinyssh.mk index 80b6ccb8503..e92ac628f2a 100644 --- a/package/tinyssh/tinyssh.mk +++ b/package/tinyssh/tinyssh.mk @@ -10,7 +10,7 @@ TINYSSH_LICENSE = CC0-1.0 TINYSSH_LICENSE_FILES = LICENCE define TINYSSH_BUILD_CMDS - $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" $(MAKE) -C $(@D) cross-compile + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) cross-compile endef define TINYSSH_INSTALL_TARGET_CMDS From b65856fbb0895d4b08f35b2d3a9bb5b5a2069e1d Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 24 Jul 2024 21:23:20 +0000 Subject: [PATCH 2070/3013] Revert "Create a .gitignore file in the CANONICAL_O directory" The packages 'python-jsonschema-specifications', 'pydantic-core', and likely other packages based on Python maturin silently stopped installing files to the host and target directories after commit a14c862c08. A similar issue was reported by the Conda project[1]. It seems some build tools scan for gitignore files to decide what files to build and install. I attempted various combinations of gitignore patterns including mimicking the Conda project's gitignore[2], but the only thing that has worked reliably is the original `/output` ignore in the root Buildroot directory. This reverts commit a14c862c08865e053d5fce90a0d0323b8f9e4bc0. [1] https://github.com/PyO3/maturin/issues/1911 [2] https://github.com/conda-forge/conda-smithy/blob/main/conda_smithy/feedstock_content/.gitignore Reported-by: Bryan Brattlof Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- .gitignore | 1 + Makefile | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 14b7ca5040f..bb02d9f5727 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index 0432a014abe..f51e8f690fc 100644 --- a/Makefile +++ b/Makefile @@ -63,9 +63,6 @@ ifneq ($(findstring @,$(CANONICAL_O)),) $(error The build directory can not contain a '@') endif -# Create a default .gitignore file that ignores everything -$(shell echo "*" > "$(CANONICAL_O)/.gitignore") - CANONICAL_CURDIR = $(realpath $(CURDIR)) REQ_UMASK = 0022 From ea3c465304d1d7a2891d9f47775996855461f117 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 24 Jul 2024 21:23:21 +0000 Subject: [PATCH 2071/3013] gitignore: ignore multiple output directories Developers may have multiple output directories when building multiple boards in parallel. A previous commit attempted to gitignore new output directories automatically but broke some things (commit a14c862c08 "Create a .gitignore file in the CANONICAL_O directory"). To provide some support, ignore anything in the Buildroot directory that starts with "output". This is a bit more cumbersome, but doesn't break packages based on Python maturin. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f5727..ec5768d053f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/output +/output* /dl /.auto.deps /.config.cmd From b5c1ead57e93b32c900b58f4fd22259313fc5c0d Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Thu, 25 Jul 2024 11:27:03 +0300 Subject: [PATCH 2072/3013] package/uclibc-ng-test: fix build with the musl C library Musl doesn't provide sys/asm.h header so we should add some defines inside mips-specific header file to avoid build errors. Fixes: http://autobuild.buildroot.net/results/af7a1d00930485f87f77762b34cae01873a8cd41/ Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni --- .../0001-Fix-error-absent-sys-asm-h.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch diff --git a/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch b/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch new file mode 100644 index 00000000000..5c8cd3f4630 --- /dev/null +++ b/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch @@ -0,0 +1,59 @@ +From a99d5bdb51bdab92a303c508b2b938ee0789d614 Mon Sep 17 00:00:00 2001 +From: Dmitry Chestnykh +Date: Thu, 25 Jul 2024 09:15:11 +0300 +Subject: [PATCH] Fix errors due to absent sys/asm.h in mips64 musl build + +Upstream: https://patchwork.ozlabs.org/project/uclibc-ng/patch/20240725081519.611076-1-dm.chestnykh@gmail.com/ +Signed-off-by: Dmitry Chestnykh +--- + test/tls/tls-macros-mips.h | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/test/tls/tls-macros-mips.h b/test/tls/tls-macros-mips.h +index eed0938..bd4c5c4 100644 +--- a/test/tls/tls-macros-mips.h ++++ b/test/tls/tls-macros-mips.h +@@ -1,7 +1,40 @@ + /* Macros to support TLS testing in times of missing compiler support. */ + + #include ++#if defined(__has_include) && __has_include() + #include ++#else ++ ++#define __STRING(x) #x ++ ++#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 32) ++#define PTR_ADDIU addiu ++#define PTR_L lw ++#endif ++ ++#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _NABI32 ++ ++#if !defined __mips_isa_rev || __mips_isa_rev < 6 ++#define PTR_ADDU add ++#define PTR_ADDIU addi ++#else ++#define PTR_ADDU addu ++#define PTR_ADDIU addiu ++#endif ++ ++#define PTR_L lw ++#endif ++ ++#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 64) \ ++ || _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _ABIN32 ++ ++#define PTR_ADDU daddu ++#define PTR_ADDIU daddiu ++#define PTR_L ld ++ ++#endif ++ ++#endif + + #define __STRING2(X) __STRING(X) + #define ADDU __STRING2(PTR_ADDU) +-- +2.45.2 + From 8ef2bb44379e4763682199ad2ecfd23d51cbacc0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 25 Jul 2024 10:06:41 +0200 Subject: [PATCH 2073/3013] package/elfutils: fix build on microblaze Fix the following build failure on microblaze: dwelf_elf_begin.c:62:1: error: symver is only supported on ELF platforms 62 | OLD_VERSION (dwelf_elf_begin, ELFUTILS_0.175) | ^~~~~~~~~~~ dwelf_elf_begin.c:62:1: error: symver is only supported on ELF platforms Fixes: - http://autobuild.buildroot.org/results/5ca2aa5c76415690ad4a85837ba47e7bcfbdbcbc Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 4d8cc43342e..8738af7751f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -45,6 +45,10 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ELFUTILS_CONF_OPTS += --disable-symbol-versioning endif +ifeq ($(BR2_microblaze),y) +ELFUTILS_CONF_OPTS += --disable-symbol-versioning +endif + # disable for now, needs "distro" support ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod From 541eb8bf7db553708ff2286995ce94b38fc8d537 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 26 Jul 2024 05:46:03 -0400 Subject: [PATCH 2074/3013] package/libpwquality: fix PAM module path The libpwquality package provides the pam_pwquality PAM module - the replacement for pam_cracklib that was dropped from linux-pam back in version 1.5.0. However, it currently installs it to the wrong place, so passwd and friends fail to find it. This commit sets the security directory path to /lib/security to match the corresponding setting in linux-pam.mk. Note that libpwquality has *always* installed pam_pwquality in the wrong place, since version 1.3.0 was added to buildroot in 2017 in commit 462040443ca943694fc59ec8380c82f8bf9aaddc. However, back then, linux-pam version 1.3.0 still provided pam_cracklib for advanced password checking. Linux-pam deprecated pam_cracklib in 1.4.0 but still built it for us when linux-pam.mk set --enable-cracklib. Linux-PAM deleted pam_cracklib altogether in 1.5.0, so it was not until our update to linux-pam-1.5.1 in commit 276f1e0a896698abec85500a86686bf72c79eb91 that pam_cracklib became unavailable. After that point, pam_pwquality was the only alternative for PAM-based password checking. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- package/libpwquality/libpwquality.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index f12e583b2df..ba62cdfb09e 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -23,7 +23,7 @@ LIBPWQUALITY_CONF_OPTS += --disable-python-bindings endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -LIBPWQUALITY_CONF_OPTS += --enable-pam +LIBPWQUALITY_CONF_OPTS += --enable-pam --with-securedir=/lib/security LIBPWQUALITY_DEPENDENCIES += linux-pam else LIBPWQUALITY_CONF_OPTS += --disable-pam From 127c42033590e73e3161852acd540a79c98d9f3d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Jul 2024 02:13:44 -0600 Subject: [PATCH 2075/3013] package/systemd: bump to version 256.4 Remove patch which is now upstream Rebase fix missing LOOP_SET_BLOCK_SIZE patch. Update config options to match new expected format. Add new nsresourced, mountfsd and vmspawn config options. Add new systemd-journal-upload user for journald-remote. Add new kernel config enable/disable options from systemd readme. Add new optional dependencies and config options as appropriate. LICENSES/README.md hash changed due to additional details added: https://github.com/systemd/systemd/commit/fb747bd8cdcbeb55f9ef3c62289fff8ff5a25b68 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...g_loop.h-fix-missing-LOOP_SET_BLOCK_.patch | 10 +- .../0002-basic-add-bcachefs-magic.patch | 53 --- package/systemd/Config.in | 29 ++ package/systemd/systemd.hash | 4 +- package/systemd/systemd.mk | 334 ++++++++++++------ 5 files changed, 263 insertions(+), 167 deletions(-) delete mode 100644 package/systemd/0002-basic-add-bcachefs-magic.patch diff --git a/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch b/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch index 7d520f81d42..0ab5a4e98d5 100644 --- a/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch +++ b/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch @@ -1,4 +1,4 @@ -From e358793a796f8c742af4ea3f4fe398731ca46649 Mon Sep 17 00:00:00 2001 +From 56ab1c54497d9fac74380ff9e11aaf931a917d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 14 Jun 2024 14:37:29 +0200 Subject: [PATCH] src/basic/missing_loop.h: fix missing LOOP_SET_BLOCK_SIZE @@ -22,17 +22,17 @@ Signed-off-by: Raphaël Mélotte 1 file changed, 4 insertions(+) diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h -index 7141544b64..b1505f678b 100644 +index b88501d78b..f83a14c914 100644 --- a/src/basic/missing_loop.h +++ b/src/basic/missing_loop.h -@@ -22,3 +22,7 @@ struct loop_config { +@@ -29,3 +29,7 @@ assert_cc(LOOP_SET_DIRECT_IO == 0x4C08); #ifndef LOOP_SET_STATUS_SETTABLE_FLAGS - #define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN | LO_FLAGS_DIRECT_IO) + # define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN) #endif + +#ifndef LOOP_SET_BLOCK_SIZE +# define LOOP_SET_BLOCK_SIZE 0x4C09 +#endif -- -2.25.1 +2.34.1 diff --git a/package/systemd/0002-basic-add-bcachefs-magic.patch b/package/systemd/0002-basic-add-bcachefs-magic.patch deleted file mode 100644 index e7f4b1cbb73..00000000000 --- a/package/systemd/0002-basic-add-bcachefs-magic.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001 -From: Chris Packham -Date: Fri, 31 May 2024 09:51:38 +1200 -Subject: [PATCH] basic: Add BCACHEFS magic - -Import magic.h from Linux 6.9 to get the definition of -BCACHEFS_SUPER_MAGIC. Update filesystems-gperf.gperf to add knowledge of -bcachefs. - -This fixes the following error building against a bleeding edge kernel. -``` -src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers: - -Filesystem found in kernel header but not in filesystems-gperf.gperf: BCACHEFS_SUPER_MAGIC -``` - -Upstream: https://github.com/systemd/systemd/commit/201148b08de65de004d10679a8c3d201cc08fb28 -Signed-off-by: Jarkko Sakkinen ---- - src/basic/filesystems-gperf.gperf | 1 + - src/basic/missing_magic.h | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf -index 1cd66b5a5f..c82fe98227 100644 ---- a/src/basic/filesystems-gperf.gperf -+++ b/src/basic/filesystems-gperf.gperf -@@ -28,6 +28,7 @@ afs, {AFS_FS_MAGIC, AFS_SUPER_MAGIC} - anon_inodefs, {ANON_INODE_FS_MAGIC} - autofs, {AUTOFS_SUPER_MAGIC} - balloon-kvm, {BALLOON_KVM_MAGIC} -+bcachefs, {BCACHEFS_SUPER_MAGIC} - bdev, {BDEVFS_MAGIC} - binder, {BINDERFS_SUPER_MAGIC} - binfmt_misc, {BINFMTFS_MAGIC} -diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h -index 82d71c8ad1..b3d2ee9f57 100644 ---- a/src/basic/missing_magic.h -+++ b/src/basic/missing_magic.h -@@ -197,3 +197,10 @@ - #ifndef NTFS3_SUPER_MAGIC - #define NTFS3_SUPER_MAGIC 0x7366746e - #endif -+ -+/* Added in Linux commit e2f48c48090dea172c0c571101041de64634dae5. Remove when next sync'd */ -+#ifndef BCACHEFS_SUPER_MAGIC -+# define BCACHEFS_SUPER_MAGIC 0xca451a4e -+#else -+assert_cc(BCACHEFS_SUPER_MAGIC == 0xca451a4e) -+#endif --- -2.45.1 - diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 82c0e30474c..6708adce9ba 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -329,6 +329,15 @@ config BR2_PACKAGE_SYSTEMD_MACHINED https://www.freedesktop.org/software/systemd/man/systemd-machined.service.html +config BR2_PACKAGE_SYSTEMD_NSRESOURCED + bool "enable nsresourced" + help + systemd-nsresourced is a system service that permits + transient delegation of a a UID/GID range to a user + namespace allocated by a client, via a Varlink IPC API. + + https://www.freedesktop.org/software/systemd/man/systemd-nsresourced.service.html + config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" default y @@ -483,6 +492,16 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_MOUNTFSD + bool "enable mountfsd support" + help + systemd-mountfsd is a system service that dissects disk + images, and returns mount file descriptors for the file + systems contained therein to clients, via a Varlink IPC + API. + + https://www.freedesktop.org/software/systemd/man/systemd-mountfsd.service.html + config BR2_PACKAGE_SYSTEMD_SYSUPDATE bool "enable sysupdate support" select BR2_PACKAGE_OPENSSL @@ -580,4 +599,14 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE_DEFAULT_KEYMAP Default keymap for the system. Leave empty to not set a default keymap. +config BR2_PACKAGE_SYSTEMD_VMSPAWN + bool "enable vmspawn" + help + systemd-vmspawn may be used to start a virtual machine + from an OS image. In many ways it is similar to + systemd-nspawn, but launches a full virtual machine + instead of using namespaces. + + https://www.freedesktop.org/software/systemd/man/systemd-vmspawn.html + endif diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f999d0d34ed..399ac614920 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 26ac73c2108132b1d11ff939e8b1bece42f1c1da03fdf4a242af5a7cf3ac34f1 systemd-254.13.tar.gz +sha256 7861d544190f938cac1b242624d78c96fe2ebbc7b72f86166e88b50451c6fa58 systemd-256.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -12,4 +12,4 @@ sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENS sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 8ccb649d1fc1103e5726612cf303f05d4eb86b7ab46d9f630009dd32e87612e2 LICENSES/README.md +sha256 3df2dfbb09215ab1aecdd3c91d7fbe02fee4a0e75ef8967a25d1a6fe3b8abc06 LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 52fa344807d..5dca8681bc7 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,8 +19,8 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.13 -SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) +SYSTEMD_VERSION = 256.4 +SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ GPL-2.0+ (udev), \ @@ -65,10 +65,9 @@ SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ -Dcreate-log-dirs=false \ - -Ddbus=false \ + -Ddbus=disabled \ -Ddbus-interfaces-dir=no \ -Ddefault-compression='auto' \ - -Ddefault-hierarchy=unified \ -Ddefault-locale='C.UTF-8' \ -Ddefault-user-shell=/bin/sh \ -Dfirst-boot-full-preset=false \ @@ -79,29 +78,33 @@ SYSTEMD_CONF_OPTS += \ -Dldconfig=false \ -Dlink-boot-shared=true \ -Dloadkeys-path=/usr/bin/loadkeys \ - -Dman=false \ + -Dman=disabled \ -Dmount-path=/usr/bin/mount \ + -Dvcs-tag=false \ -Dmode=release \ -Dnspawn-locale='C.UTF-8' \ -Dnss-systemd=true \ - -Dpasswdqc=false \ + -Dpasswdqc=disabled \ + -Dlibfido2=disabled \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ - -Drootlibdir='/usr/lib' \ -Dsetfont-path=/usr/bin/setfont \ -Dsplit-bin=true \ - -Dsplit-usr=false \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ - -Dtelinit-path= \ -Dtests=false \ + -Dfuzz-tests=false \ + -Dinstall-tests=false \ + -Dlog-message-verification=disabled \ -Dtmpfiles=true \ - -Dukify=false \ + -Dukify=disabled \ + -Dbpf-framework=disabled \ + -Dvmlinux-h=disabled \ -Dumount-path=/usr/bin/umount \ - -Dxenctrl=false + -Dxenctrl=disabled SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) @@ -117,11 +120,25 @@ ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) SYSTEMD_JOURNALD_PERMISSIONS = /var/log/journal d 2755 root systemd-journal - - - - - endif +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +SYSTEMD_DEPENDENCIES += libglib2 +SYSTEMD_CONF_OPTS += -Dglib=enabled +else +SYSTEMD_CONF_OPTS += -Dglib=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +SYSTEMD_DEPENDENCIES += libarchive +SYSTEMD_CONF_OPTS += -Dlibarchive=enabled +else +SYSTEMD_CONF_OPTS += -Dlibarchive=disabled +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl -SYSTEMD_CONF_OPTS += -Dacl=true +SYSTEMD_CONF_OPTS += -Dacl=enabled else -SYSTEMD_CONF_OPTS += -Dacl=false +SYSTEMD_CONF_OPTS += -Dacl=disabled endif ifeq ($(BR2_PACKAGE_LESS),y) @@ -132,144 +149,151 @@ endif ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) SYSTEMD_DEPENDENCIES += libapparmor -SYSTEMD_CONF_OPTS += -Dapparmor=true +SYSTEMD_CONF_OPTS += -Dapparmor=enabled else -SYSTEMD_CONF_OPTS += -Dapparmor=false +SYSTEMD_CONF_OPTS += -Dapparmor=disabled endif ifeq ($(BR2_PACKAGE_AUDIT),y) SYSTEMD_DEPENDENCIES += audit -SYSTEMD_CONF_OPTS += -Daudit=true +SYSTEMD_CONF_OPTS += -Daudit=enabled else -SYSTEMD_CONF_OPTS += -Daudit=false +SYSTEMD_CONF_OPTS += -Daudit=disabled endif ifeq ($(BR2_PACKAGE_CRYPTSETUP),y) SYSTEMD_DEPENDENCIES += cryptsetup -SYSTEMD_CONF_OPTS += -Dlibcryptsetup=true -Dlibcryptsetup-plugins=true +SYSTEMD_CONF_OPTS += -Dlibcryptsetup=enabled -Dlibcryptsetup-plugins=enabled else -SYSTEMD_CONF_OPTS += -Dlibcryptsetup=false -Dlibcryptsetup-plugins=false +SYSTEMD_CONF_OPTS += -Dlibcryptsetup=disabled -Dlibcryptsetup-plugins=disabled endif ifeq ($(BR2_PACKAGE_ELFUTILS),y) SYSTEMD_DEPENDENCIES += elfutils -SYSTEMD_CONF_OPTS += -Delfutils=true +SYSTEMD_CONF_OPTS += -Delfutils=enabled else -SYSTEMD_CONF_OPTS += -Delfutils=false +SYSTEMD_CONF_OPTS += -Delfutils=disabled endif ifeq ($(BR2_PACKAGE_IPTABLES),y) SYSTEMD_DEPENDENCIES += iptables -SYSTEMD_CONF_OPTS += -Dlibiptc=true +SYSTEMD_CONF_OPTS += -Dlibiptc=enabled else -SYSTEMD_CONF_OPTS += -Dlibiptc=false +SYSTEMD_CONF_OPTS += -Dlibiptc=disabled endif # Both options can't be selected at the same time so prefer libidn2 ifeq ($(BR2_PACKAGE_LIBIDN2),y) SYSTEMD_DEPENDENCIES += libidn2 -SYSTEMD_CONF_OPTS += -Dlibidn2=true -Dlibidn=false +SYSTEMD_CONF_OPTS += -Dlibidn2=enabled -Dlibidn=disabled else ifeq ($(BR2_PACKAGE_LIBIDN),y) SYSTEMD_DEPENDENCIES += libidn -SYSTEMD_CONF_OPTS += -Dlibidn=true -Dlibidn2=false +SYSTEMD_CONF_OPTS += -Dlibidn=enabled -Dlibidn2=disabled else -SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=false +SYSTEMD_CONF_OPTS += -Dlibidn=disabled -Dlibidn2=disabled endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) SYSTEMD_DEPENDENCIES += libseccomp -SYSTEMD_CONF_OPTS += -Dseccomp=true +SYSTEMD_CONF_OPTS += -Dseccomp=enabled else -SYSTEMD_CONF_OPTS += -Dseccomp=false +SYSTEMD_CONF_OPTS += -Dseccomp=disabled endif ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) SYSTEMD_DEPENDENCIES += libxkbcommon -SYSTEMD_CONF_OPTS += -Dxkbcommon=true +SYSTEMD_CONF_OPTS += -Dxkbcommon=enabled else -SYSTEMD_CONF_OPTS += -Dxkbcommon=false +SYSTEMD_CONF_OPTS += -Dxkbcommon=disabled endif ifeq ($(BR2_PACKAGE_BZIP2),y) SYSTEMD_DEPENDENCIES += bzip2 -SYSTEMD_CONF_OPTS += -Dbzip2=true +SYSTEMD_CONF_OPTS += -Dbzip2=enabled else -SYSTEMD_CONF_OPTS += -Dbzip2=false +SYSTEMD_CONF_OPTS += -Dbzip2=disabled endif ifeq ($(BR2_PACKAGE_ZSTD),y) SYSTEMD_DEPENDENCIES += zstd -SYSTEMD_CONF_OPTS += -Dzstd=true +SYSTEMD_CONF_OPTS += -Dzstd=enabled else -SYSTEMD_CONF_OPTS += -Dzstd=false +SYSTEMD_CONF_OPTS += -Dzstd=disabled endif ifeq ($(BR2_PACKAGE_LZ4),y) SYSTEMD_DEPENDENCIES += lz4 -SYSTEMD_CONF_OPTS += -Dlz4=true +SYSTEMD_CONF_OPTS += -Dlz4=enabled else -SYSTEMD_CONF_OPTS += -Dlz4=false +SYSTEMD_CONF_OPTS += -Dlz4=disabled endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SYSTEMD_DEPENDENCIES += linux-pam -SYSTEMD_CONF_OPTS += -Dpam=true +SYSTEMD_CONF_OPTS += -Dpam=enabled else -SYSTEMD_CONF_OPTS += -Dpam=false +SYSTEMD_CONF_OPTS += -Dpam=disabled endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),y) -SYSTEMD_CONF_OPTS += -Dfdisk=true +SYSTEMD_CONF_OPTS += -Dfdisk=enabled +else +SYSTEMD_CONF_OPTS += -Dfdisk=disabled +endif + +ifeq ($(BR2_PACKAGE_KMOD),y) +SYSTEMD_DEPENDENCIES += kmod +SYSTEMD_CONF_OPTS += -Dkmod=enabled else -SYSTEMD_CONF_OPTS += -Dfdisk=false +SYSTEMD_CONF_OPTS += -Dkmod=disabled endif ifeq ($(BR2_PACKAGE_XZ),y) SYSTEMD_DEPENDENCIES += xz -SYSTEMD_CONF_OPTS += -Dxz=true +SYSTEMD_CONF_OPTS += -Dxz=enabled else -SYSTEMD_CONF_OPTS += -Dxz=false +SYSTEMD_CONF_OPTS += -Dxz=disabled endif ifeq ($(BR2_PACKAGE_ZLIB),y) SYSTEMD_DEPENDENCIES += zlib -SYSTEMD_CONF_OPTS += -Dzlib=true +SYSTEMD_CONF_OPTS += -Dzlib=enabled else -SYSTEMD_CONF_OPTS += -Dzlib=false +SYSTEMD_CONF_OPTS += -Dzlib=disabled endif ifeq ($(BR2_PACKAGE_LIBCURL),y) SYSTEMD_DEPENDENCIES += libcurl -SYSTEMD_CONF_OPTS += -Dlibcurl=true +SYSTEMD_CONF_OPTS += -Dlibcurl=enabled else -SYSTEMD_CONF_OPTS += -Dlibcurl=false +SYSTEMD_CONF_OPTS += -Dlibcurl=disabled endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Dgcrypt=enabled else -SYSTEMD_CONF_OPTS += -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Dgcrypt=disabled endif ifeq ($(BR2_PACKAGE_P11_KIT),y) SYSTEMD_DEPENDENCIES += p11-kit -SYSTEMD_CONF_OPTS += -Dp11kit=true +SYSTEMD_CONF_OPTS += -Dp11kit=enabled else -SYSTEMD_CONF_OPTS += -Dp11kit=false +SYSTEMD_CONF_OPTS += -Dp11kit=disabled endif ifeq ($(BR2_PACKAGE_PCRE2),y) SYSTEMD_DEPENDENCIES += pcre2 -SYSTEMD_CONF_OPTS += -Dpcre2=true +SYSTEMD_CONF_OPTS += -Dpcre2=enabled else -SYSTEMD_CONF_OPTS += -Dpcre2=false +SYSTEMD_CONF_OPTS += -Dpcre2=disabled endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) -SYSTEMD_CONF_OPTS += -Dblkid=true +SYSTEMD_CONF_OPTS += -Dblkid=enabled else -SYSTEMD_CONF_OPTS += -Dblkid=false +SYSTEMD_CONF_OPTS += -Dblkid=disabled endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) @@ -296,27 +320,35 @@ else SYSTEMD_CONF_OPTS += -Danalyze=false endif +ifeq ($(BR2_PACKAGE_LIBPWQUALITY),y) +SYSTEMD_DEPENDENCIES += libpwquality +SYSTEMD_CONF_OPTS += -Dpwquality=enabled +else +SYSTEMD_CONF_OPTS += -Dpwquality=disabled +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) # remote also depends on libcurl, this is already added above. SYSTEMD_DEPENDENCIES += libmicrohttpd -SYSTEMD_CONF_OPTS += -Dremote=true -Dmicrohttpd=true +SYSTEMD_CONF_OPTS += -Dremote=enabled -Dmicrohttpd=enabled SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote +SYSTEMD_UPLOAD_USER = systemd-journal-upload -1 systemd-journal-upload -1 * - - - systemd Journal Upload else -SYSTEMD_CONF_OPTS += -Dremote=false -Dmicrohttpd=false +SYSTEMD_CONF_OPTS += -Dremote=disabled -Dmicrohttpd=disabled endif ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) SYSTEMD_DEPENDENCIES += libqrencode -SYSTEMD_CONF_OPTS += -Dqrencode=true +SYSTEMD_CONF_OPTS += -Dqrencode=enabled else -SYSTEMD_CONF_OPTS += -Dqrencode=false +SYSTEMD_CONF_OPTS += -Dqrencode=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) SYSTEMD_DEPENDENCIES += libselinux -SYSTEMD_CONF_OPTS += -Dselinux=true +SYSTEMD_CONF_OPTS += -Dselinux=enabled else -SYSTEMD_CONF_OPTS += -Dselinux=false +SYSTEMD_CONF_OPTS += -Dselinux=disabled endif ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) @@ -361,6 +393,12 @@ else SYSTEMD_CONF_OPTS += -Dvconsole=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_VMSPAWN),y) +SYSTEMD_CONF_OPTS += -Dvmspawn=enabled +else +SYSTEMD_CONF_OPTS += -Dvmspawn=disabled +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y) SYSTEMD_CONF_OPTS += -Dquotacheck=true else @@ -373,6 +411,12 @@ else SYSTEMD_CONF_OPTS += -Dsysusers=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) +SYSTEMD_CONF_OPTS += -Dstoragetm=true +else +SYSTEMD_CONF_OPTS += -Dstoragetm=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_FIRSTBOOT),y) SYSTEMD_CONF_OPTS += -Dfirstboot=true else @@ -405,24 +449,24 @@ SYSTEMD_CONF_OPTS += -Dlogind=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) -SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=true +SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=enabled SYSTEMD_MACHINED_PERMISSIONS = /var/lib/machines d 700 0 0 - - - - - else -SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=false +SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=disabled endif ifeq ($(BR2_PACKAGE_SYSTEMD_IMPORTD),y) -SYSTEMD_CONF_OPTS += -Dimportd=true +SYSTEMD_CONF_OPTS += -Dimportd=enabled else -SYSTEMD_CONF_OPTS += -Dimportd=false +SYSTEMD_CONF_OPTS += -Dimportd=disabled endif ifeq ($(BR2_PACKAGE_SYSTEMD_HOMED),y) -SYSTEMD_CONF_OPTS += -Dhomed=true +SYSTEMD_CONF_OPTS += -Dhomed=enabled SYSTEMD_DEPENDENCIES += cryptsetup openssl SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/home d 755 0 0 - - - - - else -SYSTEMD_CONF_OPTS += -Dhomed=false +SYSTEMD_CONF_OPTS += -Dhomed=disabled endif ifeq ($(BR2_PACKAGE_SYSTEMD_HOSTNAMED),y) @@ -431,6 +475,12 @@ else SYSTEMD_CONF_OPTS += -Dhostnamed=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_NSRESOURCED),y) +SYSTEMD_CONF_OPTS += -Dnsresourced=true +else +SYSTEMD_CONF_OPTS += -Dnsresourced=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_MYHOSTNAME),y) SYSTEMD_CONF_OPTS += -Dnss-myhostname=true else @@ -450,10 +500,16 @@ SYSTEMD_CONF_OPTS += -Dlocaled=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_REPART),y) -SYSTEMD_CONF_OPTS += -Drepart=true +SYSTEMD_CONF_OPTS += -Drepart=enabled SYSTEMD_DEPENDENCIES += openssl else -SYSTEMD_CONF_OPTS += -Drepart=false +SYSTEMD_CONF_OPTS += -Drepart=disabled +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_MOUNTFSD),y) +SYSTEMD_CONF_OPTS += -Dmountfsd=true +else +SYSTEMD_CONF_OPTS += -Dmountfsd=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_USERDB),y) @@ -489,10 +545,10 @@ SYSTEMD_CONF_OPTS += -Doomd=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_POLKIT),y) -SYSTEMD_CONF_OPTS += -Dpolkit=true +SYSTEMD_CONF_OPTS += -Dpolkit=enabled SYSTEMD_DEPENDENCIES += polkit else -SYSTEMD_CONF_OPTS += -Dpolkit=false +SYSTEMD_CONF_OPTS += -Dpolkit=disabled endif ifeq ($(BR2_PACKAGE_SYSTEMD_PORTABLED),y) @@ -508,9 +564,9 @@ SYSTEMD_CONF_OPTS += -Dsysext=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) -SYSTEMD_CONF_OPTS += -Dsysupdate=true +SYSTEMD_CONF_OPTS += -Dsysupdate=enabled else -SYSTEMD_CONF_OPTS += -Dsysupdate=false +SYSTEMD_CONF_OPTS += -Dsysupdate=disabled endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) @@ -533,30 +589,30 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK ln -sf ../run/systemd/resolve/resolv.conf \ $(TARGET_DIR)/etc/resolv.conf endef -SYSTEMD_CONF_OPTS += -Dnss-resolve=true -Dresolve=true +SYSTEMD_CONF_OPTS += -Dnss-resolve=enabled -Dresolve=true SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - systemd Resolver else -SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false +SYSTEMD_CONF_OPTS += -Dnss-resolve=disabled -Dresolve=false endif ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) SYSTEMD_CONF_OPTS += \ - -Dgnutls=false \ - -Dopenssl=true \ + -Dgnutls=disabled \ + -Dopenssl=enabled \ -Ddns-over-tls=openssl \ -Ddefault-dns-over-tls=opportunistic SYSTEMD_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_GNUTLS),y) SYSTEMD_CONF_OPTS += \ - -Dgnutls=true \ - -Dopenssl=false \ + -Dgnutls=enabled \ + -Dopenssl=disabled \ -Ddns-over-tls=gnutls \ -Ddefault-dns-over-tls=opportunistic SYSTEMD_DEPENDENCIES += gnutls else SYSTEMD_CONF_OPTS += \ - -Dgnutls=false \ - -Dopenssl=false \ + -Dgnutls=disabled \ + -Dopenssl=disabled \ -Ddns-over-tls=false \ -Ddefault-dns-over-tls=no endif @@ -583,15 +639,15 @@ endif ifeq ($(BR2_PACKAGE_TPM2_TSS),y) SYSTEMD_DEPENDENCIES += tpm2-tss -SYSTEMD_CONF_OPTS += -Dtpm2=true +SYSTEMD_CONF_OPTS += -Dtpm2=enabled else -SYSTEMD_CONF_OPTS += -Dtpm2=false +SYSTEMD_CONF_OPTS += -Dtpm2=disabled endif ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y) SYSTEMD_INSTALL_IMAGES = YES SYSTEMD_DEPENDENCIES += gnu-efi host-python-pyelftools -SYSTEMD_CONF_OPTS += -Defi=true -Dbootloader=true +SYSTEMD_CONF_OPTS += -Defi=true -Dbootloader=enabled SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH)) define SYSTEMD_INSTALL_BOOT_FILES @@ -604,7 +660,7 @@ define SYSTEMD_INSTALL_BOOT_FILES endef else -SYSTEMD_CONF_OPTS += -Defi=false -Dbootloader=false +SYSTEMD_CONF_OPTS += -Defi=false -Dbootloader=disabled endif # BR2_PACKAGE_SYSTEMD_BOOT == y SYSTEMD_FALLBACK_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) @@ -654,6 +710,7 @@ define SYSTEMD_USERS # systemd user groups - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) + $(SYSTEMD_UPLOAD_USER) $(SYSTEMD_COREDUMP_USER) $(SYSTEMD_OOMD_USER) $(SYSTEMD_NETWORKD_USER) @@ -800,14 +857,41 @@ define SYSTEMD_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE) + $(call KCONFIG_DISABLE_OPT,CONFIG_FW_LOADER_USER_HELPER) + + $(call KCONFIG_ENABLE_OPT,CONFIG_DMIID) + + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_BSG) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_USER_NS) + $(call KCONFIG_DISABLE_OPT,CONFIG_SYSFS_DEPRECATED) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPV6) $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECCOMP) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECCOMP_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_KCMP) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_SCH_FQ_CODEL) + + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_FAIR_GROUP_SCHED) + + $(call KCONFIG_ENABLE_OPT,CONFIG_CFS_BANDWIDTH) + + $(call KCONFIG_ENABLE_OPT,CONFIG_EFIVAR_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_EFI_PARTITION) + + $(call KCONFIG_ENABLE_OPT,CONFIG_DMI) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMI_SYSFS) + + $(call KCONFIG_DISABLE_OPT,CONFIG_RT_GROUP_SCHED) $(SYSTEMD_OOMD_LINUX_CONFIG_FIXUPS) endef @@ -815,25 +899,26 @@ endef # We need a very minimal host variant, so we disable as much as possible. HOST_SYSTEMD_CONF_OPTS = \ -Dsplit-bin=true \ - -Dsplit-usr=false \ --prefix=/usr \ --libdir=lib \ --sysconfdir=/etc \ --localstatedir=/var \ -Dcreate-log-dirs=false \ + -Dvcs-tag=false \ -Dmode=release \ -Dutmp=false \ -Dhibernate=false \ + -Dtpm2=disabled \ -Dldconfig=false \ -Dresolve=false \ - -Dbootloader=false \ + -Dbootloader=disabled \ -Defi=false \ -Dtpm=false \ -Denvironment-d=false \ -Dbinfmt=false \ - -Drepart=false \ + -Drepart=disabled \ -Dcoredump=false \ - -Ddbus=false \ + -Ddbus=disabled \ -Ddbus-interfaces-dir=no \ -Dpstore=false \ -Doomd=false \ @@ -841,55 +926,90 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dhostnamed=false \ -Dlocaled=false \ -Dmachined=false \ - -Dpasswdqc=false \ + -Dpasswdqc=disabled \ -Dportabled=false \ -Dsysext=false \ - -Dsysupdate=false \ + -Dsysupdate=disabled \ + -Dmountfsd=false \ -Duserdb=false \ - -Dhomed=false \ + -Dhomed=disabled \ -Dnetworkd=false \ -Dtimedated=false \ -Dtimesyncd=false \ - -Dremote=false \ + -Dremote=disabled \ -Dcreate-log-dirs=false \ + -Dnsresourced=false \ -Dnss-myhostname=false \ - -Dnss-mymachines=false \ - -Dnss-resolve=false \ + -Dnss-mymachines=disabled \ + -Dnss-resolve=disabled \ -Dnss-systemd=false \ -Dfirstboot=false \ -Drandomseed=false \ -Dbacklight=false \ -Dvconsole=false \ + -Dvmspawn=disabled \ -Dquotacheck=false \ -Dsysusers=false \ + -Dstoragetm=false \ -Dtmpfiles=true \ - -Dimportd=false \ + -Dimportd=disabled \ -Dhwdb=true \ -Drfkill=false \ - -Dman=false \ - -Dhtml=false \ + -Dman=disabled \ + -Dhtml=disabled \ -Dsmack=false \ - -Dpolkit=false \ - -Dblkid=false \ + -Dpolkit=disabled \ + -Dblkid=disabled \ -Didn=false \ -Dadm-group=false \ -Dwheel-group=false \ - -Dzlib=false \ + -Dzlib=disabled \ -Dgshadow=false \ -Dima=false \ -Dtests=false \ - -Dglib=false \ - -Dacl=false \ + -Dfuzz-tests=false \ + -Dinstall-tests=false \ + -Dlog-message-verification=disabled \ + -Dglib=disabled \ + -Dlibarchive=disabled \ + -Dacl=disabled \ -Dsysvinit-path='' \ -Dinitrd=false \ -Dxdg-autostart=false \ -Dkernel-install=false \ - -Dukify=false \ + -Dukify=disabled \ -Danalyze=false \ - -Dlibcryptsetup=false \ - -Daudit=false \ - -Dxenctrl=false \ - -Dzstd=false + -Dbpf-framework=disabled \ + -Dvmlinux-h=disabled \ + -Dpwquality=disabled \ + -Dmicrohttpd=disabled \ + -Dqrencode=disabled \ + -Dselinux=disabled \ + -Dlibcryptsetup=disabled \ + -Dlibcryptsetup-plugins=disabled \ + -Delfutils=disabled \ + -Dlibiptc=disabled \ + -Dapparmor=disabled \ + -Daudit=disabled \ + -Dxenctrl=disabled \ + -Dlibidn2=disabled \ + -Dlibidn=disabled \ + -Dseccomp=disabled \ + -Dxkbcommon=disabled \ + -Dbzip2=disabled \ + -Dzstd=disabled \ + -Dlz4=disabled \ + -Dpam=disabled \ + -Dfdisk=disabled \ + -Dkmod=disabled \ + -Dxz=disabled \ + -Dlibcurl=disabled \ + -Dgcrypt=disabled \ + -Dgnutls=disabled \ + -Dopenssl=disabled \ + -Dp11kit=disabled \ + -Dlibfido2=disabled \ + -Dpcre2=disabled HOST_SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ From c19a417674961fe6a10b566d600ceb6b4989ec8b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Jul 2024 10:42:48 +0200 Subject: [PATCH 2076/3013] package/libnfs: fix build with gcc >= 14 Fix the following build failure with gcc >= 14 which enables -Werror=implicit-function-declaration (https://gcc.gnu.org/gcc-14/porting_to.html): nfs-stat.c: In function 'main': nfs-stat.c:287:30: error: implicit declaration of function 'ctime' [-Wimplicit-function-declaration] 287 | printf("Access: %s", ctime( (const time_t *) &st.nfs_atime)); | ^~~~~ nfs-stat.c:177:1: note: 'ctime' is defined in header ''; this is probably fixable by adding '#include ' 176 | #include +++ |+#include 177 | char *uid_to_name(int uid) Fixes: - http://autobuild.buildroot.org/results/73c3828a4e5d275ca0dfdd5b314494e2b00393c8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...0002-utils-nfs-stat.c-include-time.h.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch diff --git a/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch b/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch new file mode 100644 index 00000000000..649d84524cb --- /dev/null +++ b/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch @@ -0,0 +1,39 @@ +From 034205b6b3acd64f9c75010d8da27e2c9f1bc82f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jul 2024 18:04:05 +0200 +Subject: [PATCH] utils/nfs-stat.c: include time.h + +Include time.h to fix the following build failure with gcc >= 14 which +enables -Werror=implicit-function-declaration +(https://gcc.gnu.org/gcc-14/porting_to.html): + +nfs-stat.c: In function 'main': +nfs-stat.c:287:30: error: implicit declaration of function 'ctime' [-Wimplicit-function-declaration] + 287 | printf("Access: %s", ctime( (const time_t *) &st.nfs_atime)); + | ^~~~~ +nfs-stat.c:177:1: note: 'ctime' is defined in header ''; this is probably fixable by adding '#include ' + 176 | #include + +++ |+#include + 177 | char *uid_to_name(int uid) + +Fixes: + - http://autobuild.buildroot.org/results/73c3828a4e5d275ca0dfdd5b314494e2b00393c8 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/sahlberg/libnfs/commit/39e1ae0206fb519c551b48b0e6de57f3e764e886 +--- + utils/nfs-stat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/nfs-stat.c b/utils/nfs-stat.c +index 17ddb311..0ec33544 100644 +--- a/utils/nfs-stat.c ++++ b/utils/nfs-stat.c +@@ -50,6 +50,7 @@ WSADATA wsaData; + #include + #include + #include ++#include + #include "libnfs.h" + #include "libnfs-raw.h" + #include "libnfs-raw-mount.h" From 94951ff187b305bc18f2e24e8f642c26c777a6a2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Jul 2024 15:57:48 +0200 Subject: [PATCH 2077/3013] package/nasm: bump to version 2.16.03 https://nasm.us/doc/nasmdocc.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/nasm/nasm.hash | 2 +- package/nasm/nasm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index d6513ff9c65..141e141b0c1 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1e1b942ea88f22edae89659e15be26fa027eae0747f51413540f52d4eac4790d nasm-2.16.02.tar.xz +sha256 1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148 nasm-2.16.03.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index ec03b03977d..e44d265be6e 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.16.02 +NASM_VERSION = 2.16.03 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause From 4a97ba343e55d4f269256579a0d5d483a89317e1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 26 Jul 2024 21:18:45 +0200 Subject: [PATCH 2078/3013] package/softhsm2: select BR2_PACKAGE_LIBOPENSSL_ENGINES softhsm2 unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859: OSSLCryptoFactory.cpp: In constructor 'OSSLCryptoFactory::OSSLCryptoFactory()': OSSLCryptoFactory.cpp:146:9: error: 'ENGINE_load_rdrand' was not declared in this scope 146 | ENGINE_load_rdrand(); | ^~~~~~~~~~~~~~~~~~ Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/9d0047755d19f1f27a42a758277de8d7a3366832 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/softhsm2/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/softhsm2/Config.in b/package/softhsm2/Config.in index 78fccc95120..ab409a2c964 100644 --- a/package/softhsm2/Config.in +++ b/package/softhsm2/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_SOFTHSM2 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES + select BR2_PACKAGE_LIBOPENSSL_ENGINES help SoftHSM is an implementation of a cryptographic store accessible through a PKCS#11 interface. You can use it From 6b70913703c4364f27ece83c07b23a6e0ef8225f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 26 Jul 2024 22:03:52 +0200 Subject: [PATCH 2079/3013] support/testing: fix s6-portable-utils test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s6-test was removed in s6-portable-utils 2.3.0.0, and replaced with eltest (from execline). This change broke the existing runtime tests with commit 42fad03182 ("packages: bump skalibs-related packages"). Instead of s6-test simply use the shell built-in "test", which provides sufficient functionality. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7338388010 Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_s6_portable_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_s6_portable_utils.py b/support/testing/tests/package/test_s6_portable_utils.py index 372e3ba8129..d4df70cd51f 100644 --- a/support/testing/tests/package/test_s6_portable_utils.py +++ b/support/testing/tests/package/test_s6_portable_utils.py @@ -28,5 +28,5 @@ def test_run(self): _, exit_code = self.emulator.run("s6-mkfifo testpipe") self.assertEqual(exit_code, 0) - _, exit_code = self.emulator.run("s6-test -p testpipe") + _, exit_code = self.emulator.run("test -p testpipe") self.assertEqual(exit_code, 0) From 7801890c3a076309362b477e9e27952dd4ebbab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 26 Jul 2024 22:03:53 +0200 Subject: [PATCH 2080/3013] support/testing: add testing for eltest in execline test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous commit removes s6-test from the runtime tests. This commit adds the same test for eltest, which replaced s6-test. Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_execline.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/support/testing/tests/package/test_execline.py b/support/testing/tests/package/test_execline.py index a7ea36c1a21..15ff92d762e 100644 --- a/support/testing/tests/package/test_execline.py +++ b/support/testing/tests/package/test_execline.py @@ -21,3 +21,8 @@ def test_run(self): output, exit_code = self.emulator.run("execlineb -c 'echo hello world'") self.assertEqual(exit_code, 0) self.assertEqual(output[0].strip(), "hello world") + + _, exit_code = self.emulator.run("mkfifo testpipe") + self.assertEqual(exit_code, 0) + _, exit_code = self.emulator.run("execlineb -c 'eltest -p testpipe'") + self.assertEqual(exit_code, 0) From 6caf350c1a9f5c6907d109e1c55fe420ec1aebd6 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Fri, 26 Jul 2024 18:01:52 +0200 Subject: [PATCH 2081/3013] package/busybox: fix menuconfig with GCC 14 GCC 14 errors out on the implicit return type of "main() {}". The patch also removes the /dev/null redirection of GCC stderr that hid the actual problem. Signed-off-by: Fiona Klute (WIWA) Reviewed-by: Brandon Maier Tested-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- ...-failing-saying-ncurses-is-not-found.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch diff --git a/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch b/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch new file mode 100644 index 00000000000..4651d8c2c91 --- /dev/null +++ b/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch @@ -0,0 +1,38 @@ +From ctxnop@gmail.com Sun Jul 21 12:10:52 2024 +From: ctxnop@gmail.com (Nop) +Date: Sun, 21 Jul 2024 14:10:52 +0200 +Subject: [PATCH] menuconfig: GCC failing saying ncurses is not found + +Newer GCC increased diagnostics levels resulting in considering the +test code to be invalid. The resulting message was misleading, saying +that ncurses was not found, while the check failed for an unrelated +reason which was hidden because GCC stderr was redirected to +/dev/null. + +Signed-off-by: ctxnop +Upstream: http://lists.busybox.net/pipermail/busybox/2024-July/090840.html +[Fiona: rephrased commit message for clarity] +Signed-off-by: Fiona Klute (WIWA) +--- + scripts/kconfig/lxdialog/check-lxdialog.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh +b/scripts/kconfig/lxdialog/check-lxdialog.sh +index 5075ebf2d..c644d1d48 100755 +--- a/scripts/kconfig/lxdialog/check-lxdialog.sh ++++ b/scripts/kconfig/lxdialog/check-lxdialog.sh +@@ -45,9 +45,9 @@ trap "rm -f $tmp" 0 1 2 3 15 + + # Check if we can link to ncurses + check() { +- $cc -x c - -o $tmp 2>/dev/null <<'EOF' ++ $cc -x c - -o $tmp <<'EOF' + #include CURSES_LOC +-main() {} ++int main() { return 0; } + EOF + if [ $? != 0 ]; then + echo " *** Unable to find the ncurses libraries or the" 1>&2 +-- +2.45.2 From 4baf992d836c7319b646911f803ec9800dc27ec0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 23 Jun 2024 12:26:15 +0200 Subject: [PATCH 2082/3013] package/octave: add optional openssl support GNU Octave supports the --with-openssl configure option since v4.0.0. For reference, commit 40ea68b4b2 "package/octave: new package" introduced the package at v7.1.0. This commits adds this optional support. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 0e2c2810dc25de0cdc2126851061f9feabe66930) Signed-off-by: Peter Korsgaard --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index f3caac3d3a4..42227045f65 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -43,6 +43,13 @@ else OCTAVE_CONF_OPTS += --without-curl endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OCTAVE_CONF_OPTS += --with-openssl=yes +OCTAVE_DEPENDENCIES += openssl +else +OCTAVE_CONF_OPTS += --without-openssl +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From f42ca9644a899df2af4c8abaa62d387e2b285e90 Mon Sep 17 00:00:00 2001 From: Lance Fredrickson Date: Sat, 22 Jun 2024 21:38:04 -0600 Subject: [PATCH 2083/3013] boot/syslinux: fix building with GCC 14.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing stdio.h include. Without this includes, the build fails with the following error under GCC 14.x: ../../../com32/lib/syslinux/debug.c: In function ‘syslinux_debug’: ../../../com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration] 91 | printf("Dynamic debug unavailable\n"); Signed-off-by: Lance Fredrickson Signed-off-by: Thomas Petazzoni (cherry picked from commit 3b9d62dac564b6d1bfa5ba5e0dd72e731fd95d55) Signed-off-by: Peter Korsgaard --- .../0020-pull-in-stdio-h-for-gcc14.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch diff --git a/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch b/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch new file mode 100644 index 00000000000..09a0074b314 --- /dev/null +++ b/boot/syslinux/0020-pull-in-stdio-h-for-gcc14.patch @@ -0,0 +1,34 @@ +From dfa2705100a893bc017d23406daa9a383fbc3c95 Mon Sep 17 00:00:00 2001 +From: Lance Fredrickson +Date: Wed, 5 Jun 2024 14:31:38 -0600 +Subject: [PATCH] com32/lib/syslinux/debug.c: add missing stdio.h include. + +Fix building syslinux with GCC 14.x + +Add missing stdio.h include. Without it results in the following error under GCC 14.x + +../../../com32/lib/syslinux/debug.c: In function ‘syslinux_debug’: +../../../com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration] + 91 | printf("Dynamic debug unavailable\n"); + +Upstream: dead (last release in 2014) +Signed-off-by: Lance Fredrickson +--- + com32/lib/syslinux/debug.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c +index d9ab863f..e8f53d57 100644 +--- a/com32/lib/syslinux/debug.c ++++ b/com32/lib/syslinux/debug.c +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + + #ifdef DYNAMIC_DEBUG + +-- +2.39.2 + From dbcdebb679da066098e91134910fbd90b6e06e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Thu, 20 Jun 2024 13:08:20 +0200 Subject: [PATCH 2084/3013] board/ti/am62x-sk: update custom hashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit cc2910a7dbd331ae0ad6a8f06ce7cd0559a1ebe1 ("configs/ti_am62x_sk_defconfig: update U-Boot to v2024.04") updated U-Boot and the ti-k3-r5-loader to 2024.04, but did not update the hash files in board/ti/am62x-sk/. It ended up working for now, because the official versions of boot/uboot and boot/ti-k3-r5-loader/ also use 2024.04 and therefore have this hash, but it would have started failing as soon as boot/uboot and/or boot/ti-k3-r5-loader official version were updated. Signed-off-by: Gero Schwäricke Signed-off-by: Thomas Petazzoni (cherry picked from commit 3da51c91802d4ff5f071ae92c3bec8eae03802e2) Signed-off-by: Peter Korsgaard --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 4 ++-- board/ti/am62x-sk/patches/uboot/uboot.hash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8f60864fbf6..7494e04ead5 100644 --- a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ -# Locally computed: +# Locally calculated sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index 0e171c56f59..97a2b4eaf95 100644 --- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am62x-sk/patches/uboot/uboot.hash b/board/ti/am62x-sk/patches/uboot/uboot.hash index 0e171c56f59..97a2b4eaf95 100644 --- a/board/ti/am62x-sk/patches/uboot/uboot.hash +++ b/board/ti/am62x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 From ffe46c664611bc0563462df97de16a3b8aa94f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Thu, 20 Jun 2024 13:08:21 +0200 Subject: [PATCH 2085/3013] board/ti/am64x-sk: update custom hashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 7efd75867cd84926b7aa6524e0a41c50c32b20e1 ("configs/ti_am64x_sk_defconfig: update U-Boot to v2024.04") updated U-Boot and the ti-k3-r5-loader to 2024.04, but did not update the hash files in board/ti/am62x-sk/. It ended up working for now, because the official versions of boot/uboot and boot/ti-k3-r5-loader/ also use 2024.04 and therefore have this hash, but it would have started failing as soon as boot/uboot and/or boot/ti-k3-r5-loader official version were updated. Signed-off-by: Gero Schwäricke Signed-off-by: Thomas Petazzoni (cherry picked from commit 5654eca137b19e904391cf6e2745c980f6260760) Signed-off-by: Peter Korsgaard --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 ++- board/ti/am64x-sk/patches/uboot/uboot.hash | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8f60864fbf6..7494e04ead5 100644 --- a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ -# Locally computed: +# Locally calculated sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index dbb44287388..97a2b4eaf95 100644 --- a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1 +1,2 @@ -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am64x-sk/patches/uboot/uboot.hash b/board/ti/am64x-sk/patches/uboot/uboot.hash index 0e171c56f59..97a2b4eaf95 100644 --- a/board/ti/am64x-sk/patches/uboot/uboot.hash +++ b/board/ti/am64x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 From 6d6e9fb45fa79f7370ce0f1ea0bedd5b0800d455 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 25 Jun 2024 00:49:58 +0200 Subject: [PATCH 2086/3013] support/testing: add kmod runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 48790b43296f45aa7f9f8c6701e94fe86269c241) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_kmod.py | 97 +++++++++++++++++++ .../test_kmod/linux-virtio-net.fragment | 1 + 3 files changed, 100 insertions(+) create mode 100644 support/testing/tests/package/test_kmod.py create mode 100644 support/testing/tests/package/test_kmod/linux-virtio-net.fragment diff --git a/DEVELOPERS b/DEVELOPERS index ef833f00f72..2a25cc6c2f8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1840,6 +1840,8 @@ F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ +F: support/testing/tests/package/test_kmod.py +F: support/testing/tests/package/test_kmod/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ F: support/testing/tests/package/test_less.py diff --git a/support/testing/tests/package/test_kmod.py b/support/testing/tests/package/test_kmod.py new file mode 100644 index 00000000000..1d9ea535fc8 --- /dev/null +++ b/support/testing/tests/package/test_kmod.py @@ -0,0 +1,97 @@ +import os + +import infra.basetest + + +class TestKmod(infra.basetest.BRTest): + # This test uses the "virtio_net" driver compiled as a module. We + # need to recompile a Kernel for that. + kernel_fragment = \ + infra.filepath("tests/package/test_kmod/linux-virtio-net.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.35" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_KMOD=y + BR2_PACKAGE_KMOD_TOOLS=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # We check the kmod program can run. Busybox does not have a + # kmod applet, so there is no possible confusion. + self.assertRunOk("kmod --version") + + # We check the "modprobe" is the one from kmod, rather than + # the Busybox applet version. + out, ret = self.emulator.run("modprobe --version") + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith("kmod version")) + + # List modules with "kmod list", the virtio-net module should + # NOT be loaded yet. + out, ret = self.emulator.run("kmod list") + self.assertEqual(ret, 0) + self.assertNotIn("virtio_net", "\n".join(out)) + + # Get module info with modinfo. + out, ret = self.emulator.run("modinfo virtio-net") + self.assertEqual(ret, 0) + lsmod_out = "\n".join(out) + self.assertRegex(lsmod_out, r'name: *virtio_net') + self.assertRegex(lsmod_out, r'description: *Virtio network driver') + + # With this test configuration, we are not supposed to have an + # eth0 Ethernet interface yet. Attempting to show info on this + # interface is expected to fail . + _, ret = self.emulator.run("ip link show dev eth0") + self.assertNotEqual(ret, 0) + + # We try to load the module. + self.assertRunOk("modprobe virtio-net") + + # We should now see the module in the list. This time, we use + # the "lsmod" command. + out, ret = self.emulator.run("lsmod") + self.assertEqual(ret, 0) + self.assertIn("virtio_net", "\n".join(out)) + + # The eth0 interface is supposed to be available, after the + # module loading. We configure the emulator user network to + # test the driver networking functionality. See: + # https://wiki.qemu.org/Documentation/Networking + self.assertRunOk("ip addr add dev eth0 10.0.2.15/24") + self.assertRunOk("ip link set dev eth0 up") + + # We check we can ping the emulator. + ping_cmd = "ping -i 0.3 -c 2 10.0.2.2" + self.assertRunOk(ping_cmd) + + # We check we can unload the driver. + self.assertRunOk("modprobe -r virtio-net") + + # Now the driver is unloaded, we should no longer be able to + # ping the emulator. + _, ret = self.emulator.run(ping_cmd) + self.assertNotEqual(ret, 0) diff --git a/support/testing/tests/package/test_kmod/linux-virtio-net.fragment b/support/testing/tests/package/test_kmod/linux-virtio-net.fragment new file mode 100644 index 00000000000..170da19d65d --- /dev/null +++ b/support/testing/tests/package/test_kmod/linux-virtio-net.fragment @@ -0,0 +1 @@ +CONFIG_VIRTIO_NET=m From 2b0c3604a4ce07ad4335ff4b3f6306fc4172d375 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 11 Jul 2024 10:31:56 +0300 Subject: [PATCH 2087/3013] package/libgeos: bump version to 3.12.2 Changelog: https://github.com/libgeos/geos/releases/tag/3.12.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 5777bfc0f72db4de0315b753b2a064f017b3d652) Signed-off-by: Peter Korsgaard --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 37fe7d6d231..362f1c10b66 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03 geos-3.12.1.tar.bz2 +sha256 34c7770bf0090ee88488af98767d08e779f124fa33437e0aabec8abd4609fec6 geos-3.12.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 491168324ff..05b74b60a2c 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.12.1 +LIBGEOS_VERSION = 3.12.2 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From c9089fb964941caf755500d4e8c5ff2eda6b35ca Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 11 Jul 2024 19:51:03 +0200 Subject: [PATCH 2088/3013] package/snappy: fix compilation error raised by vqtbl1q_u8 instruction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The package compilation for the raspberrypi3_qt5we_defconfig raises the following error: In file included from buildroot/output/build/snappy-1.1.10/snappy.cc:29: buildroot/output/build/snappy-1.2.1/snappy-internal.h: In function ‘snappy::internal::V128 snappy::internal::V128_Shuffle(V128, V128)’: buildroot/output/build/snappy-1.2.1/snappy-internal.h:109:10: error: ‘vqtbl1q_u8’ was not declared in this scope; did you mean ‘vtbl1_u8’? 109 | return vqtbl1q_u8(input, shuffle_mask); | ^~~~~~~~~~ | vtbl1_u8 make[4]: *** [CMakeFiles/snappy.dir/build.make:118: CMakeFiles/snappy.dir/snappy.cc.o] Error 1 The issue was raised by commit b3fb0b5b4b076 ("Enable vector byte shuffle optimizations on ARM NEON") contained in version 1.1.10. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 01f35f8875acc98adb670d789b256790e2418be8) Signed-off-by: Peter Korsgaard --- ...error-raised-by-vqtbl1q_u8-instructi.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch diff --git a/package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch b/package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch new file mode 100644 index 00000000000..b10ea7ecdfb --- /dev/null +++ b/package/snappy/0001-Fix-compilation-error-raised-by-vqtbl1q_u8-instructi.patch @@ -0,0 +1,52 @@ +From 284d5a6f267d4962b2b88540f218c10740a6c053 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sat, 8 Jun 2024 18:42:16 +0200 +Subject: [PATCH] Fix compilation error raised by vqtbl1q_u8 instruction +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The compilation in Buildroot for the raspberrypi3_qt5we_defconfig +configuration: + +make raspberrypi3_qt5we_defconfig +make + +raises the following error: + +In file included from buildroot/output/build/snappy-1.2.1/snappy.cc:29: +buildroot/output/build/snappy-1.2.1/snappy-internal.h: In function ‘snappy::internal::V128 snappy::internal::V128_Shuffle(V128, V128)’: +buildroot/output/build/snappy-1.2.1/snappy-internal.h:109:10: error: ‘vqtbl1q_u8’ was not declared in this scope; did you mean ‘vtbl1_u8’? + 109 | return vqtbl1q_u8(input, shuffle_mask); + | ^~~~~~~~~~ + | vtbl1_u8 +make[4]: *** [CMakeFiles/snappy.dir/build.make:118: CMakeFiles/snappy.dir/snappy.cc.o] Error 1 + +As reported by [1], the vqtbl1q_u8 instruction is supported by A64 +architectures. For this reason, the patch enables the use of the +instruction only for NEON of such architecture. + +[1] https://developer.arm.com/architectures/instruction-sets/intrinsics/vqtbl1q_u8 + +Signed-off-by: Dario Binacchi +Upstream: https://github.com/google/snappy/pull/185 +--- + snappy-internal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snappy-internal.h b/snappy-internal.h +index ae78247dbbc9..256d32344d1a 100644 +--- a/snappy-internal.h ++++ b/snappy-internal.h +@@ -46,7 +46,7 @@ + #include + #endif + +-#if SNAPPY_HAVE_SSSE3 || SNAPPY_HAVE_NEON ++#if SNAPPY_HAVE_SSSE3 || (SNAPPY_HAVE_NEON && defined(__aarch64__)) + #define SNAPPY_HAVE_VECTOR_BYTE_SHUFFLE 1 + #else + #define SNAPPY_HAVE_VECTOR_BYTE_SHUFFLE 0 +-- +2.43.0 + From 8d9f064080a95f4edcfa62c25c292d0345fb3762 Mon Sep 17 00:00:00 2001 From: Alexander Wellbrock Date: Mon, 17 Jun 2024 20:01:57 +0200 Subject: [PATCH 2089/3013] package/c-ares: update site url Download URLs changed after hosting of the c-ares website changed ownership: https://daniel.haxx.se/blog/2024/06/06/bye-bye-hosting-c-ares-web/ This cannot be fixed upstream as github pages does not support .htaccess files according to: https://github.com/c-ares/c-ares.github.io/issues/2 Signed-off-by: Alexander Wellbrock Signed-off-by: Thomas Petazzoni (cherry picked from commit b57f48e131e94a2fafc31e3ca6cb3c11553a5930) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index c4441255a2d..c2403b9c4cb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -5,7 +5,7 @@ ################################################################################ C_ARES_VERSION = 1.27.0 -C_ARES_SITE = http://c-ares.haxx.se/download +C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/cares-1_27_0 C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT From fc0499a23c8fcf0d48d50602b7c41a6b6d63d8f4 Mon Sep 17 00:00:00 2001 From: Jan Havran Date: Sun, 16 Jun 2024 16:19:14 +0200 Subject: [PATCH 2090/3013] package/ubus: remove obsolete systemd option ENABLE_SYSTEMD option has been removed from ubus by upstream commit: 96ab0b3032f5 ubusd: remove systemd socket activation support From a Buildroot perspective, this means that this systemd socket activation feature no longer exists since Buildroot commit 130be80d34905d3e79ff6b8f8fb31b3c3765eb96 ("ubus: bump version"), as we bumped ubus from 259450f414d8c9ee41896e8e6d6bc57ec00e2b63 to 34c6e818e431cc53478a0f7c7c1eca07d194d692 in this commit, and the 96ab0b3032f5 ("ubusd: remove systemd socket activation support") commit is in this range. It was therefore dropped upstream in 2016, and in Buildroot in 2017. Signed-off-by: Jan Havran Signed-off-by: Thomas Petazzoni (cherry picked from commit 60c8807c69be60a8f1c35ed9f992850b009126be) Signed-off-by: Peter Korsgaard --- package/ubus/ubus.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk index 1f9891411ac..cc2ed817869 100644 --- a/package/ubus/ubus.mk +++ b/package/ubus/ubus.mk @@ -25,13 +25,6 @@ else UBUS_CONF_OPTS += -DBUILD_LUA=OFF endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -UBUS_DEPENDENCIES += systemd -UBUS_CONF_OPTS += -DENABLE_SYSTEMD=ON -else -UBUS_CONF_OPTS += -DENABLE_SYSTEMD=OFF -endif - ifeq ($(BR2_PACKAGE_UBUS_EXAMPLES),y) UBUS_CONF_OPTS += -DBUILD_EXAMPLES=ON else From 3918d46a260f4731aeb99fe0fa6a4008cf3426aa Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 10 Jun 2024 11:38:33 +0200 Subject: [PATCH 2091/3013] package/tftpd: bump to latest git commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following error when compiled against GCC 14.x: tftp.c: In function ‘tftp_sendfile’: tftp.c:88:5: error: implicit declaration of function ‘bsd_signal’; did you mean ‘ssignal’? [-Wimplicit-function-declaration] 88 | bsd_signal(SIGALRM, timer); | ^~~~~~~~~~ | ssignal tftp.c:88:5: warning: nested extern declaration of ‘bsd_signal’ [-Wnested-externs] main.c: In function ‘main’: main.c:308:5: error: implicit declaration of function ‘bsd_signal’; did you mean ‘ssignal’? [-Wimplicit-function-declaration] 308 | bsd_signal(SIGINT, intr); | ^~~~~~~~~~ | ssignal main.c:308:5: warning: nested extern declaration of ‘bsd_signal’ [-Wnested-externs] Remove an upstreamed patch. tftpd/tftpd.c has changed, hence, change its checksum. Signed-off-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (cherry picked from commit ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...tern-qualifier-to-fix-gcc-10.x-build.patch | 29 ------------------- package/tftpd/tftpd.hash | 4 +-- package/tftpd/tftpd.mk | 2 +- 4 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index a7553198244..1006b7cfe8c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1458,7 +1458,6 @@ package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch lib_patch.Up package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch lib_patch.Upstream package/tcf-agent/S55tcf-agent Shellcheck lib_sysv.Variables package/tcl/0001-Disable-tcl-compatibility-layers.patch lib_patch.Upstream -package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch lib_patch.Upstream package/tftpd/S80tftpd-hpa Shellcheck lib_sysv.Indent lib_sysv.Variables package/ti-gfx/0001-newclkapi.patch lib_patch.Upstream package/ti-gfx/0002-fix-build-omaplfb-linux.patch lib_patch.Upstream diff --git a/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch b/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch deleted file mode 100644 index c964555347c..00000000000 --- a/package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f994166d8571961a08479736ae86c5baa2bb47f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 7 Aug 2020 12:07:45 +0200 -Subject: [PATCH] Use "extern" qualifier to fix gcc 10.x build - -Patch from -https://src.fedoraproject.org/rpms/tftp/raw/master/f/tftp-hpa-5.2-gcc10.patch. - -Signed-off-by: Thomas Petazzoni ---- - tftp/tftp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tftp/tftp.c b/tftp/tftp.c -index d15da22..d067f96 100644 ---- a/tftp/tftp.c -+++ b/tftp/tftp.c -@@ -48,7 +48,7 @@ extern int maxtimeout; - #define PKTSIZE SEGSIZE+4 - char ackbuf[PKTSIZE]; - int timeout; --sigjmp_buf toplevel; -+extern sigjmp_buf toplevel; - sigjmp_buf timeoutbuf; - - static void nak(int, const char *); --- -2.26.2 - diff --git a/package/tftpd/tftpd.hash b/package/tftpd/tftpd.hash index 66e6b0d26c7..3fab9dba073 100644 --- a/package/tftpd/tftpd.hash +++ b/package/tftpd/tftpd.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0eb23ceca54eac3648ca4254a4664241483ddc6bef36958e1cf23bc994d15863 tftpd-b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7-git4.tar.gz +sha256 9bdb3e2ab2b68e4d8cd057d102395c362baf07c7b052f1d5e40e5190afecc15e tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0-git4.tar.gz # Hash for license file -sha256 67754ebd8f265571d3226ac97e521b1bd6fd8a61363ecd4ab7806a6f90efab92 tftpd/tftpd.c +sha256 5936d0764cb6e8f2f5ce8a11c249d81037b5f275f5983e8538ee4fbe57195369 tftpd/tftpd.c diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index ceac24119eb..81b67f82cec 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TFTPD_VERSION = b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7 +TFTPD_VERSION = e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0 TFTPD_SITE = https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git TFTPD_SITE_METHOD = git TFTPD_CONF_OPTS = --without-tcpwrappers From 58781773ecf0984b3d979c4f0d871c7dca2e3fa0 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Tue, 11 Jun 2024 19:55:39 +0300 Subject: [PATCH 2092/3013] package/systemd: fix build with recent kernels Backport a patch from upstream that adds the magic number for the bcachefs superblock. Otherwise, systemd 254.13 fails to compile with the latest kernel versions. Signed-off-by: Jarkko Sakkinen Signed-off-by: Thomas Petazzoni (cherry picked from commit f3c1f667dcc300eb7205aa3e1731ba3377a8e48d) Signed-off-by: Peter Korsgaard --- .../0002-basic-add-bcachefs-magic.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/systemd/0002-basic-add-bcachefs-magic.patch diff --git a/package/systemd/0002-basic-add-bcachefs-magic.patch b/package/systemd/0002-basic-add-bcachefs-magic.patch new file mode 100644 index 00000000000..e7f4b1cbb73 --- /dev/null +++ b/package/systemd/0002-basic-add-bcachefs-magic.patch @@ -0,0 +1,53 @@ +From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Fri, 31 May 2024 09:51:38 +1200 +Subject: [PATCH] basic: Add BCACHEFS magic + +Import magic.h from Linux 6.9 to get the definition of +BCACHEFS_SUPER_MAGIC. Update filesystems-gperf.gperf to add knowledge of +bcachefs. + +This fixes the following error building against a bleeding edge kernel. +``` +src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers: + +Filesystem found in kernel header but not in filesystems-gperf.gperf: BCACHEFS_SUPER_MAGIC +``` + +Upstream: https://github.com/systemd/systemd/commit/201148b08de65de004d10679a8c3d201cc08fb28 +Signed-off-by: Jarkko Sakkinen +--- + src/basic/filesystems-gperf.gperf | 1 + + src/basic/missing_magic.h | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf +index 1cd66b5a5f..c82fe98227 100644 +--- a/src/basic/filesystems-gperf.gperf ++++ b/src/basic/filesystems-gperf.gperf +@@ -28,6 +28,7 @@ afs, {AFS_FS_MAGIC, AFS_SUPER_MAGIC} + anon_inodefs, {ANON_INODE_FS_MAGIC} + autofs, {AUTOFS_SUPER_MAGIC} + balloon-kvm, {BALLOON_KVM_MAGIC} ++bcachefs, {BCACHEFS_SUPER_MAGIC} + bdev, {BDEVFS_MAGIC} + binder, {BINDERFS_SUPER_MAGIC} + binfmt_misc, {BINFMTFS_MAGIC} +diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h +index 82d71c8ad1..b3d2ee9f57 100644 +--- a/src/basic/missing_magic.h ++++ b/src/basic/missing_magic.h +@@ -197,3 +197,10 @@ + #ifndef NTFS3_SUPER_MAGIC + #define NTFS3_SUPER_MAGIC 0x7366746e + #endif ++ ++/* Added in Linux commit e2f48c48090dea172c0c571101041de64634dae5. Remove when next sync'd */ ++#ifndef BCACHEFS_SUPER_MAGIC ++# define BCACHEFS_SUPER_MAGIC 0xca451a4e ++#else ++assert_cc(BCACHEFS_SUPER_MAGIC == 0xca451a4e) ++#endif +-- +2.45.1 + From 4aed83070375bfa0e1e918529e1b7724cf12fd98 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 2 Jun 2024 16:19:54 +0200 Subject: [PATCH 2093/3013] package/ncftp: bump to version 3.2.7 Change download location as the new version is not available at the old location. Remove already upstreamed patch. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard (cherry picked from commit 0deb8c4c5dcae01e1da772e2e1540aa989e8af8b) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/ncftp/0001-fix-gcc-10.patch | 24 ------------------------ package/ncftp/ncftp.hash | 2 +- package/ncftp/ncftp.mk | 8 +++----- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/ncftp/0001-fix-gcc-10.patch diff --git a/.checkpackageignore b/.checkpackageignore index 1006b7cfe8c..0358361079c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1067,7 +1067,6 @@ package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream -package/ncftp/0001-fix-gcc-10.patch lib_patch.Upstream package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream diff --git a/package/ncftp/0001-fix-gcc-10.patch b/package/ncftp/0001-fix-gcc-10.patch deleted file mode 100644 index 8ff9c44c502..00000000000 --- a/package/ncftp/0001-fix-gcc-10.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with gcc 10 - -Add missing extern to gBm to fix the following build failure with --fno-common which is enabled by default with gcc 10: - -/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: bookmark.o:(.bss+0x10): multiple definition of `gBm'; gpshare.o:(.bss+0x24): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/78822bc0e0039e8f8949011a256cac022863276f - -Signed-off-by: Fabrice Fontaine - -diff -Nura ncftp-3.2.6-orig/sh_util/gpshare.c ncftp-3.2.6/sh_util/gpshare.c ---- ncftp-3.2.6-orig/sh_util/gpshare.c 2020-08-21 10:46:34.173816750 +0200 -+++ ncftp-3.2.6/sh_util/gpshare.c 2020-08-21 10:52:25.407976319 +0200 -@@ -28,7 +28,7 @@ - - static int gIsAtty1 = 1, gIsAtty2 = 1; - extern int gLoadedBm, gBookmarkMatchMode; --Bookmark gBm; -+extern Bookmark gBm; - - double - FileSize(double size, const char **uStr0, double *uMult0) diff --git a/package/ncftp/ncftp.hash b/package/ncftp/ncftp.hash index 3ab27df5cc8..3e390b10153 100644 --- a/package/ncftp/ncftp.hash +++ b/package/ncftp/ncftp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23 ncftp-3.2.6-src.tar.gz +sha256 d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8 ncftp-3.2.7-src.tar.xz sha256 4fe2f063d25d79c49712a272ebb68e050c703eed9c66c80108427edfe3285580 doc/LICENSE.txt diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index d380ebae027..a3aa3fb1940 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -4,11 +4,9 @@ # ################################################################################ -NCFTP_VERSION = 3.2.6 -# use .gz as upstream .xz tarball has changed after the hash was added for -# 2017.02. Can be changed back to .xz when version is bumped -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz -NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp/older_versions +NCFTP_VERSION = 3.2.7 +NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz +NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License NCFTP_LICENSE_FILES = doc/LICENSE.txt From a02c8e337e3849968d2e0c30259c4d8fd440c052 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 17 Jun 2024 11:36:26 +0200 Subject: [PATCH 2094/3013] package/ncftp: fix GCC 14.x related build errors Patches were taken from Gentoo: https://bugs.gentoo.org/921487 https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch Fixes: http://autobuild.buildroot.net/results/058578eae885ce6e206c25b5a24aa11b625adf88/ Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit b2aa09a492cf0b1b481b754dcc5f0168a039bd3c) Signed-off-by: Peter Korsgaard --- .../ncftp/0001-ncftp-3.2.7-fix-gcc14.patch | 19 +++++ .../ncftp/0002-ncftp-3.2.7-fix-clang.patch | 72 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch create mode 100644 package/ncftp/0002-ncftp-3.2.7-fix-clang.patch diff --git a/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch b/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch new file mode 100644 index 00000000000..e2cda631d45 --- /dev/null +++ b/package/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch @@ -0,0 +1,19 @@ +fix select arg detection + +Reference: + https://bugs.gentoo.org/921487 + +Upstream: N/A, unresponsive contact email address. + +Signed-off-by: Yegor Yefremov +--- a/autoconf_local/aclocal.m4 ++++ b/autoconf_local/aclocal.m4 +@@ -4196,7 +4196,7 @@ + #include + #endif + #include /* MG: always incl */ +-extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl ++extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl + [ac_not_found=no ; break 3],ac_not_found=yes) + done + done diff --git a/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch b/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch new file mode 100644 index 00000000000..bed103609ce --- /dev/null +++ b/package/ncftp/0002-ncftp-3.2.7-fix-clang.patch @@ -0,0 +1,72 @@ +Fix compilation with clang-16 + +aclocal.m4 contains code that no longer compiles: missing headers and missing +return types. + +Reference: + https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch + +Upstream: N/A, unresponsive contact email address. + +Signed-off-by: Yegor Yefremov +--- a/autoconf_local/aclocal.m4 ++++ b/autoconf_local/aclocal.m4 +@@ -3057,6 +3057,7 @@ + #include + #include + #include ++#include + ],[ + struct sockaddr_un uaddr; + +@@ -3285,6 +3286,7 @@ + #ifdef HAVE_RESOLV_H + # include + #endif ++#include + ],[ + /* function-body */ + int len; +@@ -3363,6 +3365,7 @@ + #include + #include + ++ int + main(int argc, char **argv) + { + /* Note: don't actually call readline, +@@ -5145,6 +5148,7 @@ + #ifdef HAVE_STDLIB_H + # include + #endif ++#include + + #ifdef HAVE_NCURSES_H + # define NCURSES_OPAQUE 0 +@@ -5176,6 +5180,7 @@ + #endif + + ++int + main(int argc, char **argv) + { + /* Note: don't actually call curses, since it may block; +@@ -6510,7 +6515,6 @@ + #endif + #endif /* MG */ + +-int + int main(void) + { + char *data, *data2, *data3; +@@ -6607,8 +6611,9 @@ + AC_CACHE_CHECK(whether setvbuf arguments are reversed, + ac_cv_func_setvbuf_reversed, + [AC_TRY_RUN([#include ++ $include + /* If setvbuf has the reversed format, exit 0. */ +- main () { ++ int main (void) { + /* This call has the arguments reversed. + A reversed system may check and see that the address of main + is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ From d7696a82fb4d8c801c4f1033b4aaa14f4c243418 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 11 Jul 2024 22:52:37 +0200 Subject: [PATCH 2095/3013] package/ed: bump to version 1.20.2 See release announce: https://lists.gnu.org/archive/html/bug-ed/2024-04/msg00003.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 55235919f87e984f78cd52b5be45d94c44c74dee) Signed-off-by: Peter Korsgaard --- package/ed/ed.hash | 4 ++-- package/ed/ed.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ed/ed.hash b/package/ed/ed.hash index 5deb5e74efc..d1d99309c6e 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2024-01/msg00000.html -sha256 c6030defe6ae172f1687906d7354054c75a6a9130af319d4e73c50a91959c5a6 ed-1.20.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2024-04/msg00003.html +sha256 65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523 ed-1.20.2.tar.lz # Locally calculated sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index edfadf02a64..704744359a3 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,7 +4,7 @@ # ################################################################################ -ED_VERSION = 1.20 +ED_VERSION = 1.20.2 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-2.0+ From 7857868d00be7a6ea8b204377a1881b3c9491218 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 16:10:41 +0200 Subject: [PATCH 2096/3013] board/chromebook: use global-patch-dir for kernel patch We're going to add hashes soon, so we'll need to have that directory populated with hash files, and it would then be a bit confusing to not have the patch file in the patches directory... Signed-off-by: Yann E. MORIN Cc: Alex Suykov Signed-off-by: Arnout Vandecappelle (cherry picked from commit 552a8cec8cb1a9a66591d075992957ad32547528) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../linux/0001-linux-4.15-dts-tpm.patch} | 3 +++ configs/chromebook_snow_defconfig | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename board/chromebook/snow/{linux-4.15-dts-tpm.patch => patches/linux/0001-linux-4.15-dts-tpm.patch} (85%) diff --git a/.checkpackageignore b/.checkpackageignore index 0358361079c..ee44e82f5bb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -26,7 +26,6 @@ board/canaan/k210-soc/post-build.sh Shellcheck board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck board/chromebook/elm/sign.sh Shellcheck board/chromebook/mksd.sh Shellcheck -board/chromebook/snow/linux-4.15-dts-tpm.patch lib_patch.ApplyOrder lib_patch.Upstream board/chromebook/snow/sign.sh Shellcheck board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch lib_patch.Upstream board/cubietech/cubieboard2/post-image.sh Shellcheck diff --git a/board/chromebook/snow/linux-4.15-dts-tpm.patch b/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch similarity index 85% rename from board/chromebook/snow/linux-4.15-dts-tpm.patch rename to board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch index c71ff1b5845..01f452b5638 100644 --- a/board/chromebook/snow/linux-4.15-dts-tpm.patch +++ b/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch @@ -9,6 +9,9 @@ See https://code.google.com/p/chromium/issues/detail?id=220169 and https://lkml.org/lkml/2013/3/4/242 Signed-off-by: Alex Suykov +Upstream: Not Applicable +[yann.morin.1998@free.fr: add Upstream tag] +Signed-off-by: Yann E. MORIN --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index bcb94b716b2..50e355647c6 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_GLOBAL_PATCH_DIR="board/chromebook/snow/patches" BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" @@ -8,7 +9,6 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" -BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.15-dts-tpm.patch" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.15.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 3432be2df104c3948f06451fa1b8f373bf3cc33b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 16:10:42 +0200 Subject: [PATCH 2097/3013] board/chromebook-snow: force checking hashes The chromebook-snow config uses a custom kernel version, so add a hash for it. Signed-off-by: Yann E. MORIN Cc: Alex Suykov Signed-off-by: Arnout Vandecappelle (cherry picked from commit 0d91281d7bdfa09be28237bab694e6ac22466541) Signed-off-by: Peter Korsgaard --- board/chromebook/snow/patches/linux-headers/linux-headers.hash | 1 + board/chromebook/snow/patches/linux/linux.hash | 2 ++ configs/chromebook_snow_defconfig | 1 + 3 files changed, 4 insertions(+) create mode 120000 board/chromebook/snow/patches/linux-headers/linux-headers.hash create mode 100644 board/chromebook/snow/patches/linux/linux.hash diff --git a/board/chromebook/snow/patches/linux-headers/linux-headers.hash b/board/chromebook/snow/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/chromebook/snow/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/chromebook/snow/patches/linux/linux.hash b/board/chromebook/snow/patches/linux/linux.hash new file mode 100644 index 00000000000..1064af46aa5 --- /dev/null +++ b/board/chromebook/snow/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Localy computed +sha256 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 linux-4.15.tar.xz diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index 50e355647c6..9a5bcce98b1 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_GLOBAL_PATCH_DIR="board/chromebook/snow/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" From c96b51be73397f5ccd05f7adfd1b432db1ed25e3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 16:10:43 +0200 Subject: [PATCH 2098/3013] boards/chromebook-elm: force checking hashes Signed-off-by: Yann E. MORIN Cc: Bilal Wasim Signed-off-by: Arnout Vandecappelle (cherry picked from commit 3988f2d9238bc027b5d16219867e8d3c701c0c06) Signed-off-by: Peter Korsgaard --- board/chromebook/elm/patches/linux-headers/linux-headers.hash | 1 + board/chromebook/elm/patches/linux/linux.hash | 2 ++ configs/chromebook_elm_defconfig | 4 ++++ 3 files changed, 7 insertions(+) create mode 120000 board/chromebook/elm/patches/linux-headers/linux-headers.hash create mode 100644 board/chromebook/elm/patches/linux/linux.hash diff --git a/board/chromebook/elm/patches/linux-headers/linux-headers.hash b/board/chromebook/elm/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/chromebook/elm/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/chromebook/elm/patches/linux/linux.hash b/board/chromebook/elm/patches/linux/linux.hash new file mode 100644 index 00000000000..88aa603ac50 --- /dev/null +++ b/board/chromebook/elm/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 linux-5.10.tar.xz diff --git a/configs/chromebook_elm_defconfig b/configs/chromebook_elm_defconfig index 827d9296314..0e8b6287c3b 100644 --- a/configs/chromebook_elm_defconfig +++ b/configs/chromebook_elm_defconfig @@ -35,3 +35,7 @@ BR2_PACKAGE_HOST_PARTED=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_VBOOT_UTILS=y + +# Misc +BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y From 8beba85f71ea04ad0a84717dded85be3f0b343b3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 May 2024 19:05:23 +0200 Subject: [PATCH 2099/3013] package/util-linux: fix build with uclibc-ng < 1.0.39 Fix the following build failure with uclibc-ng < 1.0.39 (i.e., without https://github.com/wbx-github/uclibc-ng/commit/85ac4f04d94e98389a8315e720630d0f95bfdfd6) raised since bump to version 2.39 in commit ad276d94a392fb13244e042851a44269e6254d61 and https://github.com/util-linux/util-linux/commit/03a254f010b08da1175f50a8ae7882e59228f1b4: sys-utils/setarch.c:106:7: error: 'PER_LINUX32_3GB' undeclared here (not in a function); did you mean 'PER_LINUX32'? 106 | X(PER_LINUX32_3GB) \ | ^~~~~~~~~~~~~~~ Fixes: ad276d94a392fb13244e042851a44269e6254d61 - http://autobuild.buildroot.org/results/fb1feb47f2660882fa53f66bacc63e191fd52175 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 51f753710d55a6a9e6ee778fba9d1c6b2a722485) Signed-off-by: Peter Korsgaard --- ...ch.c-fix-build-with-uclibc-ng-1.0.39.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch diff --git a/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch b/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch new file mode 100644 index 00000000000..12dd119ef32 --- /dev/null +++ b/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch @@ -0,0 +1,39 @@ +From beef18da4de87ca5aaadf2beb14187f35cc4f50f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 15 May 2024 18:22:11 +0200 +Subject: [PATCH] sys-utils/setarch.c: fix build with uclibc-ng < 1.0.39 + +Fix the following build failure with uclibc-ng < 1.0.39 (i.e., without +https://github.com/wbx-github/uclibc-ng/commit/85ac4f04d94e98389a8315e720630d0f95bfdfd6) +raised since version 2.39 and +https://github.com/util-linux/util-linux/commit/03a254f010b08da1175f50a8ae7882e59228f1b4: + +sys-utils/setarch.c:106:7: error: 'PER_LINUX32_3GB' undeclared here (not in a function); did you mean 'PER_LINUX32'? + 106 | X(PER_LINUX32_3GB) \ + | ^~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/fb1feb47f2660882fa53f66bacc63e191fd52175 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/util-linux/util-linux/commit/4647fc6afbf7e99c49531600425df60f1243fcd2 +--- + sys-utils/setarch.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c +index 227bc6b5de..4bcb5e69e6 100644 +--- a/sys-utils/setarch.c ++++ b/sys-utils/setarch.c +@@ -89,6 +89,11 @@ + # define PER_LINUX_FDPIC (PER_LINUX | FDPIC_FUNCPTRS) + #endif + ++/* fallback for old uclibc-headers < 1.0.39 */ ++#ifndef PER_LINUX32_3GB ++# define PER_LINUX32_3GB (PER_LINUX32 | ADDR_LIMIT_3GB) ++#endif ++ + #define ALL_PERSONALITIES \ + X(PER_LINUX) \ + X(PER_LINUX_32BIT) \ From 175cac0f5fd8497e36a0163d4b4d6e747f41c0da Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 12 Jul 2024 14:34:57 +0200 Subject: [PATCH 2100/3013] utils/genrandconfig: stop passing --passive-ftp to wget Since there are no more packages using FTP-hosted files, we can drop the --passive-ftp option from genrandconfig, as it would cause problems on systems that use wget2. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 881a8f13465b1be19540f6e35f2a658d49f63dd7) [Peter: slightly reword commit message, no curl backend here] Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index fb493f3f31e..b46d33c4f8c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -669,7 +669,7 @@ async def gen_config(args): configlines += minimalf.readlines() # Allow hosts with old certificates to download over https - configlines.append("BR2_WGET=\"wget --passive-ftp -nd -t 3 --no-check-certificate\"\n") + configlines.append("BR2_WGET=\"wget -nd -t 3 --no-check-certificate\"\n") # Per-package folder if randint(0, 15) == 0: From 157647502d3f6b6463ecf93e40bcd9ef8bcdb6f8 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 7 Feb 2024 22:47:29 +0100 Subject: [PATCH 2101/3013] package/rtl8188eu: bump to 2024-02-06 version on v5.2.2.4 branch This version allows to build with Linux 6.8 Fixes: http://autobuild.buildroot.net/results/c2524c7580d97f7387ec22da62be71d77f2ed8ec Signed-off-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni (cherry picked from commit 20a6d583bd2c4cbeba409a3f892422e98181e2b0) Signed-off-by: Peter Korsgaard --- package/rtl8188eu/rtl8188eu.hash | 2 +- package/rtl8188eu/rtl8188eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index eb28e6cf0a9..4f8f83e78c8 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cb10a047d39f13c776b0097ef1290f6b3c63590fd57bc0827e8638c878819f0 rtl8188eu-306f3e62cf7cddf8cee74f70f88a7a7b3af46f56.tar.gz +sha256 507d32eb91d3d407c7758319c81a36a9dc69e2b89378cabcd382411153927b7b rtl8188eu-f42fc9c45d2086c415dce70d3018031b54a7beef.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index 36a84d34de7..eca0fb8007b 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = 306f3e62cf7cddf8cee74f70f88a7a7b3af46f56 +RTL8188EU_VERSION = f42fc9c45d2086c415dce70d3018031b54a7beef RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING From 6c8122b48cde07b4325f5c20de01de83288d4cd9 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Feb 2024 18:09:53 +0100 Subject: [PATCH 2102/3013] package/python-ruamel-yaml: fix comment in hash file Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 9fb8f2e10c547fedb5a65db384c813a2850241d8) Signed-off-by: Peter Korsgaard --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 29852a51ed7..ee5016835ba 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,4 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/rfc3987/json +# md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz # Locally computed sha256 checksums From 076f345accb811add37c96705ea1602a8a3b06a1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 28 Jul 2024 18:34:10 +0200 Subject: [PATCH 2103/3013] package/gdb: move GDB 14.x patches to the right folder Commit bfefed17a9e5a421b3217685003d3b22c99de4ab ("package/gdb: bump 14.x series from 14.1 to 14.2"), which upgraded the GDB 14.x series from 14.1 to 14.2 forgot to rename the directory containing the patches, causing them to no longer be applied. The patches still apply properly with no change, so renaming the directory is sufficient. http://autobuild.buildroot.net/results/b8c6af95b244272220c63847e7cc929c9c58eee4/ Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 18 +++++++++--------- ...ne-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...e-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...-fork-inferior-include-linux-ptrace.h.patch | 0 ...-getrandom-compile-for-uclibc-v1.0.35.patch | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...8-gdbserver-Makefile.in-fix-NLS-build.patch | 0 .../0009-gdb-Fix-native-build-on-xtensa.patch | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename package/gdb/{14.1 => 14.2}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) rename package/gdb/{14.1 => 14.2}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) rename package/gdb/{14.1 => 14.2}/0003-use-asm-sgidefs.h.patch (100%) rename package/gdb/{14.1 => 14.2}/0004-gdbserver-fix-build-for-m68k.patch (100%) rename package/gdb/{14.1 => 14.2}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) rename package/gdb/{14.1 => 14.2}/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch (100%) rename package/gdb/{14.1 => 14.2}/0007-fix-musl-build-on-riscv.patch (100%) rename package/gdb/{14.1 => 14.2}/0008-gdbserver-Makefile.in-fix-NLS-build.patch (100%) rename package/gdb/{14.1 => 14.2}/0009-gdb-Fix-native-build-on-xtensa.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 5e45edf7658..0f054c9a30a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -573,15 +573,15 @@ package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.U package/gdb/13.2/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream -package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream -package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream -package/gdb/14.1/0003-use-asm-sgidefs.h.patch lib_patch.Upstream -package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream -package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream -package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream -package/gdb/14.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream -package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream -package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream +package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream +package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream +package/gdb/14.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream +package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream +package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream +package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream +package/gdb/14.2/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream +package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream +package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream package/gdb/15.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream package/gdb/15.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream package/gdb/15.1/0003-use-asm-sgidefs.h.patch lib_patch.Upstream diff --git a/package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/14.1/0003-use-asm-sgidefs.h.patch b/package/gdb/14.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/14.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/14.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/14.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/14.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/14.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/14.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch similarity index 100% rename from package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch rename to package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch From 8f1c2ad8c66eaf2be11d6621ae414709f37d893e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 10:01:00 +0200 Subject: [PATCH 2104/3013] DEVELOPERS: add Bernd Kuhls for openvpn Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9a8c92f122a..c6b0d68bcbb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -466,6 +466,7 @@ F: package/mjpg-streamer/ F: package/mpg123/ F: package/ntp/ F: package/nut/ +F: package/openvpn/ F: package/opus/ F: package/pciutils/ F: package/perl-crypt-openssl-guess/ From e6816ece5b425fce6fc3e080178ff04060b8ef08 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:52:47 +0200 Subject: [PATCH 2105/3013] package/libcurl: security bump to version 8.9.0 Removed patch which is included in this release. Changelog: https://curl.se/changes.html#8_9_0 Fixes CVE-2024-6197: https://curl.se/docs/CVE-2024-6197.html CVE-2024-6874 (Apple-only): https://curl.se/docs/CVE-2024-6874.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-mbedtls-check-version-for-cipher-id.patch | 56 ------------------- package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 2 +- 3 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch diff --git a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch deleted file mode 100644 index b7d674acfe3..00000000000 --- a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0c4b4c1e93c8e869af230090f32346fdfd548f21 Mon Sep 17 00:00:00 2001 -From: Stefan Eissing -Date: Wed, 22 May 2024 14:44:56 +0200 -Subject: [PATCH] mbedtls: check version for cipher id - -mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have been added in -mbedtls 3.2.0. Check for that version. - -Closes #13749 - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/0c4b4c1e93c8e869af230090f32346fdfd548f21 ---- - lib/vtls/mbedtls.c | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) - -diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c -index ec0b10dd9a9f..98a4ea01b183 100644 ---- a/lib/vtls/mbedtls.c -+++ b/lib/vtls/mbedtls.c -@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) - (struct mbed_ssl_backend_data *)connssl->backend; - struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); - const mbedtls_x509_crt *peercert; -- char cipher_str[64]; -- uint16_t cipher_id; - #ifndef CURL_DISABLE_PROXY - const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? - data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: -@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) - return CURLE_SSL_CONNECT_ERROR; - } - -- cipher_id = (uint16_t) -- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); -- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); -- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); -- -+#if MBEDTLS_VERSION_NUMBER >= 0x03020000 -+ { -+ char cipher_str[64]; -+ uint16_t cipher_id; -+ cipher_id = (uint16_t) -+ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); -+ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); -+ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); -+ } -+#else -+ infof(data, "mbedTLS: Handshake complete"); -+#endif - ret = mbedtls_ssl_get_verify_result(&backend->ssl); - - if(!conn_config->verifyhost) --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 7ba45b79d7a..fa325efd7de 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.8.0.tar.xz.asc +# https://curl.se/download/curl-8.9.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 curl-8.8.0.tar.xz +sha256 ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 curl-8.9.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 172dd220715..966885aedad 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.8.0 +LIBCURL_VERSION = 8.9.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 7a6edbc7b9166c799b43cf9a9b78422c8e20ccc0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 28 Jul 2024 17:46:17 +0200 Subject: [PATCH 2106/3013] support/testing/infra/emulator.py: add host load info in run log Runtime tests running on test runners are subject to a high variability in term of performance and timing. Most or the runtime test commands are executed with a timeout, in pexpect. Slow or very loaded test runners can use the timeout_multiplier to globally increase those timeouts. Some runtime test commands sometimes needs to poll or query a state, rather than having purely sequential actions. It is sometimes hard to know, from the test writer point of view, the maximum timeout to set, or if a retry logic is needed. In order to help debugging runtime tests failing due very slow execution, this commit adds extra information on the host test runner about its load in the run log. Relevant information are: number of cpus, the load average at the moment the emulator is started and the current timeout_multiplier. Note: this change was discussed in: https://lists.buildroot.org/pipermail/buildroot/2024-July/759119.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/infra/emulator.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index be26d4caa4e..5318577cda4 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: ISC +import os + import pexpect import pexpect.replwrap @@ -108,6 +110,11 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): if kernel_cmdline: qemu_cmd += ["-append", " ".join(kernel_cmdline)] + self.logfile.write(f"> host cpu count: {os.cpu_count()}\n") + ldavg = os.getloadavg() + ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}" + self.logfile.write(f"> host loadavg: {ldavg_str}\n") + self.logfile.write(f"> timeout multiplier: {self.timeout_multiplier}\n") self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, From 89bf25673a760023ba4a9b5a683d19bbc83ef7b0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 19:58:04 +0200 Subject: [PATCH 2107/3013] package/libks: bump version to 2.0.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libks/libks.hash | 2 +- package/libks/libks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libks/libks.hash b/package/libks/libks.hash index f66798699f5..de16d0b029f 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63 libks-2.0.2.tar.gz +sha256 8525dd943cf970c860cd2596207c7ba6646c9e1f407e350fc0a39b76af75e625 libks-2.0.5.tar.gz sha256 3aba376a08bf91c95518532e627157f0ee3ab2712d1198463e2b1ac9186dd142 copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index c8bcb309611..2de6b727dd8 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 2.0.2 +LIBKS_VERSION = 2.0.5 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From c79ec67bc8763f8d630f51ffbcaf0bb6bfb71236 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 19:58:05 +0200 Subject: [PATCH 2108/3013] DEVELOPERS: remove Bernd Kuhls from libks I am not using this package anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index c6b0d68bcbb..78ea65205dd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -430,7 +430,6 @@ F: package/libglu/ F: package/libhdhomerun/ F: package/libheif/ F: package/libilbc/ -F: package/libks/ F: package/libldns/ F: package/libmicrohttpd/ F: package/libminiupnpc/ From 197e67e542c909cd4d4d45ef48faf3cae7d586b0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Jul 2024 18:50:28 +0200 Subject: [PATCH 2109/3013] package/gtkiostream: add BR2_PACKAGE_GTKIOSTREAM_ARCH_SUPPORTS gtkiostream only supports little-endian since its addition in commit fab48302865e5c0c98d91b696bc90e75e38189bb resulting in the following build failure: In file included from BitStream.C:23: ../include/BitStream.H:35:2: error: #error "iobitstream not tested on big endian systems" 35 | #error "iobitstream not tested on big endian systems" | ^~~~~ Fixes: fab48302865e5c0c98d91b696bc90e75e38189bb - http://autobuild.buildroot.org/results/aec24d92cc2196596413cf509d686f1f8d1eca95 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gtkiostream/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in index 1d1ec273461..334b4dc331b 100644 --- a/package/gtkiostream/Config.in +++ b/package/gtkiostream/Config.in @@ -1,5 +1,10 @@ +config BR2_PACKAGE_GTKIOSTREAM_ARCH_SUPPORTS + bool + default y if BR2_ENDIAN = "LITTLE" + config BR2_PACKAGE_GTKIOSTREAM bool "gtkiostream" + depends on BR2_PACKAGE_GTKIOSTREAM_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # eigen depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ALSA_LIB_MIXER if BR2_PACKAGE_ALSA_LIB @@ -14,5 +19,6 @@ config BR2_PACKAGE_GTKIOSTREAM https://github.com/flatmax/gtkiostream comment "gtkiostream needs a toolchain w/ C++, threads" + depends on BR2_PACKAGE_GTKIOSTREAM_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS From 948b1830423421e087f6aa4923a37ce077ed5904 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Jul 2024 18:57:15 +0200 Subject: [PATCH 2110/3013] package/open-iscsi: open-isns is optional, not mandatory open-isns is optional, not mandatory, since bump to version 2.1.9 in commit 2314928cf828ff02939b9c0041964c3ee2dd907d and https://github.com/open-iscsi/open-iscsi/commit/713524df809396e11f42d7691bd8ead2ffc1ca6b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/open-iscsi/Config.in | 1 - package/open-iscsi/open-iscsi.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in index e55bbfd867d..01d83615c9f 100644 --- a/package/open-iscsi/Config.in +++ b/package/open-iscsi/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPEN_ISCSI depends on !BR2_STATIC_LIBS # kmod select BR2_PACKAGE_KMOD select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_OPEN_ISNS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT help diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index d1f40d3e20d..1266db3d3fd 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -9,10 +9,17 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING README libopeniscsiusr/COPYING OPEN_ISCSI_CPE_ID_VALID = YES -OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux +OPEN_ISCSI_DEPENDENCIES = kmod openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi +ifeq ($(BR2_PACKAGE_OPEN_ISNS),y) +OPEN_ISCSI_DEPENDENCIES += open-isns +OPEN_ISCSI_CONF_OPTS += -Disns=enabled +else +OPEN_ISCSI_CONF_OPTS += -Disns=disabled +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) OPEN_ISCSI_DEPENDENCIES += systemd OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false From 6eef18e6b06ab9daf79e09da5f12cd9070cabbc4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 19:48:23 +0200 Subject: [PATCH 2111/3013] package/intel-microcode: security bump version to 20240531 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240312 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240514 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240531 20240312 fixes CVE-2023-39368: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00972.html CVE-2023-38575: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00982.html CVE-2023-28746: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00898.html CVE-2023-22655: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00960.html CVE-2023-43490: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01045.html 20240514 fixes CVE-2023-45733: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01051.html CVE-2023-46103: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01052.html CVE-2023-45745: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01036.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 742332d552f..742be5ae792 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cee26f311f7e2c039dd48cd30f995183bde9b98fb4c3039800e2ddaf5c090e55 intel-microcode-20231114.tar.gz +sha256 c29eb35fdbd39e3ed8587e6f0b1275cc03265f230c2fcaf88e2a1556451e773f intel-microcode-20240531.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index a159baa93d3..6862565bc8d 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20231114 +INTEL_MICROCODE_VERSION = 20240531 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From c99082a4b6d153f01decb06650c78e6ec808fee2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 20:01:01 +0200 Subject: [PATCH 2112/3013] package/ytree: bump version to 2.09 Changelog: https://www.han.de/~werner/ytree.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ytree/ytree.hash | 2 +- package/ytree/ytree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ytree/ytree.hash b/package/ytree/ytree.hash index f3fbba8673b..78357d4f281 100644 --- a/package/ytree/ytree.hash +++ b/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cf8b151e4913b5b7f7a91dffd5c7306106a42477ec44e71d62c75f66ab61a57 ytree-2.05.tar.gz +sha256 6927bf7475d777c40ecc1a8e5125316605683d91a5829a9251b44f12b09e435b ytree-2.09.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/package/ytree/ytree.mk b/package/ytree/ytree.mk index 1bd2df46b67..ec59dd8dee4 100644 --- a/package/ytree/ytree.mk +++ b/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.05 +YTREE_VERSION = 2.09 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING From 4ab96d8cdebc3b9f24a207f89a4309089fc5af02 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 29 Jul 2024 08:34:20 +0200 Subject: [PATCH 2113/3013] package/sysklogd: bump to v2.6.1 From https://github.com/troglobit/sysklogd/releases/tag/v2.6.1: - Read .conf files from include directories sorted alphabetically - Add extra linefeed to wall messages to ensure they are seen - Fix segfault on SIGTERM, regression from v2.6.0 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 361d68a157d..0a5790a1a5d 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 c5ae067b479b54ef90fa9352c277d44ff7b4314023fc6ee0a37e81b99a78a917 sysklogd-2.6.0.tar.gz +sha256 e35d5c5f55019976302ac9818890bd6b6858db257506f0e9afaa718a8dee9cc3 sysklogd-2.6.1.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 59081f27341..86bd4ef168d 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.6.0 +SYSKLOGD_VERSION = 2.6.1 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From 520ca083dfec4ad5ce7977bed478e2285ce93b07 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 29 Jul 2024 09:28:43 +0200 Subject: [PATCH 2114/3013] package/sdl2: bump version to 2.30.5 Signed-off-by: Michael Fischer Signed-off-by: Thomas Petazzoni --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 4f302aaec84..30235844e7c 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.4.tar.gz.sig -sha256 59c89d0ed40d4efb23b7318aa29fe7039dbbc098334b14f17f1e7e561da31a26 SDL2-2.30.4.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.5.tar.gz.sig +sha256 f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b SDL2-2.30.5.tar.gz # Locally calculated sha256 9b9e1764f06701bcf7ce21e942c682d5921ba0900c6fca760321b1c8837a9662 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 01dcf3551ce..d19bc0fb8f2 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.30.4 +SDL2_VERSION = 2.30.5 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From 549e4d8d9ed4f9dbca92cb85cc7fa414a9582915 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 29 Jul 2024 12:57:00 +0100 Subject: [PATCH 2115/3013] boot/xilinx-prebuilt: support future AMD Vivado versions When creating a hardware platform for AMD Versal devices with the AMD Vivado Design Suite, the resulting XSA file has a file named "psm_fw.elf" included. This does not match the "psmfw.elf" filename that users will get when building the boot firmware from the Xilinx GIT repository. A change request has been submitted to resolve this issue, so that future AMD Vivado Design Suite versions will generate XSA files including the boot firmware file named "psmfw.elf" to match the filename that is generated when building the firmware. In order to support both current and future versions of AMD Vivado Design Suite, this patch changes the xilinx-prebuilt package to use the filename "psm*fw.elf" when obtaining the Versal boot firmware images from a user generated XSA file. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- boot/xilinx-prebuilt/xilinx-prebuilt.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk index 0b0e85b8207..9f36ee7285d 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -34,8 +34,11 @@ ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf # Unlike the psmfw.elf file for Xilinx development boards, -# AMD Vivado Design Suite generates a file named psm_fw.elf. -XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm_fw.elf +# AMD Vivado Design Suite currently generates a file named psm_fw.elf. +# Future versions of AMD Vivado will generate a file named psmfw.elf, +# so to support current and future AMD Vivado versions, the filename +# psm*fw.elf is used. +XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf XILINX_PREBUILT_PDI = $(@D)/*.pdi else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf From 5960f45cbc2d0b5a476b36588d1de62af9111011 Mon Sep 17 00:00:00 2001 From: Boerge Struempfel Date: Mon, 29 Jul 2024 15:14:01 +0200 Subject: [PATCH 2116/3013] package/linux-firmware: add option for Redpine RS9116 firmware This firmware is required for the rsi9116 wifi and bluetooth module which is driven by the rsi_91x kernel driver. Signed-off-by: Boerge Struempfel Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 265b72e5622..651ca450876 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -506,6 +506,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113 help Firmware files for WLAN and Bluetooth modules rs9113 +config BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9116 + bool "Redpine rs9116" + help + Firmware files for WLAN and Bluetooth modules rs9116 + config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X bool "TI wl127x" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 75f721d1471..e40eab8dc85 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -854,6 +854,14 @@ LINUX_FIRMWARE_FILES += \ # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9116),y) +LINUX_FIRMWARE_FILES += \ + rsi/rs9116_wlan.rps \ + rsi/rs9116_wlan_bt_classic.rps +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_DH895XCC),y) LINUX_FIRMWARE_FILES += qat_895xcc.bin qat_895xcc_mmp.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware From f1a5273389bac989f1a94641616a3c8ad6098ad4 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 29 Jul 2024 15:58:12 +0200 Subject: [PATCH 2117/3013] package/trace-cmd: bump to version 3.3 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 30b0c48de60..ac30eae85fb 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 62af2c6062eeb434925921bb5936774b0a0e17a5f86671fa2ea2f40704a080cd trace-cmd-v3.2.tar.gz +sha256 0671048dd2b8abdb8b2d0eb9cc91335c997620a7da72f858381ff4206f32065f trace-cmd-v3.3.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index e02eb79530c..14a59b2cc8e 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 3.2 +TRACE_CMD_VERSION = 3.3 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot From ddbdd3584264900b6d5818c1cf0a0a444d298f56 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:51:24 +0200 Subject: [PATCH 2118/3013] package/ethtool: bump to version 6.9 Changelog: https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index b9bc768e8f8..6c442c3729e 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 c3ae526b01ce4d8df6c794ab170de4a4104d111ea8d8db3f1fd7c25fcb905619 ethtool-6.7.tar.xz +sha256 a71b0354010661c5cf178bc606ed50fcb91805cf1897ad0eb2818387a5fd0cd9 ethtool-6.9.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 77a7e16937a..bd04fca8f3c 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.7 +ETHTOOL_VERSION = 6.9 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From e08708451be9e964b5a8e3a5a6f0959ad5e7c6a0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:51:59 +0200 Subject: [PATCH 2119/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 16 ++++++++-------- package/linux-headers/Config.in.host | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 9da1db16d12..4bdca6fafe9 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.2" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 2d2b6d35465..d1d0132c966 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 70109dfd1cd1c5f8a58eb1cb37122b9bf93f9c6a6280bf91019263c7339cf76b linux-6.10.1.tar.xz -sha256 efd12e335fa67d13a3eae30e4b7b7546e74b8ccc90682e4c3fffab0b22654da1 linux-6.9.10.tar.xz -sha256 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef linux-6.6.41.tar.xz -sha256 b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 linux-6.1.100.tar.xz +sha256 73d8520dd9cba5acfc5e7208e76b35d9740b8aae38210a9224e32ec4c0d29b70 linux-6.10.2.tar.xz +sha256 5ae7cc4e0e2f6b9ba630f643985ba0522c7d5e5b9571ba478a3cb513edd4cf22 linux-6.9.12.tar.xz +sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz +sha256 1ba5f93b411ead7587fe48b2eec6c656f6796d31f5e406d236913c77512497ec linux-6.1.102.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302 linux-5.15.163.tar.xz -sha256 7b2d06803b5abb03c85f171100ca9d7acd6ba245036fe9a16eb998f088b150cb linux-5.10.222.tar.xz -sha256 a976c67eb8270cac310faf1acc61305d1f9967955aca38fbdfcb0bc77d033d42 linux-5.4.280.tar.xz +sha256 ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186 linux-5.15.164.tar.xz +sha256 ca09d86a6b79706c33382d3f8606f476eb07918417a87fb1815f6a4aa81f2ba1 linux-5.10.223.tar.xz +sha256 44a0c3e76031f7513ce43e22e2a9dcbf7d6a6dee065dca9b8001843a075272b2 linux-5.4.281.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 0d5fa562a3c53f524f02fc11abe502c01096df73dd27d57736875e8590007493 linux-4.19.318.tar.xz +sha256 544ddc7339cf1b1d1ead1992e67d11a0834ad3bc77faa063e06b5d18c682eb30 linux-4.19.319.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 707f2ad0263..d745e31155f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -427,14 +427,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.318" if BR2_KERNEL_HEADERS_4_19 - default "5.4.280" if BR2_KERNEL_HEADERS_5_4 - default "5.10.222" if BR2_KERNEL_HEADERS_5_10 - default "5.15.163" if BR2_KERNEL_HEADERS_5_15 - default "6.1.100" if BR2_KERNEL_HEADERS_6_1 - default "6.6.41" if BR2_KERNEL_HEADERS_6_6 - default "6.9.10" if BR2_KERNEL_HEADERS_6_9 - default "6.10.1" if BR2_KERNEL_HEADERS_6_10 + default "4.19.319" if BR2_KERNEL_HEADERS_4_19 + default "5.4.281" if BR2_KERNEL_HEADERS_5_4 + default "5.10.223" if BR2_KERNEL_HEADERS_5_10 + default "5.15.164" if BR2_KERNEL_HEADERS_5_15 + default "6.1.102" if BR2_KERNEL_HEADERS_6_1 + default "6.6.43" if BR2_KERNEL_HEADERS_6_6 + default "6.9.12" if BR2_KERNEL_HEADERS_6_9 + default "6.10.2" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 427562543d0063b558d58182f6af766ff1ce92b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:53:11 +0200 Subject: [PATCH 2120/3013] package/leafnode2: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/leafnode2/leafnode2.hash | 2 +- package/leafnode2/leafnode2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/leafnode2/leafnode2.hash b/package/leafnode2/leafnode2.hash index 8ab57c93c7d..9c86173ae1c 100644 --- a/package/leafnode2/leafnode2.hash +++ b/package/leafnode2/leafnode2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2a72a405599cd9f01cd44b6655c8986bf589b1f766c32957a70c147e39177a30 leafnode2-c514997a8c50bd28a34893d0436b0330f5719238.tar.gz +sha256 42f2185f29a74f683a962e9cf6e38bc5f8a342d0dde8b6a03457a165365e3445 leafnode2-9543ffaf82406f943d449d522d88baa554515e0f.tar.gz sha256 59d37f745dc5a2d63a51dff344f4ad89f72e76f8c7b7d877f20880d838b1bec9 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index 71b27f180cb..566aaf3d552 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEAFNODE2_VERSION = c514997a8c50bd28a34893d0436b0330f5719238 +LEAFNODE2_VERSION = 9543ffaf82406f943d449d522d88baa554515e0f LEAFNODE2_SITE = $(call gitlab,leafnode-2,leafnode-2,$(LEAFNODE2_VERSION)) LEAFNODE2_LICENSE = LGPL-2.1 LEAFNODE2_LICENSE_FILES = COPYING COPYING.LGPL From 0c6fec29cb51d531f8463d73b26932a1c02ab76c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:53:39 +0200 Subject: [PATCH 2121/3013] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 225123a5f00..f0140aefdcd 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8454c696e9987ae77d1bc6e1fe45536bd9ef69192b6e568840fe8994ca2a5c2b tvheadend-d2e41b553e7cc6eb06fd21b42bbed4b3a1f28bc0.tar.gz +sha256 b613319b01db2f7e08f735dd1da318041265a6f44b435491f3e8b0e32efd6d2f tvheadend-b774bdd25351e51eba0282ccf7c65904dc1b5655.tar.gz sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 0453e08f4b4..46a082838f6 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = d2e41b553e7cc6eb06fd21b42bbed4b3a1f28bc0 +TVHEADEND_VERSION = b774bdd25351e51eba0282ccf7c65904dc1b5655 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From de11afaa3458eae781582e61e0de6a91e9e48d0e Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:08 +0000 Subject: [PATCH 2122/3013] package/pkg-kconfig: fix *-savedefconfig under ppd The 'linux-savedefconfig' target fails with the below error when PER_PACKAGE_DIRECTORIES is enabled and the 'host-finalize' target hasn't run yet. scripts/Kconfig.include:39: C compiler '.../buildroot/output/host/bin/arm-buildroot-linux-gnueabihf-gcc' not found The 'PPD' variable isn't defined for this target, so 'BR_PATH' falls back to the final host directory. Reported-by: Nathaniel Roach Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index f4f35bf96ab..6bf3d6b4be9 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -270,6 +270,7 @@ $(1)-check-configuration-done: ifeq ($$($(2)_KCONFIG_SUPPORTS_DEFCONFIG),YES) .PHONY: $(1)-savedefconfig +$(1)-savedefconfig: PKG=$(2) $(1)-savedefconfig: $(1)-check-configuration-done $$(call kconfig-package-savedefconfig,$(2)) endif From 641084bfb37856f79db86d9dbd6638ec70fc9681 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:09 +0000 Subject: [PATCH 2123/3013] package/pkg-kconfig: fix *-diff-config under ppd The 'linux-diff-config' target fails with the below error when PER_PACKAGE_DIRECTORIES is enabled and the 'host-finalize' target hasn't run yet. scripts/Kconfig.include:39: C compiler '.../buildroot/output/host/bin/arm-buildroot-linux-gnueabihf-gcc' not found The 'PPD' variable isn't defined for this target, so 'BR_PATH' falls back to the final host directory. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 6bf3d6b4be9..684342bcef6 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -301,6 +301,7 @@ endif # defconfig + fragments (if any) and the current configuration. # Note: it preserves the timestamp of the current configuration when moving it # around. +$(1)-diff-config: PKG=$(2) $(1)-diff-config: $(1)-check-configuration-done $$(Q)cp -a $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_DIR)/.config.dc.bak $$(call kconfig-package-merge-config,$(2),$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG),\ From 009d31b438b2c402fa959a9041f5cc9b050a1f8f Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:10 +0000 Subject: [PATCH 2124/3013] package/pkg-kconfig: cleanup savedefconfig MAKE The kconfig infra defines a 'PKG_KCONFIG_MAKE' var that wraps all the standard kconfig options. Switch to this so we aren't duplicating the logic. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 684342bcef6..8000de16c49 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -33,8 +33,7 @@ PKG_KCONFIG_COMMON_OPTS = \ # Macro to save the defconfig file # $(1): the name of the package in upper-case letters define kconfig-package-savedefconfig - $($(1)_MAKE_ENV) $($(1)_MAKE) -C $($(1)_DIR) \ - $(PKG_KCONFIG_COMMON_OPTS) $($(1)_KCONFIG_OPTS) savedefconfig + $($(1)_KCONFIG_MAKE) savedefconfig endef # The correct way to regenerate a .config file is to use 'make olddefconfig'. From cefa611c8fcedf9b35d3a8161d5bcef775d46c32 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 28 Jul 2024 14:18:11 +0200 Subject: [PATCH 2125/3013] configs/freescale_imx6{dl, q, sx}*: bump BSP components to lf-6.6.23-2.0.0 Note: configs/freescale_imx6{dl,q,sx}* corresponds to the five: freescale_imx6dlsabreauto_defconfig freescale_imx6dlsabresd_defconfig freescale_imx6qsabreauto_defconfig freescale_imx6qsabresd_defconfig freescale_imx6sxsabresd_defconfig Those i.MX6 Sabre defconfigs have a lot in common. This is why they are all updated at once in this single commit. This commit bumps U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. The imx6sabre uboot patch is also rebased on the new version, and the "Upstream:" tag is added to flag this patch as Buildroot-specific. The ".checkpackageignore" entry for this patch is also removed. While bumping those BSP components, this commit also adds the custom hashes by enabling BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in those defconfigs. Hash files are added in the _PATCH_DIR. The ".checkpackageignore" entries for those defconfigs are also removed. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", those freescale_imx6{dl,q,sx}* are failing to build the Kernel with output: drivers/ata/libahci.c: In function 'ahci_led_store': ././include/linux/compiler_types.h:315:45: error: call to '__compiletime_assert_340' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) 315 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ This commit fixes the issue by bumping components which includes the needed gcc-13 fixes. The Kernel DTS names are also updated by adding the new "nxp/imx/" prefix, to follow the upstream reorganization in [1], first included in v6.5. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089449 https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089451 https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089452 https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089455 https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089456 [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 6 ------ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx6sabre/patches/linux/linux.hash | 2 ++ ...common-boot-Linux-to-init-in-mfgtools-mode.patch | 13 ++++++++----- board/freescale/imx6sabre/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx6dlsabreauto_defconfig | 11 ++++++----- configs/freescale_imx6dlsabresd_defconfig | 11 ++++++----- configs/freescale_imx6qsabreauto_defconfig | 11 ++++++----- configs/freescale_imx6qsabresd_defconfig | 11 ++++++----- configs/freescale_imx6sxsabresd_defconfig | 11 ++++++----- 10 files changed, 43 insertions(+), 36 deletions(-) create mode 120000 board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx6sabre/patches/linux/linux.hash create mode 100644 board/freescale/imx6sabre/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 0f054c9a30a..8e2a4c03249 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -30,7 +30,6 @@ board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch lib_patch.Upst board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck -board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch lib_patch.Upstream board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck board/hardkernel/odroidc2/post-image.sh Shellcheck board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck lib_sysv.Variables @@ -153,11 +152,6 @@ configs/engicam_imx6qdl_icore_rqs_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx6dlsabreauto_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx6dlsabresd_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx6qsabreauto_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx6qsabresd_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx6sxsabresd_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx7dsabresd_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash b/board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx6sabre/patches/linux/linux.hash b/board/freescale/imx6sabre/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx6sabre/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch b/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch index a9f88c26452..cbcb7c73fba 100644 --- a/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch +++ b/board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch @@ -1,4 +1,4 @@ -From e9a88fddc149fc52cdc5a8997f9fd3a29416c643 Mon Sep 17 00:00:00 2001 +From 221b57404b29190e0b37f03b81dd3ee6a0fc9ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Tue, 12 Aug 2014 10:17:31 +0200 Subject: [PATCH] mx6qsabre_common: boot Linux to /init in mfgtools mode @@ -15,17 +15,20 @@ buildroot system entirely through USB. Signed-off-by: Vincent Stehlé Signed-off-by: Julien Olivain +[Julien: rebased patch on lf-6.6.23-2.0.0] +Signed-off-by: Julien Olivain +Upstream: Not applicable, Buildroot specific. --- include/configs/imx_env.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/imx_env.h b/include/configs/imx_env.h -index c03748d93f..aa1a8bf488 100644 +index 1b34478fc3f..9106d59ff9f 100644 --- a/include/configs/imx_env.h +++ b/include/configs/imx_env.h -@@ -29,7 +29,7 @@ +@@ -54,7 +54,7 @@ - #define CONFIG_MFG_ENV_SETTINGS_DEFAULT \ + #define CFG_MFG_ENV_SETTINGS_DEFAULT \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ + "rdinit=/init " \ @@ -33,5 +36,5 @@ index c03748d93f..aa1a8bf488 100644 "\0" \ "kboot="MFG_BOOT_CMD"\0"\ -- -2.26.2 +2.45.2 diff --git a/board/freescale/imx6sabre/patches/uboot/uboot.hash b/board/freescale/imx6sabre/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx6sabre/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 4081fa74a2d..9354d2ececb 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabreauto" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem @@ -38,5 +39,5 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 976c180d6c5..a06b49d74dc 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem @@ -37,5 +38,5 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 72696ab1ad6..bc9a64a735c 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem @@ -38,5 +39,5 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index dddfaf5228d..a9f45ad4be7 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem @@ -38,5 +39,5 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 0c585c97f0e..a88ac68da12 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem @@ -36,6 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From 956c5224ab85f6bc5086a2d1270181be7743113c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 28 Jul 2024 19:37:20 +0200 Subject: [PATCH 2126/3013] configs/freescale_imx7dsabresd: bump BSP components to lf-6.6.23-2.0.0 This commit bumps U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. While bumping those BSP components, this commit also adds the custom hashes by enabling BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in this defconfig. A _PATCH_DIR is added for that purpose and hash files are added in it. The ".checkpackageignore" entry for this defconfig is also removed. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx7dsabresd_defconfig is failing to build the Kernel with output: drivers/ata/libahci.c: In function 'ahci_led_store': ././include/linux/compiler_types.h:315:45: error: call to '__compiletime_assert_340' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) 315 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ This commit fixes the issue by bumping components which includes the needed gcc-13 fixes. The Kernel DTS name is also updated by adding the new "nxp/imx/" prefix, to follow the upstream reorganization in [1], first included in v6.5. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7423016459 [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx7dsdb/patches/linux/linux.hash | 2 ++ board/freescale/imx7dsdb/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx7dsabresd_defconfig | 14 +++++++++----- 5 files changed, 14 insertions(+), 6 deletions(-) create mode 120000 board/freescale/imx7dsdb/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx7dsdb/patches/linux/linux.hash create mode 100644 board/freescale/imx7dsdb/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 8e2a4c03249..a6cded787bd 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -153,7 +153,6 @@ configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx7dsabresd_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mnevk_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx7dsdb/patches/linux-headers/linux-headers.hash b/board/freescale/imx7dsdb/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx7dsdb/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx7dsdb/patches/linux/linux.hash b/board/freescale/imx7dsdb/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx7dsdb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx7dsdb/patches/uboot/uboot.hash b/board/freescale/imx7dsdb/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx7dsdb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index d3378658318..f00144239e5 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -2,8 +2,12 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# patches +BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -11,10 +15,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # filesystem @@ -25,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From ee72631572ead69685e9a84f7fdd3d99d63b1514 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 20:26:11 +0200 Subject: [PATCH 2127/3013] package/rapidjson: bump version Last release dates back to 2016, project is active so bump to current HEAD. Upstream issue to tag a new release is open: https://github.com/Tencent/rapidjson/issues/2284 Updated _SITE due to upstream move in 2017: https://github.com/Tencent/rapidjson/commit/4a2f2729f1313a7150d1275185f4888224a48753 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/rapidjson/rapidjson.hash | 2 +- package/rapidjson/rapidjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rapidjson/rapidjson.hash b/package/rapidjson/rapidjson.hash index 3c16abee602..ca5befdefcc 100644 --- a/package/rapidjson/rapidjson.hash +++ b/package/rapidjson/rapidjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-1.1.0.tar.gz +sha256 39f96f17b40f7201042c9b45d6444cb7eae1b7adfb7455412a86f6140450d32d rapidjson-ab1842a2dae061284c0a62dca1cc6d5e7e37e346.tar.gz sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 license.txt diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk index d3bcef7df14..3091edeab99 100644 --- a/package/rapidjson/rapidjson.mk +++ b/package/rapidjson/rapidjson.mk @@ -4,8 +4,8 @@ # ################################################################################ -RAPIDJSON_VERSION = 1.1.0 -RAPIDJSON_SITE = $(call github,miloyip,rapidjson,v$(RAPIDJSON_VERSION)) +RAPIDJSON_VERSION = ab1842a2dae061284c0a62dca1cc6d5e7e37e346 +RAPIDJSON_SITE = $(call github,Tencent,rapidjson,$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt RAPIDJSON_CPE_ID_VENDOR = tencent From c70e0c08c7ad516b4fd20bf92dc1435ecbea94b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 13:50:29 +0200 Subject: [PATCH 2128/3013] package/openconnect: new package Build-tested using these defconfigs BR2_PACKAGE_OPENSSL=y BR2_PACKAGE_LIBOPENSSL=y BR2_PACKAGE_OPENCONNECT=y arm-aarch64 [ 1/41]: OK bootlin-aarch64-glibc [ 2/41]: OK bootlin-arcle-hs38-uclibc [ 3/41]: OK bootlin-armv5-uclibc [ 4/41]: OK bootlin-armv7-glibc [ 5/41]: OK bootlin-armv7m-uclibc [ 6/41]: SKIPPED bootlin-armv7-musl [ 7/41]: OK bootlin-m68k-5208-uclibc [ 8/41]: SKIPPED bootlin-m68k-68040-uclibc [ 9/41]: OK bootlin-microblazeel-uclibc [10/41]: OK bootlin-mipsel32r6-glibc [11/41]: OK bootlin-mipsel-uclibc [12/41]: OK bootlin-nios2-glibc [13/41]: OK bootlin-openrisc-uclibc [14/41]: OK bootlin-powerpc64le-power8-glibc [15/41]: OK bootlin-powerpc-e500mc-uclibc [16/41]: OK bootlin-riscv32-glibc [17/41]: OK bootlin-riscv64-glibc [18/41]: OK bootlin-riscv64-musl [19/41]: OK bootlin-s390x-z13-glibc [20/41]: OK bootlin-sh4-uclibc [21/41]: OK bootlin-sparc64-glibc [22/41]: OK bootlin-sparc-uclibc [23/41]: OK bootlin-x86-64-glibc [24/41]: OK bootlin-x86-64-musl [25/41]: OK bootlin-x86-64-uclibc [26/41]: OK bootlin-x86-i686-musl [27/41]: OK bootlin-xtensa-uclibc [28/41]: OK br-arm-basic [29/41]: OK br-arm-full-nothread [30/41]: OK br-arm-full-static [31/41]: OK br-i386-pentium4-full [32/41]: OK br-mips64-n64-full [33/41]: OK br-mips64r6-el-hf-glibc [34/41]: OK br-powerpc-603e-basic-cpp [35/41]: OK br-powerpc64-power7-glibc [36/41]: OK linaro-aarch64-be [37/41]: OK linaro-aarch64 [38/41]: OK linaro-arm [39/41]: OK sourcery-mips64 [40/41]: OK sourcery-mips [41/41]: OK 41 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed BR2_PACKAGE_GNUTLS=y BR2_PACKAGE_OPENCONNECT=y arm-aarch64 [ 1/41]: OK bootlin-aarch64-glibc [ 2/41]: OK bootlin-arcle-hs38-uclibc [ 3/41]: OK bootlin-armv5-uclibc [ 4/41]: OK bootlin-armv7-glibc [ 5/41]: OK bootlin-armv7m-uclibc [ 6/41]: SKIPPED bootlin-armv7-musl [ 7/41]: OK bootlin-m68k-5208-uclibc [ 8/41]: SKIPPED bootlin-m68k-68040-uclibc [ 9/41]: OK bootlin-microblazeel-uclibc [10/41]: OK bootlin-mipsel32r6-glibc [11/41]: OK bootlin-mipsel-uclibc [12/41]: OK bootlin-nios2-glibc [13/41]: OK bootlin-openrisc-uclibc [14/41]: OK bootlin-powerpc64le-power8-glibc [15/41]: OK bootlin-powerpc-e500mc-uclibc [16/41]: OK bootlin-riscv32-glibc [17/41]: OK bootlin-riscv64-glibc [18/41]: OK bootlin-riscv64-musl [19/41]: OK bootlin-s390x-z13-glibc [20/41]: OK bootlin-sh4-uclibc [21/41]: OK bootlin-sparc64-glibc [22/41]: OK bootlin-sparc-uclibc [23/41]: OK bootlin-x86-64-glibc [24/41]: OK bootlin-x86-64-musl [25/41]: OK bootlin-x86-64-uclibc [26/41]: OK bootlin-x86-i686-musl [27/41]: OK bootlin-xtensa-uclibc [28/41]: OK br-arm-basic [29/41]: SKIPPED br-arm-full-nothread [30/41]: OK br-arm-full-static [31/41]: SKIPPED br-i386-pentium4-full [32/41]: OK br-mips64-n64-full [33/41]: OK br-mips64r6-el-hf-glibc [34/41]: OK br-powerpc-603e-basic-cpp [35/41]: SKIPPED br-powerpc64-power7-glibc [36/41]: OK linaro-aarch64-be [37/41]: OK linaro-aarch64 [38/41]: OK linaro-arm [39/41]: OK sourcery-mips64 [40/41]: OK sourcery-mips [41/41]: OK 41 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...licit-declaration-of-function-malloc.patch | 40 +++++++++++++++++++ package/openconnect/Config.in | 19 +++++++++ package/openconnect/openconnect.hash | 3 ++ package/openconnect/openconnect.mk | 32 +++++++++++++++ 6 files changed, 96 insertions(+) create mode 100644 package/openconnect/0001-Fix-implicit-declaration-of-function-malloc.patch create mode 100644 package/openconnect/Config.in create mode 100644 package/openconnect/openconnect.hash create mode 100644 package/openconnect/openconnect.mk diff --git a/DEVELOPERS b/DEVELOPERS index 78ea65205dd..16f63bdc0ea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -465,6 +465,7 @@ F: package/mjpg-streamer/ F: package/mpg123/ F: package/ntp/ F: package/nut/ +F: package/openconnect/ F: package/openvpn/ F: package/opus/ F: package/pciutils/ diff --git a/package/Config.in b/package/Config.in index 90f1ecc8771..3e51ddd707e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2555,6 +2555,7 @@ endif source "package/open-iscsi/Config.in" source "package/open-lldp/Config.in" source "package/open-plc-utils/Config.in" + source "package/openconnect/Config.in" source "package/openntpd/Config.in" source "package/openobex/Config.in" source "package/openresolv/Config.in" diff --git a/package/openconnect/0001-Fix-implicit-declaration-of-function-malloc.patch b/package/openconnect/0001-Fix-implicit-declaration-of-function-malloc.patch new file mode 100644 index 00000000000..4732c4fb5ee --- /dev/null +++ b/package/openconnect/0001-Fix-implicit-declaration-of-function-malloc.patch @@ -0,0 +1,40 @@ +From 5185f640045df2b4f8ee7f028fc59e6f02fdf367 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Mon, 29 Jan 2024 23:28:53 +0530 +Subject: [PATCH] Fix implicit declaration of function 'malloc' + +First observed on Gentoo Linux with GCC 14. This is due to GCC 14 +enabling -Werror=implicit-function-declaration by default. +Thus resulting in errors such as: + +openconnect-internal.h: In function 'alloc_pkt': +openconnect-internal.h:911:27: error: implicit declaration of function 'malloc' [-Werror=implicit-function-declaration] + 911 | struct pkt *pkt = malloc(alloc_len); + | ^~~~~~ + +Plese refer gentoo bug: https://bugs.gentoo.org/923173 +Signed-off-by: Brahmajit Das + +Upstream: https://gitlab.com/openconnect/openconnect/-/commit/5185f640045df2b4f8ee7f028fc59e6f02fdf367 + +Signed-off-by: Bernd Kuhls +[rebased for 9.12] +--- + openconnect-internal.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/openconnect-internal.h b/openconnect-internal.h +index 21460adf6..2830d693f 100644 +--- a/openconnect-internal.h ++++ b/openconnect-internal.h +@@ -87,6 +87,7 @@ + + #include + #include ++#include + + #ifdef _WIN32 + #ifndef _Out_cap_c_ +-- +GitLab + diff --git a/package/openconnect/Config.in b/package/openconnect/Config.in new file mode 100644 index 00000000000..cacf617fb97 --- /dev/null +++ b/package/openconnect/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_OPENCONNECT + bool "openconnect" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS + # configure: error: LibreSSL does not support Cisco DTLS. + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_ZLIB + help + OpenConnect is an SSL VPN client initially created to support + Cisco's AnyConnect SSL VPN. + It has since been ported to support the Juniper SSL VPN (which + is now known as Pulse Connect Secure), the Palo Alto Networks + GlobalProtect SSL VPN the F5 Big-IP SSL VPN, and the Fortinet + FortiGate SSL VPN. + + https://www.infradead.org/openconnect/ diff --git a/package/openconnect/openconnect.hash b/package/openconnect/openconnect.hash new file mode 100644 index 00000000000..86bdaa5d4ed --- /dev/null +++ b/package/openconnect/openconnect.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a2bedce3aa4dfe75e36e407e48e8e8bc91d46def5335ac9564fbf91bd4b2413e openconnect-9.12.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/openconnect/openconnect.mk b/package/openconnect/openconnect.mk new file mode 100644 index 00000000000..3fd9f990b0b --- /dev/null +++ b/package/openconnect/openconnect.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# openconnect +# +################################################################################ + +OPENCONNECT_VERSION = 9.12 +OPENCONNECT_SITE = https://www.infradead.org/openconnect/download +OPENCONNECT_DEPENDENCIES = host-pkgconf libxml2 zlib +OPENCONNECT_LICENSE = LGPL-2.1 +OPENCONNECT_LICENSE_FILES = COPYING.LGPL +OPENCONNECT_CONF_OPTS = \ + --disable-dsa-tests \ + --with-vpnc-script=/etc/vpnc/vpnc-script \ + --without-java + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPENCONNECT_DEPENDENCIES += openssl +OPENCONNECT_CONF_OPTS += --without-gnutls --with-openssl +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +OPENCONNECT_DEPENDENCIES += gnutls +OPENCONNECT_CONF_OPTS += --with-gnutls --without-openssl +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +OPENCONNECT_DEPENDENCIES += lz4 +OPENCONNECT_CONF_OPTS += --with-lz4 +else +OPENCONNECT_CONF_OPTS += --without-lz4 +endif + +$(eval $(autotools-package)) From 45db64545742077470ba52b954a47bd4d1b1adf5 Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Mon, 29 Jul 2024 12:24:15 +0100 Subject: [PATCH 2129/3013] configs/microchip_mpfs_icicle: bump Linux and U-Boot, add hashes Following Microchip's Linux 2024.06 release, update the assets to the latest versions, this includes a Linux and U-boot version bump. Update the Linux headers to support the updated v6.6 kernel. This defconfig was added before the "BR2_DOWNLOAD_FORCE_CHECK_HASHES" option was mandatory. Add this and the corresponding package hashes. Signed-off-by: Jamie Gibbons Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../mpfs_icicle/patches/linux-headers/linux-headers.hash | 1 + board/microchip/mpfs_icicle/patches/linux/linux.hash | 2 ++ board/microchip/mpfs_icicle/patches/uboot/uboot.hash | 2 ++ configs/microchip_mpfs_icicle_defconfig | 8 +++++--- 5 files changed, 10 insertions(+), 4 deletions(-) create mode 120000 board/microchip/mpfs_icicle/patches/linux-headers/linux-headers.hash create mode 100644 board/microchip/mpfs_icicle/patches/linux/linux.hash create mode 100644 board/microchip/mpfs_icicle/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index a6cded787bd..b10a277eae7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -192,7 +192,6 @@ configs/linksprite_pcduino_defconfig lib_defconfig.ForceCheckHash configs/ls1046a-frwy_defconfig lib_defconfig.ForceCheckHash configs/mangopi_mq1rdw2_defconfig lib_defconfig.ForceCheckHash configs/mender_x86_64_efi_defconfig lib_defconfig.ForceCheckHash -configs/microchip_mpfs_icicle_defconfig lib_defconfig.ForceCheckHash configs/microchip_sam9x60ek_mmc_defconfig lib_defconfig.ForceCheckHash configs/microchip_sam9x60ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig lib_defconfig.ForceCheckHash diff --git a/board/microchip/mpfs_icicle/patches/linux-headers/linux-headers.hash b/board/microchip/mpfs_icicle/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/microchip/mpfs_icicle/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/microchip/mpfs_icicle/patches/linux/linux.hash b/board/microchip/mpfs_icicle/patches/linux/linux.hash new file mode 100644 index 00000000000..025d630f7dc --- /dev/null +++ b/board/microchip/mpfs_icicle/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a45642bd69b11d9312c15faac67fbd15b0ef90a6d90662d18c0760e37165c7cc linux4microchip+fpga-2024.06.tar.gz diff --git a/board/microchip/mpfs_icicle/patches/uboot/uboot.hash b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash new file mode 100644 index 00000000000..ddb73b9a718 --- /dev/null +++ b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5d9bcbebe9723ab12cbf2b60277268741e84e4aadbe7ecd8c05be046f202d8a1 linux4microchip+fpga-2024.06.tar.gz diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig index 1af7a3c474b..30d07550acc 100644 --- a/configs/microchip_mpfs_icicle_defconfig +++ b/configs/microchip_mpfs_icicle_defconfig @@ -1,11 +1,13 @@ BR2_riscv=y BR2_RISCV_ISA_RVC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/microchip/mpfs_icicle/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="mpfs_icicle" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/microchip/mpfs_icicle/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.1-mchp+fpga)/linux4microchip+fpga-2023.09.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -15,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,polarfire-soc,u-boot)linux4microchip+fpga-2023.09.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="microchip_mpfs_icicle" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/uboot-fragment-rootfs.config" BR2_TARGET_UBOOT_NEEDS_DTC=y From 8ce97fd550d64189a74e813772f05cac82541e6b Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Mon, 29 Jul 2024 12:24:16 +0100 Subject: [PATCH 2130/3013] configs/beaglev_fire: bump Linux and U-Boot Following Microchip's Linux 2024.06 release, bump Linux and U-Boot to the most recent versions. Also update the Linux custom headers to support the new v6.6 kernel. Update all affected hashes. Signed-off-by: Jamie Gibbons Signed-off-by: Thomas Petazzoni --- board/beagleboard/beaglev_fire/patches/linux/linux.hash | 2 +- board/beagleboard/beaglev_fire/patches/uboot/uboot.hash | 2 +- configs/beaglev_fire_defconfig | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/beagleboard/beaglev_fire/patches/linux/linux.hash b/board/beagleboard/beaglev_fire/patches/linux/linux.hash index d621dc32015..025d630f7dc 100644 --- a/board/beagleboard/beaglev_fire/patches/linux/linux.hash +++ b/board/beagleboard/beaglev_fire/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7d634bf425f2ad68c3a6aab0d67a5f0c9f59a4fae02f051054f428854913f58a linux4microchip+fpga-2024.02.tar.gz +sha256 a45642bd69b11d9312c15faac67fbd15b0ef90a6d90662d18c0760e37165c7cc linux4microchip+fpga-2024.06.tar.gz diff --git a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash index 684aa15a12b..ddb73b9a718 100644 --- a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c21209347beac37540f1c7070760498493975052b536fc02677faa2110666bab linux4microchip+fpga-2024.02.tar.gz +sha256 5d9bcbebe9723ab12cbf2b60277268741e84e4aadbe7ecd8c05be046f202d8a1 linux4microchip+fpga-2024.06.tar.gz diff --git a/configs/beaglev_fire_defconfig b/configs/beaglev_fire_defconfig index d52ec3c7d7b..809e00ff928 100644 --- a/configs/beaglev_fire_defconfig +++ b/configs/beaglev_fire_defconfig @@ -1,6 +1,6 @@ BR2_riscv=y BR2_RISCV_ISA_RVC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglev_fire/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -8,7 +8,7 @@ BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.1-mchp+fpga)/linux4microchip+fpga-2024.02.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,polarfire-soc,u-boot)linux4microchip+fpga-2024.02.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beaglev_fire" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglev_fire/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y From 52e537c6a5dc6a046e5272e7ba7738c6e8f3865d Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Mon, 29 Jul 2024 12:24:17 +0100 Subject: [PATCH 2131/3013] package/microchip-hss-payload-generator: bump to version 2024.06 Bump this package to latest available version v2024.06. Signed-off-by: Jamie Gibbons Signed-off-by: Thomas Petazzoni --- .../microchip-hss-payload-generator.hash | 2 +- .../microchip-hss-payload-generator.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/microchip-hss-payload-generator/microchip-hss-payload-generator.hash b/package/microchip-hss-payload-generator/microchip-hss-payload-generator.hash index b9015fc961c..006e3f4a7cd 100644 --- a/package/microchip-hss-payload-generator/microchip-hss-payload-generator.hash +++ b/package/microchip-hss-payload-generator/microchip-hss-payload-generator.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 447771d4219176acc69c6d945ff40a0f3d0c5cbe63619927bc61b9e52ab05136 microchip-hss-payload-generator-2023.09.tar.gz +sha256 667138e1b2376dcad8fb43b925bc9f24ba1ab59049550e276821c3b2f07ec6e6 microchip-hss-payload-generator-2024.06.tar.gz sha256 0b67b1d44bcad078580fc5d8e9580a48a9466b769db58aeb1631d4c5ef97e08a tools/hss-payload-generator/LICENSE.md diff --git a/package/microchip-hss-payload-generator/microchip-hss-payload-generator.mk b/package/microchip-hss-payload-generator/microchip-hss-payload-generator.mk index 4c3ca93dfe4..af1faa8aecd 100644 --- a/package/microchip-hss-payload-generator/microchip-hss-payload-generator.mk +++ b/package/microchip-hss-payload-generator/microchip-hss-payload-generator.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOST_MICROCHIP_HSS_PAYLOAD_GENERATOR_VERSION = 2023.09 +HOST_MICROCHIP_HSS_PAYLOAD_GENERATOR_VERSION = 2024.06 HOST_MICROCHIP_HSS_PAYLOAD_GENERATOR_SITE = $(call github,polarfire-soc,hart-software-services,v$(HOST_MICROCHIP_HSS_PAYLOAD_GENERATOR_VERSION)) # Some parts of the repository are under different licenses, but we # are only building/installing the code in From c4e845b5b805cc487fca6203caccc363e6e108e6 Mon Sep 17 00:00:00 2001 From: Torben Voltmer Date: Mon, 29 Jul 2024 21:32:43 +0200 Subject: [PATCH 2132/3013] package/espflash: add udev dependency Add the dependency on udev, since espflash links against libudev (via the libudev-sys crate). Fixes: http://autobuild.buildroot.net/results/c61b6ed4b6fb4d18d503ac37add200f5e6ae3706 Signed-off-by: Torben Voltmer Signed-off-by: Thomas Petazzoni --- package/espflash/Config.in | 5 +++++ package/espflash/espflash.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/espflash/Config.in b/package/espflash/Config.in index 2a7a0f6b38a..a4451012699 100644 --- a/package/espflash/Config.in +++ b/package/espflash/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_ESPFLASH bool "espflash" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_HOST_RUSTC help Serial flasher utilities for Espressif devices, based @@ -8,3 +9,7 @@ config BR2_PACKAGE_ESPFLASH ESP32-C2/C3/C6, ESP32-H2, ESP32-P4, and ESP32-S2/S3. https://github.com/esp-rs/espflash + +comment "espflash needs udev /dev management" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/espflash/espflash.mk b/package/espflash/espflash.mk index 43532de58c0..ad2294e1bfa 100644 --- a/package/espflash/espflash.mk +++ b/package/espflash/espflash.mk @@ -9,5 +9,6 @@ ESPFLASH_SITE = $(call github,esp-rs,espflash,v$(ESPFLASH_VERSION)) ESPFLASH_SUBDIR = espflash ESPFLASH_LICENSE = Apache-2.0 or MIT ESPFLASH_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT +ESPFLASH_DEPENDENCIES = udev $(eval $(cargo-package)) From 9bded368221e1aaf69a316565101e6ef109c49db Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 29 Jul 2024 20:38:15 +0200 Subject: [PATCH 2133/3013] package/lynx: bump to version 2.9.2 remove upstreamed patch Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lynx/lynx.hash | 3 +-- package/lynx/lynx.mk | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/lynx/lynx.hash b/package/lynx/lynx.hash index 62e2555a997..d9a0fc4212a 100644 --- a/package/lynx/lynx.hash +++ b/package/lynx/lynx.hash @@ -1,4 +1,3 @@ # Locally calculated: -sha256 387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595 lynx2.8.9rel.1.tar.bz2 -sha256 b2207e757dbbefc34a20a32b1b4a216b4a4316e1dc812bceca4ac6294871119a 90_CVE-2021-38165.patch +sha256 7374b89936d991669e101f4e97f2c9592036e1e8cdaa7bafc259a77ab6fb07ce lynx2.9.2.tar.bz2 sha256 8406a30ff3134ec23cf752d1ceda92ddaabbe41b4f2dc07ea3cfa139de12d6d6 COPYING diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index 83173292624..4f23b689177 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -4,13 +4,9 @@ # ################################################################################ -LYNX_VERSION = 2.8.9rel.1 +LYNX_VERSION = 2.9.2 LYNX_SOURCE = lynx$(LYNX_VERSION).tar.bz2 LYNX_SITE = https://invisible-mirror.net/archives/lynx/tarballs -LYNX_PATCH = \ - https://salsa.debian.org/lynx-team/lynx/-/raw/debian/2.9.0dev.6-3_deb11u1/debian/patches/90_CVE-2021-38165.patch -# 90_CVE-2021-38165.patch -LYNX_IGNORE_CVES += CVE-2021-38165 LYNX_LICENSE = GPL-2.0 LYNX_LICENSE_FILES = COPYING LYNX_CPE_ID_VALID = YES From 1eeea445f803b6509205a244ad07b19fc72456fb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 26 Jul 2024 10:29:19 +0200 Subject: [PATCH 2134/3013] package/liburing: add -D_GNU_SOURCE in liburing.pc.in Add -D_GNU_SOURCE to CFLAGS as liburing.h doesn't define it anymore since bump of liburing to version 2.6 in commit da45ae33040a55d9eaa6a05c75c5e7f24fe73cf4 and https://github.com/axboe/liburing/commit/c427ed678f39fd144d784f2e970bd8c52f425e14 resulting in the following musl build failure since the addition of libdex in commit 70319b47f646f74f407ed3355baf5b581a10518a: In file included from ../src/dex-uring-aio-backend.c:29: /home/autobuild/autobuild/instance-7/output-1/host/mips-buildroot-linux-musl/sysroot/usr/include/liburing.h:224:39: error: unknown type name 'cpu_set_t' 224 | const cpu_set_t *mask); | ^~~~~~~~~ /home/autobuild/autobuild/instance-7/output-1/host/mips-buildroot-linux-musl/sysroot/usr/include/liburing.h:1212:48: error: unknown type name 'loff_t'; did you mean 'off_t'? 1212 | int fd, loff_t len) | ^~~~~~ | off_t Fixes: 70319b47f646f74f407ed3355baf5b581a10518a - http://autobuild.buildroot.org/results/276646bf224d5927cf0311cf978571a7f8774116 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ing.pc.in-add-D_GNU_SOuRCE-to-Cflags.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/liburing/0001-liburing.pc.in-add-D_GNU_SOuRCE-to-Cflags.patch diff --git a/package/liburing/0001-liburing.pc.in-add-D_GNU_SOuRCE-to-Cflags.patch b/package/liburing/0001-liburing.pc.in-add-D_GNU_SOuRCE-to-Cflags.patch new file mode 100644 index 00000000000..8fec4015b27 --- /dev/null +++ b/package/liburing/0001-liburing.pc.in-add-D_GNU_SOuRCE-to-Cflags.patch @@ -0,0 +1,38 @@ +From 9485c21f8f36a78a754ccba3c4ce30867af9655d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 26 Jul 2024 09:13:16 +0200 +Subject: [PATCH] liburing.pc.in: add -D_GNU_SOuRCE to Cflags + +Add -D_GNU_SOURCE to Cflags to avoid the following musl build failure +with applications using liburing (e.g. libdex) raised since version 2.6 +and c427ed678f39fd144d784f2e970bd8c52f425e14 which reverted +c34070e08199491fe9653617364f4aea9b9b22be: + +In file included from ../src/dex-uring-aio-backend.c:29: +/home/autobuild/autobuild/instance-7/output-1/host/mips-buildroot-linux-musl/sysroot/usr/include/liburing.h:224:39: error: unknown type name 'cpu_set_t' + 224 | const cpu_set_t *mask); + | ^~~~~~~~~ +/home/autobuild/autobuild/instance-7/output-1/host/mips-buildroot-linux-musl/sysroot/usr/include/liburing.h:1212:48: error: unknown type name 'loff_t'; did you mean 'off_t'? + 1212 | int fd, loff_t len) + | ^~~~~~ + | off_t + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/axboe/liburing/commit/9485c21f8f36a78a754ccba3c4ce30867af9655d +--- + liburing.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/liburing.pc.in b/liburing.pc.in +index 2c879b2..790c22e 100644 +--- a/liburing.pc.in ++++ b/liburing.pc.in +@@ -9,4 +9,4 @@ Description: io_uring library + URL: https://git.kernel.dk/cgit/liburing/ + + Libs: -L${libdir} -luring +-Cflags: -I${includedir} ++Cflags: -I${includedir} -D_GNU_SOURCE +-- +2.43.0 + From 320c69a27d9c8a6b11616b0feb3668ab01ed93c3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 26 Jul 2024 10:27:54 +0200 Subject: [PATCH 2135/3013] package/libdex: needs dynamic library Fix the following static build failure raised since the addition of the package in commit 70319b47f646f74f407ed3355baf5b581a10518a: FAILED: src/libdex-1.so.1.0.0 /home/autobuild/autobuild/instance-11/output-1/host/bin/mips-buildroot-linux-musl-gcc -o src/libdex-1.so.1.0.0 -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group -Wl,-soname,libdex-1.so.1 -Wl,--whole-archive src/libdex-1.a -Wl,--no-whole-archive -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-Bsymbolic -fno-plt -static -lucontext -latomic /home/autobuild/autobuild/instance-11/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libffi.a /home/autobuild/autobuild/instance-11/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libglib-2.0.a /home/autobuild/autobuild/instance-11/output-1/host/lib/gcc/mips-buildroot-linux-musl/13.3. 0/../../../../mips-buildroot-linux-musl/lib/libatomic.a -lm -pthread /home/autobuild/autobuild/instance-11/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libpcre2-8.a /home/autobuild/autobuild/instance-11/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libz.a -latomic -Wl,--end-group /home/autobuild/autobuild/instance-11/output-1/host/lib/gcc/mips-buildroot-linux-musl/13.3.0/crtbeginT.o: in function `deregister_tm_clones': crtstuff.c:(.text+0x10): relocation R_MIPS_HI16 against `__gnu_local_gp' cannot be used when making a shared object; recompile with -fPIC Fixes: 70319b47f646f74f407ed3355baf5b581a10518a - http://autobuild.buildroot.org/results/f527cab99141ecbbbd13c12177a2cc8903bed3a4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libdex/Config.in | 4 +++- package/sysprof/Config.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libdex/Config.in b/package/libdex/Config.in index 5f94a79b73b..17abc0b02af 100644 --- a/package/libdex/Config.in +++ b/package/libdex/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBDEX depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2, gettext depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_UCONTEXT || \ BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS select BR2_PACKAGE_LIBGLIB2 @@ -16,8 +17,9 @@ config BR2_PACKAGE_LIBDEX https://gitlab.gnome.org/GNOME/libdex -comment "libdex needs a toolchain w/ wchar, threads, ucontext" +comment "libdex needs a toolchain w/ wchar, threads, dynamic library, ucontext" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || \ !(BR2_TOOLCHAIN_HAS_UCONTEXT || \ BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS) diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in index 32a5f997983..a4f53a11791 100644 --- a/package/sysprof/Config.in +++ b/package/sysprof/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_SYSPROF depends on BR2_USE_MMU # glib2, libdex, json-glib depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libunwind, polkit depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS # libunwind, polkit + depends on !BR2_STATIC_LIBS # libdex, libunwind, polkit depends on !BR2_OPTIMIZE_FAST # polkit depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 From d76daf0758e04d113c480974e5f89701255397cd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 26 Jul 2024 10:03:29 +0200 Subject: [PATCH 2136/3013] package/qemu: update to 9.0.2 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 2c905d2e77e..419dd0d1b3b 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 32708ac66c30d8c892633ea968c771c1c76d597d70ddead21a0d22ccf386da69 qemu-9.0.0.tar.xz +sha256 a8c3f596aece96da3b00cafb74baafa0d14515eafb8ed1ee3f7f5c2d0ebf02b6 qemu-9.0.2.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 8de803dd251..16cff13d180 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 9.0.0 +QEMU_VERSION = 9.0.2 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_SELINUX_MODULES = qemu virt From 7fab00ff153155fab626e718fb43d425e88d3066 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 19 Jul 2024 22:39:33 +0200 Subject: [PATCH 2137/3013] package/igh-ethercat: backport fix to build with Linux 6.9 This commit backports a patch from upstream that fixes the build with Linux 6.9. Fixes: http://autobuild.buildroot.net/results/db2462b1c5c6797a0edca66a513c121dbddd8888/ Signed-off-by: Thomas Petazzoni --- ...Remove-dev_base_lock-for-linux-6.9.0.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/igh-ethercat/0001-Remove-dev_base_lock-for-linux-6.9.0.patch diff --git a/package/igh-ethercat/0001-Remove-dev_base_lock-for-linux-6.9.0.patch b/package/igh-ethercat/0001-Remove-dev_base_lock-for-linux-6.9.0.patch new file mode 100644 index 00000000000..a71edb7be69 --- /dev/null +++ b/package/igh-ethercat/0001-Remove-dev_base_lock-for-linux-6.9.0.patch @@ -0,0 +1,51 @@ +From 09eb1b9f73d677d10d18039305b9d974e52cc6d5 Mon Sep 17 00:00:00 2001 +From: Nicola Fontana +Date: Mon, 3 Jun 2024 12:45:48 +0200 +Subject: [PATCH] Remove dev_base_lock for linux >= 6.9.0 + +Kernel commit 1b3ef46cb7f2618cc0b507393220a69810f6da12 removed +`dev_base_lock` from v6.9 onward. + +Use the alternate iterator `for_each_netdev_rcu` introduced by commit +c6d14c84566d6b70ad9dc1618db0dec87cca9300 in 2.6.33+. + +Upstream: https://gitlab.com/etherlab.org/ethercat/-/commit/95c25b50711ca7e1f990bdcbca8fa713c942ab01 +Signed-off-by: Thomas Petazzoni +--- + devices/generic.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/devices/generic.c b/devices/generic.c +index 4d4d9bbd..f30f1e17 100644 +--- a/devices/generic.c ++++ b/devices/generic.c +@@ -420,14 +420,14 @@ int __init ec_gen_init_module(void) + INIT_LIST_HEAD(&generic_devices); + INIT_LIST_HEAD(&descs); + +- read_lock(&dev_base_lock); +- for_each_netdev(&init_net, netdev) { ++ rcu_read_lock(); ++ for_each_netdev_rcu(&init_net, netdev) { + if (netdev->type != ARPHRD_ETHER) + continue; + desc = kmalloc(sizeof(ec_gen_interface_desc_t), GFP_ATOMIC); + if (!desc) { + ret = -ENOMEM; +- read_unlock(&dev_base_lock); ++ rcu_read_unlock(); + goto out_err; + } + strncpy(desc->name, netdev->name, IFNAMSIZ); +@@ -436,7 +436,7 @@ int __init ec_gen_init_module(void) + memcpy(desc->dev_addr, netdev->dev_addr, ETH_ALEN); + list_add_tail(&desc->list, &descs); + } +- read_unlock(&dev_base_lock); ++ rcu_read_unlock(); + + list_for_each_entry_safe(desc, next, &descs, list) { + ret = offer_device(desc); +-- +2.45.2 + From 01becc082dd7b394b1591508e58f298b262e26af Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 19 Jul 2024 22:58:01 +0200 Subject: [PATCH 2138/3013] arch/Config.in.x86: drop knightslanding and knightsmill archs According to the GCC 14.x release notes at https://gcc.gnu.org/gcc-14/changes.html: Xeon Phi CPUs support (a.k.a. Knight Landing and Knight Mill) are marked as deprecated. GCC will emit a warning when using the -mavx5124fmaps, -mavx5124vnniw, -mavx512er, -mavx512pf, -mprefetchwt1, -march=knl, -march=knm, -mtune=knl or -mtune=knm compiler switches. Support will be removed in GCC 15. Using those architectures already emits warnings, which when treated as errors cause build failures, such as: cc1: error: '-march=knm' support will be removed in GCC 15 [-Werror=deprecated] cc1: all warnings being treated as errors Therefore, let's drop support for those two architectures, which are anyway not common at all, especially in the embedded space. Fixes: http://autobuild.buildroot.net/results/ce98c41b22212f52bf7b53d84871b8e03409dbca/ Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 14 ++++++++++++++ arch/Config.in.x86 | 26 -------------------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index da6f24366cb..a746f682cc5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2024.08" +config BR2_x86_knightslanding + bool "knightslanding x86 architecture support dropped" + select BR2_LEGACY + help + GCC 14.x has marked this architecture as obsolete, and emits + a warning causing build failures. + +config BR2_x86_knightsmill + bool "knightsmill x86 architecture support dropped" + select BR2_LEGACY + help + GCC 14.x has marked this architecture as obsolete, and emits + a warning causing build failures. + config BR2_PACKAGE_DVB_APPS bool "dvb-apps package removed" select BR2_LEGACY diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 93a223b7aed..f9b32130b23 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -379,30 +379,6 @@ config BR2_x86_grandridge select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_13 -config BR2_x86_knightslanding - bool "knightslanding" - select BR2_X86_CPU_HAS_MMX - select BR2_X86_CPU_HAS_SSE - select BR2_X86_CPU_HAS_SSE2 - select BR2_X86_CPU_HAS_SSE3 - select BR2_X86_CPU_HAS_SSSE3 - select BR2_X86_CPU_HAS_SSE4 - select BR2_X86_CPU_HAS_SSE42 - select BR2_X86_CPU_HAS_AVX - select BR2_X86_CPU_HAS_AVX2 - select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 -config BR2_x86_knightsmill - bool "knightsmill" - select BR2_X86_CPU_HAS_MMX - select BR2_X86_CPU_HAS_SSE - select BR2_X86_CPU_HAS_SSE2 - select BR2_X86_CPU_HAS_SSE3 - select BR2_X86_CPU_HAS_SSSE3 - select BR2_X86_CPU_HAS_SSE4 - select BR2_X86_CPU_HAS_SSE42 - select BR2_X86_CPU_HAS_AVX - select BR2_X86_CPU_HAS_AVX2 - select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_x86_skylake_avx512 bool "skylake-avx512" select BR2_X86_CPU_HAS_MMX @@ -791,8 +767,6 @@ config BR2_GCC_TARGET_ARCH default "tremont" if BR2_x86_tremont default "sierraforest" if BR2_x86_sierraforest default "grandridge" if BR2_x86_grandridge - default "knl" if BR2_x86_knightslanding - default "knm" if BR2_x86_knightsmill default "skylake-avx512" if BR2_x86_skylake_avx512 default "cannonlake" if BR2_x86_cannonlake default "icelake-client" if BR2_x86_icelake_client From 81a4b6e7b8b5bb368bce940798bf8432fb420851 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 19 Jul 2024 23:03:24 +0200 Subject: [PATCH 2139/3013] package/gcc: fix build with BR2_TIME_BITS_64=y On the architectures that supports libsanitizer (part of gcc), the build is currently failing with BR2_TIME_BITS_64=y. This is because some code in libsanitizer unsets _FILE_OFFSET_BITS, but building code with _FILE_OFFSET_BITS unset, but _TIME_BITS set isn't legal. To fix this, this commit backports two changes: - One change to also unset _TIME_BITS in sanitizer_platform_limits_posix.cpp. This change is upstream in LLVM, and already part of GCC 14.x, so we only bringing it to GCC 12.x and GCC 13.x. - A second change doing the same modification, but in sanitizer_procmaps_solaris.cpp, which as crazy as it might sound, also gets compiled on Linux platforms (but to basically an empty file). This change has been submitted upstream to both LLVM and gcc. Notes: - the special PowerPC SPE version of GCC cannot be affected, as only uClibc-ng is used for this architecture, and uClibc-ng doesn't use _TIME_BITS=64 (but now default to 64-bit time_t on 32-bit architectures, like musl does). - the special ARC version doesn't need patching because libsanitizer doesn't support the ARC architecture, so it doesn't get built Fixes: http://autobuild.buildroot.net/results/ff2dbfdabf0bb6a0d82ea8a80122ab97fd75bd3f/ https://gitlab.com/buildroot.org/buildroot/-/issues/16 Signed-off-by: Thomas Petazzoni --- ...-along-with-_FILE_OFFSET_BITS-on-Lin.patch | 44 +++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ ...-along-with-_FILE_OFFSET_BITS-on-Lin.patch | 44 +++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ 5 files changed, 247 insertions(+) create mode 100644 package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch create mode 100644 package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch create mode 100644 package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch create mode 100644 package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch create mode 100644 package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch diff --git a/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch new file mode 100644 index 00000000000..386c9287f69 --- /dev/null +++ b/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch @@ -0,0 +1,44 @@ +From e45f12ecf703eed45515d451cf014fba32e7410b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Feb 2023 11:48:35 -0800 +Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux + +On 32-bit glibc>=2.34 systems using 64bit time_t build fails because +_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 + +Fixes + +``` +/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed + only with _FILE_OFFSET_BITS=64" +| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" +| ^ +| 1 error generated. +``` + +Reviewed By: thesamesam, MaskRay + +Differential Revision: https://reviews.llvm.org/D140812 + +Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index bfdccd5df07..4cedcbfb4bf 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -18,6 +18,7 @@ + // depends on _FILE_OFFSET_BITS setting. + // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #endif + + // Must go after undef _FILE_OFFSET_BITS. +-- +2.45.2 + diff --git a/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 00000000000..80c3378d7b5 --- /dev/null +++ b/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 940a0c955bca98aba937c4bfe3fe4a4c17dddb85 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index e16c4e938cb..ca88cf2c2df 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + #include "sanitizer_common.h" +-- +2.45.2 + diff --git a/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch new file mode 100644 index 00000000000..a3be0914b9c --- /dev/null +++ b/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch @@ -0,0 +1,44 @@ +From 88b73eedcfa0fc58aee2555377e6f7d4de153282 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Feb 2023 11:48:35 -0800 +Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux + +On 32-bit glibc>=2.34 systems using 64bit time_t build fails because +_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 + +Fixes + +``` +/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed + only with _FILE_OFFSET_BITS=64" +| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" +| ^ +| 1 error generated. +``` + +Reviewed By: thesamesam, MaskRay + +Differential Revision: https://reviews.llvm.org/D140812 + +Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index bcbd143d19d..1b23898b374 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -18,6 +18,7 @@ + // depends on _FILE_OFFSET_BITS setting. + // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #endif + + // Must go after undef _FILE_OFFSET_BITS. +-- +2.45.2 + diff --git a/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 00000000000..73b09ac3890 --- /dev/null +++ b/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 7ad54084a2c07cca6d03dfe274893e903852d359 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index eeb49e2afe3..1b23fd4d512 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +-- +2.45.2 + diff --git a/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 00000000000..b9dfcd0d013 --- /dev/null +++ b/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 71de45698f60f8feabc0e91336f1e2fb387902df Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index eeb49e2afe3..1b23fd4d512 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +-- +2.45.2 + From 42c5da5f7b61ef51a24397d20264c31789b64d95 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 26 Jul 2024 16:39:06 +0200 Subject: [PATCH 2140/3013] package/sqlite: bump to 3.46.0 Changelog: https://sqlite.org/releaselog/3_46_0.html Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index e7b5d2b2249..5eae86f1597 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a sqlite-autoconf-3450100.tar.gz +sha256 6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d sqlite-autoconf-3460000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 040d405b8ad..8bd0a5cb4dc 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.45.1 -SQLITE_TAR_VERSION = 3450100 +SQLITE_VERSION = 3.46.0 +SQLITE_TAR_VERSION = 3460000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2024 SQLITE_LICENSE = blessing From 356d4351477311e89c91963cad8badc40f8dc30f Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Tue, 30 Jul 2024 08:42:01 +0200 Subject: [PATCH 2141/3013] s390-tools: bump version to 2.33.1 Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index ccc86edd6a5..d5f6cc5ea81 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f337c1898f243835fc187f21443266f05e3beb817b5fb09d555dc3887fe74b9b s390-tools-2.32.0.tar.gz +sha256 2933c6c5233cb70b7c47d9410458d8e4c26347de683e2c027956b9c67c7ebe9a s390-tools-2.33.1.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index b0e156cc04a..6b7a52447bf 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.32.0 +S390_TOOLS_VERSION = 2.33.1 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE From ce1349a24221585222bc4f57f0caef9182595566 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Tue, 30 Jul 2024 09:27:25 +0200 Subject: [PATCH 2142/3013] package/qemu: enable s390x arch as target package Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 74962f3e266..608e4d429dd 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET default y if BR2_powerpc64 default y if BR2_powerpc64le default y if BR2_riscv + default y if BR2_s390x default y if BR2_x86_64 comment "QEMU requires a toolchain with wchar, threads, gcc >= 8" From 957973261452567c4ea36a1aa9c708d9ec03323a Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 20 Jul 2024 22:16:55 +0200 Subject: [PATCH 2143/3013] configs/beaglebone_qt5: bump U-Boot to 2024.07 The patch bumps U-Boot to version 2024.07. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- board/beagleboard/beaglebone/patches/uboot/uboot.hash | 2 +- configs/beaglebone_qt5_defconfig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/board/beagleboard/beaglebone/patches/uboot/uboot.hash index 4b82872f31e..fe9b4f53dc6 100644 --- a/board/beagleboard/beaglebone/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglebone/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a u-boot-2021.04.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index e09a88e21b2..6201507770a 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -33,9 +33,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From 4cc21e5e842747916c7f751394539c925601f9c8 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 20 Jul 2024 22:16:56 +0200 Subject: [PATCH 2144/3013] configs/beaglebone_qt5: drop U-Boot tools Commit e2520d0ff3d8e ("configs/beaglebone_qt5: bump kernel and U-Boot, add weston") selected host-uboot-tools with FIT support to create the images. They are no longer necessary now. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/beaglebone_qt5_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 6201507770a..e58255a1086 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -44,5 +44,3 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From 38f3bb5fd7702a74ee5eb16ee59c6d8221aed452 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 20 Jul 2024 22:16:57 +0200 Subject: [PATCH 2145/3013] configs/beaglebone_qt5: move patches to beaglebone-qt5 folder Compared to the beaglebone_defconfig, updating the Linux kernel for beaglebone_qt5 is more tricky because it may also involve updating the ti-sgx-{km,um} packages. Therefore, it is unlikely that the two configurations can share the same software versions for the Linux kernel, and consequently a single path for the patches. For this reason, and with the foresight of adding the hash files for the beaglebone_defconfig as well, the hash files and patches are moved to a separate board/beagleboard/beaglebone-qt5/patches/ directory. This way, future conflicts in managing the patches for the two configurations (i.e., beaglebone[_qt5]_defconfig) are avoided. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- .../patches/linux-headers/linux-headers.hash | 0 .../patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch | 0 ...2-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch | 0 ...03-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch | 0 .../linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch | 0 .../{beaglebone => beaglebone-qt5}/patches/linux/linux.hash | 0 .../{beaglebone => beaglebone-qt5}/patches/uboot/uboot.hash | 0 configs/beaglebone_qt5_defconfig | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux-headers/linux-headers.hash (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/linux.hash (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/uboot/uboot.hash (100%) diff --git a/.checkpackageignore b/.checkpackageignore index b10a277eae7..b488a059025 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -8,7 +8,7 @@ board/arcturus/aarch64-ucls1012a/post-image.sh Shellcheck board/aspeed/common/post-image.sh Shellcheck board/asus/tinker/post-build.sh Shellcheck board/atmel/flasher.sh Shellcheck -board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch lib_patch.Upstream +board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch lib_patch.Upstream board/beagleboard/beaglebone/post-build.sh Shellcheck board/beagleboard/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch lib_patch.Upstream board/beagleboard/beagleboneai/post-build.sh Shellcheck diff --git a/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash b/board/beagleboard/beaglebone-qt5/patches/linux-headers/linux-headers.hash similarity index 100% rename from board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash rename to board/beagleboard/beaglebone-qt5/patches/linux-headers/linux-headers.hash diff --git a/board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch diff --git a/board/beagleboard/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/board/beagleboard/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch diff --git a/board/beagleboard/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch diff --git a/board/beagleboard/beaglebone/patches/linux/linux.hash b/board/beagleboard/beaglebone-qt5/patches/linux/linux.hash similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/linux.hash rename to board/beagleboard/beaglebone-qt5/patches/linux/linux.hash diff --git a/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/board/beagleboard/beaglebone-qt5/patches/uboot/uboot.hash similarity index 100% rename from board/beagleboard/beaglebone/patches/uboot/uboot.hash rename to board/beagleboard/beaglebone-qt5/patches/uboot/uboot.hash diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index e58255a1086..4121065ee30 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y -BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches" +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone-qt5/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From 53911500e41db62002732bee0c583ccccb6c614c Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 20 Jul 2024 22:16:58 +0200 Subject: [PATCH 2146/3013] configs/beaglebone_defconfig: add hashes for Linux/headers/U-Boot The patch adds .hash files for Linux, Linux headers and U-Boot and then enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../beaglebone/patches/linux-headers/linux-headers.hash | 1 + board/beagleboard/beaglebone/patches/linux/linux.hash | 2 ++ board/beagleboard/beaglebone/patches/uboot/uboot.hash | 2 ++ configs/beaglebone_defconfig | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) create mode 120000 board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash create mode 100644 board/beagleboard/beaglebone/patches/linux/linux.hash create mode 100644 board/beagleboard/beaglebone/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index b488a059025..028b63b4d35 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -140,7 +140,6 @@ configs/bananapi_m2_berry_defconfig lib_defconfig.ForceCheckHash configs/bananapi_m2_ultra_defconfig lib_defconfig.ForceCheckHash configs/bananapi_m2_zero_defconfig lib_defconfig.ForceCheckHash configs/bananapro_defconfig lib_defconfig.ForceCheckHash -configs/beaglebone_defconfig lib_defconfig.ForceCheckHash configs/beelink_gs1_defconfig lib_defconfig.ForceCheckHash configs/broadcom_northstar_defconfig lib_defconfig.ForceCheckHash configs/canaan_kd233_defconfig lib_defconfig.ForceCheckHash diff --git a/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash b/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/beagleboard/beaglebone/patches/linux/linux.hash b/board/beagleboard/beaglebone/patches/linux/linux.hash new file mode 100644 index 00000000000..ce0613ad446 --- /dev/null +++ b/board/beagleboard/beaglebone/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 6b73d8dca21000030acd2e37aed43f23de2fdd2850a2808722658241df48e671 linux-6.1.80-ti-r34.tar.gz diff --git a/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/board/beagleboard/beaglebone/patches/uboot/uboot.hash new file mode 100644 index 00000000000..bc999536af2 --- /dev/null +++ b/board/beagleboard/beaglebone/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index b1a0c7cda40..28f3c20c00e 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -7,6 +7,8 @@ BR2_ARM_FPU_VFPV3=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Image From e321e81cf921346ec2d4cd1a9439016c7b2d3fb5 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 20 Jul 2024 22:16:59 +0200 Subject: [PATCH 2147/3013] configs/beaglebone: bump Linux to 6.6.32-ti-rt-arm32-r7 and U-Boot to 2024.07 The patch bumps the Linux kernel to version 6.6.32-ti-rt-arm32-r7 and U-Boot to version 2024.07. Tested on beaglebone black. Link: https://github.com/beagleboard/linux/releases/tag/6.6.32-ti-rt-arm32-r7 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- board/beagleboard/beaglebone/patches/linux/linux.hash | 2 +- board/beagleboard/beaglebone/patches/uboot/uboot.hash | 2 +- configs/beaglebone_defconfig | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/beagleboard/beaglebone/patches/linux/linux.hash b/board/beagleboard/beaglebone/patches/linux/linux.hash index ce0613ad446..4a7384d0363 100644 --- a/board/beagleboard/beaglebone/patches/linux/linux.hash +++ b/board/beagleboard/beaglebone/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6b73d8dca21000030acd2e37aed43f23de2fdd2850a2808722658241df48e671 linux-6.1.80-ti-r34.tar.gz +sha256 f1ae7325c6c146e0f852866a3bfd3f90ae1b5f46e414bc99a38384ed677e3721 linux-6.6.32-ti-arm32-r7.tar.gz diff --git a/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/board/beagleboard/beaglebone/patches/uboot/uboot.hash index bc999536af2..fe9b4f53dc6 100644 --- a/board/beagleboard/beaglebone/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglebone/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 28f3c20c00e..ca418bed208 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a8=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches" @@ -19,10 +19,10 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.80-ti-r34)/linux-6.1.80-ti-r34.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.6.32-ti-arm32-r7)/linux-6.6.32-ti-arm32-r7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-bonegreen ti/omap/am335x-evmsk ti/omap/am335x-boneblue ti/omap/am335x-boneblack-wireless ti/omap/am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem @@ -33,7 +33,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 8850a30673393f1d456be0e3c1cb5e4f8cdde457 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 19 Jul 2024 00:32:30 -0600 Subject: [PATCH 2148/3013] package/python-pefile: new host package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pefile/python-pefile.hash | 5 +++++ package/python-pefile/python-pefile.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-pefile/python-pefile.hash create mode 100644 package/python-pefile/python-pefile.mk diff --git a/package/python-pefile/python-pefile.hash b/package/python-pefile/python-pefile.hash new file mode 100644 index 00000000000..af2288487d1 --- /dev/null +++ b/package/python-pefile/python-pefile.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pefile/json +md5 fa0eba7c91f4e696771ddbfacdca25e4 pefile-2023.2.7.tar.gz +sha256 82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc pefile-2023.2.7.tar.gz +# Locally computed sha256 checksums +sha256 bfd4b5e4f8a99c961fd6f94d708e38396cc146bfe8fbc5d2a86e63aa29fb4208 LICENSE diff --git a/package/python-pefile/python-pefile.mk b/package/python-pefile/python-pefile.mk new file mode 100644 index 00000000000..c65f1deb603 --- /dev/null +++ b/package/python-pefile/python-pefile.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pefile +# +################################################################################ + +PYTHON_PEFILE_VERSION = 2023.2.7 +PYTHON_PEFILE_SOURCE = pefile-$(PYTHON_PEFILE_VERSION).tar.gz +PYTHON_PEFILE_SITE = https://files.pythonhosted.org/packages/78/c5/3b3c62223f72e2360737fd2a57c30e5b2adecd85e70276879609a7403334 +PYTHON_PEFILE_SETUP_TYPE = setuptools +PYTHON_PEFILE_LICENSE = MIT +PYTHON_PEFILE_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) From f376a7509577b88790fbf9ca77049c46da9a252c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 19 Jul 2024 00:32:31 -0600 Subject: [PATCH 2149/3013] package/python-cbor2: enable host build This will be required for the upcoming python-uswid package. Disable c extensions for host package to speed up build. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-cbor2/python-cbor2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index 50403018677..423670047e8 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -12,5 +12,8 @@ PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt PYTHON_CBOR2_DEPENDENCIES = host-python-setuptools-scm PYTHON_CBOR2_ENV = CBOR2_BUILD_C_EXTENSION=1 +HOST_PYTHON_CBOR2_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_CBOR2_ENV = CBOR2_BUILD_C_EXTENSION=0 $(eval $(python-package)) +$(eval $(host-python-package)) From 8270da3e4f73a99119b6919c829d84016e1cfbcf Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 19 Jul 2024 00:32:32 -0600 Subject: [PATCH 2150/3013] package/python3: add option to support lzma/xz in host-python This will be needed by the upcoming host-python-uswid package. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python3/Config.in.host | 5 +++++ package/python3/python3.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/python3/Config.in.host b/package/python3/Config.in.host index 88c286c55b2..f3fcd63567d 100644 --- a/package/python3/Config.in.host +++ b/package/python3/Config.in.host @@ -12,6 +12,11 @@ config BR2_PACKAGE_HOST_PYTHON3_BZIP2 help bz2 module for host Python3. +config BR2_PACKAGE_HOST_PYTHON3_XZ + bool "xz" + help + xz (a.k.a lzma) module for host Python3 + config BR2_PACKAGE_HOST_PYTHON3_CURSES bool "curses" help diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f85dcfad309..7d6c9fe93f7 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -57,6 +57,12 @@ else HOST_PYTHON3_CONF_ENV += py_cv_module__bz2=n/a endif +ifeq ($(BR2_PACKAGE_HOST_PYTHON3_XZ),y) +HOST_PYTHON3_DEPENDENCIES += host-xz +else +HOST_PYTHON3_CONF_ENV += py_cv_module__lzma=n/a +endif + ifeq ($(BR2_PACKAGE_HOST_PYTHON3_CURSES),y) HOST_PYTHON3_DEPENDENCIES += host-ncurses else From ab11a0389936d7c9acccc62edbb7d1c0cb68117a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 19 Jul 2024 00:32:33 -0600 Subject: [PATCH 2151/3013] package/python-uswid: new host package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/python-uswid/Config.in.host | 8 ++++++++ package/python-uswid/python-uswid.hash | 5 +++++ package/python-uswid/python-uswid.mk | 18 ++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 package/python-uswid/Config.in.host create mode 100644 package/python-uswid/python-uswid.hash create mode 100644 package/python-uswid/python-uswid.mk diff --git a/package/Config.in.host b/package/Config.in.host index 4340e6e8c95..e4fbee4f2a8 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -89,6 +89,7 @@ menu "Host utilities" source "package/python-lxml/Config.in.host" source "package/python-pyyaml/Config.in.host" source "package/python-six/Config.in.host" + source "package/python-uswid/Config.in.host" source "package/python-xlrd/Config.in.host" source "package/python3/Config.in.host" source "package/qemu/Config.in.host" diff --git a/package/python-uswid/Config.in.host b/package/python-uswid/Config.in.host new file mode 100644 index 00000000000..6605d51915f --- /dev/null +++ b/package/python-uswid/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_PYTHON_USWID + bool "host python-uswid" + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON3_XZ + help + A tiny tool for embedding CoSWID tags in EFI binaries. + + https://github.com/hughsie/python-uswid diff --git a/package/python-uswid/python-uswid.hash b/package/python-uswid/python-uswid.hash new file mode 100644 index 00000000000..b6bf09c713c --- /dev/null +++ b/package/python-uswid/python-uswid.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/uswid/json +md5 e43ff6d49ddcda0c95338d3271694b91 uswid-0.5.0.tar.gz +sha256 bdcd7ee5afac1da60ee688c357aa12f5f8d74bc28012446b10e2b4a9cf52fc6d uswid-0.5.0.tar.gz +# Locally computed sha256 checksums +sha256 98bc07f3fb70d05b01ff740e8191b9f29c080159f01588991fbd872c611236f9 LICENSE diff --git a/package/python-uswid/python-uswid.mk b/package/python-uswid/python-uswid.mk new file mode 100644 index 00000000000..2092a06f52d --- /dev/null +++ b/package/python-uswid/python-uswid.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python-uswid +# +################################################################################ + +PYTHON_USWID_VERSION = 0.5.0 +PYTHON_USWID_SOURCE = uswid-$(PYTHON_USWID_VERSION).tar.gz +PYTHON_USWID_SITE = https://files.pythonhosted.org/packages/dc/bf/05291df12037befeacda2083c798e98691043978e07ca4a00b4eb94aeb61 +PYTHON_USWID_SETUP_TYPE = setuptools +PYTHON_USWID_LICENSE = BSD-2-Clause-Patent +PYTHON_USWID_LICENSE_FILES = LICENSE +HOST_PYTHON_USWID_DEPENDENCIES = \ + host-python-cbor2 \ + host-python-lxml \ + host-python-pefile + +$(eval $(host-python-package)) From 51f4451094aaa56caffc4f4b4a171a64dc613826 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 19 Jul 2024 00:32:34 -0600 Subject: [PATCH 2152/3013] package/fwupd-efi: new package Backport some patches fixing the python shebang and allowing one to disable the use of genpeimg since we use host-python-pefile. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...disabling-the-use-of-genpeimg-binary.patch | 41 ++++++++ ...-shebang-paths-and-add-python-option.patch | 95 +++++++++++++++++++ package/fwupd-efi/Config.in | 9 ++ package/fwupd-efi/fwupd-efi.hash | 3 + package/fwupd-efi/fwupd-efi.mk | 28 ++++++ 7 files changed, 178 insertions(+) create mode 100644 package/fwupd-efi/0001-Allow-enabling-disabling-the-use-of-genpeimg-binary.patch create mode 100644 package/fwupd-efi/0002-Fix-python3-shebang-paths-and-add-python-option.patch create mode 100644 package/fwupd-efi/Config.in create mode 100644 package/fwupd-efi/fwupd-efi.hash create mode 100644 package/fwupd-efi/fwupd-efi.mk diff --git a/DEVELOPERS b/DEVELOPERS index 16f63bdc0ea..709f658a388 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1491,6 +1491,7 @@ F: package/apcupsd/ F: package/bpftool/ F: package/cloudflared/ F: package/exfatprogs/ +F: package/fwupd-efi/ F: package/fxdiv/ F: package/gensio/ F: package/lua-std-debug/ diff --git a/package/Config.in b/package/Config.in index 3e51ddd707e..3d638b111f7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -519,6 +519,7 @@ endmenu source "package/fmtools/Config.in" source "package/freeipmi/Config.in" source "package/freescale-imx/Config.in" + source "package/fwupd-efi/Config.in" source "package/fxload/Config.in" source "package/gcnano-binaries/Config.in" source "package/gpm/Config.in" diff --git a/package/fwupd-efi/0001-Allow-enabling-disabling-the-use-of-genpeimg-binary.patch b/package/fwupd-efi/0001-Allow-enabling-disabling-the-use-of-genpeimg-binary.patch new file mode 100644 index 00000000000..e6e460a3b76 --- /dev/null +++ b/package/fwupd-efi/0001-Allow-enabling-disabling-the-use-of-genpeimg-binary.patch @@ -0,0 +1,41 @@ +From fb1cf079346a2838cc44f7116cb4a790e40cc5bf Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 2 Jul 2024 15:08:18 -0600 +Subject: [PATCH] Allow enabling/disabling the use of genpeimg binary + +In some cases we may want to force the use of python3-pefile instead +of genpeimg such as when cross compiling, add a feature option to +allow disabling genpeimg. + +Upstream: https://github.com/fwupd/fwupd-efi/commit/fb1cf079346a2838cc44f7116cb4a790e40cc5bf +Signed-off-by: James Hilliard +--- + meson.build | 2 +- + meson_options.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a3ce068..a5612a6 100644 +--- a/meson.build ++++ b/meson.build +@@ -17,7 +17,7 @@ prefix = get_option('prefix') + libdir = join_paths(prefix, get_option('libdir')) + libexecdir = join_paths(prefix, get_option('libexecdir')) + +-genpeimg = find_program ('genpeimg', required: false) ++genpeimg = find_program ('genpeimg', required: get_option('genpeimg')) + + efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') + host_cpu = host_machine.cpu_family() +diff --git a/meson_options.txt b/meson_options.txt +index 26161e1..588ae29 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -7,3 +7,4 @@ option('efi_sbat_distro_summary', type : 'string', value : '', description : 'SB + option('efi_sbat_distro_pkgname', type : 'string', value : '', description : 'SBAT distribution package name, e.g. fwupd') + option('efi_sbat_distro_version', type : 'string', value : '', description : 'SBAT distribution version, e.g. fwupd-1.5.6.fc33') + option('efi_sbat_distro_url', type : 'string', value : '', description : 'SBAT distribution URL, e.g. https://src.fedoraproject.org/rpms/fwupd') ++option('genpeimg', type : 'feature', description : 'Use genpeimg to add NX support to binaries') +-- +2.34.1 + diff --git a/package/fwupd-efi/0002-Fix-python3-shebang-paths-and-add-python-option.patch b/package/fwupd-efi/0002-Fix-python3-shebang-paths-and-add-python-option.patch new file mode 100644 index 00000000000..97475651822 --- /dev/null +++ b/package/fwupd-efi/0002-Fix-python3-shebang-paths-and-add-python-option.patch @@ -0,0 +1,95 @@ +From 1cd1ff0216d5beb2a2523031398d4dba7d12729d Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 2 Jul 2024 14:51:26 -0600 +Subject: [PATCH] Fix python3 shebang paths and add python option. + +Using absolute paths can result in the wrong python3 binary being +used, such as when cross compiling using a non-system python3. + +Use the normal python3 env shebang instead. + +Also add a meson option to allow overriding the python path. + +Upstream: https://github.com/fwupd/fwupd-efi/commit/1cd1ff0216d5beb2a2523031398d4dba7d12729d +Signed-off-by: James Hilliard +--- + contrib/reformat-code.py | 2 +- + efi/generate_binary.py | 2 +- + efi/generate_sbat.py | 2 +- + efi/meson.build | 4 ++-- + meson.build | 7 +++++++ + meson_options.txt | 1 + + 6 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/contrib/reformat-code.py b/contrib/reformat-code.py +index 65a4ac4..ff6014d 100755 +--- a/contrib/reformat-code.py ++++ b/contrib/reformat-code.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # + # Copyright (C) 2017 Dell Inc. + # +diff --git a/efi/generate_binary.py b/efi/generate_binary.py +index 443472a..a4611bb 100755 +--- a/efi/generate_binary.py ++++ b/efi/generate_binary.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # + # Copyright (C) 2021 Javier Martinez Canillas + # Copyright (C) 2021 Richard Hughes +diff --git a/efi/generate_sbat.py b/efi/generate_sbat.py +index 6c904e5..b9b80ac 100755 +--- a/efi/generate_sbat.py ++++ b/efi/generate_sbat.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # + # Copyright (C) 2021 Javier Martinez Canillas + # Copyright (C) 2021 Richard Hughes +diff --git a/efi/meson.build b/efi/meson.build +index 75ade7a..008ba3d 100644 +--- a/efi/meson.build ++++ b/efi/meson.build +@@ -1,5 +1,5 @@ +-generate_sbat = find_program('generate_sbat.py', native: true) +-generate_binary = find_program('generate_binary.py', native: true) ++generate_sbat = [python3, files('generate_sbat.py')] ++generate_binary = [python3, files('generate_binary.py')] + + # get source version, falling back + git = find_program('git', required : false) +diff --git a/meson.build b/meson.build +index a5612a6..5836213 100644 +--- a/meson.build ++++ b/meson.build +@@ -19,6 +19,13 @@ libexecdir = join_paths(prefix, get_option('libexecdir')) + + genpeimg = find_program ('genpeimg', required: get_option('genpeimg')) + ++python3path = get_option('python') ++if python3path == '' ++ python3 = import('python').find_installation('python3') ++else ++ python3 = find_program(python3path) ++endif ++ + efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') + host_cpu = host_machine.cpu_family() + if host_cpu == 'x86' +diff --git a/meson_options.txt b/meson_options.txt +index 588ae29..5f6f521 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -8,3 +8,4 @@ option('efi_sbat_distro_pkgname', type : 'string', value : '', description : 'SB + option('efi_sbat_distro_version', type : 'string', value : '', description : 'SBAT distribution version, e.g. fwupd-1.5.6.fc33') + option('efi_sbat_distro_url', type : 'string', value : '', description : 'SBAT distribution URL, e.g. https://src.fedoraproject.org/rpms/fwupd') + option('genpeimg', type : 'feature', description : 'Use genpeimg to add NX support to binaries') ++option('python', type : 'string', description : 'the absolute path of the python3 binary') +-- +2.34.1 + diff --git a/package/fwupd-efi/Config.in b/package/fwupd-efi/Config.in new file mode 100644 index 00000000000..7d3ad6a4a8d --- /dev/null +++ b/package/fwupd-efi/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_FWUPD_EFI + bool "fwupd-efi" + depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS + select BR2_PACKAGE_GNU_EFI + select BR2_PACKAGE_HOST_PYTHON_USWID + help + EFI Application used by uefi-capsule plugin in fwupd. + + https://github.com/fwupd/fwupd-efi diff --git a/package/fwupd-efi/fwupd-efi.hash b/package/fwupd-efi/fwupd-efi.hash new file mode 100644 index 00000000000..35dc9625cae --- /dev/null +++ b/package/fwupd-efi/fwupd-efi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 afd0805a2ad081a7caff2ef5bc004ce3a0147b538015e8eca966341716b1260e fwupd-efi-1.6.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/fwupd-efi/fwupd-efi.mk b/package/fwupd-efi/fwupd-efi.mk new file mode 100644 index 00000000000..45eeb8d8249 --- /dev/null +++ b/package/fwupd-efi/fwupd-efi.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# fwupd-efi +# +################################################################################ + +FWUPD_EFI_VERSION = 1.6 +FWUPD_EFI_SITE = https://github.com/fwupd/fwupd-efi/releases/download/$(FWUPD_EFI_VERSION) +FWUPD_EFI_SOURCE = fwupd-efi-$(FWUPD_EFI_VERSION).tar.xz +FWUPD_EFI_LICENSE = LGPL-2.1+ +FWUPD_EFI_LICENSE_FILES = COPYING +FWUPD_EFI_INSTALL_STAGING = YES +FWUPD_EFI_DEPENDENCIES = host-python-pefile host-python-uswid gnu-efi +FWUPD_EFI_CONF_OPTS = \ + -Defi-libdir=$(STAGING_DIR)/usr/lib \ + -Defi-ldsdir=$(STAGING_DIR)/usr/lib \ + -Defi-includedir=$(STAGING_DIR)/usr/include/efi \ + -Defi_sbat_fwupd_generation=1 \ + -Defi_sbat_distro_id=buildroot \ + -Defi_sbat_distro_summary=Buildroot \ + -Defi_sbat_distro_pkgname=fwupd-efi \ + -Defi_sbat_distro_version=fwupd-efi-$(FWUPD_EFI_VERSION) \ + -Defi_sbat_distro_url=https://gitlab.com/buildroot.org/buildroot/-/tree/master/package/fwupd-efi \ + -Dgenpeimg=disabled \ + -Dpython="$(HOST_DIR)/bin/python3" +FWUPD_EFI_MESON_EXTRA_BINARIES = objcopy='$(TARGET_OBJCOPY)' + +$(eval $(meson-package)) From 648478ee858d248f5a9a17874d8a774565de691d Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Feb 2024 18:09:54 +0100 Subject: [PATCH 2153/3013] support/testing: add new python-ruamel-yaml runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 21da0df09db09700948c27782d0bb446a0ad66f8) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ .../package/sample_python_ruamel_yaml.py | 27 +++++++++++++++++++ .../tests/package/test_python_ruamel_yaml.py | 12 +++++++++ 3 files changed, 41 insertions(+) create mode 100644 support/testing/tests/package/sample_python_ruamel_yaml.py create mode 100644 support/testing/tests/package/test_python_ruamel_yaml.py diff --git a/DEVELOPERS b/DEVELOPERS index 2a25cc6c2f8..8243bca10b2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2150,7 +2150,9 @@ F: utils/diffconfig N: Marcus Hoffmann F: package/python-jc/ F: support/testing/tests/package/test_python_fastapi.py +F: support/testing/tests/package/test_python_ruamel_yaml.py F: support/testing/tests/package/sample_python_fastapi.py +F: support/testing/tests/package/sample_python_ruamel_yaml.py N: Marek Belisko F: package/libatasmart/ diff --git a/support/testing/tests/package/sample_python_ruamel_yaml.py b/support/testing/tests/package/sample_python_ruamel_yaml.py new file mode 100644 index 00000000000..5b3a0794714 --- /dev/null +++ b/support/testing/tests/package/sample_python_ruamel_yaml.py @@ -0,0 +1,27 @@ +from ruamel.yaml import YAML + +yaml_text = """ +Rootkey: + - ListEntry +AnotherRootKey: some-string + +ListRoot: + - float-value: '1.0' + int-value: 10234 + NestedList: + - 1 + - 2 + + - another-float: '1.1' + another-int: 1111 + +OneMoreRootKey: 9.99 +""" + +# Tests the pure python based implementation +yaml = YAML(typ='safe', pure=True) + +parsed = yaml.load(yaml_text) + +assert parsed['OneMoreRootKey'] == 9.99 +assert parsed['ListRoot'][1]['another-int'] == 1111 diff --git a/support/testing/tests/package/test_python_ruamel_yaml.py b/support/testing/tests/package/test_python_ruamel_yaml.py new file mode 100644 index 00000000000..15062b4455d --- /dev/null +++ b/support/testing/tests/package/test_python_ruamel_yaml.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3RuamelYaml(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_RUAMEL_YAML=y + """ + sample_scripts = ["tests/package/sample_python_ruamel_yaml.py"] + timeout = 40 From 0aa79675651636900bfb95d6673a50ac213010cf Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 21:44:39 +0200 Subject: [PATCH 2154/3013] package/qt5/qt5webkit: fix patch fuzz Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, qt5webkit fails to build with output: Applying 0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch using patch: patching file Source/WTF/wtf/glib/GRefPtr.h Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file Source/WTF/wtf/glib/GRefPtr.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 6d0cce7dab6cbfad02edd27254b548948612432e) Signed-off-by: Peter Korsgaard --- ...Remove-invalid-g_object-declarations-to-fix-build-wi.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch index 48605e4fe4f..e3a1faec9c9 100644 --- a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch +++ b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch @@ -8,6 +8,8 @@ g_object_ref_sink is defined as a macro meanwhile and so the build fails. Just remove the declarations, glib.h is included anyway. Signed-off-by: James Hilliard [Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058] +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Source/WTF/wtf/glib/GRefPtr.h | 3 --- 1 file changed, 3 deletions(-) @@ -17,8 +19,8 @@ index 06133d82cb35..d9a1d2f145f5 100644 --- a/Source/WTF/wtf/glib/GRefPtr.h +++ b/Source/WTF/wtf/glib/GRefPtr.h @@ -29,9 +29,6 @@ + #include #include - #include -extern "C" void g_object_unref(gpointer); -extern "C" gpointer g_object_ref_sink(gpointer); From 4ec45eda0ed47458e6e667f05e9dfb9aabf3bcb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Wed, 13 Mar 2024 23:46:09 +0100 Subject: [PATCH 2155/3013] package/qt5/qt5webkit: fix JavaScriptCore parser error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5webkit build currently fails with the following error: [...] parser.rb:587:in `block in parseSequence': undefined method `=~' for an instance of Annotation (NoMethodError) from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:654:in `block in parseSequence' from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:780:in `block in parseSequence' from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:625:in `block in parseSequence' from :187:in `loop' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse' from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:68:in `
' This issue is due to =~ being marked as deprecated since a few Ruby versions, and finally removed in 3.2.0 [1]. This now breaks the build since buildroot has moved to Ruby v3.3.0. The corresponding fix has already been issued in upstream Webkit project [2], but qt5webkit version tracked in buildroot does not have the corresponding webkit version pulled. Fix this build error by bringing the upstream patch. The patch is slightly modified (exclude part about Changelog file, which is absent from qt5webkit) Fixes: http://autobuild.buildroot.net/results/21397b110fe02e5711ecb1d35be2108221751b0a/ [1] https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ [2] https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef Signed-off-by: Alexis Lothoré Signed-off-by: Thomas Petazzoni (cherry picked from commit 51ef6691ac3b18c3a6738535c7ec7c9e3a401bc1) Signed-off-by: Peter Korsgaard --- ...ngs-with-newer-Ruby-versions-https-b.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch diff --git a/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch b/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch new file mode 100644 index 00000000000..c8e339c5f80 --- /dev/null +++ b/package/qt5/qt5webkit/0007-Offlineasm-warnings-with-newer-Ruby-versions-https-b.patch @@ -0,0 +1,48 @@ +From 47e03d4af292805bf304f09e34333b38a94c1789 Mon Sep 17 00:00:00 2001 +From: "aperez@igalia.com" +Date: Wed, 15 Jan 2020 22:15:38 +0000 +Subject: [PATCH] Offlineasm warnings with newer Ruby versions + https://bugs.webkit.org/show_bug.cgi?id=206233 + +Reviewed by Yusuke Suzuki. + +Avoid a warning about using Object#=~ on Annotation instances, which +has been deprecated in Ruby 2.7. + +* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator +to Annotation instances, which do not define it. + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc +Upstream: https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef +Signed-off-by: Alexis Lothoré +--- + Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb +index b4451124521f..cd1cffaec6ed 100644 +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -584,9 +584,7 @@ class Parser + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -600,6 +598,8 @@ class Parser + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 +-- +2.43.1 + From b72162e8068f2e611e4d692afb6da840cd969a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Wed, 13 Mar 2024 23:46:10 +0100 Subject: [PATCH 2156/3013] package/qt5/qt5webkit: fix WebCore compatibility issue with updated libxml2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5webkit build currently breaks on the following error: XSLStyleSheetLibxslt.cpp:148:129: error: invalid conversion from ‘void (*)(void*, xmlError*)’ {aka ‘void (*)(void*, _xmlError*)’} to ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void*, const _xmlError*)’} [-fpermissive] 148 | XMLDocumentParserScope scope(cachedResourceLoader(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console); | ^ | | | void (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)} This error is due to an API update in libxml2, enforcing const on more struct in version 2.12.0 (see [1]). Buildroot now tracks v2.12.5. Upstream Webkit project has already issued the corresponding fix ([2]), which updates corresponding internal prototypes depending on libxml2 version, but the qt5webkit version tracked in buildroot does not integrate the corresponding Webkit version. Fix this build issue by bringing the upstream patch "as is" from Webkit No autobuilder references because this build error was hidden by another build error fixed in a previous patch. [1] https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0 [2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b Signed-off-by: Alexis Lothoré Signed-off-by: Thomas Petazzoni (cherry picked from commit e24a11738896118870037d89ccd64d2fa331e15e) Signed-off-by: Peter Korsgaard --- ...-libxml2-version-2.12.0-due-to-API-c.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch diff --git a/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch b/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch new file mode 100644 index 00000000000..d6f379ae8ec --- /dev/null +++ b/package/qt5/qt5webkit/0008-Build-fails-with-libxml2-version-2.12.0-due-to-API-c.patch @@ -0,0 +1,61 @@ +From df49bfc4c93001970c9b9266903ee7e8804fb576 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 20 Nov 2023 07:42:30 -0800 +Subject: [PATCH] Build fails with libxml2 version 2.12.0 due to API change + https://bugs.webkit.org/show_bug.cgi?id=265128 + +Reviewed by Philippe Normand. + +Starting with libxml2 2.12.0, the API has changed the const-ness of the +xmlError pointers, which results in a build error due to a mismatched +type in the parsing error callback. This papers over the difference by +using preprocessor conditionals. + +* Source/WebCore/xml/XSLTProcessor.h: Use const when building against + libxml2 2.12.0 or newer. +* Source/WebCore/xml/XSLTProcessorLibxslt.cpp: +(WebCore::XSLTProcessor::parseErrorFunc): Ditto. + +Canonical link: https://commits.webkit.org/270977@main +Upstream: https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b +Signed-off-by: Alexis Lothoré +--- + Source/WebCore/xml/XSLTProcessor.h | 4 ++++ + Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h +index 21bb45b5cbe1..5cf20557918f 100644 +--- a/Source/WebCore/xml/XSLTProcessor.h ++++ b/Source/WebCore/xml/XSLTProcessor.h +@@ -61,7 +61,11 @@ public: + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void parseErrorFunc(void* userData, const xmlError*); ++#else + static void parseErrorFunc(void* userData, xmlError*); ++#endif + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks +diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +index a65691087e3c..9f6b363dfc6c 100644 +--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp ++++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +@@ -59,7 +59,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...) + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) ++#else + void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++#endif + { + PageConsoleClient* console = static_cast(userData); + if (!console) +-- +2.43.1 + From 0eb1ea8cb52cd9ea080aa113646e3656ce66b97f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 22 Jun 2024 20:04:32 +0200 Subject: [PATCH 2157/3013] configs/stm32mp157a_dk1: add hashes The patch adds .hash files for Arm trusted firmware, Linux, Linux headers and U-Boot and then enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 751228436a4c68bc440a2f9dd1ef12ceb861765c) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../stm32mp157a-dk1/patches/linux-headers/linux-headers.hash | 1 + .../stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash | 2 ++ .../stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash | 2 ++ configs/stm32mp157a_dk1_defconfig | 2 ++ 6 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash create mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash create mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index ee44e82f5bb..631e1d9da55 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -331,7 +331,6 @@ configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash configs/stm32f469_disco_sd_defconfig lib_defconfig.ForceCheckHash configs/stm32f469_disco_xip_defconfig lib_defconfig.ForceCheckHash -configs/stm32mp157a_dk1_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash configs/terasic_de10nano_cyclone5_defconfig lib_defconfig.ForceCheckHash diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..97c4500711f --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 068325043b7c8ecc47ebb8b4f241f01e86d3f69dc49a63f340aa94bd41a9e6df arm-trusted-firmware/arm-trusted-firmware-lts-v2.8.16.tar.gz diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash new file mode 100644 index 00000000000..8b7624cceb9 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9 linux-5.13.tar.xz diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash new file mode 100644 index 00000000000..7cef5b688ec --- /dev/null +++ b/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 u-boot-2023.04.tar.bz2 diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index aed6cfad343..38f7bc8946c 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -6,6 +6,8 @@ BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y # System configuration +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32mp157a-dk1/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" From 629869f2dd4334acef6e0d3ad5ab69f718c442c6 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 12 Jul 2024 15:37:19 +0200 Subject: [PATCH 2158/3013] .checkpackageignore: remove chromebook check-hash exceptions Commits 3988f2d9238bc027b5d16219867e8d3c701c0c06 and 0d91281d7bdfa09be28237bab694e6ac22466541 added hashes for the chromebook defconfigs, but forgot to remove the exception from .checkpackageignore. Regenerate .checkpackageignore, which removes those exceptions. Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5e36efd7ac994ed430bc2430ee0c03d44f0cbbff) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 631e1d9da55..1faaba74318 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -148,8 +148,6 @@ configs/beaglev_defconfig lib_defconfig.ForceCheckHash configs/beelink_gs1_defconfig lib_defconfig.ForceCheckHash configs/broadcom_northstar_defconfig lib_defconfig.ForceCheckHash configs/canaan_kd233_defconfig lib_defconfig.ForceCheckHash -configs/chromebook_elm_defconfig lib_defconfig.ForceCheckHash -configs/chromebook_snow_defconfig lib_defconfig.ForceCheckHash configs/ci20_defconfig lib_defconfig.ForceCheckHash configs/cubieboard2_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6qdl_icore_defconfig lib_defconfig.ForceCheckHash From 47c331f0da56580912c6187b69f989fb65bdc88d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 27 Jun 2024 10:02:04 +0200 Subject: [PATCH 2159/3013] package/dump1090: fix build with GCC 14 Fixes http://autobuild.buildroot.net/results/1d5804974153f96e80f5200793ec8cd12c9fa18a/ GCC 14 complains if the arguments to calloc (nmemb, size) are swapped around, causing a build failure as dump1090 builds with -Werror: net_io.c:107:34: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] 107 | if (!(service = calloc(sizeof(*service), 1))) { Add a patch from an upstream pull request to fix that. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit fd358b97c053af9e45fcb94e59ade63b4d895f10) Signed-off-by: Peter Korsgaard --- .../0001-swap-size-arguments-to-calloc.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/dump1090/0001-swap-size-arguments-to-calloc.patch diff --git a/package/dump1090/0001-swap-size-arguments-to-calloc.patch b/package/dump1090/0001-swap-size-arguments-to-calloc.patch new file mode 100644 index 00000000000..1c2d502793b --- /dev/null +++ b/package/dump1090/0001-swap-size-arguments-to-calloc.patch @@ -0,0 +1,43 @@ +From be8f5b7ab1223076ba0086f14aeeb53ace2d4b5c Mon Sep 17 00:00:00 2001 +From: Jeff Lawson +Date: Tue, 18 Jun 2024 15:58:24 +0000 +Subject: [PATCH] swap size arguments to calloc + +fixes #241 + +Signed-off-by: Peter Korsgaard +Upstream: https://github.com/flightaware/dump1090/pull/243 +--- + adaptive.c | 2 +- + net_io.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/adaptive.c b/adaptive.c +index f16e16c..d656433 100644 +--- a/adaptive.c ++++ b/adaptive.c +@@ -195,7 +195,7 @@ void adaptive_init() + adaptive_burst_window_remaining = adaptive_samples_per_window; + adaptive_burst_window_counter = 0; + +- adaptive_range_radix = calloc(sizeof(unsigned), 65536); ++ adaptive_range_radix = calloc(65536, sizeof(unsigned)); + adaptive_range_state = RANGE_RESCAN_UP; + + // select and enforce gain limits +diff --git a/net_io.c b/net_io.c +index bf98028..8abd510 100644 +--- a/net_io.c ++++ b/net_io.c +@@ -104,7 +104,7 @@ struct net_service *serviceInit(const char *descr, struct net_writer *writer, he + { + struct net_service *service; + +- if (!(service = calloc(sizeof(*service), 1))) { ++ if (!(service = calloc(1, sizeof(*service)))) { + fprintf(stderr, "Out of memory allocating service %s\n", descr); + exit(1); + } +-- +2.39.2 + From 0cab1602a01d5a60f0450776eb75d10fdff0520a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 9 Jun 2024 21:55:19 +0200 Subject: [PATCH 2160/3013] package/bcc: add missing dependencies to comment Since its inception in 146498d13c48 (package/bcc: new package), not all the dependencies of bcc are mirrored in the comment to be displayed when those dependencies are not met. Fix that by adding the missing pieces: - wchar, - threads - dynamic libs, Signed-off-by: Yann E. MORIN Cc: Jugurtha BELKALEM Cc: Romain Naour Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit 76051e653199f8f6c20afa0c28496c7d8cfcb527) Signed-off-by: Peter Korsgaard --- package/bcc/Config.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/bcc/Config.in b/package/bcc/Config.in index b91e0e5ee3d..bf46f07d936 100644 --- a/package/bcc/Config.in +++ b/package/bcc/Config.in @@ -38,8 +38,13 @@ config BR2_PACKAGE_BCC https://github.com/iovisor/bcc http://www.ebpf.io -comment "bcc needs a glibc toolchain, C++, gcc >= 7, host gcc >= 7" +comment "bcc needs a glibc toolchain, C++, wchar, threads, dynamic libs, gcc >= 7, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_HOST_GCC_AT_LEAST_7 + depends on !BR2_TOOLCHAIN_USES_GLIBC \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_HOST_GCC_AT_LEAST_7 \ + || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS From ec0bad566a72c42bdeeacbc5181fd9cafb251da8 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 19 Apr 2024 23:32:16 +0200 Subject: [PATCH 2161/3013] package/pkg-python: fix pep517 data files installation When installing a wheel in pep517 compatibility mode, the pyinstaller.py is invoked with the --data parameter which point to the directory in which data files should be installed. Actually the --data parameter points to the /usr subdirectory which is indeed wrong cause it shall point to the root directory where the wheel will be installed. This fixes the problem of having configuration files installed in /usr/etc instead of /etc. Signed-off-by: Angelo Compagnucci Tested-by: Fiona Klute Signed-off-by: Arnout Vandecappelle (cherry picked from commit 98f452f97425c76a9404692530b585cd950dd1fd) Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 88fadecd549..2a85a04b7c3 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -67,7 +67,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ - --data=$(TARGET_DIR)/usr + --data=$(TARGET_DIR) PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ $(TOPDIR)/support/scripts/pyinstaller.py \ @@ -76,7 +76,7 @@ PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ - --data=$(STAGING_DIR)/usr + --data=$(STAGING_DIR) PKG_PYTHON_PEP517_DEPENDENCIES = \ host-python-pypa-build \ From cf9b5e669c448270608fa829d0270302b67bd6b2 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 19 Apr 2024 23:32:15 +0200 Subject: [PATCH 2162/3013] package/fail2ban: fix data_files installation path When packaging data_files in a wheel, those files shall have the destination path expressed as relative to the wheel installation. The reason for that is the wheel installation shall be contained inside a specific folder and/or in site-packages. When building the wheel file by the bdist_wheel command, python will package files with absolute paths as python files ending up installing them in site-packages. Fixes: http://autobuild.buildroot.net/results/36ac5278d19195a21c3d02d087965e08f49228ef Signed-off-by: Angelo Compagnucci Tested-by: Fiona Klute [Arnout: add Upstream tag to the patch] Signed-off-by: Arnout Vandecappelle (cherry picked from commit c90b87156dec69c9acabb8bd80d2447a5dbfb1e8) Signed-off-by: Peter Korsgaard --- ...001-setup.py-fix-data-relative-paths.patch | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 package/fail2ban/0001-setup.py-fix-data-relative-paths.patch diff --git a/package/fail2ban/0001-setup.py-fix-data-relative-paths.patch b/package/fail2ban/0001-setup.py-fix-data-relative-paths.patch new file mode 100644 index 00000000000..75bd9aaface --- /dev/null +++ b/package/fail2ban/0001-setup.py-fix-data-relative-paths.patch @@ -0,0 +1,74 @@ +From 7b7fa3c02d4575c09362336bc310835c37859f1a Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Fri, 19 Apr 2024 22:47:20 +0200 +Subject: [PATCH] setup.py: fix data relative paths +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As per distutils documentation: + +The directory should be a relative path. It is interpreted relative to the +installation prefix (Python’s sys.prefix for system installations; +site.USER_BASE for user installations). Distutils allows directory to be an +absolute installation path, but this is discouraged since it is incompatible +with the wheel packaging format [1]. + +When packaging to a bdist_wheel indeed, the files in the "data_files" dictionary +are not picked at all as data files if they have an absolute path, +but they are instead added to the wheel as python files. +This has the effect of installing them as part of python files in the +site-packages folder when the wheel is installed. + +This patch cannot be sent upstream because it breaks the legacy way of +installing the package with *python setup.py install* and it is needed only to +comply with the pep517 buildroot compatibility layer. + +[1] https://docs.python.org/3.10/distutils/setupscript.html#installing-additional-files +Signed-off-by: Angelo Compagnucci +Upstream: N/A [breaks traditional setuptools installation] +--- + setup.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 91f71cf2..99ba2e32 100755 +--- a/setup.py ++++ b/setup.py +@@ -238,26 +238,26 @@ setup( + for f in w[2]] + } if with_tests else {}, + data_files = [ +- ('/etc/fail2ban', ++ ('etc/fail2ban', + glob("config/*.conf") + ), +- ('/etc/fail2ban/filter.d', ++ ('etc/fail2ban/filter.d', + glob("config/filter.d/*.conf") + ), +- ('/etc/fail2ban/filter.d/ignorecommands', ++ ('etc/fail2ban/filter.d/ignorecommands', + [p for p in glob("config/filter.d/ignorecommands/*") if isfile(p)] + ), +- ('/etc/fail2ban/action.d', ++ ('etc/fail2ban/action.d', + glob("config/action.d/*.conf") + + glob("config/action.d/*.py") + ), +- ('/etc/fail2ban/fail2ban.d', ++ ('etc/fail2ban/fail2ban.d', + '' + ), +- ('/etc/fail2ban/jail.d', ++ ('etc/fail2ban/jail.d', + '' + ), +- ('/var/lib/fail2ban', ++ ('var/lib/fail2ban', + '' + ), + ] + data_files_extra, +-- +2.34.1 + From 6c995cb48e66e2f714f2dd0f7acd7a0a4e754e9c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 2 Jun 2024 01:03:40 +0200 Subject: [PATCH 2163/3013] support/testing: add mosquitto runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 3ba6f800fdc2435d09aca215ef2e8aefb3165bff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + .../testing/tests/package/test_mosquitto.py | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 support/testing/tests/package/test_mosquitto.py diff --git a/DEVELOPERS b/DEVELOPERS index 8243bca10b2..7bb7b371ff7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1863,6 +1863,7 @@ F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py F: support/testing/tests/package/test_micropython/ +F: support/testing/tests/package/test_mosquitto.py F: support/testing/tests/package/test_mtools.py F: support/testing/tests/package/test_mtr.py F: support/testing/tests/package/test_ncdu.py diff --git a/support/testing/tests/package/test_mosquitto.py b/support/testing/tests/package/test_mosquitto.py new file mode 100644 index 00000000000..ba10b30b00b --- /dev/null +++ b/support/testing/tests/package/test_mosquitto.py @@ -0,0 +1,38 @@ +import os +import time + +import infra.basetest + + +class TestMosquitto(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MOSQUITTO=y + BR2_PACKAGE_MOSQUITTO_BROKER=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + topic = "br-test-topic" + log = "mqtt.log" + msg = "Hello Buildroot!" + + # We subscribe to a topic and write one message to a log file. + self.assertRunOk(f"mosquitto_sub -t {topic} -C 1 > {log} &") + + time.sleep(1) + + # We publish a message. + self.assertRunOk(f"mosquitto_pub -t {topic} -m '{msg}'") + + # We check the log file contains our message. + out, ret = self.emulator.run(f"cat {log}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) From 3ec6223b14f70beca551c5551d22f118db54c2aa Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 19 Jul 2024 00:32:35 -0600 Subject: [PATCH 2164/3013] package/fwupd: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...devdir-when-gudev-support-is-enabled.patch | 35 +++ package/fwupd/Config.in | 19 ++ package/fwupd/fwupd.hash | 3 + package/fwupd/fwupd.mk | 208 ++++++++++++++++++ 6 files changed, 267 insertions(+) create mode 100644 package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch create mode 100644 package/fwupd/Config.in create mode 100644 package/fwupd/fwupd.hash create mode 100644 package/fwupd/fwupd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 709f658a388..092397adcb6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1491,6 +1491,7 @@ F: package/apcupsd/ F: package/bpftool/ F: package/cloudflared/ F: package/exfatprogs/ +F: package/fwupd/ F: package/fwupd-efi/ F: package/fxdiv/ F: package/gensio/ diff --git a/package/Config.in b/package/Config.in index 3d638b111f7..e04cdae1e5e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -519,6 +519,7 @@ endmenu source "package/fmtools/Config.in" source "package/freeipmi/Config.in" source "package/freescale-imx/Config.in" + source "package/fwupd/Config.in" source "package/fwupd-efi/Config.in" source "package/fxload/Config.in" source "package/gcnano-binaries/Config.in" diff --git a/package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch b/package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch new file mode 100644 index 00000000000..0f145085163 --- /dev/null +++ b/package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch @@ -0,0 +1,35 @@ +From a784ef9b904778b511a6284f46d983906939de6c Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 18 Jul 2024 09:44:15 -0600 +Subject: [PATCH] Only require udevdir when gudev support is enabled + +Signed-off-by: James Hilliard +Upstream: https://github.com/fwupd/fwupd/commit/a784ef9b904778b511a6284f46d983906939de6c +--- + meson.build | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 22282d73e..f49d08d29 100644 +--- a/meson.build ++++ b/meson.build +@@ -273,10 +273,12 @@ if build_daemon + if not polkit.found() + warning('Polkit is disabled, the daemon will allow ALL client actions') + endif +- udevdir = get_option('udevdir') +- if udevdir == '' and host_machine.system() == 'linux' +- udev = dependency('udev') +- udevdir = udev.get_variable(pkgconfig: 'udevdir') ++ if gudev.found() ++ udevdir = get_option('udevdir') ++ if udevdir == '' and host_machine.system() == 'linux' ++ udev = dependency('udev') ++ udevdir = udev.get_variable(pkgconfig: 'udevdir') ++ endif + endif + endif + libm = cc.find_library('m', required: false) +-- +2.34.1 + diff --git a/package/fwupd/Config.in b/package/fwupd/Config.in new file mode 100644 index 00000000000..6a96358e5b9 --- /dev/null +++ b/package/fwupd/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_FWUPD + bool "fwupd" + depends on !BR2_STATIC_LIBS # libxmlb + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBJCAT + select BR2_PACKAGE_LIBXMLB + select BR2_PACKAGE_ZLIB + help + Fwupd is a simple daemon to allow session software + to update device firmware on your local machine. + + https://fwupd.org/ + +comment "fwupd needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fwupd/fwupd.hash b/package/fwupd/fwupd.hash new file mode 100644 index 00000000000..8da9dc3c667 --- /dev/null +++ b/package/fwupd/fwupd.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b86a2d7fe1b6cc0ac4f75f3351a78cb3c225880c9e20b932fa078ef472e9fcb2 fwupd-1.9.20.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/fwupd/fwupd.mk b/package/fwupd/fwupd.mk new file mode 100644 index 00000000000..9283eb43aa7 --- /dev/null +++ b/package/fwupd/fwupd.mk @@ -0,0 +1,208 @@ +################################################################################ +# +# fwupd +# +################################################################################ + +FWUPD_VERSION = 1.9.20 +FWUPD_SITE = https://github.com/fwupd/fwupd/releases/download/$(FWUPD_VERSION) +FWUPD_SOURCE = fwupd-$(FWUPD_VERSION).tar.xz +FWUPD_LICENSE = LGPL-2.1+ +FWUPD_LICENSE_FILES = COPYING +FWUPD_DEPENDENCIES = \ + host-pkgconf \ + host-python-jinja2 \ + libglib2 \ + libjcat \ + libxmlb \ + zlib + +FWUPD_CONF_OPTS = \ + -Dstatic_analysis=false \ + -Dconsolekit=disabled \ + -Dfirmware-packager=true \ + -Ddocs=disabled \ + -Dlvfs=true \ + -Dman=false \ + -Dgusb=disabled \ + -Dpassim=disabled \ + -Dp2p_policy=none \ + -Dcbor=disabled \ + -Dplugin_acpi_phat=enabled \ + -Dplugin_cfu=disabled \ + -Dplugin_ep963x=enabled \ + -Dplugin_fastboot=disabled \ + -Dplugin_logitech_bulkcontroller=disabled \ + -Dplugin_logitech_scribe=disabled \ + -Dplugin_logitech_tap=disabled \ + -Dplugin_pixart_rf=enabled \ + -Dplugin_tpm=disabled \ + -Dplugin_uefi_capsule=enabled \ + -Dplugin_uefi_capsule_splash=false \ + -Dplugin_nitrokey=enabled \ + -Dplugin_mtd=enabled \ + -Dplugin_intel_me=enabled \ + -Dplugin_upower=enabled \ + -Dplugin_powerd=enabled \ + -Dqubes=false \ + -Dsupported_build=enabled \ + -Dlaunchd=disabled \ + -Dtests=false \ + -Dmetainfo=true \ + -Dfish_completion=false \ + -Dcompat_cli=false \ + -Dthinklmi_compat=false \ + -Dpython="$(HOST_DIR)/bin/python3" + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +FWUPD_DEPENDENCIES += gobject-introspection +FWUPD_CONF_OPTS += -Dintrospection=enabled +else +FWUPD_CONF_OPTS += -Dintrospection=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +FWUPD_DEPENDENCIES += libarchive +FWUPD_CONF_OPTS += -Dlibarchive=enabled +else +FWUPD_CONF_OPTS += -Dlibarchive=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +FWUPD_DEPENDENCIES += libgudev +FWUPD_CONF_OPTS += \ + -Dgudev=enabled \ + -Dplugin_android_boot=enabled \ + -Dplugin_bcm57xx=enabled \ + -Dplugin_emmc=enabled \ + -Dplugin_gpio=enabled \ + -Dplugin_igsc=enabled \ + -Dplugin_kinetic_dp=enabled \ + -Dplugin_parade_lspcon=enabled \ + -Dplugin_realtek_mst=enabled \ + -Dplugin_synaptics_mst=enabled \ + -Dplugin_mediatek_scaler=enabled \ + -Dplugin_scsi=enabled \ + -Dplugin_nvme=enabled \ + -Dplugin_uf2=enabled +else +FWUPD_CONF_OPTS += \ + -Dgudev=disabled \ + -Dplugin_android_boot=disabled \ + -Dplugin_bcm57xx=disabled \ + -Dplugin_emmc=disabled \ + -Dplugin_gpio=disabled \ + -Dplugin_igsc=disabled \ + -Dplugin_kinetic_dp=disabled \ + -Dplugin_parade_lspcon=disabled \ + -Dplugin_realtek_mst=disabled \ + -Dplugin_synaptics_mst=disabled \ + -Dplugin_mediatek_scaler=disabled \ + -Dplugin_scsi=disabled \ + -Dplugin_nvme=disabled \ + -Dplugin_uf2=disabled +endif + +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +FWUPD_DEPENDENCIES += bluez5_utils +FWUPD_CONF_OPTS += -Dbluez=enabled +else +FWUPD_CONF_OPTS += -Dbluez=disabled +endif + +ifeq ($(BR2_PACKAGE_POLKIT),y) +FWUPD_DEPENDENCIES += polkit +FWUPD_CONF_OPTS += -Dpolkit=enabled +else +FWUPD_CONF_OPTS += -Dpolkit=disabled +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +FWUPD_DEPENDENCIES += gnutls +FWUPD_CONF_OPTS += -Dgnutls=enabled -Dplugin_uefi_pk=enabled +else +FWUPD_CONF_OPTS += -Dgnutls=disabled -Dplugin_uefi_pk=disabled +endif + +ifeq ($(BR2_PACKAGE_SQLITE),y) +FWUPD_DEPENDENCIES += sqlite +FWUPD_CONF_OPTS += -Dsqlite=enabled +else +FWUPD_CONF_OPTS += -Dsqlite=disabled +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +FWUPD_DEPENDENCIES += xz +FWUPD_CONF_OPTS += -Dlzma=enabled +ifeq ($(BR2_i386)$(BR2_x86_64),y) +FWUPD_CONF_OPTS += -Dplugin_intel_spi=true +else +FWUPD_CONF_OPTS += -Dplugin_intel_spi=false +endif +else +FWUPD_CONF_OPTS += -Dlzma=disabled -Dplugin_intel_spi=false +endif + +ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU)$(BR2_PACKAGE_LIBGUDEV),yy) +FWUPD_DEPENDENCIES += libdrm libgudev +FWUPD_CONF_OPTS += -Dplugin_amdgpu=enabled +else +FWUPD_CONF_OPTS += -Dplugin_amdgpu=disabled +endif + +ifeq ($(BR2_i386)$(BR2_x86_64),y) +FWUPD_CONF_OPTS += -Dplugin_cpu=enabled -Dplugin_msr=enabled -Dhsi=enabled +else +FWUPD_CONF_OPTS += -Dplugin_cpu=disabled -Dplugin_msr=disabled -Dhsi=disabled +endif + +ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGUDEV),yy) +FWUPD_DEPENDENCIES += gnutls libgudev +FWUPD_CONF_OPTS += -Dplugin_synaptics_rmi=enabled +else +FWUPD_CONF_OPTS += -Dplugin_synaptics_rmi=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +FWUPD_DEPENDENCIES += libcurl +FWUPD_CONF_OPTS += -Dplugin_redfish=enabled -Dcurl=enabled +else +FWUPD_CONF_OPTS += -Dplugin_redfish=disabled -Dcurl=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGUDEV)$(BR2_PACKAGE_LIBMBIM)$(BR2_PACKAGE_LIBQMI)$(BR2_PACKAGE_MODEM_MANAGER),yyyy) +FWUPD_DEPENDENCIES += libgudev libmbim libqmi modem-manager +FWUPD_CONF_OPTS += -Dplugin_modem_manager=enabled +else +FWUPD_CONF_OPTS += -Dplugin_modem_manager=disabled +endif + +ifeq ($(BR2_PACKAGE_FLASHROM),y) +FWUPD_DEPENDENCIES += flashrom +FWUPD_CONF_OPTS += -Dplugin_flashrom=enabled +else +FWUPD_CONF_OPTS += -Dplugin_flashrom=disabled +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +FWUPD_DEPENDENCIES += systemd +FWUPD_CONF_OPTS += -Dsystemd=enabled -Delogind=enabled -Doffline=enabled +else +FWUPD_CONF_OPTS += -Dsystemd=disabled -Delogind=disabled -Doffline=disabled +endif + +ifeq ($(BR2_PACKAGE_FWUPD_EFI),y) +FWUPD_DEPENDENCIES += fwupd-efi +FWUPD_CONF_OPTS += -Defi_binary=true +else +FWUPD_CONF_OPTS += -Defi_binary=false +endif + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +FWUPD_DEPENDENCIES += bash-completion +FWUPD_CONF_OPTS += -Dbash_completion=true +else +FWUPD_CONF_OPTS += -Dbash_completion=false +endif + +$(eval $(meson-package)) From 1c11f9020ad98db11e6d67066d0fdb2cfab27605 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 22:31:43 +0200 Subject: [PATCH 2165/3013] package/btrfs-progs: bump version to 6.10 For change log since v6.9.2, see: https://github.com/kdave/btrfs-progs/blob/v6.10/CHANGES This commit also drops the two package patches, which are now included in this release. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...compat-fix-fallthrough-definition-fo.patch | 63 -------------- ...uClibc-ng-compatibility-for-printf-f.patch | 85 ------------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 4 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 package/btrfs-progs/0001-btrfs-progs-kerncompat-fix-fallthrough-definition-fo.patch delete mode 100644 package/btrfs-progs/0002-btrfs-progs-add-uClibc-ng-compatibility-for-printf-f.patch diff --git a/package/btrfs-progs/0001-btrfs-progs-kerncompat-fix-fallthrough-definition-fo.patch b/package/btrfs-progs/0001-btrfs-progs-kerncompat-fix-fallthrough-definition-fo.patch deleted file mode 100644 index 588e9d47238..00000000000 --- a/package/btrfs-progs/0001-btrfs-progs-kerncompat-fix-fallthrough-definition-fo.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0d2bf742df7f6b6d91fff8abe3c2f8b6ef0e0c01 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Sun, 14 Jul 2024 12:52:33 +0200 -Subject: [PATCH] btrfs-progs: kerncompat: fix fallthrough definition for gcc - 5.x and 6.x. - -Commit [1] 3a1d4aa089 "btrfs-progs: fix fallthrough cases with proper -attributes" introduced a macro "fallthrough" to better handle compiler -warnings of fallthrough situations. - -This macro is defined using the "__has_attribute" built-in -function-like macro, which was introduced in GCC 5. See [2]. It then -test for the "__fallthrough__" attribute, which was introduced in -GCC 7. See [3]. - -When compiling with a gcc version which supports "__has_attribute" and -not the "__fallthrough__" attribute, compilation fails with error -message: - - common/format-output.c: In function 'print_escaped': - common/format-output.c:78:4: error: 'fallthrough' undeclared (first use in this function) - fallthrough; - ^ -btrfs-progs claim to support gcc at minimal version 4.8 in [4]. - -This commit fixes this issue by adding the missing definition. - -The definition of the unsupported case is duplicated, because testing -for "__has_attribute" and an attribute at the same time is not -portable. See the cpp "__has_attribute" documentation [5]. - -Note: the issue was found with Buildroot Linux [6], while testing with -the command "utils/test-pkg -a -p btrfs-progs". - -[1] https://github.com/kdave/btrfs-progs/commit/3a1d4aa089419b7c94b31ff87122fa74907e1aa6 -[2] https://gcc.gnu.org/gcc-5/changes.html -[3] https://gcc.gnu.org/gcc-7/changes.html -[4] https://github.com/kdave/btrfs-progs/tree/v6.9.2#build-compatibility -[5] https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html -[6] https://buildroot.org/ - -Upstream: Proposed: https://github.com/kdave/btrfs-progs/pull/842 -Signed-off-by: Julien Olivain ---- - include/kerncompat.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/kerncompat.h b/include/kerncompat.h -index 31cd9d8d..bcd46bde 100644 ---- a/include/kerncompat.h -+++ b/include/kerncompat.h -@@ -305,6 +305,8 @@ static inline void up_read(struct rw_semaphore *sem) - #if defined __has_attribute - # if __has_attribute(__fallthrough__) - # define fallthrough __attribute__((__fallthrough__)) -+# else -+# define fallthrough do {} while (0) /* fallthrough */ - # endif - #else - # define fallthrough do {} while (0) /* fallthrough */ --- -2.45.2 - diff --git a/package/btrfs-progs/0002-btrfs-progs-add-uClibc-ng-compatibility-for-printf-f.patch b/package/btrfs-progs/0002-btrfs-progs-add-uClibc-ng-compatibility-for-printf-f.patch deleted file mode 100644 index b1b4fba5198..00000000000 --- a/package/btrfs-progs/0002-btrfs-progs-add-uClibc-ng-compatibility-for-printf-f.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 0f34a362c8644f212138fb8de8e0fba54941e757 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Sun, 14 Jul 2024 16:28:08 +0200 -Subject: [PATCH] btrfs-progs: add uClibc-ng compatibility for printf format - %pV - -Commit [1] 164bc10d "btrfs-progs: add musl compatibility for printf -format %pV" added a logic to detect the presence of the glibc - header, and if present, to use the -register_printf_specifier() and register_printf_modifier() functions. - -The original intent (as the commit log suggests), was to support the -musl libc, which does not provides this header. - -When compiling with another libc, such as uClibc-ng, btrfs-progs fail -to build with error: - - common/messages.c: In function 'print_va_format': - common/messages.c:51:19: error: 'const struct printf_info' has no member named 'user' - 51 | if (!(info->user & va_modifier)) - | ^~ - common/messages.c: In function 'btrfs_no_printk': - common/messages.c:76:17: warning: implicit declaration of function 'register_printf_specifier'; did you mean 'register_printf_function'? [-Wimplicit-function-declaration] - 76 | register_printf_specifier('V', print_va_format, - | ^~~~~~~~~~~~~~~~~~~~~~~~~ - | register_printf_function - common/messages.c:78:31: warning: implicit declaration of function 'register_printf_modifier'; did you mean 'register_printf_function'? [-Wimplicit-function-declaration] - 78 | va_modifier = register_printf_modifier(L"p"); - | ^~~~~~~~~~~~~~~~~~~~~~~~ - | register_printf_function - -This is because uClibc-ng provides a header, but not the -register_printf_specifier() and register_printf_modifier() functions. -See [2]. It mainly includes register_printf_function(). uClibc-ng -emulates an older glibc behavior. Glibc added support for printf user -elements in commit [3] (first included in glibc-2.10, in 2009). Checking -only the is not sufficient. - -This commit fixes this build issue by refining the detection logic of -the functions required by btrfs-progs. - -[1] https://github.com/kdave/btrfs-progs/commit/164bc10dfc08d8754d23ef0d6d7281e139d6cd53 -[2] https://gogs.waldemar-brodkorb.de/oss/uclibc-ng/src/v1.0.49/include/printf.h -[3] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=9d26efa90c6dcbcd6b3e586c9927b6058ef4d529 - -Upstream: Proposed: https://github.com/kdave/btrfs-progs/pull/843 -Signed-off-by: Julien Olivain ---- - common/messages.h | 4 +++- - configure.ac | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/common/messages.h b/common/messages.h -index d6d4044d..aced7c9b 100644 ---- a/common/messages.h -+++ b/common/messages.h -@@ -25,7 +25,9 @@ - /* - * Workaround for custom format %pV that may not be supported on all libcs. - */ --#ifdef HAVE_PRINTF_H -+#if defined(HAVE_PRINTF_H) \ -+ && defined(HAVE_REGISTER_PRINTF_SPECIFIER) \ -+ && defined(HAVE_REGISTER_PRINTF_MODIFIER) - #define DECLARE_PV(name) struct va_format name - #define PV_FMT "%pV" - #define PV_VAL(va) &va -diff --git a/configure.ac b/configure.ac -index b69973b3..62b88973 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,6 +95,10 @@ AC_CHECK_HEADERS([linux/hw_breakpoint.h]) - AC_CHECK_HEADERS([linux/fsverity.h]) - AC_CHECK_HEADERS([printf.h]) - -+dnl Check for printf.h functions. -+AC_CHECK_FUNCS([register_printf_specifier]) -+AC_CHECK_FUNCS([register_printf_modifier]) -+ - if grep -q 'HAVE_LINUX_FSVERITY_H.*1' confdefs.h; then - have_fsverity='yes' - else --- -2.45.2 - diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 082e8c1cdc1..f12c76c2eef 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 43865bb272dc0ab2585de3605434d81ba217578f0897bf700cd36c14ac40652a btrfs-progs-v6.9.2.tar.xz +sha256 3382a84e3fcfe1ffdea07a61ab3f4e86665d38fa35f1f34548d5df867423e0df btrfs-progs-v6.10.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 69424a2d729..273c7e37f2b 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 6.9.2 +BTRFS_PROGS_VERSION = 6.10 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib From b382ede065e1260582d6d27ddb34b0450fce4e5e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 22:44:53 +0200 Subject: [PATCH 2166/3013] package/freerdp: security bump version to 2.11.7 See release announce: https://www.freerdp.com/2024/04/22/2_11_7-release Note: this release is flagged as a "security" bump from the upstream release note. While there is no allocated CVEs, commits in this release are backported fixes from oss-fuzz. See: https://github.com/FreeRDP/FreeRDP/compare/2.11.6...2.11.7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 9ac9b25066a..1007215cd66 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.6.tar.gz.sha256 -sha256 ad5a0c7761b18af914041ed50902d6c9fd553e65eeba8a1bea41c4149980b84c freerdp-2.11.6.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.7.tar.gz.sha256 +sha256 5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3 freerdp-2.11.7.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 8e359cbb4f7..e8c8f320a9b 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.6 +FREERDP_VERSION = 2.11.7 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From 345f48304b553b5aed92c6f5a8a56a160f7278c9 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 23:28:24 +0200 Subject: [PATCH 2167/3013] package/fwts: bump to version 24.07.00 Release announce: https://lists.ubuntu.com/archives/fwts-devel/2024-July/013869.html For release note since 24.03.00, see: https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes/24.07.00 This commit removes the patch 0002, which is included in this new version. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...fix-parallel-build-with-GNU-Make-4.4.patch | 133 ------------------ package/fwts/fwts.hash | 2 +- package/fwts/fwts.mk | 2 +- 3 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch diff --git a/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch b/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch deleted file mode 100644 index a5568d1fd9f..00000000000 --- a/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 65a89b6253ef527ab4bc951eb8f9deba12f0121a Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Mon, 20 May 2024 11:14:02 +0200 -Subject: [PATCH] libfwtsiasl: fix parallel build with GNU Make >= 4.4 - -When a build host has a large number of cores (like 20+) and GNU Make -version is >= 4.4, fwts randomly fail to build in parallel, with a -"make -j$(nproc)" command, with error: - - mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory - mv: cannot stat 'prparser.tab.c': No such file or directory - -This issue has been reported here: -https://github.com/fwts/fwts/issues/7 - -The Makefile.am of libfwtsiasl is using the GNU Make ".NOTPARALLEL" -special target with prerequisites to handle commands generating -multiple outputs (like lex/yacc invocations). See: -https://github.com/fwts/fwts/blob/V24.03.00/src/libfwtsiasl/Makefile.am#L61 - -First, the .NOTPARALLEL special target _with_ prerequisites is a -feature added in GNU Make 4.4. See: -https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 -https://lists.gnu.org/archive/html/help-make/2022-10/msg00020.html - -GNU Make version < 4.4 will interpret it as if it was written without -prerequisite (as a standalone ".NOTPARALLEL:"). The effect is that the -parallel compilation is disabled for the whole libfwtsiasl. The -standalone .NOTPARALLEL special target was introduced in GNU Make 3.79 -in 2000. This is why parallel builds are working with Make older than -version 4.4. - -Secondly, the reason why the build is failing on GNU Make >= 4.4 is -because the usage of .NOTPARALLEL in incorrect. - -Quoting the Make manual: -https://www.gnu.org/software/make/manual/html_node/Parallel-Disable.html -""" -If the .NOTPARALLEL special target has prerequisites, then each of those -prerequisites will be considered a target and all prerequisites of these -targets will be run serially. -""" - -Note the serialization will happen on the prerequisites of the targets -set as prerequisites of .NOTPARALLEL. - -The targets will not be correctly marked to disable parallel -execution. - -Thirdly, the use of multiple targets in a rule is incorrect here. See -Make manual: -https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html -The construct used in Makefile.am of libfwtsiasl for lex/yacc parsers -assumes they are independant targets (so they can be executed in -parallel). Finally, the "mv" command is failing, because there will be -one parallel execution per target, the first mv will suceed and the -other ones will fail. Multiple independant targets are often used in -Makefiles for lex/yacc, they are working because they are not using -"mv". Even in multiple execution, files are just overwritten. - -Fixing this .NOTPARALLEL usage with prerequisites would require Make -version 4.4 or greater. This is a strong requirement, as there is -still many Linux distros with older Make version (as an example Ubuntu -22.04 LTS has Make 4.3). - -The .WAIT special target could be used, but was also introduced in -Make version 4.4. See: -https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 - -GNU Make 4.3 also introduced "Grouped Targets" for that purpose. See: -https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html -But this would add a requirement on a recent Make version. - -This commit fixes the issue by declaring the first generated file as a -dependency of the other extra generated files. This has the effect of -completely solving the parallel build for all GNU Make versions. Also, -this enables parallel build for libfwtsiasl (except for the parser -generation) and makes the whole build faster. - -Signed-off-by: Julien Olivain -Upstream: https://github.com/fwts/fwts/commit/c0962cd74c725418523c46ca44101e0e70201f81 ---- - src/libfwtsiasl/Makefile.am | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am -index cb10bc58..ac54f621 100644 ---- a/src/libfwtsiasl/Makefile.am -+++ b/src/libfwtsiasl/Makefile.am -@@ -58,32 +58,32 @@ aslcompiler.y: $(ASL_PARSER) - aslcompilerlex.c: $(ASL_LEXER) - ${LEX} ${AM_LFLAGS} -PAslCompiler -o$@ $(top_srcdir)/src/acpica/source/compiler/aslcompiler.l - --.NOTPARALLEL: aslcompiler.c --aslcompiler.c aslcompiler.y.h: aslcompiler.y -+aslcompiler.c: aslcompiler.y - ${YACC} ${AM_YFLAGS} -d -baslcompiler -pAslCompiler $^ - mv aslcompiler.tab.c aslcompiler.c - cp aslcompiler.tab.h aslcompiler.y.h -+aslcompiler.y.h: aslcompiler.c - --.NOTPARALLEL: dtcompilerparserlex.c --dtcompilerparserlex.c dtcompilerparser.c dtcompilerparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y -+dtcompilerparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y - ${LEX} ${AM_LFLAGS} -PDtCompilerParser -odtcompilerparserlex.c $< - ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y - mv dtcompilerparser.tab.c dtcompilerparser.c - cp dtcompilerparser.tab.h dtcompilerparser.y.h -+dtcompilerparser.c dtcompilerparser.y.h: dtcompilerparserlex.c - --.NOTPARALLEL: dtparserlex.c --dtparserlex.c dtparser.c dtparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y -+dtparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y - ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c $< - ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser $(top_srcdir)/src/acpica/source/compiler/dtparser.y - mv dtparser.tab.c dtparser.c - cp dtparser.tab.h dtparser.y.h -+dtparser.c dtparser.y.h: dtparserlex.c - --.NOTPARALLEL: prparserlex.c --prparserlex.c prparser.c prparser.y.h: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y -+prparserlex.c: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y - ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c $< - ${YACC} ${AM_YFLAGS} -bprparser -pPrParser $(top_srcdir)/src/acpica/source/compiler/prparser.y - mv prparser.tab.c prparser.c - cp prparser.tab.h prparser.y.h -+prparser.c prparser.y.h: prparserlex.c - - pkglib_LTLIBRARIES = libfwtsiasl.la - --- -2.45.1 - diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 0c0dd58c15c..61f615835e8 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 d7f2642b1ec3697be798409decd6593d52bb1438f0d2dc697cbc85f52d19b41e fwts-V24.03.00.tar.gz +sha256 2bd45ab1b9f8dc1db2716721e89d982ee4b4eda4b1043cca7b13775c95d5023b fwts-V24.07.00.tar.gz # Hash for license file sha256 3cd2c5d12f024ff2aa203e37d7e972c4d5ab7bf1a65e3e09aebccf71e64b525b debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 0692121421d..fa1f8ed8c4f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 24.03.00 +FWTS_VERSION = 24.07.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 From 99f65ecb6a16e75d92c3f88e4e01959a2948e4d9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 1 Aug 2024 15:40:57 +0300 Subject: [PATCH 2168/3013] package/picocom: bump to version 2024-07 This release adds support for no-MMU build. Cc: Wolfram Sang Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/picocom/Config.in | 1 - package/picocom/picocom.hash | 2 +- package/picocom/picocom.mk | 9 +++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/picocom/Config.in b/package/picocom/Config.in index 6db71e1791a..e2c34c0e724 100644 --- a/package/picocom/Config.in +++ b/package/picocom/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PICOCOM bool "picocom" - depends on BR2_USE_MMU # fork() help picocom is a minimal dumb-terminal emulation program. It is, in principle, very much like minicom, only it's pico instead diff --git a/package/picocom/picocom.hash b/package/picocom/picocom.hash index 8107f5633a6..170de09cf46 100644 --- a/package/picocom/picocom.hash +++ b/package/picocom/picocom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 107d3e49e502ce63f826525f587826990451bcb39492efe2e0463dd62d64f3ea picocom-2023-04.tar.gz +sha256 4379de2ec591a5848123f37ccdbc7fbeee6dd3520ef1ce4119d84202fc268a17 picocom-2024-07.tar.gz sha256 9273c6b2c55be95f0f0df292d87e8900e5bfdf5b510a6ea09e80306cf45c10f6 LICENSE.txt diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk index bb55c3c1d1d..066a2a4f837 100644 --- a/package/picocom/picocom.mk +++ b/package/picocom/picocom.mk @@ -4,14 +4,19 @@ # ################################################################################ -PICOCOM_VERSION = 2023-04 +PICOCOM_VERSION = 2024-07 PICOCOM_SITE = $(call gitlab,wsakernel,picocom,$(PICOCOM_VERSION)) PICOCOM_LICENSE = GPL-2.0+ PICOCOM_LICENSE_FILES = LICENSE.txt PICOCOM_CPE_ID_VALID = YES +ifeq ($(BR2_USE_MMU),) +PICOCOM_CPPFLAGS += -DNO_FORK +endif + define PICOCOM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + EXTRA_CPPFLAGS="$(PICOCOM_CPPFLAGS)" $(MAKE) -C $(@D) endef define PICOCOM_INSTALL_TARGET_CMDS From 15e411d800999a70cc04a8d506ead40ea3dba210 Mon Sep 17 00:00:00 2001 From: Thomas Bonnefille Date: Thu, 1 Aug 2024 16:59:58 +0200 Subject: [PATCH 2169/3013] package/ffmpeg: add optional dependency on jack Add automatic JACK audio sound server support to ffmpeg if either JACK or JACK2 are enabled. Signed-off-by: Thomas Bonnefille Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 87c482656c6..5b2d33883d3 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -82,6 +82,16 @@ else FFMPEG_CONF_OPTS += --disable-ffplay endif +ifeq ($(BR2_PACKAGE_JACK1),y) +FFMPEG_CONF_OPTS += --enable-libjack +FFMPEG_DEPENDENCIES += jack1 +else ifeq ($(BR2_PACKAGE_JACK2),y) +FFMPEG_CONF_OPTS += --enable-libjack +FFMPEG_DEPENDENCIES += jack2 +else +FFMPEG_CONF_OPTS += --disable-libjack +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) FFMPEG_DEPENDENCIES += libv4l FFMPEG_CONF_OPTS += --enable-libv4l2 From 44b921f605dffd07bb6294e6368c2ace34a08266 Mon Sep 17 00:00:00 2001 From: Philip-Dylan Gleonec Date: Thu, 1 Aug 2024 17:34:31 +0200 Subject: [PATCH 2170/3013] configs/mx6sx_udoo_neo: bump kernel to 6.6.43 The current 5.15.13 kernel fails to build: In file included from : drivers/ata/libahci.c: In function 'ahci_led_store': ././include/linux/compiler_types.h:322:45: error: call to '__compiletime_assert_329' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) This commit fixes this by using the opportunity to bump the kernel to the latest LTS version. While bumping the kernel, the headers to use are also updated, and the selected device trees are updated to use the new dts per vendor organization. This update does not introduce any new error or warning with the current configuration. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7477108980 Signed-off-by: Philip-Dylan Gleonec Signed-off-by: Thomas Petazzoni --- configs/mx6sx_udoo_neo_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 793d992ce7a..71a7473307d 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -19,10 +19,10 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-udoo-neo-basic nxp/imx/imx6sx-udoo-neo-full nxp/imx/imx6sx-udoo-neo-extended" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # required tools to create the SD card image From 450240ca3f933b710910a6ff0620fae5bd74f07b Mon Sep 17 00:00:00 2001 From: Philip-Dylan Gleonec Date: Thu, 1 Aug 2024 17:34:32 +0200 Subject: [PATCH 2171/3013] configs/mx6sx_udoo_neo: add hashes Add hashes for uboot and linux, and enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Modify .checkpackageignore to enable the hash check for the Udoo Neo config. Signed-off-by: Philip-Dylan Gleonec Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - board/udoo/neo/patches/linux-headers/linux-headers.hash | 1 + board/udoo/neo/patches/linux/linux.hash | 2 ++ board/udoo/neo/patches/uboot/uboot.hash | 2 ++ configs/mx6sx_udoo_neo_defconfig | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) create mode 120000 board/udoo/neo/patches/linux-headers/linux-headers.hash create mode 100644 board/udoo/neo/patches/linux/linux.hash create mode 100644 board/udoo/neo/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 028b63b4d35..fe5d2618c68 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -202,7 +202,6 @@ configs/microchip_sama7g5ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash configs/minnowboard_max_defconfig lib_defconfig.ForceCheckHash configs/mx25pdk_defconfig lib_defconfig.ForceCheckHash configs/mx53loco_defconfig lib_defconfig.ForceCheckHash -configs/mx6sx_udoo_neo_defconfig lib_defconfig.ForceCheckHash configs/mx6udoo_defconfig lib_defconfig.ForceCheckHash configs/nexbox_a95x_defconfig lib_defconfig.ForceCheckHash configs/nitrogen6sx_defconfig lib_defconfig.ForceCheckHash diff --git a/board/udoo/neo/patches/linux-headers/linux-headers.hash b/board/udoo/neo/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/udoo/neo/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/udoo/neo/patches/linux/linux.hash b/board/udoo/neo/patches/linux/linux.hash new file mode 100644 index 00000000000..b8935a250a6 --- /dev/null +++ b/board/udoo/neo/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz diff --git a/board/udoo/neo/patches/uboot/uboot.hash b/board/udoo/neo/patches/uboot/uboot.hash new file mode 100644 index 00000000000..0bfbf306ffb --- /dev/null +++ b/board/udoo/neo/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 71a7473307d..adcd7aeb4eb 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -1,5 +1,7 @@ BR2_arm=y BR2_cortex_a9=y +BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y From 0d4e3c4498395fd4d19a1f67228ec28015d2f023 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 19:44:53 +0200 Subject: [PATCH 2172/3013] configs/freescale_imx8mpevk: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8mpevk_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5675:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. This commit also adds the custom version package hashes. Therefore, BR2_DOWNLOAD_FORCE_CHECK_HASHES=y is added in the defconfig, a BR2_GLOBAL_PATCH_DIR is also added in the board specific directory and the hash files are added. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089468 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../imx8mpevk/patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8mpevk/patches/linux/linux.hash | 2 ++ board/freescale/imx8mpevk/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8mpevk_defconfig | 10 ++++++---- 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8mpevk/patches/linux/linux.hash create mode 100644 board/freescale/imx8mpevk/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index fe5d2618c68..cb08ed1e5ab 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -155,7 +155,6 @@ configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mnevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8mpevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8qmmek_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8qxpmek_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..0266b45d6ab --- /dev/null +++ b/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mpevk/patches/linux/linux.hash b/board/freescale/imx8mpevk/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx8mpevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mpevk/patches/uboot/uboot.hash b/board/freescale/imx8mpevk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx8mpevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 2aed0484826..0ced252cd0e 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -1,12 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mpevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.1.22-2.0.0)/linux-imx-lf-6.1.22-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" @@ -19,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.1.22-2.0.0)/imx-atf-lf-6.1.22-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1.22-2.0.0)/uboot-imx-lf-6.1.22-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imx8mpevk/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y From a8d594b601b8d5b9cdf8692968a24e5951003b2a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 19:49:54 +0200 Subject: [PATCH 2173/3013] configs/freescale_imx8mnevk: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8mnevk_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5769:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5769 | _QuerySignal( | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. The BR2_GLOBAL_PATCH_DIR is also changed from "board/freescale/common/patches" to "board/freescale/imx8mnevk/patches". This for two reasons: 1. the common patch directory is removed, because the patches for arm-trusted-firmware are no longer needed. Patch 0001 is included in this new version, and patch 0002 no longer needed due a code rewrite in this new version. The common patch files are kept, because they are used in other freescale_ defconfigs. 2. the imx8mnevk patch directory is introduced, to include the needed hash files, because this commit enables BR2_DOWNLOAD_FORCE_CHECK_HASHES=y. Those hash files are introduced in a board specific directory to allow updating this defconfig independently of the other i.MX defconfigs: there is 16 freescale_imx*_defconfigs, with more or less dependencies (firmwares, gpu drivers, ...). The ".checkpackageignore" entry for this defconfig is also removed. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089467 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8mnevk/patches/linux/linux.hash | 2 ++ board/freescale/imx8mnevk/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8mnevk_defconfig | 11 ++++++----- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8mnevk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8mnevk/patches/linux/linux.hash create mode 100644 board/freescale/imx8mnevk/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index cb08ed1e5ab..91bea78a980 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -154,7 +154,6 @@ configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8mnevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8qmmek_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8qxpmek_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..0266b45d6ab --- /dev/null +++ b/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mnevk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mnevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx8mnevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mnevk/patches/linux/linux.hash b/board/freescale/imx8mnevk/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx8mnevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mnevk/patches/uboot/uboot.hash b/board/freescale/imx8mnevk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx8mnevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index ac73bea7699..a534c504776 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mnevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -21,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 008e37b3aeb304919a3eb4d1c47b2b4d49ec49db Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Thu, 1 Aug 2024 21:12:34 +0200 Subject: [PATCH 2174/3013] board/udoo/neo/readme.txt: provide more details This patch adds more information to the Udoo Neo's readme, e.g., UART pins and baudrate. Signed-off-by: Kilian Zinnecker Signed-off-by: Thomas Petazzoni --- board/udoo/neo/readme.txt | 54 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/board/udoo/neo/readme.txt b/board/udoo/neo/readme.txt index 94ebcc12f2f..e9f9fbac1c1 100644 --- a/board/udoo/neo/readme.txt +++ b/board/udoo/neo/readme.txt @@ -1,12 +1,36 @@ MX6X Udoo Neo board - +=================== http://www.udoo.org/udoo-neo/ +Build: +====== + To build a minimal support for these boards: $ make mx6sx_udoo_neo_defconfig $ make +Files created in the output directory: +====================================== + +output/images +. +├── boot.scr +├── imx6sx-udoo-neo-basic.dtb +├── imx6sx-udoo-neo-extended.dtb +├── imx6sx-udoo-neo-full.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── SPL +├── u-boot.bin +├── u-boot.img +└── zImage + +Creating bootable SD card: +========================== + Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on an SD card: @@ -14,3 +38,31 @@ dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. + +Booting: +======== + +Serial console: +--------------- +The Udoo Neo features the serial console "UART1" on the pin header "P7". The +Uart pins are as follows (see board labels): + +pin 46: rx +pin 47: tx + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +Documentation: +============== + +documentation link: +------------------- +https://www.udoo.org/docs-neo/Introduction/Introduction.html + +forum link: +----------- +https://www.udoo.org/forum/forums/udoo-neo.39/ From b6404f78cd2c1179884c9551aee050db49aaf2db Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 21:15:05 +0200 Subject: [PATCH 2175/3013] package/freescale-imx/firmware-imx: bump version to 8.24 This version is aligned with NXP Linux BSP version "lf-6.6.23-2.0.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v49 September 2023" to "v56 April 2024". Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. See [1]. [1] https://github.com/nxp-imx/meta-imx/blob/rel_imx_6.6.23_2.0.0/meta-imx-bsp/recipes-bsp/firmware-imx/firmware-imx-8.24.inc#L10 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/freescale-imx/firmware-imx/firmware-imx.hash | 6 +++--- package/freescale-imx/firmware-imx/firmware-imx.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index d9443374c56..d606ae6da6b 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 94c8bceac56ec503c232e614f77d6bbd8e17c7daa71d4e651ea8fd5034c30350 firmware-imx-8.22.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 2e27962332197ebebbb30138f6dfb365361d48d7efa565df97c4f79285b1ca50 firmware-imx-8.24-fbe0a4c.bin +sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA sha256 40d02f6d6b4e94d9307529408f372f5a9908cf3d156ec533a4e54274b40f271e SCR.txt diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index c131558c37f..8666d76a730 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,9 +4,10 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.22 +FIRMWARE_IMX_VERSION = 8.24 +FIRMWARE_IMX_REVISION = fbe0a4c FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) -FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin +FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION)-$(FIRMWARE_IMX_REVISION).bin FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement FIRMWARE_IMX_LICENSE_FILES = EULA COPYING SCR.txt From 2bf49ed39edd75e64617a8baf3d2bba933b85e3d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 21:27:50 +0200 Subject: [PATCH 2176/3013] package/freescale-imx/imx-sc-firmware: bump to version 1.16.0 This version is aligned with NXP Linux BSP version "lf-6.6.23-2.0.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v39 August 2022" to "v56 April 2024". Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash | 6 +++--- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash index a5bbe112687..955879eb43c 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f imx-sc-firmware-1.15.0.bin -sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA -sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 23327c38ffc746321697528b2c4c726ed5c3ebadf4b312592d533664719595bd imx-sc-firmware-1.16.0.bin +sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 55b6fb00e33..5c9ec59d8a4 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SC_FIRMWARE_VERSION = 1.15.0 +IMX_SC_FIRMWARE_VERSION = 1.16.0 IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin From d166c917f6490f234a9760e2b091690421a93d8e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 21:30:29 +0200 Subject: [PATCH 2177/3013] package/freescale-imx/imx-seco: bump to version 5.9.4 This version is aligned with NXP Linux BSP version "lf-6.6.23-2.0.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v48 July 2023" to "v56 April 2024". Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-seco/imx-seco.hash | 6 +++--- package/freescale-imx/imx-seco/imx-seco.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-seco/imx-seco.hash b/package/freescale-imx/imx-seco/imx-seco.hash index 40963a81be0..a91dbc22745 100644 --- a/package/freescale-imx/imx-seco/imx-seco.hash +++ b/package/freescale-imx/imx-seco/imx-seco.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 81601f73d1b2c1d051760e6f6174e084256a1a10ed21a5c616c139e630c4e709 imx-seco-5.9.2.bin -sha256 b158adaac5e2d1c7fa6e739ff168ab498957e3303070f1c0b0e66d9a8f02a354 EULA -sha256 de37a0bcbf1717b910c1a53ea6eab853c404e61e8143bb6c081d39f532571e54 COPYING +sha256 9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7 imx-seco-5.9.4.bin +sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 4261602a8c7..4afac8005b6 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SECO_VERSION = 5.9.2 +IMX_SECO_VERSION = 5.9.4 IMX_SECO_SITE = $(FREESCALE_IMX_SITE) IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin From 80004b1dbb5747abecea6583e86812204d7c22e7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 21:46:49 +0200 Subject: [PATCH 2178/3013] configs/freescale_imx8qmmek: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8qmmek_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5769:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5769 | _QuerySignal( | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. The BR2_GLOBAL_PATCH_DIR is also changed from "board/freescale/common/patches" to "board/freescale/imx8qmmek/patches". This for two reasons: 1. the common patch directory is removed, because the patches for arm-trusted-firmware are no longer needed. Patch 0001 is included in this new version, and patch 0002 no longer needed due a code rewrite in this new version. The common patch files are kept, because they are used in other freescale_ defconfigs. 2. the imx8qmmek patch directory is introduced, to include the needed hash files, because this commit enables BR2_DOWNLOAD_FORCE_CHECK_HASHES=y. Those hash files are introduced in a board specific directory to allow updating this defconfig independently of the other i.MX defconfigs: there is 16 freescale_imx*_defconfigs, with more or less dependencies (firmwares, gpu drivers, ...). The ".checkpackageignore" entry for this defconfig is also removed. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089474 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8qmmek/patches/linux/linux.hash | 2 ++ board/freescale/imx8qmmek/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8qmmek_defconfig | 11 ++++++----- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8qmmek/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8qmmek/patches/linux/linux.hash create mode 100644 board/freescale/imx8qmmek/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 91bea78a980..f2d7186a919 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -155,7 +155,6 @@ configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8qmmek_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8qxpmek_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..0266b45d6ab --- /dev/null +++ b/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8qmmek/patches/linux-headers/linux-headers.hash b/board/freescale/imx8qmmek/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx8qmmek/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8qmmek/patches/linux/linux.hash b/board/freescale/imx8qmmek/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx8qmmek/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8qmmek/patches/uboot/uboot.hash b/board/freescale/imx8qmmek/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx8qmmek/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 0fc3fe7b077..3ad273c9d43 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -1,12 +1,13 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8qmmek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -21,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 5a89d557792fd83f993abd3ada195654fc8ad4be Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 21:50:48 +0200 Subject: [PATCH 2179/3013] configs/freescale_imx8qxpmek: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8qxpmek_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5769:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5769 | _QuerySignal( | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. The BR2_GLOBAL_PATCH_DIR is also changed from "board/freescale/common/patches" to "board/freescale/imx8qxpmek/patches". This for two reasons: 1. the common patch directory is removed, because the patches for arm-trusted-firmware are no longer needed. Patch 0001 is included in this new version, and patch 0002 no longer needed due a code rewrite in this new version. The common patch files are kept, because they are used in other freescale_ defconfigs. 2. the imx8qxpmek patch directory is introduced, to include the needed hash files, because this commit enables BR2_DOWNLOAD_FORCE_CHECK_HASHES=y. Those hash files are introduced in a board specific directory to allow updating this defconfig independently of the other i.MX defconfigs: there is 16 freescale_imx*_defconfigs, with more or less dependencies (firmwares, gpu drivers, ...). The ".checkpackageignore" entry for this defconfig is also removed. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089475 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8qxpmek/patches/linux/linux.hash | 2 ++ board/freescale/imx8qxpmek/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8qxpmek_defconfig | 11 ++++++----- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8qxpmek/patches/linux/linux.hash create mode 100644 board/freescale/imx8qxpmek/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index f2d7186a919..906cf204659 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -155,7 +155,6 @@ configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8qxpmek_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash configs/freescale_t1040d4rdb_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..0266b45d6ab --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash b/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8qxpmek/patches/linux/linux.hash b/board/freescale/imx8qxpmek/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/uboot/uboot.hash b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 47a2104d5b0..d2fae2c9e7b 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -1,14 +1,15 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8qxpmek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -23,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 91fc008a7913fa0fa74913fc3cd7a4c180d9177a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 1 Aug 2024 21:56:48 +0200 Subject: [PATCH 2180/3013] configs/freescale_imx8dxlevk: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8dxlevk_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5675:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. This commit also adds the custom version package hashes. Therefore, BR2_DOWNLOAD_FORCE_CHECK_HASHES=y is added in the defconfig, a BR2_GLOBAL_PATCH_DIR is also added in the board specific directory and the hash files are added. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089463 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8dxlevk/patches/linux/linux.hash | 2 ++ board/freescale/imx8dxlevk/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8dxlevk_defconfig | 10 ++++++---- 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8dxlevk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8dxlevk/patches/linux/linux.hash create mode 100644 board/freescale/imx8dxlevk/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 906cf204659..17b33dc2cd4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -152,7 +152,6 @@ configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..0266b45d6ab --- /dev/null +++ b/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8dxlevk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8dxlevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx8dxlevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8dxlevk/patches/linux/linux.hash b/board/freescale/imx8dxlevk/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx8dxlevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8dxlevk/patches/uboot/uboot.hash b/board/freescale/imx8dxlevk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx8dxlevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8dxlevk_defconfig b/configs/freescale_imx8dxlevk_defconfig index 0f4caa0ea9a..1ee1413eb0b 100644 --- a/configs/freescale_imx8dxlevk_defconfig +++ b/configs/freescale_imx8dxlevk_defconfig @@ -1,13 +1,15 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8dxlevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8dxl-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.1.22-2.0.0)/linux-imx-lf-6.1.22-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8dxl-evk" @@ -22,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.1.22-2.0.0)/imx-atf-lf-6.1.22-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8dxl" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1.22-2.0.0)/uboot-imx-lf-6.1.22-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8dxl_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From a1b28a8c428c31dcb7388f2c81e974ff7de159b4 Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Wed, 31 Jul 2024 23:55:46 +0200 Subject: [PATCH 2181/3013] configs/rock5b: remove unneeded uboot tools param While switching from a custom to mainline kernel in commit b7dbdd3d775b8e94664c6f37b11afc8a6a352e35, the uboot tools became unneeded and were removed from the rock5b_defconfig. However, the FIT support configuration parameter was accidentally left inside the defconfig. This patch removes it. Signed-off-by: Kilian Zinnecker Signed-off-by: Thomas Petazzoni --- configs/rock5b_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 2765b5fbd8a..0778e8afdfe 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -40,7 +40,6 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="250M" -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y From da77020c8ecc742b84fef007355b6719bb6e0f6b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 21:59:23 +0200 Subject: [PATCH 2182/3013] package/imx-mkimage: bump to version lf-6.6.23-2.0.0 For change log, see: https://github.com/nxp-imx/imx-mkimage/compare/lf-6.1.22-2.0.0...lf-6.6.23-2.0.0 Note: the Buildroot package version name before this commit was "lf-6.6.3_1.0.0" (with an underscore "_"), which was in fact a branch git reference. See: https://github.com/nxp-imx/imx-mkimage/tree/lf-6.6.3_1.0.0 It should have been the tag name "lf-6.6.3-1.0.0" (with the dash "-"). See: https://github.com/nxp-imx/imx-mkimage/releases/tag/lf-6.6.3-1.0.0 This commit fixes this issue by updating to a new git tag reference. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 3161d66ad2e..02205def1eb 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 48e7bad4a49e693415418859bb0330b63938a77bbb12660bc64761a5daa915c9 imx-mkimage-lf-6.6.3_1.0.0.tar.gz +sha256 0a5654229c063e4e87b5d69f47a4a913ecee51f8a817ae2346a2a407e765ed3b imx-mkimage-lf-6.6.23-2.0.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c LICENSE diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index a82854eb6e2..f7396ba1b23 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = lf-6.6.3_1.0.0 +IMX_MKIMAGE_VERSION = lf-6.6.23-2.0.0 IMX_MKIMAGE_SITE = $(call github,nxp-imx,imx-mkimage,$(IMX_MKIMAGE_VERSION)) IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = LICENSE From afd4c4d708ade684c732e982785968047900e655 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 22:08:14 +0200 Subject: [PATCH 2183/3013] configs/freescale_imx8mmevk: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8mmevk_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5769:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5769 | _QuerySignal( | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. The BR2_GLOBAL_PATCH_DIR is also changed from "board/freescale/common/patches" to "board/freescale/imx8mmevk/patches". This for two reasons: 1. the common patch directory is removed, because the patches for arm-trusted-firmware are no longer needed. Patch 0001 is included in this new version, and patch 0002 no longer needed due a code rewrite in this new version. The common patch files are kept, because they are used in other freescale_ defconfigs. 2. the imx8mmevk patch directory is introduced, to include the needed hash files, because this commit enables BR2_DOWNLOAD_FORCE_CHECK_HASHES=y. Those hash files are introduced in a board specific directory to allow updating this defconfig independently of the other i.MX defconfigs: there is 16 freescale_imx*_defconfigs, with more or less dependencies (firmwares, gpu drivers, ...). The ".checkpackageignore" entry for this defconfig is also removed. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089464 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8mmevk/patches/linux/linux.hash | 2 ++ board/freescale/imx8mmevk/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8mmevk_defconfig | 11 ++++++----- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8mmevk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8mmevk/patches/linux/linux.hash create mode 100644 board/freescale/imx8mmevk/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 17b33dc2cd4..2b2a67eb1af 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -152,7 +152,6 @@ configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..0266b45d6ab --- /dev/null +++ b/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mmevk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mmevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx8mmevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mmevk/patches/linux/linux.hash b/board/freescale/imx8mmevk/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx8mmevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mmevk/patches/uboot/uboot.hash b/board/freescale/imx8mmevk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx8mmevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index ca5c308da62..2f57bfd2f02 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mmevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" @@ -20,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From ab78dae649e663c8744be5343e4a59ef3b1efb9b Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Wed, 31 Jul 2024 23:58:28 +0000 Subject: [PATCH 2184/3013] package/wilc-firmware: bump to 16.3 Wraps up firmware 16.2 and 16.3 Changelog from https://github.com/linux4wilc/firmware/releases: - Fixed the transmission issue for the large data blocks - Unified driver codebase for the ATWILC & nextGen products. - Fix for Powersave state issue when network interface is down (using 'ifconfig wlan0 down') and 'up' again. - Migrated the ATWILC driver codebase to Kernel 6.6 Signed-off-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni --- package/wilc-firmware/wilc-firmware.hash | 2 +- package/wilc-firmware/wilc-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash index 8a7957a1d2f..543aaa0f1e0 100644 --- a/package/wilc-firmware/wilc-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e wilc-firmware-wilc_linux_16_1_2.tar.gz +sha256 b9305e1ed5a43eaffed880ba0486431c13cdf93b2e449aed650e7a605a291c83 wilc-firmware-wilc_linux_16_3.tar.gz sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk index 3381162bbd1..ac0f33440e5 100644 --- a/package/wilc-firmware/wilc-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 +WILC_FIRMWARE_VERSION = wilc_linux_16_3 WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) WILC_FIRMWARE_LICENSE = PROPRIETARY From 126156df4a866bec1832a9d462935f4f8be0ed71 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 31 Jul 2024 10:09:17 +0200 Subject: [PATCH 2185/3013] package/strace: update to 6.10 See here for a ChangeLog: https://github.com/strace/strace/blob/master/NEWS Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 68b9cc5f935..dcaf1ad5d43 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.8/strace-6.8.tar.xz.asc -sha256 ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 strace-6.8.tar.xz +# https://strace.io/files/6.10/strace-6.10.tar.xz.asc +sha256 765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07 strace-6.10.tar.xz sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 908aed6653b..34a154357f6 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.8 +STRACE_VERSION = 6.10 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From a23518b9d74a8bd66e19b8ffa7175b81dc7dd207 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 31 Jul 2024 10:10:19 +0200 Subject: [PATCH 2186/3013] package/asterisk: update to 20.9.1 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index bff34b37bb2..ee21d88d98a 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 bea2978c41d0f69f7197536c35c2d80cbfdf7db826f48c0741b6f66462981d2f asterisk-20.8.1.tar.gz +sha256 c928c715dc5ff783ea6cf62cca3eebdc1dc9c5d40ce9b37b0213c0eac7f4090f asterisk-20.9.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 3d41285c78f..64ec740d46e 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.8.1 +ASTERISK_VERSION = 20.9.1 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From e6e9deabe3dc7ea74a8c90f4673f84653a0ff69d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 31 Jul 2024 13:04:29 +0200 Subject: [PATCH 2187/3013] package/netcalc: bump to v2.1.7 Upstream now provides sha256sum for tarball. License hash updated because of copyright year and maintainer surname changes. Changes from https://github.com/troglobit/netcalc/releases/tag/v2.1.7: - Allow colorized output over pipes, use -n to disable. This reverts the auto-disable in pipes, introduced in v2.1 - Misc. build issues on macOS and *BSD - Various minor GCC 13 and Clang 18 warnings Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/netcalc/netcalc.hash | 10 +++++----- package/netcalc/netcalc.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/netcalc/netcalc.hash b/package/netcalc/netcalc.hash index ba503b6457f..7a9f2000e0f 100644 --- a/package/netcalc/netcalc.hash +++ b/package/netcalc/netcalc.hash @@ -1,5 +1,5 @@ -# From https://github.com/troglobit/netcalc/releases/tag/v2.1.6 -md5 c8660b61370c76d866247fe65966a35b netcalc-2.1.6.tar.gz -# Locally computed: -sha256 cff41782fcf63d7d4ce6d35f95ed302127f6ddf6fc0ca03a8188af95a7c3243b netcalc-2.1.6.tar.gz -sha256 745538f8d515d37af6f03442df982a8b211b129e8dc10d0195e33c4b42f8fe5f LICENSE +# From https://github.com/troglobit/netcalc/releases/tag/v2.1.7 +sha256 7300ceac519dd14a8431d27339359f064eb5d80bdd7307ecb1b1cb1b0ab42969 netcalc-2.1.7.tar.gz + +# Locally computed +sha256 c9462bef0a7f70323f782e10def048ea0bb281d35e93dd0de896ea9805856015 LICENSE diff --git a/package/netcalc/netcalc.mk b/package/netcalc/netcalc.mk index 7d96fc53cf1..4d69deee615 100644 --- a/package/netcalc/netcalc.mk +++ b/package/netcalc/netcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETCALC_VERSION = 2.1.6 +NETCALC_VERSION = 2.1.7 NETCALC_SITE = https://github.com/troglobit/netcalc/releases/download/v$(NETCALC_VERSION) NETCALC_LICENSE = BSD-3-Clause NETCALC_LICENSE_FILES = LICENSE From 2652faca32bf0d1ab5af825b6c75118dbba0312f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 00:07:13 +0200 Subject: [PATCH 2188/3013] configs/freescale_imx8mqevk: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8mqevk_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5769:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5769 | _QuerySignal( | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. The BR2_GLOBAL_PATCH_DIR is also changed from "board/freescale/common/patches" to "board/freescale/imx8mqevk/patches". This for two reasons: 1. the common patch directory is removed, because the patches for arm-trusted-firmware are no longer needed. Patch 0001 is included in this new version, and patch 0002 no longer needed due a code rewrite in this new version. The common patch files are kept, because they are used in other freescale_ defconfigs. 2. the imx8mqevk patch directory is introduced, to include the needed hash files, because this commit enables BR2_DOWNLOAD_FORCE_CHECK_HASHES=y. Those hash files are introduced in a board specific directory to allow updating this defconfig independently of the other i.MX defconfigs: there is 16 freescale_imx*_defconfigs, with more or less dependencies (firmwares, gpu drivers, ...). The ".checkpackageignore" entry for this defconfig is also removed. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089470 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8mqevk/patches/linux/linux.hash | 2 ++ board/freescale/imx8mqevk/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8mqevk_defconfig | 11 ++++++----- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8mqevk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8mqevk/patches/linux/linux.hash create mode 100644 board/freescale/imx8mqevk/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 2b2a67eb1af..72bbcb5bde0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -152,7 +152,6 @@ configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash configs/freescale_t1040d4rdb_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..0266b45d6ab --- /dev/null +++ b/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mqevk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mqevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx8mqevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mqevk/patches/linux/linux.hash b/board/freescale/imx8mqevk/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx8mqevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8mqevk/patches/uboot/uboot.hash b/board/freescale/imx8mqevk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx8mqevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 79375d7f886..05a78e5b6b8 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mqevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -20,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From a8884c6f40ecd162f4fc7903998d7d7ce6e8583f Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Fri, 2 Aug 2024 12:08:31 +0700 Subject: [PATCH 2189/3013] package/git: bump to version 2.46.0 Bump the package version to 2.46.0. Release notes: https://lore.kernel.org/git/xmqqzfq0i0qa.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Thomas Petazzoni --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index f72fd60ec2d..6b34d145439 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb git-2.45.2.tar.xz +sha256 7f123462a28b7ca3ebe2607485f7168554c2b10dfc155c7ec46300666ac27f95 git-2.46.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index d84b2e487c2..d0b27d7e5c9 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.45.2 +GIT_VERSION = 2.46.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From f3148385f89bf052a420933c05dcd4e40f114c77 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 2 Aug 2024 07:11:07 +0200 Subject: [PATCH 2190/3013] package/gcc: update to 14.2.0 List of bugs which were resolved in 14.2.0: https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=14.2 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- .../0001-disable-split-stack-for-non-thread-builds.patch | 0 ...libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename package/gcc/{14.1.0 => 14.2.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) rename package/gcc/{14.1.0 => 14.2.0}/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 72bbcb5bde0..fa0935c17d6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -541,7 +541,7 @@ package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch li package/fxload/0001-fix-static-build.patch lib_patch.Upstream package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream diff --git a/package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/14.2.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch similarity index 100% rename from package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch rename to package/gcc/14.2.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 5d3b803c78f..911bc2f4dea 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -75,7 +75,7 @@ config BR2_GCC_VERSION default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "12.4.0" if BR2_GCC_VERSION_12_X default "13.3.0" if BR2_GCC_VERSION_13_X - default "14.1.0" if BR2_GCC_VERSION_14_X + default "14.2.0" if BR2_GCC_VERSION_14_X default "arc-2023.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 4534655790f..b7c53f8fbed 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -6,8 +6,8 @@ sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3c sha512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 gcc-12.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-13.3.0/sha512.sum sha512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 gcc-13.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.1.0/sha512.sum -sha512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea gcc-14.1.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.2.0/sha512.sum +sha512 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396 gcc-14.2.0.tar.xz # Locally calculated (fetched from Github) sha512 4dca20f517a42bb027fec605965b09fb917a535eebf3fe3e811d93476b02b1962df5ad4665f117bd44c2ec8e8015d51a44c00591761fe5f259c201ac5c7d920f gcc-arc-2023.09-release.tar.gz From 84ae3b04fe6cd70a4abccc5d9e19218583410c16 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 08:33:55 +0200 Subject: [PATCH 2191/3013] package/odb: properly format Upstream: tags in patches All patches of the odb package already contained relevant Upstream information, just not formatted according to how we expect it. Let's fix that, and drop the .checkpackageignore entries that are no longer needed. Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 13 ------------- ...de-in-gcc.hxx-appears-to-be-no-longer-nece.patch | 2 +- package/odb/0002-Remove-gratuitous-classes.patch | 2 +- ...ial-work-to-make-ODB-compatible-with-GCC-6.patch | 2 +- ...04-Make-compilable-with-GCC-6-in-C-14-mode.patch | 2 +- ...ix-bug-in-GCC-6-input_location-translation.patch | 2 +- package/odb/0006-Adapt-to-changes-in-GCC-8.patch | 2 +- ...007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch | 2 +- ...adaptation-to-be-compatible-with-previous-.patch | 2 +- ...le-namespace-aliases-when-parsing-GCC-tree.patch | 2 +- .../odb/0010-Add-initial-support-for-GCC-9.patch | 2 +- package/odb/0011-Adjust-to-changes-in-GCC-10.patch | 2 +- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 2 +- ...me-lookup-ambiguity-causing-error-with-GCC.patch | 2 +- 14 files changed, 13 insertions(+), 26 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index fa0935c17d6..9d2da90aa19 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -984,19 +984,6 @@ package/numactl/0001-link-with-latomic-if-needed-again.patch lib_patch.Upstream package/nuttcp/0001-susv3-legacy.patch lib_patch.Upstream package/nvidia-driver/0001-use-LDFLAGS.patch lib_patch.Upstream package/octave/0001-Fix-BLAS-library-integer-size-detection.patch lib_patch.Upstream -package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch lib_patch.Upstream -package/odb/0002-Remove-gratuitous-classes.patch lib_patch.Upstream -package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch lib_patch.Upstream -package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch lib_patch.Upstream -package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch lib_patch.Upstream -package/odb/0006-Adapt-to-changes-in-GCC-8.patch lib_patch.Upstream -package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch lib_patch.Upstream -package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch lib_patch.Upstream -package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch lib_patch.Upstream -package/odb/0010-Add-initial-support-for-GCC-9.patch lib_patch.Upstream -package/odb/0011-Adjust-to-changes-in-GCC-10.patch lib_patch.Upstream -package/odb/0012-Adjust-to-changes-in-GCC-11.patch lib_patch.Upstream -package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch lib_patch.Upstream package/ofono/0001-uclibc-backtrace.patch lib_patch.Upstream package/ofono/S46ofono lib_sysv.Variables package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch lib_patch.Upstream diff --git a/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch b/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch index 0216038f2cd..a9366d6fb8b 100644 --- a/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch +++ b/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch @@ -6,7 +6,7 @@ Subject: [PATCH] include in gcc.hxx appears to be no longer necessary On MIPS this file pulls in enum processor which conflicts with our class processor. -[Upstream: f0bbc17aeed1b636782a4b92e8191d90f310d0a2] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=f0bbc17aeed1b636782a4b92e8191d90f310d0a2 Signed-off-by: Kamel Bouhara --- odb/gcc.hxx | 2 -- diff --git a/package/odb/0002-Remove-gratuitous-classes.patch b/package/odb/0002-Remove-gratuitous-classes.patch index f2d9303e095..7fd70e8a21e 100644 --- a/package/odb/0002-Remove-gratuitous-classes.patch +++ b/package/odb/0002-Remove-gratuitous-classes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove gratuitous classes In the process also get rid of global class processor which conflicts with enum processor on MIPS. -[Upstream: bbc39ffe31c67506b4c03fc56fa3adcb925b6325] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=bbc39ffe31c67506b4c03fc56fa3adcb925b6325 Signed-off-by: Kamel Bouhara --- odb/context.hxx | 3 ++- diff --git a/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch b/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch index e2b97cca6c9..4c936f44535 100644 --- a/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch +++ b/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 5 Feb 2016 16:01:42 +0200 Subject: [PATCH] Initial work to make ODB compatible with GCC 6 -[Upstream: 511dcf67322ad87fb32f97d1cf7725c129e83898] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=511dcf67322ad87fb32f97d1cf7725c129e83898 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 4 ++++ diff --git a/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch b/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch index 57288af0445..8911590ec10 100644 --- a/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch +++ b/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Mon, 8 Feb 2016 18:39:21 +0200 Subject: [PATCH] Make compilable with GCC 6 in C++14 mode -[Upstream: 61d13eb53ade9f30a64892a901401bda5e42c335] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=61d13eb53ade9f30a64892a901401bda5e42c335 Signed-off-by: Kamel Bouhara --- odb/gcc.hxx | 9 ++++++--- diff --git a/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch b/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch index 4e8c8f4fc33..af682502c90 100644 --- a/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch +++ b/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 23 Dec 2016 10:18:01 +0200 Subject: [PATCH] Fix bug in GCC 6 input_location translation -[Upstream: ec777147024fde72e4411cc6b1e1e49f4a1d1804] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=ec777147024fde72e4411cc6b1e1e49f4a1d1804 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 8 ++++++++ diff --git a/package/odb/0006-Adapt-to-changes-in-GCC-8.patch b/package/odb/0006-Adapt-to-changes-in-GCC-8.patch index c0ef4e8bfa3..2f907de6632 100644 --- a/package/odb/0006-Adapt-to-changes-in-GCC-8.patch +++ b/package/odb/0006-Adapt-to-changes-in-GCC-8.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Tue, 7 Nov 2017 14:58:43 +0200 Subject: [PATCH] Adapt to changes in GCC 8 -[Upstream: 356630ced28f3101e8e2d88e3c52f8d3008515c7] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=356630ced28f3101e8e2d88e3c52f8d3008515c7 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 16 ++++++++++++++-- diff --git a/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch b/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch index bf856eb487e..e3fbc21ae65 100644 --- a/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch +++ b/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Tue, 7 Nov 2017 10:37:53 +0200 Subject: [PATCH] Switch to C++11, get rid of auto_ptr use -[Upstream: 6e374de9ae2f2978f2fca3390aba4ea3f72bfade] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=6e374de9ae2f2978f2fca3390aba4ea3f72bfade Signed-off-by: Kamel Bouhara --- odb/Makefile.am | 5 +++++ diff --git a/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch b/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch index b89c35fb8fe..818a95db739 100644 --- a/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch +++ b/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch @@ -4,7 +4,7 @@ Date: Tue, 7 Nov 2017 16:57:35 +0200 Subject: [PATCH] Fix GCC 8 adaptation to be compatible with previous versions -[Upstream: 006bbc5748a8197d7874550cc9186545f1c55ad8] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=006bbc5748a8197d7874550cc9186545f1c55ad8 Signed-off-by: Kamel Bouhara --- odb/validator.cxx | 6 ++++++ diff --git a/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch b/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch index bac7abea1f9..dbe2d533bd0 100644 --- a/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch +++ b/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 5 Oct 2018 07:20:18 +0200 Subject: [PATCH] Handle namespace aliases when parsing GCC tree -[Upstream: 3a1788234bfaa96ee093b68e9ba02cf7d5bdffe6] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=3a1788234bfaa96ee093b68e9ba02cf7d5bdffe6 Signed-off-by: Kamel Bouhara --- odb/parser.cxx | 5 +++++ diff --git a/package/odb/0010-Add-initial-support-for-GCC-9.patch b/package/odb/0010-Add-initial-support-for-GCC-9.patch index dd36882bc56..c6c4c0a52d0 100644 --- a/package/odb/0010-Add-initial-support-for-GCC-9.patch +++ b/package/odb/0010-Add-initial-support-for-GCC-9.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 15 Mar 2019 17:37:28 +0200 Subject: [PATCH] Add initial support for GCC 9 -[Upstream: 841140bbf13ae2bfaa5978a181718cda0a8edae7] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=841140bbf13ae2bfaa5978a181718cda0a8edae7 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 33 +++++++++++++++++++++++++++------ diff --git a/package/odb/0011-Adjust-to-changes-in-GCC-10.patch b/package/odb/0011-Adjust-to-changes-in-GCC-10.patch index 33d46d792eb..0da8b09bf19 100644 --- a/package/odb/0011-Adjust-to-changes-in-GCC-10.patch +++ b/package/odb/0011-Adjust-to-changes-in-GCC-10.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Wed, 17 Jun 2020 11:22:11 +0200 Subject: [PATCH] Adjust to changes in GCC 10 -[Upstream: 060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52 Signed-off-by: Thomas Petazzoni --- odb/gcc.hxx | 7 +++++-- diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch index 2959a71dea2..e5601b048e2 100644 --- a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Wed, 31 Mar 2021 10:45:21 +0200 Subject: [PATCH] Adjust to changes in GCC 11 -[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=61d80f051293a7449a09081f60f48b8377bfbbad Signed-off-by: Thomas Petazzoni --- odb/gcc.hxx | 20 ++++++++++++++++++++ diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch index 79c3d982fa4..fed8b6319b0 100644 --- a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Wed, 7 Jul 2021 09:26:57 +0200 Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 -[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=47035c0f72efd99a2210cd45db6e42423fb74533 Signed-off-by: Thomas Petazzoni --- odb/relational/header.hxx | 2 ++ From 905b9c8868fc4b021d7d7e0bce331f17d5e20d71 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 08:35:41 +0200 Subject: [PATCH 2192/3013] package/odb: backport upstream patch to fix GCC 14.x build issue Fixes: http://autobuild.buildroot.net/results/f1b802e65273ae348569f37feb7e4bd2a04bb46e/ Signed-off-by: Thomas Petazzoni --- ...-compiler-plugin-to-work-with-GCC-14.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch diff --git a/package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch b/package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch new file mode 100644 index 00000000000..bcab6c12ed1 --- /dev/null +++ b/package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch @@ -0,0 +1,66 @@ +From 4bd8af5dbd1f58bf631b4d5af90086f214553157 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Thu, 25 Apr 2024 07:15:47 +0200 +Subject: [PATCH] Update ODB compiler plugin to work with GCC 14 + +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=acb0c5194690d2751d2211bf91aec21da2fadc26 +Signed-off-by: Thomas Petazzoni +--- + odb/cxx-lexer.cxx | 4 +++- + odb/processor.cxx | 18 +++++++++++++++--- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index acd13be6..e283abd5 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -217,7 +217,9 @@ cxx_string_lexer () + linemap_init (&line_map_); + #endif + +-#if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 6 ++#if BUILDING_GCC_MAJOR >= 14 ++ line_map_.m_round_alloc_size = ggc_round_alloc_size; ++#elif BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 6 + line_map_.round_alloc_size = ggc_round_alloc_size; + #endif + +diff --git a/odb/processor.cxx b/odb/processor.cxx +index c787e0d1..8f273545 100644 +--- a/odb/processor.cxx ++++ b/odb/processor.cxx +@@ -438,8 +438,14 @@ namespace + // functions. Note that TREE_PUBLIC() returns something + // other than what we need. + // +- if (!DECL_NONSTATIC_MEMBER_FUNCTION_P (f) || +- TREE_PRIVATE (f) || TREE_PROTECTED (f)) ++ if ( ++#if BUILDING_GCC_MAJOR >= 14 ++ !DECL_OBJECT_MEMBER_FUNCTION_P (f) ++#else ++ !DECL_NONSTATIC_MEMBER_FUNCTION_P (f) ++#endif ++ || TREE_PRIVATE (f) ++ || TREE_PROTECTED (f)) + continue; + + found_type r (k == "get" +@@ -548,7 +554,13 @@ namespace + #endif + // We are only interested in non-static member functions. + // +- if (!DECL_NONSTATIC_MEMBER_FUNCTION_P (f)) ++ if ( ++#if BUILDING_GCC_MAJOR >= 14 ++ !DECL_OBJECT_MEMBER_FUNCTION_P (f) ++#else ++ !DECL_NONSTATIC_MEMBER_FUNCTION_P (f) ++#endif ++ ) + continue; + + if ((k == "get" +-- +2.45.2 + From b95fff0185803bac5c8cfb558d60234e59a1469b Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 2 Aug 2024 12:44:37 +0200 Subject: [PATCH 2193/3013] package/mdio-tools: enable CONFIG_NETDEVICES mdio-tools depends on CONFIG_MDIO_DEVICE in order for mdiobus driver to be built, but CONFIG_MDIO_DEVICE depends on CONFIG_NETDEVICES which we are not enabling so on platforms without it enabled in kernel config building mdio-tools will fail with: ERROR: modpost: "mdio_find_bus" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_c45_read" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_read" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_c45_write" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_write" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! So enable CONFIG_NETDEVICES as well to make sure CONFIG_MDIO_DEVICE can be enabled. Fixes: http://autobuild.buildroot.net/results/edf47df96cde6094c890c0b74034cced90335a39/ Signed-off-by: Robert Marko Signed-off-by: Thomas Petazzoni --- package/mdio-tools/mdio-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdio-tools/mdio-tools.mk b/package/mdio-tools/mdio-tools.mk index 16eba747344..b42ea41c79b 100644 --- a/package/mdio-tools/mdio-tools.mk +++ b/package/mdio-tools/mdio-tools.mk @@ -14,6 +14,7 @@ MDIO_TOOLS_MODULE_SUBDIRS = kernel define MDIO_TOOLS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) $(call KCONFIG_ENABLE_OPT,CONFIG_MDIO_DEVICE) endef From f0877f5f9db6d14e39bd9c82ad13937906a2ab62 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 11:33:12 +0200 Subject: [PATCH 2194/3013] package/cwiid: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: led.c: In function 'wmplugin_exec': led.c:86:42: error: assignment to 'struct cwiid_btn_message *' from incompatible pointer type 'struct cwiid_btn_mesg *' [-Wincompatible-pointer-types] 86 | btn_mesg = &mesg[i].btn_mesg; | ^ Fixes: - http://autobuild.buildroot.org/results/a3bde74ff2137d088f4261e62930859bfe460cb9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...gins-led-led.c-fix-build-with-gcc-14.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch diff --git a/package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch b/package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch new file mode 100644 index 00000000000..ba8121802be --- /dev/null +++ b/package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch @@ -0,0 +1,37 @@ +From 10106fdb4cc833faa3c2fcb980d0a4eb121fe19d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 23 Jul 2024 10:31:32 +0200 +Subject: [PATCH] wminput/plugins/led/led.c: fix build with gcc >= 14 + +Fix the following build failure with gcc >= 14: + +led.c: In function 'wmplugin_exec': +led.c:86:42: error: assignment to 'struct cwiid_btn_message *' from incompatible pointer type 'struct cwiid_btn_mesg *' [-Wincompatible-pointer-types] + 86 | btn_mesg = &mesg[i].btn_mesg; + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/a3bde74ff2137d088f4261e62930859bfe460cb9 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/abstrakraft/cwiid/pull/47 +--- + wminput/plugins/led/led.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wminput/plugins/led/led.c b/wminput/plugins/led/led.c +index 93b96d9..591f365 100644 +--- a/wminput/plugins/led/led.c ++++ b/wminput/plugins/led/led.c +@@ -72,7 +72,7 @@ struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[]) + { + int i; + uint8_t button; +- struct cwiid_btn_message *btn_mesg; ++ struct cwiid_btn_mesg *btn_mesg; + + uint8_t led_state = (Led1 ? CWIID_LED1_ON : 0) + | (Led2 ? CWIID_LED2_ON : 0) +-- +2.43.0 + From 86e51fd5fe2810bbf833b48c4914dcd2de01bdbe Mon Sep 17 00:00:00 2001 From: Woodrow Douglass Date: Mon, 22 Jul 2024 13:31:36 -0400 Subject: [PATCH 2195/3013] package/chicken: move literals into text section for xtensa architecture This solves a build problem -- by default xtensa-gcc puts literals in a different section of memory then the program text, and chicken is a very literal-heavy program, so they don't all fit there. This avoids that problem. Fixes: http://autobuild.buildroot.net/results/ce36170d67c4702f34bee025d8a46e5269c4573e/ Signed-off-by: Woodrow Douglass Signed-off-by: Thomas Petazzoni --- .../0001-xtensa-text-section-literals.patch | 30 +++++++++++++++++++ package/chicken/chicken.mk | 14 +++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 package/chicken/0001-xtensa-text-section-literals.patch diff --git a/package/chicken/0001-xtensa-text-section-literals.patch b/package/chicken/0001-xtensa-text-section-literals.patch new file mode 100644 index 00000000000..b93aaf9e218 --- /dev/null +++ b/package/chicken/0001-xtensa-text-section-literals.patch @@ -0,0 +1,30 @@ +From e8d177f4d4e1c6bc41787ea1621e323ff4ad493e Mon Sep 17 00:00:00 2001 +From: Woodrow Douglass +Date: Mon, 22 Jul 2024 08:50:37 -0400 +Subject: [PATCH] Move literals into text section for xtensa architecture + +Upstream: https://bugs.call-cc.org/ticket/1840 +Signed-off-by: Woodrow Douglass +--- + Makefile.linux | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile.linux b/Makefile.linux +index b628cda4..e97c2b94 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -52,6 +52,11 @@ USES_SONAME = yes + + # architectures + ++ifeq ($(ARCH),xtensa) ++C_COMPILER_OPTIONS += -mtext-section-literals ++LINKER_OPTIONS += -mtext-section-literals ++endif ++ + ifeq ($(ARCH),x32) + C_COMPILER_OPTIONS += -mx32 + LINKER_OPTIONS += -mx32 +-- +2.39.2 + diff --git a/package/chicken/chicken.mk b/package/chicken/chicken.mk index 2667f7823d8..0520280134a 100644 --- a/package/chicken/chicken.mk +++ b/package/chicken/chicken.mk @@ -11,9 +11,19 @@ CHICKEN_LICENSE_FILES = LICENSE CHICKEN_CPE_ID_VENDOR = call-cc CHICKEN_INSTALL_STAGING = YES -# If ARCH is not set, it attempts to autodiscover. But it is anyway not used. +# Chicken only uses the "arch" variable for some special-case compile +# arguments If it's empty, it tries to detect the arch host Filter out +# values that have an effect, or pass "unused" here +ifeq ($(NORMALIZED_ARCH),x86_64) +CHICKEN_ARCH = x86-64 +else ifeq ($(NORMALIZED_ARCH),xtensa) +CHICKEN_ARCH = xtensa +else +CHICKEN_ARCH = unused +endif + CHICKEN_MAKE_OPTS = \ - ARCH=unused \ + ARCH="$(CHICKEN_ARCH)" \ C_COMPILER="$(TARGET_CC)" \ CXX_COMPILER="$(TARGET_CXX)" \ PREFIX=/usr \ From 9880dba15c25ff8d1ca59a255a538b8fb881962c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 26 Jul 2024 10:53:52 +0200 Subject: [PATCH 2196/3013] package/cairo: fix build without threads Fix the following build failure without threads raised since switch to meson-package in commit 1fa58814c09a71444f961b61a9a2c399b9163fc2 which wrongly removed -DCAIRO_NO_MUTEX=1: In file included from ../src/cairo-mutex-type-private.h:45, from ../src/cairo-scaled-font-private.h:45, from ../src/cairoint.h:415, from ../src/cairo-arc.c:37: ../src/cairo-mutex-impl-private.h:231:3: error: #error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." 231 | # error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." | ^~~~~ Note that prior to 1fa58814c09a71444f961b61a9a2c399b9163fc2, the condition was: ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" endif but that was in fact wrong, because it meant that toolchain with linuxthreads (not NPTL) would have thread support, but a thread-unsafe cairo library. The condition was changed from BR2_TOOLCHAIN_HAS_THREADS to BR2_TOOLCHAIN_HAS_THREADS_NPTL in an older commit, 92f14307ba670058d0b3692fb8e82753d6ad6868, but now cairo's mutex support builds fine with linuxthreads, so we can use CAIRO_NO_MUTEX=1 only when thread support is not available at all. Fixes: 1fa58814c09a71444f961b61a9a2c399b9163fc2 - http://autobuild.buildroot.org/results/a123355b6d315d2fcda646d3f1c7b588cba78258 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cairo/cairo.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4ace04ebbe7..ba25620f8d5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -20,6 +20,10 @@ ifeq ($(BR2_m68k_cf),y) CAIRO_CFLAGS += -mxgot endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +CAIRO_CFLAGS += -DCAIRO_NO_MUTEX=1 +endif + # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From 668867bfed9a4decd7fd74d87d742368030b9399 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 19:47:44 +0200 Subject: [PATCH 2197/3013] package/bcusdk: fixup upstream tag in patch 0001 The patch 0001 has been submitted upstream, but the formatting of the tag was not correct, let's fix this. Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-fd_set-requires-inclusion-of-sys-select.h.patch | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 9d2da90aa19..0f58f9a1491 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -334,7 +334,6 @@ package/bc/0003-dc-fix-exit-code-of-q-command.patch lib_patch.Upstream package/bc/0004-no-gen-libmath.patch lib_patch.Upstream package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch lib_patch.Upstream package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch lib_patch.Upstream -package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch lib_patch.Upstream package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch lib_patch.Upstream package/bearssl/0001-Fix-missing-objdir-dependency.patch lib_patch.Upstream package/benejson/0001-c-std.patch lib_patch.Upstream diff --git a/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch b/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch index 723de5c1a29..f89658836f7 100644 --- a/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch +++ b/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch @@ -7,8 +7,7 @@ According to POSIX.1-2001, the definition fd_set and related macros is in , so it should be included in files using fd_set to make the code compatible with all standard C libraries. -Submitted upstream: https://sourceforge.net/p/bcusdk/patches/3/ - +Upstream: https://sourceforge.net/p/bcusdk/patches/3/ Signed-off-by: Thomas Petazzoni --- eibd/examples/common.h | 1 + From e4109c1d2d28f737409dce2e346661cbf20084c6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 19:44:56 +0200 Subject: [PATCH 2198/3013] package/bcusdk: fix build with host GCC 14.x With GCC 14.x as the host compiler, bcusdk fails to build as follows: configure: error: Specified CC_FOR_BUILD doesn't seem to work This is due to missing includes in the test programs used in the configure script to check the host compiler. We fix this with patch 0003. However, this patch requires to autoreconf the package, and autoreconf would need the definition of AM_PATH_XML2, which would require libxml2 even though we don't have libxml2 as a dependency of this package (we don't enable the features that requires libxml2). As it turns out that the AM_PATH_XML2 macro is in fact deprecated, we replaced it by its equivalent using PKG_CHECK_MODULES(), which is in fact exactly how AM_PATH_XML2 is implemented in upstream libxml2. Fixes: http://autobuild.buildroot.net/results/458880bd6c207e5bb7afce1a1186f204c30c0941/ Signed-off-by: Thomas Petazzoni --- ....m4-include-stdlib.h-in-test-program.patch | 50 +++++++++++++++++++ ...lace-obsolete-AM_PATH_XML2-by-PKG_CH.patch | 40 +++++++++++++++ package/bcusdk/bcusdk.mk | 6 ++- 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch create mode 100644 package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch diff --git a/package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch b/package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch new file mode 100644 index 00000000000..36b8f3d744c --- /dev/null +++ b/package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch @@ -0,0 +1,50 @@ +From 1c78aa3541f730e9624504168fb0e1f413e5cbb8 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 2 Aug 2024 19:28:36 +0200 +Subject: [PATCH] m4/ccforbuild.m4: include in test program + +The GMP_PROG_CC_FOR_BUILD_WORKS and GMP_PROG_EXEEXT_FOR_BUILD macros +do various checks to verify if the host compiler works, but their test +programs lack the inclusion of , needed for exit(). This +causes a build failure with gcc 14.x: + +conftest.c: In function 'main': +conftest.c:4:3: error: implicit declaration of function 'exit' [-Wimplicit-function-declaration] + 4 | exit(0); + +which then causes the configure script to think that the host compiler +does not work: + +configure: error: Specified CC_FOR_BUILD doesn't seem to work + +so let's include to fix this issue. + +Upstream: https://sourceforge.net/p/bcusdk/patches/4/ +Signed-off-by: Thomas Petazzoni +--- + m4/ccforbuild.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/m4/ccforbuild.m4 b/m4/ccforbuild.m4 +index a466cab..389deaa 100644 +--- a/m4/ccforbuild.m4 ++++ b/m4/ccforbuild.m4 +@@ -66,6 +66,7 @@ AC_DEFUN([GMP_PROG_CC_FOR_BUILD_WORKS], + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c < + int + main () + { +@@ -140,6 +141,7 @@ AC_DEFUN([GMP_PROG_EXEEXT_FOR_BUILD], + AC_CACHE_CHECK([for build system executable suffix], + gmp_cv_prog_exeext_for_build, + [cat >conftest.c < + int + main () + { +-- +2.45.2 + diff --git a/package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch b/package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch new file mode 100644 index 00000000000..899f8c0f3b0 --- /dev/null +++ b/package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch @@ -0,0 +1,40 @@ +From 8402c1ffccb2eeb47581d2d80b81e94433cdacb7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 2 Aug 2024 19:35:02 +0200 +Subject: [PATCH] configure.in: replace obsolete AM_PATH_XML2 by + PKG_CHECK_MODULES + +According to the libxml2 code: + + AM_PATH_XML2 is deprecated, use PKG_CHECK_MODULES instead + +See: + + https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/libxml.m4 + +Upstream: https://sourceforge.net/p/bcusdk/patches/5/ +Signed-off-by: Thomas Petazzoni +--- + configure.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 7f3a8bd..82176d9 100644 +--- a/configure.in ++++ b/configure.in +@@ -81,7 +81,11 @@ AM_CONDITIONAL(HAVE_ONLYEIBD, test x$onlyeibd = xtrue) + + if test x$onlyeibd = xfalse ; then + +-AM_PATH_XML2(2.6.16,,[AC_MSG_ERROR([limxml2 not found])]) ++PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.16], [], [AC_MSG_ERROR([limxml2 not found])]) ++XML_CPPFLAGS=$XML_CFLAGS ++AC_SUBST(XML_CPPFLAGS) ++AC_SUBST(XML_LIBS) ++ + AC_PATH_PROG(TAS,[m68hc05-as],,[$PATH:$bindir:$prefix/bin]) + AC_PATH_PROG(TLD,[m68hc05-ld],,[$PATH:$bindir:$prefix/bin]) + AC_PATH_PROG(TAR,[m68hc05-ar],,[$PATH:$bindir:$prefix/bin]) +-- +2.45.2 + diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk index f14b23c7cc9..4defd29ba10 100644 --- a/package/bcusdk/bcusdk.mk +++ b/package/bcusdk/bcusdk.mk @@ -10,6 +10,9 @@ BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib BCUSDK_LICENSE = GPL-2.0+ BCUSDK_LICENSE_FILES = COPYING BCUSDK_INSTALL_STAGING = YES +# 0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch +# 0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch +BCUSDK_AUTORECONF = YES BCUSDK_CONF_OPTS = \ --enable-onlyeibd \ --enable-ft12 \ @@ -21,7 +24,8 @@ BCUSDK_CONF_OPTS = \ --without-pth-test \ --with-pth=$(STAGING_DIR)/usr -BCUSDK_DEPENDENCIES = libpthsem +# host-pkgconf is only needed because of autoreconf +BCUSDK_DEPENDENCIES = libpthsem host-pkgconf ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) BCUSDK_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) From b6db4e2a79da7aadcbe2beda3e00381afb9e3f28 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 15:20:58 +0200 Subject: [PATCH 2199/3013] package/pistache: needs NPTL pistache needs NPTL as it unconditionally uses pthread_setname_np since https://github.com/pistacheio/pistache/commit/b283c32963a7cb0500cf69555d320a6e9e252850 resulting in the following uclibc build failure since commit 82e61bed8208857d5d13c384c89086c4dd4e1e79: ../src/common/reactor.cc: In lambda function: ../src/common/reactor.cc:512:25: error: 'pthread_setname_np' was not declared in this scope; did you mean 'pthread_setcanceltype'? 512 | pthread_setname_np(pthread_self(), | ^~~~~~~~~~~~~~~~~~ | pthread_setcanceltype Fixes: 82e61bed8208857d5d13c384c89086c4dd4e1e79 - http://autobuild.buildroot.org/results/b2b22e4f9684aca0246650673fd8c33019712ddf - http://autobuild.buildroot.org/results/1597bfe2a57cd3aef54d331447dd81cae020d434 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pistache/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index ca2d2833cdc..e66c24d86d8 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PISTACHE bool "pistache" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_RAPIDJSON help @@ -12,8 +12,8 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar" +comment "pistache needs a toolchain w/ C++, gcc >= 7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_USE_WCHAR From ca742a985cc9acc40fff3539c696e64fa040f1c4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 15:30:04 +0200 Subject: [PATCH 2200/3013] package/rtty: bump to version 8.1.2 - Drop patch (already in version) - This bump will fix the following build failure with musl >= 1.2.5 thanks to https://github.com/zhaojh329/rtty/commit/eb6394c3d83a21a8825e47b40659cfe0ead33b6f: /home/autobuild/autobuild/instance-22/output-1/build/rtty-8.1.0/src/file.c: In function 'start_upload_file': /home/autobuild/autobuild/instance-22/output-1/build/rtty-8.1.0/src/file.c:156:24: error: implicit declaration of function 'basename' [-Werror=implicit-function-declaration] 156 | const char *name = basename(path); | ^~~~~~~~ https://github.com/zhaojh329/rtty/releases/tag/v8.1.2 https://github.com/zhaojh329/rtty/releases/tag/v8.1.1 Fixes: - http://autobuild.buildroot.org/results/382405b421a8ea7b5b3beb553f47fa20427fa3c3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...keLists.txt-prefer-pkg_check_modules.patch | 40 ------------------- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 2 +- 4 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0f58f9a1491..2d9b0c13ca5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1177,7 +1177,6 @@ package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.p package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch lib_patch.Upstream package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch lib_patch.Upstream package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patch.Upstream -package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream package/rubix/0001-dont-use-legacy-functions.patch lib_patch.Upstream package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream package/rygel/S99rygel Shellcheck lib_sysv.Indent lib_sysv.Variables diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch deleted file mode 100644 index 37140504456..00000000000 --- a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 26 Feb 2023 20:39:11 +0100 -Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules - -Prefer pkg_check_modules over find_package to avoid the following static -build failure with openssl and -latomic: - -/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': -ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' - -Fixes: - - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/ssl/pull/4] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt -index 4868bf7..36488c7 100644 ---- a/src/ssl/CMakeLists.txt -+++ b/src/ssl/CMakeLists.txt -@@ -14,10 +14,10 @@ endif() - - find_package(PkgConfig QUIET) - --find_package(OpenSSL) -+pkg_check_modules(OPENSSL openssl) - - if (NOT OPENSSL_FOUND) -- pkg_check_modules(OPENSSL openssl) -+ find_package(OpenSSL) - endif() - - find_package(WolfSSL) --- -2.39.1 - diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index a6ccb5c2e67..004314eea18 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz +sha256 522b0fc5e032c3b84ac707abce8ac4ff5609900011f8f300ce4f4246abac0acc rtty-8.1.2.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index b2fac144322..618971c9a33 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 8.1.0 +RTTY_VERSION = 8.1.2 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE From 79877bbdb165c8eef90b8aecf75d2dd8363e4995 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Fri, 2 Aug 2024 20:39:00 +0300 Subject: [PATCH 2201/3013] package/wpa_supplicant: bump version to 2.11 Update wpa_supplicant to the latest release v2.11. Drop all the patches as they are already included into the release. Hash of the README file used as license file has changed due to: -Copyright (c) 2002-2022, Jouni Malinen and contributors +Copyright (c) 2002-2024, Jouni Malinen and contributors Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...le-options-for-libwpa_client.so-and-.patch | 68 ---------------- ...se-a-less-generic-name-for-IEEE802.1.patch | 79 ------------------- ...384-512-KDF-for-SAE-if-SHA384-512-is.patch | 64 --------------- package/wpa_supplicant/wpa_supplicant.hash | 4 +- package/wpa_supplicant/wpa_supplicant.mk | 2 +- 6 files changed, 3 insertions(+), 215 deletions(-) delete mode 100644 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch delete mode 100644 package/wpa_supplicant/0002-wpa_supplicant-use-a-less-generic-name-for-IEEE802.1.patch delete mode 100644 package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2d9b0c13ca5..10662bb11ed 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1386,7 +1386,6 @@ package/wipe/0001-musl.patch lib_patch.Upstream package/wireless_tools/0001-remove-bzero.patch lib_patch.Upstream package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch lib_patch.Upstream package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch lib_patch.Upstream -package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch lib_patch.Upstream package/wpa_supplicant/ifupdown.sh Shellcheck package/x11r7/xapp_luit/0001-posix-openpt.patch lib_patch.Upstream package/x11r7/xapp_xdm/S99xdm lib_sysv.Indent lib_sysv.Variables diff --git a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch deleted file mode 100644 index 156d0e7e2c2..00000000000 --- a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich -Date: Sun, 20 Feb 2022 10:12:28 +0300 -Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase - -Commit a41a29192e5d ("build: Pull common fragments into a build.rules -file") introduced regression into wpa_supplicant build process. Build -target libwpa_client.so is not built regardless of whether the option -CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config -option is used before it is imported from the configuration file. -Moving its usage after including build.rules does not help: variable -ALL is processed by build.rules and further changes are not applied. -Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as -expected: wpa_passphrase is always built regardless of whether the -option is set or not. - -This commit re-enables options adding both build targets to _all -dependencies. - -Signed-off-by: Sergey Matyukevich ---- - wpa_supplicant/Makefile | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) - -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index cb66defac..e384cc6b8 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1,24 +1,29 @@ - BINALL=wpa_supplicant wpa_cli - --ifndef CONFIG_NO_WPA_PASSPHRASE --BINALL += wpa_passphrase --endif -- - ALL = $(BINALL) - ALL += systemd/wpa_supplicant.service - ALL += systemd/wpa_supplicant@.service - ALL += systemd/wpa_supplicant-nl80211@.service - ALL += systemd/wpa_supplicant-wired@.service - ALL += dbus/fi.w1.wpa_supplicant1.service --ifdef CONFIG_BUILD_WPA_CLIENT_SO --ALL += libwpa_client.so --endif - - EXTRA_TARGETS=dynamic_eap_methods - - CONFIG_FILE=.config - include ../src/build.rules - -+ifdef CONFIG_BUILD_WPA_CLIENT_SO -+# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO -+# being set in the config which is read by build.rules -+_all: libwpa_client.so -+endif -+ -+ifndef CONFIG_NO_WPA_PASSPHRASE -+# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE -+# being set in the config which is read by build.rules -+_all: wpa_passphrase -+endif -+ - ifdef LIBS - # If LIBS is set with some global build system defaults, clone those for - # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. --- -2.35.1 - diff --git a/package/wpa_supplicant/0002-wpa_supplicant-use-a-less-generic-name-for-IEEE802.1.patch b/package/wpa_supplicant/0002-wpa_supplicant-use-a-less-generic-name-for-IEEE802.1.patch deleted file mode 100644 index a8637111bb5..00000000000 --- a/package/wpa_supplicant/0002-wpa_supplicant-use-a-less-generic-name-for-IEEE802.1.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c8af2e431b47d7d900e0c7359705aaa1096d302a Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich -Date: Fri, 16 Sep 2022 23:18:50 +0300 -Subject: [PATCH] wpa_supplicant: use a less generic name for IEEE802.11 CRC-32 routine - -Hostapd uses 'crc32' name for IEEE802.11 CRC-32 routine. This name is -too generic. Buildroot autobuilder detected build configuration that -failed to build due to the naming conflict: static linking with openssl -using zlib-ng as a zlib provider, e.g. see: -- http://autobuild.buildroot.net/results/9901df820d3afa4cde78e8ad6d62cb8ce7e69fdb/ -- http://autobuild.buildroot.net/results/ac19975f0bf77f4a8ca574c374092ba81cd5a332/ - -Use a less generic name ieee80211_crc32 for IEEE802.11 CRC-32 routine -to avoid such naming conflicts. - -Upstream: https://w1.fi/cgit/hostap/commit/?id=0c7b3814ca6070a8e930dea09fde08b4058a4ca6 -Signed-off-by: Sergey Matyukevich ---- - src/ap/hostapd.c | 3 ++- - src/ap/neighbor_db.c | 2 +- - src/utils/crc32.c | 2 +- - src/utils/crc32.h | 2 +- - 4 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c -index 4b88641a2..56c8fb90e 100644 ---- a/src/ap/hostapd.c -+++ b/src/ap/hostapd.c -@@ -1230,7 +1230,8 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first) - * Short SSID calculation is identical to FCS and it is defined in - * IEEE P802.11-REVmd/D3.0, 9.4.2.170.3 (Calculating the Short-SSID). - */ -- conf->ssid.short_ssid = crc32(conf->ssid.ssid, conf->ssid.ssid_len); -+ conf->ssid.short_ssid = ieee80211_crc32(conf->ssid.ssid, -+ conf->ssid.ssid_len); - - if (!hostapd_drv_none(hapd)) { - wpa_printf(MSG_DEBUG, "Using interface %s with hwaddr " MACSTR -diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c -index 229edd2a9..ef17634c3 100644 ---- a/src/ap/neighbor_db.c -+++ b/src/ap/neighbor_db.c -@@ -136,7 +136,7 @@ int hostapd_neighbor_set(struct hostapd_data *hapd, const u8 *bssid, - - os_memcpy(entry->bssid, bssid, ETH_ALEN); - os_memcpy(&entry->ssid, ssid, sizeof(entry->ssid)); -- entry->short_ssid = crc32(ssid->ssid, ssid->ssid_len); -+ entry->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); - - entry->nr = wpabuf_dup(nr); - if (!entry->nr) -diff --git a/src/utils/crc32.c b/src/utils/crc32.c -index 12d9e2a70..371254994 100644 ---- a/src/utils/crc32.c -+++ b/src/utils/crc32.c -@@ -72,7 +72,7 @@ static const u32 crc32_table[256] = { - }; - - --u32 crc32(const u8 *frame, size_t frame_len) -+u32 ieee80211_crc32(const u8 *frame, size_t frame_len) - { - size_t i; - u32 crc; -diff --git a/src/utils/crc32.h b/src/utils/crc32.h -index dc31399be..71a19dc5f 100644 ---- a/src/utils/crc32.h -+++ b/src/utils/crc32.h -@@ -9,6 +9,6 @@ - #ifndef CRC32_H - #define CRC32_H - --u32 crc32(const u8 *frame, size_t frame_len); -+u32 ieee80211_crc32(const u8 *frame, size_t frame_len); - - #endif /* CRC32_H */ --- -2.37.1 - diff --git a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch deleted file mode 100644 index 98df56e5406..00000000000 --- a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch +++ /dev/null @@ -1,64 +0,0 @@ -From c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 17 Apr 2022 12:28:41 +0300 -Subject: [PATCH] Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included - -It was possible to miss the HMAC functions if some other build -configuration parameters ended up setting NEED_SHA384/512=y. - -Upstream: https://w1.fi/cgit/hostap/commit/?id=c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 - -Signed-off-by: Jouni Malinen -Signed-off-by: Sergey Matyukevich ---- - wpa_supplicant/Android.mk | 11 +++++++++++ - wpa_supplicant/Makefile | 11 +++++++++++ - 2 files changed, 22 insertions(+) - -diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk -index 0e0ce467c..bcdbd6c90 100644 ---- a/wpa_supplicant/Android.mk -+++ b/wpa_supplicant/Android.mk -@@ -1361,6 +1361,17 @@ endif - endif - endif - -+ifdef CONFIG_SAE -+ifdef NEED_SHA384 -+# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. -+NEED_HMAC_SHA384_KDF=y -+endif -+ifdef NEED_SHA512 -+# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. -+NEED_HMAC_SHA512_KDF=y -+endif -+endif -+ - SHA256OBJS = # none by default - L_CFLAGS += -DCONFIG_SHA256 - ifneq ($(CONFIG_TLS), openssl) -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index ed49aa972..69c80121c 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1475,6 +1475,17 @@ endif - endif - endif - -+ifdef CONFIG_SAE -+ifdef NEED_SHA384 -+# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. -+NEED_HMAC_SHA384_KDF=y -+endif -+ifdef NEED_SHA512 -+# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. -+NEED_HMAC_SHA512_KDF=y -+endif -+endif -+ - SHA256OBJS = # none by default - CFLAGS += -DCONFIG_SHA256 - ifneq ($(CONFIG_TLS), openssl) --- -2.39.2 - diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index fcaee0a30b1..2f38dc257aa 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz -sha256 af01e1d1ee065a1054d20ebe8a78a016f1fb1133b73e6a9d50801b165bb280c7 README +sha256 912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a wpa_supplicant-2.11.tar.gz +sha256 f1b5992bbdd015c3ccb7faaadd62ef58ed821e15b9329bf2ceb27511ccc3f562 README diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 42c6f772acb..984959f6799 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPA_SUPPLICANT_VERSION = 2.10 +WPA_SUPPLICANT_VERSION = 2.11 WPA_SUPPLICANT_SITE = http://w1.fi/releases WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README From 4703a7ae9176b3a9d824880ef095b1b80c123df4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 23:50:41 +0200 Subject: [PATCH 2202/3013] package/xz: fix musl static build Runnning autoreconf is needed to avoid the following static build failure on musl which is raised as otherwise LDFLAGS (which contains -static) is not passed: /home/autobuild/autobuild/instance-16/output-1/host/lib/gcc/armeb-buildroot-linux-musleabi/13.3.0/../../../../armeb-buildroot-linux-musleabi/bin/ld: /home/autobuild/autobuild/instance-16/output-1/host/lib/gcc/armeb-buildroot-linux-musleabi/13.3.0/libgcc.a(_dvmd_lnx.o): in function `__aeabi_idiv0': /home/autobuild/autobuild/instance-16/output-1/build/host-gcc-final-13.3.0/build/armeb-buildroot-linux-musleabi/libgcc/../../../libgcc/config/arm/lib1funcs.S:1499:(.text+0x8): undefined reference to `raise' This build failure is raised by autobuilders since bump to version 5.6.2 in commit d1d77eb274761d1f2d24ee4b55a374e917c67a8e but it can also be reproduced on version 5.4.7 (but not on 5.4.6). There is probably an issue with these two official autotools tarballs which have been released the same day (on May 29 2024). Fixes: 40240ac30afc4c6af765794f38e6815162ca61fa http://autobuild.buildroot.org/results/344813b202644a23c166920aa7e861ebf408536b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xz/xz.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 8dfd76f8b9b..9fb93ff4d6b 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -12,6 +12,8 @@ XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, BSD-0-Clause, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani +# autoreconf needed to fix a musl static build failure +XZ_AUTORECONF = YES # The package is a dependency to ccache so ccache cannot be a dependency HOST_XZ_ADD_CCACHE_DEPENDENCY = NO From 905409a245a5adfbca4dcf934a52aaca992a5435 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 26 Jul 2024 18:45:22 +0200 Subject: [PATCH 2203/3013] package/dtv-scan-tables: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dtv-scan-tables/dtv-scan-tables.hash | 2 +- package/dtv-scan-tables/dtv-scan-tables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dtv-scan-tables/dtv-scan-tables.hash b/package/dtv-scan-tables/dtv-scan-tables.hash index fd2edb13c81..f110bb6dee5 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.hash +++ b/package/dtv-scan-tables/dtv-scan-tables.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6bf3e1839f3c4ab9c63994043c1a5dfd3e2b9a6f717fd1db3db0e7a53baf5518 dtv-scan-tables-57ed2982275045ea5e92ef2a40b9fa58255852e5-git4.tar.gz +sha256 a6ffaeec227c35d8afe79b9d7b7a2dd9d3367c33dc1c3d5d5729cebd4973ef48 dtv-scan-tables-7098bdd27548eaf3e5d9485fc68575f88e362daf-git4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk index 45264a41c5a..d9e6910abdb 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/package/dtv-scan-tables/dtv-scan-tables.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTV_SCAN_TABLES_VERSION = 57ed2982275045ea5e92ef2a40b9fa58255852e5 +DTV_SCAN_TABLES_VERSION = 7098bdd27548eaf3e5d9485fc68575f88e362daf DTV_SCAN_TABLES_SITE = https://git.linuxtv.org/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git From d9c6e47534e4dadbcf727857d0be387299cabb2b Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 20 Jun 2024 16:38:51 +0200 Subject: [PATCH 2204/3013] package/optee-client: add support for custom tarball OP-TEE OS supports custom tarballs. If the OP-TEE OS custom tarball version does not match the latest optee-client version supported by Buildroot, optee-client might not build or run properly. This patch adds support for an optee-client custom tarball URL to address this potential issue. Signed-off-by: Kory Maincent Acked-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- package/optee-client/Config.in | 38 ++++++++++++++++++++++++++++ package/optee-client/optee-client.mk | 21 +++++++++++++-- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index 4061164cbb0..738d43f8372 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -17,6 +17,44 @@ config BR2_PACKAGE_OPTEE_CLIENT if BR2_PACKAGE_OPTEE_CLIENT +choice + prompt "optee-client version" + default BR2_PACKAGE_OPTEE_CLIENT_LATEST + help + Select the version of optee-client you want to use + +config BR2_PACKAGE_OPTEE_CLIENT_LATEST + bool "4.3.0" + help + Use the latest release tag from the optee-client official Git + repository. + +config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an + optee-client source tarball. This URL can use any protocol + recognized by Buildroot, like http://, ftp://, file:// + or scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + +endchoice + +if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL + +config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION + string "URL of custom optee-client tarball" + +endif + +config BR2_PACKAGE_OPTEE_CLIENT_VERSION + string + default "4.3.0" if BR2_PACKAGE_OPTEE_CLIENT_LATEST + default "custom" if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL + config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH string "Path for normal world OS secure storage" default "/data/tee" diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index c1813cd9b11..de3ff1df7fc 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,12 +4,23 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 4.3.0 -OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) +OPTEE_CLIENT_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE OPTEE_CLIENT_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL),y) +OPTEE_CLIENT_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)) +OPTEE_CLIENT_SITE = $(patsubst %/,%,$(dir $(OPTEE_CLIENT_TARBALL))) +OPTEE_CLIENT_SOURCE = $(notdir $(OPTEE_CLIENT_TARBALL)) +else +OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) +endif + +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT):$(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_CLIENT_SOURCE) +endif + OPTEE_CLIENT_CONF_OPTS = \ -DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) \ -DCFG_WERROR=OFF @@ -38,4 +49,10 @@ define OPTEE_CLIENT_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S30tee-supplicant endef +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION) +endif +endif + $(eval $(cmake-package)) From 9826d06cb3b8f7236a863597b3cb27df52b228a6 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 20 Jun 2024 16:38:52 +0200 Subject: [PATCH 2205/3013] package/optee-test: add support for custom tarball OP-TEE OS supports custom tarballs. If the OP-TEE OS custom tarball version does not match the latest optee-test version supported by Buildroot, optee-test might not build or run properly. This patch adds support for an optee-test custom tarball URL to address this potential issue. Signed-off-by: Kory Maincent Acked-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- package/optee-test/Config.in | 41 ++++++++++++++++++++++++++++++++ package/optee-test/optee-test.mk | 21 ++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index 57a7834c753..a29eb355ac2 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -31,3 +31,44 @@ comment "optee-test needs a toolchain w/ threads, C++, dynamic library, headers depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + +if BR2_PACKAGE_OPTEE_TEST + +choice + prompt "optee-test version" + default BR2_PACKAGE_OPTEE_TEST_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + help + Select the version of optee-test you want to use + +config BR2_PACKAGE_OPTEE_TEST_LATEST + bool "4.3.0" + help + Use the latest release tag from the optee-test official Git + repository. + +config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an optee-test + source tarball. This URL can use any protocol recognized by + Buildroot, like http://, ftp://, file:// or scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + +endchoice + +if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL + +config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION + string "URL of custom optee-test tarball" + +endif + +config BR2_PACKAGE_OPTEE_TEST_VERSION + string + default "4.3.0" if BR2_PACKAGE_OPTEE_TEST_LATEST + default "custom" if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL + +endif # BR2_PACKAGE_OPTEE_TEST diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 9037678b1d9..c250639d061 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,11 +4,22 @@ # ################################################################################ -OPTEE_TEST_VERSION = 4.3.0 -OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) +OPTEE_TEST_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md +ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL),y) +OPTEE_TEST_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)) +OPTEE_TEST_SITE = $(patsubst %/,%,$(dir $(OPTEE_TEST_TARBALL))) +OPTEE_TEST_SOURCE = $(notdir $(OPTEE_TEST_TARBALL)) +else +OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) +endif + +ifeq ($(BR2_PACKAGE_OPTEE_TEST):$(BR2_PACKAGE_OPTEE_TEST_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_TEST_SOURCE) +endif + OPTEE_TEST_DEPENDENCIES = optee-client optee-os ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) @@ -34,4 +45,10 @@ endef OPTEE_TEST_POST_BUILD_HOOKS += OPTEE_TEST_BUILD_TAS OPTEE_TEST_POST_INSTALL_TARGET_HOOKS += OPTEE_TEST_INSTALL_TAS +ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION) +endif +endif + $(eval $(cmake-package)) From 500ff76216a58df2eff2fd254e8efcd64565ba63 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 20 Jun 2024 16:38:53 +0200 Subject: [PATCH 2206/3013] package/optee-examples: add support for custom tarball OP-TEE OS supports custom tarballs. If the OP-TEE OS custom tarball version does not match the latest optee-examples version supported by Buildroot, optee-examples might not build or run properly. This patch adds support for an optee-examples custom tarball URL to address this potential issue. Signed-off-by: Kory Maincent Acked-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- package/optee-examples/Config.in | 42 ++++++++++++++++++++++++ package/optee-examples/optee-examples.mk | 21 ++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index eb6ee165025..52ef268ac49 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -26,3 +26,45 @@ comment "optee-examples needs a toolchain w/ threads, dynamic library, headers > depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + +if BR2_PACKAGE_OPTEE_EXAMPLES + +choice + prompt "optee-examples version" + default BR2_PACKAGE_OPTEE_EXAMPLES_LATEST + help + Select the version of optee-examples you want to use + +config BR2_PACKAGE_OPTEE_EXAMPLES_LATEST + bool "4.3.0" + help + Use the latest release tag from the optee-examples official + Git repository. + +config BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an + optee-examples source tarball. This URL can use any protocol + recognized by Buildroot, like http://, ftp://, file:// or + scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + +endchoice + +if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL + +config BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION + string "URL of custom optee-examples tarball" + +endif + +config BR2_PACKAGE_OPTEE_EXAMPLES_VERSION + string + default "4.3.0" if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST + default "custom" if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL + +endif # BR2_PACKAGE_OPTEE_EXAMPLES diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 8eb8724ff62..fc90cfcff61 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,11 +4,22 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 4.3.0 -OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) +OPTEE_EXAMPLES_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL),y) +OPTEE_EXAMPLES_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION)) +OPTEE_EXAMPLES_SITE = $(patsubst %/,%,$(dir $(OPTEE_EXAMPLES_TARBALL))) +OPTEE_EXAMPLES_SOURCE = $(notdir $(OPTEE_EXAMPLES_TARBALL)) +else +OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) +endif + +ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES):$(BR2_PACKAGE_OPTEE_EXAMPLES_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_EXAMPLES_SOURCE) +endif + OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os # Trusted Application are not built from CMake due to ta_dev_kit dependencies. @@ -28,4 +39,10 @@ endef OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_TAS OPTEE_EXAMPLES_POST_INSTALL_TARGET_HOOKS += OPTEE_EXAMPLES_INSTALL_TAS +ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION) +endif +endif + $(eval $(cmake-package)) From 65f8174648a3df922892cfac1ad15279d1bffde3 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 27 Jun 2024 22:33:32 +0300 Subject: [PATCH 2207/3013] package/wpewebkit: disable libdrm usage when not available Pass USE_LIBDRM=OFF to the wpewebkit CMake configuration step when the libdrm package has not been selected. WPE WebKit can be built without libdrm support, and it will still work with backends that use other platform-specific methods to handle graphics buffers and/or presenting content onto an output. For example this is the case with wpebackend-rdk configured to use rpi-userland, which uses dispmanx to produce the output instead of DRM/KMS. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpewebkit/wpewebkit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 1355b65f616..36de0213f3e 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -93,6 +93,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=ON +WPEWEBKIT_DEPENDENCIES += libdrm +else +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=OFF +endif + ifeq ($(BR2_PACKAGE_WOFF2),y) WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON WPEWEBKIT_DEPENDENCIES += woff2 From 9696d277565159029e74efb9eae16b4a670bf945 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:23:57 +0200 Subject: [PATCH 2208/3013] package/gpsd: condition python stuff to the proper kconfig option Currently, we have a Kconfig symbol to enable the python support in gpsd, but the condition at configure time is based on whether the python package is enabled. So, if a user does not enable python support in gpsd, they still get it. Switch to using the proper symbol. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Reviewed-by: Jan Havran Signed-off-by: Thomas Petazzoni --- package/gpsd/gpsd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 1d4013d1222..c57fad83c34 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -178,7 +178,7 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" From b88d2b51a4bd2d825d71730bde934dc9991fc6cf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:23:58 +0200 Subject: [PATCH 2209/3013] package/gpsd: fix comment about wchar requirement The comment does not follow the coding style, so update it appropriately. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gpsd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 8c28c05efd6..44615f4e433 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -84,7 +84,7 @@ config BR2_PACKAGE_GPSD_PYTHON Python libraries and tools for the gpsd service daemon including gpsfake test harness. -comment "GPSD python support not available with toolchain w/o wide characters support" +comment "python support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR comment "Protocols" From 5cd3797e9bd103d3c02f37875fda96350863620d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:23:59 +0200 Subject: [PATCH 2210/3013] package/gpsd: move python option later It's in the middle of options that are specific to the daemon, while it itself is not specific to the daemon. We're going to add an option to enable/disable the daemon soon, so that python option would get hidden away. Move it further down, out of scope of the daemon-related options. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gpsd/Config.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 44615f4e433..1b61f8c286a 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -76,17 +76,6 @@ config BR2_PACKAGE_GPSD_MAX_DEV_VALUE config BR2_PACKAGE_GPSD_SQUELCH bool "squelch gpsd_report and gpsd_hexdump to save cpu" -config BR2_PACKAGE_GPSD_PYTHON - bool "build Python support and modules" - depends on BR2_USE_WCHAR # python3 - select BR2_PACKAGE_PYTHON3 - help - Python libraries and tools for the gpsd service daemon - including gpsfake test harness. - -comment "python support needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - comment "Protocols" config BR2_PACKAGE_GPSD_AIVDM @@ -221,4 +210,15 @@ config BR2_PACKAGE_GPSD_UBX help uBlox UBX binary support +config BR2_PACKAGE_GPSD_PYTHON + bool "build Python support and modules" + depends on BR2_USE_WCHAR # python3 + select BR2_PACKAGE_PYTHON3 + help + Python libraries and tools for the gpsd service daemon + including gpsfake test harness. + +comment "python support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + endif From ef35d60e1a7f74d381deee26051f78c8bde0002d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:24:00 +0200 Subject: [PATCH 2211/3013] package/gpsd: add option to enable clients In some cases, the clients are useless on the target, e.g. when there is no need to adjust the gpsd daemon at runtime. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gpsd/Config.in | 11 +++++++++++ package/gpsd/gpsd.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 1b61f8c286a..cbdcdb5725d 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -210,6 +210,17 @@ config BR2_PACKAGE_GPSD_UBX help uBlox UBX binary support +config BR2_PACKAGE_GPSD_CLIENTS + bool "gpsd clients" + default y # legacy + help + Build and install gspd client programs, like: + - gpsctl + - gpsdctl + - gpsdecode + - gpspipe + - ... + config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" depends on BR2_USE_WCHAR # python3 diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index c57fad83c34..77c6f6c562c 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -178,6 +178,12 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif +ifeq ($(BR2_PACKAGE_GPSD_CLIENTS),y) +GPSD_SCONS_OPTS += gpsdclients=yes +else +GPSD_SCONS_OPTS += gpsdclients=no +endif + ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y) GPSD_SCONS_OPTS += \ python=yes \ From f6aa6d1a5f7d57f65d47e3eb250a18ae23662b02 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:24:01 +0200 Subject: [PATCH 2212/3013] package/gpsd: add option to enable/disable the daemon Some scenarii, like building an RTK base, does not require a gpsd daemon, but just a few python based tools (e.g. the python scripts to configure a GNSS device). Add an option to enable or disable building and instaling the daemon. We make it enabled by default, for legacy purposes. When the daemon is installed, it also installs a few ancillary helpers, which need some of the clients (e.g. the udev rule will use gpsdctl), so ensure they are enabled with the daemon. Speaking of the udev rule: without the daemon, it does not need to be installed, so only try to fix its mode when the daemomn is installed. Similarly for systemd, no need to install the drop-in when the daemon is not installed. And for sysv init, no need for a startup script without the daemon either. Now that everything is optional, daemon, clients, and python stuff, we need to ensure that at least something is installed. The obvious solution would be to ensure that the daemon is installed, but that causes conflicts in the Kconfig depencies (elided for readability): config BR2_PACAKGE_GPSD bool "gpsd: select BR2_PACKAGE_GPSD_DAEMON if ! BR2_PACKAGE_GPSD_CLIENTS \ && ! BR2_PACKAGE_GPSD_PYTHON config BR2_PACKAGE_GPSD_DAEMON bool "daemon" select BR2_PACKAGE_GPSD_CLIENTS would cause errors like: package/gpsd/Config.in:27:error: recursive dependency detected! package/gpsd/Config.in:27: symbol BR2_PACKAGE_GPSD_DAEMON is selected by BR2_PACKAGE_GPSD_CLIENTS package/gpsd/Config.in:226: symbol BR2_PACKAGE_GPSD_CLIENTS is selected by BR2_PACKAGE_GPSD_DAEMON So we chose the next best option: ensure that the clients get built, if nothing else does. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Reviewed-by: Jan Havran Tested-by: Jan Havran Signed-off-by: Thomas Petazzoni --- package/gpsd/Config.in | 13 +++++++++ package/gpsd/gpsd.mk | 62 ++++++++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index cbdcdb5725d..92a124b8aca 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -9,6 +9,8 @@ menuconfig BR2_PACKAGE_GPSD depends on BR2_TOOLCHAIN_HAS_THREADS # Always tries to build a shared library depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_GPSD_CLIENTS if !BR2_PACKAGE_GPSD_DAEMON \ + && !BR2_PACKAGE_GPSD_PYTHON help gpsd is a service daemon that monitors one or more GPSes or AIS receivers attached to a host computer through serial or @@ -22,6 +24,15 @@ menuconfig BR2_PACKAGE_GPSD if BR2_PACKAGE_GPSD +config BR2_PACKAGE_GPSD_DAEMON + bool "gpsd daemon" + default y # legacy + select BR2_PACKAGE_GPSD_CLIENTS + help + Build and install the gpsd daemon itself + +if BR2_PACKAGE_GPSD_DAEMON + config BR2_PACKAGE_GPSD_DEVICES string "Where to look for GPSes" default "/dev/ttyS1" @@ -210,6 +221,8 @@ config BR2_PACKAGE_GPSD_UBX help uBlox UBX binary support +endif # GPSD_DAEMON + config BR2_PACKAGE_GPSD_CLIENTS bool "gpsd clients" default y # legacy diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 77c6f6c562c..8f87766dcce 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -26,8 +26,7 @@ GPSD_SCONS_OPTS = \ prefix=/usr \ sysroot=$(STAGING_DIR) \ strip=no \ - qt=no \ - systemd=$(if $(BR2_INIT_SYSTEMD),yes,no) + qt=no ifeq ($(BR2_PACKAGE_NCURSES),y) GPSD_DEPENDENCIES += ncurses @@ -178,6 +177,40 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif +ifeq ($(BR2_PACKAGE_GPSD_DAEMON),y) +GPSD_SCONS_OPTS += \ + gpsd=yes \ + systemd=$(if $(BR2_INIT_SYSTEMD),yes,no) + +GPSD_INSTALL_RULE = $(if $(BR2_PACKAGE_HAS_UDEV),udev-install,install) + +# When using chrony, wait for after Buildroot's chrony.service +ifeq ($(BR2_PACKAGE_CHRONY),y) +define GPSD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(GPSD_PKGDIR)/br-chrony.conf \ + $(TARGET_DIR)/usr/lib/systemd/system/gpsd.service.d/br-chrony.conf +endef +endif + +define GPSD_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd + $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd +endef + +# After the udev rule is installed, make it writable so that this +# package can be re-built/re-installed. +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +define GPSD_INSTALL_UDEV_RULES + chmod u+w $(TARGET_DIR)/lib/udev/rules.d/25-gpsd.rules +endef +GPSD_POST_INSTALL_TARGET_HOOKS += GPSD_INSTALL_UDEV_RULES +endif + +else # GPSD_DAEMON +GPSD_SCONS_OPTS += gpsd=no systemd=no +GPSD_INSTALL_RULE = install +endif + ifeq ($(BR2_PACKAGE_GPSD_CLIENTS),y) GPSD_SCONS_OPTS += gpsdclients=yes else @@ -211,21 +244,8 @@ define GPSD_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) \ $(SCONS) \ $(GPSD_SCONS_OPTS) \ - $(if $(BR2_PACKAGE_HAS_UDEV),udev-install,install)) -endef - -define GPSD_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd - $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd -endef - -# When using chrony, wait for after Buildroot's chrony.service -ifeq ($(BR2_PACKAGE_CHRONY),y) -define GPSD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(GPSD_PKGDIR)/br-chrony.conf \ - $(TARGET_DIR)/usr/lib/systemd/system/gpsd.service.d/br-chrony.conf + $(GPSD_INSTALL_RULE)) endef -endif define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ @@ -236,14 +256,4 @@ define GPSD_INSTALL_STAGING_CMDS install) endef -# After the udev rule is installed, make it writable so that this -# package can be re-built/re-installed. -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -define GPSD_INSTALL_UDEV_RULES - chmod u+w $(TARGET_DIR)/lib/udev/rules.d/25-gpsd.rules -endef - -GPSD_POST_INSTALL_TARGET_HOOKS += GPSD_INSTALL_UDEV_RULES -endif - $(eval $(generic-package)) From 1941fe3d82236f4b4e92eedf6e7f7a34db70016e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 25 Jul 2024 09:39:08 +0200 Subject: [PATCH 2213/3013] package/mokutil: force libopenssl mokutil unconditionally uses X509_get0_subject_key_id resulting in the following build failure with libressl since its addition in commit 2e6e121496bfcbe09c018558be13733077b6df9b: /home/autobuild/autobuild/instance-18/output-1/host/lib/gcc/i686-buildroot-linux-uclibc/13.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: mokutil-efi_x509.o: in function `get_cert_skid': efi_x509.c:(.text+0x4e6): undefined reference to `X509_get0_subject_key_id' Fixes: 2e6e121496bfcbe09c018558be13733077b6df9b - http://autobuild.buildroot.org/results/88b549734eae4b25de1b8e1c4f04bace0a7e7418 - http://autobuild.buildroot.org/results/05ac319bfb2a252f3dcdc5d04761f276afb53b6f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mokutil/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mokutil/Config.in b/package/mokutil/Config.in index dd02078b4e1..8895b66d203 100644 --- a/package/mokutil/Config.in +++ b/package/mokutil/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_MOKUTIL select BR2_PACKAGE_KEYUTILS select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help mokutil is a tool to import or delete the machines owner keys (MOK) stored in the database of shim. From fb974003c136f7e0eea6bea057011db55fa922c0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 24 Jul 2024 16:19:11 +0200 Subject: [PATCH 2214/3013] configs/imx8mn_bsh_smm_s2[_pro]: bump TF-A, U-Boot and Linux versions This patch bumps: - TF-A to version v2.10 - U-Boot to versione v2024.07 - Linux kernel to version 6.10 The TF-A bump required applying a patch, sent upstream, to fix a regression in the domain access permissions configuration for the boot console UART. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...rop-UARTs-domain-permissions-setting.patch | 65 +++++++++++++++++++ .../arm-trusted-firmware.hash | 2 +- .../patches/linux/linux.hash | 2 +- .../patches/uboot/uboot.hash | 2 +- configs/imx8mn_bsh_smm_s2_defconfig | 8 +-- configs/imx8mn_bsh_smm_s2_pro_defconfig | 8 +-- 6 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/0001-fix-imx8m-drop-UARTs-domain-permissions-setting.patch diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/0001-fix-imx8m-drop-UARTs-domain-permissions-setting.patch b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/0001-fix-imx8m-drop-UARTs-domain-permissions-setting.patch new file mode 100644 index 00000000000..74b12df38dc --- /dev/null +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/0001-fix-imx8m-drop-UARTs-domain-permissions-setting.patch @@ -0,0 +1,65 @@ +From 0d12fc41d6c68b257de1610a1511144d731f9af4 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Wed, 24 Jul 2024 10:46:49 +0200 +Subject: [PATCH] fix(imx8m): drop UARTs domain permissions setting + +The commit d76f012ea8fc0 ("refactor(imx8m): replace magic number with +enum type") also hardcodes the domain permissions configuration for the +UARTs, causing a regression for any board using a boot console different +from UART2. Indeed, previously, the RDC_PDAP_UARTn registers were set to +the reset value (0xff), meaning all domains were enabled for read and +write access. + +This patch partially reverts that commit to fix the regression. + +Fixes: d76f012ea8fc0 ("refactor(imx8m): replace magic number with enum type") +Change-Id: I2670bf485372f32ef45cebb72a7694a9a800f417 +Signed-off-by: Dario Binacchi +Upstream: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/30131 +--- + plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 -- + plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 -- + plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c | 1 - + 3 files changed, 5 deletions(-) + +diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +index f6e46eb67bc9..539df931a6a4 100644 +--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c ++++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +@@ -67,8 +67,6 @@ static const struct imx_rdc_cfg rdc[] = { + RDC_MDAn(RDC_MDA_M4, DID1), + + /* peripherals domain permission */ +- RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W), +- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), + + /* memory region */ + +diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +index befa7698f912..604ef3cae6dc 100644 +--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c ++++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +@@ -53,8 +53,6 @@ static const struct imx_rdc_cfg rdc[] = { + RDC_MDAn(RDC_MDA_M7, DID1), + + /* peripherals domain permission */ +- RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W), +- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), + + /* memory region */ + RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff), +diff --git a/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c b/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c +index ffad3d159e59..5251c28e6ba8 100644 +--- a/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c ++++ b/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c +@@ -54,7 +54,6 @@ static const struct imx_rdc_cfg rdc[] = { + RDC_MDAn(RDC_MDA_M7, DID1), + + /* peripherals domain permission */ +- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W), + + /* memory region */ + +-- +2.43.0 + diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 80e592dab60..02714d06a09 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 fc4cdac7c08fc398b6d4b705285dc13ac2d2b30a7449c6f07e9ccd81207241df arm-trusted-firmware-v2.5.tar.gz +sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash index b017ef2a893..53eb1438945 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3e4d8e561da5703a205ae8d7b2bed6c5c64fc4299eebcbfd20481e63b57d5ee3 linux-6.1.6.tar.xz +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash index 7cef5b688ec..fe9b4f53dc6 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 u-boot-2023.04.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 841512ed1a1..2b358cf57b2 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBIFS_RT_NONE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/imx8mn_bsh_smm_s2_pro_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig index b4553ceb521..e903cbf3148 100644 --- a/configs/imx8mn_bsh_smm_s2_pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From d95b4db8633a9b928f9a12e428125c91551a3eae Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Fri, 23 Feb 2024 21:30:31 +0100 Subject: [PATCH 2215/3013] package/fd: new package A simple, fast and user-friendly alternative to 'find' https://github.com/sharkdp/fd.git Signed-off-by: Saeed Kazemi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/fd/Config.in | 12 ++++++++++++ package/fd/fd.hash | 4 ++++ package/fd/fd.mk | 12 ++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/fd/Config.in create mode 100644 package/fd/fd.hash create mode 100644 package/fd/fd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 092397adcb6..4d26885a1b0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2869,6 +2869,7 @@ F: package/biosdevname/ N: Saeed Kazemi F: package/eza/ +F: package/fd/ F: package/parsec-tool/ F: package/procs/ F: package/mxt-app/ diff --git a/package/Config.in b/package/Config.in index e04cdae1e5e..e21987717f1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -182,6 +182,7 @@ menu "Development tools" source "package/cxxtest/Config.in" source "package/diffutils/Config.in" source "package/dos2unix/Config.in" + source "package/fd/Config.in" source "package/findutils/Config.in" source "package/flex/Config.in" source "package/gawk/Config.in" diff --git a/package/fd/Config.in b/package/fd/Config.in new file mode 100644 index 00000000000..10f295cb201 --- /dev/null +++ b/package/fd/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FD + bool "fd" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + fd is a program to find entries in your filesystem. It is a + simple, fast and user-friendly alternative to find. While it + does not aim to support all of find's powerful functionality, + it provides sensible (opinionated) defaults for a majority of + use cases. + + https://github.com/sharkdp/fd.git diff --git a/package/fd/fd.hash b/package/fd/fd.hash new file mode 100644 index 00000000000..90d2c386942 --- /dev/null +++ b/package/fd/fd.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 91da5cc2b99d4754fa5096cda1eeac98f312f712bfca6a41f9972b2287a4c4f9 fd-9.0.0-cargo2.tar.gz +sha256 73c83c60d817e7df1943cb3f0af81e4939a8352c9a96c2fd00451b1116fa635c LICENSE-APACHE +sha256 322cfc7aa0c774d0eca3b2610f1d414de3ddbd7d8dd4b9dea941a13a6eb07455 LICENSE-MIT diff --git a/package/fd/fd.mk b/package/fd/fd.mk new file mode 100644 index 00000000000..316da418ea5 --- /dev/null +++ b/package/fd/fd.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# fd +# +################################################################################ + +FD_VERSION = 9.0.0 +FD_SITE = $(call github,sharkdp,fd,v$(FD_VERSION)) +FD_LICENSE = Apache-2.0 or MIT +FD_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) From 92d652df4869d073e383d9d44b5c43e338d83c29 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 11:20:05 +0200 Subject: [PATCH 2216/3013] DEVELOPERS: remove Maeva Manuel Maeva told me personally she will no longer contribute to Buildroot for the time being. This commit removes all the associated DEVELOPERS entries. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 4d26885a1b0..6c1fc7fc8e3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2136,11 +2136,6 @@ N: Ludwig Kormann F: board/in-circuit/ F: configs/icnova* -N: Maeva Manuel -F: board/freescale/imx8qmmek/ -F: configs/freescale_imx8qmmek_defconfig -F: package/freescale-imx/imx-seco/ - N: Mahyar Koshkouei F: package/ffmpeg/ F: package/mpv/ From 3e1e49069d5fc67b434de94637409c6ced915dea Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 20 Feb 2024 23:07:20 +0100 Subject: [PATCH 2217/3013] support/testing: add make runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_make.py | 82 +++++++++++++++++++ .../test_make/rootfs-overlay/root/Makefile | 23 ++++++ 3 files changed, 107 insertions(+) create mode 100644 support/testing/tests/package/test_make.py create mode 100644 support/testing/tests/package/test_make/rootfs-overlay/root/Makefile diff --git a/DEVELOPERS b/DEVELOPERS index 6c1fc7fc8e3..aede8197e36 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1909,6 +1909,8 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_make.py +F: support/testing/tests/package/test_make/ F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ diff --git a/support/testing/tests/package/test_make.py b/support/testing/tests/package/test_make.py new file mode 100644 index 00000000000..2ec62826bec --- /dev/null +++ b/support/testing/tests/package/test_make.py @@ -0,0 +1,82 @@ +import os + +import infra.basetest + + +class TestMake(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_make/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_MAKE=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def gen_expected_str(self, count): + """Return the expected string generated by the test Makefile""" + return "".join(map(lambda x: str(x), range(1, count+1))) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("make --version") + + # We touch the Makefile to set its modification time to the + # current system time. This is to avoid warnings from Make + # about having files with timestamps in the future. This is + # because the minimal system running in the emulator might not + # set the clock to the real time, and the Makefile has a + # correct timestamp from the build host (which is likely at + # the correct time). + self.assertRunOk("touch Makefile") + + # We test the "message" target and check we get the expected + # string. + out, ret = self.emulator.run("make message") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") + + # We redo the same test, this time by passing a new message + # with a variable. + msg = "This is Another Message..." + out, ret = self.emulator.run(f"make message MESSAGE='{msg}'") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We run a simple "make" invocation, using the defaults. + self.assertRunOk("make") + + # We check the generated output contains the expected string. + expected_str = self.gen_expected_str(10) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) + + # Clean the previous invocation. + self.assertRunOk("make clean") + + # We check a output generated file is no longer present. + self.assertRunOk("test ! -e output.txt") + + # We run an invocation with a larger COUNT value. GNU Make + # version 4.4 introduced the --shuffle option, which shuffle + # rules. We use it with a constant seed, in order to have a + # stable reshuffling in all test runs. We also include in this + # execution a request for parallel jobs. + count = 50 + seed = 123456 + self.assertRunOk(f"make -j10 --shuffle={seed} COUNT={count}") + + # Despite the pseudo-randomization in the previous invocation, + # the expected output should be correctly ordered. + expected_str = self.gen_expected_str(count) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) diff --git a/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile new file mode 100644 index 00000000000..7ac86945a5e --- /dev/null +++ b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile @@ -0,0 +1,23 @@ +MESSAGE ?= "Hello Buildroot!" +COUNT ?= 10 + +LIST = $(shell seq $(COUNT)) +INPUTS = $(addsuffix .in.txt,$(LIST)) +OUTPUT = output.txt + +.PHONY: all +all: $(OUTPUT) + +.PHONY: clean +clean: + $(RM) $(OUTPUT) *.in.txt + +.PHONY: message +message: + @echo $(MESSAGE) + +%.in.txt: + echo $(subst .in.txt,,$@) > $@ + +$(OUTPUT): $(INPUTS) + (cat $? | tr -d '\n' ; echo) > $@ From 5356754d1e11174274553f2f7329edd7e8c7fd68 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 17 Feb 2024 19:45:20 +0100 Subject: [PATCH 2218/3013] support/testing: add mariadb runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_mariadb.py | 195 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 support/testing/tests/package/test_mariadb.py diff --git a/DEVELOPERS b/DEVELOPERS index aede8197e36..68729f721b6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1911,6 +1911,7 @@ F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py F: support/testing/tests/package/test_make.py F: support/testing/tests/package/test_make/ +F: support/testing/tests/package/test_mariadb.py F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py new file mode 100644 index 00000000000..523f075db18 --- /dev/null +++ b/support/testing/tests/package/test_mariadb.py @@ -0,0 +1,195 @@ +import os + +import infra.basetest + + +class TestMariaDB(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.78" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_MYSQL=y + BR2_PACKAGE_MARIADB=y + BR2_PACKAGE_MARIADB_SERVER=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="512M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + # Configuration for the test + db_adminuser = "root" + db_admin = "mysql" + db_user = "br_user" + db_name = "br_database" + backup_file = "dump.sql" + + def run_user_db_query(self, user, database, query, opts=None): + cmd = f"mariadb --user={user} --database={database}" + cmd += f' --execute="{query}"' + if opts is not None: + cmd += " " + opts + self.assertRunOk(cmd) + + def run_admin_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_adminuser, self.db_admin, query, opts) + + def run_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_user, self.db_name, query, opts) + + def cleanup_database(self): + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will prevent errors during the + # user/db creation. + + # Drop the test database, if it exists. + sql_query = f"DROP USER IF EXISTS {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Drop the test user, if it exists. + sql_query = f"DROP DATABASE IF EXISTS {self.db_name};" + self.run_admin_sql_query(sql_query) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "2G", + "-smp", "2", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the server binary can execute. + self.assertRunOk("mariadbd --version") + + # Check the client binary can execute. + self.assertRunOk("mariadb --version") + + # Check the server is ready. + self.assertRunOk("mariadb-admin ping") + + # Query the server version from the client. + sql_query = "SELECT version();" + self.run_admin_sql_query(sql_query, opts="-N -s") + + self.cleanup_database() + + # Create a new user. + sql_query = f"CREATE USER {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Create a new database. + sql_query = f"CREATE DATABASE {self.db_name}" + sql_query += " COMMENT = 'Test Database for Buildroot Test';" + self.run_admin_sql_query(sql_query) + + # Grant all permission on this new database to our test user. + sql_query = "GRANT ALL PRIVILEGES" + sql_query += f" ON {self.db_name}.*" + sql_query += f" TO {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + self.create_tables() + + self.insert_data() + + self.query_database() + + # Update a table. + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Backup the test database. + cmd = f"mariadb-dump --user={self.db_user}" + cmd += f" {self.db_name} > {self.backup_file}" + self.assertRunOk(cmd) + + # Drop all the tables. + sql_query = "DROP TABLE fruit_colors, fruits, colors;" + self.run_sql_query(sql_query) + + # Query the server status. + self.assertRunOk("mariadb-admin status") + + # Stop the server. + self.assertRunOk("/etc/init.d/S97mysqld stop") + + # Check the server is stopped. + _, exit_code = self.emulator.run("mariadb-admin ping") + self.assertNotEqual(exit_code, 0) + + # Restart the server. + self.assertRunOk("/etc/init.d/S97mysqld start") + + # Restore the backup. + cmd = f"mariadb --user={self.db_user} --database={self.db_name}" + cmd += f" < {self.backup_file}" + self.assertRunOk(cmd) + + # Query one last time our data, to check the backup + # restoration succeeded. + self.query_database() From 45651cdb851bcd5af06bb94d824b078b03d4f187 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:45:00 +0200 Subject: [PATCH 2219/3013] package/libxml2: security bump version to 2.12.9 Fixes CVE-2024-34459 (2.12.7) & CVE-2024-40896. Release notes: https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.news https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.8.news https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.news Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 086bb410986..73fd0ecedfa 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.6.sha256sum -sha256 889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb libxml2-2.12.6.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.sha256sum +sha256 59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590 libxml2-2.12.9.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index e7ed6fb7527..b69722b21d4 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).9 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From 7165533a3f0e2f3c4bcdcd481a844f5a86a46a40 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:45:27 +0200 Subject: [PATCH 2220/3013] package/samba4: bump version to 4.20.3 Rebased patch 0001. Release notes: https://www.samba.org/samba/history/samba-4.20.3.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...d-pre-built-heimdal-build-tools-in-case-of-.patch | 12 ++++++------ package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch index 1c4de6a02ef..eb0ea099b7b 100644 --- a/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -32,8 +32,8 @@ and hence the check, in bundled mode. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni -Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 4.11.13 & 4.17.7] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for version 4.11.13, 4.17.7 & 4.20.3] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- @@ -43,10 +43,10 @@ diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_hei index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -6,3 +6,14 @@ - - conf.define('USING_EMBEDDED_HEIMDAL', 1) - conf.RECURSE('third_party/heimdal_build') +@@ -13,3 +13,14 @@ + # when this will be available also in + # system libraries... + conf.define('HAVE_CLIENT_GSS_C_CHANNEL_BOUND_FLAG', 1) + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 353736f3b2b..d2512f2e0a8 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.20.2.tar.asc -sha256 f969ffed58ccf3e85cbbcc0e33a1726d025c2b40f42a653b1125b82b92d2e0e5 samba-4.20.2.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.20.3.tar.asc +sha256 afd5a9bb03e5c921c4c1d4e4b4fa6ea16cf798d94e5e5bffb9fd61716641cf30 samba-4.20.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index ec0ffd70bfb..d48a02140f1 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.20.2 +SAMBA4_VERSION = 4.20.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From ea301ef80c810791a6b673d46b4f16b6c2f62a29 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:45:55 +0200 Subject: [PATCH 2221/3013] package/php: bump version to 8.3.10 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/434 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 59a82b001d0..3a6f60680b6 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bf4d7b8ea60a356064f88485278bd6f941a230ec16f0fc401574ce1445ad6c77 php-8.3.9.tar.xz +sha256 a0f2179d00931fe7631a12cbc3428f898ca3d99fe564260c115af381d2a1978d php-8.3.10.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 3fdce8186a1..0487c03b613 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.9 +PHP_VERSION = 8.3.10 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 179bf242d564e18db278b39fdf67e43ec6806e28 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:33 +0200 Subject: [PATCH 2222/3013] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 4bdca6fafe9..429a7eabefd 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.3" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d1d0132c966..b6ab8b32673 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,8 +1,8 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 73d8520dd9cba5acfc5e7208e76b35d9740b8aae38210a9224e32ec4c0d29b70 linux-6.10.2.tar.xz +sha256 fa5f22fd67dd05812d39dca579320c493048e26c4a556048a12385e7ae6fc698 linux-6.10.3.tar.xz sha256 5ae7cc4e0e2f6b9ba630f643985ba0522c7d5e5b9571ba478a3cb513edd4cf22 linux-6.9.12.tar.xz -sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz -sha256 1ba5f93b411ead7587fe48b2eec6c656f6796d31f5e406d236913c77512497ec linux-6.1.102.tar.xz +sha256 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 linux-6.6.44.tar.xz +sha256 5eb4706f898f50881552ff5146d892132d3ffc5298033bffe27087d3a44c4573 linux-6.1.103.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186 linux-5.15.164.tar.xz sha256 ca09d86a6b79706c33382d3f8606f476eb07918417a87fb1815f6a4aa81f2ba1 linux-5.10.223.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d745e31155f..e2356897002 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -431,10 +431,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.281" if BR2_KERNEL_HEADERS_5_4 default "5.10.223" if BR2_KERNEL_HEADERS_5_10 default "5.15.164" if BR2_KERNEL_HEADERS_5_15 - default "6.1.102" if BR2_KERNEL_HEADERS_6_1 - default "6.6.43" if BR2_KERNEL_HEADERS_6_6 + default "6.1.103" if BR2_KERNEL_HEADERS_6_1 + default "6.6.44" if BR2_KERNEL_HEADERS_6_6 default "6.9.12" if BR2_KERNEL_HEADERS_6_9 - default "6.10.2" if BR2_KERNEL_HEADERS_6_10 + default "6.10.3" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 4450ee378f6ac49018241d3258fc178272384db0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:34 +0200 Subject: [PATCH 2223/3013] package/linux-headers: drop 6.9.x option The 6.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a746f682cc5..94092d38f4c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_KERNEL_HEADERS_6_9 + bool "kernel headers version 6.9.x are no longer supported" + select BR2_LEGACY + help + Version 6.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_x86_knightslanding bool "knightslanding x86 architecture support dropped" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index b6ab8b32673..4e05f4a7654 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 fa5f22fd67dd05812d39dca579320c493048e26c4a556048a12385e7ae6fc698 linux-6.10.3.tar.xz -sha256 5ae7cc4e0e2f6b9ba630f643985ba0522c7d5e5b9571ba478a3cb513edd4cf22 linux-6.9.12.tar.xz sha256 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 linux-6.6.44.tar.xz sha256 5eb4706f898f50881552ff5146d892132d3ffc5298033bffe27087d3a44c4573 linux-6.1.103.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e2356897002..83b8d1267ed 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -48,10 +48,6 @@ config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 -config BR2_KERNEL_HEADERS_6_9 - bool "Linux 6.9.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 - config BR2_KERNEL_HEADERS_6_10 bool "Linux 6.10.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 @@ -433,7 +429,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.164" if BR2_KERNEL_HEADERS_5_15 default "6.1.103" if BR2_KERNEL_HEADERS_6_1 default "6.6.44" if BR2_KERNEL_HEADERS_6_6 - default "6.9.12" if BR2_KERNEL_HEADERS_6_9 default "6.10.3" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 0fac1f6be090c0875498ca40533ad55a8c7a3ef9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:42 +0200 Subject: [PATCH 2224/3013] package/kodi-pvr-argustv: bump version to 21.0.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index b04554075e6..df9b9242d42 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6ab2952690de934d236cf43a3f42ea19337013d88af305dc1df82b5c1235cff0 kodi-pvr-argustv-21.0.1-Omega.tar.gz +sha256 2fc9a21411f2015ef5d07fc4aad1411588860b2036a5677bde88b2429839192b kodi-pvr-argustv-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 38900e5afc2..d1f05cadf7b 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 21.0.1-Omega +KODI_PVR_ARGUSTV_VERSION = 21.0.2-Omega KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md From 50b14eca0e7e31108752247ae78f6fa1feb2b3bc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:43 +0200 Subject: [PATCH 2225/3013] package/kodi-pvr-dvblink: bump version to 21.1.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash | 2 +- package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index 36a320290b3..286a30abc3e 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 53799996d1a241d672d4b0c16eccbf3be2a73d5fcad3bb48feef8f35da79f9ec kodi-pvr-dvblink-21.1.1-Omega.tar.gz +sha256 a532955c0993f0d30ce85a04c80e62e80312089435b32f7dd28e1882b52dbf33 kodi-pvr-dvblink-21.1.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index ee334fe82f6..652052152e6 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBLINK_VERSION = 21.1.1-Omega +KODI_PVR_DVBLINK_VERSION = 21.1.2-Omega KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ KODI_PVR_DVBLINK_LICENSE_FILES = LICENSE.md From 429c37d4288d34ec90a0db896fa3b08501f6c054 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:44 +0200 Subject: [PATCH 2226/3013] package/kodi-pvr-dvbviewer: bump version to 21.1.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash | 2 +- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index 0fc03619b33..8aadcfdbb59 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e12d3a930f0b404a0d7d996b962c4cdc9b1477bbfb8f6af4fcbe23ded05e5fff kodi-pvr-dvbviewer-21.1.1-Omega.tar.gz +sha256 bde3ff8e2416d6b47478702ec0731a3a31392422f4cd0ec41669bb797277c31a kodi-pvr-dvbviewer-21.1.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index bb08cf3e6a6..a68bc23c2e2 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBVIEWER_VERSION = 21.1.1-Omega +KODI_PVR_DVBVIEWER_VERSION = 21.1.2-Omega KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ KODI_PVR_DVBVIEWER_LICENSE_FILES = LICENSE.md From 7c5705dc401d0cbfd09f86590b3550464c044e27 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:45 +0200 Subject: [PATCH 2227/3013] package/kodi-pvr-filmon: bump version to 21.0.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 2 +- package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index 16bb884885d..058788d1af7 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0e1f4b32a31aee3e60b2e7b0c64c7a061ca69232cd2feebf5af77ad5f0a6036 kodi-pvr-filmon-21.0.1-Omega.tar.gz +sha256 62e7426d654e33c95c2c9940fce48f9549f73eae510258448fd6ed606499eac6 kodi-pvr-filmon-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index 2c3eb8a8599..db7ca75214b 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 21.0.1-Omega +KODI_PVR_FILMON_VERSION = 21.0.2-Omega KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ KODI_PVR_FILMON_LICENSE_FILES = LICENSE.md From 9264c5251a8f41714946302c9656ce3581f8c739 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:46 +0200 Subject: [PATCH 2228/3013] package/kodi-pvr-hts: bump version to 21.2.5-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 3c9f7d87b35..15b790c80c4 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5c8dd796735d5af7dddfc6fe56c8b2d8268fd43be50098f60b8fa537ff02956d kodi-pvr-hts-21.2.4-Omega.tar.gz +sha256 c54c249a4c91091e47245b406210224aa4e3c5468497eb9cdeb09cd336cab4b2 kodi-pvr-hts-21.2.5-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 7f73c0565ef..68c4d04bd0c 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 21.2.4-Omega +KODI_PVR_HTS_VERSION = 21.2.5-Omega KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md From 73752ee341708e5a79d4537fd1ed30391572d24e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:47 +0200 Subject: [PATCH 2229/3013] package/kodi-pvr-iptvsimple: bump version to 21.8.5-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 872efba7545..560eea27e6b 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 287d9fe5ca348f70b7fae96be7de0e0f092e9a00a3e8043c67ad24bd77a9a82d kodi-pvr-iptvsimple-21.8.4-Omega.tar.gz +sha256 aa463ad43e0dda1aaf10f5fca562823d91762671ad5b5077f5dbaeb7dc425fa7 kodi-pvr-iptvsimple-21.8.5-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 67db5793d0b..04b83273449 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 21.8.4-Omega +KODI_PVR_IPTVSIMPLE_VERSION = 21.8.5-Omega KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From 1632d7bc58bd290ec25605c66212fe518a61fdd1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:48 +0200 Subject: [PATCH 2230/3013] package/kodi-pvr-nextpvr: bump version to 21.1.1-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 5c65af95973..5b8b6b7e4d1 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 220e292c58d22b3064f1ea6a717341d9d004384791aec8b409d6653b91817085 kodi-pvr-nextpvr-21.1.0-Omega.tar.gz +sha256 dd4974d3bf664067787da271ad8f76a8ecf61e73909050991aae99e0c2863eaa kodi-pvr-nextpvr-21.1.1-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index dc2a7703ceb..788415b8960 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 21.1.0-Omega +KODI_PVR_NEXTPVR_VERSION = 21.1.1-Omega KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From f649c17911fc72f3be5552c45f29b374300ed1fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:49 +0200 Subject: [PATCH 2231/3013] package/kodi-pvr-plutotv: bump version to 21.3.1-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash | 2 +- package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash index bb4826ba660..75f9ed03985 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fb026664222af3415bb805c4b2c19d1893f9e05a7d089c2d720a495131d1460d kodi-pvr-plutotv-21.3.0-Omega.tar.gz +sha256 468d5ad4703c36d73dc8d08008d19c0e9b44474b86b4d5e618b97c3003214b6e kodi-pvr-plutotv-21.3.1-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk index 885ef03e0d5..d363f206d79 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PLUTOTV_VERSION = 21.3.0-Omega +KODI_PVR_PLUTOTV_VERSION = 21.3.1-Omega KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md From 8e9a704c2fb59c98b15ed91c68e6fe9966705cc4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:50 +0200 Subject: [PATCH 2232/3013] package/kodi-pvr-stalker: bump version to 21.1.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 2bed6159fff..4232af0debb 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 61b76dd9917577fdf63078c552ae96b497167fd78e5524e056c77bbf3699634d kodi-pvr-stalker-21.1.1-Omega.tar.gz +sha256 dd461f59d37cd5e4a199ea2547aeef42861d9f7a57b5d92d3253f686164474a6 kodi-pvr-stalker-21.1.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index 9ae5ee9fe08..a703323cdc8 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 21.1.1-Omega +KODI_PVR_STALKER_VERSION = 21.1.2-Omega KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md From 74ac6999029a482bf0a39fab8b720b454a66a0db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:51 +0200 Subject: [PATCH 2233/3013] package/kodi-pvr-vbox: bump version to 21.1.4-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vbox/kodi-pvr-vbox.hash | 2 +- package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index aec8100c776..e35d518baa9 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 becc98a7d3bc8e4a78f775a34851ea1d4962e64ee4d63bbf339ac86cf12a4b95 kodi-pvr-vbox-21.1.3-Omega.tar.gz +sha256 241aad6926579835d5d0513ad588f39ee9e99de5858655c38a25454c69372746 kodi-pvr-vbox-21.1.4-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index 35ff5fa6c99..4b16c70ea84 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VBOX_VERSION = 21.1.3-Omega +KODI_PVR_VBOX_VERSION = 21.1.4-Omega KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ KODI_PVR_VBOX_LICENSE_FILES = LICENSE.md From ceb875e72921ccc837a9529e0f7611de2ca2961f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:52 +0200 Subject: [PATCH 2234/3013] package/kodi-pvr-vdr-vnsi: bump version to 21.1.1-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 1922f7b3cda..79475062e8e 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30cde3d04ca47091f92569c4826a959d14fad728699c258014dcde2be3d40db1 kodi-pvr-vdr-vnsi-21.1.1-Omega.tar.gz +sha256 6c66868a97c4860442cf02acfeacedc929da372bf1b71971410700e8e9689a12 kodi-pvr-vdr-vnsi-21.1.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 1769cf4d338..c35594eba12 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 21.1.1-Omega +KODI_PVR_VDR_VNSI_VERSION = 21.1.2-Omega KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md From 7ad71fa3ba0b4e7805e94ee200eec39d93fe093d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:53 +0200 Subject: [PATCH 2235/3013] package/kodi-pvr-vuplus: bump version to 21.2.1-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +- package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index d68d5b5be5e..2b1139e054a 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5d918e8073a326e2631aac0756ee2c78fddb359980a8dff805ff13d9d9bf48ba kodi-pvr-vuplus-21.1.2-Omega.tar.gz +sha256 e0fc9ef1db89e97c11dadccc06901ac0fbff03ff9f22ba7a8de665ce85c28aa8 kodi-pvr-vuplus-21.2.1-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 1b70521867b..c289042a02a 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 21.1.2-Omega +KODI_PVR_VUPLUS_VERSION = 21.2.1-Omega KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md From ec4effa09db326c6c7fd1b212cb3cf20392b7af6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:54 +0200 Subject: [PATCH 2236/3013] package/kodi-pvr-wmc: bump version to 21.0.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index fc04e44b2a3..f274aa92c29 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5008adcd9ce35e965bc172ac98306c0ec4b639182a7026e6ee9b36581516c8a8 kodi-pvr-wmc-21.0.1-Omega.tar.gz +sha256 690de222455f4ec02480e3cc0eb524e64448ca95486394f562c48492a614e17c kodi-pvr-wmc-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 81829d5eb4b..04097ba151e 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 21.0.1-Omega +KODI_PVR_WMC_VERSION = 21.0.2-Omega KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = LICENSE.md From f9b943e93512d6ec758f8efb02589c463fc021b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:55 +0200 Subject: [PATCH 2237/3013] package/kodi-pvr-zattoo: bump version to 21.0.3-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index d97bfce5b36..126640f0327 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 859a64e152eca06a6210a80ad199e8b545c9fc9b85562eb12f980c1659ace72a kodi-pvr-zattoo-21.0.2-Omega.tar.gz +sha256 20361e6de6bd783203e73dc19f8aa0bfc1e269508bfc7933477fbaa1e8a4b9e9 kodi-pvr-zattoo-21.0.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index cba9d0b2ef7..50d3651cb9e 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 21.0.2-Omega +KODI_PVR_ZATTOO_VERSION = 21.0.3-Omega KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From 965ce296ee74d8f96c8d7f59e8d5fadb19a3f601 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:56 +0200 Subject: [PATCH 2238/3013] package/kodi-skin-confluence: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-skin-confluence/kodi-skin-confluence.hash | 2 +- package/kodi-skin-confluence/kodi-skin-confluence.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash index 482da25cf2d..ed53dd5015d 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d66fe75a261c6c2b9ac2923dc51d469ccc1df45a2462188e6a024a87bbe27311 kodi-skin-confluence-7bd4a396c492adb2d424d7f51d415fb565cda358.tar.gz +sha256 85550f949598d3904bcb77e3d2e6b7fa2d0d9334a7939b964a94d98ffe0e36ea kodi-skin-confluence-b2f2fe26ab47ca3c317d5d7927687e41584e46ed.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk index 03aa4261cdb..2898c045393 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SKIN_CONFLUENCE_VERSION = 7bd4a396c492adb2d424d7f51d415fb565cda358 +KODI_SKIN_CONFLUENCE_VERSION = b2f2fe26ab47ca3c317d5d7927687e41584e46ed KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION)) KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt From 0d094c1d41e595b2c77b4d8ece84f2525ac62e6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:47:17 +0200 Subject: [PATCH 2239/3013] package/libheif: bump version to 1.18.1 Removed patch which is included in this release: https://github.com/strukturag/libheif/commit/4944d7d47cc537681d6836e8c77db179f63af005 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ns-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 ------------------- package/libheif/libheif.hash | 2 +- package/libheif/libheif.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch deleted file mode 100644 index 5245327fe7e..00000000000 --- a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 31 Jan 2024 21:04:37 +0100 -Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build - -Fix the following libjpeg build failure raised since version 1.17.0 and -https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 -because third argument of jpeg_mem_dest is defined as size_t* on libjpeg -instead of unsigned long* on jpeg-turbo: - -/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': -/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] - 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); - | ^~~~~~~~~~ - | | - | long unsigned int* - -Fix #1008 and #1086 - -Fixes: - - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/strukturag/libheif/pull/1120 ---- - libheif/plugins/encoder_jpeg.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc -index d6c7854..21a5541 100644 ---- a/libheif/plugins/encoder_jpeg.cc -+++ b/libheif/plugins/encoder_jpeg.cc -@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* - } - - uint8_t* outbuffer = nullptr; -+#ifdef LIBJPEG_TURBO_VERSION - unsigned long outlength = 0; -+#else -+ size_t outlength = 0; -+#endif - - jpeg_create_compress(&cinfo); - jpeg_mem_dest(&cinfo, &outbuffer, &outlength); --- -2.43.0 - diff --git a/package/libheif/libheif.hash b/package/libheif/libheif.hash index a2ca065b7ae..ed1a083d7c4 100644 --- a/package/libheif/libheif.hash +++ b/package/libheif/libheif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee libheif-1.17.6.tar.gz +sha256 8702564b0f288707ea72b260b3bf4ba9bf7abfa7dac01353def3a86acd6bbb76 libheif-1.18.1.tar.gz sha256 b2eb4f6588b005bebac44cfb2dfd23f6a16c5ca9b8a619a315158b0215a917a3 COPYING diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index 908e2ce068c..e2c3a328bc6 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHEIF_VERSION = 1.17.6 +LIBHEIF_VERSION = 1.18.1 LIBHEIF_SITE = https://github.com/strukturag/libheif/releases/download/v$(LIBHEIF_VERSION) LIBHEIF_LICENSE = LGPL-3.0+ LIBHEIF_LICENSE_FILES = COPYING From 85e4ad837ebdebea17e6b7e9c05c851b57788584 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:47:35 +0200 Subject: [PATCH 2240/3013] package/libass: bump version to 0.17.3 Release notes: https://github.com/libass/libass/releases/tag/0.17.2 https://github.com/libass/libass/releases/tag/0.17.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index bf9b8251d75..2f6b554e3dc 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 libass-0.17.1.tar.xz +sha256 eae425da50f0015c21f7b3a9c7262a910f0218af469e22e2931462fed3c50959 libass-0.17.3.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index f48673014ab..f198ee89f0a 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.17.1 +LIBASS_VERSION = 0.17.3 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. From 358261b319e3be29e68a86358ccc7bf97fa795f2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:48:05 +0200 Subject: [PATCH 2241/3013] package/flatbuffers: bump version to 24.3.25 Updated project URL, rebased patch. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-include-flatbuffers-base.h-fix-build-on-musl.patch | 6 +++--- package/flatbuffers/Config.in | 2 +- package/flatbuffers/flatbuffers.hash | 2 +- package/flatbuffers/flatbuffers.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch index 82feca3e391..872db03045c 100644 --- a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch +++ b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch @@ -30,8 +30,8 @@ Fixes: Signed-off-by: Fabrice Fontaine [Upstream status: Rejected: https://github.com/google/flatbuffers/pull/6773] -Signed-off-by: Bernd Kuhls -(rebased and added fix for uClibc-build) +Signed-off-by: Bernd Kuhls +(rebased and added fix for uClibc-build, rebased again for 24.3.25) --- include/flatbuffers/base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -40,7 +40,7 @@ diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h index de7898dc..101c7598 100644 --- a/include/flatbuffers/base.h +++ b/include/flatbuffers/base.h -@@ -264,7 +264,8 @@ namespace flatbuffers { +@@ -270,7 +270,8 @@ namespace flatbuffers { // strtoull_l}. #if (defined(_MSC_VER) && _MSC_VER >= 1800) || \ (defined(__ANDROID_API__) && __ANDROID_API__>= 21) || \ diff --git a/package/flatbuffers/Config.in b/package/flatbuffers/Config.in index 992738282f5..878bbd0d6dc 100644 --- a/package/flatbuffers/Config.in +++ b/package/flatbuffers/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_FLATBUFFERS Python. It was originally created at Google for game development and other performance-critical applications. - http://google.github.io/flatbuffers/ + https://flatbuffers.dev comment "flatbuffers needs a toolchain w/ C++, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index 3c3a90d6f39..ac2c9fc63a9 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1cce06b17cddd896b6d73cc047e36a254fb8df4d7ea18a46acf16c4c0cd3f3f3 flatbuffers-23.5.26.tar.gz +sha256 4157c5cacdb59737c5d627e47ac26b140e9ee28b1102f812b36068aab728c1ed flatbuffers-24.3.25.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 3998a25cdf8..33481eabf8e 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLATBUFFERS_VERSION = 23.5.26 +FLATBUFFERS_VERSION = 24.3.25 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE From 4f6e5813350bfb9c1c4ec724797d11d696a16c95 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 13:18:55 +0200 Subject: [PATCH 2242/3013] configs/freescale_imx6ullevk: bump BSP components to lf-6.6.23-2.0.0 Bump U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. This commit also adds the custom version package hashes. Therefore, BR2_DOWNLOAD_FORCE_CHECK_HASHES=y is added in the defconfig, a BR2_GLOBAL_PATCH_DIR is also added in the board specific directory and the hash files are added. The corresponding ".checkpackageignore" entry is also removed. The Kernel DTS name is also updated by adding the new "nxp/imx/" prefix, to follow the upstream reorganization in [1], first included in v6.5. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx6ullevk/patches/linux/linux.hash | 2 ++ board/freescale/imx6ullevk/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx6ullevk_defconfig | 10 ++++++---- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 120000 board/freescale/imx6ullevk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx6ullevk/patches/linux/linux.hash create mode 100644 board/freescale/imx6ullevk/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 10662bb11ed..9335dca0e70 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -151,7 +151,6 @@ configs/engicam_imx6qdl_icore_rqs_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash configs/freescale_t1040d4rdb_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx6ullevk/patches/linux-headers/linux-headers.hash b/board/freescale/imx6ullevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx6ullevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx6ullevk/patches/linux/linux.hash b/board/freescale/imx6ullevk/patches/linux/linux.hash new file mode 100644 index 00000000000..3c4223976bf --- /dev/null +++ b/board/freescale/imx6ullevk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx6ullevk/patches/uboot/uboot.hash b/board/freescale/imx6ullevk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..4e0d729ca0e --- /dev/null +++ b/board/freescale/imx6ullevk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index fd4254edbfc..e29a9898fc1 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,16 +1,18 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx6ullevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.1.36-2.1.0)/linux-imx-lf-6.1.36-2.1.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6ullevk/linux_sdma.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ull-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y @@ -20,7 +22,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1.36-2.1.0)/uboot-imx-lf-6.1.36-2.1.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y From 32effe39f8260fc145f6f965482d082580716307 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 15:43:28 +0200 Subject: [PATCH 2243/3013] configs/freescale_imx93evk: bump BSP components to lf-6.6.23-2.0.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, commit c05f27c8ae "configs/freescale_imx93evk: new defconfig" introduced the custom hash files, but did not add BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in the defconfig. This commit fixes this issue by adding this config directive. As a side note, commit 22fd54b737 "configs/freescale_imx93evk: Update to NXP lf-6.6.3-1.0.0" updated the defconfig components version, but did not updated the custom hash files, because they were ignored. This is why hashes were still at version 6.1 whereas components where already at 6.6. Since hashes were not enabled, this was not detected by "make check-package", and the entry in ".checkpackageignore" was also kept. This commit also removes this entry. Finally, with the bump of BSP components, this commit updates the custom hash files accordingly. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx93evk/patches/linux/linux.hash | 2 +- board/freescale/imx93evk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx93evk_defconfig | 7 ++++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 9335dca0e70..42bcbed4eb0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -151,7 +151,6 @@ configs/engicam_imx6qdl_icore_rqs_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash configs/freescale_t1040d4rdb_defconfig lib_defconfig.ForceCheckHash configs/freescale_t2080_qds_rdb_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 98f425a89e4..0266b45d6ab 100644 --- a/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 cfb927722272897f850681c78d5f129b0883a8efaba9c52d30e029086524f7ff imx-atf-lf-6.1.55-2.2.0.tar.gz +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash index 715a590825e..3c4223976bf 100644 --- a/board/freescale/imx93evk/patches/linux/linux.hash +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx93evk/patches/uboot/uboot.hash b/board/freescale/imx93evk/patches/uboot/uboot.hash index 9bc17c3f6f9..4e0d729ca0e 100644 --- a/board/freescale/imx93evk/patches/uboot/uboot.hash +++ b/board/freescale/imx93evk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 64441ee5bf3d5011e7853c028d06211b6f0439d21e147a8f36972c95a07ae9ac uboot-imx-lf-6.1.55-2.2.0.tar.gz +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig index f30bafd9a2c..b244ba9684f 100644 --- a/configs/freescale_imx93evk_defconfig +++ b/configs/freescale_imx93evk_defconfig @@ -3,11 +3,12 @@ BR2_cortex_a55=y BR2_ARM_FPU_VFPV4D16=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx93evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.3-1.0.0)/linux-imx-lf-6.6.3-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-11x11-evk" @@ -21,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.3-1.0.0)/imx-atf-lf-6.6.3-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.3-1.0.0)/uboot-imx-lf-6.6.3-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx93_11x11_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From dda750dcddda3a609c6c070141638886174f2c19 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 16:25:40 +0200 Subject: [PATCH 2244/3013] package/freescale-imx/imx-gpu-viv: bump to version 6.4.11.p2.6 This version is aligned to the NXP BSP lf-6.6.23-2.0.0. See [1]. License hashes changed because the LA_OPT_NXP_Software_License changed from "v49 September 2023" to "v56 April 2024". [1] https://github.com/nxp-imx/meta-imx/blob/rel_imx_6.6.23_2.0.0/meta-imx-bsp/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 8 ++++---- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index b350443a512..cce08e27275 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 15efe6da5d4bac2a6067c2a898190be8754df6f14128c3db4756cff59c6da049 imx-gpu-viv-6.4.11.p2.2-aarch32-fd0148d.bin -sha256 6e34f3718925ba37c362cd09a3228cc56d03cfad323ebae0932f64449dbaeb2e imx-gpu-viv-6.4.11.p2.2-aarch64-fd0148d.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3 imx-gpu-viv-6.4.11.p2.6-aarch32-bc7b6a2.bin +sha256 5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1 imx-gpu-viv-6.4.11.p2.6-aarch64-bc7b6a2.bin +sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 3cfbfe3cccd..a559bb74786 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.11.p2.2-aarch64-fd0148d +IMX_GPU_VIV_VERSION = 6.4.11.p2.6-aarch64-bc7b6a2 else -IMX_GPU_VIV_VERSION = 6.4.11.p2.2-aarch32-fd0148d +IMX_GPU_VIV_VERSION = 6.4.11.p2.6-aarch32-bc7b6a2 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin From 2143e8f8351c177d7fce87ccacba042afea94f93 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 3 Aug 2024 13:42:03 -0400 Subject: [PATCH 2245/3013] package/swaybg: bump to version 1.2.1 See also: https://github.com/swaywm/swaybg/releases/tag/v1.2.1 Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- package/swaybg/swaybg.hash | 5 +++-- package/swaybg/swaybg.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/swaybg/swaybg.hash b/package/swaybg/swaybg.hash index 62bf048d612..e528349db90 100644 --- a/package/swaybg/swaybg.hash +++ b/package/swaybg/swaybg.hash @@ -1,3 +1,4 @@ -# Locally computed, tarball verified with GPG signature -sha256 c0205b34f1fad94553b6cb2c2b983cc33186018026058cad0b841a00bc3087e3 swaybg-1.2.0.tar.gz +# Locally calculated after checking pgp signature: +# https://github.com/swaywm/swaybg/releases/download/v1.2.1/swaybg-1.2.1.tar.gz.sig +sha256 6af1fdf0e57b1cc5345febed786b761fea0e170943a82639f94cfaed7df84f8f swaybg-1.2.1.tar.gz sha256 95224d118a325daf31828afcca98cd958d53f0a7cdd856b50b1be8ac44832faf LICENSE diff --git a/package/swaybg/swaybg.mk b/package/swaybg/swaybg.mk index 90a8cb5d809..87374e035ee 100644 --- a/package/swaybg/swaybg.mk +++ b/package/swaybg/swaybg.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWAYBG_VERSION = 1.2.0 +SWAYBG_VERSION = 1.2.1 SWAYBG_SITE = https://github.com/swaywm/swaybg/releases/download/v$(SWAYBG_VERSION) SWAYBG_LICENSE = MIT SWAYBG_LICENSE_FILES = LICENSE From b77ee70a7ceaf0b70a2e9573d52643ccf06979f0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 22:23:40 +0200 Subject: [PATCH 2246/3013] package/freescale-imx/imx-gpu-g2d: bump to version 6.4.11.p2.6 This version is aligned to the NXP BSP lf-6.6.23-2.0.0. See [1]. License hashes changed because the LA_OPT_NXP_Software_License changed from "v49 September 2023" to "v56 April 2024". [1] https://github.com/nxp-imx/meta-imx/blob/rel_imx_6.6.23_2.0.0/meta-imx-bsp/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash | 8 ++++---- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index d15287ebc7e..922fce2236d 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bc168b19096a997251e7137f82ffcff404c61709cf5f227c53a099f631569f76 imx-gpu-g2d-6.4.11.p2.2-arm-fd0148d.bin -sha256 1cedc606be965b01300613ccea81b4fd589d940306bb1caa30a37c41928616ec imx-gpu-g2d-6.4.11.p2.2-aarch64-fd0148d.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663 imx-gpu-g2d-6.4.11.p2.6-arm-bc7b6a2.bin +sha256 b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918 imx-gpu-g2d-6.4.11.p2.6-aarch64-bc7b6a2.bin +sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 51a49b6972e..0a7ee3c298e 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.11.p2.2-aarch64-fd0148d +IMX_GPU_G2D_VERSION = 6.4.11.p2.6-aarch64-bc7b6a2 else -IMX_GPU_G2D_VERSION = 6.4.11.p2.2-arm-fd0148d +IMX_GPU_G2D_VERSION = 6.4.11.p2.6-arm-bc7b6a2 endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin From bb280a47ad9bc48b40b98019a595857102275375 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 22:43:31 +0200 Subject: [PATCH 2247/3013] package/genimage: bump to version 18 For a change list since v17, see: https://github.com/pengutronix/genimage/compare/v17...v18 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/genimage/genimage.hash | 2 +- package/genimage/genimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index e09ffd82bef..232ba6ef662 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8756e3567a0d4d82c36b08ccc1e088250b9006d5670c6b2b014185e6ec60671 genimage-17.tar.xz +sha256 ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd genimage-18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 2be8e1137e8..b8ce7ff3c90 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 17 +GENIMAGE_VERSION = 18 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse From 6395fc6e6575d487c4a4404516cc3cb440271e95 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 3 Aug 2024 15:13:41 +0200 Subject: [PATCH 2248/3013] package/valgrind: update to 3.23.0 See here for Changes: https://valgrind.org/docs/manual/dist.news.html Enable for S/390X as it is supported. (Only compile time tested). Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/valgrind/Config.in | 1 + package/valgrind/valgrind.hash | 4 ++-- package/valgrind/valgrind.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in index 700849130fc..56fda07d092 100644 --- a/package/valgrind/Config.in +++ b/package/valgrind/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x depends on !BR2_MIPS_SOFT_FLOAT comment "valgrind needs a toolchain w/ dynamic library, threads" diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index d236c7b4a0f..9cb66b583ad 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,7 +1,7 @@ # From https://valgrind.org/downloads/current.html -sha1 60894cbf59d480c1794674da24a8406518a8df59 valgrind-3.22.0.tar.bz2 +sha1 ec410c75d3920d4f9249a5cfa2cac31e1bf6d586 valgrind-3.23.0.tar.bz2 # locally computed -sha256 c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c valgrind-3.22.0.tar.bz2 +sha256 c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d valgrind-3.23.0.tar.bz2 # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 97a955bd3bd..a5cb4b1c03e 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.22.0 +VALGRIND_VERSION = 3.23.0 VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 From 4398dd7e847d89ec3cff3446643eb0816279a51d Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 3 Aug 2024 19:54:01 -0400 Subject: [PATCH 2249/3013] package/libpqxx: bump to version 7.9.2 Requires GCC 8.3 due to the introduction of the charconv header. However, as there is no BR2_TOOLCHAIN_GCC_AT_LEAST_8_3, we round up to BR2_TOOLCHAIN_GCC_AT_LEAST_9. Note the `COPYING` file has changed due to copyright year bumps. See also: https://github.com/jtv/libpqxx/blob/master/NEWS Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- package/libpqxx/Config.in | 6 +++--- package/libpqxx/libpqxx.hash | 4 ++-- package/libpqxx/libpqxx.mk | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libpqxx/Config.in b/package/libpqxx/Config.in index f5fe2b38079..845692eae68 100644 --- a/package/libpqxx/Config.in +++ b/package/libpqxx/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBPQXX bool "libpqxx" depends on BR2_PACKAGE_POSTGRESQL depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # C++17/charconv depends on BR2_INSTALL_LIBSTDCPP help libpqxx is the official C++ client API for PostgreSQL, the @@ -10,8 +10,8 @@ config BR2_PACKAGE_LIBPQXX http://pqxx.org/development/libpqxx/ -comment "libpqxx needs toolchain w/ C++, gcc >= 7, threads" +comment "libpqxx needs toolchain w/ C++, gcc >= 9, threads" depends on BR2_PACKAGE_POSTGRESQL depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libpqxx/libpqxx.hash b/package/libpqxx/libpqxx.hash index 1c0e4c185de..7e13e7415b5 100644 --- a/package/libpqxx/libpqxx.hash +++ b/package/libpqxx/libpqxx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c7dc3e8fa2eee656f2b6a8179d72f15db10e97a80dc4f173f806e615ea990973 libpqxx-7.7.5.tar.gz -sha256 91718581edafc9f722915133d75f74c82d7c2e41a1831c1e042206423e5a63b0 COPYING +sha256 e37d5774c39f6c802e32d7f418e88b8e530404fb54758516e884fc0ebdee6da4 libpqxx-7.9.2.tar.gz +sha256 3dd057a614dd24688aafc38d4c41111140e17147cfd94f314a80af30879641b2 COPYING diff --git a/package/libpqxx/libpqxx.mk b/package/libpqxx/libpqxx.mk index 434cefd0695..c69b77260db 100644 --- a/package/libpqxx/libpqxx.mk +++ b/package/libpqxx/libpqxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPQXX_VERSION = 7.7.5 +LIBPQXX_VERSION = 7.9.2 LIBPQXX_SITE = $(call github,jtv,libpqxx,$(LIBPQXX_VERSION)) LIBPQXX_INSTALL_STAGING = YES LIBPQXX_DEPENDENCIES = postgresql From f9d6e6fb11b906f08fd974dbf58fbf66b17756ac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 4 Aug 2024 04:32:50 +0200 Subject: [PATCH 2250/3013] package/libressl: update to 3.9.2 Release notes: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.2-relnotes.txt Patches 0002/0003 are upstream. 0004 got renamed to 0002. Disable ASM for PowerPC target, as it fails to link binaries when enabled: /home/autobuild/autobuild/instance-15/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/13.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../../crypto/libcrypto.so.52.0.0: undefined reference to `bn_mul_add_words' ... Fixes: http://autobuild.buildroot.net/results/ddd/dddd58def99b28c5afa9896622259b652a4287da/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...sts-txt-Fix-HOST-variable-for-ppc64.patch} | 0 ...02-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 ------------------ ...x-some-compat-symbols-with-libressl_.patch | 130 ----------------- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 8 +- 5 files changed, 8 insertions(+), 265 deletions(-) rename package/libressl/{0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch => 0002-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch} (100%) delete mode 100644 package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch delete mode 100644 package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch diff --git a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch b/package/libressl/0002-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch similarity index 100% rename from package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch rename to package/libressl/0002-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch deleted file mode 100644 index 411132ff203..00000000000 --- a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch +++ /dev/null @@ -1,133 +0,0 @@ -From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Mon, 11 Dec 2023 17:56:33 +0100 -Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT - -I thought we stopped doing this, but that's for a separate thread. - -Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd -Signed-off-by: Fabrice Fontaine ---- - crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ - 1 file changed, 19 insertions(+), 18 deletions(-) - -diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt -index 605647151..8046efe87 100644 ---- a/crypto/CMakeLists.txt -+++ b/crypto/CMakeLists.txt -@@ -767,13 +767,13 @@ endif() - - if(NOT HAVE_ASPRINTF) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) - endif() - - if(NOT HAVE_FREEZERO) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) - endif() - - if(NOT HAVE_GETOPT) -@@ -799,46 +799,46 @@ endif() - - if(NOT HAVE_REALLOCARRAY) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) - endif() - - if(NOT HAVE_RECALLOCARRAY) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) - endif() - - if(NOT HAVE_STRCASECMP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) - endif() - - if(NOT HAVE_STRLCAT) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) - endif() - - if(NOT HAVE_STRLCPY) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) - endif() - - if(NOT HAVE_STRNDUP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) - if(NOT HAVE_STRNLEN) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) - endif() - endif() - - if(NOT HAVE_STRSEP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) - endif() - - if(NOT HAVE_STRTONUM) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) - endif() - - if(NOT HAVE_SYSLOG_R) -@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) - set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) - endif() -- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) - endif() - - if(NOT HAVE_ARC4RANDOM_BUF) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) - - if(NOT HAVE_GETENTROPY) - if(WIN32) -@@ -891,12 +891,12 @@ endif() - - if(NOT HAVE_TIMINGSAFE_BCMP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) - endif() - - if(NOT HAVE_TIMINGSAFE_MEMCMP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) - endif() - - if(NOT ENABLE_ASM) -@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) - string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) - endforeach() - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) -+# XXX should we still be doing this? - if(EXTRA_EXPORT) - list(SORT EXTRA_EXPORT) - foreach(SYM IN LISTS EXTRA_EXPORT) diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch deleted file mode 100644 index 42fbbe90692..00000000000 --- a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Sat, 18 Nov 2023 10:53:09 +0100 -Subject: [PATCH] Prefix some compat symbols with libressl_ - -See #928. This isn't a full fix, but should remove much of the friction -already. - -Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 -Signed-off-by: Fabrice Fontaine ---- - include/compat/stdio.h | 2 ++ - include/compat/stdlib.h | 10 ++++++++++ - include/compat/string.h | 11 +++++++++++ - 3 files changed, 23 insertions(+) - -diff --git a/include/compat/stdio.h b/include/compat/stdio.h -index d5725c9ac9..4ddd63aee1 100644 ---- a/include/compat/stdio.h -+++ b/include/compat/stdio.h -@@ -20,7 +20,9 @@ - - #ifndef HAVE_ASPRINTF - #include -+#define vasprintf libressl_vasprintf - int vasprintf(char **str, const char *fmt, va_list ap); -+#define asprintf libressl_asprintf - int asprintf(char **str, const char *fmt, ...); - #endif - -diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h -index 2eaea244c0..76dc07c35a 100644 ---- a/include/compat/stdlib.h -+++ b/include/compat/stdlib.h -@@ -20,26 +20,36 @@ - #include - - #ifndef HAVE_ARC4RANDOM_BUF -+#define arc4random libressl_arc4random - uint32_t arc4random(void); -+#define arc4random_buf libressl_arc4random_buf - void arc4random_buf(void *_buf, size_t n); -+#define arc4random_uniform libressl_arc4random_uniform - uint32_t arc4random_uniform(uint32_t upper_bound); - #endif - - #ifndef HAVE_FREEZERO -+#define freezero libressl_freezero - void freezero(void *ptr, size_t sz); - #endif - - #ifndef HAVE_GETPROGNAME -+#define getprogname libressl_getprogname - const char * getprogname(void); - #endif - -+#ifndef HAVE_REALLOCARRAY -+#define reallocarray libressl_reallocarray - void *reallocarray(void *, size_t, size_t); -+#endif - - #ifndef HAVE_RECALLOCARRAY -+#define recallocarray libressl_recallocarray - void *recallocarray(void *, size_t, size_t, size_t); - #endif - - #ifndef HAVE_STRTONUM -+#define strtonum libressl_strtonum - long long strtonum(const char *nptr, long long minval, - long long maxval, const char **errstr); - #endif -diff --git a/include/compat/string.h b/include/compat/string.h -index 4bf7519b5b..6a82793f62 100644 ---- a/include/compat/string.h -+++ b/include/compat/string.h -@@ -27,43 +27,54 @@ - #endif - - #ifndef HAVE_STRCASECMP -+#define strcasecmp libressl_strcasecmp - int strcasecmp(const char *s1, const char *s2); -+#define strncasecmp libressl_strncasecmp - int strncasecmp(const char *s1, const char *s2, size_t len); - #endif - - #ifndef HAVE_STRLCPY -+#define strlcpy libressl_strlcpy - size_t strlcpy(char *dst, const char *src, size_t siz); - #endif - - #ifndef HAVE_STRLCAT -+#define strlcat libressl_strlcat - size_t strlcat(char *dst, const char *src, size_t siz); - #endif - - #ifndef HAVE_STRNDUP -+#define strndup libressl_strndup - char * strndup(const char *str, size_t maxlen); - /* the only user of strnlen is strndup, so only build it if needed */ - #ifndef HAVE_STRNLEN -+#define strnlen libressl_strnlen - size_t strnlen(const char *str, size_t maxlen); - #endif - #endif - - #ifndef HAVE_STRSEP -+#define strsep libressl_strsep - char *strsep(char **stringp, const char *delim); - #endif - - #ifndef HAVE_EXPLICIT_BZERO -+#define explicit_bzero libressl_explicit_bzero - void explicit_bzero(void *, size_t); - #endif - - #ifndef HAVE_TIMINGSAFE_BCMP -+#define timingsafe_bcmp libressl_timingsafe_bcmp - int timingsafe_bcmp(const void *b1, const void *b2, size_t n); - #endif - - #ifndef HAVE_TIMINGSAFE_MEMCMP -+#define timingsafe_memcmp libressl_timingsafe_memcmp - int timingsafe_memcmp(const void *b1, const void *b2, size_t len); - #endif - - #ifndef HAVE_MEMMEM -+#define memmem libressl_memmem - void * memmem(const void *big, size_t big_len, const void *little, - size_t little_len); - #endif diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 5d3b54ea9ce..692dce28e3a 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 c0cef9cfe174ac366ce482f542fddb07721e7fa0caface34b49a8720fa37fe7d libressl-3.8.4.tar.gz +sha256 7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97 libressl-3.9.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 1d90aa853d8..5a78ec839a6 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.8.4 +LIBRESSL_VERSION = 3.9.2 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING @@ -12,6 +12,12 @@ LIBRESSL_CPE_ID_VENDOR = openbsd LIBRESSL_INSTALL_STAGING = YES LIBRESSL_CONF_OPTS = -DLIBRESSL_TESTS=OFF -DOPENSSLDIR="/etc/ssl" +# Otherwise fails to build with undefined reference to +# `bn_mul_add_words' +ifeq ($(BR2_powerpc),y) +LIBRESSL_CONF_OPTS += -DENABLE_ASM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBRESSL_BIN),) define LIBRESSL_REMOVE_BIN $(RM) -f $(TARGET_DIR)/usr/bin/openssl From 069a93389455827a59084638ab4e079484977e80 Mon Sep 17 00:00:00 2001 From: Xiang Lin Date: Sun, 4 Aug 2024 11:12:32 +0800 Subject: [PATCH 2251/3013] package/procps-ng: add option to select 'top' layout The new procps-ng uses modern top layout by default which doesn't provide detailed cpu usage info, so let's add an option for nostalgic users that allows to get the original layout back. Signed-off-by: Xiang Lin Signed-off-by: Thomas Petazzoni --- package/procps-ng/Config.in | 10 ++++++++++ package/procps-ng/procps-ng.mk | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/package/procps-ng/Config.in b/package/procps-ng/Config.in index 6ff89832020..4afd01699b8 100644 --- a/package/procps-ng/Config.in +++ b/package/procps-ng/Config.in @@ -8,3 +8,13 @@ config BR2_PACKAGE_PROCPS_NG Provides things like kill, ps, uptime, free, top, etc... http://sourceforge.net/projects/procps-ng/ + +if BR2_PACKAGE_PROCPS_NG + +config BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP + bool "Use original top layout" + help + Disable modern top layout, return to original top with + detail cpu usage. + +endif diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index c5675e2ee6e..2f28e3571e2 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -52,6 +52,10 @@ else PROCPS_NG_CONF_OPTS += --enable-w endif +ifeq ($(BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP),y) +PROCPS_NG_CONF_OPTS += --disable-modern-top +endif + # Avoid installing S02sysctl, since openrc provides /etc/init.d/sysctl. define PROCPS_NG_INSTALL_INIT_OPENRC @: From 9b9532a6650923faab48ead83b299187c30a3bdc Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 4 Aug 2024 11:50:12 +0200 Subject: [PATCH 2252/3013] package/linux-pam: add menuconfig option to build pam_lastlog.so Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/linux-pam/Config.in | 9 +++++++++ package/linux-pam/linux-pam.mk | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index c8aca97ac69..1aa90453330 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -13,6 +13,15 @@ config BR2_PACKAGE_LINUX_PAM http://linux-pam.org +if BR2_PACKAGE_LINUX_PAM + +config BR2_PACKAGE_LINUX_PAM_LASTLOG + bool "pam_lastlog.so" + help + Build pam_lastlog.so module. + +endif + comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR \ diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index a205d67c54f..1433eb00b3d 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -54,6 +54,12 @@ else LINUX_PAM_CONF_OPTS += --disable-openssl endif +ifeq ($(BR2_PACKAGE_LINUX_PAM_LASTLOG),y) +LINUX_PAM_CONF_OPTS += --enable-lastlog +else +LINUX_PAM_CONF_OPTS += --disable-lastlog +endif + # Install default pam config (deny everything except login) define LINUX_PAM_INSTALL_CONFIG $(INSTALL) -m 0644 -D package/linux-pam/login.pam \ From 7a8939378990ec007049f71bc4a1636b2f7da4b0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 4 Aug 2024 12:02:48 +0200 Subject: [PATCH 2253/3013] package/libgpg-error: bump to 1.50 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libgpg-error/libgpg-error.hash | 4 ++-- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index f87accdd970..be5202584da 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 28668dc3f693dfd8fa6724c702559e45ab5b15c0 libgpg-error-1.49.tar.bz2 -sha256 8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9 libgpg-error-1.49.tar.bz2 +sha1 6790fc3d6e7bbd7576654b43971bbe15e953ccc4 libgpg-error-1.50.tar.bz2 +sha256 69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a libgpg-error-1.50.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 9245e765310..8dff6a612d3 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.49 +LIBGPG_ERROR_VERSION = 1.50 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From 2a8c58b5849ed2c9908cf08b596f370454c251b6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 4 Aug 2024 12:03:51 +0200 Subject: [PATCH 2254/3013] package/libgcrypt: fix libgpg-error detection Libgcrypt uses two scripts to identify libgpg-error location. The first one is gpg-error-config. The second one is gpgrt-config. The usage of gpg-error-config is deprecated. Help libgcrpyt to find a correct gpgrt-config for cross-compilation. Fixes: - http://autobuild.buildroot.net/results/46e/46efff01f7d0a2ce3c8523cd073302e58e0f0ae5/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libgcrypt/libgcrypt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index ae50ead3436..57eca507b37 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -16,6 +16,7 @@ LIBGCRYPT_CPE_ID_VENDOR = gnupg # Patching configure.ac and Makefile.am in 0001 LIBGCRYPT_AUTORECONF = YES +LIBGCRYPT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config LIBGCRYPT_CONF_OPTS = \ --disable-tests \ $(if $(BR2_OPTIMIZE_0),--disable-ppc-crypto-support,) \ From 4a672660130bba57ca5a21ed2325259172ba235f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 4 Aug 2024 18:13:54 +0200 Subject: [PATCH 2255/3013] configs/freescale_imx[67]*: uboot needs openssl Those defconfigs were recently bumped to NXP BSP lf-6.6.23-2.0.0. NXP BSP U-Boot version lf-6.6.23-2.0.0 is based on upstream version 2024.04. This version now requires OpenSSL. Those defconfigs are failing in uboot build, with output: In file included from tools/imagetool.h:24, from tools/imagetool.c:8: include/image.h:1471:12: fatal error: openssl/evp.h: No such file or directory 1471 | # include | ^~~~~~~~~~~~~~~ This commit fixes the issue by adding BR2_TARGET_UBOOT_NEEDS_OPENSSL=y in all the impacted defconfigs. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6dlsabreauto_defconfig | 1 + configs/freescale_imx6dlsabresd_defconfig | 1 + configs/freescale_imx6qsabreauto_defconfig | 1 + configs/freescale_imx6qsabresd_defconfig | 1 + configs/freescale_imx6sxsabresd_defconfig | 1 + configs/freescale_imx7dsabresd_defconfig | 1 + 6 files changed, 6 insertions(+) diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 9354d2ececb..0a60d1b6b1b 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -41,3 +41,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index a06b49d74dc..49a3ea84483 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -40,3 +40,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index bc9a64a735c..8ae57fc7e09 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -41,3 +41,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index a9f45ad4be7..09829c20155 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -41,3 +41,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index a88ac68da12..5beef977d4c 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -40,3 +40,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index f00144239e5..1b2412ad8cb 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -32,6 +32,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # required tools to create the microSD image BR2_PACKAGE_HOST_DOSFSTOOLS=y From 0cdbda3b56e73e8d6ee93820c3581ffa5d2adf75 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 4 Aug 2024 18:15:57 +0200 Subject: [PATCH 2256/3013] configs/freescale_imx8q*: uboot needs openssl Those defconfigs were recently bumped to NXP BSP lf-6.6.23-2.0.0. NXP BSP U-Boot version lf-6.6.23-2.0.0 is based on upstream version 2024.04. This version now requires OpenSSL. Those defconfigs are failing in uboot build, with output: In file included from tools/imagetool.h:24, from tools/imagetool.c:8: include/image.h:1471:12: fatal error: openssl/evp.h: No such file or directory 1471 | # include | ^~~~~~~~~~~~~~~ This commit fixes the issue by adding BR2_TARGET_UBOOT_NEEDS_OPENSSL=y in all the impacted defconfigs. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- configs/freescale_imx8qmmek_defconfig | 1 + configs/freescale_imx8qxpmek_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 3ad273c9d43..6fb3a54df18 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -31,6 +31,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index d2fae2c9e7b..3ff476e992b 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -33,6 +33,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y From 754e638d6bae686c8c945573caff8b94f6e163c7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 4 Aug 2024 18:18:06 +0200 Subject: [PATCH 2257/3013] configs/freescale_imx8mnevk: uboot needs openssl This defconfig was recently bumped to NXP BSP lf-6.6.23-2.0.0. NXP BSP U-Boot version lf-6.6.23-2.0.0 is based on upstream version 2024.04. This version now requires OpenSSL. This defconfig is failing in uboot build, with output: In file included from tools/imagetool.h:24, from tools/imagetool.c:8: include/image.h:1471:12: fatal error: openssl/evp.h: No such file or directory 1471 | # include | ^~~~~~~~~~~~~~~ This commit fixes the issue by adding BR2_TARGET_UBOOT_NEEDS_OPENSSL=y in the defconfig. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- configs/freescale_imx8mnevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index a534c504776..fc601dd5fbb 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -31,6 +31,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y From 8009fee0f82fda9e2b3b45d93204a3c6004a6e72 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 4 Aug 2024 18:20:57 +0200 Subject: [PATCH 2258/3013] configs/freescale_imx8m[mq]evk*: uboot needs openssl and gnutls Those defconfigs were recently bumped to NXP BSP lf-6.6.23-2.0.0. NXP BSP U-Boot version lf-6.6.23-2.0.0 is based on upstream version 2024.04. This version now requires OpenSSL and GnuTLS for that configuration. Those defconfigs are failing in uboot build, with output: In file included from tools/imagetool.h:24, from tools/imagetool.c:8: include/image.h:1471:12: fatal error: openssl/evp.h: No such file or directory 1471 | # include | ^~~~~~~~~~~~~~~ and: tools/mkeficapsule.c:20:10: fatal error: gnutls/gnutls.h: No such file or directory 20 | #include | ^~~~~~~~~~~~~~~~~ This commit fixes the issue by adding BR2_TARGET_UBOOT_NEEDS_GNUTLS=y and BR2_TARGET_UBOOT_NEEDS_OPENSSL=y in those defconfigs. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- configs/freescale_imx8mmevk_defconfig | 2 ++ configs/freescale_imx8mqevk_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index 2f57bfd2f02..335030fcd3f 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -30,6 +30,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 05a78e5b6b8..50fcaeff83f 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -30,6 +30,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y From f0e4448e7c38d604152b6e727dcd6fb6d23c286f Mon Sep 17 00:00:00 2001 From: Wilfred Mallawa via buildroot Date: Mon, 5 Aug 2024 11:57:12 +1000 Subject: [PATCH 2259/3013] package/libspdm: bump version to 3.4.0 `libspdm 3.3.0` and later support the SPDM event capability, however this patch disables support for EVENT_CAP as it is optional, and requires additional functionality implemented at link time. `libspdm 3.4.0` also introduces SPDM1.3 measurement extention log (MEL). Leave this off by default for the same reason as above. The license file has changed, for two reasons: - The copyright years have been updated - The license was simplified to be really a pure BSD 3 Clause license, instead of a modified license that had some special patent disclaimer/clauses. See https://github.com/DMTF/libspdm/issues/2682 for more details. We don't need to change LIBSPDM_LICENSE because it was already only saying BSD-3-Clause (which was slightly wrong) Signed-off-by: Wilfred Mallawa Reviewed-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- ...eLists-remove-fixed-options-for-NONE.patch | 52 ------------------- package/libspdm/libspdm.hash | 4 +- package/libspdm/libspdm.mk | 10 +++- 3 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch deleted file mode 100644 index 0de0ad00793..00000000000 --- a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 -From: Wilfred Mallawa -Date: Mon, 19 Feb 2024 09:56:14 +1000 -Subject: [PATCH] CMakeLists: remove fixed options for NONE - -The use of the NONE toolchain option is such that we can provide at the -build project level (buildroot etc...). However, the changes introduced -in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker -option that does not comply with the definition of the options as -specified in [1]. This change removes those options. - -[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments - -Upstream: https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 -Signed-off-by: Wilfred Mallawa ---- - CMakeLists.txt | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c300cc817..f6cf17d269 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(CMAKE_EXE_LINKER_FLAGS "") - - SET(CMAKE_C_LINK_EXECUTABLE "") -- -- elseif(TOOLCHAIN STREQUAL "NONE") -- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) -- if(CMAKE_BUILD_TYPE STREQUAL "Debug") -- ADD_COMPILE_OPTIONS(-g) -- endif() -- if(GCOV STREQUAL "ON") -- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) -- endif() -- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) -- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) -- -- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) -- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) -- if(GCOV STREQUAL "ON") -- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") -- endif() -- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") -- - endif() - - if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") --- -2.43.2 - diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 32415bcfcec..93a8d933cc8 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz -sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md +sha256 44f967aeb0c481676affe59069615252854bc0c072368ce4b26b6809a54daff5 libspdm-3.4.0.tar.gz +sha256 c6ffa7e6889e63893078cb21b89594070183f7e2cf5b4ea01a4fb23eac59ed32 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 2ec35be0ac4..e86a79ed67a 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.2.0 +LIBSPDM_VERSION = 3.4.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md @@ -17,6 +17,11 @@ LIBSPDM_DEPENDENCIES = openssl LIBSPDM_TARGET_CPU_FAMILY = $(call qstrip,$(BR2_PACKAGE_LIBSPDM_CPU_FAMILY)) +LIBSPDM_CFLAGS = \ + $(TARGET_CFLAGS) \ + -DLIBSPDM_ENABLE_CAPABILITY_EVENT_CAP=0 \ + -DLIBSPDM_ENABLE_CAPABILITY_MEL_CAP=0 + LIBSPDM_CONF_OPTS = \ -DARCH=$(LIBSPDM_TARGET_CPU_FAMILY) \ -DTOOLCHAIN=NONE \ @@ -27,7 +32,8 @@ LIBSPDM_CONF_OPTS = \ -DCOMPILED_LIBSSL_PATH=/usr/lib/ \ -DDISABLE_TESTS=1 \ -DDISABLE_EDDSA=1 \ - -DLINK_FLAGS=$(STAGING_DIR) + -DLINK_FLAGS=$(STAGING_DIR) \ + -DCMAKE_C_FLAGS="$(LIBSPDM_CFLAGS)" define LIBSPDM_INSTALL_STAGING_CMDS mkdir -p $(STAGING_DIR)/usr/lib From 327312359a742f40d35c241958602b2026f0a1ba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 08:20:04 +0200 Subject: [PATCH 2260/3013] package/uclibc: fix missing m_tim issue Patch from upstream to fix missing m_tim issue. Fixes: - http://autobuild.buildroot.org/results/f07d6d6ae2331f9972974093c0503b9d3c6b914a/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...are-st_mtim-if-defined-__USE_XOPEN2K.patch | 205 ++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch diff --git a/package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch b/package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch new file mode 100644 index 00000000000..73100c2c1ba --- /dev/null +++ b/package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch @@ -0,0 +1,205 @@ +From d0c8c185b439187b12644457bb2aa0326f25aaf7 Mon Sep 17 00:00:00 2001 +From: J.Neuschäfer?= +Date: Sat, 27 Jul 2024 18:47:09 +0200 +Subject: [PATCH] bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), + everywhere +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While building software that sets _POSIX_C_SOURCE=200809L and uses +stat.st_mtim for ARM, it was noticed that st_mtim was not defined. + +This seems to be because common/bits/stat.h was picked up, which does +not take __USE_XOPEN2K8 as a reason to enable st_mtim and related +fields. This appears to be an oversight, and porting the check from +common-generic/bits/stat.h to other architectures does indeed fix the +build issue. + +This patch is based on commit 50bd6d06e ("Fix memory corruption due to +struct stat field"). + +Signed-off-by: J. Neuschäfer +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=d0c8c185b439187b12644457bb2aa0326f25aaf7 +--- + libc/sysdeps/linux/alpha/bits/stat.h | 2 +- + libc/sysdeps/linux/common/bits/stat.h | 4 ++-- + libc/sysdeps/linux/frv/bits/stat.h | 4 ++-- + libc/sysdeps/linux/ia64/bits/stat.h | 4 ++-- + libc/sysdeps/linux/m68k/bits/stat.h | 4 ++-- + libc/sysdeps/linux/mips/bits/stat.h | 4 ++-- + libc/sysdeps/linux/nds32/bits/stat.h | 4 ++-- + libc/sysdeps/linux/powerpc/bits/stat.h | 4 ++-- + 8 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/libc/sysdeps/linux/alpha/bits/stat.h b/libc/sysdeps/linux/alpha/bits/stat.h +index 88bc6617d..f2dca250d 100644 +--- a/libc/sysdeps/linux/alpha/bits/stat.h ++++ b/libc/sysdeps/linux/alpha/bits/stat.h +@@ -40,7 +40,7 @@ + + Use neat tidy anonymous unions and structures when possible. */ + +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + # if __GNUC_PREREQ(3,3) + # define __ST_TIME(X) \ + __extension__ union { \ +diff --git a/libc/sysdeps/linux/common/bits/stat.h b/libc/sysdeps/linux/common/bits/stat.h +index 07c09f50a..fc76cc3e7 100644 +--- a/libc/sysdeps/linux/common/bits/stat.h ++++ b/libc/sysdeps/linux/common/bits/stat.h +@@ -61,7 +61,7 @@ struct stat + #else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -107,7 +107,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/frv/bits/stat.h b/libc/sysdeps/linux/frv/bits/stat.h +index 381d207f2..18321c080 100644 +--- a/libc/sysdeps/linux/frv/bits/stat.h ++++ b/libc/sysdeps/linux/frv/bits/stat.h +@@ -70,7 +70,7 @@ struct stat + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif + +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -117,7 +117,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/ia64/bits/stat.h b/libc/sysdeps/linux/ia64/bits/stat.h +index 6723166e7..2b70b8cf8 100644 +--- a/libc/sysdeps/linux/ia64/bits/stat.h ++++ b/libc/sysdeps/linux/ia64/bits/stat.h +@@ -38,7 +38,7 @@ struct stat + int pad0; + __dev_t st_rdev; /* Device number, if device. */ + __off_t st_size; /* Size of file, in bytes. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -77,7 +77,7 @@ struct stat64 + int pad0; + __dev_t st_rdev; /* Device number, if device. */ + __off_t st_size; /* Size of file, in bytes. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/m68k/bits/stat.h b/libc/sysdeps/linux/m68k/bits/stat.h +index 7b9c3d144..70da1b384 100644 +--- a/libc/sysdeps/linux/m68k/bits/stat.h ++++ b/libc/sysdeps/linux/m68k/bits/stat.h +@@ -60,7 +60,7 @@ struct stat + #else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -106,7 +106,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/mips/bits/stat.h b/libc/sysdeps/linux/mips/bits/stat.h +index 539fa33d2..bad2a0244 100644 +--- a/libc/sysdeps/linux/mips/bits/stat.h ++++ b/libc/sysdeps/linux/mips/bits/stat.h +@@ -60,7 +60,7 @@ struct stat + long int st_pad2[2]; + __off64_t st_size; /* Size of file, in bytes. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -103,7 +103,7 @@ struct stat { + unsigned int st_rdev; /* Device number, if device. */ + int st_pad2[3]; + __off_t st_size; /* Size of file, in bytes. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/nds32/bits/stat.h b/libc/sysdeps/linux/nds32/bits/stat.h +index c4e09e0f2..5272751f4 100644 +--- a/libc/sysdeps/linux/nds32/bits/stat.h ++++ b/libc/sysdeps/linux/nds32/bits/stat.h +@@ -64,7 +64,7 @@ struct stat + #else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -110,7 +110,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/powerpc/bits/stat.h b/libc/sysdeps/linux/powerpc/bits/stat.h +index 7494586b5..ce2ebf896 100644 +--- a/libc/sysdeps/linux/powerpc/bits/stat.h ++++ b/libc/sysdeps/linux/powerpc/bits/stat.h +@@ -59,7 +59,7 @@ struct stat + # else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + # endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -99,7 +99,7 @@ struct stat64 + __off64_t st_size; /* Size of file, in bytes. */ + __blksize_t st_blksize; /* Optimal block size for I/O. */ + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +-- +2.30.2 + From 9ef47358431814d752f1005f99415f3f3e205fe6 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 13:04:51 +0100 Subject: [PATCH 2261/3013] package/nethogs: new package Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/nethogs/Config.in | 10 ++++++++++ package/nethogs/nethogs.hash | 3 +++ package/nethogs/nethogs.mk | 21 +++++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/nethogs/Config.in create mode 100644 package/nethogs/nethogs.hash create mode 100644 package/nethogs/nethogs.mk diff --git a/DEVELOPERS b/DEVELOPERS index 68729f721b6..8e46beff001 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2204,6 +2204,7 @@ F: utils/config F: utils/diffconfig N: Marcus Hoffmann +F: package/nethogs/ F: package/pico-sdk/ F: package/picotool/ F: package/python-jc/ diff --git a/package/Config.in b/package/Config.in index e21987717f1..2ac351cce55 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2527,6 +2527,7 @@ endif source "package/netcalc/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" + source "package/nethogs/Config.in" source "package/netplug/Config.in" source "package/netsnmp/Config.in" source "package/netstat-nat/Config.in" diff --git a/package/nethogs/Config.in b/package/nethogs/Config.in new file mode 100644 index 00000000000..2d6b44739ca --- /dev/null +++ b/package/nethogs/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_NETHOGS + bool "nethogs" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_NCURSES + help + NetHogs is a small 'net top' tool. Instead of breaking the + traffic down per protocol or per subnet, like most tools + do, it groups bandwidth by process. + + https://github.com/raboof/nethogs diff --git a/package/nethogs/nethogs.hash b/package/nethogs/nethogs.hash new file mode 100644 index 00000000000..fd1f2362505 --- /dev/null +++ b/package/nethogs/nethogs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d nethogs-0.8.7.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk new file mode 100644 index 00000000000..98c4f5f008c --- /dev/null +++ b/package/nethogs/nethogs.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# nethogs +# +################################################################################ + +NETHOGS_VERSION = 0.8.7 +NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION)) +NETHOGS_LICENSE = GPL-2.0+ +NETHOGS_LICENSE_FILES = COPYING +NETHOGS_DEPENDENCIES = libpcap ncurses + +define NETHOGS_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) nethogs +endef + +define NETHOGS_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/nethogs $(TARGET_DIR)/usr/sbin/nethogs +endef + +$(eval $(generic-package)) From f6a975f24e044ffdb717a96537395cc40c43aa70 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 09:19:07 +0200 Subject: [PATCH 2262/3013] package/fluent-bit: fix SSP compile issues with uClibc-ng Let's disable Security flags for the Buildsystem and let it handled by Buildroot itself. Fixes: - http://autobuild.buildroot.net/results/c9e/c9ed27a51a68429b2ed2d8eebb1afc919ecbead1/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/fluent-bit/fluent-bit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 5463682e454..10e639a3d51 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -15,6 +15,7 @@ FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ + -DFLB_SECURITY=No \ -DFLB_EXAMPLES=No \ -DFLB_CHUNK_TRACE=No \ -DFLB_PREFER_SYSTEM_LIBS=Yes \ From 61ad5516485a1b4518c4997c9a146a5faa96e6d2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 11:31:28 +0200 Subject: [PATCH 2263/3013] package/openldap: update to 2.5.18 See here for a Changelog: https://openldap.org/software/release/changes_lts.html Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/openldap/openldap.hash | 4 ++-- package/openldap/openldap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 1383c6aef88..32bd83f3498 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,5 +1,5 @@ # Verified by locally checking against the SHA3-512 hash available in -# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.16.sha3-512 +# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.18.sha3-512 # Locally computed -sha256 546ba591822e8bb0e467d40c4d4a30f89d937c3a507fe83a578f582f6a211327 openldap-2.5.16.tgz +sha256 2670ae43d8d99dd6b1ba182101d982350d613d09c098eb1607ea6b36e6b51d3e openldap-2.5.18.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 9cebff99dcb..68cfb89c41d 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.5.16 +OPENLDAP_VERSION = 2.5.18 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License From 761259c93400bc806611a242c7dc3df7ff67c231 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 16:16:01 +0200 Subject: [PATCH 2264/3013] package/nginx: security update to 1.26.1 See here for a Changelog and CVE's: http://nginx.org/en/CHANGES-1.26 Patch 0006 is no longer required as the openssl library is found without this patch, which does not apply anymore. Patch 0009 is no longer required as it was fixed in another way upstream: https://hg.nginx.org/nginx/rev/fb989e24c60a Patch 0011 is upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 Reorder the remaining patches and update .checkpackageignore accordingly. The LICENSE file is changed, the year changed from 2022 to 2024. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 8 +- ...-auto-lib-libgd-conf-use-pkg-config.patch} | 0 ...auto-lib-openssl-conf-use-pkg-config.patch | 251 ------------------ ...inux_config.h-only-include-dlfcn.h-.patch} | 0 ...of-endianness-for-cross-compilation.patch} | 0 ...to-os-linux-fix-build-with-libxcrypt.patch | 38 --- ...ix-compile-error-in-configure-script.patch | 33 --- package/nginx/nginx.hash | 4 +- package/nginx/nginx.mk | 2 +- 9 files changed, 6 insertions(+), 330 deletions(-) rename package/nginx/{0007-auto-lib-libgd-conf-use-pkg-config.patch => 0006-auto-lib-libgd-conf-use-pkg-config.patch} (100%) delete mode 100644 package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch rename package/nginx/{0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch => 0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch} (100%) rename package/nginx/{0010-Allow-forcing-of-endianness-for-cross-compilation.patch => 0008-Allow-forcing-of-endianness-for-cross-compilation.patch} (100%) delete mode 100644 package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch delete mode 100644 package/nginx/0011-Fix-compile-error-in-configure-script.patch diff --git a/.checkpackageignore b/.checkpackageignore index 42bcbed4eb0..8fe4a16eb82 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -957,11 +957,9 @@ package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch li package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch lib_patch.Upstream package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch lib_patch.Upstream package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch lib_patch.Upstream -package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch lib_patch.Upstream -package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch lib_patch.Upstream -package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch lib_patch.Upstream -package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch lib_patch.Upstream -package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream +package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch lib_patch.Upstream +package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch lib_patch.Upstream +package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream package/nginx/S50nginx lib_sysv.Indent lib_sysv.Variables package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch lib_patch.Upstream package/nmap/0001-libdnet-always-build-a-static-library.patch lib_patch.Upstream diff --git a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch similarity index 100% rename from package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch rename to package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch diff --git a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch b/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch deleted file mode 100644 index 43387296589..00000000000 --- a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch +++ /dev/null @@ -1,251 +0,0 @@ -From 4ba4b1e0bd1b69e124eb34c95ae9e7c087370efa Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Fri, 6 May 2016 14:48:31 +0100 -Subject: [PATCH] auto/lib/openssl/conf: use pkg-config - -Change to using pkg-config to find the path to openssl and its -dependencies. - -Signed-off-by: Martin Bark ---- - auto/lib/openssl/conf | 187 +++++++++++++++++++++--------------------- - 1 file changed, 94 insertions(+), 93 deletions(-) - -diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf -index 4fb52df7..9f30490d 100644 ---- a/auto/lib/openssl/conf -+++ b/auto/lib/openssl/conf -@@ -1,4 +1,3 @@ -- - # Copyright (C) Igor Sysoev - # Copyright (C) Nginx, Inc. - -@@ -7,123 +6,125 @@ if [ $OPENSSL != NONE ]; then - - case "$CC" in - -- cl | bcc32) -- have=NGX_OPENSSL . auto/have -- have=NGX_SSL . auto/have -- -- CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" -- -- CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" -- CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" -- -- if [ -f $OPENSSL/ms/do_ms.bat ]; then -- # before OpenSSL 1.1.0 -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" -- else -- # OpenSSL 1.1.0+ -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" -- fi -- -- # libeay32.lib requires gdi32.lib -- CORE_LIBS="$CORE_LIBS gdi32.lib" -- # OpenSSL 1.0.0 requires crypt32.lib -- CORE_LIBS="$CORE_LIBS crypt32.lib" -- ;; -- -- *) -- have=NGX_OPENSSL . auto/have -- have=NGX_SSL . auto/have -- -- CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" -- CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" -- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" -- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" -- CORE_LIBS="$CORE_LIBS $NGX_LIBDL" -- CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" -- -- if [ "$NGX_PLATFORM" = win32 ]; then -- CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" -- fi -- ;; -+ cl | bcc32) -+ have=NGX_OPENSSL . auto/have -+ have=NGX_SSL . auto/have -+ -+ CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" -+ -+ CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" -+ CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" -+ -+ if [ -f $OPENSSL/ms/do_ms.bat ]; then -+ # before OpenSSL 1.1.0 -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" -+ else -+ # OpenSSL 1.1.0+ -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" -+ fi -+ -+ # libeay32.lib requires gdi32.lib -+ CORE_LIBS="$CORE_LIBS gdi32.lib" -+ # OpenSSL 1.0.0 requires crypt32.lib -+ CORE_LIBS="$CORE_LIBS crypt32.lib" -+ ;; -+ -+ *) -+ have=NGX_OPENSSL . auto/have -+ have=NGX_SSL . auto/have -+ -+ CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" -+ CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" -+ CORE_LIBS="$CORE_LIBS $NGX_LIBDL" -+ CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" -+ -+ if [ "$NGX_PLATFORM" = win32 ]; then -+ CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" -+ fi -+ ;; - esac - - else - - if [ "$NGX_PLATFORM" != win32 ]; then - -- OPENSSL=NO -+ OPENSSL=NO - -- ngx_feature="OpenSSL library" -- ngx_feature_name="NGX_OPENSSL" -- ngx_feature_run=no -- ngx_feature_incs="#include " -- ngx_feature_path= -- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" -- ngx_feature_test="SSL_CTX_set_options(NULL, 0)" -- . auto/feature -+ ngx_feature="OpenSSL library" -+ ngx_feature_name="NGX_OPENSSL" -+ ngx_feature_run=no -+ ngx_feature_incs="#include " -+ ngx_feature_path= -+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl| -+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" -+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" -+ ngx_feature_test="SSL_CTX_set_options(NULL, 0)" -+ . auto/feature - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # FreeBSD port -+ # FreeBSD port - -- ngx_feature="OpenSSL library in /usr/local/" -- ngx_feature_path="/usr/local/include" -+ ngx_feature="OpenSSL library in /usr/local/" -+ ngx_feature_path="/usr/local/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # NetBSD port -+ # NetBSD port - -- ngx_feature="OpenSSL library in /usr/pkg/" -- ngx_feature_path="/usr/pkg/include" -+ ngx_feature="OpenSSL library in /usr/pkg/" -+ ngx_feature_path="/usr/pkg/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # MacPorts -+ # MacPorts - -- ngx_feature="OpenSSL library in /opt/local/" -- ngx_feature_path="/opt/local/include" -+ ngx_feature="OpenSSL library in /opt/local/" -+ ngx_feature_path="/opt/local/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = yes ]; then -- have=NGX_SSL . auto/have -- CORE_INCS="$CORE_INCS $ngx_feature_path" -- CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -- OPENSSL=YES -- fi -+ if [ $ngx_found = yes ]; then -+ have=NGX_SSL . auto/have -+ CORE_INCS="$CORE_INCS $ngx_feature_path" -+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -+ OPENSSL=YES -+ fi - fi - - if [ $OPENSSL != YES ]; then -@@ -136,7 +137,7 @@ into the system, or build the OpenSSL library statically from the source - with nginx by using --with-openssl= option. - - END -- exit 1 -+ exit 1 - fi - - fi --- -2.17.1 - diff --git a/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch similarity index 100% rename from package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch rename to package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch diff --git a/package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch b/package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch similarity index 100% rename from package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch rename to package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch diff --git a/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch b/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch deleted file mode 100644 index 8b368d946f2..00000000000 --- a/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 79f1fe5251afc4e22a138b0c8f44fc9c94093b8b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 2 Apr 2021 09:18:26 +0200 -Subject: [PATCH] auto/os/linux: fix build with libxcrypt - -If crypt_r is found in libcrypt, add -lcrypt to CORE_LIBS to avoid the -following build failure with libxcrypt: - -objs/ngx_modules.o \ --lpcre -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lcrypto -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lxslt -lxml2 -lGeoIP \ --Wl,-E -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: objs/src/os/unix/ngx_user.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/nginx-1.18.0/src/os/unix/ngx_user.c:18: undefined reference to `crypt_r' - -Fixes: - - http://autobuild.buildroot.org/results/79a51b0d348e756517b5c9ce815a67f5c657e7e6 - -Signed-off-by: Fabrice Fontaine ---- - auto/os/linux | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/auto/os/linux b/auto/os/linux -index 5e280eca..04682812 100644 ---- a/auto/os/linux -+++ b/auto/os/linux -@@ -232,6 +232,9 @@ ngx_feature_test="struct crypt_data cd; - crypt_r(\"key\", \"salt\", &cd);" - . auto/feature - -+if [ $ngx_found = yes ]; then -+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -+fi - - ngx_include="sys/vfs.h"; . auto/include - --- -2.30.2 - diff --git a/package/nginx/0011-Fix-compile-error-in-configure-script.patch b/package/nginx/0011-Fix-compile-error-in-configure-script.patch deleted file mode 100644 index 672162759e2..00000000000 --- a/package/nginx/0011-Fix-compile-error-in-configure-script.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e1bcac837f6aeabc4ddece06ecbcf2bcca8dd651 Mon Sep 17 00:00:00 2001 -From: Edgar Bonet -Date: Thu, 16 May 2024 11:15:10 +0200 -Subject: [PATCH] Configure: fixed building libatomic test. - -Using "long *" instead of "AO_t *" leads either to -Wincompatible-pointer-types -or -Wpointer-sign warnings, depending on whether long and size_t are compatible -types (e.g., ILP32 versus LP64 data models). Notably, -Wpointer-sign warnings -are enabled by default in Clang only, and -Wincompatible-pointer-types is an -error starting from GCC 14. - -Signed-off-by: Edgar Bonet -Upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 ---- - auto/lib/libatomic/conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf -index d1e484a..0f12b9c 100644 ---- a/auto/lib/libatomic/conf -+++ b/auto/lib/libatomic/conf -@@ -20,7 +20,7 @@ else - #include " - ngx_feature_path= - ngx_feature_libs="-latomic_ops" -- ngx_feature_test="long n = 0; -+ ngx_feature_test="AO_t n = 0; - if (!AO_compare_and_swap(&n, 0, 1)) - return 1; - if (AO_fetch_and_add(&n, 1) != 1) --- -2.34.1 - diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 24bc588d855..0b45f96a454 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d nginx-1.24.0.tar.gz +sha256 f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b nginx-1.26.1.tar.gz # License files, locally calculated -sha256 ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320 LICENSE +sha256 f19c4caea60247490199c5a6d0134281e3fb20b3d7577e6873c628597f5381d9 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 7bd2173b489..e63acc7b16b 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.24.0 +NGINX_VERSION = 1.26.1 NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From baf5a1f0da5cd0deaca214d8ced77b5a1937626c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 19:19:47 +0200 Subject: [PATCH 2265/3013] package/ffmpeg: bump version to 6.1.2 Rebased patch 0003. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 5 +++-- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index a52d7fc347b..aeb272c459e 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -10,7 +10,8 @@ Fixes https://trac.ffmpeg.org/ticket/9138 Patch sent upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html -Signed-off-by: Bernd Kuhls +[Bernd: rebased for version 6.1.2] +Signed-off-by: Bernd Kuhls [Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: Dario Binacchi --- @@ -23,9 +24,9 @@ index a89cfa6d959d..6ec00df75312 100755 --- a/configure +++ b/configure @@ -2227,6 +2227,7 @@ HEADERS_LIST=" - opencv2_core_core_c_h OpenGL_gl3_h poll_h + pthread_np_h + sys_auxv_h sys_param_h sys_resource_h diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index f70ff5da833..630bd70c564 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968 ffmpeg-6.1.1.tar.xz +sha256 3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 ffmpeg-6.1.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 5b2d33883d3..19c270a14b1 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 6.1.1 +FFMPEG_VERSION = 6.1.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = https://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 6c540d3439059f57ce24771c8604705dcdefac2b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 21:06:27 +0200 Subject: [PATCH 2266/3013] package/tvheadend: bump version This bump adds support for ffmpeg 7.x. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index f0140aefdcd..871fc9ca014 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b613319b01db2f7e08f735dd1da318041265a6f44b435491f3e8b0e32efd6d2f tvheadend-b774bdd25351e51eba0282ccf7c65904dc1b5655.tar.gz +sha256 192cf8d181eb03cbf18e4fd4beb16edf89ef34aa25bc1c73c891bc904342aade tvheadend-078a822cf548b37bc474475fa57e48e9604090ee.tar.gz sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 46a082838f6..ee82ecb1e65 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b774bdd25351e51eba0282ccf7c65904dc1b5655 +TVHEADEND_VERSION = 078a822cf548b37bc474475fa57e48e9604090ee TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From fc60f1375321586662d3d405ad26dbc0d098e06d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 21:07:05 +0200 Subject: [PATCH 2267/3013] package/libvpl: bump version to 2.12.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libvpl/libvpl.hash | 2 +- package/libvpl/libvpl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index f8a89f962be..16034437de9 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3e322ba6b3593da03e1cfdb8062f9f1545f6d9b1de39e36876de5934b26737d2 libvpl-2.11.0.tar.gz +sha256 efc19e5a8544704100f814753eb5e09e85a68e3386508b164042c1f1f761bae8 libvpl-2.12.0.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 994680e4d20..25e8730c25c 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2.11.0 +LIBVPL_VERSION = 2.12.0 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE From a37ebadd466d05876d2c57f11d51d1ce914efca3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 21:07:06 +0200 Subject: [PATCH 2268/3013] package/intel-vpl-gpu-rt: bump version to 24.3.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash | 2 +- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash index 2b42c7b0503..ba756af4133 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 02b01dd73f7c5a4a46860ec01470b484286709cc13f9333a34a089d7e457295e intel-vpl-gpu-rt-24.3.0.tar.gz +sha256 b92594e8e30be3b879526f4ac38bef60ea684cc8e93d2e7f24eb45205d0211b9 intel-vpl-gpu-rt-24.3.1.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk index 1566b87b497..7d7771aae98 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_VPL_GPU_RT_VERSION = 24.3.0 +INTEL_VPL_GPU_RT_VERSION = 24.3.1 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION)) INTEL_VPL_GPU_RT_LICENSE = MIT INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE From ab26966ba58dcd4ac412e2510ceef1f681147073 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 21:07:07 +0200 Subject: [PATCH 2269/3013] package/intel-mediadriver: bump version to 24.3.1 Removed patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Refactor-for-build-issue.patch | 142 ------------------ .../intel-mediadriver/intel-mediadriver.hash | 2 +- .../intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 144 deletions(-) delete mode 100644 package/intel-mediadriver/0001-Refactor-for-build-issue.patch diff --git a/package/intel-mediadriver/0001-Refactor-for-build-issue.patch b/package/intel-mediadriver/0001-Refactor-for-build-issue.patch deleted file mode 100644 index 5badc985cc4..00000000000 --- a/package/intel-mediadriver/0001-Refactor-for-build-issue.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 47bae3c809c9f5b11793b76b5edfd7704adb4080 Mon Sep 17 00:00:00 2001 -From: Chen_Ke -Date: Fri, 12 Jul 2024 11:42:04 +0800 -Subject: [PATCH] [VP] Refactor for build issue - -Refactor for build issue: Avoid storing the address of local variable - -Upstream: https://github.com/intel/media-driver/commit/47bae3c809c9f5b11793b76b5edfd7704adb4080 - -Signed-off-by: Bernd Kuhls ---- - media_common/agnostic/common/hw/mhw_render.h | 1 + - media_common/agnostic/common/hw/mhw_state_heap.h | 2 -- - .../agnostic/common/hw/mhw_render_cmdpar.h | 1 + - .../shared/packet/media_render_cmd_packet.cpp | 4 ++-- - .../shared/packet/media_render_cmd_packet.h | 4 ++-- - .../common/vp/hal/packet/vp_render_kernel_obj.cpp | 15 +++++---------- - .../common/vp/hal/packet/vp_render_kernel_obj.h | 3 ++- - 7 files changed, 13 insertions(+), 17 deletions(-) - -diff --git a/media_common/agnostic/common/hw/mhw_render.h b/media_common/agnostic/common/hw/mhw_render.h -index b551ab1337..36c895c299 100644 ---- a/media_common/agnostic/common/hw/mhw_render.h -+++ b/media_common/agnostic/common/hw/mhw_render.h -@@ -312,6 +312,7 @@ typedef struct _MHW_GPGPU_WALKER_PARAMS - - bool hasBarrier; - PMHW_INLINE_DATA_PARAMS inlineDataParamBase; -+ uint32_t inlineDataParamSize; - - } MHW_GPGPU_WALKER_PARAMS, *PMHW_GPGPU_WALKER_PARAMS; - -diff --git a/media_common/agnostic/common/hw/mhw_state_heap.h b/media_common/agnostic/common/hw/mhw_state_heap.h -index 49add60823..2f9afff0af 100644 ---- a/media_common/agnostic/common/hw/mhw_state_heap.h -+++ b/media_common/agnostic/common/hw/mhw_state_heap.h -@@ -83,8 +83,6 @@ typedef struct MHW_BLOCK_MANAGER *PMHW_BLOCK_MANAGER; - - #define MHW_INVALID_SYNC_TAG 0xFFFFFFFF - --#define MAX_INLINE_DATA_PARAMS 32 -- - enum MW_RENDER_ENGINE_ADDRESS_SHIFT - { - MHW_STATE_HEAP_SURFACE_STATE_SHIFT = 0 -diff --git a/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h b/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h -index 4c01d351ce..a8004bbbb9 100644 ---- a/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h -+++ b/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h -@@ -65,6 +65,7 @@ struct MHW_HEAPS_RESOURCE - { - PMOS_RESOURCE presInstructionBuffer = nullptr; - PMHW_INLINE_DATA_PARAMS inlineDataParamsBase = nullptr; -+ uint32_t inlineDataParamSize = 0; - }; - - enum MHW_VFE_SLICE_DISABLE -diff --git a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp -index dc9d6896ba..c18cbf4b4f 100644 ---- a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp -+++ b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp -@@ -1264,8 +1264,8 @@ MOS_STATUS RenderCmdPacket::PrepareComputeWalkerParams(KERNEL_WALKER_PARAMS para - - gpgpuWalker.SLMSize = params.slmSize; - gpgpuWalker.hasBarrier = params.hasBarrier; -- gpgpuWalker.inlineDataParamBase = params.inlineDataParams; -- -+ gpgpuWalker.inlineDataParamBase = params.inlineDataParamBase; -+ gpgpuWalker.inlineDataParamSize = params.inlineDataParamSize; - return MOS_STATUS_SUCCESS; - } - -diff --git a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h -index 89ac89d9a5..7e6b0aa8a1 100644 ---- a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h -+++ b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h -@@ -120,8 +120,8 @@ typedef struct _KERNEL_WALKER_PARAMS - - bool hasBarrier; - uint32_t slmSize; -- MHW_INLINE_DATA_PARAMS inlineDataParams[MAX_INLINE_DATA_PARAMS]; -- uint32_t inlineDataParamNum; -+ PMHW_INLINE_DATA_PARAMS inlineDataParamBase; -+ uint32_t inlineDataParamSize; - }KERNEL_WALKER_PARAMS, * PKERNEL_WALKER_PARAMS; - - typedef struct _KERNEL_PACKET_RENDER_DATA -diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp -index d6630cbd5f..dbd5b12d1d 100644 ---- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp -+++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp -@@ -740,7 +740,7 @@ void VpRenderKernelObj::DumpSurface(VP_SURFACE* pSurface, PCCHAR fileName) - #endif - } - --MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KERNEL_WALKER_PARAMS &walkerParam, KRN_ARG args, RENDERHAL_INTERFACE *renderhal) -+MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KRN_ARG args, RENDERHAL_INTERFACE *renderhal) - { - VP_FUNC_CALL(); - MHW_INLINE_DATA_PARAMS inlineDataPar = {}; -@@ -762,15 +762,10 @@ MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KERNEL_WALKER_PARAMS &walke - { - inlineDataPar.isPtrType = false; - } -- if (walkerParam.inlineDataParamNum < MAX_INLINE_DATA_PARAMS) -- { -- walkerParam.inlineDataParams[walkerParam.inlineDataParamNum] = inlineDataPar; -- walkerParam.inlineDataParamNum++; -- } -- else -- { -- VP_RENDER_ASSERTMESSAGE("Exceed max inline data params!"); -- } -+ -+ // walkerParam.inlineDataParamBase will add m_inlineDataParams.data() in each kernel -+ // walkerParam.inlineDataParamSize will add m_inlineDataParams.size() in each kernel -+ m_inlineDataParams.push_back(inlineDataPar); - - return MOS_STATUS_SUCCESS; - } -\ No newline at end of file -diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h -index 8b9abf9dca..8d095730cd 100644 ---- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h -+++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h -@@ -537,7 +537,7 @@ class VpRenderKernelObj - - virtual MOS_STATUS InitRenderHalSurfaceCMF(MOS_SURFACE* src, PRENDERHAL_SURFACE renderHalSurface); - -- virtual MOS_STATUS SetInlineDataParameter(KERNEL_WALKER_PARAMS &walkerParam, KRN_ARG args, RENDERHAL_INTERFACE *renderhal); -+ virtual MOS_STATUS SetInlineDataParameter(KRN_ARG args, RENDERHAL_INTERFACE *renderhal); - - virtual MOS_STATUS UpdateBindlessSurfaceResource(SurfaceType surf, std::set surfStateOffset) - { -@@ -617,6 +617,7 @@ class VpRenderKernelObj - bool m_useIndependentSamplerGroup = false; //true means multi kernels has their own stand alone sampler states group. only can be true when m_isAdvKernel is true. - - std::shared_ptr m_veboxItf = nullptr; -+ std ::vector m_inlineDataParams = {}; - - MEDIA_CLASS_DEFINE_END(vp__VpRenderKernelObj) - }; diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 4fa24fba7ae..109d90c4289 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b6728607e4d05739bce27124605993011b468781043ce34bb1a51919196f2d15 intel-media-24.3.0.tar.gz +sha256 98702b946edb24454a3b780f8dd5b3091c6c795478467c1c00fe4d16c4371291 intel-media-24.3.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 5283631df47..ee1f03ddb43 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.3.0 +INTEL_MEDIADRIVER_VERSION = 24.3.1 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From adcf413ed7a6e96c1715a8f4528e908b6f2a34ef Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 21:07:34 +0200 Subject: [PATCH 2270/3013] package/freeswitch: bump version to 1.10.12 Release notes: https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Release-Notes/FreeSWITCH-1.10.x-Release-notes_25460878#11012-release-date-02-aug-2024 https://github.com/signalwire/freeswitch/releases/tag/v1.10.12 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freeswitch/freeswitch.hash | 4 ++-- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 3f16467e22b..9c6fb6155dc 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.11.-release.tar.xz.sha256 -sha256 7f9603a691220d9f47da42f3b19290b629b69dceb2eee56448f0a7cefcf9d1a1 freeswitch-1.10.11.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.12.-release.tar.xz.sha256 +sha256 e324e4ae063e692c42b93031157329bae339ea007e611d3535333deaed85aa47 freeswitch-1.10.12.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6160fe5fcb3..bef25236f0c 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.11 +FREESWITCH_VERSION = 1.10.12 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging From 0eb09e7d377f30b54b329e20ccf4340d493eabde Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 21:09:10 +0200 Subject: [PATCH 2271/3013] package/libxml2: bump version to 2.13.3 Add configure option --with-http to enable HTTP support which is now disabled by default to preserve previous behaviour. Release notes: https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.0.news https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.1.news https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.2.news https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.3.news Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libxml2/libxml2.hash | 6 +++--- package/libxml2/libxml2.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 73fd0ecedfa..7b9ffc5d47d 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.sha256sum -sha256 59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590 libxml2-2.12.9.tar.xz +# From https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.3.sha256sum +sha256 0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138 libxml2-2.13.3.tar.xz # License files, locally calculated -sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright +sha256 c99aae1afe013e50b8b3701e089222b351258043c3025b64053a233fd25b4be7 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index b69722b21d4..068ce157d50 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).9 +LIBXML2_VERSION_MAJOR = 2.13 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) @@ -20,7 +20,7 @@ ifeq ($(BR2_m68k_cf),y) LIBXML2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" endif -LIBXML2_CONF_OPTS = --with-gnu-ld --without-debug +LIBXML2_CONF_OPTS = --with-http --with-gnu-ld --without-debug HOST_LIBXML2_DEPENDENCIES = host-pkgconf LIBXML2_DEPENDENCIES = host-pkgconf From 279bf93cd2bc6b384e3e0c71c7cfedc32c445dea Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 5 Aug 2024 21:36:50 +0200 Subject: [PATCH 2272/3013] package/libopenmpt: security bump to version 0.7.9 For release note, see: https://lib.openmpt.org/libopenmpt/2024/07/21/security-updates-0.7.9-0.6.18-0.5.32-0.4.44/ Note: this release is flagged as a "security" update from the release note. There is no CVE allocated. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libopenmpt/libopenmpt.hash | 2 +- package/libopenmpt/libopenmpt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libopenmpt/libopenmpt.hash b/package/libopenmpt/libopenmpt.hash index df0b43096aa..cc5519806c8 100644 --- a/package/libopenmpt/libopenmpt.hash +++ b/package/libopenmpt/libopenmpt.hash @@ -1,3 +1,3 @@ # computed locally -sha256 87778c8046a226c6cbfb114f4c8e3e27c121b7b3dccce5cb7de45899250274cc libopenmpt-0.7.8+release.autotools.tar.gz +sha256 0386e918d75d797e79d5b14edd0847165d8b359e9811ef57652c0a356a2dfcf4 libopenmpt-0.7.9+release.autotools.tar.gz sha256 e3d7e76c6b441ddd9fff0a397e7b5e055a11678bd7c3b246a0ce13e352eb15e8 LICENSE diff --git a/package/libopenmpt/libopenmpt.mk b/package/libopenmpt/libopenmpt.mk index c52f5b04c28..aff67f6935f 100644 --- a/package/libopenmpt/libopenmpt.mk +++ b/package/libopenmpt/libopenmpt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENMPT_VERSION = 0.7.8 +LIBOPENMPT_VERSION = 0.7.9 LIBOPENMPT_SITE = https://lib.openmpt.org/files/libopenmpt/src LIBOPENMPT_SOURCE = libopenmpt-$(LIBOPENMPT_VERSION)+release.autotools.tar.gz LIBOPENMPT_LICENSE = BSD-3-Clause From f9f2ade9bb207d2481b12a325bba7cee5a3e9cbf Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 5 Aug 2024 21:38:44 +0200 Subject: [PATCH 2273/3013] package/fluidsynth: bump to version 2.3.6 For change log since v2.3.5, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.6 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 91d8778cbfd..0f54ad254e2 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d fluidsynth-2.3.5.tar.gz +sha256 3340d73286b28fe6e5150fbe12648d4640e86c64c228878b572773bd08cac531 fluidsynth-2.3.6.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index ef05b6a5699..3105162bda9 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.5 +FLUIDSYNTH_VERSION = 2.3.6 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From beb54d8126e7b0fd2e1090061aa96e6487c4b697 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Sun, 11 Feb 2024 19:47:57 -0800 Subject: [PATCH 2274/3013] package/atop: bump to version 2.10.0 This new version requires libglib2 as a dependency, which itself is detected using pkg-config, so we need host-pkgconf as a dependency. The patch 0001-atop.h-include-time.h.patch can be removed, it was applied upstream as https://github.com/Atoptool/atop/commit/03c5c4dd29bc7590baccb55a36d61e7f4b39c1fe. A new patch (submitted upstream) is also needed to be able to provide additional CFLAGS/LDFLAGS, without overriding the ones defined in the upstream Makefile. Signed-off-by: Kadambini Nema Signed-off-by: Thomas Petazzoni --- ...he-user-to-pass-additional-CFLAGS-an.patch | 33 +++++++++++++++ package/atop/0001-atop.h-include-time.h.patch | 41 ------------------- package/atop/Config.in | 11 +++-- package/atop/atop.hash | 2 +- package/atop/atop.mk | 4 +- 5 files changed, 43 insertions(+), 48 deletions(-) create mode 100644 package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch delete mode 100644 package/atop/0001-atop.h-include-time.h.patch diff --git a/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch b/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch new file mode 100644 index 00000000000..c4ec67ca24f --- /dev/null +++ b/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch @@ -0,0 +1,33 @@ +From c8e9d2b885deca065bd7955019a6aa071974042d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 5 Aug 2024 23:38:08 +0200 +Subject: [PATCH] Makefile: allow the user to pass additional CFLAGS and + LDFLAGS + +This is needed for some build systems. For example, Buildroot needs to +disable optimizations on some CPU architectures. + +Upstream: https://github.com/Atoptool/atop/pull/314 +Signed-off-by: Thomas Petazzoni +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a6f196b..dae5cda 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,8 +20,8 @@ PMPATH1 = /usr/lib/pm-utils/sleep.d + PMPATH2 = /usr/lib64/pm-utils/sleep.d + PMPATHD = /usr/lib/systemd/system-sleep + +-CFLAGS += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS +-LDFLAGS = $(shell pkg-config --libs glib-2.0) ++override CFLAGS := -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security $(CFLAGS) # -DNOPERFEVENT # -DHTTPSTATS ++override LDFLAGS := $(shell pkg-config --libs glib-2.0) $(LDFLAGS) + OBJMOD0 = version.o + OBJMOD1 = various.o deviate.o procdbase.o + OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o +-- +2.45.2 + diff --git a/package/atop/0001-atop.h-include-time.h.patch b/package/atop/0001-atop.h-include-time.h.patch deleted file mode 100644 index 2b8a390e71c..00000000000 --- a/package/atop/0001-atop.h-include-time.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 03c5c4dd29bc7590baccb55a36d61e7f4b39c1fe Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 29 Oct 2023 18:56:35 +0100 -Subject: [PATCH] atop.h: include time.h - -Include time.h to avoid the following build failure with musl: - -atop.h:157:1: error: unknown type name 'time_t' - 157 | time_t normalize_epoch(time_t, long); - | ^~~~~~ -atop.h:157:1: note: 'time_t' is defined in header ''; did you forget to '#include '? -atop.h:157:40: error: expected ')' before 'long' - 157 | time_t normalize_epoch(time_t, long); - | ^~~~~ - | ) - -Fixes: - - http://autobuild.buildroot.org/results/e7ec8d16f2299320f374a0198c8e9b18a102b037 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/Atoptool/atop/pull/280 ---- - atop.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/atop.h b/atop.h -index 9274fc5..3d5fea4 100644 ---- a/atop.h -+++ b/atop.h -@@ -24,6 +24,8 @@ - #ifndef __ATOP__ - #define __ATOP__ - -+#include -+ - #define EQ 0 - #define SECONDSINDAY 86400 - #define RAWNAMESZ 256 --- -2.42.0 - diff --git a/package/atop/Config.in b/package/atop/Config.in index b8ee30c306c..6e9e209f179 100644 --- a/package/atop/Config.in +++ b/package/atop/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_ATOP bool "atop" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # ncurses wchar + depends on BR2_USE_MMU # fork(), libglib2 + depends on BR2_USE_WCHAR # ncurses wchar, libglib2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # PERF_FLAG_FD_CLOEXEC + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES_WCHAR select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBGLIB2 help Atop is an ASCII full-screen performance monitor for Linux that is capable of reporting the activity of all processes @@ -20,7 +22,8 @@ config BR2_PACKAGE_ATOP http://www.atoptool.nl -comment "atop needs a toolchain w/ wchar, headers >= 3.14" +comment "atop needs a toolchain w/ wchar, headers >= 3.14, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 0b7ee061dd9..a6539e6211c 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 8d82f211b712a227000ef254c0a2b53bcb71235bf40d93316acce80b04bff926 atop-2.9.0.tar.gz +sha256 e7a673cf2c82578e7dd82ecb0dec83fd9ecb30828b2561c28a9fa5aaf75d5f93 atop-2.10.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 27cd537f64a..b383932e8d8 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,12 +4,12 @@ # ################################################################################ -ATOP_VERSION = 2.9.0 +ATOP_VERSION = 2.10.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING ATOP_CPE_ID_VALID = YES -ATOP_DEPENDENCIES = ncurses zlib +ATOP_DEPENDENCIES = ncurses zlib libglib2 host-pkgconf ATOP_CFLAGS = $(TARGET_CFLAGS) From bd035872be9948515ee50ae034bda4a2e044ff22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Mon, 5 Aug 2024 23:53:56 +0200 Subject: [PATCH 2275/3013] package/Makefile.in: Use "-z text" instead of "-Wl, -z, text" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After the recent addition to -Wl,-z,text to TARGET_LDFLAGS in case of musl-libc and dynamic linking, it was found that some packages pass TARGET_LDFLAGS directly to ld, but the -Wl syntax only works with compiler drivers (gcc/clang). This commit changes the flag to -z text, which the gcc and clang also understand and pass to the linker. Reported-by: Thomas Petazzoni Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 1cedfefa7e7..43a5c279c08 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -154,8 +154,13 @@ TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) # when DT_TEXREL is used, so we capture the problem earlier. # # See also: https://www.openwall.com/lists/musl/2020/09/25/4 +# +# NOTE: We're using "-z text" instead of "-Wl,-z,text" here, because some +# packages pass TARGET_LDFLAGS directly to ld rather than gcc, and ld doesn't +# support -Wl,[...]. -z is supported by both gcc and clang, so it probably +# won't cause us problems. ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_STATIC_LIBS),y:) -TARGET_LDFLAGS += -Wl,-z,text +TARGET_LDFLAGS += -z text endif # By design, _FORTIFY_SOURCE requires gcc optimization to be enabled. From 1498da3deeb64faa8afed2c715667cec496f72dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Tue, 6 Aug 2024 00:16:05 +0200 Subject: [PATCH 2276/3013] package/tipidee: load config from /etc instead of /usr/etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --prefix influences the default of --sysconfdir, so we need to specify --sysconfdir=/etc explicitly. Fixes: 17deaf60f6 ("tipidee: new package") Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/tipidee/tipidee.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tipidee/tipidee.mk b/package/tipidee/tipidee.mk index 915b4f84bdd..8ae18edd8db 100644 --- a/package/tipidee/tipidee.mk +++ b/package/tipidee/tipidee.mk @@ -12,6 +12,7 @@ TIPIDEE_DEPENDENCIES = skalibs TIPIDEE_CONF_OPTS = \ --prefix=/usr \ + --sysconfdir=/etc \ --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ From 03505e34570d65ead565e13b0998b05a12ab95ac Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 6 Aug 2024 01:39:44 +0300 Subject: [PATCH 2277/3013] DEVELOPERS: assign Adrian Perez for sysprof Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8e46beff001..76f7fc5ed64 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -61,6 +61,7 @@ F: package/libepoxy/ F: package/libmanette/ F: package/libpsl/ F: package/libwpe/ +F: package/sysprof/ F: package/webkitgtk/ F: package/wlroots/ F: package/woff2/ @@ -3295,7 +3296,6 @@ N: Will Newton F: package/enchant/ F: package/erlang/ F: package/libmicrohttpd/ -F: package/sysprof/ F: package/time/ N: Will Wagner From f00b18c48aa7e1fdf68ac49a1d143eb664c05826 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 6 Aug 2024 05:48:26 +0100 Subject: [PATCH 2278/3013] package/gcc-bare-metal: bump to gcc 14.2.0 This patch bumps gcc-bare-metal to gcc 14.2.0. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- package/gcc-bare-metal/14.1.0 | 1 - package/gcc-bare-metal/14.2.0 | 1 + package/gcc-bare-metal/gcc-bare-metal.mk | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 120000 package/gcc-bare-metal/14.1.0 create mode 120000 package/gcc-bare-metal/14.2.0 diff --git a/package/gcc-bare-metal/14.1.0 b/package/gcc-bare-metal/14.1.0 deleted file mode 120000 index e519bfb6fdc..00000000000 --- a/package/gcc-bare-metal/14.1.0 +++ /dev/null @@ -1 +0,0 @@ -../gcc/14.1.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/14.2.0 b/package/gcc-bare-metal/14.2.0 new file mode 120000 index 00000000000..07372368505 --- /dev/null +++ b/package/gcc-bare-metal/14.2.0 @@ -0,0 +1 @@ +../gcc/14.2.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk index 2f36b491255..501f12bc335 100644 --- a/package/gcc-bare-metal/gcc-bare-metal.mk +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOST_GCC_BARE_METAL_VERSION = 14.1.0 +HOST_GCC_BARE_METAL_VERSION = 14.2.0 HOST_GCC_BARE_METAL_SITE = \ https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION) HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz From d70bbedd0d284744521ca3bc68984f6d8057ee50 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Tue, 6 Aug 2024 09:45:39 +0200 Subject: [PATCH 2279/3013] package/crudini: bump to 0.9.5 Removing backported patch and introducing new dependency setuptools-scm. As setuptools-scm doesn't work with github release tarballs, also switching back to download the tarball from pypi... Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- .../0001-prefer-shlex-over-pipes.patch | 41 ------------------- package/crudini/crudini.hash | 3 +- package/crudini/crudini.mk | 7 ++-- 3 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 package/crudini/0001-prefer-shlex-over-pipes.patch diff --git a/package/crudini/0001-prefer-shlex-over-pipes.patch b/package/crudini/0001-prefer-shlex-over-pipes.patch deleted file mode 100644 index 16296f619fa..00000000000 --- a/package/crudini/0001-prefer-shlex-over-pipes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d81b703f3e8e29c1547386135c7e9ca539c1f054 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Tue, 2 Aug 2022 14:40:37 +0100 -Subject: [PATCH] prefer shlex over pipes - -pipes is deprecated since python 3.10 -and slated for removal in python 3.13 - -[Romain backport to 0.9.3] -Upstream: https://github.com/pixelb/crudini/commit/e1650941054822faad4cda788bff6fe364eb4ca3 -Signed-off-by: Romain Naour ---- - crudini | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/crudini b/crudini -index 669596b..a136241 100755 ---- a/crudini -+++ b/crudini -@@ -17,15 +17,17 @@ import getopt - import hashlib - import iniparse - import os --import pipes -+import re - import shutil - import string - import tempfile - - if sys.version_info[0] >= 3: -+ import shlex as pipes - from io import StringIO - import configparser - else: -+ import pipes - from cStringIO import StringIO - import ConfigParser as configparser - --- -2.34.3 - diff --git a/package/crudini/crudini.hash b/package/crudini/crudini.hash index 6f2563dfdd6..5b92c0e4da5 100644 --- a/package/crudini/crudini.hash +++ b/package/crudini/crudini.hash @@ -1,3 +1,4 @@ +# from https://pypi.org/project/crudini/#files +sha256 59ae650f45af82a64afc33eb876909ee0c4888dc4e8711ef59731c1edfda5e24 crudini-0.9.5.tar.gz # locally computed -sha256 e1b8125ac4373ece3bb0bb047ba9336e5bd55ed5d56b9729968058c9385ab546 crudini-0.9.3.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 48e0ebde8ff..0f5cfcedd9b 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -4,14 +4,15 @@ # ################################################################################ -CRUDINI_VERSION = 0.9.3 -CRUDINI_SITE = $(call github,pixelb,crudini,$(CRUDINI_VERSION)) +CRUDINI_VERSION = 0.9.5 +CRUDINI_SITE = https://files.pythonhosted.org/packages/32/67/c4e838930e2f434db08d6a6aadffca3d14e7455d1c2c2332e22003ad453d CRUDINI_SETUP_TYPE = setuptools +CRUDINI_DEPENDENCIES = host-python-setuptools-scm CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING # This is a runtime dependency, but we don't have the concept of # runtime dependencies for host packages. -HOST_CRUDINI_DEPENDENCIES = host-python-iniparse +HOST_CRUDINI_DEPENDENCIES = host-python-iniparse host-python-setuptools-scm $(eval $(python-package)) $(eval $(host-python-package)) From cc7fb688b06fd67c7fff6dfea0fae33c740f9dbd Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 6 Aug 2024 11:08:57 +0300 Subject: [PATCH 2280/3013] package/libavif: security bump to version 1.1.1 The release notes for version 1.1.0 mention fixes for memory handling issues and bugs found out by fuzzing, which is the reason why this may be considered a security update, despite them not having CVEs assigned: https://github.com/AOMediaCodec/libavif/releases/tag/v1.1.0 https://github.com/AOMediaCodec/libavif/releases/tag/v1.1.1 The change checksum for the LICENSE file is caused by a path change for one of the submodules, and the addition of the licensing terms for the bundled libyuv sources. The latter are never built from the libavif tree as there is a separate libyuv package, so BSD-3-Clause does not need to be added to LIBAVIF_LICENSE. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/libavif/libavif.hash | 4 ++-- package/libavif/libavif.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/libavif/libavif.hash b/package/libavif/libavif.hash index f4599cdb0b8..b26e678abf4 100644 --- a/package/libavif/libavif.hash +++ b/package/libavif/libavif.hash @@ -1,3 +1,3 @@ -sha256 dc56708c83a4b934a8af2b78f67f866ba2fb568605c7cf94312acf51ee57d146 libavif-1.0.4.tar.gz +sha256 914662e16245e062ed73f90112fbb4548241300843a7772d8d441bb6859de45b libavif-1.1.1.tar.gz -sha256 10952217a6d404de8bf8a997fbea9b88f682df1fe98cb9b9f467ade641525639 LICENSE +sha256 165abf92cc04b39e80d29cadea7a6a7e8fddf59407d4ad2616507a7ebe8216f9 LICENSE diff --git a/package/libavif/libavif.mk b/package/libavif/libavif.mk index 1ca3add82b3..0c2a8e4daeb 100644 --- a/package/libavif/libavif.mk +++ b/package/libavif/libavif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAVIF_VERSION = 1.0.4 +LIBAVIF_VERSION = 1.1.1 LIBAVIF_SITE = $(call github,AOMediaCodec,libavif,v$(LIBAVIF_VERSION)) LIBAVIF_LICENSE = BSD-2-Clause, IJG, Apache-2.0 LIBAVIF_LICENSE_FILES = LICENSE @@ -19,17 +19,18 @@ LIBAVIF_CONF_OPTS = \ -DAVIF_BUILD_MAN_PAGES=OFF \ -DAVIF_BUILD_TESTS=OFF \ -DAVIF_CODEC_AOM=OFF \ - -DAVIF_CODEC_DAV1D=ON \ + -DAVIF_CODEC_DAV1D=SYSTEM \ -DAVIF_CODEC_LIBGAV1=OFF \ -DAVIF_CODEC_RAV1E=OFF \ -DAVIF_CODEC_SVT=OFF \ -DAVIF_CODEC_AVM=OFF \ -DAVIF_ENABLE_GTEST=OFF -# There is no CMake options to explicitly enable/disable usage of -# libyuv, only autodetection :-( ifeq ($(BR2_PACKAGE_LIBYUV),y) LIBAVIF_DEPENDENCIES += libyuv +LIBAVIF_CONF_OPTS += -DAVIF_LIBYUV=SYSTEM +else +LIBAVIF_CONF_OPTS += -DAVIF_LIBYUV=OFF endif $(eval $(cmake-package)) From a05038831e7b35b7c0349b847ed9e95bceecbe1e Mon Sep 17 00:00:00 2001 From: Markus Mayer Date: Mon, 5 Aug 2024 20:06:59 -0700 Subject: [PATCH 2281/3013] package/xz: avoid cicular dependency on autoconf for host builds autoconf has an implicit dependency on HOST_XZ due to extracting a tar.xz archive. By enabling XZ_AUTORECONF we create a reverse dependency for xz on autoconf. This is fine for target builds, but it won't work for host builds, as the two packages now depend on each other. This problem only occurs if host tools are being built by Buildroot. If the build relies on host tools provided by the distro, there is no circular dependency problem. Fixes: 4703a7ae9176 package/xz: fix musl static build Signed-off-by: Markus Mayer Signed-off-by: Thomas Petazzoni --- package/xz/xz.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 9fb93ff4d6b..3329d302efa 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -68,5 +68,14 @@ HOST_XZ_CONF_ENV = \ CC="$(HOSTCC_NOCCACHE)" \ CXX="$(HOSTCXX_NOCCACHE)" +# We need to prevent XZ_AUTORECONF for host builds or we end up with a +# circular dependency. Since the autoconf build needs to extract a +# tar.xz archive, autoconf has an implicit dependency on HOST_XZ. By +# enabling XZ_AUTORECONF we also make host-xz depend on autoconf, +# which we can't do. It is also not necessary as we're autoreconfuring +# the target package to fix static build with musl, which is +# irrelevant for the host package. +HOST_XZ_AUTORECONF = NO + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From a3a7e673de82adbd324b23cc90ffb09923eb9956 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Aug 2024 07:36:23 +0200 Subject: [PATCH 2282/3013] package/openconnect: fix openssl support Enable needed OpenSSL options even when GnuTLS is enabled as OpenSSL is used in priority over GnuTLS. Fixes: http://autobuild.buildroot.net/results/f53/f535a63b80f2efe59709d5d9b59bc27ba66d2c26/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openconnect/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openconnect/Config.in b/package/openconnect/Config.in index cacf617fb97..ab065be3579 100644 --- a/package/openconnect/Config.in +++ b/package/openconnect/Config.in @@ -4,8 +4,8 @@ config BR2_PACKAGE_OPENCONNECT select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS # configure: error: LibreSSL does not support Cisco DTLS. select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if !BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if !BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_ZLIB help From 7c11f0b3a6eb11f32b82f8478f74d423f15ecf39 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 6 Aug 2024 15:35:53 +0200 Subject: [PATCH 2283/3013] package/libressl: disable asm for mips64/mips64el LibreSSL fails in the same way as powerpc, so disable asm too for these architectures. Fixes: - http://autobuild.buildroot.net/results/788/7883ffe9ed96f38f9ca359e99a18a548b6f35c24/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libressl/libressl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 5a78ec839a6..7e92ea3a11d 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -14,7 +14,7 @@ LIBRESSL_CONF_OPTS = -DLIBRESSL_TESTS=OFF -DOPENSSLDIR="/etc/ssl" # Otherwise fails to build with undefined reference to # `bn_mul_add_words' -ifeq ($(BR2_powerpc),y) +ifeq ($(BR2_powerpc)$(BR2_mips64)$(BR2_mips64el),y) LIBRESSL_CONF_OPTS += -DENABLE_ASM=OFF endif From bede54c774ef59640cc1b4d9fd1dabfc69e4ecdb Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 01:21:26 +0100 Subject: [PATCH 2284/3013] Revert "docs/website/support.html: document irc channel permission changes" This didn't work out as planned, neither the restriction of muting unregistered users, nor the exception for matrix users worked as planned. The channel mode has been reverted to +R (meaning only registered users are allowed to join) and an exception for *that* has been introduced for matrix users via +e. The channel modes are documented in [1]. [1] https://www.oftc.net/ChannelModes/ This reverts commit d1e6d7845b0f3b450709b84a6e4fc4527f12b196. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 96b9a60b18e..6bcf4ffc22d 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

-

Note that due to excessive spamming on IRC, you can only talk in the - channel if you are a registered user with +

Note that due to excessive spamming on IRC, the channel can only be + joined if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

From 50b13c9f865ab820cb6166a220f4eb524bdf5125 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 28 Mar 2024 12:00:58 +0100 Subject: [PATCH 2285/3013] package/nodejs: bump to 20.12.0 Release Notes: https://nodejs.org/en/blog/release/v20.12.0 LICENSE hash changed due to changes in vendored components: * copyright year updates [1][2] * version name update [3] * change from "Unicode, Inc. License - Data Files and Software" to the "Unicode License v3" [4]. This is in the icu vendored dependency which is unused in buildroot. * new build tooling script [5] under BSD style license NodeJS tests are passing: $ ./utils/docker-run ./support/testing/run-tests -o ./outputs/ -k tests.package.test_nodejs 13:40:05 TestNodeJSModuleHostSrc Starting 13:40:06 TestNodeJSModuleHostSrc Building 14:05:52 TestNodeJSModuleHostSrc Building done 14:06:02 TestNodeJSModuleHostSrc Cleaning up .14:06:02 TestNodeJSModuleHostBin Starting 14:06:03 TestNodeJSModuleHostBin Building 14:24:25 TestNodeJSModuleHostBin Building done 14:24:31 TestNodeJSModuleHostBin Cleaning up .14:24:31 TestNodeJSBasic Starting 14:24:32 TestNodeJSBasic Building 14:42:53 TestNodeJSBasic Building done 14:43:02 TestNodeJSBasic Cleaning up . ---------------------------------------------------------------------- Ran 3 tests in 3776.679s OK [1] https://github.com/nodejs/node/commit/347e1dd06a5f927d9fd64ce72d776c56d5101910 [2] https://github.com/nodejs/node/commit/b88170d602791fa62fc45ac80ca9953bc1bdd25b [3] https://github.com/nodejs/node/commit/c8233912e9fd7464898b549d6762130722bf0bf4 [4] https://github.com/nodejs/node/commit/625fd69b76b5a8f59152f803b31941c8986d924b [5] https://github.com/nodejs/node/commit/b5bc597871ca701bab750c46d31ed626decd7f89 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit e86fa6bdb4707c56f96677b41be17460e77d2757) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index ddab345e0a6..2cbbf766f5c 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc -sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz -sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz -sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz -sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz -sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz +# From https://nodejs.org/dist/v20.12.0/SHASUMS256.txt.asc +sha256 007ca2699cf6e84290e5bed844ed66ef9d707d23561dfaf117212b7dce216ba7 node-v20.12.0-linux-arm64.tar.xz +sha256 668fb421a24be596c98f00a31049fbf6ada14d221b7382e0f1caa55ab421431a node-v20.12.0-linux-armv7l.tar.xz +sha256 78dc3b7ad993c332684802e35c1f0de2b76193d13394bc89e3bab216828587c7 node-v20.12.0-linux-ppc64le.tar.xz +sha256 0a126adf5b6a5eb11a37bad76a0c626a18f20b6811322e68aae0e3cf9bf580bd node-v20.12.0-linux-x64.tar.xz +sha256 76e5346cebfd581528f699f764f4d1a6e87cb818b696708f235ddcb625a0f78d node-v20.12.0.tar.xz # Locally calculated -sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE +sha256 d3a9fbfe0a1fb78627ee296cd5ca5b498822d4d1c5da3b8e8100c41bd7b791fd LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 858c6a86f5d..9ed51fbe9ba 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.11.1 +NODEJS_COMMON_VERSION = 20.12.0 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From 69710addd121a18ff662c5a6dcb1d8f329f39d69 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 7 Feb 2024 23:51:00 +0100 Subject: [PATCH 2286/3013] package/swipl: new package SWI-Prolog offers a comprehensive free Prolog environment. Since its start in 1987, SWI-Prolog development has been driven by the needs of real world applications. SWI-Prolog is widely used in research and education as well as commercial applications. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/swipl/Config.in | 43 +++++++++++++++++++++++++++++++ package/swipl/swipl.hash | 4 +++ package/swipl/swipl.mk | 55 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 package/swipl/Config.in create mode 100644 package/swipl/swipl.hash create mode 100644 package/swipl/swipl.mk diff --git a/DEVELOPERS b/DEVELOPERS index 76f7fc5ed64..90c34e51f5f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1818,6 +1818,7 @@ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ +F: package/swipl/ F: package/tig/ F: package/tinycompress/ F: package/z3/ @@ -1962,6 +1963,8 @@ F: support/testing/tests/package/test_sox.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py +F: support/testing/tests/package/test_swipl.py +F: support/testing/tests/package/test_swipl/ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py diff --git a/package/Config.in b/package/Config.in index 2ac351cce55..0d51c6af1e5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1476,6 +1476,7 @@ endmenu endif source "package/quickjs/Config.in" source "package/ruby/Config.in" + source "package/swipl/Config.in" source "package/tcl/Config.in" if BR2_PACKAGE_TCL menu "Tcl libraries/modules" diff --git a/package/swipl/Config.in b/package/swipl/Config.in new file mode 100644 index 00000000000..84b6ace47f6 --- /dev/null +++ b/package/swipl/Config.in @@ -0,0 +1,43 @@ +# swipl supports arch for which libc fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_SWIPL_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + +config BR2_PACKAGE_SWIPL + bool "swipl" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # __has_attribute() + depends on BR2_PACKAGE_SWIPL_ARCH_SUPPORTS + # swipl needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_ZLIB + help + SWI-Prolog offers a comprehensive free Prolog + environment. Since its start in 1987, SWI-Prolog development + has been driven by the needs of real world + applications. SWI-Prolog is widely used in research and + education as well as commercial applications. + + https://www.swi-prolog.org + +comment "swipl needs a glibc or musl toolchain w/ gcc >= 5" + depends on BR2_PACKAGE_SWIPL_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash new file mode 100644 index 00000000000..9f980654ba7 --- /dev/null +++ b/package/swipl/swipl.hash @@ -0,0 +1,4 @@ +# From https://www.swi-prolog.org/download/stable +sha256 10d90b15734d14d0d7972dc11a3584defd300d65a9f0b1185821af8c3896da5e swipl-9.2.0.tar.gz +# Locally calculated +sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk new file mode 100644 index 00000000000..d4263a6aa8c --- /dev/null +++ b/package/swipl/swipl.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# swipl +# +################################################################################ + +SWIPL_VERSION = 9.2.0 +SWIPL_SITE = https://www.swi-prolog.org/download/stable/src +SWIPL_LICENSE = BSD-2-Clause +SWIPL_LICENSE_FILES = LICENSE + +SWIPL_DEPENDENCIES = host-swipl zlib + +# A host-swipl is needed to compile the target prolog boot +# boot.prl file. +HOST_SWIPL_CONF_OPTS = \ + -DBUILD_PDF_DOCUMENTATION=OFF \ + -DSWIPL_PACKAGES=OFF \ + -DUSE_GMP=OFF \ + -DUSE_TCMALLOC=OFF + +# swipl uses cmake macros try_run() and check_c_source_runs(), which +# are not suitable for cross compilation. We add results in cache to +# avoid running those tests. The SWIPL_NATIVE_FRIEND variable, is +# meant to point to build directory of a host native swipl, rather +# than the binary itself. The Cmake macro will append "src/swipl" to +# the path set to this variable. Therefore, we cannot use the host +# "swipl" binary installed in $(HOST_DIR)/usr/bin. +SWIPL_CONF_OPTS = \ + -DBUILD_PDF_DOCUMENTATION=OFF \ + -DHAVE_WEAK_ATTRIBUTE=1 \ + -DLLROUND_OK=1 \ + -DMODF_OK=1 \ + -DQSORT_R_GNU=1 \ + -DSWIPL_NATIVE_FRIEND=$(HOST_SWIPL_SRCDIR) \ + -DSWIPL_PACKAGES=OFF \ + -DUSE_TCMALLOC=OFF + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SWIPL_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_PACKAGE_GMP),y) +SWIPL_CONF_OPTS += -DUSE_GMP=ON +SWIPL_DEPENDENCIES += gmp +else +SWIPL_CONF_OPTS += -DUSE_GMP=OFF +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +SWIPL_DEPENDENCIES += ncurses +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 4dc5c45bd283991912a3536d044ec1f36756f505 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 6 Aug 2024 22:06:11 +0200 Subject: [PATCH 2287/3013] support/testing/tests/package/test_swipl.py: new test This commit adds a test case for the recently added swipl package. It should have been part of commit 69710addd121a18ff662c5a6dcb1d8f329f39d69 ("package/swipl: new package") but was forgotten. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_swipl.py | 46 +++++++++++++++++++ .../test_swipl/rootfs-overlay/root/sudoku.pl | 42 +++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 support/testing/tests/package/test_swipl.py create mode 100644 support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl diff --git a/support/testing/tests/package/test_swipl.py b/support/testing/tests/package/test_swipl.py new file mode 100644 index 00000000000..08391015994 --- /dev/null +++ b/support/testing/tests/package/test_swipl.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + + +class TestSWIPL(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_swipl/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_SWIPL=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check program executes. + cmd = "swipl --version" + self.assertRunOk(cmd) + + # Check swipl fails when goal is false. + cmd = "swipl -g false" + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test output. + string = "Hello Buildroot !" + cmd = f"swipl -g 'writeln(\"{string}\")' -t halt" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], string) + + # Check the swipl demo file works (ex: "sam" likes "pizza"). + cmd = "swipl -g '[swi(demo/likes)]' -g 'likes(sam,pizza)' -t halt" + self.assertRunOk(cmd) + + # Run a more complex logic program (solve a sudoku). + cmd = "swipl -g top -t halt /root/sudoku.pl" + self.assertRunOk(cmd, timeout=10) diff --git a/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl new file mode 100644 index 00000000000..2b68b6cc891 --- /dev/null +++ b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl @@ -0,0 +1,42 @@ +% taken from: +% https://www.swi-prolog.org/pldoc/man?section=clpfd-sudoku + +:- use_module(library(clpfd)). + +sudoku(Rows) :- + length(Rows, 9), maplist(same_length(Rows), Rows), + append(Rows, Vs), Vs ins 1..9, + maplist(all_distinct, Rows), + transpose(Rows, Columns), + maplist(all_distinct, Columns), + Rows = [As,Bs,Cs,Ds,Es,Fs,Gs,Hs,Is], + blocks(As, Bs, Cs), + blocks(Ds, Es, Fs), + blocks(Gs, Hs, Is). + +blocks([], [], []). +blocks([N1,N2,N3|Ns1], [N4,N5,N6|Ns2], [N7,N8,N9|Ns3]) :- + all_distinct([N1,N2,N3,N4,N5,N6,N7,N8,N9]), + blocks(Ns1, Ns2, Ns3). + +problem(1, [[_,_,_,_,_,_,_,_,_], + [_,_,_,_,_,3,_,8,5], + [_,_,1,_,2,_,_,_,_], + [_,_,_,5,_,7,_,_,_], + [_,_,4,_,_,_,1,_,_], + [_,9,_,_,_,_,_,_,_], + [5,_,_,_,_,_,_,7,3], + [_,_,2,_,1,_,_,_,_], + [_,_,_,_,4,_,_,_,9]]). + +top :- writeln("Sudoku solution:"), + problem(1, Rows), sudoku(Rows), maplist(portray_clause, Rows), + Rows = [[9, 8, 7, 6, 5, 4, 3, 2, 1], + [2, 4, 6, 1, 7, 3, 9, 8, 5], + [3, 5, 1, 9, 2, 8, 7, 4, 6], + [1, 2, 8, 5, 3, 7, 6, 9, 4], + [6, 3, 4, 8, 9, 2, 1, 5, 7], + [7, 9, 5, 4, 6, 1, 8, 3, 2], + [5, 1, 9, 2, 8, 6, 4, 7, 3], + [4, 7, 2, 3, 1, 9, 5, 6, 8], + [8, 6, 3, 7, 4, 5, 2, 1, 9]]. From 21f312a53e49a3338db870df778665e42cf72dbf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 11:11:40 +0100 Subject: [PATCH 2288/3013] package/htop: fix BR2_SHARED_STATIC_LIBS build With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a --enable-static flags causing htop to be built as a static binary. Adding a --disable-static reverts this. This will fix the following build failure with hwloc raised since bump to version 3.3.0 in commit 09243186df3168022f0b23b8a9677c6313033769 and https://github.com/htop-dev/htop/commit/c8a61850dd31ab64eb8ad83929ce86d2adbeb96c: /home/autobuild/autobuild/instance-3/output-1/host/bin/mipsel-buildroot-linux-gnu-gcc -std=c99 -pedantic -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -I/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -I/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/include/libxml2 -Wall -Wcast-align -Wcast-qual -Wextra -Wfloat-equal -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -Wunused -Wwrite-strings -Wnull-dereference -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"/etc\"" -I"./linux" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=2 -static -rdynamic -static -o htop htop.o Action.o Affinity.o AffinityPanel.o AvailableColumnsPanel.o AvailableMetersPanel.o BatteryMeter.o CategoriesPanel.o ClockMeter.o ColorsPanel.o ColumnsPanel.o CommandLine.o CommandScreen. o Compat.o CPUMeter.o CRT.o DateMeter.o DateTimeMeter.o DiskIOMeter.o DisplayOptionsPanel.o DynamicColumn.o DynamicMeter.o DynamicScreen.o EnvScreen.o FileDescriptorMeter.o FunctionBar.o Hashtable.o Header.o HeaderOptionsPanel.o HostnameMeter.o IncSet.o InfoScreen.o ListItem.o LoadAverageMeter.o Machine.o MainPanel.o MemoryMeter.o MemorySwapMeter.o Meter.o MetersPanel.o NetworkIOMeter.o Object.o OpenFilesScreen.o OptionItem.o Panel.o Process.o ProcessLocksScreen.o ProcessTable.o Row.o RichString.o Scheduling.o ScreenManager.o ScreensPanel.o ScreenTabsPanel.o Settings.o SignalsPanel.o SwapMeter.o SysArchMeter.o Table.o TasksMeter.o TraceScreen.o UptimeMeter.o UsersTable.o Vector.o XUtils.o generic/gettime.o generic/hostname.o generic/uname.o linux/CGroupUtils.o linux/HugePageMeter.o linux/IOPriorityPanel.o linux/LibSensors.o linux/LinuxMachine.o linux/LinuxProcess.o linux/LinuxProcessTable.o linux/Platform.o linux/PressureStallMeter.o linux/SELinuxMeter.o linux/SystemdMeter.o linux/Z ramMeter.o zfs/ZfsArcMeter.o zfs/ZfsCompressedArcMeter.o -lcap -llzma -L/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lncurses -lm -L/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -lhwloc /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Action.o: in function `Action_setUserOnly': Action.c:(.text+0x2490): warning: Using 'getpwnam' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Settings.o: in function `Settings_new': Settings.c:(.text+0x2dd0): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/libhwloc.a(topology-xml-libxml.o): in function `hwloc_libxml_free_buffer': topology-xml-libxml.c:(.text+0x2c): undefined reference to `xmlFree' Fixes: - http://autobuild.buildroot.org/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/htop/htop.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 6dbaae3796f..4fa8e4fb5fa 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -17,6 +17,16 @@ HTOP_LICENSE_FILES = COPYING # provided by autoconf relies on wchar_t. HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 +# --enable-static has a non-standard semantic in htop, and causes the +# main binary to be linked statically, not just the production of +# static libraries. This causes issues with BR2_SHARED_STATIC_LIBS as +# htop is linked statically, but pkg-config returns results relevant +# for a shared library build. Since htop is only building an +# application, let's disable this bogus behavior. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +HTOP_CONF_OPTS += --disable-static +endif + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc From 33d45b9c672df06b7157be957f81b2cf17dccdd7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 6 Aug 2024 21:25:24 +0200 Subject: [PATCH 2289/3013] package/swipl: bump version to 9.2.6 For change log, see: https://www.swi-prolog.org/ChangeLog?branch=stable&from=9.2.0&to=9.2.6 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/swipl/swipl.hash | 2 +- package/swipl/swipl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash index 9f980654ba7..98611ffcda3 100644 --- a/package/swipl/swipl.hash +++ b/package/swipl/swipl.hash @@ -1,4 +1,4 @@ # From https://www.swi-prolog.org/download/stable -sha256 10d90b15734d14d0d7972dc11a3584defd300d65a9f0b1185821af8c3896da5e swipl-9.2.0.tar.gz +sha256 0cb9b80b9922be8165cbac384ebe050d94553e72cf7aebfc980b4395ff01d05d swipl-9.2.6.tar.gz # Locally calculated sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk index d4263a6aa8c..9ba841084ed 100644 --- a/package/swipl/swipl.mk +++ b/package/swipl/swipl.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWIPL_VERSION = 9.2.0 +SWIPL_VERSION = 9.2.6 SWIPL_SITE = https://www.swi-prolog.org/download/stable/src SWIPL_LICENSE = BSD-2-Clause SWIPL_LICENSE_FILES = LICENSE From 6e3bf1fe76db187fbdf4fee5eb5e894ec4cc3e54 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 11 Oct 2023 09:27:01 +0200 Subject: [PATCH 2290/3013] package/python-configobj: new package python-configobj package was removed in commit 8d264a96172cfa1c1f515d1160b921c013fa3bd7 because of the missing support for Python 3.x. Meanwhile, this problem was fixed, hence readd the package. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ------ package/Config.in | 1 + package/python-configobj/Config.in | 7 +++++++ package/python-configobj/python-configobj.hash | 5 +++++ package/python-configobj/python-configobj.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 package/python-configobj/Config.in create mode 100644 package/python-configobj/python-configobj.hash create mode 100644 package/python-configobj/python-configobj.mk diff --git a/Config.in.legacy b/Config.in.legacy index 94092d38f4c..6473947a9a6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1164,12 +1164,6 @@ config BR2_PACKAGE_PYTHON_DIALOG help Package was removed together with python 2.7 support. -config BR2_PACKAGE_PYTHON_CONFIGOBJ - bool "python-configobj removed" - select BR2_LEGACY - help - Package was removed together with python 2.7 support. - config BR2_PACKAGE_PYTHON_YIELDFROM bool "python-yieldfrom removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0d51c6af1e5..0472ec2daf5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1051,6 +1051,7 @@ menu "External python modules" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" + source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-construct/Config.in" diff --git a/package/python-configobj/Config.in b/package/python-configobj/Config.in new file mode 100644 index 00000000000..365aa17fcbc --- /dev/null +++ b/package/python-configobj/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_CONFIGOBJ + bool "python-configobj" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Config file reading, writing and validation. + + https://github.com/DiffSK/configobj diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash new file mode 100644 index 00000000000..682dc987f14 --- /dev/null +++ b/package/python-configobj/python-configobj.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/configobj/json +md5 8dda7b31bb3aea87ecfe3b7a87812b17 configobj-5.0.8.tar.gz +sha256 6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97 configobj-5.0.8.tar.gz +# Locally computed sha256 checksums +sha256 0d95e648469a711f5ec1e59e6d4492150ec65d968c1ea6c6d96154a92879997a LICENSE diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk new file mode 100644 index 00000000000..fe1776f79f9 --- /dev/null +++ b/package/python-configobj/python-configobj.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-configobj +# +################################################################################ + +PYTHON_CONFIGOBJ_VERSION = 5.0.8 +PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz +PYTHON_CONFIGOBJ_SITE = https://files.pythonhosted.org/packages/cb/87/17d4c6d634c044ab08b11c0cd2a8a136d103713d438f8792d7be2c5148fb +PYTHON_CONFIGOBJ_SETUP_TYPE = setuptools +PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause +PYTHON_CONFIGOBJ_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 4a285b160fc0c106ccf9c42a7ebfd8cd5ed54744 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 15 Jun 2024 11:16:11 +0200 Subject: [PATCH 2291/3013] support/testing: test_audio_codec_base.py: new helper class This is a helper class providing a template for testing audio codec programs such as lame mp3 encoder, flac tools, ogg vorbis-tools, ... Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../tests/package/test_audio_codec_base.py | 86 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 support/testing/tests/package/test_audio_codec_base.py diff --git a/DEVELOPERS b/DEVELOPERS index 90c34e51f5f..44462dfdfdb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1842,6 +1842,7 @@ F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_attr.py +F: support/testing/tests/package/test_audio_codec_base.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_bcc.py F: support/testing/tests/package/test_bcc/ diff --git a/support/testing/tests/package/test_audio_codec_base.py b/support/testing/tests/package/test_audio_codec_base.py new file mode 100644 index 00000000000..59c7efcad3c --- /dev/null +++ b/support/testing/tests/package/test_audio_codec_base.py @@ -0,0 +1,86 @@ +import math +import os + +import infra.basetest + + +class TestAudioCodecBase(infra.basetest.BRTest): + """Common class to test an audio codec package. + + This base class builds a Buildroot system image containing the + package enabled in its config, start the emulator, login to it. It + prepares an input test WAV file containing a tone. This WAV file + is encoded into a new output file in the native encoder format. It + is then decoded to a new output WAV file. This final output WAV + file is checked to contain the expected tone generated in the + initial input WAV file. There is no specific check about file + size, nor audio quality. The acceptance criteria is the + recognition of the tone. Note: the tone generation is made with + the Sox package, and the tone recognition is made with the Aubio + package. + + Each test case that inherits from this class must have: + __test__ = True - to let nose2 know that it is a test case + config - defconfig fragment with the packages to run the test + encode_test() - the function that runs the encoder and produces an + encoded file. + decode_test() - the function that runs the decoder and produces a + decode file. + """ + __test__ = False + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_AUBIO=y + BR2_PACKAGE_SOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + input_file = "reference.wav" + decoded_file = "decoded.wav" + tone_freq = 440 # General Midi note A3 + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + def test_run(self): + self.login() + self.prepare_data() + self.encode_test(self.input_file) + self.decode_test(self.decoded_file) + self.check_test() + + def prepare_data(self): + # Generate a sinusoidal tone. + cmd = "sox -V -r 48000 -n -b 16 -c 1 " + cmd += self.input_file + cmd += f" synth 3 sin {self.tone_freq} vol -10dB" + self.assertRunOk(cmd) + + def encode_test(self, input_filename): + msg = "method must be implemented in derived class" + raise NotImplementedError(msg) + + def decode_test(self, output_filename): + msg = "method must be implemented in derived class" + raise NotImplementedError(msg) + + def note_from_freq(self, freq): + """Return a note number from the input frequency in Hertz.""" + return round((12 * math.log(freq / 440) / math.log(2)) + 69) + + def check_test(self): + expected_note = self.note_from_freq(self.tone_freq) + out, ret = self.emulator.run(f"aubionotes {self.decoded_file}", timeout=20) + self.assertEqual(ret, 0) + note_found = False + for line in out: + values = line.split() + if len(values) == 3: + note = round(float(values[0])) + if note == expected_note: + note_found = True + self.assertTrue(note_found, "The expected note was not found") From 73e8652b57c8fd97bb7af6ef10e46301a22922e8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 15 Jun 2024 11:16:12 +0200 Subject: [PATCH 2292/3013] support/testing: add lame runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_lame.py | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 support/testing/tests/package/test_lame.py diff --git a/DEVELOPERS b/DEVELOPERS index 44462dfdfdb..c472aa4c53d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1897,6 +1897,7 @@ F: support/testing/tests/package/test_kmod.py F: support/testing/tests/package/test_kmod/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ +F: support/testing/tests/package/test_lame.py F: support/testing/tests/package/test_less.py F: support/testing/tests/package/test_libcamera.py F: support/testing/tests/package/test_libcamera/ diff --git a/support/testing/tests/package/test_lame.py b/support/testing/tests/package/test_lame.py new file mode 100644 index 00000000000..bffb11672b1 --- /dev/null +++ b/support/testing/tests/package/test_lame.py @@ -0,0 +1,20 @@ +from tests.package.test_audio_codec_base import TestAudioCodecBase + + +class TestLame(TestAudioCodecBase): + __test__ = True + config = TestAudioCodecBase.config + \ + """ + BR2_PACKAGE_LAME=y + """ + encoded_file = "encoded.mp3" + + def encode_test(self, input_filename): + cmd = "lame --quiet" + cmd += f" {input_filename} {self.encoded_file}" + self.assertRunOk(cmd) + + def decode_test(self, output_filename): + cmd = "lame --quiet --decode" + cmd += f" {self.encoded_file} {output_filename}" + self.assertRunOk(cmd) From 9a118c766437a2419fdc267fcf871d18369eb4fa Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Jul 2024 09:02:32 +0200 Subject: [PATCH 2293/3013] package/gpm: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, gpm fails to build with output: Applying 0003-src-Makefile.in-Really-install-unversioned-solibrary.patch using patch: patching file src/Makefile.in Hunk #1 FAILED at 115. 1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej This commit refreshes the package patch on the current package version. While we're at it, change to use a proper Upstream: tag and remove from .checkpackageignore. Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit d47ae17adfca2f07a6a575d84e1137d87afd961c) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...ile.in-Really-install-unversioned-solibrary.patch | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 1faaba74318..9eba20f24e6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -699,7 +699,6 @@ package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch. package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch lib_patch.Upstream package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch lib_patch.Upstream package/gpm/0002-Install-unversioned-solibrary.patch lib_patch.Upstream -package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch lib_patch.Upstream package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch lib_patch.Upstream package/gpm/0005-fix-building-w-newer-glibc.patch lib_patch.Upstream package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch lib_patch.Upstream diff --git a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch index 25918019769..3806fe7e89c 100644 --- a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch +++ b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch @@ -1,4 +1,4 @@ -From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001 +From 5b83edaa20f6ecf97d16e323be1ed555d8fa2c01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 17:59:52 +0100 Subject: [PATCH] src/Makefile.in: Really install unversioned solibrary @@ -7,25 +7,27 @@ This commit is a follow-up to https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa which created libgpm.so but failed to include it in the install target. -Patch sent upstream: https://github.com/telmich/gpm/pull/11 +Upstream: https://github.com/telmich/gpm/pull/11 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.in b/src/Makefile.in -index 7e9e2ef..bca226f 100644 +index b63e4f4489bd..a1838c300312 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -115,6 +115,7 @@ install: check if test "x@SHLIB@" != "x" ; then \ - $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ + $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ + cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \ echo "WARNING: We installed a lib, you should now call ldconfig" ; \ echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ echo "Or to update everything just type ldconfig" ; \ -- -2.7.0 +2.43.0 From b5060121343c780e1642df9c0460ae0ea11fcd15 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 May 2024 11:17:07 +0200 Subject: [PATCH 2294/3013] package/gpm: fix musl build with gcc 14 Fix the following musl build failure with gcc 14: daemon/old_main.c: In function 'old_main': daemon/old_main.c:56:11: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] 56 | if(!strcmp((which_mouse->opt_dev),"-")) fd=0; /* use stdin */ | ^~~~~~ daemon/old_main.c:35:1: note: include '' or provide a declaration of 'strcmp' 34 | #include "headers/gpmInt.h" /* daemon internals */ +++ |+#include 35 | While at it, add Upstream tags to other patches Fixes: - http://autobuild.buildroot.org/results/3192740863d57e72e90e622683e7b9fcc057fa8b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 50b18ed68ceef78061e85a390d29ad172d1f9f95) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 5 ---- ...usl-support-to-libgpm-and-the-daemon.patch | 4 +-- .../0002-Install-unversioned-solibrary.patch | 4 +-- ...mptyset-API-instead-of-__sigemptyset.patch | 1 + .../gpm/0005-fix-building-w-newer-glibc.patch | 1 + ...on.h-avoid-redefinition-of-last_sele.patch | 1 + package/gpm/0007-Add-include-string-h.patch | 27 +++++++++++++++++++ 7 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 package/gpm/0007-Add-include-string-h.patch diff --git a/.checkpackageignore b/.checkpackageignore index 9eba20f24e6..cd60677c2fd 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -697,11 +697,6 @@ package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch lib_patch.Upstream -package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch lib_patch.Upstream -package/gpm/0002-Install-unversioned-solibrary.patch lib_patch.Upstream -package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch lib_patch.Upstream -package/gpm/0005-fix-building-w-newer-glibc.patch lib_patch.Upstream -package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch lib_patch.Upstream package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream diff --git a/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch b/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch index 1e1e919416a..1e143e50310 100644 --- a/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch +++ b/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch @@ -3,9 +3,7 @@ From: Dima Krasner Date: Wed, 12 Nov 2014 23:06:46 +0200 Subject: [PATCH] Added musl support to libgpm and the daemon. -[Upstream patch backported from the github repository, -https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe.] - +Upstream: https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe Signed-off-by: Thomas Petazzoni --- src/daemon/open_console.c | 1 + diff --git a/package/gpm/0002-Install-unversioned-solibrary.patch b/package/gpm/0002-Install-unversioned-solibrary.patch index 27e97acb32b..5f184daba28 100644 --- a/package/gpm/0002-Install-unversioned-solibrary.patch +++ b/package/gpm/0002-Install-unversioned-solibrary.patch @@ -6,9 +6,7 @@ Subject: [PATCH] Install unversioned solibrary Unversioned solibraries are shipped with -devel packages in Linux distros. Generate and install it for the consistency. -[Upstream patch backported from the github repository, -https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa] - +Upstream: https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Signed-off-by: Bernd Kuhls --- src/Makefile.in | 7 +++---- diff --git a/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch index 01c7424a9de..5820d21f513 100644 --- a/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch +++ b/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch @@ -7,6 +7,7 @@ __sigemptyset has been removed from glibc public API headers in upcoming (2.26) release onwards Signed-off-by: Khem Raj +Upstream: https://github.com/telmich/gpm/commit/fdc42770596e25749f7e2ce0ea97882177397167 Signed-off-by: Petr Vorel --- src/prog/gpm-root.y | 4 ---- diff --git a/package/gpm/0005-fix-building-w-newer-glibc.patch b/package/gpm/0005-fix-building-w-newer-glibc.patch index b451d975e0b..839f92f37bf 100644 --- a/package/gpm/0005-fix-building-w-newer-glibc.patch +++ b/package/gpm/0005-fix-building-w-newer-glibc.patch @@ -7,6 +7,7 @@ Linux C libraries are looking to disentangle sysmacros.h from the sys/types.h include, so make sure we pull in the header when it is found. +Upstream: https://github.com/telmich/gpm/commit/b350aee4ea5785a75cb6ad770f6b768c506ebb70 Signed-off-by: Giulio Benetti --- src/daemon/open_console.c | 4 ++++ diff --git a/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch b/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch index 36a8ddc5bb0..0c8428df2c5 100644 --- a/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch +++ b/package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch @@ -20,6 +20,7 @@ https://gcc.gnu.org/PR85678. The error also happens if CFLAGS=-fno-common passed explicitly. Signed-off-by: Sergei Trofimovich +Upstream: https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Signed-off-by: Heiko Thiery --- src/headers/daemon.h | 2 +- diff --git a/package/gpm/0007-Add-include-string-h.patch b/package/gpm/0007-Add-include-string-h.patch new file mode 100644 index 00000000000..dd7e736e7b6 --- /dev/null +++ b/package/gpm/0007-Add-include-string-h.patch @@ -0,0 +1,27 @@ +From 2085cab74a0a84df8b965addf007775a7225c9ec Mon Sep 17 00:00:00 2001 +From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com> +Date: Sat, 29 Dec 2018 23:47:17 -0600 +Subject: [PATCH] Add include + +Added + line 28, #include /* strcpy, bzero */ +for musl compilation + +Upstream: https://github.com/telmich/gpm/commit/2085cab74a0a84df8b965addf007775a7225c9ec +Signed-off-by: Fabrice Fontaine +--- + src/daemon/old_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/daemon/old_main.c b/src/daemon/old_main.c +index 2581e26..ab7a87f 100644 +--- a/src/daemon/old_main.c ++++ b/src/daemon/old_main.c +@@ -25,6 +25,7 @@ + #include /* guess again */ + #include /* guess again */ + #include /* unlink */ ++#include /* strcpy, bzero */ + #include /* chmod */ + + #include /* linux hd* */ From 3127d74ff6fbde4e74a60a1720f5a7ad78c2f1d6 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 17 May 2024 10:20:07 +0200 Subject: [PATCH 2295/3013] package/frotz: fix build with gcc 14 Change -std=c99 into -std=gnu99 in the CFLAGS to avoid the following build failure with gcc 14: fastmem.c: In function 'z_restore': fastmem.c:842:36: error: implicit declaration of function 'strdup'; did you mean 'strcmp'? [-Wimplicit-function-declaration] 842 | f_setup.aux_name = strdup(default_name); | ^~~~~~ | strcmp Fixes: - http://autobuild.buildroot.org/results/df3b3b98265ec3a75578614746b2d1426c90e125 Reported-by: Fabrice Fontaine Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni (cherry picked from commit 1b01c3c3331f3c33268c4232900079ee9166fc14) Signed-off-by: Peter Korsgaard --- package/frotz/frotz.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/frotz/frotz.mk b/package/frotz/frotz.mk index 5af235137cd..4c477c396df 100644 --- a/package/frotz/frotz.mk +++ b/package/frotz/frotz.mk @@ -21,7 +21,7 @@ endif define FROTZ_BUILD_CMDS $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr CONFIG_DIR=/etc \ SOUND_TYPE=none CURSES="$(FROTZ_CURSES)" USE_UTF8=$(FROTZ_UTF8) \ - CFLAGS="$(TARGET_CFLAGS) -std=c99" + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" endef define FROTZ_INSTALL_TARGET_CMDS From 65fc31a8ecd9ed7866f26353dac97c9fc9769e9c Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:49 -0300 Subject: [PATCH 2296/3013] utils/check-package: fix check for _REDISTRIBUTE Commit "8e87d76c12 check-package: check *.mk files" added a typo that prevents check-package from checking _REDISTRIBUTE default value. Fix the typo: _INSTALL_REDISTRIBUTE -> _REDISTRIBUTE Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (cherry picked from commit cca315f814888025daa80fc320610117a6f69007) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_mk.py | 2 +- utils/checkpackagelib/test_lib_mk.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index ce2ab5157c4..4d97571f505 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -324,7 +324,7 @@ class UselessFlag(_CheckFunction): r"_LIBTOOL_PATCH\s*=\s*YES"]))) DEFAULT_GENERIC_FLAG = re.compile(r"^.*{}".format("|".join([ r"_INSTALL_IMAGES\s*=\s*NO", - r"_INSTALL_REDISTRIBUTE\s*=\s*YES", + r"_REDISTRIBUTE\s*=\s*YES", r"_INSTALL_STAGING\s*=\s*NO", r"_INSTALL_TARGET\s*=\s*YES"]))) END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 2086237ebb1..11fecdd5cf2 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -602,13 +602,13 @@ def test_TypoInPackageVariable(testname, filename, string, expected): ('generic', 'any.mk', 'ANY_INSTALL_IMAGES = NO\n' - 'ANY_INSTALL_REDISTRIBUTE = YES\n' + 'ANY_REDISTRIBUTE = YES\n' 'ANY_INSTALL_STAGING = NO\n' 'ANY_INSTALL_TARGET = YES\n', [['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', 'ANY_INSTALL_IMAGES = NO\n'], ['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', - 'ANY_INSTALL_REDISTRIBUTE = YES\n'], + 'ANY_REDISTRIBUTE = YES\n'], ['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', 'ANY_INSTALL_STAGING = NO\n'], ['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', @@ -618,9 +618,9 @@ def test_TypoInPackageVariable(testname, filename, string, expected): 'ifneq (condition)\n' 'ANY_INSTALL_IMAGES = NO\n' 'endif\n' - 'ANY_INSTALL_REDISTRIBUTE = YES\n', + 'ANY_REDISTRIBUTE = YES\n', [['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', - 'ANY_INSTALL_REDISTRIBUTE = YES\n']]), + 'ANY_REDISTRIBUTE = YES\n']]), ] From 6c6f6eb44a12ac56a596bd030620465bdd45cd11 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:50 -0300 Subject: [PATCH 2297/3013] utils/check-package: check linux-tools Each linux tool uses a fragment of a .mk file, named, for instance: package/linux-tools/linux-tool-cpupower.mk.in So currently check-package does not check these files. Add the support in check-package script. At the same time, factor out a function to derive package prefix from the filename being checked, so the fix (calling os.path.splitext twice) can be applied in a single place. Signed-off-by: Ricardo Martincoski [Arnout: add docstring and explain double splitext to get_package_prefix_from_filename] Signed-off-by: Arnout Vandecappelle (cherry picked from commit ccc12c0f244de23672300b5837b473292c8db931) Signed-off-by: Peter Korsgaard --- utils/check-package | 3 ++- utils/checkpackagelib/lib_mk.py | 30 ++++++++++++--------- utils/checkpackagelib/test_lib_mk.py | 40 ++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/utils/check-package b/utils/check-package index cbb3613e190..3741a2ccdcb 100755 --- a/utils/check-package +++ b/utils/check-package @@ -126,6 +126,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", r"fs/common\.mk$", + r"package/alchemy/atom.mk.in$", r"package/doc-asciidoc\.mk$", r"package/pkg-\S*\.mk$", r"support/dependencies/[^/]+\.mk$", @@ -163,7 +164,7 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_defconfig if fname.endswith(".hash"): return checkpackagelib.lib_hash - if fname.endswith(".mk"): + if fname.endswith(".mk") or fname.endswith(".mk.in"): return checkpackagelib.lib_mk if fname.endswith(".patch"): return checkpackagelib.lib_patch diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 4d97571f505..1e6bd708a5c 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -49,6 +49,18 @@ def check_line(self, lineno, text): text] +def get_package_prefix_from_filename(filename): + """Return a tuple (pkgname, PKGNAME) with the package name derived from the file name""" + # Double splitext to support .mk.in + package = os.path.splitext(os.path.splitext(os.path.basename(filename))[0])[0] + # linux tools do not use LINUX_TOOL_ prefix for variables + package = package.replace("linux-tool-", "") + # linux extensions do not use LINUX_EXT_ prefix for variables + package = package.replace("linux-ext-", "") + package_upper = package.replace("-", "_").upper() + return package, package_upper + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) @@ -207,12 +219,10 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): packages_that_may_contain_default_source = ["binutils", "gcc", "gdb"] def before(self): - package, _ = os.path.splitext(os.path.basename(self.filename)) - package_upper = package.replace("-", "_").upper() - self.package = package + self.package, package_upper = get_package_prefix_from_filename(self.filename) self.FIND_SOURCE = re.compile( r"^{}_SOURCE\s*=\s*{}-\$\({}_VERSION\)\.tar\.gz" - .format(package_upper, package, package_upper)) + .format(package_upper, self.package, package_upper)) def check_line(self, lineno, text): if self.FIND_SOURCE.search(text): @@ -282,16 +292,10 @@ class TypoInPackageVariable(_CheckFunction): VARIABLE = re.compile(r"^(define\s+)?([A-Z0-9_]+_[A-Z0-9_]+)") def before(self): - package, _ = os.path.splitext(os.path.basename(self.filename)) - package = package.replace("-", "_").upper() - # linux tools do not use LINUX_TOOL_ prefix for variables - package = package.replace("LINUX_TOOL_", "") - # linux extensions do not use LINUX_EXT_ prefix for variables - package = package.replace("LINUX_EXT_", "") - self.package = package - self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package)) + _, self.package = get_package_prefix_from_filename(self.filename) + self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(self.package)) self.FIND_VIRTUAL = re.compile( - r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package)) + r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(self.package)) self.virtual = [] def check_line(self, lineno, text): diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 11fecdd5cf2..208b1ecdc2b 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -74,6 +74,40 @@ def test_Ifdef(testname, filename, string, expected): assert warnings == expected +get_package_prefix_from_filename = [ + ('linux extension', + 'linux/linux-ext-aufs.mk', + ['aufs', 'AUFS']), + ('linux tool', + 'package/linux-tools/linux-tool-gpio.mk.in', + ['gpio', 'GPIO']), + ('boot', + 'boot/binaries-marvell/binaries-marvell.mk', + ['binaries-marvell', 'BINARIES_MARVELL']), + ('toolchain', + 'toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk', + ['toolchain-external-bootlin', 'TOOLCHAIN_EXTERNAL_BOOTLIN']), + ('package, underscore, subfolder', + 'package/x11r7/xapp_bitmap/xapp_bitmap.mk', + ['xapp_bitmap', 'XAPP_BITMAP']), + ('package, starting with number', + 'package/4th/4th.mk', + ['4th', '4TH']), + ('package, long name', + 'package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk', + ['perl-mojolicious-plugin-authentication', 'PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION']), + ('package, case sensitive', + 'package/libeXosip2/libeXosip2.mk', + ['libeXosip2', 'LIBEXOSIP2']), + ] + + +@pytest.mark.parametrize('testname,filename,expected', get_package_prefix_from_filename) +def test_get_package_prefix_from_filename(testname, filename, expected): + prefix_lower, prefix_upper = m.get_package_prefix_from_filename(filename) + assert [prefix_lower, prefix_upper] == expected + + Indent = [ ('ignore comment at beginning of line', 'any', @@ -567,6 +601,12 @@ def test_TrailingBackslash(testname, filename, string, expected): 'OTHERS_VAR = \n', [['any.mk:2: possible typo: OTHERS_VAR -> *ANY*', 'OTHERS_VAR = \n']]), + ('linux tool', + 'package/linux-tools/linux-tool-cpupower.mk.in', + 'CPUPOWER_DEPENDENCIES =\n' + 'POWER_DEPENDENCIES +=\n', + [['package/linux-tools/linux-tool-cpupower.mk.in:2: possible typo: POWER_DEPENDENCIES -> *CPUPOWER*', + 'POWER_DEPENDENCIES +=\n']]), ] From 26db1f8ef5647c6d2d1d7c5f5334be667bc83820 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:53 -0300 Subject: [PATCH 2298/3013] docs/manual: standardize references to the generic infra Currently the text for each package infra that mentions the usage of variables already provided by the generic infra diverge from each other: - some (golang, kconfig, python) add a cross-referece to the generic infra chapter; - kconfig does not list any example; - some mention _LICENSE as an example, others don't; - some (cargo, golang, python) add an 'etc.' at the end of the examples, giving the idea that can be more symbols provided by the generic infra than the ones listed; - most have the text 'works by defining a number of variables before calling the ++ macro', except golang and kconfig; - some actually list 'A few additional variables' but keep using some old reference as 'An additional variable'; - some say 'First, all the package metadata' and other only 'All the package metadata'; - most mention _SUBDIR as an example of variable supported by the generic infra, even the generic infra manual not mentioning it. Improve the correctness for the manual by standardizing the text among the package infras: - use the same text "All the package metadata information variables that exist in the generic package infrastructure also exist in the infrastructure:" for all of them; - add the cross-reference for all of them; - remove the examples of variables inherited from the generic infra - this also solves the _SUBDIR problem, there no longer is any reference to _SUBDIR; - wrap the modified text at 80 columns; - add "macro" to golang and luarocks infra; - use "A few additional variables" for qmake and waf. At same time, add a missing format on golang manual for BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. Cc: Eric Le Bihan Cc: Thomas De Schampheleire Signed-off-by: Ricardo Martincoski [Arnout: - remove the examples; - add "the" where "macro" was added; - rewrite the preceding paragraphs for kconfig to make it more consistent. ] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 4286c89f9d987f5f3bcbb14dfd58ba440944f4c2) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-autotools.adoc | 9 +++------ docs/manual/adding-packages-cargo.adoc | 7 +++---- docs/manual/adding-packages-cmake.adoc | 8 +++----- docs/manual/adding-packages-golang.adoc | 9 ++++----- docs/manual/adding-packages-kconfig.adoc | 14 ++++++++++---- docs/manual/adding-packages-luarocks.adoc | 10 +++++----- docs/manual/adding-packages-meson.adoc | 7 +++---- docs/manual/adding-packages-perl.adoc | 9 +++------ docs/manual/adding-packages-python.adoc | 5 +---- docs/manual/adding-packages-qmake.adoc | 10 ++++------ docs/manual/adding-packages-rebar.adoc | 10 +++------- docs/manual/adding-packages-waf.adoc | 10 ++++------ 12 files changed, 46 insertions(+), 62 deletions(-) diff --git a/docs/manual/adding-packages-autotools.adoc b/docs/manual/adding-packages-autotools.adoc index ad96957f3d8..c2b90f31eb6 100644 --- a/docs/manual/adding-packages-autotools.adoc +++ b/docs/manual/adding-packages-autotools.adoc @@ -76,12 +76,9 @@ Just like the generic infrastructure, the autotools infrastructure works by defining a number of variables before calling the +autotools-package+ macro. -First, all the package metadata information variables that exist in the -generic infrastructure also exist in the autotools infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, -+LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, -+LIBFOO_INSTALL_STAGING+, +LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the autotools infrastructure. A few additional variables, specific to the autotools infrastructure, can also be defined. Many of them are only useful in very specific diff --git a/docs/manual/adding-packages-cargo.adoc b/docs/manual/adding-packages-cargo.adoc index e18fd9ce237..a2a15ed996a 100644 --- a/docs/manual/adding-packages-cargo.adoc +++ b/docs/manual/adding-packages-cargo.adoc @@ -64,10 +64,9 @@ Just like the generic infrastructure, the Cargo infrastructure works by defining a number of variables before calling the +cargo-package+ or +host-cargo-package+ macros. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the Cargo infrastructure: -+FOO_VERSION+, +FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, -+FOO_DEPENDENCIES+, +FOO_LICENSE+, +FOO_LICENSE_FILES+, etc. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Cargo infrastructure. A few additional variables, specific to the Cargo infrastructure, can also be defined. Many of them are only useful in very specific cases, diff --git a/docs/manual/adding-packages-cmake.adoc b/docs/manual/adding-packages-cmake.adoc index 4f336db7373..e375e17d74f 100644 --- a/docs/manual/adding-packages-cmake.adoc +++ b/docs/manual/adding-packages-cmake.adoc @@ -75,11 +75,9 @@ Just like the generic infrastructure, the CMake infrastructure works by defining a number of variables before calling the +cmake-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the CMake infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, -+LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the CMake infrastructure. A few additional variables, specific to the CMake infrastructure, can also be defined. Many of them are only useful in very specific cases, diff --git a/docs/manual/adding-packages-golang.adoc b/docs/manual/adding-packages-golang.adoc index c952cde5776..00b8bea285d 100644 --- a/docs/manual/adding-packages-golang.adoc +++ b/docs/manual/adding-packages-golang.adoc @@ -56,16 +56,15 @@ The main macro of the Go package infrastructure is ability to build host packages is also available, with the +host-golang-package+ macro. Host packages built by +host-golang-package+ macro should depend on -BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. ++BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS+. Just like the generic infrastructure, the Go infrastructure works -by defining a number of variables before calling the +golang-package+. +by defining a number of variables before calling the +golang-package+ +macro. All the package metadata information variables that exist in the xref:generic-package-reference[generic package infrastructure] also -exist in the Go infrastructure: +FOO_VERSION+, +FOO_SOURCE+, -+FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+, -+FOO_LICENSE+, +FOO_LICENSE_FILES+, +FOO_INSTALL_STAGING+, etc. +exist in the Go infrastructure. Note that it is not necessary to add +host-go+ in the +FOO_DEPENDENCIES+ variable of a package, since this basic dependency diff --git a/docs/manual/adding-packages-kconfig.adoc b/docs/manual/adding-packages-kconfig.adoc index a35681775f8..f2c40ed7a28 100644 --- a/docs/manual/adding-packages-kconfig.adoc +++ b/docs/manual/adding-packages-kconfig.adoc @@ -15,10 +15,16 @@ expose the package's +menuconfig+ target as +foo-menuconfig+ in Buildroot, and to handle the copying back and forth of the configuration file in a correct way. -The +kconfig-package+ infrastructure is based on the +generic-package+ -infrastructure. All variables supported by +generic-package+ are -available in +kconfig-package+ as well. See -xref:generic-package-reference[] for more details. +The main macro of the kconfig package infrastructure is ++kconfig-package+. It is similar to the +generic-package+ macro. + +Just like the generic infrastructure, the kconfig infrastructure works +by defining a number of variables before calling the +kconfig-package+ +macro. + +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the kconfig infrastructure. In order to use the +kconfig-package+ infrastructure for a Buildroot package, the minimally required lines in the +.mk+ file, in addition to diff --git a/docs/manual/adding-packages-luarocks.adoc b/docs/manual/adding-packages-luarocks.adoc index 70f48fc02cc..9ced6c55046 100644 --- a/docs/manual/adding-packages-luarocks.adoc +++ b/docs/manual/adding-packages-luarocks.adoc @@ -73,16 +73,16 @@ infrastructures in Buildroot, respectively. The main macro of the LuaRocks package infrastructure is +luarocks-package+: like +generic-package+ it works by defining a number of variables providing -metadata information about the package, and then calling +luarocks-package+. +metadata information about the package, and then calling the +luarocks-package+ +macro. Just like the generic infrastructure, the LuaRocks infrastructure works by defining a number of variables before calling the +luarocks-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the LuaRocks infrastructure: -+LUA_FOO_VERSION+, +LUA_FOO_SOURCE+, +LUA_FOO_SITE+, -+LUA_FOO_DEPENDENCIES+, +LUA_FOO_LICENSE+, +LUA_FOO_LICENSE_FILES+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the LuaRocks infrastructure. Two of them are populated by the LuaRocks infrastructure (for the +download+ step). If your package is not hosted on the LuaRocks mirror diff --git a/docs/manual/adding-packages-meson.adoc b/docs/manual/adding-packages-meson.adoc index 029c8c2488d..8c0f84709f8 100644 --- a/docs/manual/adding-packages-meson.adoc +++ b/docs/manual/adding-packages-meson.adoc @@ -76,10 +76,9 @@ packages is also available, with the +host-meson-package+ macro. Just like the generic infrastructure, the Meson infrastructure works by defining a number of variables before calling the +meson-package+ macro. -First, all the package metadata information variables that exist in the generic -infrastructure also exist in the Meson infrastructure: +FOO_VERSION+, -+FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+, -+FOO_INSTALL_STAGING+, +FOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Meson infrastructure. A few additional variables, specific to the Meson infrastructure, can also be defined. Many of them are only useful in very specific cases, typical packages diff --git a/docs/manual/adding-packages-perl.adoc b/docs/manual/adding-packages-perl.adoc index 6ce693fd6eb..7c60a1a4a7e 100644 --- a/docs/manual/adding-packages-perl.adoc +++ b/docs/manual/adding-packages-perl.adoc @@ -85,12 +85,9 @@ Just like the generic infrastructure, the Perl/CPAN infrastructure works by defining a number of variables before calling the +perl-package+ macro. -First, all the package metadata information variables that exist in the -generic infrastructure also exist in the Perl/CPAN infrastructure: -+PERL_FOO_VERSION+, +PERL_FOO_SOURCE+, -+PERL_FOO_PATCH+, +PERL_FOO_SITE+, -+PERL_FOO_SUBDIR+, +PERL_FOO_DEPENDENCIES+, -+PERL_FOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Perl/CPAN infrastructure. Note that setting +PERL_FOO_INSTALL_STAGING+ to +YES+ has no effect unless a +PERL_FOO_INSTALL_STAGING_CMDS+ variable is defined. The perl diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 67f2f6081d7..7cb36357928 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -80,10 +80,7 @@ or +host-python-package+ macros. All the package metadata information variables that exist in the xref:generic-package-reference[generic package infrastructure] also -exist in the Python infrastructure: +PYTHON_FOO_VERSION+, -+PYTHON_FOO_SOURCE+, +PYTHON_FOO_PATCH+, +PYTHON_FOO_SITE+, -+PYTHON_FOO_SUBDIR+, +PYTHON_FOO_DEPENDENCIES+, +PYTHON_FOO_LICENSE+, -+PYTHON_FOO_LICENSE_FILES+, +PYTHON_FOO_INSTALL_STAGING+, etc. +exist in the Python infrastructure. Note that: diff --git a/docs/manual/adding-packages-qmake.adoc b/docs/manual/adding-packages-qmake.adoc index 699d082aa1b..0205f6ca293 100644 --- a/docs/manual/adding-packages-qmake.adoc +++ b/docs/manual/adding-packages-qmake.adoc @@ -51,13 +51,11 @@ Just like the generic infrastructure, the QMake infrastructure works by defining a number of variables before calling the +qmake-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the QMake infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, -+LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the QMake infrastructure. -An additional variable, specific to the QMake infrastructure, can +A few additional variables, specific to the QMake infrastructure, can also be defined. * +LIBFOO_CONF_ENV+, to specify additional environment variables to diff --git a/docs/manual/adding-packages-rebar.adoc b/docs/manual/adding-packages-rebar.adoc index d78b3171d8c..c2a5b0d0e9e 100644 --- a/docs/manual/adding-packages-rebar.adoc +++ b/docs/manual/adding-packages-rebar.adoc @@ -51,13 +51,9 @@ Just like the generic infrastructure, the +rebar+ infrastructure works by defining a number of variables before calling the +rebar-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the +rebar+ infrastructure: -+ERLANG_FOOBAR_VERSION+, +ERLANG_FOOBAR_SOURCE+, -+ERLANG_FOOBAR_PATCH+, +ERLANG_FOOBAR_SITE+, -+ERLANG_FOOBAR_SUBDIR+, +ERLANG_FOOBAR_DEPENDENCIES+, -+ERLANG_FOOBAR_INSTALL_STAGING+, +ERLANG_FOOBAR_INSTALL_TARGET+, -+ERLANG_FOOBAR_LICENSE+ and +ERLANG_FOOBAR_LICENSE_FILES+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the +rebar+ infrastructure. A few additional variables, specific to the +rebar+ infrastructure, can also be defined. Many of them are only useful in very specific diff --git a/docs/manual/adding-packages-waf.adoc b/docs/manual/adding-packages-waf.adoc index 101cddf1f13..7622c55a7b2 100644 --- a/docs/manual/adding-packages-waf.adoc +++ b/docs/manual/adding-packages-waf.adoc @@ -51,13 +51,11 @@ Just like the generic infrastructure, the Waf infrastructure works by defining a number of variables before calling the +waf-package+ macro. -First, all the package metadata information variables that exist in -the generic infrastructure also exist in the Waf infrastructure: -+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, -+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, -+LIBFOO_INSTALL_TARGET+. +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Waf infrastructure. -An additional variable, specific to the Waf infrastructure, can +A few additional variables, specific to the Waf infrastructure, can also be defined. * +LIBFOO_SUBDIR+ may contain the name of a subdirectory inside the From 362af615cd20dc7b4b0dd6fdcd7f2315a57de9a4 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 12 Jul 2024 20:23:24 +0200 Subject: [PATCH 2299/3013] docs/manual: normalize delimiters of listing blocks Although the asciidoc toolchain accepts any number of ~ to delimit a listing block (i.e. a code block), it is actually specified to be exactly four, i.e. ~~~~. Currently, a mix of diffrent numbers of ~ are being used - sometimes even a different number at the beginning and at the end of the block. Normalize this to always use exactly four ~ for the delimiter. Signed-off-by: Arnout Vandecappelle (cherry picked from commit 447fa1fca425e629cc65cd0a8261a4c09ddf67d2) Signed-off-by: Peter Korsgaard --- docs/manual/adding-board-support.adoc | 4 +- docs/manual/adding-packages-autotools.adoc | 4 +- docs/manual/adding-packages-cargo.adoc | 8 +- docs/manual/adding-packages-cmake.adoc | 4 +- docs/manual/adding-packages-directory.adoc | 60 ++++++------- docs/manual/adding-packages-generic.adoc | 28 +++---- docs/manual/adding-packages-golang.adoc | 4 +- docs/manual/adding-packages-hooks.adoc | 4 +- docs/manual/adding-packages-kconfig.adoc | 4 +- ...ding-packages-linux-kernel-spec-infra.adoc | 16 ++-- docs/manual/adding-packages-luarocks.adoc | 4 +- docs/manual/adding-packages-meson.adoc | 4 +- docs/manual/adding-packages-perl.adoc | 4 +- docs/manual/adding-packages-python.adoc | 24 +++--- docs/manual/adding-packages-qmake.adoc | 4 +- docs/manual/adding-packages-rebar.adoc | 4 +- docs/manual/adding-packages-tips.adoc | 12 +-- docs/manual/adding-packages-virtual.adoc | 24 +++--- docs/manual/adding-packages-waf.adoc | 4 +- docs/manual/beyond-buildroot.adoc | 16 ++-- docs/manual/ccache-support.adoc | 4 +- docs/manual/common-usage.adoc | 64 +++++++------- docs/manual/configure.adoc | 4 +- docs/manual/contribute.adoc | 84 +++++++++---------- .../manual/customize-directory-structure.adoc | 12 +-- docs/manual/customize-outside-br.adoc | 24 +++--- docs/manual/customize-packages.adoc | 8 +- docs/manual/download-location.adoc | 4 +- docs/manual/faq-troubleshooting.adoc | 4 +- docs/manual/getting.adoc | 8 +- docs/manual/legal-notice.adoc | 4 +- docs/manual/make-tips.adoc | 24 +++--- docs/manual/package-make-target.adoc | 4 +- docs/manual/patch-policy.adoc | 16 ++-- docs/manual/quickstart.adoc | 20 ++--- docs/manual/rebuilding-packages.adoc | 4 +- docs/manual/using-buildroot-debugger.adoc | 12 +-- docs/manual/using-buildroot-development.adoc | 24 +++--- docs/manual/writing-rules.adoc | 36 ++++---- 39 files changed, 298 insertions(+), 298 deletions(-) diff --git a/docs/manual/adding-board-support.adoc b/docs/manual/adding-board-support.adoc index ef6dbd3c2b9..9501262086a 100644 --- a/docs/manual/adding-board-support.adoc +++ b/docs/manual/adding-board-support.adoc @@ -51,10 +51,10 @@ Before submitting patches for new boards it is recommended to test it by building it using latest gitlab-CI docker container. To do this use +utils/docker-run+ script and inside it issue these commands: --------------------- +---- $ make _defconfig $ make --------------------- +---- By default, Buildroot developers use the official image hosted on the https://gitlab.com/buildroot.org/buildroot/container_registry/2395076[gitlab.com diff --git a/docs/manual/adding-packages-autotools.adoc b/docs/manual/adding-packages-autotools.adoc index c2b90f31eb6..a45d1652b59 100644 --- a/docs/manual/adding-packages-autotools.adoc +++ b/docs/manual/adding-packages-autotools.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for an autotools-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -26,7 +26,7 @@ package, with an example : 13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf 14: 15: $(eval $(autotools-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-cargo.adoc b/docs/manual/adding-packages-cargo.adoc index a2a15ed996a..1d476589f83 100644 --- a/docs/manual/adding-packages-cargo.adoc +++ b/docs/manual/adding-packages-cargo.adoc @@ -14,7 +14,7 @@ called "crates". The +Config.in+ file of Cargo-based package 'foo' should contain: ---------------------------- +---- 01: config BR2_PACKAGE_FOO 02: bool "foo" 03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS @@ -23,11 +23,11 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 06: This is a comment that explains what foo is. 07: 08: http://foosoftware.org/foo/ ---------------------------- +---- And the +.mk+ file for this package should contain: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -41,7 +41,7 @@ And the +.mk+ file for this package should contain: 11: FOO_LICENSE_FILES = COPYING 12: 13: $(eval $(cargo-package)) --------------------------------- +---- The Makefile starts with the definition of the standard variables for package declaration (lines 7 to 11). diff --git a/docs/manual/adding-packages-cmake.adoc b/docs/manual/adding-packages-cmake.adoc index e375e17d74f..845f54ad4b4 100644 --- a/docs/manual/adding-packages-cmake.adoc +++ b/docs/manual/adding-packages-cmake.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a CMake-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -26,7 +26,7 @@ with an example : 13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf 14: 15: $(eval $(cmake-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 0b7221aae0f..2039c2c7cc6 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -24,7 +24,7 @@ file will contain the option descriptions related to our +libfoo+ software that will be used and displayed in the configuration tool. It should basically contain: ---------------------------- +---- config BR2_PACKAGE_LIBFOO bool "libfoo" help @@ -32,7 +32,7 @@ config BR2_PACKAGE_LIBFOO should be wrapped. http://foosoftware.org/libfoo/ ---------------------------- +---- The +bool+ line, +help+ line and other metadata information about the configuration option must be indented with one tab. The help text @@ -64,9 +64,9 @@ put your package in one of the existing categories). The files included there are 'sorted alphabetically' per category and are 'NOT' supposed to contain anything but the 'bare' name of the package. --------------------------- +---- source "package/libfoo/Config.in" --------------------------- +---- ==== +Config.in.host+ file @@ -83,14 +83,14 @@ options here: the configuration menu. In this case, create a +Config.in.host+ file for that host package: + ---------------------------- +---- config BR2_PACKAGE_HOST_FOO bool "host foo" help This is a comment that explains what foo for the host is. http://foosoftware.org/foo/ ---------------------------- +---- + The same coding style and options as for the +Config.in+ file are valid. + @@ -98,9 +98,9 @@ Finally you have to add your new +libfoo/Config.in.host+ to +package/Config.in.host+. The files included there are 'sorted alphabetically' and are 'NOT' supposed to contain anything but the 'bare' name of the package. + --------------------------- +---- source "package/foo/Config.in.host" --------------------------- +---- + The host package will then be available from the +Host utilities+ menu. @@ -136,7 +136,7 @@ is not met. An example illustrates both the usage of +select+ and +depends on+. --------------------------- +---- config BR2_PACKAGE_RRDTOOL bool "rrdtool" depends on BR2_USE_WCHAR @@ -152,7 +152,7 @@ config BR2_PACKAGE_RRDTOOL comment "rrdtool needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR --------------------------- +---- Note that these two dependency types are only transitive with the @@ -160,7 +160,7 @@ dependencies of the same kind. This means, in the following example: --------------------------- +---- config BR2_PACKAGE_A bool "Package A" @@ -179,7 +179,7 @@ config BR2_PACKAGE_D config BR2_PACKAGE_E bool "Package E" select BR2_PACKAGE_D --------------------------- +---- * Selecting +Package C+ will be visible if +Package B+ has been selected, which in turn is only visible if +Package A+ has been @@ -193,7 +193,7 @@ config BR2_PACKAGE_E the dependency of +Package B+ on +Package A+. Therefore, in such a situation, the transitive dependency has to be added explicitly: --------------------------- +---- config BR2_PACKAGE_D bool "Package D" depends on BR2_PACKAGE_A @@ -203,7 +203,7 @@ config BR2_PACKAGE_E bool "Package E" depends on BR2_PACKAGE_A select BR2_PACKAGE_D --------------------------- +---- Overall, for package library dependencies, +select+ should be preferred. @@ -247,21 +247,21 @@ comment and other config options. The general format of a dependency +comment+ for package foo is: --------------------------- +---- foo needs a toolchain w/ featA, featB, featC --------------------------- +---- for example: --------------------------- +---- mpd needs a toolchain w/ C++, threads, wchar --------------------------- +---- or --------------------------- +---- crda needs a toolchain w/ threads --------------------------- +---- Note that this text is kept brief on purpose, so that it will fit on a 80-character terminal. @@ -358,32 +358,32 @@ typically kernel modules or firmware. A comment should be added in the Config.in file to express this dependency, similar to dependencies on toolchain options. The general format is: --------------------------- +---- foo needs a Linux kernel to be built --------------------------- +---- If there is a dependency on both toolchain options and the Linux kernel, use this format: --------------------------- +---- foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built --------------------------- +---- ==== Dependencies on udev /dev management If a package needs udev /dev management, it should depend on symbol +BR2_PACKAGE_HAS_UDEV+, and the following comment should be added: --------------------------- +---- foo needs udev /dev management --------------------------- +---- If there is a dependency on both toolchain options and udev /dev management, use this format: --------------------------- +---- foo needs udev /dev management and a toolchain w/ featA, featB, featC --------------------------- +---- ==== Dependencies on features provided by virtual packages @@ -578,7 +578,7 @@ not start before +S40network+. The scripts are started in alphabetical order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ start thereafter. ------------------------------- +---- 01: #!/bin/sh 02: 03: DAEMON="syslogd" @@ -634,7 +634,7 @@ start thereafter. 53: echo "Usage: $0 {start|stop|restart|reload}" 54: exit 1 55: esac ------------------------------- +---- *Note:* programs that support reloading their configuration in some fashion (+SIGHUP+) should provide a +reload()+ function similar to diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 9d365a10cae..89fc7004528 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -12,7 +12,7 @@ system is based on hand-written Makefiles or shell scripts. ==== +generic-package+ tutorial ------------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -56,7 +56,7 @@ system is based on hand-written Makefiles or shell scripts. 41: endef 42: 43: $(eval $(generic-package)) --------------------------------- +---- The Makefile begins on line 7 to 11 with metadata information: the version of the package (+LIBFOO_VERSION+), the name of the @@ -103,9 +103,9 @@ Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'. So its fixup would be: --------------------------------- +---- DIVINE_CONFIG_SCRIPTS = divine-config --------------------------------- +---- ================================ .Config script: 'imagemagick' package: @@ -115,11 +115,11 @@ Package imagemagick installs the following scripts: So it's fixup would be: --------------------------------- +---- IMAGEMAGICK_CONFIG_SCRIPTS = \ Magick-config Magick++-config \ MagickCore-config MagickWand-config Wand-config --------------------------------- +---- ================================ On line 14, we specify the list of dependencies this package relies @@ -166,10 +166,10 @@ for the host. It is possible to call both of them in a single +.mk+ file: once to create the rules to generate a target package and once to create the rules to generate a host package: ----------------------- +---- $(eval $(generic-package)) $(eval $(host-generic-package)) ----------------------- +---- This might be useful if the compilation of the target package requires some tools to be installed on the host. If the package name is @@ -504,12 +504,12 @@ not and can not work as people would expect it should: Buildroot package. A Makefile comment must always precede the addition of a CVE to this variable. Example: + ----------------------- +---- # 0001-fix-cve-2020-12345.patch LIBFOO_IGNORE_CVES += CVE-2020-12345 # only when built with libbaz, which Buildroot doesn't support LIBFOO_IGNORE_CVES += CVE-2020-54321 ----------------------- +---- * [[cpe-id]] +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the package to define its https://nvd.nist.gov/products/cpe[CPE @@ -551,9 +551,9 @@ corresponding target package. The recommended way to define these variables is to use the following syntax: ----------------------- +---- LIBFOO_VERSION = 2.32 ----------------------- +---- Now, the variables that define what should be performed at the different steps of the build process. @@ -633,13 +633,13 @@ different steps of the build process. The preferred way to define these variables is: ----------------------- +---- define LIBFOO_CONFIGURE_CMDS action 1 action 2 action 3 endef ----------------------- +---- In the action definitions, you can use the following variables: diff --git a/docs/manual/adding-packages-golang.adoc b/docs/manual/adding-packages-golang.adoc index 00b8bea285d..3ddbe57afe0 100644 --- a/docs/manual/adding-packages-golang.adoc +++ b/docs/manual/adding-packages-golang.adoc @@ -13,7 +13,7 @@ build system and use bundled dependencies. First, let's see how to write a +.mk+ file for a go package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -26,7 +26,7 @@ with an example : 10: FOO_LICENSE_FILES = LICENSE 11: 12: $(eval $(golang-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-hooks.adoc b/docs/manual/adding-packages-hooks.adoc index 741b71ca296..7aa7aa232dd 100644 --- a/docs/manual/adding-packages-hooks.adoc +++ b/docs/manual/adding-packages-hooks.adoc @@ -52,14 +52,14 @@ These variables are 'lists' of variable names containing actions to be performed at this hook point. This allows several hooks to be registered at a given hook point. Here is an example: ----------------------- +---- define LIBFOO_POST_PATCH_FIXUP action1 action2 endef LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP ----------------------- +---- [[hooks-rsync]] ==== Using the +POST_RSYNC+ hook diff --git a/docs/manual/adding-packages-kconfig.adoc b/docs/manual/adding-packages-kconfig.adoc index f2c40ed7a28..ee52cbd7370 100644 --- a/docs/manual/adding-packages-kconfig.adoc +++ b/docs/manual/adding-packages-kconfig.adoc @@ -30,11 +30,11 @@ In order to use the +kconfig-package+ infrastructure for a Buildroot package, the minimally required lines in the +.mk+ file, in addition to the variables required by the +generic-package+ infrastructure, are: ------------------------------- +---- FOO_KCONFIG_FILE = reference-to-source-configuration-file $(eval $(kconfig-package)) ------------------------------- +---- This snippet creates the following make targets: diff --git a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc index b948e208da8..3b3daebf557 100644 --- a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc +++ b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc @@ -22,7 +22,7 @@ Let's look at an example of a Linux tool. For a new Linux tool named descriptions related to each kernel tool that will be used and displayed in the configuration tool. It would basically look like: ------------------------------- +---- 01: config BR2_PACKAGE_LINUX_TOOLS_FOO 02: bool "foo" 03: select BR2_PACKAGE_LINUX_TOOLS @@ -30,7 +30,7 @@ displayed in the configuration tool. It would basically look like: 05: This is a comment that explains what foo kernel tool is. 06: 07: http://foosoftware.org/foo/ ------------------------------- +---- The name of the option starts with the prefix +BR2_PACKAGE_LINUX_TOOLS_+, followed by the uppercase name of the tool (like is done for packages). @@ -43,7 +43,7 @@ the `Target packages` main menu. Then for each linux tool, add a new +.mk.in+ file named +package/linux-tools/linux-tool-foo.mk.in+. It would basically look like: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -69,7 +69,7 @@ Then for each linux tool, add a new +.mk.in+ file named 23: DESTDIR=$(TARGET_DIR) \ 24: foo_install 25: endef --------------------------------- +---- On line 7, we register the Linux tool +foo+ to the list of available Linux tools. @@ -115,19 +115,19 @@ the existing +linux/Config.ext.in+. This file contains the option descriptions related to each kernel extension that will be used and displayed in the configuration tool. It would basically look like: ------------------------------- +---- 01: config BR2_LINUX_KERNEL_EXT_FOO 02: bool "foo" 03: help 04: This is a comment that explains what foo kernel extension is. 05: 06: http://foosoftware.org/foo/ ------------------------------- +---- Then for each linux extension, add a new +.mk+ file named +linux/linux-ext-foo.mk+. It should basically contain: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -139,7 +139,7 @@ Then for each linux extension, add a new +.mk+ file named 09: define FOO_PREPARE_KERNEL 10: $(FOO_DIR)/prepare-kernel-tree.sh --linux-dir=$(@D) 11: endef --------------------------------- +---- On line 7, we add the Linux extension +foo+ to the list of available Linux extensions. diff --git a/docs/manual/adding-packages-luarocks.adoc b/docs/manual/adding-packages-luarocks.adoc index 9ced6c55046..e9d47175686 100644 --- a/docs/manual/adding-packages-luarocks.adoc +++ b/docs/manual/adding-packages-luarocks.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a LuaRocks-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # lua-foo @@ -27,7 +27,7 @@ with an example : 14: LUA_FOO_LICENSE_FILES = $(LUA_FOO_SUBDIR)/COPYING 15: 16: $(eval $(luarocks-package)) ------------------------- +---- On line 7, we declare the version of the package (the same as in the rockspec, which is the concatenation of the upstream version and the rockspec revision, diff --git a/docs/manual/adding-packages-meson.adoc b/docs/manual/adding-packages-meson.adoc index 8c0f84709f8..16135b12978 100644 --- a/docs/manual/adding-packages-meson.adoc +++ b/docs/manual/adding-packages-meson.adoc @@ -14,7 +14,7 @@ build operations. Let's see how to write a +.mk+ file for a Meson-based package, with an example: ------------------------------- +---- 01: ################################################################################ 02: # 03: # foo @@ -38,7 +38,7 @@ Let's see how to write a +.mk+ file for a Meson-based package, with an example: 21: endif 22: 23: $(eval $(meson-package)) --------------------------------- +---- The Makefile starts with the definition of the standard variables for package declaration (lines 7 to 11). diff --git a/docs/manual/adding-packages-perl.adoc b/docs/manual/adding-packages-perl.adoc index 7c60a1a4a7e..405931770c2 100644 --- a/docs/manual/adding-packages-perl.adoc +++ b/docs/manual/adding-packages-perl.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a Perl/CPAN package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # perl-foo-bar @@ -26,7 +26,7 @@ with an example : 13: PERL_FOO_BAR_DISTNAME = Foo-Bar 14: 15: $(eval $(perl-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 7cb36357928..f33770f95c6 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -15,7 +15,7 @@ system, generally recognizable by the usage of a +setup.py+ script or First, let's see how to write a +.mk+ file for a Python package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # python-foo @@ -32,7 +32,7 @@ with an example : 14: PYTHON_FOO_SETUP_TYPE = setuptools 15: 16: $(eval $(python-package)) ------------------------- +---- On line 7, we declare the version of the package. @@ -170,9 +170,9 @@ your host. When at the root of your buildroot directory just do : ------------------------ +---- utils/scanpypi foo bar -o package ------------------------ +---- This will generate packages +python-foo+ and +python-bar+ in the package folder if they exist on https://pypi.python.org. @@ -190,18 +190,18 @@ need to manually add the package to the +package/Config.in+ file. If your Buildroot package is not in the official Buildroot tree but in a br2-external tree, use the -o flag as follows: ------------------------ +---- utils/scanpypi foo bar -o other_package_dir ------------------------ +---- This will generate packages +python-foo+ and +python-bar+ in the +other_package_directory+ instead of +package+. Option +-h+ will list the available options: ------------------------ +---- utils/scanpypi -h ------------------------ +---- [[python-package-cffi-backend]] @@ -219,17 +219,17 @@ Such a package should: compiled C library wrapper on the target. This is achieved by adding +select BR2_PACKAGE_PYTHON_CFFI+ to the package +Config.in+. ------------------------- +---- config BR2_PACKAGE_PYTHON_FOO bool "python-foo" select BR2_PACKAGE_PYTHON_CFFI # runtime ------------------------- +---- * add +host-python-cffi+ as a build-time dependency in order to cross-compile the C wrapper. This is achieved by adding +host-python-cffi+ to the +PYTHON_FOO_DEPENDENCIES+ variable. ------------------------- +---- ################################################################################ # # python-foo @@ -241,4 +241,4 @@ cross-compile the C wrapper. This is achieved by adding PYTHON_FOO_DEPENDENCIES = host-python-cffi $(eval $(python-package)) ------------------------- +---- diff --git a/docs/manual/adding-packages-qmake.adoc b/docs/manual/adding-packages-qmake.adoc index 0205f6ca293..e09da166b90 100644 --- a/docs/manual/adding-packages-qmake.adoc +++ b/docs/manual/adding-packages-qmake.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a QMake-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -24,7 +24,7 @@ an example : 11: LIBFOO_DEPENDENCIES = bar 12: 13: $(eval $(qmake-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-rebar.adoc b/docs/manual/adding-packages-rebar.adoc index c2a5b0d0e9e..d2ed67c4741 100644 --- a/docs/manual/adding-packages-rebar.adoc +++ b/docs/manual/adding-packages-rebar.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a rebar-based package, with an example : ------------------------------- +---- 01: ################################################################################ 02: # 03: # erlang-foobar @@ -23,7 +23,7 @@ with an example : 10: ERLANG_FOOBAR_DEPENDENCIES = host-libaaa libbbb 11: 12: $(eval $(rebar-package)) --------------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/adding-packages-tips.adoc b/docs/manual/adding-packages-tips.adoc index d8c2eceb105..b04b42b51f9 100644 --- a/docs/manual/adding-packages-tips.adoc +++ b/docs/manual/adding-packages-tips.adoc @@ -172,11 +172,11 @@ However, it is possible to download tarballs directly from the repository on GitHub. As GitHub is known to have changed download mechanisms in the past, the 'github' helper function should be used as shown below. ------------------------- +---- # Use a tag or a full commit ID FOO_VERSION = 1.0 FOO_SITE = $(call github,,,v$(FOO_VERSION)) ------------------------- +---- .Notes - The FOO_VERSION can either be a tag or a commit ID. @@ -220,22 +220,22 @@ to download from Gitlab repositories. It can be used to download auto-generated tarballs produced by Gitlab, either for specific tags or commits: ------------------------- +---- # Use a tag or a full commit ID FOO_VERSION = 1.0 FOO_SITE = $(call gitlab,,,v$(FOO_VERSION)) ------------------------- +---- By default, it will use a +.tar.gz+ tarball, but Gitlab also provides +.tar.bz2+ tarballs, so by adding a +_SOURCE+ variable, this +.tar.bz2+ tarball can be used: ------------------------- +---- # Use a tag or a full commit ID FOO_VERSION = 1.0 FOO_SITE = $(call gitlab,,,v$(FOO_VERSION)) FOO_SOURCE = foo-$(FOO_VERSION).tar.bz2 ------------------------- +---- If there is a specific tarball uploaded by the upstream developers in +https://gitlab.com//releases/+, do not use this macro, but diff --git a/docs/manual/adding-packages-virtual.adoc b/docs/manual/adding-packages-virtual.adoc index 722e6e3771f..297e189186d 100644 --- a/docs/manual/adding-packages-virtual.adoc +++ b/docs/manual/adding-packages-virtual.adoc @@ -26,14 +26,14 @@ First, let's create the virtual package. The +Config.in+ file of virtual package 'something-virtual' should contain: ---------------------------- +---- 01: config BR2_PACKAGE_HAS_SOMETHING_VIRTUAL 02: bool 03: 04: config BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL 05: depends on BR2_PACKAGE_HAS_SOMETHING_VIRTUAL 06: string ---------------------------- +---- In this file, we declare two options, +BR2_PACKAGE_HAS_SOMETHING_VIRTUAL+ and +BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL+, whose values will be used by the @@ -43,7 +43,7 @@ providers. The +.mk+ for the virtual package should just evaluate the +virtual-package+ macro: ---------------------------- +---- 01: ################################################################################ 02: # 03: # something-virtual @@ -51,7 +51,7 @@ The +.mk+ for the virtual package should just evaluate the +virtual-package+ mac 05: ################################################################################ 06: 07: $(eval $(virtual-package)) ---------------------------- +---- The ability to have target and host packages is also available, with the +host-virtual-package+ macro. @@ -64,7 +64,7 @@ modifications. The +Config.in+ file of the package 'some-provider', which provides the functionalities of 'something-virtual', should contain: ---------------------------- +---- 01: config BR2_PACKAGE_SOME_PROVIDER 02: bool "some-provider" 03: select BR2_PACKAGE_HAS_SOMETHING_VIRTUAL @@ -77,7 +77,7 @@ functionalities of 'something-virtual', should contain: 10: config BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL 11: default "some-provider" 12: endif ---------------------------- +---- On line 3, we select +BR2_PACKAGE_HAS_SOMETHING_VIRTUAL+, and on line 11, we set the value of +BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL+ to the name of the @@ -89,9 +89,9 @@ The +.mk+ file should also declare an additional variable +SOME_PROVIDER_PROVIDES+ to contain the names of all the virtual packages it is an implementation of: ---------------------------- +---- 01: SOME_PROVIDER_PROVIDES = something-virtual ---------------------------- +---- Of course, do not forget to add the proper build and runtime dependencies for this package! @@ -101,14 +101,14 @@ this package! When adding a package that requires a certain +FEATURE+ provided by a virtual package, you have to use +depends on BR2_PACKAGE_HAS_FEATURE+, like so: ---------------------------- +---- config BR2_PACKAGE_HAS_FEATURE bool config BR2_PACKAGE_FOO bool "foo" depends on BR2_PACKAGE_HAS_FEATURE ---------------------------- +---- ==== Notes on depending on a specific provider @@ -118,7 +118,7 @@ provider. Let's take an example with two providers for a +FEATURE+: ---------------------------- +---- config BR2_PACKAGE_HAS_FEATURE bool @@ -129,7 +129,7 @@ config BR2_PACKAGE_FOO config BR2_PACKAGE_BAR bool "bar" select BR2_PACKAGE_HAS_FEATURE ---------------------------- +---- And you are adding a package that needs +FEATURE+ as provided by +foo+, but not as provided by +bar+. diff --git a/docs/manual/adding-packages-waf.adoc b/docs/manual/adding-packages-waf.adoc index 7622c55a7b2..59029172145 100644 --- a/docs/manual/adding-packages-waf.adoc +++ b/docs/manual/adding-packages-waf.adoc @@ -10,7 +10,7 @@ First, let's see how to write a +.mk+ file for a Waf-based package, with an example : ------------------------- +---- 01: ################################################################################ 02: # 03: # libfoo @@ -24,7 +24,7 @@ an example : 11: LIBFOO_DEPENDENCIES = bar 12: 13: $(eval $(waf-package)) ------------------------- +---- On line 7, we declare the version of the package. diff --git a/docs/manual/beyond-buildroot.adoc b/docs/manual/beyond-buildroot.adoc index eefea1fecf7..871b591a02c 100644 --- a/docs/manual/beyond-buildroot.adoc +++ b/docs/manual/beyond-buildroot.adoc @@ -13,9 +13,9 @@ images_ menu. After a complete build, just run the following commands to setup the NFS-root directory: -------------------- +---- sudo tar -xavf /path/to/output_dir/rootfs.tar -C /path/to/nfs_root_dir -------------------- +---- Remember to add this path to +/etc/exports+. @@ -34,21 +34,21 @@ as a live CD and live USB (through the _Build hybrid image_ option). You can test your live CD image using QEMU: -------------------- +---- qemu-system-i386 -cdrom output/images/rootfs.iso9660 -------------------- +---- Or use it as a hard-drive image if it is a hybrid ISO: -------------------- +---- qemu-system-i386 -hda output/images/rootfs.iso9660 -------------------- +---- It can be easily flashed to a USB drive with +dd+: -------------------- +---- dd if=output/images/rootfs.iso9660 of=/dev/sdb -------------------- +---- === Chroot diff --git a/docs/manual/ccache-support.adoc b/docs/manual/ccache-support.adoc index ab4f10be23c..86cb4a150dc 100644 --- a/docs/manual/ccache-support.adoc +++ b/docs/manual/ccache-support.adoc @@ -28,13 +28,13 @@ misses, etc.) by running +make ccache-stats+. The make target +ccache-options+ and the +CCACHE_OPTIONS+ variable provide more generic access to the ccache. For example ------------------ +---- # set cache limit size make CCACHE_OPTIONS="--max-size=5G" ccache-options # zero statistics counters make CCACHE_OPTIONS="--zero-stats" ccache-options ------------------ +---- +ccache+ makes a hash of the source files and of the compiler options. If a compiler option is different, the cached object file will not be diff --git a/docs/manual/common-usage.adoc b/docs/manual/common-usage.adoc index e0ab1a9f660..43caa3a9bc8 100644 --- a/docs/manual/common-usage.adoc +++ b/docs/manual/common-usage.adoc @@ -13,9 +13,9 @@ If you intend to do an offline build and just want to download all sources that you previously selected in the configurator ('menuconfig', 'nconfig', 'xconfig' or 'gconfig'), then issue: --------------------- +---- $ make source --------------------- +---- You can now disconnect or copy the content of your +dl+ directory to the build-host. @@ -29,15 +29,15 @@ Buildroot also supports building out of tree with a syntax similar to the Linux kernel. To use it, add +O=+ to the make command line: --------------------- +---- $ make O=/tmp/build menuconfig --------------------- +---- Or: --------------------- +---- $ cd /tmp/build; make O=$PWD -C path/to/buildroot menuconfig --------------------- +---- All the output files will be located under +/tmp/build+. If the +O+ path does not exist, Buildroot will create it. @@ -56,9 +56,9 @@ For ease of use, Buildroot generates a Makefile wrapper in the output directory - so after the first run, you no longer need to pass +O=<...>+ and +-C <...>+, simply run (in the output directory): --------------------- +---- $ make --------------------- +---- [[env-vars]] @@ -108,16 +108,16 @@ to +make+ or set in the environment: An example that uses config files located in the toplevel directory and in your $HOME: --------------------- +---- $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config --------------------- +---- If you want to use a compiler other than the default +gcc+ or +g+++ for building helper-binaries on your host, then do --------------------- +---- $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD --------------------- +---- === Dealing efficiently with filesystem images @@ -166,9 +166,9 @@ packages in the current configuration, together with their dependencies, licenses and other metadata. This JSON blurb is produced by using the +show-info+ make target: ------------------------- +---- make show-info ------------------------- +---- Buildroot can also produce details about packages as HTML and JSON output using the +pkg-stats+ make target. Amongst other things, these @@ -176,9 +176,9 @@ details include whether known CVEs (security vulnerabilities) affect the packages in your current configuration. It also shows if there is a newer upstream version for those packages. ------------------------- +---- make pkg-stats ------------------------- +---- === Graphing the dependencies between packages @@ -198,9 +198,9 @@ graphs. To generate a dependency graph of the full system you have compiled, simply run: ------------------------- +---- make graph-depends ------------------------- +---- You will find the generated graph in +output/graphs/graph-depends.pdf+. @@ -209,9 +209,9 @@ If your system is quite large, the dependency graph may be too complex and difficult to read. It is therefore possible to generate the dependency graph just for a given package: ------------------------- +---- make -graph-depends ------------------------- +---- You will find the generated graph in +output/graph/-graph-depends.pdf+. @@ -227,9 +227,9 @@ can switch to other output formats, such as PNG, PostScript or SVG. All formats supported by the +-T+ option of the +dot+ tool are supported. --------------------------------- +---- BR2_GRAPH_OUT=svg make graph-depends --------------------------------- +---- The +graph-depends+ behaviour can be controlled by setting options in the +BR2_GRAPH_DEPS_OPTS+ environment variable. The accepted options are: @@ -253,9 +253,9 @@ The +graph-depends+ behaviour can be controlled by setting options in the root package (+R+), the target packages (+T+) and the host packages (+H+). Defaults to: +lightblue,grey,gainsboro+ --------------------------------- +---- BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colors=red,green,blue' make graph-depends --------------------------------- +---- === Graphing the build duration @@ -269,9 +269,9 @@ step of each package, and allows to generate graphs from this data. To generate the build time graph after a build, run: ----------------- +---- make graph-build ----------------- +---- This will generate a set of files in +output/graphs+ : @@ -299,9 +299,9 @@ By default, the output format for the graph is PDF, but a different format can be selected using the +BR2_GRAPH_OUT+ environment variable. The only other format supported is PNG: ----------------- +---- BR2_GRAPH_OUT=png make graph-build ----------------- +---- [[graph-size]] === Graphing the filesystem size contribution of packages @@ -315,9 +315,9 @@ the different packages. To generate these data after a build, run: ----------------- +---- make graph-size ----------------- +---- This will generate: @@ -366,9 +366,9 @@ Buildroot release, use the +size-stats-compare+ script. It takes two +file-size-stats.csv+ files (produced by +make graph-size+) as input. Refer to the help text of this script for more details: ----------------- +---- utils/size-stats-compare -h ----------------- +---- [[top-level-parallel-build]] === Top-level parallel build diff --git a/docs/manual/configure.adoc b/docs/manual/configure.adoc index 60860d2c716..d27cdf3eb96 100644 --- a/docs/manual/configure.adoc +++ b/docs/manual/configure.adoc @@ -252,9 +252,9 @@ Then, we can trigger the build, and also ask Buildroot to generate a SDK. This will conveniently generate for us a tarball which contains our toolchain: ------ +---- make sdk ------ +---- This produces the SDK tarball in +$(O)/images+, with a name similar to +arm-buildroot-linux-uclibcgnueabi_sdk-buildroot.tar.gz+. Save this diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 6ff6c153147..1801a53d2f0 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -72,9 +72,9 @@ basically two things that can be done: can be removed. In the commit message of a patch fixing an autobuild failure, add a reference to the build result directory, as follows: ---------------------- +---- Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 ---------------------- +---- === Reviewing and testing patches @@ -153,10 +153,10 @@ When browsing patches in the patchwork management interface, an +mbox+ link is provided at the top of the page. Copy this link address and run the following commands: ---------------------- +---- $ git checkout -b $ wget -O - | git am ---------------------- +---- Another option for applying patches is to create a bundle. A bundle is a set of patches that you can group together using the patchwork @@ -306,24 +306,24 @@ Starting from the changes committed in your local git view, _rebase_ your development branch on top of the upstream tree before generating a patch set. To do so, run: ---------------------- +---- $ git fetch --all --tags $ git rebase origin/master ---------------------- +---- Now check the coding style for the changes you committed: ---------------------- +---- $ utils/docker-run make check-package ---------------------- +---- Now, you are ready to generate then submit your patch set. To generate it, run: ---------------------- +---- $ git format-patch -M -n -s -o outgoing origin/master ---------------------- +---- This will generate patch files in the +outgoing+ subdirectory, automatically adding the +Signed-off-by+ line. @@ -336,37 +336,37 @@ sent, called +get-developers+ (see xref:DEVELOPERS[] for more information). This tool reads your patches and outputs the appropriate +git send-email+ command to use: ---------------------- +---- $ ./utils/get-developers outgoing/* ---------------------- +---- Use the output of +get-developers+ to send your patches: ---------------------- +---- $ git send-email --to buildroot@buildroot.org --cc bob --cc alice outgoing/* ---------------------- +---- Alternatively, +get-developers -e+ can be used directly with the +--cc-cmd+ argument to +git send-email+ to automatically CC the affected developers: ---------------------- +---- $ git send-email --to buildroot@buildroot.org \ --cc-cmd './utils/get-developers -e' origin/master ---------------------- +---- +git+ can be configured to automatically do this out of the box with: ---------------------- +---- $ git config sendemail.to buildroot@buildroot.org $ git config sendemail.ccCmd "$(pwd)/utils/get-developers -e" ---------------------- +---- And then just do: ---------------------- +---- $ git send-email origin/master ---------------------- +---- Note that +git+ should be configured to use your mail account. To configure +git+, see +man git-send-email+ or https://git-send-email.io/. @@ -427,10 +427,10 @@ should be based off the maintenance branch, and the patch subject prefix must include the maintenance branch name (for example "[PATCH 2020.02.x]"). This can be done with the +git format-patch+ flag +--subject-prefix+: ---------------------- +---- $ git format-patch --subject-prefix "PATCH 2020.02.x" \ -M -s -o outgoing origin/2020.02.x ---------------------- +---- Then send the patches with +git send-email+, as described above. @@ -458,7 +458,7 @@ be preserved forever in the +git+ history of the project. Hereafter the recommended layout: ---------------- +---- Patch title: short explanation, max 72 chars A paragraph that explains the problem, and how it manifests itself. If @@ -481,7 +481,7 @@ Changes v2 -> v3: Changes v1 -> v2: - alpha bravo (suggested by John) - charly delta ---------------- +---- Any patch revision should include the version number. The version number is simply composed of the letter +v+ followed by an +integer+ greater or @@ -490,17 +490,17 @@ equal to two (i.e. "PATCH v2", "PATCH v3" ...). This can be easily handled with +git format-patch+ by using the option +--subject-prefix+: ---------------------- +---- $ git format-patch --subject-prefix "PATCH v4" \ -M -s -o outgoing origin/master ---------------------- +---- Since git version 1.8.1, you can also use +-v + (where is the version number): ---------------------- +---- $ git format-patch -v4 -M -s -o outgoing origin/master ---------------------- +---- When you provide a new version of a patch, please mark the old one as superseded in @@ -579,7 +579,7 @@ cases can be listed by executing +support/testing/run-tests -l+. These tests can all be run individually during test development from the console. Both one at a time and selectively as a group of a subset of tests. ---------------------- +---- $ support/testing/run-tests -l List of tests test_run (tests.utils.test_check_package.TestCheckPackage) @@ -606,11 +606,11 @@ test_run (tests.init.test_busybox.TestInitSystemBusyboxRwNet) ... ok Ran 157 tests in 0.021s OK ---------------------- +---- * Then, to run one test case: ---------------------- +---- $ support/testing/run-tests -d dl -o output_folder -k tests.init.test_busybox.TestInitSystemBusyboxRw 15:03:26 TestInitSystemBusyboxRw Starting 15:03:28 TestInitSystemBusyboxRw Building @@ -620,7 +620,7 @@ $ support/testing/run-tests -d dl -o output_folder -k tests.init.test_busybox.Te Ran 1 test in 301.140s OK ---------------------- +---- The standard output indicates if the test is successful or not. By default, the output folder for the test is deleted automatically @@ -674,12 +674,12 @@ be the maintainer of that test case. When a test case runs, the +output_folder+ will contain the following: ---------------------- +---- $ ls output_folder/ TestInitSystemBusyboxRw/ TestInitSystemBusyboxRw-build.log TestInitSystemBusyboxRw-run.log ---------------------- +---- +TestInitSystemBusyboxRw/+ is the Buildroot output directory, and it is preserved only if the +-k+ option is passed. @@ -721,28 +721,28 @@ arbitrary string you choose. * To trigger all run-test test case jobs, push a branch that ends with +-runtime-tests+: ---------------------- +---- $ git push gitlab HEAD:-runtime-tests ---------------------- +---- * To trigger one or several test case jobs, push a branch that ends with the complete test case name (+tests.init.test_busybox.TestInitSystemBusyboxRo+) or with the name of a category of tests (+tests.init.test_busybox+): ---------------------- +---- $ git push gitlab HEAD:- ---------------------- +---- Example to run one test: ---------------------- +---- $ git push gitlab HEAD:foo-tests.init.test_busybox.TestInitSystemBusyboxRo ---------------------- +---- Examples to run several tests part of the same group: ---------------------- +---- $ git push gitlab HEAD:foo-tests.init.test_busybox $ git push gitlab HEAD:foo-tests.init ---------------------- +---- diff --git a/docs/manual/customize-directory-structure.adoc b/docs/manual/customize-directory-structure.adoc index 1249421da2f..e0eecb56417 100644 --- a/docs/manual/customize-directory-structure.adoc +++ b/docs/manual/customize-directory-structure.adoc @@ -16,7 +16,7 @@ this structure itself: either inside the Buildroot tree, or outside of it using a br2-external tree. Both options are valid, the choice is up to you. ------ +---- +-- board/ | +-- / | +-- / @@ -51,7 +51,7 @@ to you. +-- Config.in (if using a br2-external tree) +-- external.mk (if using a br2-external tree) +-- external.desc (if using a br2-external tree) ------- +---- Details on the files shown above are given further in this chapter. @@ -79,7 +79,7 @@ more than two layers. An example directory structure for where a user has two customization layers 'common' and 'fooboard' is: ------ +---- +-- board/ +-- / +-- common/ @@ -98,14 +98,14 @@ layers 'common' and 'fooboard' is: | +-- ... +-- patches/ +-- ... ------ +---- For example, if the user has the +BR2_GLOBAL_PATCH_DIR+ configuration option set as: ------ +---- BR2_GLOBAL_PATCH_DIR="board//common/patches board//fooboard/patches" ------ +---- then first the patches from the 'common' layer would be applied, followed by the patches from the 'fooboard' layer. diff --git a/docs/manual/customize-outside-br.adoc b/docs/manual/customize-outside-br.adoc index 348f2b089ce..5e653f1603e 100644 --- a/docs/manual/customize-outside-br.adoc +++ b/docs/manual/customize-outside-br.adoc @@ -40,23 +40,23 @@ xref:br2-external-converting[] for help on doing so. Some examples: ------ +---- buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig ------ +---- From now on, definitions from the +/path/to/foo+ br2-external tree will be used: ------ +---- buildroot/ $ make buildroot/ $ make legal-info ------ +---- We can switch to another br2-external tree at any time: ------ +---- buildroot/ $ make BR2_EXTERNAL=/where/we/have/bar xconfig ------ +---- We can also use multiple br2-external trees: @@ -66,9 +66,9 @@ buildroot/ $ make BR2_EXTERNAL=/path/to/foo:/where/we/have/bar menuconfig Or disable the usage of any br2-external tree: ------ +---- buildroot/ $ make BR2_EXTERNAL= xconfig ------ +---- ==== Layout of a br2-external tree @@ -152,16 +152,16 @@ makefile logic. The main usage of this is to store package recipes. The recommended way to do this is to write a +Config.in+ file that looks like: ------- +---- source "$BR2_EXTERNAL_BAR_42_PATH/package/package1/Config.in" source "$BR2_EXTERNAL_BAR_42_PATH/package/package2/Config.in" ------- +---- Then, have an +external.mk+ file that looks like: ------- +---- include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) ------- +---- And then in +$(BR2_EXTERNAL_BAR_42_PATH)/package/package1+ and +$(BR2_EXTERNAL_BAR_42_PATH)/package/package2+ create normal diff --git a/docs/manual/customize-packages.adoc b/docs/manual/customize-packages.adoc index b57280ea10d..af2fd13debd 100644 --- a/docs/manual/customize-packages.adoc +++ b/docs/manual/customize-packages.adoc @@ -34,19 +34,19 @@ includes these additional +.mk+ files. Therefore, create a file +package//.mk+ with following contents (assuming you have only one extra directory level below +package//+): ------ +---- include $(sort $(wildcard package//*/*.mk)) ------ +---- For the +Config.in+ files, create a file +package//Config.in+ that includes the +Config.in+ files of all your packages. An exhaustive list has to be provided since wildcards are not supported in the source command of kconfig. For example: ------ +---- source "package//package1/Config.in" source "package//package2/Config.in" ------ +---- Include this new file +package//Config.in+ from +package/Config.in+, preferably in a company-specific menu to make diff --git a/docs/manual/download-location.adoc b/docs/manual/download-location.adoc index d485df94f59..b2c527ad050 100644 --- a/docs/manual/download-location.adoc +++ b/docs/manual/download-location.adoc @@ -18,9 +18,9 @@ shared download location. This can be achieved by pointing the set, then the value of +BR2_DL_DIR+ in the Buildroot configuration is overridden. The following line should be added to +<~/.bashrc>+. ------------------ +---- export BR2_DL_DIR= ------------------ +---- The download location can also be set in the +.config+ file, with the +BR2_DL_DIR+ option. Unlike most options in the .config file, this value diff --git a/docs/manual/faq-troubleshooting.adoc b/docs/manual/faq-troubleshooting.adoc index a61276d4c56..5f132f99f6c 100644 --- a/docs/manual/faq-troubleshooting.adoc +++ b/docs/manual/faq-troubleshooting.adoc @@ -10,12 +10,12 @@ If the boot process seems to hang after the following messages (messages not necessarily exactly similar, depending on the list of packages selected): ------------------------- +---- Freeing init memory: 3972K Initializing random number generator... done. Starting network... Starting dropbear sshd: generating rsa key... generating dsa key... OK ------------------------- +---- then it means that your system is running, but didn't start a shell on the serial console. In order to have the system start a shell on your diff --git a/docs/manual/getting.adoc b/docs/manual/getting.adoc index 549938a223d..51c97d57931 100644 --- a/docs/manual/getting.adoc +++ b/docs/manual/getting.adoc @@ -18,17 +18,17 @@ get started. If you want to setup an isolated buildroot environment on Linux or Mac Os X, paste this line onto your terminal: --------------------- +---- curl -O https://buildroot.org/downloads/Vagrantfile; vagrant up --------------------- +---- If you are on Windows, paste this into your powershell: --------------------- +---- (new-object System.Net.WebClient).DownloadFile( "https://buildroot.org/downloads/Vagrantfile","Vagrantfile"); vagrant up --------------------- +---- If you want to follow development, you can use the daily snapshots or make a clone of the Git repository. Refer to the diff --git a/docs/manual/legal-notice.adoc b/docs/manual/legal-notice.adoc index 179aa6b1798..495c5ffe9c4 100644 --- a/docs/manual/legal-notice.adoc +++ b/docs/manual/legal-notice.adoc @@ -24,9 +24,9 @@ To make this easier for you, Buildroot can collect for you some material you will probably need. To produce this material, after you have configured Buildroot with +make menuconfig+, +make xconfig+ or +make gconfig+, run: --------------------- +---- make legal-info --------------------- +---- Buildroot will collect legally-relevant material in your output directory, under the +legal-info/+ subdirectory. diff --git a/docs/manual/make-tips.adoc b/docs/manual/make-tips.adoc index df3b888c25e..4ccb460525e 100644 --- a/docs/manual/make-tips.adoc +++ b/docs/manual/make-tips.adoc @@ -8,21 +8,21 @@ This is a collection of tips that help you make the most of Buildroot. .Display all commands executed by make: --------------------- +---- $ make V=1 --------------------- +---- .Display the list of boards with a defconfig: --------------------- +---- $ make list-defconfigs --------------------- +---- .Display all available targets: --------------------- +---- $ make help --------------------- +---- Not all targets are always available, some settings in the +.config+ file may hide some targets: @@ -46,19 +46,19 @@ configuration options are changed. To delete all build products (including build directories, host, staging and target trees, the images and the toolchain): --------------------- +---- $ make clean --------------------- +---- .Generating the manual: The present manual sources are located in the 'docs/manual' directory. To generate the manual: ---------------------------------- +---- $ make manual-clean $ make manual ---------------------------------- +---- The manual outputs will be generated in 'output/docs/manual'. @@ -70,9 +70,9 @@ The manual outputs will be generated in 'output/docs/manual'. To delete all build products as well as the configuration: --------------------- +---- $ make distclean --------------------- +---- .Notes If +ccache+ is enabled, running +make clean+ or +distclean+ does diff --git a/docs/manual/package-make-target.adoc b/docs/manual/package-make-target.adoc index 795c7d46dee..90a7910e23e 100644 --- a/docs/manual/package-make-target.adoc +++ b/docs/manual/package-make-target.adoc @@ -12,9 +12,9 @@ For packages relying on the Buildroot infrastructure, there are numerous special make targets that can be called independently like this: ------------- +---- make - ------------- +---- The package build targets are (in the order they are executed): diff --git a/docs/manual/patch-policy.adoc b/docs/manual/patch-policy.adoc index dc35132ecfd..a4bc5f391ab 100644 --- a/docs/manual/patch-policy.adoc +++ b/docs/manual/patch-policy.adoc @@ -122,7 +122,7 @@ removed, but do update the rest of the patch comment when appropriate. At the end, the patch should look like: ---------------- +---- configure.ac: add C++ support test Signed-off-by: John Doe @@ -142,7 +142,7 @@ AC_PROG_MAKE_SET + AC_LANG_POP([C++])]) + +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) ---------------- +---- === Additional patch documentation @@ -152,17 +152,17 @@ applicable, via the +Upstream+ trailer. When backporting an upstream patch that has been accepted into mainline, it is preferred that the URL to the commit is referenced: ---------------- +---- Upstream: ---------------- +---- If a new issue is identified in Buildroot and upstream is generally affected by the issue (it's not a Buildroot specific issue), users should submit the patch upstream and provide a link to that submission when possible: ---------------- +---- Upstream: ---------------- +---- Patches that have been submitted but were denied upstream should note that and include comments about why the patch is being used despite the upstream status. @@ -172,9 +172,9 @@ about any changes to the patch that may have been necessary. If a patch does not apply upstream then this should be noted with a comment: ---------------- +---- Upstream: N/A ---------------- +---- Adding this documentation helps streamline the patch review process during package version updates. \ No newline at end of file diff --git a/docs/manual/quickstart.adoc b/docs/manual/quickstart.adoc index 80569e85f40..605031037f9 100644 --- a/docs/manual/quickstart.adoc +++ b/docs/manual/quickstart.adoc @@ -15,27 +15,27 @@ http://www.busybox.net/[BusyBox]. From the buildroot directory, run --------------------- +---- $ make menuconfig --------------------- +---- for the original curses-based configurator, or --------------------- +---- $ make nconfig --------------------- +---- for the new curses-based configurator, or --------------------- +---- $ make xconfig --------------------- +---- for the Qt-based configurator, or --------------------- +---- $ make gconfig --------------------- +---- for the GTK-based configurator. @@ -56,9 +56,9 @@ read by the top-level Makefile. To start the build process, simply run: --------------------- +---- $ make --------------------- +---- By default, Buildroot does not support top-level parallel build, so running +make -jN+ is not necessary. There is however experimental diff --git a/docs/manual/rebuilding-packages.adoc b/docs/manual/rebuilding-packages.adoc index 06d3855148d..0658a93b303 100644 --- a/docs/manual/rebuilding-packages.adoc +++ b/docs/manual/rebuilding-packages.adoc @@ -86,9 +86,9 @@ necessary, and you will save more and more time. For reference, a full rebuild is achieved by running: ---------------- +---- $ make clean all ---------------- +---- [[rebuild-pkg]] === Understanding how to rebuild packages diff --git a/docs/manual/using-buildroot-debugger.adoc b/docs/manual/using-buildroot-debugger.adoc index 9a8a7dfbaf9..c208e86bbdc 100644 --- a/docs/manual/using-buildroot-debugger.adoc +++ b/docs/manual/using-buildroot-debugger.adoc @@ -24,9 +24,9 @@ To achieve this: Now, to start debugging a program called +foo+, you should run on the target: ----------------------------- +---- gdbserver :2345 foo ----------------------------- +---- This will cause +gdbserver+ to listen on TCP port 2345 for a connection from the cross gdb. @@ -34,9 +34,9 @@ from the cross gdb. Then, on the host, you should start the cross gdb using the following command line: ----------------------------- +---- /output/host/bin/-gdb -ix /output/staging/usr/share/buildroot/gdbinit foo ----------------------------- +---- Of course, +foo+ must be available in the current directory, built with debugging symbols. Typically you start this command from the @@ -48,6 +48,6 @@ cross gdb where to find the libraries of the target. Finally, to connect to the target from the cross gdb: ----------------------------- +---- (gdb) target remote :2345 ----------------------------- +---- diff --git a/docs/manual/using-buildroot-development.adoc b/docs/manual/using-buildroot-development.adoc index da6dd822fb0..72628e0a6f9 100644 --- a/docs/manual/using-buildroot-development.adoc +++ b/docs/manual/using-buildroot-development.adoc @@ -47,17 +47,17 @@ option. In this _override_ file, Buildroot expects to find lines of the form: ------------------- +---- _OVERRIDE_SRCDIR = /path/to/pkg1/sources _OVERRIDE_SRCDIR = /path/to/pkg2/sources ------------------- +---- For example: ------------------- +---- LINUX_OVERRIDE_SRCDIR = /home/bob/linux/ BUSYBOX_OVERRIDE_SRCDIR = /home/bob/busybox/ ------------------- +---- When Buildroot finds that for a given package, an +_OVERRIDE_SRCDIR+ has been defined, it will no longer attempt to @@ -79,17 +79,17 @@ process of just this package. In the example of the +linux+ package above, the developer can then make a source code change in +/home/bob/linux+ and then run: ------------------------ +---- make linux-rebuild all ------------------------ +---- and in a matter of seconds gets the updated Linux kernel image in +output/images+. Similarly, a change can be made to the BusyBox source code in +/home/bob/busybox+, and after: ------------------------ +---- make busybox-rebuild all ------------------------ +---- the root filesystem image in +output/images+ contains the updated BusyBox. @@ -102,13 +102,13 @@ from the source tree. For example, when working on the +webkitgtk+ package, the following will exclude the tests and in-tree builds from a local WebKit source tree: ------------------- +---- WEBKITGTK_OVERRIDE_SRCDIR = /home/bob/WebKit WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \ --exclude JSTests --exclude ManualTests --exclude PerformanceTests \ --exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \ --exclude WebKit.xcworkspace --exclude Websites --exclude Examples ------------------- +---- By default, Buildroot skips syncing of VCS artifacts (e.g., the *.git* and *.svn* directories). Some packages prefer to have these VCS directories @@ -116,6 +116,6 @@ available during build, for example for automatically determining a precise commit reference for version information. To undo this built-in filtering at a cost of a slower speed, add these directories back: ------------------- +---- LINUX_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = --include .git ------------------- +---- diff --git a/docs/manual/writing-rules.adoc b/docs/manual/writing-rules.adoc index 13b7fd5bea6..03e4f2c61cf 100644 --- a/docs/manual/writing-rules.adoc +++ b/docs/manual/writing-rules.adoc @@ -23,7 +23,7 @@ Buildroot. An entry has the following pattern: ---------------------- +---- config BR2_PACKAGE_LIBFOO bool "libfoo" depends on BR2_PACKAGE_LIBBAZ @@ -33,7 +33,7 @@ config BR2_PACKAGE_LIBFOO should be wrapped. http://foosoftware.org/libfoo/ ---------------------- +---- * The +bool+, +depends on+, +select+ and +help+ lines are indented with one tab. @@ -57,31 +57,31 @@ http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[]. preferably in lowercase, enclosed between separators made of 80 hashes. A blank line is mandatory after the header: + ---------------------- +---- ################################################################################ # # libfoo # ################################################################################ ---------------------- +---- + * Assignment: use +=+ preceded and followed by one space: + ---------------------- +---- LIBFOO_VERSION = 1.0 LIBFOO_CONF_OPTS += --without-python-support ---------------------- +---- + Do not align the +=+ signs. * Indentation: use tab only: + ---------------------- +---- define LIBFOO_REMOVE_DOC $(RM) -r $(TARGET_DIR)/usr/share/libfoo/doc \ $(TARGET_DIR)/usr/share/man/man3/libfoo* endef ---------------------- +---- + Note that commands inside a +define+ block should always start with a tab, so _make_ recognizes them as commands. @@ -92,21 +92,21 @@ so _make_ recognizes them as commands. + YES: + ---------------------- +---- ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBFOO_CONF_OPTS += --with-python-support LIBFOO_DEPENDENCIES += python3 else LIBFOO_CONF_OPTS += --without-python-support endif ---------------------- +---- + NO: + ---------------------- +---- LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON3),,out)-python-support LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) ---------------------- +---- ** Keep configure options and dependencies close together. @@ -115,18 +115,18 @@ LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,) + YES: + ---------------------- +---- ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) define LIBFOO_REMOVE_DATA $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif ---------------------- +---- + NO: + ---------------------- +---- define LIBFOO_REMOVE_DATA $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef @@ -134,7 +134,7 @@ endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif ---------------------- +---- [[writing-genimage-cfg]] @@ -145,7 +145,7 @@ uses to create final .img file. An example follows: ---------------------- +---- image efi-part.vfat { vfat { file EFI { @@ -174,7 +174,7 @@ image sdimage.img { size = 512M } } ---------------------- +---- * Every +section+(i.e. hdimage, vfat etc.), +partition+ must be indented with one tab. From 7b148d9d25602e63f298e2b73bc296cb4889821f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 21:07:14 +0200 Subject: [PATCH 2300/3013] package/pppd: add patch fixing build issue on SPARC/SPARC64 Integrate a patch, which was submitted upstream, to work-around an issue with the SPARC kernel headers. The kernel headers have been fixed in the upstream kernel (in the to-be-released 6.10 kernel), but we need a workaround for the older toolchains, until we believe 6.10 is "old" enough to be able to drop the workaround. Fixes: http://autobuild.buildroot.net/results/272c464ed4f9392535fa3b7613218dbd03acf901/ Signed-off-by: Thomas Petazzoni (cherry picked from commit b162aab7c6da6b45dc5ba9ad30b59b4362e2dc2e) Signed-off-by: Peter Korsgaard --- ...orkaround-sparc-asm-termbits.h-issue.patch | 316 ++++++++++++++++++ 1 file changed, 316 insertions(+) create mode 100644 package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch diff --git a/package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch b/package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch new file mode 100644 index 00000000000..923c0477431 --- /dev/null +++ b/package/pppd/0001-pppd-workaround-sparc-asm-termbits.h-issue.patch @@ -0,0 +1,316 @@ +From ef37e5b112734f551132b613438788fd4ef8797a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 12 Jul 2024 20:24:22 +0200 +Subject: [PATCH] pppd: workaround sparc issue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The SPARC version of the kernel header has an issue: +it defines "struct termio", which conflicts with the definition in +, causing a build failure in pppd. + +This issue was fixed in the upstream Linux kernel in commit +c32d18e7942d7589b62e301eb426b32623366565 ("sparc: move struct termio +to asm/termios.h"), which is going to appear in Linux 6.10. + +In order to support building with older toolchains, this patch +includes in the pppd source code a copy of the fixed SPARC + in the pppd code base, and uses it if we're on SPARC +with kernel headers older than 6.10. + +Fixes: + +In file included from termios_linux.h:39: +/home/thomas/projets/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/asm/termbits.h:17:8: error: redefinition of ‘struct termio’ + 17 | struct termio { + | ^~~~~~ + CC pppd-ipv6cp.o +In file included from /home/thomas/projets/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/sys/ioctl.h:29, + from sys-linux.c:76: +/home/thomas/projets/buildroot/output/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/bits/ioctl-types.h:36:8: note: originally defined here + 36 | struct termio + | ^~~~~~ + +Upstream: https://github.com/ppp-project/ppp/pull/504 +Signed-off-by: Thomas Petazzoni +--- + pppd/sparc-termbits.h | 247 ++++++++++++++++++++++++++++++++++++++++++ + pppd/termios_linux.h | 6 + + 2 files changed, 253 insertions(+) + create mode 100644 pppd/sparc-termbits.h + +diff --git a/pppd/sparc-termbits.h b/pppd/sparc-termbits.h +new file mode 100644 +index 0000000..f92a27a +--- /dev/null ++++ b/pppd/sparc-termbits.h +@@ -0,0 +1,247 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++#ifndef _SPARC_TERMBITS_H ++#define _SPARC_TERMBITS_H ++ ++#include ++ ++typedef unsigned char cc_t; ++typedef unsigned int speed_t; ++ ++#if defined(__sparc__) && defined(__arch64__) ++typedef unsigned int tcflag_t; ++#else ++typedef unsigned long tcflag_t; ++#endif ++ ++#define NCCS 17 ++struct termios { ++ tcflag_t c_iflag; /* input mode flags */ ++ tcflag_t c_oflag; /* output mode flags */ ++ tcflag_t c_cflag; /* control mode flags */ ++ tcflag_t c_lflag; /* local mode flags */ ++ cc_t c_line; /* line discipline */ ++ cc_t c_cc[NCCS]; /* control characters */ ++}; ++ ++struct termios2 { ++ tcflag_t c_iflag; /* input mode flags */ ++ tcflag_t c_oflag; /* output mode flags */ ++ tcflag_t c_cflag; /* control mode flags */ ++ tcflag_t c_lflag; /* local mode flags */ ++ cc_t c_line; /* line discipline */ ++ cc_t c_cc[NCCS+2]; /* control characters */ ++ speed_t c_ispeed; /* input speed */ ++ speed_t c_ospeed; /* output speed */ ++}; ++ ++struct ktermios { ++ tcflag_t c_iflag; /* input mode flags */ ++ tcflag_t c_oflag; /* output mode flags */ ++ tcflag_t c_cflag; /* control mode flags */ ++ tcflag_t c_lflag; /* local mode flags */ ++ cc_t c_line; /* line discipline */ ++ cc_t c_cc[NCCS+2]; /* control characters */ ++ speed_t c_ispeed; /* input speed */ ++ speed_t c_ospeed; /* output speed */ ++}; ++ ++/* c_cc characters */ ++#define VINTR 0 ++#define VQUIT 1 ++#define VERASE 2 ++#define VKILL 3 ++#define VEOF 4 ++#define VEOL 5 ++#define VEOL2 6 ++#define VSWTC 7 ++#define VSTART 8 ++#define VSTOP 9 ++ ++ ++ ++#define VSUSP 10 ++#define VDSUSP 11 /* SunOS POSIX nicety I do believe... */ ++#define VREPRINT 12 ++#define VDISCARD 13 ++#define VWERASE 14 ++#define VLNEXT 15 ++ ++/* Kernel keeps vmin/vtime separated, user apps assume vmin/vtime is ++ * shared with eof/eol ++ */ ++#define VMIN VEOF ++#define VTIME VEOL ++ ++/* c_iflag bits */ ++#define IGNBRK 0x00000001 ++#define BRKINT 0x00000002 ++#define IGNPAR 0x00000004 ++#define PARMRK 0x00000008 ++#define INPCK 0x00000010 ++#define ISTRIP 0x00000020 ++#define INLCR 0x00000040 ++#define IGNCR 0x00000080 ++#define ICRNL 0x00000100 ++#define IUCLC 0x00000200 ++#define IXON 0x00000400 ++#define IXANY 0x00000800 ++#define IXOFF 0x00001000 ++#define IMAXBEL 0x00002000 ++#define IUTF8 0x00004000 ++ ++/* c_oflag bits */ ++#define OPOST 0x00000001 ++#define OLCUC 0x00000002 ++#define ONLCR 0x00000004 ++#define OCRNL 0x00000008 ++#define ONOCR 0x00000010 ++#define ONLRET 0x00000020 ++#define OFILL 0x00000040 ++#define OFDEL 0x00000080 ++#define NLDLY 0x00000100 ++#define NL0 0x00000000 ++#define NL1 0x00000100 ++#define CRDLY 0x00000600 ++#define CR0 0x00000000 ++#define CR1 0x00000200 ++#define CR2 0x00000400 ++#define CR3 0x00000600 ++#define TABDLY 0x00001800 ++#define TAB0 0x00000000 ++#define TAB1 0x00000800 ++#define TAB2 0x00001000 ++#define TAB3 0x00001800 ++#define XTABS 0x00001800 ++#define BSDLY 0x00002000 ++#define BS0 0x00000000 ++#define BS1 0x00002000 ++#define VTDLY 0x00004000 ++#define VT0 0x00000000 ++#define VT1 0x00004000 ++#define FFDLY 0x00008000 ++#define FF0 0x00000000 ++#define FF1 0x00008000 ++#define PAGEOUT 0x00010000 /* SUNOS specific */ ++#define WRAP 0x00020000 /* SUNOS specific */ ++ ++/* c_cflag bit meaning */ ++#define CBAUD 0x0000100f ++#define B0 0x00000000 /* hang up */ ++#define B50 0x00000001 ++#define B75 0x00000002 ++#define B110 0x00000003 ++#define B134 0x00000004 ++#define B150 0x00000005 ++#define B200 0x00000006 ++#define B300 0x00000007 ++#define B600 0x00000008 ++#define B1200 0x00000009 ++#define B1800 0x0000000a ++#define B2400 0x0000000b ++#define B4800 0x0000000c ++#define B9600 0x0000000d ++#define B19200 0x0000000e ++#define B38400 0x0000000f ++#define EXTA B19200 ++#define EXTB B38400 ++#define CSIZE 0x00000030 ++#define CS5 0x00000000 ++#define CS6 0x00000010 ++#define CS7 0x00000020 ++#define CS8 0x00000030 ++#define CSTOPB 0x00000040 ++#define CREAD 0x00000080 ++#define PARENB 0x00000100 ++#define PARODD 0x00000200 ++#define HUPCL 0x00000400 ++#define CLOCAL 0x00000800 ++#define CBAUDEX 0x00001000 ++/* We'll never see these speeds with the Zilogs, but for completeness... */ ++#define BOTHER 0x00001000 ++#define B57600 0x00001001 ++#define B115200 0x00001002 ++#define B230400 0x00001003 ++#define B460800 0x00001004 ++/* This is what we can do with the Zilogs. */ ++#define B76800 0x00001005 ++/* This is what we can do with the SAB82532. */ ++#define B153600 0x00001006 ++#define B307200 0x00001007 ++#define B614400 0x00001008 ++#define B921600 0x00001009 ++/* And these are the rest... */ ++#define B500000 0x0000100a ++#define B576000 0x0000100b ++#define B1000000 0x0000100c ++#define B1152000 0x0000100d ++#define B1500000 0x0000100e ++#define B2000000 0x0000100f ++/* These have totally bogus values and nobody uses them ++ so far. Later on we'd have to use say 0x10000x and ++ adjust CBAUD constant and drivers accordingly. ++#define B2500000 0x00001010 ++#define B3000000 0x00001011 ++#define B3500000 0x00001012 ++#define B4000000 0x00001013 */ ++#define CIBAUD 0x100f0000 /* input baud rate (not used) */ ++#define CMSPAR 0x40000000 /* mark or space (stick) parity */ ++#define CRTSCTS 0x80000000 /* flow control */ ++ ++#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ ++ ++/* c_lflag bits */ ++#define ISIG 0x00000001 ++#define ICANON 0x00000002 ++#define XCASE 0x00000004 ++#define ECHO 0x00000008 ++#define ECHOE 0x00000010 ++#define ECHOK 0x00000020 ++#define ECHONL 0x00000040 ++#define NOFLSH 0x00000080 ++#define TOSTOP 0x00000100 ++#define ECHOCTL 0x00000200 ++#define ECHOPRT 0x00000400 ++#define ECHOKE 0x00000800 ++#define DEFECHO 0x00001000 /* SUNOS thing, what is it? */ ++#define FLUSHO 0x00002000 ++#define PENDIN 0x00004000 ++#define IEXTEN 0x00008000 ++#define EXTPROC 0x00010000 ++ ++/* modem lines */ ++#define TIOCM_LE 0x001 ++#define TIOCM_DTR 0x002 ++#define TIOCM_RTS 0x004 ++#define TIOCM_ST 0x008 ++#define TIOCM_SR 0x010 ++#define TIOCM_CTS 0x020 ++#define TIOCM_CAR 0x040 ++#define TIOCM_RNG 0x080 ++#define TIOCM_DSR 0x100 ++#define TIOCM_CD TIOCM_CAR ++#define TIOCM_RI TIOCM_RNG ++#define TIOCM_OUT1 0x2000 ++#define TIOCM_OUT2 0x4000 ++#define TIOCM_LOOP 0x8000 ++ ++/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ ++#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ ++ ++ ++/* tcflow() and TCXONC use these */ ++#define TCOOFF 0 ++#define TCOON 1 ++#define TCIOFF 2 ++#define TCION 3 ++ ++/* tcflush() and TCFLSH use these */ ++#define TCIFLUSH 0 ++#define TCOFLUSH 1 ++#define TCIOFLUSH 2 ++ ++/* tcsetattr uses these */ ++#define TCSANOW 0 ++#define TCSADRAIN 1 ++#define TCSAFLUSH 2 ++ ++#endif /* _SPARC_TERMBITS_H */ +diff --git a/pppd/termios_linux.h b/pppd/termios_linux.h +index a234d30..9812017 100644 +--- a/pppd/termios_linux.h ++++ b/pppd/termios_linux.h +@@ -32,7 +32,13 @@ + #include + #include + #include ++#include ++ ++#if defined(__sparc__) && LINUX_VERSION_CODE < KERNEL_VERSION(6,10,0) ++#include "sparc-termbits.h" ++#else + #include ++#endif + + #if defined(BOTHER) && defined(TCGETS2) + #define termios termios2 +-- +2.45.2 + From 8e63d76db9101b55e57d79fc157bee70da34a454 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 22 Aug 2023 21:23:14 +0200 Subject: [PATCH 2301/3013] package/kexec: fix link error when BR2_OPTIMIZE_0=y When BR2_OPTIMIZE_0, -O0 is passed in compiler CFLAGS. This means no code optimization will be performed. kexec code uses a trick to detect unaligned accesses at link time which needs at least dead-code-removal to work. See put/get_unaligned() macros in kexec/kexec.h. This code was re-enabled in upstream commit [1]. This commit sets at least -O1 (which include the sufficient dead-code-removal) when BR2_OPTIMIZE_0=y, to fix those issues. Fixes: - http://autobuild.buildroot.org/results/8f8/8f8532f1dfbd71e52c51c00118934af9fa45e7cb - http://autobuild.buildroot.org/results/528/528fd7baf9b0ad5549d22ec8e0623c5fa1f2d117 - http://autobuild.buildroot.org/results/499/499115439680adfb4b40042468e5bbb65d91ce6c - ...and many others [1] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=0723defb5308ac7fce296f8b596bff4df6803f01 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit a411588b582ad6a0c8573ec9f59f737473d69bee) Signed-off-by: Peter Korsgaard --- package/kexec/kexec.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index df14b2d711a..1fd8c0f0ab3 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -16,6 +16,14 @@ KEXEC_SELINUX_MODULES = kdump # Makefile expects $STRIP -o to work, so needed for !BR2_STRIP_strip KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip" +# kexec requires at least -O1 optimization level. Its code uses a +# trick to detect unaligned accesses at link time which needs at least +# dead-code-removal to work. See put/get_unaligned() macros in +# kexec/kexec.h +ifeq ($(BR2_OPTIMIZE_0),y) +KEXEC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" +endif + ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) KEXEC_CONF_OPTS += --with-zlib KEXEC_DEPENDENCIES += zlib From 8d5845211fdff45b3fae25a260754fdf69f02db2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 8 Aug 2023 22:05:46 +0200 Subject: [PATCH 2302/3013] package/xvisor: fix RISC-V hang when BR2_SHARED_LIBS=y When BR2_SHARED_LIBS=y (shared libraries only) and BR2_PIC_PIE=y (Build code with PIC/PIE), the toolchain-wrapper will try to enable position-independent code/executables. See [1]. This configuration is a common default. Xvisor was likely tested only with RISC-V gcc from [2], which will not enable PIE by default. Since Xvisor is a Type 1 hypervisor, it needs the same kind of special treatment as U-Boot or Kernel. This commit adds a patch to explicitly force static linking and disable PIE for RISC-V architecture. [1] https://git.buildroot.org/buildroot/tree/toolchain/toolchain-wrapper.c?h=2023.05.1#n392 [2] https://github.com/riscv-collab/riscv-gnu-toolchain Signed-off-by: Julien Olivain [Arnout: renumber patch] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 28925c6c86c41f2539c057f1a67267e58b5b2057) Signed-off-by: Peter Korsgaard --- ...-pie-code-generation-and-static-link.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch diff --git a/package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch b/package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch new file mode 100644 index 00000000000..706fbbfbda9 --- /dev/null +++ b/package/xvisor/0002-RISC-V-Force-no-pie-code-generation-and-static-link.patch @@ -0,0 +1,46 @@ +From 8491908238c4b3397571e9cff55765d59da03a45 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Wed, 2 Aug 2023 23:57:17 +0200 +Subject: [PATCH] RISC-V: Force no-pie code generation and static link + +Some toolchains are now enabling PIE for security reasons by default. +When XVisor is built with such a RISC-V toolchain, it is crashing +just after OpenSBI, in early Xvisor startup (before any message is +printed on the console). + +Hangs looks like those described in: + +https://github.com/xvisor/xvisor/issues/144 +https://github.com/xvisor/xvisor/issues/159 + +Forcing -fno-pie code generation and -static link will explicitly disable +PIE with those toolchains, hence fixing those issues. + +This issue was observed while using a riscv64 gcc toolchain from: +https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2022.08-1.tar.bz2 + +Signed-off-by: Julien Olivain +Upstream: https://github.com/xvisor/xvisor/pull/170 +--- + arch/riscv/cpu/generic/objects.mk | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/riscv/cpu/generic/objects.mk b/arch/riscv/cpu/generic/objects.mk +index 230da2a1..576603f6 100644 +--- a/arch/riscv/cpu/generic/objects.mk ++++ b/arch/riscv/cpu/generic/objects.mk +@@ -67,6 +67,11 @@ cpu-cflags += -fno-strict-aliasing -O2 + cpu-asflags += $(arch-cflags-y) -march=$(march-nonld-isa-y) + cpu-ldflags += $(arch-ldflags-y) -march=$(march-ld-isa-y) + ++cpu-cflags += -fno-pie ++cpu-asflags += -fno-pie ++cpu-ldflags += -static ++cpu-mergeflags += -static ++ + cpu-objs-y+= cpu_entry.o + cpu-objs-y+= cpu_proc.o + cpu-objs-y+= cpu_tlb.o +-- +2.41.0 + From fffc83c54af30b102b9393f6d7f73eb603449920 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Aug 2023 19:43:58 +0200 Subject: [PATCH 2303/3013] package/ntpsec: fix compile issue for some toolchains Ntpsec unconditionally uses PIE to compile code. This breaks compilation for at least microblaze-uclibc and m68k-uclibc toolchains. Also in Buildroot context, PIE should anyway be governed by BR2_PIC_PIE. It would be better to add a configure option to allow to disable pie support, but this is something for a waf expert. Fixes: - http://autobuild.buildroot.net/results/77f/77f4e4065874d022a2ae98d82508242f551e224c - http://autobuild.buildroot.net/results/e45/e45b65f2aa323df075d54ff43b0401b5ac7c6eb5 Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (cherry picked from commit a5327724686a1ba719d37caff5986f241993b500) Signed-off-by: Peter Korsgaard --- package/ntpsec/0003-disable-PIE-support.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/ntpsec/0003-disable-PIE-support.patch diff --git a/package/ntpsec/0003-disable-PIE-support.patch b/package/ntpsec/0003-disable-PIE-support.patch new file mode 100644 index 00000000000..64eb559de02 --- /dev/null +++ b/package/ntpsec/0003-disable-PIE-support.patch @@ -0,0 +1,26 @@ +From 712675fbd2a736df817fecd7bfb39055946ef85b Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sun, 13 Aug 2023 13:48:03 +0200 +Subject: [PATCH] disable PIE support + +Signed-off-by: Waldemar Brodkorb +Upstream: N/A Not upstreamable +--- + wscript | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/wscript b/wscript +index 292e3a45b..105c7eac2 100644 +--- a/wscript ++++ b/wscript +@@ -299,7 +299,6 @@ def configure(ctx): + + cc_test_flags = [ + ('PIC', '-fPIC'), +- ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie + ('unused', '-Qunused-arguments'), + # This is a useless warning on any architecture with a barrel +-- +2.39.2 + From ea84f13bb067398a5293127e709d49c2af1f25cc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 17 Aug 2023 16:51:38 +0200 Subject: [PATCH 2304/3013] package/tcf-agent: fix uClibc-ng compile on ARM When a shared build is used, we can use getauxval and no ARM only instuctions are in use. When a static build is used, we need to override CFLAGS to use arm instructions, as uClibc-ng only supports getauxval for shared case. Fixes: - http://autobuild.buildroot.net/results/3b5/3b5c5519a3e5ee490308bc1a1b9579ce13417235 Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (cherry picked from commit 408352207c18084c331b23aa739cde98cd52d000) Signed-off-by: Peter Korsgaard --- .../0001-fix-uClibc-ng-compile.patch | 27 +++++++++++++++++++ package/tcf-agent/tcf-agent.mk | 7 +++++ 2 files changed, 34 insertions(+) create mode 100644 package/tcf-agent/0001-fix-uClibc-ng-compile.patch diff --git a/package/tcf-agent/0001-fix-uClibc-ng-compile.patch b/package/tcf-agent/0001-fix-uClibc-ng-compile.patch new file mode 100644 index 00000000000..b8f46f3c48d --- /dev/null +++ b/package/tcf-agent/0001-fix-uClibc-ng-compile.patch @@ -0,0 +1,27 @@ +From a78007cd139e1dea3d893f5fe1d1c3a47503e6a2 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 12 Aug 2023 18:27:02 +0200 +Subject: [PATCH] fix uClibc-ng compile + +Signed-off-by: Waldemar Brodkorb +Upstream: N/A only mail available +--- + agent/machine/arm/tcf/cpudefs-mdep.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/machine/arm/tcf/cpudefs-mdep.c b/agent/machine/arm/tcf/cpudefs-mdep.c +index 051631a0..7c4fbf3e 100644 +--- a/agent/machine/arm/tcf/cpudefs-mdep.c ++++ b/agent/machine/arm/tcf/cpudefs-mdep.c +@@ -21,7 +21,7 @@ + + #ifndef USE_getauxval + # include +-# define USE_getauxval (defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))) ++# define USE_getauxval (defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) || (defined(__UCLIBC__) && defined(__HAVE_SHARED__))) + #endif + + #include +-- +2.39.2 + diff --git a/package/tcf-agent/tcf-agent.mk b/package/tcf-agent/tcf-agent.mk index 9d955d4b6f2..cc998d82d6f 100644 --- a/package/tcf-agent/tcf-agent.mk +++ b/package/tcf-agent/tcf-agent.mk @@ -20,6 +20,13 @@ TCF_AGENT_CONF_OPTS = \ -DBUILD_SHARED_LIBS=OFF \ -DTCF_MACHINE=$(call qstrip,$(BR2_PACKAGE_TCF_AGENT_ARCH)) +# tcf-agent uses some arm instructions in case getauxval is not available. +# unfortunately the uClibc-ng implementation of getauxval uses some features +# of ld.so to work +ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_ARM_INSTRUCTIONS_THUMB),yyy) +TCF_AGENT_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + define TCF_AGENT_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tcf-agent/tcf-agent.service \ $(TARGET_DIR)/usr/lib/systemd/system/tcf-agent.service From cb131ede84f33418afcf9f607edbcabc2fab56ba Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 18 Aug 2023 17:16:08 +0200 Subject: [PATCH 2305/3013] package/pkg-generic.mk: remove double colon in .stamp_built This issue was introduced back in 2009 with commit e11fe847b2f545446fc3300dd2ba88fd5da05756 that created the generic package infrastructure. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit bd0d5498ea00c29b22bb8c87b8f593b356deb469) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a2749320c3c..c7419b00fba 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -276,7 +276,7 @@ $(BUILD_DIR)/%/.stamp_configured: $(Q)touch $@ # Build -$(BUILD_DIR)/%/.stamp_built:: +$(BUILD_DIR)/%/.stamp_built: @$(call step_start,build) @$(call MESSAGE,"Building") $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) From 92b84583f63ef3fdae050e6fd058f7193809d3d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 17:10:15 +0200 Subject: [PATCH 2306/3013] package/libarchive: add bsdunzip option Add bsdunzip option to avoid the following build failure raised since bump to version 3.7.1 in commit 7991d2c48a859f9c0333ade8192868c21b1a8a31 and https://github.com/libarchive/libarchive/commit/c157e4ce8eb170a92945cc2d292fd7106bdfcce1: CCLD bsdunzip /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc-buildroot-linux-musl/12.3.0/../../../../powerpc-buildroot-linux-musl/bin/ld: cannot find -lz: No such file or directory By handling it explicitly, we can specify whether the dynamic or static library should be used, according to what we actually have available. Fixes: - http://autobuild.buildroot.org/results/aaf7fdefa0b7bd7e5ac743487c197544c1a2ce6f Signed-off-by: Fabrice Fontaine Tested-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit bbc08b15ae60c3008fb8cbff59dc329d8357c563) Signed-off-by: Peter Korsgaard --- package/libarchive/Config.in | 6 ++++++ package/libarchive/libarchive.mk | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in index ffa4cff7b33..2c8d813ccbd 100644 --- a/package/libarchive/Config.in +++ b/package/libarchive/Config.in @@ -30,4 +30,10 @@ config BR2_PACKAGE_LIBARCHIVE_BSDCAT The 'bsdcat' program is a simple replacement tool for zcat, bzcat, xzcat, and such. +config BR2_PACKAGE_LIBARCHIVE_BSDUNZIP + bool "bsdunzip" + help + The 'bsdunzip' program is a simple replacement tool + for Info-ZIP. + endif diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 1a50b0472da..7d58b5c69f3 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -46,6 +46,16 @@ else LIBARCHIVE_CONF_OPTS += --disable-bsdcat endif +ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDUNZIP),y) +ifeq ($(BR2_STATIC_LIBS),y) +LIBARCHIVE_CONF_OPTS += --enable-bsdunzip=static +else +LIBARCHIVE_CONF_OPTS += --enable-bsdunzip=shared +endif +else +LIBARCHIVE_CONF_OPTS += --disable-bsdunzip +endif + ifeq ($(BR2_PACKAGE_ACL),y) LIBARCHIVE_DEPENDENCIES += acl else From 6a3872661c6e51a97008efe8fceb317e6bdc5982 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 22:16:08 +0200 Subject: [PATCH 2307/3013] package/check: don't build shared lib when disabled The build system of check was unconditionally building a shared library, even when BUILD_SHARED_LIBS=OFF. This commit brings a patch, submitted upstream, which fixes this issue, and allows to fix the build in BR2_STATIC_LIBS=y configurations. Fixes: http://autobuild.buildroot.net/results/d4a1c6d49dd15ce6b73cfade2557d49733e9318b/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 526b89b981cb3fa3da7644482d1f140f1fb25e27) Signed-off-by: Peter Korsgaard --- ...xt-don-t-build-shared-libraries-when.patch | 255 ++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch diff --git a/package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch b/package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch new file mode 100644 index 00000000000..6ed01f5401f --- /dev/null +++ b/package/check/0001-src-CMakeLists.txt-don-t-build-shared-libraries-when.patch @@ -0,0 +1,255 @@ +From 2ae2137d724d5f3a70d5d2856cb979d389c4cbd8 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 12 Jul 2024 21:30:43 +0200 +Subject: [PATCH] src/CMakeLists.txt: don't build shared libraries when not + enabled + +BUILD_SHARED_LIBS is a standard CMake option [1] that specifies +whether shared libraries should be built or not. This commit adjusts +src/CMakeLists.txt to observe this variable to decide whether the +shared library variant should be built or not. This allows check to +only build a static library in environments where only a static +library can be compiled. + +This needs a bit of refactoring to avoid duplication: + +- Additional source files from libcompat are directly added to the + ${SOURCES} variable as needed + +- Additional libraries are collected into ${ADDITIONAL_LIBS} before + being associated to the static library and shared library (if enabled) + +[1] https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html + +Fixes: + +__uClibc_main.c:(.text+0x12c): undefined reference to `__fini_array_end' +/home/autobuild/autobuild/instance-20/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/13.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: __uClibc_main.c:(.text+0x130): undefined reference to `__fini_array_start' +/home/autobuild/autobuild/instance-20/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/13.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: __uClibc_main.c:(.text+0x134): undefined reference to `__fini_array_end' + +Upstream: https://github.com/libcheck/check/pull/355 +Signed-off-by: Thomas Petazzoni +--- + src/CMakeLists.txt | 137 ++++++++++++++++++++++----------------------- + 1 file changed, 67 insertions(+), 70 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a02dbe..e0cf32b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,117 +31,106 @@ set(SOURCES + check_run.c + check_str.c) + +-set(HEADERS +- ${CONFIG_HEADER} +- ${CMAKE_CURRENT_BINARY_DIR}/check.h +- check.h.in +- check_error.h +- check_impl.h +- check_list.h +- check_log.h +- check_msg.h +- check_pack.h +- check_print.h +- check_str.h) +- +-configure_file(check.h.in check.h @ONLY) +- +-# To maintain compatibility with the Autotools installation +-# we specifically create both shared and static libraries +-# as that is what Autotools script has been doing. +-# Normally CMake would create the system's native default library type. +- +-add_library(check STATIC ${SOURCES} ${HEADERS}) +-add_library(Check::check ALIAS check) +- +- +-# We would like to create an OBJECT library but currently they are +-# too unreliable and cumbersome, +-# especially with target_link_libraries and install(EXPORT... +-# https://stackoverflow.com/questions/38832528/transitive-target-include-directories-on-object-libraries +-# So we instead do the work twice. +-add_library(checkShared SHARED ${SOURCES} ${HEADERS}) +-add_library(Check::checkShared ALIAS checkShared) +- + # Add parts of libcompat as required +-target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/fpclassify.c) +-target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/fpclassify.c) ++list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/fpclassify.c) + + if (NOT HAVE_LIBRT) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/clock_gettime.c) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_create.c) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_delete.c) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_settime.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/clock_gettime.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_create.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_delete.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_settime.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/clock_gettime.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_create.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_delete.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/timer_settime.c) + endif(NOT HAVE_LIBRT) + + if(NOT HAVE_GETLINE) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/getline.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/getline.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/getline.c) + endif(NOT HAVE_GETLINE) + + if(NOT HAVE_GETTIMEOFDAY) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/gettimeofday.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/gettimeofday.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/gettimeofday.c) + endif(NOT HAVE_GETTIMEOFDAY) + + if(NOT HAVE_DECL_LOCALTIME_R) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/localtime_r.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/localtime_r.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/localtime_r.c) + endif(NOT HAVE_DECL_LOCALTIME_R) + + if(NOT HAVE_MALLOC) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/malloc.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/malloc.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/malloc.c) + endif(NOT HAVE_MALLOC) + + if(NOT HAVE_REALLOC) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/realloc.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/realloc.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/realloc.c) + endif(NOT HAVE_REALLOC) + + if(NOT HAVE_SNPRINTF) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) + endif(NOT HAVE_SNPRINTF) + + if(NOT HAVE_DECL_STRDUP AND NOT HAVE__STRDUP) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strdup.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/snprintf.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strdup.c) + endif(NOT HAVE_DECL_STRDUP AND NOT HAVE__STRDUP) + + if(NOT HAVE_DECL_STRSIGNAL) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strsignal.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strsignal.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/strsignal.c) + endif(NOT HAVE_DECL_STRSIGNAL) + + if(NOT HAVE_DECL_ALARM) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/alarm.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/alarm.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/alarm.c) + endif(NOT HAVE_DECL_ALARM) + + if(NOT HAVE_PTHREAD) +- target_sources(check PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/pthread_mutex.c) +- target_sources(checkShared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/pthread_mutex.c) ++ list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../lib/pthread_mutex.c) + endif() + ++set(HEADERS ++ ${CONFIG_HEADER} ++ ${CMAKE_CURRENT_BINARY_DIR}/check.h ++ check.h.in ++ check_error.h ++ check_impl.h ++ check_list.h ++ check_log.h ++ check_msg.h ++ check_pack.h ++ check_print.h ++ check_str.h) ++ ++configure_file(check.h.in check.h @ONLY) ++ ++# To maintain compatibility with the Autotools installation ++# we specifically create both shared and static libraries ++# as that is what Autotools script has been doing. ++# Normally CMake would create the system's native default library type. ++ ++add_library(check STATIC ${SOURCES} ${HEADERS}) ++add_library(Check::check ALIAS check) ++ ++# We would like to create an OBJECT library but currently they are ++# too unreliable and cumbersome, ++# especially with target_link_libraries and install(EXPORT... ++# https://stackoverflow.com/questions/38832528/transitive-target-include-directories-on-object-libraries ++# So we instead do the work twice. ++if (BUILD_SHARED_LIBS) ++ add_library(checkShared SHARED ${SOURCES} ${HEADERS}) ++ add_library(Check::checkShared ALIAS checkShared) ++endif (BUILD_SHARED_LIBS) ++ + # Include libraries if available + if (HAVE_LIBM) +- target_link_libraries(check PUBLIC m) +- target_link_libraries(checkShared PUBLIC m) ++ list(APPEND ADDITIONAL_LIBS m) + endif (HAVE_LIBM) + if (HAVE_LIBRT) +- target_link_libraries(check PUBLIC rt) +- target_link_libraries(checkShared PUBLIC rt) ++ list(APPEND ADDITIONAL_LIBS rt) + endif (HAVE_LIBRT) + if (HAVE_SUBUNIT) +- target_link_libraries(check PUBLIC subunit) +- target_link_libraries(checkShared PUBLIC subunit) ++ list(APPEND ADDITIONAL_LIBS subunit) + endif (HAVE_SUBUNIT) + ++target_link_libraries(check PUBLIC ${ADDITIONAL_LIBS}) ++if (BUILD_SHARED_LIBS) ++ target_link_libraries(checkShared PUBLIC m) ++endif (BUILD_SHARED_LIBS) ++ ++ + if(MSVC) + target_compile_definitions(checkShared + PRIVATE "CK_DLL_EXP=_declspec(dllexport)" +@@ -168,27 +157,35 @@ if (MSVC) + # So we call it this: + set(LIBRARY_OUTPUT_NAME "checkDynamic") + endif (MSVC) ++if (BUILD_SHARED_LIBS) + set_target_properties(checkShared PROPERTIES + OUTPUT_NAME ${LIBRARY_OUTPUT_NAME} + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR} + PUBLIC_HEADER "${public_headers}" + ) ++endif (BUILD_SHARED_LIBS) + target_include_directories(check + PUBLIC + $ + $ + $ + ) ++if (BUILD_SHARED_LIBS) + target_include_directories(checkShared + PUBLIC + $ + $ + $ +-) ++ ) ++endif (BUILD_SHARED_LIBS) + + if(NOT THIS_IS_SUBPROJECT) +- install(TARGETS check checkShared ++ if (BUILD_SHARED_LIBS) ++ set(SHARED_LIBNAME checkShared) ++ endif () ++ ++ install(TARGETS check ${SHARED_LIBNAME} + EXPORT check-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +-- +2.45.2 + From e0cb58f1ca9b53526707c1ddf43f4f81f49ce2e2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 22:17:30 +0200 Subject: [PATCH 2308/3013] package/check: fix build on noMMU configurations check was failing to build on noMMU configurations due to mistake in the build conditionals of the code around the HAVE_FORK macro. This commit brings a patch, submitted upstream, that fixes those issues. Fixes: http://autobuild.buildroot.net/results/1509108aa111da706d544eb67e1ae2c2b34bd4e4/ Signed-off-by: Thomas Petazzoni (cherry picked from commit d10bee42012103fe7974c5e20be3af81e3c1c250) Signed-off-by: Peter Korsgaard --- ...k_run.c-fix-build-on-noMMU-platforms.patch | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch diff --git a/package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch b/package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch new file mode 100644 index 00000000000..173fa4ae5ac --- /dev/null +++ b/package/check/0002-src-check_run.c-fix-build-on-noMMU-platforms.patch @@ -0,0 +1,82 @@ +From c9bebf051aa7e3037ca8e0fe554e073204ffedde Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 12 Jul 2024 21:27:47 +0200 +Subject: [PATCH] src/check_run.c: fix build on noMMU platforms + +src/check_run.c defines sig_handler() under the following conditions: + + #if defined(HAVE_FORK) && HAVE_FORK==1 + +however, it does use sig_handler under the following conditions: + + #if defined(HAVE_SIGACTION) && defined(HAVE_FORK) + +which breaks when HAVE_FORK is defined, but has the value HAVE_FORK=0, +as is the case on noMMU platforms. + +This commit fixes this by ensuring that the build conditions are +aligned throughout check_run.c. + +Fixes: + +src/check_run.c: In function 'srunner_run_tagged': +src/check_run.c:802:38: error: 'sig_handler' undeclared (first use in this function); did you mean 'sa_handler'? +[...] + +Upstream: https://github.com/libcheck/check/pull/354 +Signed-off-by: Thomas Petazzoni +--- + src/check_run.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/check_run.c b/src/check_run.c +index 5f160e5..4c370b3 100644 +--- a/src/check_run.c ++++ b/src/check_run.c +@@ -772,12 +772,12 @@ void srunner_run_tagged(SRunner * sr, const char *sname, const char *tcname, + const char *include_tags, const char *exclude_tags, + enum print_output print_mode) + { +-#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) ++#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) && HAVE_FORK==1 + static struct sigaction sigalarm_old_action; + static struct sigaction sigalarm_new_action; + static struct sigaction sigint_new_action; + static struct sigaction sigterm_new_action; +-#endif /* HAVE_SIGACTION && HAVE_FORK */ ++#endif /* HAVE_SIGACTION && HAVE_FORK && HAVE_FORK==1 */ + + /* Get the selected test suite and test case from the + environment. */ +@@ -797,7 +797,7 @@ void srunner_run_tagged(SRunner * sr, const char *sname, const char *tcname, + eprintf("Bad print_mode argument to srunner_run_all: %d", + __FILE__, __LINE__, print_mode); + } +-#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) ++#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) && HAVE_FORK==1 + memset(&sigalarm_new_action, 0, sizeof(sigalarm_new_action)); + sigalarm_new_action.sa_handler = sig_handler; + sigaction(SIGALRM, &sigalarm_new_action, &sigalarm_old_action); +@@ -809,16 +809,16 @@ void srunner_run_tagged(SRunner * sr, const char *sname, const char *tcname, + memset(&sigterm_new_action, 0, sizeof(sigterm_new_action)); + sigterm_new_action.sa_handler = sig_handler; + sigaction(SIGTERM, &sigterm_new_action, &sigterm_old_action); +-#endif /* HAVE_SIGACTION && HAVE_FORK */ ++#endif /* HAVE_SIGACTION && HAVE_FORK && HAVE_FORK==1 */ + srunner_run_init(sr, print_mode); + srunner_iterate_suites(sr, sname, tcname, include_tags, exclude_tags, + print_mode); + srunner_run_end(sr, print_mode); +-#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) ++#if defined(HAVE_SIGACTION) && defined(HAVE_FORK) && HAVE_FORK==1 + sigaction(SIGALRM, &sigalarm_old_action, NULL); + sigaction(SIGINT, &sigint_old_action, NULL); + sigaction(SIGTERM, &sigterm_old_action, NULL); +-#endif /* HAVE_SIGACTION && HAVE_FORK */ ++#endif /* HAVE_SIGACTION && HAVE_FORK && HAVE_FORK==1 */ + } + + void srunner_run(SRunner * sr, const char *sname, const char *tcname, +-- +2.45.2 + From b6f4d79df21b2affa1ccc5133c44647072d21058 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 6 Aug 2024 23:28:50 +0200 Subject: [PATCH 2309/3013] support/testing: package: gpsd: fix test by enabling python support Commit 9696d27756 "package/gpsd: condition python stuff to the proper kconfig option" changed the condition in which the gpsd python scripts are installed. After that change, the "gpsfake" command (which is a python script) is no longer found and the runtime test is failing. This commit fixes the issue by reflecting the change in the runtime test Buildroot configuration. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_gpsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index 7ca59739814..2c44e25cec5 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -11,7 +11,7 @@ class TestGpsd(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ f""" BR2_PACKAGE_GPSD=y - BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_GPSD_PYTHON=y BR2_ROOTFS_OVERLAY="{rootfs_overlay}" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set From 9f66a80bf0482346262194eff163b2cc00aae760 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 7 Aug 2024 00:02:50 +0200 Subject: [PATCH 2310/3013] package/swipl: host-swipl needs host-zlib host-swipl fails to configure with CMake error message: Could NOT find ZLIB (missing: ZLIB_LIBRARY ZLIB_INCLUDE_DIR) This commit fixes the issue by adding the missing host-zlib dependency. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/swipl/swipl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk index 9ba841084ed..595f5e975b3 100644 --- a/package/swipl/swipl.mk +++ b/package/swipl/swipl.mk @@ -9,6 +9,8 @@ SWIPL_SITE = https://www.swi-prolog.org/download/stable/src SWIPL_LICENSE = BSD-2-Clause SWIPL_LICENSE_FILES = LICENSE +HOST_SWIPL_DEPENDENCIES = host-zlib + SWIPL_DEPENDENCIES = host-swipl zlib # A host-swipl is needed to compile the target prolog boot From 1fc2baa098dd6b0ee16a651199a59bb040721b4f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 7 Aug 2024 08:17:03 +0200 Subject: [PATCH 2311/3013] package/elf2flt: update to 2024.05 Patch 0001 is upstream, this is also the only change in this release. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...r-new-style-ctors-when-using-riscv64.patch | 34 ------------------- package/elf2flt/elf2flt.hash | 2 +- package/elf2flt/elf2flt.mk | 2 +- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch diff --git a/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch b/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch deleted file mode 100644 index fea726dab2c..00000000000 --- a/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From eead8d5e9f3911243182311f16178c25c6ea03c4 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 23 Mar 2024 07:23:45 +0100 -Subject: [PATCH] fix alignment for new-style ctors when using riscv64 - -Recently uClibc-ng enabled UCLIBC_CTOR_DTOR for riscv64, so -that f.e. C++ applications are running fine. As a side effect -this breaks noMMU support. The problem is the alignment for -the ctors in elf2flt. This patch fixes it. - -Tested with Qemu for ARM, M68k and Xtensa with no regressions. - -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/uclinux-dev/elf2flt/commit/eead8d5e9f3911243182311f16178c25c6ea03c4 ---- - elf2flt.ld.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/elf2flt.ld.in b/elf2flt.ld.in -index a99c69e..230c382 100644 ---- a/elf2flt.ld.in -+++ b/elf2flt.ld.in -@@ -139,7 +139,7 @@ R_RODAT: *(.gnu.linkonce.r*) - @SYMBOL_PREFIX@_ssro_size = @SYMBOL_PREFIX@_essro - @SYMBOL_PREFIX@_ssro; - PROVIDE(@SYMBOL_PREFIX@_SDA2_BASE_ = @SYMBOL_PREFIX@_ssro + (@SYMBOL_PREFIX@_ssro_size / 2)); - -- . = ALIGN(4) ; -+ . = ALIGN(8) ; - TOR: @SYMBOL_PREFIX@__CTOR_LIST__ = .; - TOR: LONG((@SYMBOL_PREFIX@__CTOR_END__ - @SYMBOL_PREFIX@__CTOR_LIST__) / 4 - 2) - SINGLE_LINK: /* gcc uses crtbegin.o to find the start of --- -2.30.2 - diff --git a/package/elf2flt/elf2flt.hash b/package/elf2flt/elf2flt.hash index e338ff67800..1e9c7cbedcd 100644 --- a/package/elf2flt/elf2flt.hash +++ b/package/elf2flt/elf2flt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e1d419c463431ff1af7fdc76a402f628744ad10dff063bea76a386942255119c elf2flt-2024.02.tar.gz +sha256 9fd899d0c66552ecb175ff6764e5af810aa1bb78db38a64768a1b97c3c62199d elf2flt-2024.05.tar.gz sha256 f20bc5007904094e3a4e9fbcc3526cdd40893f91d458c3139b308e5c4c0899c6 LICENSE.TXT diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index d5a7b9b5fd5..a15c64d0419 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELF2FLT_VERSION = 2024.02 +ELF2FLT_VERSION = 2024.05 ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,v$(ELF2FLT_VERSION)) ELF2FLT_LICENSE = GPL-2.0+ ELF2FLT_LICENSE_FILES = LICENSE.TXT From ed863ca1cb31f021537b6a5490053d1c6787cd26 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Aug 2024 10:17:55 +0200 Subject: [PATCH 2312/3013] package/python-uvicorn: bump to 0.30.5 Changelog: * https://github.com/encode/uvicorn/releases/tag/0.30.4 * https://github.com/encode/uvicorn/releases/tag/0.30.5 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index 70323199995..e662adda1ee 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 433c22f6ac3bbc2e7011a5623b772e25 uvicorn-0.30.3.tar.gz -sha256 0d114d0831ff1adbf231d358cbf42f17333413042552a624ea6a9b4c33dcfd81 uvicorn-0.30.3.tar.gz +md5 c43ec29f83c3706b99c48a7eeb0208ac uvicorn-0.30.5.tar.gz +sha256 ac6fdbd4425c5fd17a9fe39daf4d4d075da6fdc80f653e5894cdc2fd98752bee uvicorn-0.30.5.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 00c3b953a34..276aa898046 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.30.3 +PYTHON_UVICORN_VERSION = 0.30.5 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/77/40/b650be95700dc83d14c5f2b9eac9deb23cbca757a12ee20e473b5ef1ac48 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/c3/ad/02b1b412e43605aa6aac8d0392c383ff3f6ae8267b7864e48e3b5f3f601e PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md From f777ce1fd6b9e0537593a70940dc23f4ca177054 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Aug 2024 10:22:50 +0200 Subject: [PATCH 2313/3013] package/python-django: security bump to version 5.0.8 Django 5.0.7 fixes the following CVEs: * CVE-2024-38875: Potential denial-of-service vulnerability in django.utils.html.urlize() * CVE-2024-39329: Username enumeration through timing difference for users with unusable passwords * CVE-2024-39330: Potential directory-traversal via Storage.save() * CVE-2024-39614: Potential denial-of-service vulnerability in get_supported_language_variant() Django 5.0.8 fixes the following CVEs: * CVE-2024-41989: Memory exhaustion in django.utils.numberformat.floatformat() * CVE-2024-41990: Potential denial-of-service vulnerability in django.utils.html.urlize() * CVE-2024-41991: Potential denial-of-service vulnerability in django.utils.html.urlize() and AdminURLFieldWidget * CVE-2024-42005: Potential SQL injection in QuerySet.values() and values_list() Further release Notes: https://docs.djangoproject.com/en/5.0/releases/ Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index d5684a083c0..a5a8c7426db 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 1009c48d70060cadb40000cc15a8058a Django-5.0.3.tar.gz -sha256 5fb37580dcf4a262f9258c1f4373819aacca906431f505e4688e37f3a99195df Django-5.0.3.tar.gz +md5 fb167eef987a98421cad62036868a1ca Django-5.0.8.tar.gz +sha256 ebe859c9da6fead9c9ee6dbfa4943b04f41342f4cea2c4d8c978ef0d10694f2b Django-5.0.8.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 258ff9e0c1c..2c5c20ee4db 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.3 +PYTHON_DJANGO_VERSION = 5.0.8 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/e1/b1/ac6a16aaf0049637b50afbcf06b8ec2fa5c6ce42d4ae6ba66bbaf4c3609a +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/79/1c/55733805bb735e26fee0430045efdb61df6fd704b6aebf2154875ef9e6a9 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From bd15cdda9be3a7dea6cc80ef4707af244864d992 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Aug 2024 11:28:13 +0200 Subject: [PATCH 2314/3013] package/python-pymodbus: bump to 3.7.0 Changelog: https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.7.0 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-pymodbus/python-pymodbus.hash | 4 ++-- package/python-pymodbus/python-pymodbus.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 37c44f6a060..7c8f352de46 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 5201e93420b9ac9dc5e3e64a656101cc pymodbus-3.6.9.tar.gz -sha256 f4223b72c20cd00a2cf25f6ddb31ecb2c0587309111a55283b2f4a1ac115e4cc pymodbus-3.6.9.tar.gz +md5 3bdc2a574cbfd10ec6dddf38c3f26598 pymodbus-3.7.0.tar.gz +sha256 5c772babaa61a65ff908293faa668aedcd9d9e10f4bcf5c77a8fe51a6fd9ed47 pymodbus-3.7.0.tar.gz # Locally computed sha256 checksums sha256 47f904249172e795a6b32de91f471073297befffd74e17cafc288d348a55972e LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index cba94896bb0..6a7c384cf63 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.6.9 +PYTHON_PYMODBUS_VERSION = 3.7.0 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/b4/a4/5322c8e3be3bb2db7ab3eb7c2160fd2ec325083d7e60a76cd9cc896dd7bd +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/cc/83/de0c3596f17ac4833f591e96cafee7ae6109d846d607387b48f88d66759a PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE From 202e644b2698ac9b2e7a85dd23acfa3df5f6bd74 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Aug 2024 12:39:00 +0200 Subject: [PATCH 2315/3013] package/nethogs: needs toolchain with C++ Fixes: http://autobuild.buildroot.net/results/a250f6f3e93ceddad2d4c7cd1f29233fce2b327e http://autobuild.buildroot.net/results/b68e8c601b31c70bc30cdfe913f7988f54255dbf http://autobuild.buildroot.net/results/298090dfb9db42ba9f219d2c268bc798373142c7 http://autobuild.buildroot.net/results/b59851d542418ad0f40d86b32dc7573248233de4 http://autobuild.buildroot.net/results/18cc7058d567916c7d2bfb16b7808b71ed731948 http://autobuild.buildroot.net/results/786e68c8c397038511db4e8bea589839a7d9b056 http://autobuild.buildroot.net/results/8eddfca525f6951e6d11184e312cffccfc443ba8 http://autobuild.buildroot.net/results/bdfc7b723abdf4aea48e40e789883405061e4e1c Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/nethogs/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/nethogs/Config.in b/package/nethogs/Config.in index 2d6b44739ca..fe5a4cdba4e 100644 --- a/package/nethogs/Config.in +++ b/package/nethogs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NETHOGS bool "nethogs" + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_NCURSES help @@ -8,3 +9,6 @@ config BR2_PACKAGE_NETHOGS do, it groups bandwidth by process. https://github.com/raboof/nethogs + +comment "nethogs needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP From d84d9241c8e0e4cbe872d4e8bb86dcfa3781f974 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 7 Aug 2024 12:44:21 +0200 Subject: [PATCH 2316/3013] package/mpg123: update to 1.32.6 See the homepage for News and Changes: http://mpg123.de/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/mpg123/mpg123.hash | 6 +++--- package/mpg123/mpg123.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mpg123/mpg123.hash b/package/mpg123/mpg123.hash index 0fe46996062..5a83f29586f 100644 --- a/package/mpg123/mpg123.hash +++ b/package/mpg123/mpg123.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/mpg123/files/mpg123/1.32.3/ -sha1 3a94848a620db7917c757cb21e261c711e44618f mpg123-1.32.3.tar.bz2 +# From https://sourceforge.net/projects/mpg123/files/mpg123/1.32.6/ +sha1 886c8c5f100caccfb4fefabc1c75ff6e2a834128 mpg123-1.32.6.tar.bz2 # Locally calculated -sha256 2d9913a57d4ee8f497a182c6e82582602409782a4fb481e989feebf4435867b4 mpg123-1.32.3.tar.bz2 +sha256 ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6 mpg123-1.32.6.tar.bz2 # License file sha256 c22482728a634a8dfdb4ff72a96d4c1ed64cd8f3e79335c401751ac591609366 COPYING diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 4de5f99bdfc..af036132d2c 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.32.3 +MPG123_VERSION = 1.32.6 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = https://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_INSTALL_STAGING = YES From 359b3228e24642ee9d7603af8f664b1832c5f98b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 7 Aug 2024 14:48:47 +0200 Subject: [PATCH 2317/3013] package/libjcat: fix linking, add missing intl library For musl/uClibc-ng toolchains we need to explicitely link libintl. The problem exist since the addition of the package in commit e52605c092d8eaa926da8720ae498a38eddb5205. Fixes: - http://autobuild.buildroot.net/results/58c/58c7ecbcfab96ebbc7a20291d4712cf64094b9f7/ - http://autobuild.buildroot.net/results/5d7/5d7c5dea0213f5a24489c397c5703c0601b2f12d/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libjcat/libjcat.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libjcat/libjcat.mk b/package/libjcat/libjcat.mk index e13e5dbfb74..c365c1914b8 100644 --- a/package/libjcat/libjcat.mk +++ b/package/libjcat/libjcat.mk @@ -10,7 +10,9 @@ LIBJCAT_SOURCE = libjcat-$(LIBJCAT_VERSION).tar.xz LIBJCAT_LICENSE = LGPL-2.1+ LIBJCAT_LICENSE_FILES = LICENSE LIBJCAT_INSTALL_STAGING = YES -LIBJCAT_DEPENDENCIES = host-pkgconf json-glib libglib2 +LIBJCAT_DEPENDENCIES = host-pkgconf json-glib libglib2 $(TARGET_NLS_DEPENDENCIES) + +LIBJCAT_LDFLAGS = $(TARGET_NLS_LIBS) LIBJCAT_CONF_OPTS = \ -Dgtkdoc=false \ From 5703b1a03ea1c21eace4e577040407847b5c8ff8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 4 Jul 2024 19:11:14 -0600 Subject: [PATCH 2318/3013] package/systemd: enable required oomd kernel options In order for systemd-oomd to run CONFIG_PSI and CONFIG_MEMCG must be enabled in the kernel config. See: https://github.com/systemd/systemd/commit/e7b3f1a6c358dd3eaf0b50547bd52130ad4126ae https://github.com/systemd/systemd/commit/aa329b89223a79793cde8288b1bc6e93db174938 Signed-off-by: James Hilliard Signed-off-by: Romain Naour (cherry picked from commit be5f14657a5540fdabb03ba8b5ff64c0da804e32) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6b3553723c4..52fa344807d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -480,6 +480,10 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) SYSTEMD_CONF_OPTS += -Doomd=true SYSTEMD_OOMD_USER = systemd-oom -1 systemd-oom -1 * - - - systemd Userspace OOM Killer +define SYSTEMD_OOMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_PSI) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) +endef else SYSTEMD_CONF_OPTS += -Doomd=false endif @@ -804,6 +808,8 @@ define SYSTEMD_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) + + $(SYSTEMD_OOMD_LINUX_CONFIG_FIXUPS) endef # We need a very minimal host variant, so we disable as much as possible. From abf5e2571d1b1e5d787b9e9ac2215347916c9aa2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 20 May 2024 11:52:05 +0200 Subject: [PATCH 2319/3013] package/fwts: fix build with host make >= 4.4 When build host has a many CPUs (more that 20) and GNU Make 4.4 (included for example in Fedora 40), fwts can randomly fail to build. This commit adds a package patch to fix the issue. Fixes: mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory mv: cannot stat 'prparser.tab.c': No such file or directory See also: https://github.com/fwts/fwts/issues/7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit f6d9fa3692b0e5dd75bb1fee5d151fe58da7800d) Signed-off-by: Peter Korsgaard --- ...fix-parallel-build-with-GNU-Make-4.4.patch | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch diff --git a/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch b/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch new file mode 100644 index 00000000000..a5568d1fd9f --- /dev/null +++ b/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch @@ -0,0 +1,133 @@ +From 65a89b6253ef527ab4bc951eb8f9deba12f0121a Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 May 2024 11:14:02 +0200 +Subject: [PATCH] libfwtsiasl: fix parallel build with GNU Make >= 4.4 + +When a build host has a large number of cores (like 20+) and GNU Make +version is >= 4.4, fwts randomly fail to build in parallel, with a +"make -j$(nproc)" command, with error: + + mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory + mv: cannot stat 'prparser.tab.c': No such file or directory + +This issue has been reported here: +https://github.com/fwts/fwts/issues/7 + +The Makefile.am of libfwtsiasl is using the GNU Make ".NOTPARALLEL" +special target with prerequisites to handle commands generating +multiple outputs (like lex/yacc invocations). See: +https://github.com/fwts/fwts/blob/V24.03.00/src/libfwtsiasl/Makefile.am#L61 + +First, the .NOTPARALLEL special target _with_ prerequisites is a +feature added in GNU Make 4.4. See: +https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 +https://lists.gnu.org/archive/html/help-make/2022-10/msg00020.html + +GNU Make version < 4.4 will interpret it as if it was written without +prerequisite (as a standalone ".NOTPARALLEL:"). The effect is that the +parallel compilation is disabled for the whole libfwtsiasl. The +standalone .NOTPARALLEL special target was introduced in GNU Make 3.79 +in 2000. This is why parallel builds are working with Make older than +version 4.4. + +Secondly, the reason why the build is failing on GNU Make >= 4.4 is +because the usage of .NOTPARALLEL in incorrect. + +Quoting the Make manual: +https://www.gnu.org/software/make/manual/html_node/Parallel-Disable.html +""" +If the .NOTPARALLEL special target has prerequisites, then each of those +prerequisites will be considered a target and all prerequisites of these +targets will be run serially. +""" + +Note the serialization will happen on the prerequisites of the targets +set as prerequisites of .NOTPARALLEL. + +The targets will not be correctly marked to disable parallel +execution. + +Thirdly, the use of multiple targets in a rule is incorrect here. See +Make manual: +https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html +The construct used in Makefile.am of libfwtsiasl for lex/yacc parsers +assumes they are independant targets (so they can be executed in +parallel). Finally, the "mv" command is failing, because there will be +one parallel execution per target, the first mv will suceed and the +other ones will fail. Multiple independant targets are often used in +Makefiles for lex/yacc, they are working because they are not using +"mv". Even in multiple execution, files are just overwritten. + +Fixing this .NOTPARALLEL usage with prerequisites would require Make +version 4.4 or greater. This is a strong requirement, as there is +still many Linux distros with older Make version (as an example Ubuntu +22.04 LTS has Make 4.3). + +The .WAIT special target could be used, but was also introduced in +Make version 4.4. See: +https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 + +GNU Make 4.3 also introduced "Grouped Targets" for that purpose. See: +https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html +But this would add a requirement on a recent Make version. + +This commit fixes the issue by declaring the first generated file as a +dependency of the other extra generated files. This has the effect of +completely solving the parallel build for all GNU Make versions. Also, +this enables parallel build for libfwtsiasl (except for the parser +generation) and makes the whole build faster. + +Signed-off-by: Julien Olivain +Upstream: https://github.com/fwts/fwts/commit/c0962cd74c725418523c46ca44101e0e70201f81 +--- + src/libfwtsiasl/Makefile.am | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am +index cb10bc58..ac54f621 100644 +--- a/src/libfwtsiasl/Makefile.am ++++ b/src/libfwtsiasl/Makefile.am +@@ -58,32 +58,32 @@ aslcompiler.y: $(ASL_PARSER) + aslcompilerlex.c: $(ASL_LEXER) + ${LEX} ${AM_LFLAGS} -PAslCompiler -o$@ $(top_srcdir)/src/acpica/source/compiler/aslcompiler.l + +-.NOTPARALLEL: aslcompiler.c +-aslcompiler.c aslcompiler.y.h: aslcompiler.y ++aslcompiler.c: aslcompiler.y + ${YACC} ${AM_YFLAGS} -d -baslcompiler -pAslCompiler $^ + mv aslcompiler.tab.c aslcompiler.c + cp aslcompiler.tab.h aslcompiler.y.h ++aslcompiler.y.h: aslcompiler.c + +-.NOTPARALLEL: dtcompilerparserlex.c +-dtcompilerparserlex.c dtcompilerparser.c dtcompilerparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y ++dtcompilerparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y + ${LEX} ${AM_LFLAGS} -PDtCompilerParser -odtcompilerparserlex.c $< + ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y + mv dtcompilerparser.tab.c dtcompilerparser.c + cp dtcompilerparser.tab.h dtcompilerparser.y.h ++dtcompilerparser.c dtcompilerparser.y.h: dtcompilerparserlex.c + +-.NOTPARALLEL: dtparserlex.c +-dtparserlex.c dtparser.c dtparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y ++dtparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y + ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c $< + ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser $(top_srcdir)/src/acpica/source/compiler/dtparser.y + mv dtparser.tab.c dtparser.c + cp dtparser.tab.h dtparser.y.h ++dtparser.c dtparser.y.h: dtparserlex.c + +-.NOTPARALLEL: prparserlex.c +-prparserlex.c prparser.c prparser.y.h: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y ++prparserlex.c: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y + ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c $< + ${YACC} ${AM_YFLAGS} -bprparser -pPrParser $(top_srcdir)/src/acpica/source/compiler/prparser.y + mv prparser.tab.c prparser.c + cp prparser.tab.h prparser.y.h ++prparser.c prparser.y.h: prparserlex.c + + pkglib_LTLIBRARIES = libfwtsiasl.la + +-- +2.45.1 + From 7c4f3014ef9128a1d743e96452d388a3343c1150 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Wed, 7 Aug 2024 22:06:56 +0200 Subject: [PATCH 2320/3013] package/grantlee: bump to 5.3.1 The hash of the license file has changed due to the addition of this line: +Grantlee is copyright Stephen Kelly and others. Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/grantlee/grantlee.hash | 4 ++-- package/grantlee/grantlee.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/grantlee/grantlee.hash b/package/grantlee/grantlee.hash index 6508aa70cce..6ff509f0dd0 100644 --- a/package/grantlee/grantlee.hash +++ b/package/grantlee/grantlee.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 139acee5746b957bdf1327ec0d97c604d4c0b9be42aec5d584297cb5ed6a990a grantlee-5.2.0.tar.gz +sha256 ba288ae9ed37ec0c3622ceb40ae1f7e1e6b2ea89216ad8587f0863d64be24f06 grantlee-5.3.1.tar.gz # Hash for license file -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 4c3b163159fe524dc992489c5bc52aaf0231b5ff41fb6234adb7f10373da24c4 COPYING.LIB diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index 7079679ca42..7e363349028 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRANTLEE_VERSION = 5.2.0 +GRANTLEE_VERSION = 5.3.1 GRANTLEE_SITE = $(call github,steveire,grantlee,v$(GRANTLEE_VERSION)) GRANTLEE_INSTALL_STAGING = YES GRANTLEE_LICENSE = LGPL-2.1+ From 698c9f12c48463c6c39a747109e8b39d5a4fa660 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Wed, 7 Aug 2024 22:07:11 +0200 Subject: [PATCH 2321/3013] package/grantlee: enable building for Qt6 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/grantlee/Config.in | 8 +++++--- package/grantlee/grantlee.mk | 8 +++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index 779306bc2ec..7849cfd9f22 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5SCRIPT - select BR2_PACKAGE_QT5BASE_GUI + depends on (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6DECLARATIVE if BR2_PACKAGE_QT6 help Qt implementation of the Django template framework diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index 7e363349028..9e786645590 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -9,6 +9,12 @@ GRANTLEE_SITE = $(call github,steveire,grantlee,v$(GRANTLEE_VERSION)) GRANTLEE_INSTALL_STAGING = YES GRANTLEE_LICENSE = LGPL-2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB -GRANTLEE_DEPENDENCIES = qt5base qt5script + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +GRANTLEE_DEPENDENCIES += qt5base qt5script +else ifeq ($(BR2_PACKAGE_QT6BASE),y) +GRANTLEE_DEPENDENCIES += qt6base qt6declarative +GRANTLEE_CONF_OPTS += -DGRANTLEE_BUILD_WITH_QT6=ON +endif $(eval $(cmake-package)) From 69629bae7ccb2431a70d0cffce2fadf62560ebdf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 5 Oct 2023 18:17:40 +0200 Subject: [PATCH 2322/3013] support/testing/test/graphics_base: add helper to test graphics rendering In 4edb0e3456ef (support/testing/tests/package/test_weston.py: new runtime test), the weston test was introduced, and thus was the first that needed to test that rendering was happening. Now we also have a test for a flutter application, and we'll want to have it test the rendering too. Move the corresponding code to a helper that can be reused by other tests, rather than duplicate (or reinvent) it. Switch weston to using that new helper. Signed-off-by: Yann E. MORIN Cc: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/graphics_base.py | 39 +++++++++++++ support/testing/tests/package/test_weston.py | 61 ++++---------------- 3 files changed, 50 insertions(+), 51 deletions(-) create mode 100644 support/testing/tests/graphics_base.py diff --git a/DEVELOPERS b/DEVELOPERS index c472aa4c53d..38a19aafcfb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3384,6 +3384,7 @@ F: package/weston/ F: package/wtfutil/ F: package/zisofs-tools/ F: support/download/ +F: support/testing/tests/graphics_base.py N: Yann E. MORIN F: .editorconfig diff --git a/support/testing/tests/graphics_base.py b/support/testing/tests/graphics_base.py new file mode 100644 index 00000000000..15a4c00bb22 --- /dev/null +++ b/support/testing/tests/graphics_base.py @@ -0,0 +1,39 @@ +class GraphicsBase: + def get_n_fb_crc(self, *, count=10, uniq=False, timeout=-1): + """ + Return count DRM CRC from the framebuffer. If uniq is True, + only unique CRCs are returned (which may be less than the + requested cont). + Returns a possibly empty list of integers. + Set timeout to -1 for no timeout, or to a positive number for + a timeout of that many seconds. + """ + # DRM CRCs are exposed through a sysfs pseudo file + try: + self.debugfs_mounted + except AttributeError: + # Note: some init system (e.g. systemd) may have this already + # mounted, so check beforehand + self.assertRunOk("mountpoint /sys/kernel/debug/ || mount -t debugfs none /sys/kernel/debug/") + self.debugfs_mounted = True + + # The first column is the frame number, the second column is the + # CRC measure. We use "head" to get the needed CRC count. + disp_crc_path = "/sys/kernel/debug/dri/0/crtc-0/crc/data" + cmd = f"head -{count} {disp_crc_path}" + + # The DRM CRC sysfs pseudo file lines are terminated by '\n' + # and '\0'. We remove the '\0' to have a text-only output. + cmd += " | tr -d '\\000'" + + # Finally, we drop the frame counter, and keep only the second + # column (CRC values) + cmd += " | cut -f 2 -d ' '" + + if uniq: + cmd += " | sort -u" + + output, exit_code = self.emulator.run(cmd, timeout=timeout) + self.assertTrue(exit_code == 0, f"'{cmd}' failed with exit code {exit_code}") + + return [int(crc, 16) for crc in output] diff --git a/support/testing/tests/package/test_weston.py b/support/testing/tests/package/test_weston.py index df1b7a41358..f37a73565fa 100644 --- a/support/testing/tests/package/test_weston.py +++ b/support/testing/tests/package/test_weston.py @@ -2,9 +2,10 @@ import time import infra.basetest +from ..graphics_base import GraphicsBase -class TestWeston(infra.basetest.BRTest): +class TestWeston(infra.basetest.BRTest, GraphicsBase): config = \ """ BR2_aarch64=y @@ -36,31 +37,6 @@ class TestWeston(infra.basetest.BRTest): infra.filepath("tests/package/test_weston/linux-vkms.fragment") ) - def gen_read_disp_crcs_cmd(self, count=1): - # DRM CRCs are exposed through a sysfs pseudo file, one measure - # per line. The first column is the frame number, the second - # column is the CRC measure. We use "head" to get the needed - # CRC count. - disp_crc_path = "/sys/kernel/debug/dri/0/crtc-0/crc/data" - cmd = f"head -{count} {disp_crc_path}" - - # The DRM CRC sysfs pseudo file lines are terminated by '\n' - # and '\0'. We remove the '\0' to have a text-only output. - cmd += " | tr -d '\\000'" - - # Finally, we drop the frame counter, and keep only the second - # column (CRC values) - cmd += " | cut -f 2 -d ' '" - - return cmd - - def gen_count_unique_disp_crcs_cmd(self, count=10): - # We get the command generating one CRC per line... - cmd = self.gen_read_disp_crcs_cmd(count) - # ...then count the number of unique values - cmd += " | uniq | wc -l" - return cmd - def start_weston(self): self.assertRunOk("export XDG_RUNTIME_DIR=/tmp") @@ -106,25 +82,14 @@ def test_run(self): # Check a simple info client can communicate with the compositor self.assertRunOk("wayland-info", timeout=10) - # This test will use the Kernel VKMS DRM Display CRC support, - # which is exposed in debugfs. See: - # https://docs.kernel.org/gpu/drm-uapi.html#display-crc-support - self.assertRunOk("mount -t debugfs none /sys/kernel/debug/") - # We get 10 consecutive DRM frame CRCs and count how many # unique CRCs we have. Since weston is supposed to run idle, # we should have 10 times the same display CRC. - cmd = self.gen_count_unique_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - self.assertEqual(int(output[0]), 1) + self.assertTrue(len(self.get_n_fb_crc(uniq=True)) == 1) # We save the CRC value of an empty weston desktop for # later... - cmd = self.gen_read_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - weston_desktop_crc = int(output[0], 16) + weston_desktop_crc = self.get_n_fb_crc(count=1)[0] # We start the weston-simple-egl in background... Every # rendered frame is supposed to be different (as the triangle @@ -138,10 +103,8 @@ def test_run(self): # display something, we are now supposed to measure a # different display CRC than the one we measured when the # desktop was empty. - cmd = self.gen_read_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - self.assertNotEqual(int(output[0], 16), weston_desktop_crc) + crc = self.get_n_fb_crc(count=1)[0] + self.assertNotEqual(crc, weston_desktop_crc) # While weston-simple-egl is running, we check the VKMS DRM # CRCs are now changing. We get many CRCs, one per display @@ -152,10 +115,8 @@ def test_run(self): # remain very permissive to slow emulation situations. # Increase timeout, as the command is expected to run about 5s, # which is the default timeout. - cmd = self.gen_count_unique_disp_crcs_cmd(300) - output, exit_code = self.emulator.run(cmd, timeout=10) - self.assertEqual(exit_code, 0) - self.assertGreaterEqual(int(output[0]), 5) + crcs = self.get_n_fb_crc(count=300, timeout=10) + self.assertGreaterEqual(len(crcs), 5) # We stop weston-simple-egl, and sleep a bit to let Weston do # its cleanup and desktop repaint refresh... @@ -165,10 +126,8 @@ def test_run(self): # After we stopped the application, we should have the initial # weston desktop background. The CRC we measure now should be # the same as the one we saved earlier. - cmd = self.gen_read_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - self.assertEqual(int(output[0], 16), weston_desktop_crc) + crc = self.get_n_fb_crc(count=1)[0] + self.assertEqual(crc, weston_desktop_crc) self.stop_weston() From e506946347430e8bc721b55248e625d6668f4c72 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 5 Oct 2023 18:17:41 +0200 Subject: [PATCH 2323/3013] suport/testing/tests/package/test_flutter: extend to check rendering is happening Commit 7f0af11cee31 (support/testing/tests/package/test_flutter.py: new runtime test) added a simple test that just checked that the systemd unit launching the application, was active. It is perfectly possible, from a systemd perspective, that the unit is active, while the application actually crashes. Instead, what we need to check, is that the application does actually render "something"; we don't really care what, as long as we know it is actually rendering, thus the graphical stack is working and the aplication stack is running. Extend the flutter runtime test to also check that the framebuffer is modified by the application when it is running, similarly to what we do in the weston test. We drop the activation of the unit and start it manually, as we want to check the state of the CRC before, while, and after the application runs. We also need to disable the blinking cursor on the console, or we would not be able to detect whether a change in CRC is due to the application starting rendering, or to the cursor blinking. We tell the kernel to disable the cursor with the appropriate kernel command line parameter. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Reviewed-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_flutter.py | 35 +++++++++++++++---- .../flutter-markdown-example.service | 1 - 2 files changed, 29 insertions(+), 7 deletions(-) delete mode 120000 support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service diff --git a/support/testing/tests/package/test_flutter.py b/support/testing/tests/package/test_flutter.py index 3a150a69e1b..08aa497417c 100644 --- a/support/testing/tests/package/test_flutter.py +++ b/support/testing/tests/package/test_flutter.py @@ -1,8 +1,11 @@ import os +import time import infra.basetest +from ..graphics_base import GraphicsBase -class TestFlutter(infra.basetest.BRTest): + +class TestFlutter(infra.basetest.BRTest, GraphicsBase): config = f""" BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y @@ -40,7 +43,7 @@ def test_run(self): self.emulator.boot( arch="aarch64", kernel=kern, - kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + kernel_cmdline=["root=/dev/vda console=ttyAMA0 vt.global_cursor_default=0"], options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", @@ -49,7 +52,27 @@ def test_run(self): "-vnc", "none", "-drive", f"file={img},if=virtio,format=raw"]) self.emulator.login() - cmd = "systemctl is-active flutter-markdown-example" - output, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 0) - self.assertEqual(output[0], "active") + + # Get the CRC from the current ramebuffer + empty_crc = self.get_n_fb_crc(count=1)[0] + + # Start the example App. It can take a bit of time to start, + # so lets try a few times. 600 samples should cover about 10s + # @60Hz (although, the rendering could be much slower on slow + # machines) + self.assertRunOk("systemctl start flutter-markdown-example", timeout=10) + for i in range(600): + gallery_crc = self.get_n_fb_crc(count=1)[0] + if gallery_crc != empty_crc: + break + time.sleep(1) + self.assertNotEqual(gallery_crc, empty_crc, "gallery app did not render anything on screen") + + # Stop the application, and check it restored the framebuffer content + self.assertRunOk("systemctl stop flutter-markdown-example", timeout=10) + for i in range(600): + gallery_crc = self.get_n_fb_crc(count=1)[0] + if gallery_crc == empty_crc: + break + time.sleep(1) + self.assertEqual(gallery_crc, empty_crc, "gallery app did not stop rendering") diff --git a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service deleted file mode 120000 index 83e731ba2df..00000000000 --- a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service +++ /dev/null @@ -1 +0,0 @@ -../../../../usr/lib/systemd/system/flutter-markdown-example.service \ No newline at end of file From 9dff7ad7da4e31d09450a049371ac12f1ebd146f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 7 Aug 2024 11:38:23 -0600 Subject: [PATCH 2324/3013] package/python-tomli-w: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-tomli-w/Config.in | 6 ++++++ package/python-tomli-w/python-tomli-w.hash | 5 +++++ package/python-tomli-w/python-tomli-w.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-tomli-w/Config.in create mode 100644 package/python-tomli-w/python-tomli-w.hash create mode 100644 package/python-tomli-w/python-tomli-w.mk diff --git a/package/Config.in b/package/Config.in index 0472ec2daf5..f2c63ffb6ec 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1408,6 +1408,7 @@ menu "External python modules" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" source "package/python-tomli/Config.in" + source "package/python-tomli-w/Config.in" source "package/python-tomlkit/Config.in" source "package/python-tornado/Config.in" source "package/python-tortoise-orm/Config.in" diff --git a/package/python-tomli-w/Config.in b/package/python-tomli-w/Config.in new file mode 100644 index 00000000000..83fe937ebaa --- /dev/null +++ b/package/python-tomli-w/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TOMLI_W + bool "python-tomli-w" + help + A lil' TOML writer. + + https://github.com/hukkin/tomli-w diff --git a/package/python-tomli-w/python-tomli-w.hash b/package/python-tomli-w/python-tomli-w.hash new file mode 100644 index 00000000000..778c22583a5 --- /dev/null +++ b/package/python-tomli-w/python-tomli-w.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomli-w/json +md5 2c050134d4842b449ec4129c97d51e62 tomli_w-1.0.0.tar.gz +sha256 f463434305e0336248cac9c2dc8076b707d8a12d019dd349f5c1e382dd1ae1b9 tomli_w-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli-w/python-tomli-w.mk b/package/python-tomli-w/python-tomli-w.mk new file mode 100644 index 00000000000..d5d7ab9f2cd --- /dev/null +++ b/package/python-tomli-w/python-tomli-w.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tomli-w +# +################################################################################ + +PYTHON_TOMLI_W_VERSION = 1.0.0 +PYTHON_TOMLI_W_SOURCE = tomli_w-$(PYTHON_TOMLI_W_VERSION).tar.gz +PYTHON_TOMLI_W_SITE = https://files.pythonhosted.org/packages/49/05/6bf21838623186b91aedbda06248ad18f03487dc56fbc20e4db384abde6c +PYTHON_TOMLI_W_SETUP_TYPE = flit +PYTHON_TOMLI_W_LICENSE = MIT +PYTHON_TOMLI_W_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From eea735bb6d89d99e8d536b839300e0432a3fcaab Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 7 Aug 2024 22:55:09 +0200 Subject: [PATCH 2325/3013] package/cryptsetup: bump version to 2.7.4 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index dfee537a4a4..e0cb65642d4 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456 cryptsetup-2.7.3.tar.xz +sha256 dce29903a58f7b774fe61191e7e6de955de0f40d9e27b0028ffcf3438c0e9480 cryptsetup-2.7.4.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d5046d99433..15cadb28408 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From caa1f6c2d42835254e6cb7db0d893b7c1fd730d8 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 7 Aug 2024 21:57:31 +0200 Subject: [PATCH 2326/3013] package/libgpiod2: bump to version 2.1.3 - multiple bugfixes, see [0] - license hash changed as well as cxx-bindings were relicensed to LGPL-2.1+ [0] https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/tree/NEWS?h=v2.1.3 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/libgpiod2/libgpiod2.hash | 4 ++-- package/libgpiod2/libgpiod2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpiod2/libgpiod2.hash b/package/libgpiod2/libgpiod2.hash index b5488496b24..3b498f0eb94 100644 --- a/package/libgpiod2/libgpiod2.hash +++ b/package/libgpiod2/libgpiod2.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 fa4024a080121c958502f9a46a5bda44bea85e7a4dd7fcb3dead463b6fc4261c libgpiod-2.1.tar.xz +sha256 2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58 libgpiod-2.1.3.tar.xz # Hash for license file -sha256 eb17a56966db5d986bec449ee44ed61f01f9e3fafa952e527db67a8f9594fd11 COPYING +sha256 f646ad5159efb51c1130a4b43c31f0759750b1e254d2acf510f368ee2e2085c3 COPYING diff --git a/package/libgpiod2/libgpiod2.mk b/package/libgpiod2/libgpiod2.mk index 856eb9bd14d..142289cb3a7 100644 --- a/package/libgpiod2/libgpiod2.mk +++ b/package/libgpiod2/libgpiod2.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD2_VERSION = 2.1 +LIBGPIOD2_VERSION = 2.1.3 LIBGPIOD2_SOURCE = libgpiod-$(LIBGPIOD2_VERSION).tar.xz LIBGPIOD2_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD2_LICENSE = LGPL-2.1+ From fc4a7276093511fd1ac54959bb7e218b10131875 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 7 Aug 2024 21:57:36 +0200 Subject: [PATCH 2327/3013] support/testing: add vorbis-tools runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../tests/package/test_vorbis_tools.py | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 support/testing/tests/package/test_vorbis_tools.py diff --git a/DEVELOPERS b/DEVELOPERS index 38a19aafcfb..a40201fb718 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1976,6 +1976,7 @@ F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ F: support/testing/tests/package/test_usbutils.py F: support/testing/tests/package/test_usbutils/ +F: support/testing/tests/package/test_vorbis_tools.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_wine.py diff --git a/support/testing/tests/package/test_vorbis_tools.py b/support/testing/tests/package/test_vorbis_tools.py new file mode 100644 index 00000000000..edf186f31d8 --- /dev/null +++ b/support/testing/tests/package/test_vorbis_tools.py @@ -0,0 +1,20 @@ +from tests.package.test_audio_codec_base import TestAudioCodecBase + + +class TestVorbisTools(TestAudioCodecBase): + __test__ = True + config = TestAudioCodecBase.config + \ + """ + BR2_PACKAGE_VORBIS_TOOLS=y + """ + encoded_file = "encoded.ogg" + + def encode_test(self, input_filename): + cmd = "oggenc" + cmd += f" -o {self.encoded_file} {input_filename}" + self.assertRunOk(cmd) + + def decode_test(self, output_filename): + cmd = "oggdec" + cmd += f" -o {output_filename} {self.encoded_file}" + self.assertRunOk(cmd) From aed5bccfee20686c0ce8f076d998e36b63260729 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 7 Aug 2024 23:07:02 +0200 Subject: [PATCH 2328/3013] package/libnss: bump version to 3.103 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index ae82e7eaa84..1370b6ad0d8 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_102_1_RTM/src/SHA256SUMS -sha256 54982d3587e41579c94f2036ba084438b073f8456bbd873b7a942c057e9737cc nss-3.102.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_103_RTM/src/SHA256SUMS +sha256 7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962 nss-3.103.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 93fc1cb543e..4c620a604b9 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.102.1 +LIBNSS_VERSION = 3.103 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From e1aacc3049e03bd788fc58b9233bf5a93f2613a1 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Wed, 7 Aug 2024 12:48:19 -0500 Subject: [PATCH 2329/3013] boot/arm-trusted-firmware: move to official source for tf-a ARM_TRUSTED_FIRMWARE_SITE is currently pointing to the deprecated ARM-software github read-only mirror[0] which is no longer publishing new tags. They do have a newer github mirror under the TrustedFirmware-A organization[1] which continues to receive tag updates we could use however because of the way github generates tarballs changing the SITE to point to TrustedFormware-A changes the pre-calculated hash values for every version for everyone. Without much way around changing all hash values if we want these latest tags, lets drop the github mirrors and move to the official git source[2] so we can download real tarballs which shouldn't change even if the ARM_TRUSTED_FIRMWARE_SITE moves again and hopefully preventing this from ever happening again. [2] https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/ [1] https://github.com/TrustedFirmware-A/trusted-firmware-a [0] https://github.com/ARM-software/arm-trusted-firmware Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 4 ++-- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 3 ++- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 02714d06a09..6f02bfbb22e 100644 --- a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 02714d06a09..6f02bfbb22e 100644 --- a/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 02714d06a09..6f02bfbb22e 100644 --- a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 02714d06a09..6f02bfbb22e 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash index c9d043c46f1..8b3df439a05 100644 --- a/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 74fe35c9bc7..0b99949745e 100644 --- a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz +sha256 c9f0d0bf967d690edbf34b621728a6271856f2e26ed46081a285b6d627a358c5 arm-trusted-firmware-v2.7-git4.tar.gz diff --git a/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8b69a5a9645..2bc5030cf2f 100644 --- a/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 06d32acf42808b682859008292f0591d2d872f19aa1a8021bfcd1c1c626285e6 arm-trusted-firmware-v2.9.tar.gz +sha256 72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8 arm-trusted-firmware-v2.9-git4.tar.gz diff --git a/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8f60864fbf6..f0635a66526 100644 --- a/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz +sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 7494e04ead5..d68ac4bd30d 100644 --- a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz +sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 7494e04ead5..d68ac4bd30d 100644 --- a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz +sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 73ab431b9fc..660edb121ed 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz -sha256 e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274 arm-trusted-firmware-lts-v2.8.13.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +sha256 695ae232fef6da931157e032b520f145b2c4cbe675d92b6a12222a332e960e89 arm-trusted-firmware-lts-v2.8.13-git4.tar.gz sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index abf917948ee..1b2cc3a236e 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -16,7 +16,8 @@ ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUST ARM_TRUSTED_FIRMWARE_SITE_METHOD = git else # Handle stable official ATF versions -ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) +ARM_TRUSTED_FIRMWARE_SITE = https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git +ARM_TRUSTED_FIRMWARE_SITE_METHOD = git # The licensing of custom or from-git versions is unknown. # This is valid only for the latest (i.e. known) version. ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) From 886cdf6c91652bb533ec714b0b29dd23ea8ed829 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 Jul 2024 12:33:29 -0700 Subject: [PATCH 2330/3013] package/go: security bump version to go1.22.5 Fixes CVE: CVE-2024-24791: net/http: denial of service due to improper 100-continue handling https://go.dev/doc/devel/release#go1.22.5 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 5d02277884e406625c0142e7c3e68dfe30bdf6c4) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 7952461f2d5..d300f6e2c90 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784 go1.22.4.src.tar.gz +sha256 ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 go1.22.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 461a472dd49..e6f61d643be 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.22.4 +GO_VERSION = 1.22.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 9c50759cd1677e1739078239a1e86fb1d62e33e8 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Wed, 7 Aug 2024 12:48:20 -0500 Subject: [PATCH 2331/3013] boot/arm-trusted-firmware: bump to v2.11 Update trusted-firmware-a to v2.11 The hash of the license file is updated due to this change: See the original `Linux MIT license`_. +- Some source files originating from the `Open Profile for DICE`_ project. + These files are licensed under the Apache License, Version 2.0, which is a + permissive license compatible with BSD-3-Clause. Any contributions to this + code must also be made under the terms of `Apache License 2.0`_. + These files are: + + - ``include/lib/dice/dice.h`` + .. _FreeBSD: http://www.freebsd.org .. _Linux MIT license: https://raw.githubusercontent.com/torvalds/linux/master/LICENSES/preferred/MIT .. _SCC: http://www.simple-cc.org/ +.. _Open Profile for DICE: https://pigweed.googlesource.com/open-dice/ +.. _Apache License 2.0: https://www.apache.org/licenses/LICENSE-2.0.txt + As we only document the main license of TF-A, BSD-3-Clause, this change has no impact for us. Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 4 ++-- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 2fe3dd1146e..60ecf419bc3 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -14,7 +14,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.10" + bool "v2.11" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION bool "latest lts-v2.8.x" @@ -47,7 +47,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.10" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.11" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "lts-v2.8.13" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 660edb121ed..8095eb29d2c 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz sha256 695ae232fef6da931157e032b520f145b2c4cbe675d92b6a12222a332e960e89 arm-trusted-firmware-lts-v2.8.13-git4.tar.gz -sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst +sha256 03d5088ff4fbfe989f3c807117356191c263cf27d62ee6916bde8532611728ed docs/license.rst From 7f2cfcc8f41ddcab5b573c31f8fa99b9c32ff16f Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Wed, 7 Aug 2024 12:48:21 -0500 Subject: [PATCH 2332/3013] boot/arm-trusted-firmware: bump lts-v2.8 to v2.8.20 bump the lts-v2.8.x branch to v2.8.20. Our patch still applies. Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 2 +- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- .../0001-build-tools-avoid-unnecessary-link.patch | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename boot/arm-trusted-firmware/{lts-v2.8.13 => lts-v2.8.20}/0001-build-tools-avoid-unnecessary-link.patch (100%) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 60ecf419bc3..870db48c80b 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -48,7 +48,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string default "v2.11" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - default "lts-v2.8.13" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION + default "lts-v2.8.20" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 8095eb29d2c..37819ed1604 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz -sha256 695ae232fef6da931157e032b520f145b2c4cbe675d92b6a12222a332e960e89 arm-trusted-firmware-lts-v2.8.13-git4.tar.gz +sha256 a90617cc2c1791c98d36b9e3d9a7f3f77029897e00c4279ff4ef559b769e9d7b arm-trusted-firmware-lts-v2.8.20-git4.tar.gz sha256 03d5088ff4fbfe989f3c807117356191c263cf27d62ee6916bde8532611728ed docs/license.rst diff --git a/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/lts-v2.8.20/0001-build-tools-avoid-unnecessary-link.patch similarity index 100% rename from boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch rename to boot/arm-trusted-firmware/lts-v2.8.20/0001-build-tools-avoid-unnecessary-link.patch From c48c3cf48223f2abda7da58bf206eac87c89b08b Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Wed, 7 Aug 2024 12:48:22 -0500 Subject: [PATCH 2333/3013] boot/arm-trusted-firmware: add lts-v2.10.x selection There is a new lts-v2.10.x branch. Add it to the selection Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 6 ++++++ boot/arm-trusted-firmware/arm-trusted-firmware.hash | 1 + 2 files changed, 7 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 870db48c80b..02a6db795a1 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -16,6 +16,11 @@ choice config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION bool "v2.11" +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION + bool "latest lts-v2.10.x" + help + Select the latest LTS v2.10.x version available + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION bool "latest lts-v2.8.x" help @@ -48,6 +53,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string default "v2.11" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "lts-v2.10.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION default "lts-v2.8.20" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 37819ed1604..4e446eaff5a 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,4 +1,5 @@ # Locally calculated sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz +sha256 62af6f1f2e9406d761ace03025f6bf22a0670578b1d0b76092dc1db455746dad arm-trusted-firmware-lts-v2.10.5-git4.tar.gz sha256 a90617cc2c1791c98d36b9e3d9a7f3f77029897e00c4279ff4ef559b769e9d7b arm-trusted-firmware-lts-v2.8.20-git4.tar.gz sha256 03d5088ff4fbfe989f3c807117356191c263cf27d62ee6916bde8532611728ed docs/license.rst From 88e8f08fb676ab6c8d441f66d5ecbdac9bfff628 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Aug 2024 23:56:25 +0200 Subject: [PATCH 2334/3013] boot/arm-trusted-firmware: also provide license info for LTS versions This commit adds license information, and license file hashes for LTS versions, by using per-version directories. Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 5 ----- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- .../lts-v2.10.5/arm-trusted-firmware.hash | 3 +++ .../lts-v2.8.20/arm-trusted-firmware.hash | 3 +++ boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash | 3 +++ 5 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 boot/arm-trusted-firmware/arm-trusted-firmware.hash create mode 100644 boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash create mode 100644 boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash create mode 100644 boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash deleted file mode 100644 index 4e446eaff5a..00000000000 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally calculated -sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz -sha256 62af6f1f2e9406d761ace03025f6bf22a0670578b1d0b76092dc1db455746dad arm-trusted-firmware-lts-v2.10.5-git4.tar.gz -sha256 a90617cc2c1791c98d36b9e3d9a7f3f77029897e00c4279ff4ef559b769e9d7b arm-trusted-firmware-lts-v2.8.20-git4.tar.gz -sha256 03d5088ff4fbfe989f3c807117356191c263cf27d62ee6916bde8532611728ed docs/license.rst diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1b2cc3a236e..a3a44feea94 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -20,7 +20,7 @@ ARM_TRUSTED_FIRMWARE_SITE = https://git.trustedfirmware.org/TF-A/trusted-firmwar ARM_TRUSTED_FIRMWARE_SITE_METHOD = git # The licensing of custom or from-git versions is unknown. # This is valid only for the latest (i.e. known) version. -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif diff --git a/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash new file mode 100644 index 00000000000..66573371189 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 62af6f1f2e9406d761ace03025f6bf22a0670578b1d0b76092dc1db455746dad arm-trusted-firmware-lts-v2.10.5-git4.tar.gz +sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash new file mode 100644 index 00000000000..6368bf7f988 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a90617cc2c1791c98d36b9e3d9a7f3f77029897e00c4279ff4ef559b769e9d7b arm-trusted-firmware-lts-v2.8.20-git4.tar.gz +sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash new file mode 100644 index 00000000000..984978dc11b --- /dev/null +++ b/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz +sha256 03d5088ff4fbfe989f3c807117356191c263cf27d62ee6916bde8532611728ed docs/license.rst From 53116d091562fb260460382fa295738323decf3d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Aug 2024 00:16:17 +0200 Subject: [PATCH 2335/3013] DEVELOPERS: drop Ariel D'Alessandro : host aspmx.l.google.com[2a00:1450:400c:c07::1a] said: 550-5.2.1 The email account that you tried to reach is inactive. For more 550-5.2.1 information, go to 550 5.2.1 https://support.google.com/mail/?p=DisabledUser ffacd0b85a97d-36bbd075381si7797549f8f.548 - gsmtp (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a40201fb718..c52f53565ca 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -268,12 +268,6 @@ F: configs/snps_archs38_axs103_defconfig F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig -N: Ariel D'Alessandro -F: board/bsh/ -F: configs/imx8mn_bsh_smm_s2_pro_defconfig -F: package/axfsutils/ -F: package/mali-t76x/ - N: Arnaud Aujon F: package/espeak/ From 09766aab583750b2227bff45c5f51460b36eb7a7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 23:59:14 +0200 Subject: [PATCH 2336/3013] package/uvw: bump to 3.4.0 This allows uvw to be again in sync with the libuv package, following the bump of libuv to v1.48 in commit bd2f99246c253739a3d44d8345f2fbb5362b3fb5 ("package/libuv: security bump to version 1.48") The hash of the license file has changed due to a copyright year update. Signed-off-by: Thomas Petazzoni (cherry picked from commit c54134bf6914593caaa9ed4aa11cbe3a17c59eca) Signed-off-by: Peter Korsgaard --- package/uvw/uvw.hash | 4 ++-- package/uvw/uvw.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 2dc6e879e1f..d346ac16198 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714 uvw-3.2.0_libuv_v1.46.tar.gz -sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE +sha256 c16600573871a5feeb524234b378ab832c8971b2a68d030c6bd0e3077d416ade uvw-3.4.0_libuv_v1.48.tar.gz +sha256 5e439d0ad6e1b16f2f14023872c49cb2cf1b62a172c30b864cb45a5aa6533454 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 12149d43ca5..a1eff0e4dd7 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 3.2.0_libuv_v1.46 +UVW_VERSION = 3.4.0_libuv_v1.48 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From 250a3544bff016a0a69fa3847808f221dc54af0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 8 Aug 2024 14:39:38 +0200 Subject: [PATCH 2337/3013] board/raspberrypi: reword console comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Raspberry Pi with Bluetooth connectivity up to 4 (i.e. Zero W, Zero 2 W, 3, 4 and Compute Module 4) use the miniuart-bt overlay to restore UART0 for the serial console (like the Raspberry Pi and Raspberry Pi 2 that have no Bluetooth); the Bluetooth uses the mini-UART instead[1][2]. This rewords the comment instead of enumerating every hardwares that can be extended in the future. [1]: https://www.raspberrypi.com/documentation/computers/configuration.html#uarts-and-device-tree [2]: https://github.com/raspberrypi/linux/blob/rpi-6.6.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L4-L6 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- board/raspberrypi/config_0w.txt | 2 +- board/raspberrypi/config_3.txt | 2 +- board/raspberrypi/config_3_64bit.txt | 2 +- board/raspberrypi/config_3_qt5we.txt | 2 +- board/raspberrypi/config_4.txt | 2 +- board/raspberrypi/config_4_64bit.txt | 2 +- board/raspberrypi/config_cm4io.txt | 2 +- board/raspberrypi/config_cm4io_64bit.txt | 2 +- board/raspberrypi/config_zero2w.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt index bc59d5fad2e..123e09cf56c 100644 --- a/board/raspberrypi/config_0w.txt +++ b/board/raspberrypi/config_0w.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt index bc59d5fad2e..123e09cf56c 100644 --- a/board/raspberrypi/config_3.txt +++ b/board/raspberrypi/config_3.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt index 66728711257..88206e9b144 100644 --- a/board/raspberrypi/config_3_64bit.txt +++ b/board/raspberrypi/config_3_64bit.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_3_qt5we.txt b/board/raspberrypi/config_3_qt5we.txt index 752310b1795..3d81a4e5da3 100644 --- a/board/raspberrypi/config_3_qt5we.txt +++ b/board/raspberrypi/config_3_qt5we.txt @@ -22,5 +22,5 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=200 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt index 74a7b270cdf..9b77d23d740 100644 --- a/board/raspberrypi/config_4.txt +++ b/board/raspberrypi/config_4.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt index a4ae327d2a2..fcb1c5c30a3 100644 --- a/board/raspberrypi/config_4_64bit.txt +++ b/board/raspberrypi/config_4_64bit.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_cm4io.txt b/board/raspberrypi/config_cm4io.txt index cf7e6df1a1a..15751e71875 100644 --- a/board/raspberrypi/config_cm4io.txt +++ b/board/raspberrypi/config_cm4io.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable RTC diff --git a/board/raspberrypi/config_cm4io_64bit.txt b/board/raspberrypi/config_cm4io_64bit.txt index 813f6eba7b8..4884bda553c 100644 --- a/board/raspberrypi/config_cm4io_64bit.txt +++ b/board/raspberrypi/config_cm4io_64bit.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable RTC diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt index 55095f64a7d..123e09cf56c 100644 --- a/board/raspberrypi/config_zero2w.txt +++ b/board/raspberrypi/config_zero2w.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B ,zero W and zero 2) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach From 18ae3b5d7e4c4f85d1323bf797216d6de28d4c0b Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 8 Aug 2024 08:28:33 +0200 Subject: [PATCH 2338/3013] package/fmt: bump to version 11.0.2 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/fmt/fmt.hash | 2 +- package/fmt/fmt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 90d78dd9893..aff52ccb6e7 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 62ca45531814109b5d6cef0cf2fd17db92c32a30dd23012976e768c685534814 fmt-11.0.1.zip +sha256 40fc58bebcf38c759e11a7bd8fdc163507d2423ef5058bba7f26280c5b9c5465 fmt-11.0.2.zip sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index d33b5b1bff6..113652e9116 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 11.0.1 +FMT_VERSION = 11.0.2 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception From 038af921dc90d54a0bf5dabad8b03327cfe44247 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 8 Aug 2024 15:39:01 +0200 Subject: [PATCH 2339/3013] package/valgrind: fix MIPS build issues Add two patches from upstream to fix MIPS build issues. Fixes: - http://autobuild.buildroot.net/results/4cb021207d341b412ef6921c3368da3b644d7eb0 - http://autobuild.buildroot.net/results/d0ef7145960695bbbec23909b1ca24a5336f3c23 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...ninitialized-err-in-handle_extension.patch | 47 +++++++++++++++++++ ...st_IP_AT_SYSCALL-in-handle_extension.patch | 33 +++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch create mode 100644 package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch diff --git a/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch b/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch new file mode 100644 index 00000000000..c6a6b3dce3f --- /dev/null +++ b/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch @@ -0,0 +1,47 @@ +From 94c2e5c6be23c6323f24deacdad5f98fb9f0b1c2 Mon Sep 17 00:00:00 2001 +From: Andreas Arnez +Date: Wed, 15 May 2024 14:32:42 +0200 +Subject: [PATCH] Fix uninitialized `err' in handle_extension() + +In handle_extension(), in the case of a second return from SCHEDSETJMP the +variable `err' would be used uninitialized. Fix this by avoiding any +access to `err' in this case. + +Signed-off-by: Andreas Arnez +Signed-off-by: Waldemar Brodkorb +Upstream: https://sourceware.org/git/?p=valgrind.git;a=commit;h=94c2e5c6be23c6323f24deacdad5f98fb9f0b1c2 +--- + coregrind/m_scheduler/scheduler.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c +index fc8cf7c9c..29751bb28 100644 +--- a/coregrind/m_scheduler/scheduler.c ++++ b/coregrind/m_scheduler/scheduler.c +@@ -1233,7 +1233,10 @@ static void handle_extension(ThreadId tid) + SCHEDSETJMP(tid, jumped, err = VG_(client_extension)(tid)); + vg_assert(VG_(is_running_thread)(tid)); + +- if (err != ExtErr_OK) { ++ if (jumped != (UWord)0) { ++ block_signals(); ++ VG_(poll_signals)(tid); ++ } else if (err != ExtErr_OK) { + ThreadState* tst = VG_(get_ThreadState)(tid); + Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL; + switch (err) { +@@ -1244,11 +1247,6 @@ static void handle_extension(ThreadId tid) + VG_(core_panic)("scheduler: bad return code from extension"); + } + } +- +- if (jumped != (UWord)0) { +- block_signals(); +- VG_(poll_signals)(tid); +- } + } + + /* tid just requested a jump to the noredir version of its current +-- +2.39.2 + diff --git a/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch b/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch new file mode 100644 index 00000000000..006e24096e9 --- /dev/null +++ b/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch @@ -0,0 +1,33 @@ +From 16249b21456d681b5d98400287b8dbd926050c75 Mon Sep 17 00:00:00 2001 +From: Andreas Arnez +Date: Wed, 15 May 2024 14:32:42 +0200 +Subject: [PATCH] Avoid use of guest_IP_AT_SYSCALL in handle_extension() + +The guest state field guest_IP_AT_SYSCALL is referenced in +handle_extension(), even though it may not be defined by all +architectures. Avoid its use altogether. + +Signed-off-by: Andreas Arnez +Signed-off-by: Waldemar Brodkorb +Upstream: https://sourceware.org/git/?p=valgrind.git;a=commit;h=16249b21456d681b5d98400287b8dbd926050c75 +--- + coregrind/m_scheduler/scheduler.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c +index 29751bb28..cc8d070b7 100644 +--- a/coregrind/m_scheduler/scheduler.c ++++ b/coregrind/m_scheduler/scheduler.c +@@ -1237,8 +1237,7 @@ static void handle_extension(ThreadId tid) + block_signals(); + VG_(poll_signals)(tid); + } else if (err != ExtErr_OK) { +- ThreadState* tst = VG_(get_ThreadState)(tid); +- Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL; ++ Addr addr = VG_(get_IP)(tid); + switch (err) { + case ExtErr_Illop: + VG_(synth_sigill)(tid, addr); +-- +2.39.2 + From 7c21eeed18221496bfbca311d367a4d20e4685d4 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 8 Aug 2024 16:17:43 +0200 Subject: [PATCH 2340/3013] package/depot-tools: bump version to 75932421da2cd8b5807a4ac52ed2a6f46d7c2120 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/depot-tools/depot-tools.hash | 2 +- package/depot-tools/depot-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/depot-tools/depot-tools.hash b/package/depot-tools/depot-tools.hash index e2dfe2f9234..5e172a9a9a9 100644 --- a/package/depot-tools/depot-tools.hash +++ b/package/depot-tools/depot-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 75cc0f9c8bf711c1821b2b1ac873fe75c6fa256f5cdd6a5585a02214ed36d792 depot-tools-8d14454ba4a35fd9d2483842b08815a2357ec86f-git4.tar.gz +sha256 c085a4bc561c90555555461d5810dd406e723618313f24eb2161421f9306b498 depot-tools-75932421da2cd8b5807a4ac52ed2a6f46d7c2120-git4.tar.gz sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d LICENSE diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index a53afa14d61..0d7048b8eb2 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEPOT_TOOLS_VERSION = 8d14454ba4a35fd9d2483842b08815a2357ec86f +DEPOT_TOOLS_VERSION = 75932421da2cd8b5807a4ac52ed2a6f46d7c2120 DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause From 7f7a5f0374e51812b17b08d5e45d544d70bb974e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 8 Aug 2024 16:17:44 +0200 Subject: [PATCH 2341/3013] package/flutter-sdk-bin: bump version to 3.24.0 As of https://github.com/flutter/engine/pull/51943, by default, flutter now uses and provides the AOT snapshot frontend server instead of the frontend_server.dart.snapshot. The depfile produced by dart has been renamed from kernel_snapshot.d to kernel_snapshot_program.d. Flutter programs must compile with the dartaotruntime binary instead of the dart binary, or else errors occure stating that the dartaotruntime must be used. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index b697b9cc900..4f3622e725c 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6590607e7f2fb23bcc7e0a2d6aac292f9208cbf12a40862c281058c758604fb3 flutter_linux_3.19.5-stable.tar.xz +sha256 d52a5d12f17d8bcf868d1ccc01fe0f7ffb05b53d9628aa21b07a18f9d33621f2 flutter_linux_3.24.0-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 321c08680fd..26415551bc7 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.19.5 +FLUTTER_SDK_BIN_VERSION = 3.24.0 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause @@ -68,11 +68,11 @@ HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false endif # The Order matters.Taken from: -# https://github.com/meta-flutter/meta-flutter/blob/kirkstone/classes/flutter-app.inc +# https://github.com/meta-flutter/meta-flutter/blob/scarthgap/conf/include/common.inc HOST_FLUTTER_SDK_BIN_DART_ARGS = \ --verbose \ --disable-analytics \ - --disable-dart-dev $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/linux-x64/frontend_server.dart.snapshot \ + --disable-dart-dev $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/linux-x64/frontend_server_aot.dart.snapshot \ --sdk-root $(HOST_FLUTTER_SDK_BIN_SDK_ROOT) \ --target=flutter \ --no-print-incremental-dependencies \ @@ -85,7 +85,7 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \ --target-os linux \ --packages .dart_tool/package_config.json \ --output-dill .dart_tool/flutter_build/*/app.dill \ - --depfile .dart_tool/flutter_build/*/kernel_snapshot.d + --depfile .dart_tool/flutter_build/*/kernel_snapshot_program.d # Helper wrapper to run flutter when building flutter applications. HOST_FLUTTER_SDK_BIN_FLUTTER = \ @@ -95,7 +95,7 @@ HOST_FLUTTER_SDK_BIN_FLUTTER = \ # Helper wrapper to run dart when building flutter applications. HOST_FLUTTER_SDK_BIN_DART_BIN = \ $(HOST_FLUTTER_SDK_BIN_ENV) \ - $(HOST_FLUTTER_SDK_BIN_DART_SDK)/bin/dart \ + $(HOST_FLUTTER_SDK_BIN_DART_SDK)/bin/dartaotruntime \ $(HOST_FLUTTER_SDK_BIN_DART_ARGS) $(eval $(host-generic-package)) From dbd1dce67dd2deacaea726dd3380cc348c602cfc Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 8 Aug 2024 16:17:45 +0200 Subject: [PATCH 2342/3013] package/flutter-engine: bump version to 3.24.0 Add `"download_fuchsia_deps": False` to the dot-gclient file as this is for linux, not fuchsia, so the dependencies are not necessary. Also, change various paths in flutter-engine.mk to ensure that the package builds correctly. Remove patch 0005-skip-configuration-dependency-if-unit-tests-are-disa.patch which is upstream. Tested with tests.package.test_flutter.TestFlutter.test_run Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...on-dependency-if-unit-tests-are-disa.patch | 32 ------------------- package/flutter-engine/dot-gclient | 3 +- package/flutter-engine/flutter-engine.mk | 10 +++--- 3 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch diff --git a/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch b/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch deleted file mode 100644 index 125bfc6910b..00000000000 --- a/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2252a85e59669b5826019f60a98b7a69939dacfd Mon Sep 17 00:00:00 2001 -From: Greg Spencer -Date: Mon, 4 Mar 2024 12:30:41 -0800 -Subject: [PATCH] Skip configuration dependency if unit tests are disabled. - -Commit 88baf62f made gtk+-3.0 an unconditional requirement, see: - -Issue: https://github.com/flutter/flutter/issues/144421 -Upstream: Merged. https://github.com/flutter/engine/pull/51179 - -Signed-off-by: Greg Spencer -Signed-off-by: Adam Duskett ---- - flutter/testing/BUILD.gn | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flutter/testing/BUILD.gn b/flutter/testing/BUILD.gn -index 9eac29452..a7d094695 100644 ---- a/flutter/testing/BUILD.gn -+++ b/flutter/testing/BUILD.gn -@@ -51,7 +51,7 @@ source_set("testing") { - - sources = [ "run_all_unittests.cc" ] - -- if (is_linux) { -+ if (enable_unittests && is_linux) { - # So that we can call gtk_init in main(). - configs += [ "//flutter/shell/platform/linux/config:gtk" ] - } --- -2.44.0 - diff --git a/package/flutter-engine/dot-gclient b/package/flutter-engine/dot-gclient index ba9590a7f5f..6ead80c8c22 100644 --- a/package/flutter-engine/dot-gclient +++ b/package/flutter-engine/dot-gclient @@ -8,6 +8,7 @@ solutions = [{ "custom_vars": { "download_android_deps": False, "download_windows_deps": False, - "download_linux_deps": False + "download_linux_deps": False, + "download_fuchsia_deps": False }, }] diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index dfc3c03ef97..020fa2ee8a4 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.19.5 +FLUTTER_ENGINE_VERSION = 3.24.0 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = @@ -67,7 +67,7 @@ FLUTTER_ENGINE_INSTALL_FILES = libflutter_engine.so # Flutter engine includes a bundled patched clang that must be used for # compiling or else there are linking errors. -FLUTTER_ENGINE_CLANG_PATH = $(@D)/buildtools/linux-x64/clang +FLUTTER_ENGINE_CLANG_PATH = $(@D)/flutter/buildtools/linux-x64/clang FLUTTER_ENGINE_CONF_OPTS = \ --clang \ @@ -126,7 +126,7 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) FLUTTER_ENGINE_DEPENDENCIES += libgles -FLUTTER_ENGINE_CONF_OPTS += --enable-impeller-opengles +FLUTTER_ENGINE_CONF_OPTS += --enable-impeller-3d endif ifeq ($(BR2_PACKAGE_LIBGLFW),y) @@ -153,7 +153,7 @@ FLUTTER_ENGINE_DEPENDENCIES += libxcb else define FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP $(SED) "s%vulkan_use_x11.*%vulkan_use_x11 = false%g" -i \ - $(@D)/build_overrides/vulkan_headers.gni + $(@D)/flutter/build_overrides/vulkan_headers.gni $(SED) "s%ozone_platform_x11.*%ozone_platform_x11 = false%g" \ $(@D)/build/config/BUILDCONFIG.gn @@ -166,7 +166,7 @@ FLUTTER_ENGINE_DEPENDENCIES += wayland else define FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP $(SED) "s%vulkan_use_wayland.*%vulkan_use_wayland = false%g" \ - $(@D)/build_overrides/vulkan_headers.gni + $(@D)/flutter/build_overrides/vulkan_headers.gni $(SED) "s%ozone_platform_wayland.*%ozone_platform_wayland = false%g" \ $(@D)/build/config/BUILDCONFIG.gn From 0b771887ca01a076b9169c1ac880e523c5fe6f44 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 8 Aug 2024 16:17:46 +0200 Subject: [PATCH 2343/3013] package/flutter-pi: bump version to 37bd9773c1938e5f76208bc4e8632fdbbb4190ff Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/flutter-pi/flutter-pi.hash | 2 +- package/flutter-pi/flutter-pi.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash index 135a0deb32e..6a735247457 100644 --- a/package/flutter-pi/flutter-pi.hash +++ b/package/flutter-pi/flutter-pi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7ce5c8d960735923f6897dd9852b89c8010a01b9a29f4f6bbbf7c016dac623c flutter-pi-783db32ec6441b878783bfa241777d3bfe6b35e2-git4.tar.gz +sha256 c3c7df5712cd7c45539b325b0d8d58d0942b08a6f66c55e3f53aa5225cbe86af flutter-pi-37bd9773c1938e5f76208bc4e8632fdbbb4190ff-git4.tar.gz sha256 b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70 LICENSE diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index ee54a2bf4ee..fad1da32159 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PI_VERSION = 783db32ec6441b878783bfa241777d3bfe6b35e2 +FLUTTER_PI_VERSION = 37bd9773c1938e5f76208bc4e8632fdbbb4190ff FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git FLUTTER_PI_SITE_METHOD = git FLUTTER_PI_LICENSE = MIT @@ -33,7 +33,8 @@ FLUTTER_PI_CONF_OPTS = \ -DTRY_ENABLE_VULKAN=OFF \ -DVULKAN_DEBUG="OFF" \ -DUSE_LEGACY_KMS=OFF \ - -DWARN_MISSING_FIELD_INITIALIZERS=OFF + -DWARN_MISSING_FIELD_INITIALIZERS=OFF \ + -DBUILD_SENTRY_PLUGIN=OFF ifeq ($(BR2_ENABLE_LTO),y) FLUTTER_PI_CONF_OPTS += -DLTO=ON From 50bf83cb7520c5c1eee36ca55c69fef2aaef559f Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sun, 19 May 2024 11:16:04 +0200 Subject: [PATCH 2344/3013] package/webkitgtk: bump to 2.44.2 A lot has been changed in 2.44.0, please consult the announcement [1], what's new [2], and the security advisory [3] for more details. Specific to this bump: - Libegl is now mandatory [4] and the USE_OPENGL_OR_ES flag has been dropped. While at it, also explicitly add the libepoxy dependency which is now selected by libgtk3. - The WPE renderer has been dropped [2], so drop the wpebackend-fdo dependency. - JPEG2000 has been dropped [2], so drop the OpenJPEG dependency. - GTK4 is now the default, so turn it off, since buildroot has no GTK4 support yet [2]. - USE_LIBBACKTRACE has been added [5], so select it properly. - Support for ENABLE_WEB_CODECS has been added, which will now be enabled together with audio and video support. - ENABLE_WEBASSEMBLY is forbidden when ENABLE_C_LOOP [6], so disable it when compiling for MIPS r6, ARMv5, and ARMv6. In the meantime, a follow-up 2.44.1 and 2.44.2 release has been announced [7][8], which contains a bunch of patches that were accepted upstream. Including build fixes for 32-bit devices, and disabling video. [1]: https://webkitgtk.org/2024/03/16/webkitgtk2.44.0-released.html [2]: https://webkitgtk.org/2024/03/27/webkigit-2.44.html [3]: https://webkitgtk.org/security/WSA-2024-0002.html [4]: https://commits.webkit.org/271345@main [5]: https://commits.webkit.org/268579@main [6]: https://commits.webkit.org/271347@main [7]: https://webkitgtk.org/2024/04/09/webkitgtk2.44.1-released.html [8]: https://webkitgtk.org/2024/05/16/webkitgtk2.44.2-released.html Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro Tested-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit d5ff56ef06c46bc870cc677d34cec2639852c823) Signed-off-by: Peter Korsgaard --- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 --------------- package/webkitgtk/Config.in | 4 +- package/webkitgtk/webkitgtk.hash | 6 +-- package/webkitgtk/webkitgtk.mk | 50 ++++++++----------- 4 files changed, 26 insertions(+), 73 deletions(-) delete mode 100644 package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch deleted file mode 100644 index c9667fedbdd..00000000000 --- a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 5 Feb 2024 11:00:49 -0600 -Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= - =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= - =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= - =?UTF-8?q?=3D268739?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Unreviewed build fix. Seems a backport went badly, and we didn't notice -because the code is architecture-specific. - -* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: -(JSC::CLoop::execute): - -Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff -Signed-off-by: Peter Korsgaard ---- - Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index 5064ead6cd2e..9a2e2653b121 100644 ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, - UNUSED_VARIABLE(t2); - UNUSED_VARIABLE(t3); - UNUSED_VARIABLE(t5); -- UNUSED_VARIABLE(t6); -- UNUSED_VARIABLE(t7); - - struct StackPointerScope { - StackPointerScope(CLoopStack& stack) --- -2.39.2 - diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index ace1b8739f9..8ee90dda1ca 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -29,6 +29,7 @@ config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" depends on !BR2_STATIC_LIBS # wayland depends on !BR2_BINFMT_FLAT # icu + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 @@ -42,18 +43,17 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_ICU select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_LIBSOUP3 select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 - select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index ac4799d4cf9..7da0e97e5d5 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums -sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz -sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz.sums +sha1 e62b2c545011a2f180a914529a68950c4d34a2ee webkitgtk-2.44.2.tar.xz +sha256 523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b webkitgtk-2.44.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 075a36654f6..468fefab0ef 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.42.5 +WEBKITGTK_VERSION = 2.44.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -14,8 +14,8 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ - enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup3 \ - libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 + enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk3 libsecret \ + libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2 WEBKITGTK_CMAKE_BACKEND = ninja @@ -28,8 +28,8 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ -DUSE_AVIF=OFF \ + -DUSE_GTK4=OFF \ -DUSE_LIBHYPHEN=OFF \ - -DUSE_OPENJPEG=ON \ -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) @@ -45,12 +45,14 @@ endif ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=ON \ - -DENABLE_WEB_AUDIO=ON + -DENABLE_WEB_AUDIO=ON \ + -DENABLE_WEB_CODECS=ON WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base else WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=OFF \ - -DENABLE_WEB_AUDIO=OFF + -DENABLE_WEB_AUDIO=OFF \ + -DENABLE_WEB_CODECS=OFF endif ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y) @@ -73,6 +75,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBBACKTRACE),y) +WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=ON +WEBKITGTK_DEPENDENCIES += libbacktrace +else +WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF +endif + ifeq ($(BR2_PACKAGE_LIBJXL),y) WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON WEBKITGTK_DEPENDENCIES += libjxl @@ -87,13 +96,6 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON -WEBKITGTK_DEPENDENCIES += libgles -else -WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF -endif - ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON WEBKITGTK_DEPENDENCIES += libgbm @@ -111,23 +113,10 @@ endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON -WEBKITGTK_DEPENDENCIES += libegl else WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF endif -# If only the GTK Broadway backend is enabled, EGL is still needed. -ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LIBGTK3_BROADWAY),::y) -WEBKITGTK_DEPENDENCIES += libegl -endif - -ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) -WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON -WEBKITGTK_DEPENDENCIES += wpebackend-fdo -else -WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=OFF -endif - ifeq ($(BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL),y) WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON else @@ -145,14 +134,17 @@ endif # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. # -# Also, we have to disable the sampling profiler, which does NOT work -# with ENABLE_C_LOOP. +# Also, we have to disable the sampling profiler and webassembly, +# which does NOT work with ENABLE_C_LOOP. # # Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 # https://bugs.webkit.org/show_bug.cgi?id=172765 +# https://bugs.webkit.org/show_bug.cgi?id=265218 # ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON \ + -DENABLE_SAMPLING_PROFILER=OFF \ + -DENABLE_WEBASSEMBLY=OFF endif $(eval $(cmake-package)) From 3e0ff92ac6843be664cd65e7251741228f683b48 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 8 Aug 2024 16:17:47 +0200 Subject: [PATCH 2345/3013] package/flutter-packages: bump version to 8af79fbca12699248e96b50b4705da74396cd6a3 As of commit e35f29177495131f0f598fc7ae1ffd74d89edf15, the dynamic-layouts example has been removed from the flutter-packages repository, which fixes https://github.com/flutter/flutter/issues/148979. The exact reasoning is as follows: ``` The dynamic_layouts package is unpublished, and its core feature set has not been updated in years. Though it's not high-traffic, all packages in that repo require maintenance for Flutter versions, gradle bumps, and project migrations. ``` Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/flutter-packages/Config.in | 1 - .../flutter-dynamic-layouts-example/Config.in | 8 --- .../flutter-dynamic-layouts-example.hash | 1 - .../flutter-dynamic-layouts-example.mk | 54 ------------------- .../flutter-packages/flutter-packages.hash | 2 +- package/flutter-packages/flutter-packages.mk | 2 +- 8 files changed, 9 insertions(+), 67 deletions(-) delete mode 100644 package/flutter-packages/flutter-dynamic-layouts-example/Config.in delete mode 120000 package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash delete mode 100644 package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk diff --git a/Config.in.legacy b/Config.in.legacy index 6473947a9a6..c1870613afd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE + bool "flutter-dynamic-layouts-example has been removed" + select BR2_LEGACY + help + flutter-dynamic-layouts was removed from flutter-packages + as of commit e35f29177495131f0f598fc7ae1ffd74d89edf15. + config BR2_KERNEL_HEADERS_6_9 bool "kernel headers version 6.9.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index c52f53565ca..d7d0af35431 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,7 +35,6 @@ F: package/flutter-engine/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ -F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-go-router-example/ F: package/flutter-packages/flutter-image-example/ F: package/flutter-packages/flutter-markdown-example/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 4e3e29582f0..88d9193608a 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -9,7 +9,6 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" -source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-go-router-example/Config.in" source "package/flutter-packages/flutter-image-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/Config.in b/package/flutter-packages/flutter-dynamic-layouts-example/Config.in deleted file mode 100644 index a3f66307959..00000000000 --- a/package/flutter-packages/flutter-dynamic-layouts-example/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE - bool "flutter dynamic layouts example" - help - This package provides support for multi sized tiles and - different layouts. Currently the layouts that are implemented - in this package are Stagger and Wrap. - - https://github.com/flutter/packages/tree/main/packages/dynamic_layouts/example diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash deleted file mode 120000 index 879f2adb39e..00000000000 --- a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash +++ /dev/null @@ -1 +0,0 @@ -../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk deleted file mode 100644 index aefcf3f62c9..00000000000 --- a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# flutter-dynamic-layouts-example -# -################################################################################ - -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME = example -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/dynamc-layouts-$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SUBDIR = packages/dynamic_layouts/example - -define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_CONFIGURE_CMDS - cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle -endef - -define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILD_CMDS - cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ - $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - --native-assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ - package:$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/main.dart && \ - $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ - --deterministic \ - --obfuscate \ - --snapshot_kind=app-aot-elf \ - --elf=libapp.so \ - .dart_tool/flutter_build/*/app.dill -endef - -define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_TARGET_CMDS - mkdir -p $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/{data,lib} - cp -dprf $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ - - $(INSTALL) -D -m 0755 $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/libapp.so \ - $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/libapp.so - - ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ - $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ - - ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/ - $(RM) $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin - touch $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin -endef - -$(eval $(generic-package)) diff --git a/package/flutter-packages/flutter-packages.hash b/package/flutter-packages/flutter-packages.hash index f266c497e40..1fbe6013966 100644 --- a/package/flutter-packages/flutter-packages.hash +++ b/package/flutter-packages/flutter-packages.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e1e19713ac74b6e00a6f5ec516e8ccda5e5ba1fc8b249d40abcfe4cb50dff87 flutter-packages-ab1630b9b9bd1130b4d5d1ac18a588b690fd0fa3.tar.gz +sha256 388ec45142ddfab711aa82958c82657b8c2238deb6c131cec94a5a993ba4c760 flutter-packages-8af79fbca12699248e96b50b4705da74396cd6a3.tar.gz sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE diff --git a/package/flutter-packages/flutter-packages.mk b/package/flutter-packages/flutter-packages.mk index 6b1a4371e8f..1a1913043b0 100644 --- a/package/flutter-packages/flutter-packages.mk +++ b/package/flutter-packages/flutter-packages.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PACKAGES_VERSION = ab1630b9b9bd1130b4d5d1ac18a588b690fd0fa3 +FLUTTER_PACKAGES_VERSION = 8af79fbca12699248e96b50b4705da74396cd6a3 FLUTTER_PACKAGES_SITE = $(call github,flutter,packages,$(FLUTTER_PACKAGES_VERSION)) FLUTTER_PACKAGES_LICENSE = BSD-3-Clause FLUTTER_PACKAGES_LICENSE_FILES = LICENSE From 08edb3c22a61b6de28e1472faceaebc3399b6537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Thu, 8 Aug 2024 18:06:07 +0200 Subject: [PATCH 2346/3013] package/zfs: replace wip patch by upstream patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Salvador Rufo Signed-off-by: Thomas Petazzoni --- ...ll-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch | 70 ++++++++ ...s-ignore-if-SEEK_DATA-is-not-defined.patch | 162 ------------------ package/zfs/zfs.mk | 3 - 3 files changed, 70 insertions(+), 165 deletions(-) create mode 100644 package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch delete mode 100644 package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch diff --git a/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch new file mode 100644 index 00000000000..64972c4f570 --- /dev/null +++ b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch @@ -0,0 +1,70 @@ +From 2ccefd4aff98cf355c7d13b3f92bb4d390dfa522 Mon Sep 17 00:00:00 2001 +From: Tino Reichardt +Date: Sun, 4 Aug 2024 11:58:13 +0200 +Subject: [PATCH] ZTS: small fix for SEEK_DATA/SEEK_HOLE tests + +Some libc's like uClibc lag the proper definition of SEEK_DATA +and SEEK_HOLE. Since we have only two files in ZTS which use +these definitons, let's define them by hand: + +``` +#ifndef SEEK_DATA +#define SEEK_DATA 3 +#endif +#ifndef SEEK_HOLE +#define SEEK_HOLE 4 +#endif +``` + +There should be no failures, because: +- FreeBSD has support for SEEK_DATA/SEEK_HOLE since FreeBSD 8 +- Linux has it since Linux 3.1 +- the libc will submit the parameters unchanged to the kernel + +Signed-off-by: Tino Reichardt +Signed-off-by: José Luis Salvador Rufo +Upstream: https://github.com/openzfs/zfs/commit/bd949b10bed3d99e3b40249d9c8d74a0b4304774 +--- + tests/zfs-tests/cmd/mmap_seek.c | 10 ++++++++++ + tests/zfs-tests/tests/functional/cp_files/seekflood.c | 7 +++++++ + 2 files changed, 17 insertions(+) + +diff --git a/tests/zfs-tests/cmd/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek.c +index 7be92d109565..2d250554a13f 100644 +--- a/tests/zfs-tests/cmd/mmap_seek.c ++++ b/tests/zfs-tests/cmd/mmap_seek.c +@@ -35,6 +35,16 @@ + #include + #endif + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#ifndef SEEK_HOLE ++#define SEEK_HOLE 4 ++#endif ++#endif ++ + static void + seek_data(int fd, off_t offset, off_t expected) + { +diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +index 02c2c8e6eca5..f832db85970d 100644 +--- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c ++++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +@@ -36,6 +36,13 @@ + #include + #include + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#endif ++ + #define DATASIZE (4096) + char data[DATASIZE]; + diff --git a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch deleted file mode 100644 index f47c615d109..00000000000 --- a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 93e7f8889072047276da11fe6a525d3f0ea16205 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= - -Date: Sat, 11 May 2024 22:40:12 +0200 -Subject: [PATCH] tests/cp_files: ignore if SEEK_DATA is not defined -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case -cp_files if SEEK_DATA is not defined. - -Signed-off-by: José Luis Salvador Rufo -Upstream: https://github.com/openzfs/zfs/pull/16169 ---- - config/user-unistd.m4 | 24 ++++++++++++++++++++++++ - config/user.m4 | 1 + - config/zfs-build.m4 | 1 + - tests/test-runner/bin/zts-report.py.in | 1 + - tests/zfs-tests/Makefile.am | 2 ++ - tests/zfs-tests/cmd/Makefile.am | 6 +++++- - tests/zfs-tests/tests/Makefile.am | 14 +++++++++----- - 7 files changed, 43 insertions(+), 6 deletions(-) - create mode 100644 config/user-unistd.m4 - -diff --git a/config/user-unistd.m4 b/config/user-unistd.m4 -new file mode 100644 -index 000000000..302bc0bde ---- /dev/null -+++ b/config/user-unistd.m4 -@@ -0,0 +1,24 @@ -+dnl # -+dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case. -+dnl # -+AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [ -+ AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA) -+ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ #ifndef _GNU_SOURCE -+ #define _GNU_SOURCE -+ #endif -+ #include -+ #if defined(SEEK_DATA) -+ int ok; -+ #else -+ error fail -+ #endif -+ ]])], [ -+ user_unistd_seek_data=yes -+ AC_MSG_RESULT([yes]) -+ ], [ -+ user_unistd_seek_data=no -+ AC_MSG_RESULT([no]) -+ ]) -+]) -diff --git a/config/user.m4 b/config/user.m4 -index 6ec27a5b2..2326a44be 100644 ---- a/config/user.m4 -+++ b/config/user.m4 -@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ - ZFS_AC_CONFIG_USER_LIBAIO - ZFS_AC_CONFIG_USER_LIBATOMIC - ZFS_AC_CONFIG_USER_LIBFETCH -+ ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA - ZFS_AC_CONFIG_USER_AIO_H - ZFS_AC_CONFIG_USER_CLOCK_GETTIME - ZFS_AC_CONFIG_USER_PAM -diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 -index bb5a85d81..578692676 100644 ---- a/config/zfs-build.m4 -+++ b/config/zfs-build.m4 -@@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ - [test "x$qatsrc" != x ]) - AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) - AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) -+ AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ]) - AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) - ]) - -diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in -index ecc50f487..3a00345ed 100755 ---- a/tests/test-runner/bin/zts-report.py.in -+++ b/tests/test-runner/bin/zts-report.py.in -@@ -162,6 +162,7 @@ known = { - ['FAIL', rewind_reason], - 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], - 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], -+ 'cp_files/cp_stress': ['SKIP', 16169], - 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], - 'privilege/setup': ['SKIP', na_reason], - 'refreserv/refreserv_004_pos': ['FAIL', known_reason], -diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am -index 3dd1a6452..8ae790057 100644 ---- a/tests/zfs-tests/Makefile.am -+++ b/tests/zfs-tests/Makefile.am -@@ -13,8 +13,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test - %C%_tests_functional_hkdf_hkdf_test_LDADD = \ - libzpool.la - -+if WANT_UNISTD_SEEK_DATA - scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files - scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood -+endif - - if BUILD_LINUX - scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile -diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am -index 23848a82f..69bba3039 100644 ---- a/tests/zfs-tests/cmd/Makefile.am -+++ b/tests/zfs-tests/cmd/Makefile.am -@@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec - scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write --scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files - scripts_zfs_tests_bin_PROGRAMS += %D%/ctime - scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update - scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write -@@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test - scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket - - -+if WANT_UNISTD_SEEK_DATA -+scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files -+endif -+ -+ - scripts_zfs_tests_bin_PROGRAMS += %D%/badsend - %C%_badsend_LDADD = \ - libzfs_core.la \ -diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am -index cc66d762f..1e9f06a7e 100644 ---- a/tests/zfs-tests/tests/Makefile.am -+++ b/tests/zfs-tests/tests/Makefile.am -@@ -1394,11 +1394,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/compression/l2arc_encrypted.ksh \ - functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ - functional/compression/setup.ksh \ -- functional/cp_files/cleanup.ksh \ -- functional/cp_files/cp_files_001_pos.ksh \ -- functional/cp_files/cp_files_002_pos.ksh \ -- functional/cp_files/cp_stress.ksh \ -- functional/cp_files/setup.ksh \ - functional/crtime/cleanup.ksh \ - functional/crtime/crtime_001_pos.ksh \ - functional/crtime/setup.ksh \ -@@ -2108,3 +2103,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/idmap_mount/idmap_mount_003.ksh \ - functional/idmap_mount/idmap_mount_004.ksh \ - functional/idmap_mount/idmap_mount_005.ksh -+ -+if WANT_UNISTD_SEEK_DATA -+nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ -+ functional/cp_files/cleanup.ksh \ -+ functional/cp_files/cp_files_001_pos.ksh \ -+ functional/cp_files/cp_files_002_pos.ksh \ -+ functional/cp_files/cp_stress.ksh \ -+ functional/cp_files/setup.ksh -+endif --- -2.45.2 - diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index e0fa3926704..e51ade55a42 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,9 +12,6 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch -ZFS_AUTORECONF = YES - ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux # sysvinit installs only a commented-out modules-load.d/ config file From 453d468e3e133b98abe71cbee50249f2ad16e95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Thu, 8 Aug 2024 18:06:10 +0200 Subject: [PATCH 2347/3013] package/zfs: bump version to 2.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Salvador Rufo Signed-off-by: Thomas Petazzoni --- package/zfs/zfs.hash | 2 +- package/zfs/zfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 9c8d4cec850..9598aed992b 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ # From https://github.com/openzfs/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.sha256.asc -sha256 9790905f7683d41759418e1ef3432828c31116654ff040e91356ff1c21c31ec0 zfs-2.2.4.tar.gz +sha256 2388cf6f29cd75e87d6d05e4858a09d419c4f883a658d51ef57796121cd08897 zfs-2.2.5.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index e51ade55a42..549f8641b92 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.2.4 +ZFS_VERSION = 2.2.5 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL From fdbc8d97cb166ce721df96acda6d291f6f2c4aa9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Aug 2024 21:21:26 +0200 Subject: [PATCH 2348/3013] package/mjpg-streamer: fix undefined symbol error Fixes runtime error: dlopen: /usr/lib/mjpg-streamer/input_uvc.so: undefined symbol: resolutions_help Patch was suggested by Thomas: http://lists.busybox.net/pipermail/buildroot/2024-August/759732.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-all-symbols-of-mjpg_streamer-binary.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch diff --git a/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch new file mode 100644 index 00000000000..771ee838327 --- /dev/null +++ b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch @@ -0,0 +1,33 @@ +From fbde1593948ae95f287b2167d0bec5b27948cc01 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Aug 2024 17:04:55 +0200 +Subject: [PATCH] Export all symbols of mjpg_streamer binary + +Fixes runtime error with stripped binary + + dlopen: /usr/lib/mjpg-streamer/input_uvc.so: undefined symbol: resolutions_help + +Source: http://lists.busybox.net/pipermail/buildroot/2024-August/759732.html + +Upstream: https://github.com/jacksonliam/mjpg-streamer/pull/401 + +Signed-off-by: Bernd Kuhls +--- + mjpg-streamer-experimental/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mjpg-streamer-experimental/CMakeLists.txt b/mjpg-streamer-experimental/CMakeLists.txt +index cf26620..3ff12cd 100644 +--- a/mjpg-streamer-experimental/CMakeLists.txt ++++ b/mjpg-streamer-experimental/CMakeLists.txt +@@ -92,6 +92,7 @@ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + add_executable(mjpg_streamer mjpg_streamer.c + utils.c) + ++set_property(TARGET mjpg_streamer PROPERTY ENABLE_EXPORTS ON) + target_link_libraries(mjpg_streamer pthread dl) + install(TARGETS mjpg_streamer DESTINATION bin) + +-- +2.39.2 + From 32161a3c4e0c238e0e44ccfcadffc62f72f5c4e4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Aug 2024 22:54:58 +0200 Subject: [PATCH 2349/3013] Update for 2024.08-rc1 Signed-off-by: Thomas Petazzoni --- CHANGES | 79 ++++++++++++++++++++++++++++++++++++++ Makefile | 4 +- docs/website/download.html | 22 +++++------ docs/website/news.html | 21 ++++++++++ 4 files changed, 113 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 6567a415459..eef042823a1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,82 @@ +2024.08-rc1, released August 8th, 2024 + + Fixes all over the tree (especially related to GCC 14.x + compatibility) and package updates. + + Toolchains: + - uClibc updated to 1.0.49 + - GDB 15.x added, GDB 14.x now the default + - GCC 14.x updated to GCC 14.2.0 + - Support for Linux 6.9/6.10 headers added + + Infrastructure: + - Patches on packages are now applied with -F0, which means no + fuzz is accepted anymore. + - Improvements to the canonical example of SysV init script + + New defconfigs: arm_fvp_ebbr, beaglev_fire, cubieboard1, + imx6ulz_bsh_smm_m2_defconfig, spike_riscv32, + + Removed defconfigs: beagleboardx15, beaglev, imx8mpico + + New packages: blake3, chicken, cloudfared, docker-cli-buildx, + espflash, fd, freescale-imx/firmware-upower, fwupd, fwupd-efi, + gtkiostream, graphene, kmon, libavif, libdex, libgtk4, + libjcat, libopenmpt, libtpms, mxt-app, nethogs, openconnect, + parsec-tool, pico-sdk, picotool, python-aerich, + python-autocommand, python-betterproto, python-configobj, + python-grpclib, python-inflect, python-jaraco-collections, + python-jaraco-context, python-jaraco-text, python-pyasynchat, + python-pyasyncore, python-dictdiffer, python-pkgconfig, + python-pypika-tortoise, python-ruamel-yaml-clib, + python-tomlkit, python-tomli-w, python-tpm2-pytss, + python-tortoise-orm, python-uswid, qt6declarative, + qt6languageserver, qt6mqtt, qt6opcua, qt6shadertools, + qt6tools, qt6virtualkeyboard, qt6wayland, qt6websockets, + skopeo, sqlitecpp, swipl, swtpm, tig, tipidee, tpm2-openssl, + xilinx-prebuilt, zoxide + + Removed packages: beaglev-ddrinit, beaglev-secondboot, + beecrypt, cgic, dvb-apps, gamin + + New runtime tests: 4th, attr, atftp, bcc, btrfs, btrfsprogs, + dmidecode, go, gpsd, iproute2, kmod, lame, make, mariadb, + mawk, mosquitto, nmap, ntp, python-asn1crypto, python-pymupdf, + python-ruamel-yaml, rt-tests, swipl, vorbis-tools, xfsprogs + + Issues resolved: + - Are there plans to add raspberrypizero2w_64_defconfig config? + https://gitlab.com/buildroot.org/buildroot/-/issues/1 + - Some folders can't visit and some file is missing while running + https://gitlab.com/buildroot.org/buildroot/-/issues/2 + - wpewebkit build fails on ARM Neon + https://gitlab.com/buildroot.org/buildroot/-/issues/3 + - TAR-1.35 will not build for target (host-variant will build) + https://gitlab.com/buildroot.org/buildroot/-/issues/4 + - package/xz without shared libraries breaks Python build + https://gitlab.com/buildroot.org/buildroot/-/issues/5 + - unable to build - 404 at sources.buildroot.net + https://gitlab.com/buildroot.org/buildroot/-/issues/10 + - OpenSSH 9.8 broken + https://gitlab.com/buildroot.org/buildroot/-/issues/11 + - Update Openssh to Version 9.8p1 (CVE-2024-6387) in Long Term + Support Release 2024.02.x + https://gitlab.com/buildroot.org/buildroot/-/issues/14 + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + - building go/golang gives error + https://gitlab.com/buildroot.org/buildroot/-/issues/18 + - GCC 13.3 is missing + https://gitlab.com/buildroot.org/buildroot/-/issues/20 + - package containerd update to avoid hanging docker exec + commands + https://gitlab.com/buildroot.org/buildroot/-/issues/21 + - "BR2_EXTERNAL broken missing srctree error Config.in" + https://gitlab.com/buildroot.org/buildroot/-/issues/24 + - Can't subscribe buildroot mailing list + https://gitlab.com/buildroot.org/buildroot/-/issues/25 + 2024.05.1, released July 13th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index f51e8f690fc..284a0bb20ee 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.08-git +export BR2_VERSION := 2024.08-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1718188000 +BR2_VERSION_EPOCH = 1723149000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index ce859c43b58..9a36d5c5d84 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,41 +75,41 @@

buildroot-2024.05.1.tar.xzPGP signature

- + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
diff --git a/docs/website/news.html b/docs/website/news.html index 6b0d4c721a6..001b471d4c3 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2024.08-rc1 released

    +

    8 August 2024

    +
    +
    +

    We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

    + +

    Go to the downloads page to pick up the + 2024.08-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • +
  • From 3cf303f91666207a5a259866e6ecc05b21afae05 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 13 Jul 2024 00:04:31 +0200 Subject: [PATCH 2350/3013] package/btrfs-progs: update Kconfig package homepage URL The btrfs-progs homepage [1] show a banner: OBSOLETE CONTENT This wiki has been archived and the content is no longer updated. NOTE: this wiki is archived and not updated anymore (02/2023). Contents will be migrated to https://btrfs.readthedocs.io This commit updates the URL to the new one at [2]. [1] https://btrfs.wiki.kernel.org/index.php/Main_Page [2] https://btrfs.readthedocs.io Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 91cd9488005e7f0fce7ead126f1e637deefcaf02) Signed-off-by: Peter Korsgaard --- package/btrfs-progs/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/btrfs-progs/Config.in b/package/btrfs-progs/Config.in index 35dfc391934..bae096061db 100644 --- a/package/btrfs-progs/Config.in +++ b/package/btrfs-progs/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_BTRFS_PROGS help Btrfs filesystem utilities - https://btrfs.wiki.kernel.org/index.php/Main_Page + https://btrfs.readthedocs.io comment "btrfs-progs needs a toolchain w/ threads" depends on BR2_USE_MMU From c4f8ae4a1a6bed2b1abfb2b7148ee95c3013b713 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 12 Jul 2024 23:48:38 +0200 Subject: [PATCH 2351/3013] package/octave: add optional libsndfile support GNU Octave supports the --with-sndfile configure option since v4.0.0. For reference, commit 40ea68b4b2 "package/octave: new package" introduced the package at v7.1.0. This commits adds this optional support. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit a5ce48fe456d790612c9b63990f0a4f3e2faa554) Signed-off-by: Peter Korsgaard --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 42227045f65..5ed5ed8d2dc 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -43,6 +43,13 @@ else OCTAVE_CONF_OPTS += --without-curl endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +OCTAVE_CONF_OPTS += --with-sndfile +OCTAVE_DEPENDENCIES += libsndfile +else +OCTAVE_CONF_OPTS += --without-sndfile +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OCTAVE_CONF_OPTS += --with-openssl=yes OCTAVE_DEPENDENCIES += openssl From 177b4deb3d6866a1c39f42303fb4c53953104cf9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Oct 2023 18:52:35 +0200 Subject: [PATCH 2352/3013] package/sunxi-tools: sunxi-fel needs dynamic library Fix the following build failure raised since bump to version 1.4.2-168-ged3039c in commit 2e330dff6a7ce7965ceb0dccdc9dcbcb329167bb: /home/buildroot/autobuild/run/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: attempted static link of dynamic object `libfdt/libfdt-1.6.1.so' Fixes: - http://autobuild.buildroot.org/results/6788d86c10d551b3d617e33c85083b817eb5d0b2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit e167800979b48a449c168c229448e7069d2045e7) Signed-off-by: Peter Korsgaard --- package/sunxi-tools/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in index 14f7da5bf20..16550f4e55d 100644 --- a/package/sunxi-tools/Config.in +++ b/package/sunxi-tools/Config.in @@ -23,6 +23,7 @@ config BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO config BR2_PACKAGE_SUNXI_TOOLS_FEL bool "sunxi-fel" + depends on !BR2_STATIC_LIBS # dtc depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_DTC @@ -33,8 +34,8 @@ config BR2_PACKAGE_SUNXI_TOOLS_FEL fel mode. This allows do download code to memory and execute it. -comment "sunxi-fel needs a toolchain w/ threads, gcc >= 4.9" - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ +comment "sunxi-fel needs a toolchain w/ dynamic library, threads, gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_SUNXI_TOOLS_NAND_PART From f008725ad65ac2e8d31d2eeec548bec5b3b2f15c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 10:27:06 +0200 Subject: [PATCH 2353/3013] package/x265: replace patch fixing gcc option As we're about to do some other fixes in x265 ARM build, let's replace the patch fixing gcc option by: - A patch generated by git format-patch now that x265 upstream uses Git - Is re-submitted upstream - Only drops the flags, and does not add bogus ARM architecture aliases that don't exist in the CMake world. Signed-off-by: Thomas Petazzoni (cherry picked from commit 9d62687d0024f7e3bac68157f1250970ef45abff) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...ists.txt-do-not-force-compiler-flags.patch | 83 +++++++++++++++++ package/x265/0001-fix-gcc-options.patch | 88 ------------------- 3 files changed, 83 insertions(+), 89 deletions(-) create mode 100644 package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch delete mode 100644 package/x265/0001-fix-gcc-options.patch diff --git a/.checkpackageignore b/.checkpackageignore index cd60677c2fd..214b45a57ca 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1588,7 +1588,6 @@ package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch lib_patch.Upstream -package/x265/0001-fix-gcc-options.patch lib_patch.Upstream package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch lib_patch.Upstream package/xen/0002-Fix-build-with-64-bits-time_t.patch lib_patch.Upstream package/xen/0003-libs-light-fix-tv_sec-printf-format.patch lib_patch.Upstream diff --git a/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch b/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch new file mode 100644 index 00000000000..af0e57f2061 --- /dev/null +++ b/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch @@ -0,0 +1,83 @@ +From b56e9125db34614b2157516df3ee724180f2084f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 09:59:26 +0200 +Subject: [PATCH] CMakeLists.txt: do not force compiler flags + +The compiler flags enforced by CMakeLists.txt can be problematic: + +- When CROSS_COMPILE_ARM is set, one is not necessarily building for + armv6 with soft float-abi: one may be using ARMv7 with hard float + +- When CROSS_COMPILE_ARM is not set, forcing -mfloat-abi=hard is + similarly wrong + +Those compiler flags should be passed by the user depending on the +exact target platform. + +Inspired from +https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/x265/files/arm-r1.patch, +and earlier work from Bertrand Jacquin and +Bernd Kuhls . + +Upstream: https://bitbucket.org/multicoreware/x265_git/pull-requests/26 +Signed-off-by: Thomas Petazzoni +--- + source/CMakeLists.txt | 10 +++------- + source/dynamicHDR10/CMakeLists.txt | 6 +++--- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index a407271b4..a34bf4d4f 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -239,11 +239,7 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- if(ARM64) +- set(ARM_ARGS -fPIC) +- else() +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) +- endif() ++ set(ARM_ARGS -fPIC) + message(STATUS "cross compile arm") + elseif(ARM) + if(ARM64) +@@ -252,10 +248,10 @@ if(GCC) + else() + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + endif() +diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt +index 22fb79d44..2cea7c48a 100644 +--- a/source/dynamicHDR10/CMakeLists.txt ++++ b/source/dynamicHDR10/CMakeLists.txt +@@ -43,14 +43,14 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) ++ set(ARM_ARGS -fPIC) + elseif(ARM) + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + add_definitions(${ARM_ARGS}) +-- +2.45.2 + diff --git a/package/x265/0001-fix-gcc-options.patch b/package/x265/0001-fix-gcc-options.patch deleted file mode 100644 index 0283da25ea9..00000000000 --- a/package/x265/0001-fix-gcc-options.patch +++ /dev/null @@ -1,88 +0,0 @@ -# HG changeset patch -# User Bertrand Jacquin -# Date 1444431941 -3600 -# Node ID 5c6d2a6f2f9a0534933cc999b3845be4344e1af0 -# Parent b6156a08b1def3584647f26096866c1a0c11e54a -build: Disable -march selection from CMakeLists.txt - -x32 arch as defined on https://sites.google.com/site/x32abi is neither -X86 nor X64, then forcing -march=i686 leads to build failure as wrong --march is used. - -Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong - -As a global sanity sake, disable all forced -march in CMakeLists - -Backported from upstream pull request: -https://bitbucket.org/multicoreware/x265/pull-requests/21 - -Signed-off-by: Bernd Kuhls -[Bernd: rebased for 3.5 based on - https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/x265/files/arm-r1.patch] - -diff -r 58dddcf01b7d source/CMakeLists.txt ---- a/source/CMakeLists.txt Mon Jan 23 09:50:33 2017 +0530 -+++ b/source/CMakeLists.txt Mon Jan 23 21:03:10 2017 +0100 -@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ - # System architecture detection - string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) - set(X86_ALIASES x86 i386 i686 x86_64 amd64) --set(ARM_ALIASES armv6l armv7l aarch64) -+set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64) - list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) - list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) - set(POWER_ALIASES ppc64 ppc64le) -@@ -239,11 +239,7 @@ if(GCC) - endif() - endif() - if(ARM AND CROSS_COMPILE_ARM) -- if(ARM64) -- set(ARM_ARGS -fPIC) -- else() -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -- endif() -+ set(ARM_ARGS -fPIC) - message(STATUS "cross compile arm") - elseif(ARM) - if(ARM64) -@@ -252,10 +248,10 @@ if(GCC) - else() - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -mfpu=neon -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) -+ set(ARM_ARGS -fPIC) - endif() - endif() - endif() ---- a/source/dynamicHDR10/CMakeLists.txt -+++ b/source/dynamicHDR10/CMakeLists.txt -@@ -43,14 +43,14 @@ if(GCC) - endif() - endif() - if(ARM AND CROSS_COMPILE_ARM) -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -+ set(ARM_ARGS -fPIC) - elseif(ARM) - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) -+ set(ARM_ARGS -fPIC) - endif() - endif() - add_definitions(${ARM_ARGS}) -@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") - option(ENABLE_SHARED "Build shared library" OFF) - - install(FILES hdr10plus.h DESTINATION include) --endif() -\ No newline at end of file -+endif() - From 8896b815f1ec8ffa24cba20f1bd8235cf6b2e2e9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 10:28:40 +0200 Subject: [PATCH 2354/3013] package/x265: fix runtime issue on ARMv6, ensure correctness on ARMv7 The build logic in source/cmake/FindNeon.cmake caused the x265 build system to always think that the CPU supports neon: it was looking in /proc/cpuinfo, which of course is wrong when cross-compilation, but then the sequence of grep was interacting badly with CMake, causing the build system to always conclude that the CPU supports NEON. This causes runtime issues on ARMv6. Setting -DCROSS_COMPILE_ARM=1 fixes this, as it tells the x265 build system we are cross-compiling and it skips its bogus NEON check. So for ARMv6, we pass -DCROSS_COMPILE_ARM=1. But then, we still want NEON for ARMv7 processors with NEON, so this commit adds a patch that allows to explicitly specify whether the CPU supports NEON, in the -DCROSS_COMPILE_ARM=1 case, and we use this option when BR2_ARM_CPU_HAS_NEON. For those wondering why -DCROSS_COMPILE_ARM=1 is not passed for all ARM platforms: it's because from the perspective of x265, only ARM >= v6 is ARM: it has assembly code that needs at least ARMv6. Earlier ARM platforms are not detected as ARM by the x265 build logic, and therefore fallback on generic code. This has been build-tested on: - ARMv5: generic code is used, no assembly - ARMv6: assembly code is used, but not with NEON support - ARMv7 with NEON: assembly code is used, with NEON support Reported-by: David Barbion Signed-off-by: Thomas Petazzoni (cherry picked from commit 1fbd26f83169a206bdf9c36c85510a33c0e7a864) Signed-off-by: Peter Korsgaard --- ...s.txt-allow-setting-CPU_HAS_NEON-whe.patch | 40 +++++++++++++++++++ package/x265/x265.mk | 14 +++++++ 2 files changed, 54 insertions(+) create mode 100644 package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch diff --git a/package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch b/package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch new file mode 100644 index 00000000000..51be8f2d020 --- /dev/null +++ b/package/x265/0002-source-CMakeLists.txt-allow-setting-CPU_HAS_NEON-whe.patch @@ -0,0 +1,40 @@ +From 0088d29e7c75ea7f100a100aea4e2a797469427f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 13 Jul 2024 10:10:54 +0200 +Subject: [PATCH] source/CMakeLists.txt: allow setting CPU_HAS_NEON when + CROSS_COMPILE_ARM + +The logic in source/cmake/FindNeon.cmake is not appropriate for +cross-compilation scenarios, so in order to allow cross-compiling for +ARM, CROSS_COMPILE_ARM needs to be defined. However that currently +doesn't allow the enabling of NEON support, so let's allow the user to +manually set CPU_HAS_NEON in this case. + +Upstream: https://bitbucket.org/multicoreware/x265_git/pull-requests/26 +Signed-off-by: Thomas Petazzoni +--- + source/CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index a34bf4d4f..072bf62ab 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -239,8 +239,13 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- set(ARM_ARGS -fPIC) + message(STATUS "cross compile arm") ++ if(CPU_HAS_NEON) ++ set(ARM_ARGS -mfpu=neon -fPIC) ++ add_definitions(-DHAVE_NEON) ++ else() ++ set(ARM_ARGS -fPIC) ++ endif() + elseif(ARM) + if(ARM64) + set(ARM_ARGS -fPIC) +-- +2.45.2 + diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 51c39df4cd8..bd5180b24b9 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -13,6 +13,20 @@ X265_CPE_ID_VENDOR = multicorewareinc X265_SUBDIR = source X265_INSTALL_STAGING = YES +# For CPUs before ARMv6, x265 does not consider them "ARM" but generic +# CPUs for which no optimized assembly is provided, hence we don't +# pass -DCROSS_COMPILE_ARM=1. +ifeq ($(BR2_ARM_CPU_ARMV6),y) +X265_CONF_OPTS += -DCROSS_COMPILE_ARM=1 +endif + +ifeq ($(BR2_ARM_CPU_ARMV7A),y) +X265_CONF_OPTS += -DCROSS_COMPILE_ARM=1 +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +X265_CONF_OPTS += -DCPU_HAS_NEON=1 +endif +endif + ifeq ($(BR2_i386)$(BR2_x86_64),y) X265_DEPENDENCIES += host-nasm endif From db06ee93b98b019a458104f73fc1bf7fb5eeaada Mon Sep 17 00:00:00 2001 From: Sagi Mor Date: Sat, 7 Jan 2023 20:09:43 +0200 Subject: [PATCH 2355/3013] toolchain/toolchain-wrapper: make gcc --help -v work correctly make "gcc --help -v" display all the options, some packages depend on this https://bugs.busybox.net/show_bug.cgi?id=15231 Signed-off-by: Sagi Mor [Arnout: move the handling to the beginning and directly call execv] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9954315fc5b2026552a0f0175307ec8784b51578) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-wrapper.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index f66e588bfd1..e4368897607 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -310,6 +310,17 @@ int main(int argc, char **argv) perror(__FILE__ ": overflow"); return 3; } + + /* skip all processing --help is specified */ + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "--help")) { + argv[0] = path; + if (execv(path, argv)) + perror(path); + return 1; + } + } + #ifdef BR_CCACHE ret = snprintf(ccache_path, sizeof(ccache_path), "%s/bin/ccache", absbasedir); if (ret >= sizeof(ccache_path)) { From 5fd4d3757c96d1b5cfdfb69aec1a48f022bd9c06 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 23 Dec 2022 14:34:00 +0100 Subject: [PATCH 2356/3013] package/boost: Boost.Atomic needs atomic intrinsics similar to previous problems with nios2 and not-available atomic ints the build for Boost.Atomics also fails for ARC Targets which don't have the ATOMICS_EXT flag set. according to [0] "Boost.Atomic has a hard requirement of the native atomic operations on bytes". The same tests mentioned there fail for ARC without the atomic extension. Disable BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS for BR2_arc without BR2_ARC_ATOMIC_EXT. Fixes: http://autobuild.buildroot.net/results/4ca54a85672d7b9328b1909b457e548c6032a493 [0] https://github.com/boostorg/atomic/issues/42#issuecomment-734130348 Signed-off-by: Michael Nosthoff [Arnout: add to BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS instead of updating all packages] Signed-off-by: Arnout Vandecappelle (cherry picked from commit ad71b415c1bdf1bbf4c37b04c772dc3104187b58) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index baf69ce4635..33a88ff7385 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -94,6 +94,7 @@ config BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_ARM_CPU_ARMV5 depends on !BR2_sparc_v8 depends on !BR2_m68k_cf5208 + depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT) # GCC uses thunk functions to adjust the 'this' pointer when calling # C++ member functions in classes derived with multiple inheritance. From b8ec6c9b64f50d7263871cfe0b77a81ff77e8fe0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 10:57:09 +0200 Subject: [PATCH 2357/3013] package/cdrkit: replace URL in Config.in cdrkit.org no longer works, and there is no obvious homepage for this dead project. Use the Wikipedia page as a replacement. Signed-off-by: Thomas Petazzoni (cherry picked from commit aa549fb95f8409c2b364cd1d8257f92a1b693720) Signed-off-by: Peter Korsgaard --- package/cdrkit/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in index 7b5b8865f6c..b3ddcbd1354 100644 --- a/package/cdrkit/Config.in +++ b/package/cdrkit/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_CDRKIT blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD data, and more. - http://www.cdrkit.org/ + https://en.wikipedia.org/wiki/Cdrkit From be5c48e20cb5022ae38c404906587cc54e85e25b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 11:00:00 +0200 Subject: [PATCH 2358/3013] package/cdrkit: convert first patch to Git formatted one Signed-off-by: Thomas Petazzoni (cherry picked from commit 347def2fd1f062be5d335d06aaaec577c5fa1d68) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 +- ....patch => 0001-fix-build-with-uClibc.patch} | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) rename package/cdrkit/{0001-no-rcmd.patch => 0001-fix-build-with-uClibc.patch} (59%) diff --git a/.checkpackageignore b/.checkpackageignore index 214b45a57ca..d848e20e58a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -453,7 +453,7 @@ package/cache-calibrator/0001-Fix-conflicting-round-function.patch lib_patch.Ups package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch lib_patch.Upstream package/cairo/0002-Fix-mask-usage-in-image-compositor.patch lib_patch.Upstream package/caps/0001-Fix-stdint-types-with-musl.patch lib_patch.Upstream -package/cdrkit/0001-no-rcmd.patch lib_patch.Upstream +package/cdrkit/0001-fix-build-with-uClibc.patch lib_patch.Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch lib_patch.Upstream package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch lib_patch.Upstream package/cfm/S65cfm lib_sysv.Indent lib_sysv.Variables diff --git a/package/cdrkit/0001-no-rcmd.patch b/package/cdrkit/0001-fix-build-with-uClibc.patch similarity index 59% rename from package/cdrkit/0001-no-rcmd.patch rename to package/cdrkit/0001-fix-build-with-uClibc.patch index 294779f7a51..27203eee649 100644 --- a/package/cdrkit/0001-no-rcmd.patch +++ b/package/cdrkit/0001-fix-build-with-uClibc.patch @@ -1,17 +1,20 @@ -[PATCH] fix build with uClibc +From 13823cfe42f33e947f8375f5a3f9ee177c699960 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Sat, 13 Jul 2024 10:57:57 +0200 +Subject: [PATCH] fix build with uClibc cdrkit unconditionally enables code using rcmd(3), which isn't available on uClibc. Signed-off-by: Peter Korsgaard --- - include/xconfig.h.in | 1 - + include/xconfig.h.in | 1 - 1 file changed, 1 deletion(-) -Index: cdrkit-1.1.10/include/xconfig.h.in -=================================================================== ---- cdrkit-1.1.10.orig/include/xconfig.h.in -+++ cdrkit-1.1.10/include/xconfig.h.in +diff --git a/include/xconfig.h.in b/include/xconfig.h.in +index c130600..00f2044 100644 +--- a/include/xconfig.h.in ++++ b/include/xconfig.h.in @@ -187,7 +187,6 @@ * they are placed before the large file tests. */ @@ -20,3 +23,6 @@ Index: cdrkit-1.1.10/include/xconfig.h.in #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ +-- +2.45.2 + From a3ec7bb68fd0f650f4c8aa2d78ad67d0592d66f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 11:38:24 +0200 Subject: [PATCH 2359/3013] package/cdrkit: fix build with gcc 14.x This commit adds a patch, which is already in Debian, fixing the build with gcc 14.x: /home/autobuild/autobuild/instance-7/output-1/build/host-cdrkit-1.1.11/genisoimage/genisoimage.c:1509:17: error: implicit declaration of function 'parse_checksum_algo' [-Wimplicit-function-declaration] 1509 | if (parse_checksum_algo(optarg, &checksum_algo_iso)) | ^~~~~~~~~~~~~~~~~~~ make[3]: *** [genisoimage/CMakeFiles/genisoimage.dir/build.make:76: genisoimage/CMakeFiles/genisoimage.dir/genisoimage.o] Error 1 Fixes: http://autobuild.buildroot.net/results/a9cca8da22774ecafdbb382697aae71f78e348f4/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 0a0de4d86cd1fbeb5ff0439259b297756b3a5d98) Signed-off-by: Peter Korsgaard --- .../0004-Add-missing-header-includes.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/cdrkit/0004-Add-missing-header-includes.patch diff --git a/package/cdrkit/0004-Add-missing-header-includes.patch b/package/cdrkit/0004-Add-missing-header-includes.patch new file mode 100644 index 00000000000..d2a93fe5a72 --- /dev/null +++ b/package/cdrkit/0004-Add-missing-header-includes.patch @@ -0,0 +1,48 @@ +From 8b7852149c45c8a837a9f5124e91812dd475a270 Mon Sep 17 00:00:00 2001 +From: Andrey Rakhmatullin +Date: Sat, 13 Jul 2024 11:37:07 +0200 +Subject: [PATCH] Add missing header includes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug-Debian: https://bugs.debian.org/1066264 + +Fixes: + +genisoimage/genisoimage.c:1509:17: error: implicit declaration of function ‘parse_checksum_algo’ [-Wimplicit-function-declaration] + +Upstream: https://sources.debian.org/patches/cdrkit/9:1.1.11-3.5/fix-implicit-function-declaration.patch/ +Signed-off-by: Thomas Petazzoni +--- + genisoimage/genisoimage.c | 1 + + genisoimage/jte.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c +index 46f0cb7..fa2f8bd 100644 +--- a/genisoimage/genisoimage.c ++++ b/genisoimage/genisoimage.c +@@ -53,6 +53,7 @@ + #include + #include "match.h" + #include "exclude.h" ++#include "checksum.h" + #include /* For UNICODE translation */ + #include + #ifdef UDF +diff --git a/genisoimage/jte.c b/genisoimage/jte.c +index 0dff289..4c4d986 100644 +--- a/genisoimage/jte.c ++++ b/genisoimage/jte.c +@@ -27,6 +27,7 @@ + #include "ifo_read.h" + #include "endianconv.h" + #include "checksum.h" ++#include "md5.h" + #endif + #ifdef APPLE_HYB + #include +-- +2.45.2 + From d3b6f8fa3cbc9c245c85a0963a8b446455f15e6c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 19:29:11 +0100 Subject: [PATCH 2360/3013] package/openssl: add and use BR2_PACKAGE_LIBRESSL_ARCH_SUPPORTS libressl doesn't support all architectures since bump to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24 and https://github.com/libressl/portable/commit/b98c56fd5e86fa76eb55a98a2266a923f64f705c https://github.com/libressl/portable/commit/71ce0b8c3e07079a40011d2f3515969e3bdf302e: In file included from /home/autobuild/autobuild/instance-4/output-1/build/libressl-3.8.2/crypto/rc4/rc4_enc.c:61: /home/autobuild/autobuild/instance-4/output-1/build/libressl-3.8.2/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' 75 | RC4_INT x, y; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/1f6ac121b3771ccc4b0e846c061b7002ccb63963 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 080f2d94b7ac6e8ed5aef99000ec35a001186ed9) Signed-off-by: Peter Korsgaard --- package/openssl/Config.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/openssl/Config.in b/package/openssl/Config.in index c7641ecefa1..30db152fadb 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -1,3 +1,14 @@ +config BR2_PACKAGE_LIBRESSL_ARCH_SUPPORTS + bool + # see include/CMakeLists.txt + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_RISCV_64 + default y if BR2_sparc64 + config BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL bool @@ -32,6 +43,7 @@ source "package/libopenssl/Config.in" config BR2_PACKAGE_LIBRESSL bool "libressl" + depends on BR2_PACKAGE_LIBRESSL_ARCH_SUPPORTS depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL depends on BR2_TOOLCHAIN_HAS_THREADS # uClibc doesn't provide __register_atfork() without NPTL From 33557477c06bbbb24754210b7606c186f1e8a31e Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 9 Aug 2024 16:55:27 +0100 Subject: [PATCH 2361/3013] configs/zynqmp_zcu106_defconfig: move to board rev1.0 Migrate the zynqmp_zcu106_defconfig to rev1.0 ddr memory, since all new boards will be using the rev1.0 ddr memory. This patch also adds documentation in the board/zynqmp/readme.txt explaining the issue related to the change in ddr memory. Should users not see anything printing from the board during boot, the most likely issue is that the board has the original ddr memory and the u-boot device tree needs to be configured accordingly to revA. Original DDR Memory: BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" More information regarding this issue can be found here: https://support.xilinx.com/s/article/71961?language=en_US Signed-off-by: Neal Frager Reviewed-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- board/zynqmp/readme.txt | 26 ++++++++++++++++++++++++++ configs/zynqmp_zcu106_defconfig | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index 3a8a9b03ac2..3f1b3a80c2b 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -64,3 +64,29 @@ card: Where 'sdX' is the device node of the SD. Eject the SD card, insert it in the board, and power it up. + +============== +Important Note +============== + +The DDR memory on the original ZCU102 and ZCU106 boards is EOL. +The Buildroot defconfigs for these boards use the new DDR memory +which is configured by the u-boot spl initialization with the +Buildroot config options below. + +New DDR Memories: +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0" + +If nothing is printing upon boot, most likely it is because the +board has the original DDR memories. To fix the problem, modify +the Buildroot defconfig file to use the u-boot spl initialization +for the original DDR memory using the config below for the target +board. + +Original DDR Memories: +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-revA" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" + +For more information on this issue: +https://support.xilinx.com/s/article/71961?language=en_US diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index c10ec70ed8d..970ed40d2c9 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y From 3a39e706a91ad6191e499e46bdcaacbe590a144a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 9 Aug 2024 15:08:22 +0200 Subject: [PATCH 2362/3013] package/Makefile.in: work around buggy buildsystems wrt LDFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some buildsystems (or their use of it by packages) will cause flags in LDFLAGS to be re-orderded, or even dropped, causing some incomprehensible mayhem... For example, gpsd [0] has this in its SConscript [1](typoes not mines, for once): 591 # scons uses gcc, or clang, to link. Thus LDFLAGS does not serve its 592 # traditional function of providing arguments to ln. LDFLAGS set in the 593 # environment before running scons get moved into CCFLAGS by scons. 594 # LDFLAGS set while running scons get ignored. [--SNIP--] 611 for i in ["ARFLAGS", 612 "CCFLAGS", 613 "CFLAGS", 614 "CPPFLAGS", 615 "CXXFLAGS", 616 "LDFLAGS", 617 "LINKFLAGS", 618 "SHLINKFLAGS", 619 ]: 620 if i in os.environ: 621 # MergeFlags() puts the options where scons wants them, not 622 # where you asked them to go. 623 env.MergeFlags(Split(os.getenv(i))) So, when LDFLAGS (our TARGET_LDFLAGS) contains "-z text" (without the quotes), that gets turned into a command line like (line-splitted for readability): [...]/buildroot/output/host/bin/aarch64_be-buildroot-linux-musl-gcc \ -o gpsd-3.25/drivers/driver_rtcm2.os \ -c \ --sysroot=[...]/buildroot/output/host/aarch64_be-buildroot-linux-musl/sysroot \ -O3 -g0 \ -z \ -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ gpsd-3.25/drivers/driver_rtcm2.c Notice how there is a lone "-z" without any following keyword. This then causes a build failure that looks totally unrelated [2]: In file included from gpsd-3.25/drivers/../include/gpsd.h:36, from gpsd-3.25/drivers/driver_rtcm2.c:65: gpsd-3.25/drivers/../include/os_compat.h:40:8: error: redefinition of ‘struct timespec’ 40 | struct timespec { | ^~~~~~~~ In file included from [...]/buildroot/output/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/sys/select.h:16, from gpsd-3.25/drivers/../include/gpsd.h:31: [...]/buildroot/output/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/bits/alltypes.h:237:8: note: originally defined here 237 | struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); }; | ^~~~~~~~ gpsd-3.25/drivers/../include/os_compat.h:48:5: error: conflicting types for ‘clock_gettime’; have ‘int(clockid_t, struct timespec *)’ {aka ‘int(int, struct timespec *)’} 48 | int clock_gettime(clockid_t, struct timespec *); | ^~~~~~~~~~~~~ In file included from gpsd-3.25/drivers/../include/gpsd.h:33: [...]/buildroot/output/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/time.h:104:5: note: previous declaration of ‘clock_gettime’ with type ‘int(clockid_t, struct timespec *)’ {aka ‘int(int, struct timespec *)’} 104 | int clock_gettime (clockid_t, struct timespec *); | ^~~~~~~~~~~~~ scons: *** [gpsd-3.25/drivers/driver_rtcm2.os] Error 1 scons: building terminated because of errors. make[1]: *** [package/pkg-generic.mk:289: [...]/buildroot/output/build/gpsd-3.25/.stamp_built] Error 2 make: *** [Makefile:83: _all] Error 2 Although undocumented, neither in gcc not ld (clang unchecked by lack of a clang toolchain here, and by lack of clang knowledge), -z accepts the keyword to be snatch-glued onto it, like -zkeyword, rather than be spearated with a space. So, use that to pass -ztext. Fixes: http://autobuild.buildroot.org/results/c03/c039989947b960ac6af17c87090366abc26dcb6d/ http://autobuild.buildroot.net/results/bc35d3e7b0e8c59c776652070650af3c749250ee/ [0] Our other scons-based package, mongodb, does not build for another reason that probably hides the same issue as seen with gpsd. [1] As explained in gpsd's SConscript (se above), Scons does play tricks with variables: https://scons.org/doc/production/HTML/scons-man.html#f-MergeFlags https://scons.org/doc/production/HTML/scons-man.html#f-ParseFlags Quoting: Flag values are translated according to the prefix found, and added to the following construction variables: [...] -Wl, LINKFLAGS [...] - CCFLAGS [...] Any other strings not associated with options are assumed to be the names of libraries and added to the $LIBS construction variable. So in our case, it finds that -z is an unknown option that matches the '-' prefix, so it is added to CFLAGS, while 'text' is a string on its own, so added to LIBS, and thus it would try to link with -ltext (supposedly, because we do not even go that far). Funnily enough, we can se that "-Wl," is a known option prefix, that is added to LINKFLAGS (to properly be used with gcc or clang, not ld). As a consequence, gpsd's buildsystem does drop -ztext from the link flags, and only passes it to the compile flags, which brings us back to before we banned textrels in a1a2f498d7ec (package/Makefile.in: ban textrels on musl toolchains). Fixing gpsd is a task for another, separate patch... [2] I spent quite some time to look at recent, time-related changes in Buildroot, especially due to the infamous time64_t issues... Alas, that was not related, and only a git-bisect pinpointed the actual issue. Poor polar bears... Signed-off-by: Yann E. MORIN Cc: J. Neuschäfer Reviewed-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 43a5c279c08..808b71a93e9 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -155,12 +155,17 @@ TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) # # See also: https://www.openwall.com/lists/musl/2020/09/25/4 # -# NOTE: We're using "-z text" instead of "-Wl,-z,text" here, because some +# NOTE: We're using "-ztext" instead of "-Wl,-z,text" here, because some # packages pass TARGET_LDFLAGS directly to ld rather than gcc, and ld doesn't # support -Wl,[...]. -z is supported by both gcc and clang, so it probably # won't cause us problems. +# +# We're using "-ztext" instead of "-z text" here, because some buildsystems +# (like scons, for gpsd) will reorder and/or drop LDFLAGS, causing a lone +# "-z" to be passed and the "text" keyword to be dropped otherwise. Both +# gcc and ld supports that, so it probably won't cause us problems. ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_STATIC_LIBS),y:) -TARGET_LDFLAGS += -z text +TARGET_LDFLAGS += -ztext endif # By design, _FORTIFY_SOURCE requires gcc optimization to be enabled. From ade2db3ad2e2693ba5e4bfdad0aa75eabe9e5e4c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 9 Aug 2024 14:12:08 +0200 Subject: [PATCH 2363/3013] package/ffmpeg: fix gcc 14.x compile issue Fixes: - http://autobuild.buildroot.net/results/a04/a040cbc991da14c68302062ce96121b1e55c690e Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...ay-dvd-Use-correct-pointer-types-on-.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch diff --git a/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch new file mode 100644 index 00000000000..a77a0cf5ece --- /dev/null +++ b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch @@ -0,0 +1,52 @@ +From 347a70f101be28f8d78e8fd62ffc3a78324f49e9 Mon Sep 17 00:00:00 2001 +From: Andreas Rheinhardt +Date: Thu, 28 Mar 2024 05:35:36 +0100 +Subject: [PATCH] avcodec/pcm-bluray/dvd: Use correct pointer types on BE + +Signed-off-by: Andreas Rheinhardt +Signed-off-by: Waldemar Brodkorb +Upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/347a70f101be28f8d78e8fd62ffc3a78324f49e9 +--- + libavcodec/pcm-bluray.c | 5 +++-- + libavcodec/pcm-dvd.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c +index f65609514a..235020d78f 100644 +--- a/libavcodec/pcm-bluray.c ++++ b/libavcodec/pcm-bluray.c +@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, + samples *= num_source_channels; + if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { + #if HAVE_BIGENDIAN +- bytestream2_get_buffer(&gb, dst16, buf_size); ++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size); + #else + do { + *dst16++ = bytestream2_get_be16u(&gb); +@@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, + if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { + do { + #if HAVE_BIGENDIAN +- bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2); ++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, ++ avctx->ch_layout.nb_channels * 2); + dst16 += avctx->ch_layout.nb_channels; + #else + channel = avctx->ch_layout.nb_channels; +diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c +index 419b2a138f..319746c62e 100644 +--- a/libavcodec/pcm-dvd.c ++++ b/libavcodec/pcm-dvd.c +@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, + switch (avctx->bits_per_coded_sample) { + case 16: { + #if HAVE_BIGENDIAN +- bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); ++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size); + dst16 += blocks * s->block_size / 2; + #else + int samples = blocks * avctx->ch_layout.nb_channels; +-- +2.39.2 + From 74b46d08da7adc49b01f7af7ebb9e1421b8a9362 Mon Sep 17 00:00:00 2001 From: Athaariq Ardhiansyah Date: Fri, 9 Aug 2024 13:43:45 +0200 Subject: [PATCH 2364/3013] configs/raspberrypi5: use correct CPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Raspberry Pi 5 uses a quad-core ARM Cortex-A76 CPU cluster[1]. This fixes incorrect CPU as it is no big.LITTLE CPU. [1]: https://www.raspberrypi.com/documentation/computers/processors.html#bcm2712 Signed-off-by: Athaariq Ardhiansyah Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- configs/raspberrypi5_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig index 268bf2892ae..18fdfa13825 100644 --- a/configs/raspberrypi5_defconfig +++ b/configs/raspberrypi5_defconfig @@ -1,6 +1,5 @@ BR2_aarch64=y -BR2_cortex_a76_a55=y -BR2_ARM_FPU_VFPV4=y +BR2_cortex_a76=y # patches BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" From 8a6b86756843df35ce103423188a55eb80bb255c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 13 Jul 2024 11:28:42 +0200 Subject: [PATCH 2365/3013] package/squid: bump version to 6.10 The ESI feature is now disabled by default. Use --enable-esi if needed. See here for other changes: https://github.com/squid-cache/squid/commits/v6 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 4c1a85a87d5aabfc2a4ec99da7c48df9f1884797) Signed-off-by: Peter Korsgaard --- package/squid/squid.hash | 8 ++++---- package/squid/squid.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index e5017ae5cd0..e0dede862a4 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v6/squid-6.9.tar.xz.asc -md5 4888e9dc75c0daa0ed526b34c055cb67 squid-6.9.tar.xz -sha1 5e73b30116ce7111589cc2b1c9bfe3c17efa2e75 squid-6.9.tar.xz +# From http://www.squid-cache.org/Versions/v6/squid-6.10.tar.xz.asc +md5 86deefa7282c4388be95260aa4d4cf6a squid-6.10.tar.xz +sha1 70e90865df0e4e9ba7765b622da40bda9bb8fc5d squid-6.10.tar.xz # Locally calculated -sha256 1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882 squid-6.9.tar.xz +sha256 0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7 squid-6.10.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 60eca397ece..bfb36640823 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 6.9 +SQUID_VERSION = 6.10 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v6 SQUID_LICENSE = GPL-2.0+ From 53d0a01c0be32c34befdeff50a46f5b576d6296d Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 13 Jul 2024 15:25:32 +0200 Subject: [PATCH 2366/3013] DEVELOPERS: drop duplicated libnfc entry The patch removes one of the two occurrences of libnfc from the list of packages managed by Simon Dawson. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 673d371cf22262509e8f764615864be31b3e146e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7bb7b371ff7..2536f2eac21 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2896,7 +2896,6 @@ F: package/lcdapi/ F: package/libfreefare/ F: package/libjson/ F: package/libnfc/ -F: package/libnfc/ F: package/libserial/ F: package/libsigsegv/ F: package/macchanger/ From 77ebe1795c934a2fbe9f1521a37588f250b24ecc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 Jul 2024 23:34:34 +0200 Subject: [PATCH 2367/3013] package/gcc: bump 12.x series to 12.4 https://gcc.gnu.org/gcc-12/changes.html describes the changes of gcc 12.4 as follows: This is the list of problem reports (PRs) from GCC's bug tracking system that are known to be fixed in the 12.4 release. This list might not be complete (that is, it is possible that some PRs that have been fixed are not listed here). With a link to https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=12.4 There are 654 relevant commits (ignoring the "daily bumps") between gcc 12.3.0 and 12.4.0, which is too much to list exhaustively here. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour (cherry picked from commit b4454720908e79252ea98bcbe4de86e4bbd4de77) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 +- .../0001-disable-split-stack-for-non-thread-builds.patch | 0 ...02-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 0 .../0003-xtensa-add-.note.GNU-stack-section-on-linux.patch | 0 .../0004-Remove-crypt-and-crypt_r-interceptors.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 7 files changed, 4 insertions(+), 4 deletions(-) rename package/gcc/{12.3.0 => 12.4.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) rename package/gcc/{12.3.0 => 12.4.0}/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch (100%) rename package/gcc/{12.3.0 => 12.4.0}/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch (100%) rename package/gcc/{12.3.0 => 12.4.0}/0004-Remove-crypt-and-crypt_r-interceptors.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index d848e20e58a..4eff91e184d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -645,7 +645,7 @@ package/fxload/0001-fix-static-build.patch lib_patch.Upstream package/gamin/0001-no-abstract-sockets.patch lib_patch.Upstream package/gamin/0002-no-const-return.patch lib_patch.Sob lib_patch.Upstream package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch lib_patch.Upstream -package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream diff --git a/package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/12.4.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch similarity index 100% rename from package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch rename to package/gcc/12.4.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch diff --git a/package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch b/package/gcc/12.4.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch similarity index 100% rename from package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch rename to package/gcc/12.4.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch diff --git a/package/gcc/12.3.0/0004-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/12.4.0/0004-Remove-crypt-and-crypt_r-interceptors.patch similarity index 100% rename from package/gcc/12.3.0/0004-Remove-crypt-and-crypt_r-interceptors.patch rename to package/gcc/12.4.0/0004-Remove-crypt-and-crypt_r-interceptors.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 969702b707f..c88518a4154 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -73,7 +73,7 @@ config BR2_GCC_SUPPORTS_DLANG config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE - default "12.3.0" if BR2_GCC_VERSION_12_X + default "12.4.0" if BR2_GCC_VERSION_12_X default "13.3.0" if BR2_GCC_VERSION_13_X default "14.1.0" if BR2_GCC_VERSION_14_X default "arc-2023.09-release" if BR2_GCC_VERSION_ARC diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 0b48a1acddd..4534655790f 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -2,8 +2,8 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-10.4.0/sha512.sum sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum -sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.4.0/sha512.sum +sha512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 gcc-12.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-13.3.0/sha512.sum sha512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 gcc-13.3.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-14.1.0/sha512.sum From 051df65fd5e60e81b61262b408d442d98d15acc8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 12 Jul 2024 00:20:18 +0200 Subject: [PATCH 2368/3013] package/gdb: remove stale hashes from GDB 10.x and 11.x In commit 809fdb3a7a3e4da8e7734a0d7cec48a4b3b99ec5 ("package/gdb: remove gdb 10.x") and 030497be18cfb4dfae6494ada0c202f6c7c0f5c0 ("package/gdb: remove support for GDB 11.x"), we forgot to drop the no longer needed hashes from gdb.hash. Let's do this now. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour (cherry picked from commit 538a99a33a2729b829ee07394de1a19dd955814a) Signed-off-by: Peter Korsgaard --- package/gdb/gdb.hash | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 144f6da2961..5c8f883309e 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,6 +1,4 @@ # From https://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz -sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz sha512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34 gdb-13.2.tar.xz sha512 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede gdb-14.2.tar.xz From 58e57aff083ff7151e9a9678cf07ed83270dba78 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 14:09:26 +0200 Subject: [PATCH 2369/3013] package/gcc: disallow Fortran on gcc 12/13 on Microblaze The build of gcc with Fortran support is broken on gcc 12.x and gcc 13.x, it fails with: ../../../libgfortran/generated/bessel_r8.c: In function 'bessel_yn_r8': ../../../libgfortran/generated/bessel_r8.c:178:1: internal compiler error: in gen_reg_rtx, at emit-rtl.cc:1167 This issue has been fixed in gcc 14.x, which builds a Microblaze Fortran-capable toolchain successfully. Since we're not really interested in figuring out the commit that fixed the problem, let's simply disallow the selection of Fortran with gcc12/13 on Microblaze. Fixes: http://autobuild.buildroot.net/results/5b4eee1d9b119c9f923f9518618f45a6482ddc85/ Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour (cherry picked from commit 41f25676184fdbb3243c3709b925369679e7423a) Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index c88518a4154..5d3b803c78f 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -103,6 +103,10 @@ config BR2_TOOLCHAIN_BUILDROOT_FORTRAN # on architecture building libquadmath, wchar is required depends on !BR2_TOOLCHAIN_HAS_LIBQUADMATH || \ (BR2_TOOLCHAIN_HAS_LIBQUADMATH && BR2_USE_WCHAR) + # internal compiler error: in gen_reg_rtx, at emit-rtl.cc:1167 + # fixed in gcc 14.x, so disable gcc 12.x/13.x + depends on !(BR2_microblaze && \ + (BR2_GCC_VERSION_12_X || BR2_GCC_VERSION_13_X)) select BR2_TOOLCHAIN_HAS_FORTRAN help Enable this option if you want your toolchain to support the From 5396f35da3430b0d135d14647a235bfd6508ca52 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 11 Jul 2024 22:19:38 +0200 Subject: [PATCH 2370/3013] package/bitcoin: bump to version 26.2 For change log since 26.0, see: https://bitcoincore.org/en/releases/26.1/ https://bitcoincore.org/en/releases/26.2/ Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 88ab90e3092de7ce43a79e01e9a8cad8e7323047) Signed-off-by: Peter Korsgaard --- package/bitcoin/bitcoin.hash | 6 +++--- package/bitcoin/bitcoin.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index 6b3008af863..9bd08430854 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,7 +1,7 @@ -# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS +# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.2/SHA256SUMS # After checking pgp signature from: -# https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS.asc -sha256 ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1 bitcoin-26.0.tar.gz +# https://bitcoincore.org/bin/bitcoin-core-26.2/SHA256SUMS.asc +sha256 78d59418741f45cbdaa9bf20ebc49a5e95ff9f7172f72fc78d14307eaf341b3c bitcoin-26.2.tar.gz # Hash for license file sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 2f8a1777a26..9ca29092adc 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITCOIN_VERSION = 26.0 +BITCOIN_VERSION = 26.2 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT From 560fb72ff4909670e5ff6987e9b8c6e618e310f3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 6 Jul 2024 22:15:48 +0200 Subject: [PATCH 2371/3013] support/testing: new xfsprogs runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1fb08cdc85fab4ba1460cd15e0829494afc0fdf2) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + .../testing/tests/package/test_xfsprogs.py | 112 ++++++++++++++++++ .../package/test_xfsprogs/linux-xfs.fragment | 1 + 3 files changed, 115 insertions(+) create mode 100644 support/testing/tests/package/test_xfsprogs.py create mode 100644 support/testing/tests/package/test_xfsprogs/linux-xfs.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 2536f2eac21..7e06a1acfa4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1917,6 +1917,8 @@ F: support/testing/tests/package/test_usbutils/ F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_wine.py +F: support/testing/tests/package/test_xfsprogs.py +F: support/testing/tests/package/test_xfsprogs/ F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/support/testing/tests/package/test_xfsprogs.py b/support/testing/tests/package/test_xfsprogs.py new file mode 100644 index 00000000000..a3a4bd27d83 --- /dev/null +++ b/support/testing/tests/package/test_xfsprogs.py @@ -0,0 +1,112 @@ +import os +import subprocess + +import infra.basetest + + +class TestXfsProgs(infra.basetest.BRTest): + # This test needs a Kernel with XFS support. + kern_frag = \ + infra.filepath("tests/package/test_xfsprogs/linux-xfs.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.37" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_XFSPROGS=y + BR2_PACKAGE_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + # Prepare the disk image. XFS requires at least 300MB of + # storage to work. + disk_file = os.path.join(self.builddir, "images", "disk.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", "bs=1M", "count=512"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + + # Run the emulator with a blank drive. + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = ["console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-drive", f"file={disk_file},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Check a program can run and show its version. + self.assertRunOk("mkfs.xfs -V") + + # Variables for this test. + dev = "/dev/vda" + label = "BR_TEST" + mnt_pt = "/tmp/xfs" + data_file = f"{mnt_pt}/data.bin" + + # We create the XFS filesystem on our device. + self.assertRunOk(f"mkfs.xfs {dev}") + + # We set a label on this filesystem. + self.assertRunOk(f"xfs_admin -L '{label}' {dev}") + + # We create a mount point. + self.assertRunOk(f"mkdir -p {mnt_pt}") + + # We mount the XFS filesystem. + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We create a file with random data, to use this new + # filesystem a bit. + self.assertRunOk(f"dd if=/dev/urandom of={data_file} bs=1M count=10") + + # We compute the sha256 hash and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We unmount the filesystem. + self.assertRunOk(f"umount {mnt_pt}") + + # We query the fragmentation level. Since it's a new + # filesystem, we don't expect any filesystem + # fragmentation. This invocation is just to test the "xfs_db" + # program can run and read the filesystem. + self.assertRunOk(f"xfs_db -c frag -r {dev}") + + # We run a repair (this tool is the equivalent of + # "fsck"). Again, since we cleanly unmounted the filesystem, + # we are not expecting any repair. This is just to test the + # program works correctly. + self.assertRunOk(f"xfs_repair {dev}") + + # We query the label and check it is the one we set at the + # beginning. + out, ret = self.emulator.run(f"xfs_admin -l {dev}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], f"label = \"{label}\"") + + # We remount our filesystem. + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We should recompute the same sha256 hash as before. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) diff --git a/support/testing/tests/package/test_xfsprogs/linux-xfs.fragment b/support/testing/tests/package/test_xfsprogs/linux-xfs.fragment new file mode 100644 index 00000000000..32f7f6d8720 --- /dev/null +++ b/support/testing/tests/package/test_xfsprogs/linux-xfs.fragment @@ -0,0 +1 @@ +CONFIG_XFS_FS=y From 4be8ba1629b5ec8606806f4573d81bd37693106c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:25:42 +0200 Subject: [PATCH 2372/3013] package/mupdf: drop MUPDF_PKG_CONFIG_PACKAGES This variable might have been needed in the very distant past to help mupdf find libraries, but mupdf's Makefile now properly uses pkg-config to find the 5 libraries freetype2, gumbo, harfbuzz, libjpeg and zlib, so our code has become redundant: drop it. Signed-off-by: Thomas Petazzoni (cherry picked from commit f7deaa1330baad303afb76a7711faeeb1ddfee5d) Signed-off-by: Peter Korsgaard --- package/mupdf/mupdf.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 08894d7980e..4aef0f99e7a 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -22,22 +22,12 @@ MUPDF_DEPENDENCIES = \ xlib_libX11 \ zlib -# The pkg-config name for gumbo-parser is `gumbo`. -MUPDF_PKG_CONFIG_PACKAGES = \ - freetype2 \ - gumbo \ - harfbuzz \ - libjpeg \ - zlib - MUPDF_CFLAGS = \ $(TARGET_CFLAGS) \ - `$(PKG_CONFIG_HOST_BINARY) --cflags $(MUPDF_PKG_CONFIG_PACKAGES)` \ -fPIC # -fPIC is needed because the Makefile doesn't append it. MUPDF_LDFLAGS = \ - $(TARGET_LDFLAGS) \ - `$(PKG_CONFIG_HOST_BINARY) --libs $(MUPDF_PKG_CONFIG_PACKAGES)` + $(TARGET_LDFLAGS) # mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. # with USE_SYSTEM_LIBS it will try to use system libraries instead of the bundled ones. From ef7cf5871451666a4bc1357a90f5798afd1d58a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 7 Jun 2024 18:32:04 +0200 Subject: [PATCH 2373/3013] package/mupdf: fix building shared libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By default mupdf generates static libraries, shared libraries must be enabled explicitely. Also, when building shared libraries, mupdf's Makefile properly passes -fPIC, so adding it manually to MUPDF_CFLAGS is not needed. Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni (cherry picked from commit 401162d4a947184654d8202392425a625d000172) Signed-off-by: Peter Korsgaard --- package/mupdf/mupdf.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 4aef0f99e7a..e3fe66e3969 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -23,8 +23,7 @@ MUPDF_DEPENDENCIES = \ zlib MUPDF_CFLAGS = \ - $(TARGET_CFLAGS) \ - -fPIC # -fPIC is needed because the Makefile doesn't append it. + $(TARGET_CFLAGS) MUPDF_LDFLAGS = \ $(TARGET_LDFLAGS) @@ -40,6 +39,12 @@ MUPDF_MAKE_OPTS = \ HAVE_OBJCOPY=no \ prefix="/usr" +ifeq ($(BR2_STATIC_LIBS),y) +MUPDF_MAKE_OPTS += shared=no +else +MUPDF_MAKE_OPTS += shared=yes +endif + ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MUPDF_DEPENDENCIES += libfreeglut else From aeced848bd5588dd62a1556d2d8093615d349cfa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:29:06 +0200 Subject: [PATCH 2374/3013] package/mupdf: drop MUPDF_CFLAGS/MUPDF_LDFLAGS Now that MUPDF_CFLAGS and MUPDF_LDFLAGS are just TARGET_CFLAGS and TARGET_LDFLAGS, drop them. Signed-off-by: Thomas Petazzoni (cherry picked from commit 90f0a484671098f9a94ce66b8f8af94e106ae106) Signed-off-by: Peter Korsgaard --- package/mupdf/mupdf.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index e3fe66e3969..5f73b680a6c 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -22,17 +22,11 @@ MUPDF_DEPENDENCIES = \ xlib_libX11 \ zlib -MUPDF_CFLAGS = \ - $(TARGET_CFLAGS) - -MUPDF_LDFLAGS = \ - $(TARGET_LDFLAGS) - # mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. # with USE_SYSTEM_LIBS it will try to use system libraries instead of the bundled ones. MUPDF_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ - XCFLAGS="$(MUPDF_CFLAGS)" \ - XLIBS="$(MUPDF_LDFLAGS)" \ + XCFLAGS="$(TARGET_CFLAGS)" \ + XLIBS="$(TARGET_LDFLAGS)" \ USE_SYSTEM_LIBS=yes MUPDF_MAKE_OPTS = \ From 1c4be6bb3794f88ff4a2f5bee05ccc5df9a482b1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:32:52 +0200 Subject: [PATCH 2375/3013] package/mupdf: make X11 support optional The X11 support in mupdf is actually optional, and it does require libXext in addition to libX11, so adjust the packaging accordingly. Signed-off-by: Thomas Petazzoni (cherry picked from commit 2c0d7b72c0993a55c8dcb7b38d85792e1bf6e8bc) Signed-off-by: Peter Korsgaard --- package/mupdf/Config.in | 2 -- package/mupdf/mupdf.mk | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in index cf97711160d..34c5e7d538c 100644 --- a/package/mupdf/Config.in +++ b/package/mupdf/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_MUPDF depends on BR2_INSTALL_LIBSTDCPP # harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz - depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GUMBO_PARSER select BR2_PACKAGE_HARFBUZZ @@ -11,7 +10,6 @@ config BR2_PACKAGE_MUPDF select BR2_PACKAGE_JPEG select BR2_PACKAGE_LCMS2 select BR2_PACKAGE_OPENJPEG - select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_ZLIB help MuPDF is a lightweight PDF, XPS, and E-book viewer. diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 5f73b680a6c..d813d9b7de0 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -19,7 +19,6 @@ MUPDF_DEPENDENCIES = \ host-pkgconf \ jbig2dec jpeg \ lcms2 openjpeg \ - xlib_libX11 \ zlib # mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. @@ -39,6 +38,13 @@ else MUPDF_MAKE_OPTS += shared=yes endif +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXEXT),yy) +MUPDF_MAKE_OPTS += HAVE_X11=yes +MUPDF_DEPENDENCIES += xlib_libX11 xlib_libXext +else +MUPDF_MAKE_OPTS += HAVE_X11=no +endif + ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MUPDF_DEPENDENCIES += libfreeglut else From ff17ce6f28d9371d505051a486f479079b23b050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 7 Jun 2024 18:32:02 +0200 Subject: [PATCH 2376/3013] package/python-pymupdf: add missing python-zlib dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It turns out that python-pymupdf doesn't require zlib directly, but it does require the zlib python module. This fixes the following runtime error: Traceback (most recent call last): File "", line 1, in File "/usr/lib/python3.11/site-packages/fitz/__init__.py", line 22, in File "/usr/lib/python3.11/site-packages/fitz/fitz.py", line 3402, in File "/usr/lib/python3.11/gzip.py", line 9, in ModuleNotFoundError: No module named 'zlib' Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni (cherry picked from commit ba6baa019b8b0146d053f310ddd2bc96cb9465a5) Signed-off-by: Peter Korsgaard --- package/python-pymupdf/Config.in | 2 +- package/python-pymupdf/python-pymupdf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index ecaa5496b51..3831a254516 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF - select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Python bindings for the PDF rendering library MuPDF. diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 8825868fb59..8547d4f3fb4 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -12,7 +12,7 @@ PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github -PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib +PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" From 553391da6c3f6afc07c044e8059411e4797f87dc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:53:57 +0200 Subject: [PATCH 2377/3013] package/python-pymupdf: drop dependency on X.org Now that the mandatory dependency of MuPDF on X.org, we can also drop this dependency from python-pymupdf. Signed-off-by: Thomas Petazzoni (cherry picked from commit edfa6f29785e618b75739b702fc863ee2410908d) Signed-off-by: Peter Korsgaard --- package/python-pymupdf/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index 3831a254516..7e961689b6c 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_INSTALL_LIBSTDCPP # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz - depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF @@ -13,10 +12,6 @@ config BR2_PACKAGE_PYTHON_PYMUPDF https://github.com/pymupdf/PyMuPDF -comment "python-pymupdf needs Xorg" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_XORG7 - comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ From d9bddddd2341cd8dd841a09884c808b6e57af5de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 7 Jun 2024 18:32:03 +0200 Subject: [PATCH 2378/3013] support/testing: add new test for python-pymupdf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To give us a chance to catch runtime issues (such as missing dependencies) more easily, add a test that writes a sample PDF file, read it back and verify the text that was read. Like similar packages that lead to a big rootfs (e.g. python-botocore), this test requires a separate ext2 rootfs to avoid filling the default amount of RAM available entirely (which would cause missing files from the root filesystem and in turn, test failures). Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni (cherry picked from commit 115e9493b8e3b50cd56b93c47d669319d02698a7) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ .../tests/package/sample_python_pymupdf.py | 17 ++++++++++++++ .../tests/package/test_python_pymupdf.py | 23 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 support/testing/tests/package/sample_python_pymupdf.py create mode 100644 support/testing/tests/package/test_python_pymupdf.py diff --git a/DEVELOPERS b/DEVELOPERS index 7e06a1acfa4..210c8436132 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2671,9 +2671,11 @@ F: package/python-pymupdf/ F: package/python-rsa/ F: package/python-s3transfer/ F: support/testing/tests/package/sample_python_jmespath.py +F: support/testing/tests/package/sample_python_pymupdf.py F: support/testing/tests/package/sample_python_rsa.py F: support/testing/tests/package/sample_python_s3transfer.py F: support/testing/tests/package/test_python_jmespath.py +F: support/testing/tests/package/test_python_pymupdf.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py diff --git a/support/testing/tests/package/sample_python_pymupdf.py b/support/testing/tests/package/sample_python_pymupdf.py new file mode 100644 index 00000000000..574bd279653 --- /dev/null +++ b/support/testing/tests/package/sample_python_pymupdf.py @@ -0,0 +1,17 @@ +import fitz + +# Write a test PDF file +outfile = "python-pymupdf.pdf" +sample_text = "This is a test page for python-pymupdf." +doc = fitz.open() +page = doc.new_page() +p = fitz.Point(50, 72) +page.insert_text(p, sample_text) +doc.save(outfile) + +# Read back the file +with fitz.open(outfile) as d: # open document + read_text = chr(12).join([page.get_text() for page in d]) + +print(read_text) +assert(read_text == sample_text + "\n") diff --git a/support/testing/tests/package/test_python_pymupdf.py b/support/testing/tests/package/test_python_pymupdf.py new file mode 100644 index 00000000000..1af3efc8afa --- /dev/null +++ b/support/testing/tests/package/test_python_pymupdf.py @@ -0,0 +1,23 @@ +import os +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3PyMuPDF(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYMUPDF=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + """ + sample_scripts = ["tests/package/sample_python_pymupdf.py"] + timeout = 30 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() From 65af7b6ee47a5eb611441e52210a7912c4124dcc Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 13 Jul 2024 07:42:15 +0200 Subject: [PATCH 2379/3013] package/pkg-cmake: remove override of CMAKE_ASM_COMPILER CMAKE_ASM_COMPILER is supposed to point to a compiler wrapper (i.e. gcc), _not_ to as directly. If it is not set, it will use the value of CMAKE_C_COMPILER. That's exactly what we want, so there is no need to set CMAKE_ASM_COMPILER at all. For target, we don't set CMAKE_ASM_COMPILER either. Setting CMAKE_ASM_COMPILER leads to build failures for any package that actually tries to build .S files for the host - like llvm. This is why llvm has an override for it. Signed-off-by: Heiko Thiery Signed-off-by: Arnout Vandecappelle (cherry picked from commit 22af5f2939089b996aeda9ce072ab2f9b3ee6c2d) Signed-off-by: Peter Korsgaard --- package/pkg-cmake.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8f391eb4c92..c7032312fb4 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -147,7 +147,6 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ -DCMAKE_SHARED_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ - -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER)" \ $(if $$(CMAKE_HOST_C_COMPILER_LAUNCHER),\ From a70ac746fefb044febdc2bff56a89a3495782b78 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 13 Jul 2024 07:44:08 +0200 Subject: [PATCH 2380/3013] package/llvm-project/llvm: remove overriding the ASM compiler There was an error in the pkg-cmake infra file regarding the selection of the ASM compiler. Now that this has been fixed, overwriting the ASM compiler selection is no longer necessary. Signed-off-by: Heiko Thiery Signed-off-by: Arnout Vandecappelle (cherry picked from commit 638474478093831d76ab70e0cb3bd2d65d4a4511) Signed-off-by: Peter Korsgaard --- package/llvm-project/llvm/llvm.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/llvm-project/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk index 6598d8b6c11..b0515474d80 100644 --- a/package/llvm-project/llvm/llvm.mk +++ b/package/llvm-project/llvm/llvm.mk @@ -20,10 +20,6 @@ LLVM_DEPENDENCIES = host-llvm HOST_LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm -# Assembly files for x64 in lib/Support/BLAKE3 need to be compiled -# by a C compiler -HOST_LLVM_CONF_OPTS += -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" - # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects # This flag assumes that projects are checked out side-by-side and not nested HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" From c7d558031d630ed0e3b9c53b8ffc335a759933a5 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sun, 19 May 2024 11:16:26 +0200 Subject: [PATCH 2381/3013] package/x11r7/xlib_libxshmfence: fix build on riscv32 In preparation to revert e39ad96136a8c340b3aea6b036024e28f14584f3, and (partial) 26642e4cc09666110d5105e7867579a0e48cfa09. xshmfence_futex.h: In function 'sys_futex': xshmfence_futex.h:58:24: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'? 58 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); | ^~~~~~~~~ | sys_futex Fixes: - https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3 Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni (cherry picked from commit 36c7b1f08607c92186b849bd395fb2529942a6f9) Signed-off-by: Peter Korsgaard --- ...tex.h-fix-build-on-32-bit-architectu.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch diff --git a/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch b/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch new file mode 100644 index 00000000000..40a796c4f28 --- /dev/null +++ b/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch @@ -0,0 +1,46 @@ +From 4fca45a71f08a5bebd12d39c85f49e0b0e4426bf Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Fri, 5 Apr 2024 10:45:15 +0200 +Subject: [PATCH] src/xshmfence_futex.h: fix build on 32-bit architectures + using 64-bit time_t + +Fix the following build failure on 32-bit architectures using 64-bit +time_t (e.g. riscv32): + +xshmfence_futex.h: In function 'sys_futex': +xshmfence_futex.h:58:24: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'? + 58 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); + | ^~~~~~~~~ + | sys_futex + +Similar to: +https://gitlab.freedesktop.org/mesa/mesa/-/commit/7d87478124061915582412ba410759afe863d679 + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3 + +Signed-off-by: Thomas Devoogdt +Part-of: +Upstream: https://gitlab.freedesktop.org/xorg/lib/libxshmfence/-/commit/4fca45a71f08a5bebd12d39c85f49e0b0e4426bf +--- + src/xshmfence_futex.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h +index 673ac0e..4476038 100644 +--- a/src/xshmfence_futex.h ++++ b/src/xshmfence_futex.h +@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) { + #include + #include + ++#if defined(SYS_futex_time64) && !defined(SYS_futex) ++#define SYS_futex SYS_futex_time64 ++#endif ++ + static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3) + { + return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); +-- +2.34.1 + From ed225a095050900bfdf0ed3dc1a74d9d83da5577 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sun, 19 May 2024 11:16:27 +0200 Subject: [PATCH 2382/3013] Revert "package/x11r7/xlib_libxshmfence: disable on riscv32" This reverts (partial) commit e39ad96136a8c340b3aea6b036024e28f14584f3, and 26642e4cc09666110d5105e7867579a0e48cfa09, but also fixed additional sites where the !BR2_RISCV_32 dependency is no longer needed, thanks to the recently added 0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch in xlib_libxshmfence. Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni (cherry picked from commit f30da3dc2181f157c25b742e6785b4b79f5deedf) Signed-off-by: Peter Korsgaard --- package/mesa3d/Config.in | 6 +++--- package/weston/Config.in | 2 -- package/wlroots/Config.in | 2 -- package/x11r7/xlib_libxshmfence/Config.in | 3 --- package/x11r7/xserver_xorg-server/Config.in | 3 +-- package/x11r7/xwayland/Config.in | 2 -- 6 files changed, 4 insertions(+), 14 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 459051b2dba..d8ea22ac918 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -99,7 +99,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" - depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV help @@ -135,7 +135,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" - depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Utgard GPUs. @@ -151,7 +151,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" - depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. diff --git a/package/weston/Config.in b/package/weston/Config.in index e83eeb0f746..7cb17454285 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -128,7 +128,6 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland - depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB @@ -142,7 +141,6 @@ comment "XWayland support needs libepoxy and X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 7622a3033bd..f0f53a82c91 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -49,7 +49,6 @@ config BR2_PACKAGE_WLROOTS_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland - depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_WM @@ -62,7 +61,6 @@ comment "XWayland support needs X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xlib_libxshmfence/Config.in b/package/x11r7/xlib_libxshmfence/Config.in index 7823bda7c08..710476b357f 100644 --- a/package/x11r7/xlib_libxshmfence/Config.in +++ b/package/x11r7/xlib_libxshmfence/Config.in @@ -1,8 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXSHMFENCE bool "libxshmfence" - # Due to use of SYS_futex - can be enabled again when upstream - # adds SYS_futex64 as an alternative - depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_XORGPROTO help diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index b933bd0285f..89410f22bb8 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -49,8 +49,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBPCIACCESS - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ - (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_TOOLCHAIN_HAS_SYNC_4 help This variant of the X.org server is the full-blown variant, as used by desktop GNU/Linux distributions. The drivers (for diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 9ac1928f51b..311dae25ec6 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_XWAYLAND # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. - depends on !BR2_RISCV_32 # xlib_libxshmfence depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) @@ -27,6 +26,5 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS From 22f476b997497dced9759085e85f0208c33f3556 Mon Sep 17 00:00:00 2001 From: Steffen Persvold Date: Thu, 27 Jun 2024 12:34:57 +0200 Subject: [PATCH 2383/3013] package/directfb: enable on riscv32 again Newer 32bit architectures like RISCV32 and ARC are using 64bit time_t from the get go unlike other 32bit architectures, therefore aliasing __NR_futex to __NR_futex_time64 avoids the build error mentioned in cb6fd050. Fixes: - http://autobuild.buildroot.org/results/c0f4168575fa85af933539441eea95a3b10dac91 Signed-off-by: Steffen Persvold Signed-off-by: Thomas Petazzoni (cherry picked from commit a4ae4122936306952109865006d055a112a111f1) Signed-off-by: Peter Korsgaard --- ...-__NR_futex-on-32bit-architectures-u.patch | 43 +++++++++++++++++++ package/directfb/Config.in | 2 - 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch diff --git a/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch b/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch new file mode 100644 index 00000000000..4cbbc5dcc38 --- /dev/null +++ b/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch @@ -0,0 +1,43 @@ +From 8ffd68a8dfa1e8671dd8c01b96faffd681deca4e Mon Sep 17 00:00:00 2001 +From: Steffen Persvold +Date: Tue, 25 Jun 2024 14:14:49 +0200 +Subject: [PATCH] libdirect: define __NR_futex on 32bit architectures using + 64-bit time_t + +Newer 32bit architectures like RISCV32 and ARC are using 64bit time_t +from the get go unlike other 32bit architectures, therefore aliasing +__NR_futex to __NR_futex_time64 helps avoid the below errors : + +system.c:242:21: error: '__NR_futex' undeclared (first use in this function) + 242 | ret = syscall( __NR_futex, uaddr, op, val, timeout, uaddr2, val3 ); + | ^~~~~~~~~~ + +Upstream: dead +Signed-off-by: Steffen Persvold +--- + lib/direct/os/linux/glibc/system.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/direct/os/linux/glibc/system.c b/lib/direct/os/linux/glibc/system.c +index 32086a25..7143442b 100644 +--- a/lib/direct/os/linux/glibc/system.c ++++ b/lib/direct/os/linux/glibc/system.c +@@ -213,6 +213,10 @@ direct_getenv( const char *name ) + + /**********************************************************************************************************************/ + ++#if defined(__NR_futex_time64) && !defined(__NR_futex) ++#define __NR_futex __NR_futex_time64 ++#endif ++ + DirectResult + direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int *uaddr2, int val3 ) + { +@@ -245,4 +249,3 @@ direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int * + + return DR_OK; + } +- +-- +2.40.1 + diff --git a/package/directfb/Config.in b/package/directfb/Config.in index f4d6b8cbd19..20481f56da1 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_DIRECTFB bool "directfb" - depends on !BR2_RISCV_32 depends on !BR2_STATIC_LIBS # static link issues depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP @@ -162,7 +161,6 @@ config BR2_PACKAGE_DIRECTFB_TESTS endif # BR2_PACKAGE_DIRECTFB comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library" - depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \ From 23e9dab58a831cf7bee941b659142e97952cd65e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 7 Jun 2024 15:48:47 +0200 Subject: [PATCH 2384/3013] utils/checkpackagelib: really check variable name Currently, when a package defines an unprefixed variable, but its value contains a properly prefixed expansion (or even just the name of a variable), there is not error reported (e.g. with the recently fixed composer issue): BASE_SITE = https://getcomposer.org/download/$(COMPOSER_VERSION)/composer.phar The reason is that he check is done on the whole line, rather than on the variable that is being set. We fix that by really looking at the variable we found, instead of looking in the whole line. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (cherry picked from commit b0964df557bedd88db1a223491fba615c995484f) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 1e6bd708a5c..d21e409b4c6 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -316,7 +316,7 @@ def check_line(self, lineno, text): if self.ALLOWED.match(variable): return - if self.REGEX.search(text) is None: + if self.REGEX.search(variable) is None: return ["{}:{}: possible typo: {} -> *{}*" .format(self.filename, lineno, variable, self.package), text] From 39af748ca422ab508c6cf6ae33a041c191888419 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 7 Jun 2024 15:48:48 +0200 Subject: [PATCH 2385/3013] utils/checkpackagelib: extend hint about unprefixed variables User may get confused when they see the current hint, and take that as the proper replacement, while we're only reporting the stem of the variable name: .../foo.mk:16: possible typo: BLA -> *FOO* There is usually no easy way to actually suggest the proper variable name, though, so let's make it a little bit more obvious that we meant the variable was improperly prefixed: .../foo.mk:16: possible typo, variable not properly prefixed: BLA -> *FOO_XXX* And while at it, throw in the URL to the corresponding manual entry. Adapt the test accordingly. Reported-by: "Frager, Neal" Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski Reviewed-by: Neal Frager [Arnout: also update new test, scoped -> prefixed] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5836b797626db56958fec09810e16af1c75d2b4c) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_mk.py | 4 ++-- utils/checkpackagelib/test_lib_mk.py | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index d21e409b4c6..5d48e8929c8 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -317,8 +317,8 @@ def check_line(self, lineno, text): if self.ALLOWED.match(variable): return if self.REGEX.search(variable) is None: - return ["{}:{}: possible typo: {} -> *{}*" - .format(self.filename, lineno, variable, self.package), + return ["{}:{}: possible typo, variable not properly prefixed: {} -> *{}_XXXX* ({}#_tips_and_tricks)" + .format(self.filename, lineno, variable, self.package, self.url_to_manual), text] diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 208b1ecdc2b..c86c55b9cbb 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -546,27 +546,27 @@ def test_TrailingBackslash(testname, filename, string, expected): ('bad =', 'any.mk', 'OTHER_VAR = \n', - [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + [['any.mk:1: possible typo, variable not properly prefixed: OTHER_VAR -> *ANY_XXXX* (url#_tips_and_tricks)', 'OTHER_VAR = \n']]), ('bad +=', 'any.mk', 'OTHER_VAR += \n', - [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + [['any.mk:1: possible typo, variable not properly prefixed: OTHER_VAR -> *ANY_XXXX* (url#_tips_and_tricks)', 'OTHER_VAR += \n']]), ('ignore missing space', 'any.mk', 'OTHER_VAR= \n', - [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + [['any.mk:1: possible typo, variable not properly prefixed: OTHER_VAR -> *ANY_XXXX* (url#_tips_and_tricks)', 'OTHER_VAR= \n']]), ('use path in the warning', './any.mk', 'OTHER_VAR = \n', - [['./any.mk:1: possible typo: OTHER_VAR -> *ANY*', + [['./any.mk:1: possible typo, variable not properly prefixed: OTHER_VAR -> *ANY_XXXX* (url#_tips_and_tricks)', 'OTHER_VAR = \n']]), ('another name', 'other.mk', 'ANY_VAR = \n', - [['other.mk:1: possible typo: ANY_VAR -> *OTHER*', + [['other.mk:1: possible typo, variable not properly prefixed: ANY_VAR -> *OTHER_XXXX* (url#_tips_and_tricks)', 'ANY_VAR = \n']]), ('libc exception', './any.mk', @@ -583,7 +583,7 @@ def test_TrailingBackslash(testname, filename, string, expected): ('host (bad)', 'any.mk', 'HOST_OTHER_VAR = \n', - [['any.mk:1: possible typo: HOST_OTHER_VAR -> *ANY*', + [['any.mk:1: possible typo, variable not properly prefixed: HOST_OTHER_VAR -> *ANY_XXXX* (url#_tips_and_tricks)', 'HOST_OTHER_VAR = \n']]), ('provides', 'any.mk', @@ -599,13 +599,14 @@ def test_TrailingBackslash(testname, filename, string, expected): 'any.mk', 'ANY_PROVIDES = other\n' 'OTHERS_VAR = \n', - [['any.mk:2: possible typo: OTHERS_VAR -> *ANY*', + [['any.mk:2: possible typo, variable not properly prefixed: OTHERS_VAR -> *ANY_XXXX* (url#_tips_and_tricks)', 'OTHERS_VAR = \n']]), ('linux tool', 'package/linux-tools/linux-tool-cpupower.mk.in', 'CPUPOWER_DEPENDENCIES =\n' 'POWER_DEPENDENCIES +=\n', - [['package/linux-tools/linux-tool-cpupower.mk.in:2: possible typo: POWER_DEPENDENCIES -> *CPUPOWER*', + [['package/linux-tools/linux-tool-cpupower.mk.in:2: possible typo, variable not properly prefixed: ' + 'POWER_DEPENDENCIES -> *CPUPOWER_XXXX* (url#_tips_and_tricks)', 'POWER_DEPENDENCIES +=\n']]), ] From 300d507c2efd3201ddb6c9d8116711a85288003e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 Jul 2024 11:49:01 +0200 Subject: [PATCH 2386/3013] package/android-tools: add patches to fix build with GCC 14.x This commit adds 3 patches that fix various implicit declarations error that arise with GCC 14.x. Fixes host-android-tools build issues: http://autobuild.buildroot.net/results/1fd0d0a9547d4ad2a24916eb79230d49a825e694 http://autobuild.buildroot.net/results/9e3bb951d7db1c8a8725b5570c54f6dec0e8b344 http://autobuild.buildroot.net/results/8c9345fcad6e935c13b16c318bbb27282de10ac1 http://autobuild.buildroot.net/results/4e8a2ce69bfb8a86da2711cb32a99ad51b0bdf5f http://autobuild.buildroot.net/results/ca6310cfcb0a9787eb5cec3c33aab903f4964cab http://autobuild.buildroot.net/results/a77509d4df8281d666d870faeb008f9196d3bbc3 http://autobuild.buildroot.net/results/74cdcbcbe8bab244b1c368260162e3cef133376f http://autobuild.buildroot.net/results/225b2722b030b1ea1706db8dd54d62da81d8725b As well as android-tools build issues: http://autobuild.buildroot.net/results/abfaf53328d0b29c778f75e105cc7043f2ad44fe http://autobuild.buildroot.net/results/d2467a2ac4a915d850cc8bc2341d9803346604a9 http://autobuild.buildroot.net/results/a4cf59ce479b7db7f0a3269c0462ce1ccc9f600e http://autobuild.buildroot.net/results/667a49bff45b226dec4349d54f977c8bd6abadd5 http://autobuild.buildroot.net/results/92cf3eea0e0d7531220cd9850993e269a3a4744d Signed-off-by: Thomas Petazzoni (cherry picked from commit d201f2f5cd0d1e0389430cda78adead37977a6cd) Signed-off-by: Peter Korsgaard --- ...stboot.c-reorder-functions-to-avoid-.patch | 54 +++++++++++++++++++ ...parse_read.c-add-missing-output_file.patch | 37 +++++++++++++ ...s-make_ext4fs_main.c-disable-Android.patch | 54 +++++++++++++++++++ ...014-core-adbd-adb.c-open-code-capset.patch | 52 ++++++++++++++++++ ...b.c-include-correct-header-for-prctl.patch | 34 ++++++++++++ 5 files changed, 231 insertions(+) create mode 100644 package/android-tools/0011-core-fastboot-fastboot.c-reorder-functions-to-avoid-.patch create mode 100644 package/android-tools/0012-core-libsparse-sparse_read.c-add-missing-output_file.patch create mode 100644 package/android-tools/0013-extras-ext4_utils-make_ext4fs_main.c-disable-Android.patch create mode 100644 package/android-tools/0014-core-adbd-adb.c-open-code-capset.patch create mode 100644 package/android-tools/0015-core-adbd-adb.c-include-correct-header-for-prctl.patch diff --git a/package/android-tools/0011-core-fastboot-fastboot.c-reorder-functions-to-avoid-.patch b/package/android-tools/0011-core-fastboot-fastboot.c-reorder-functions-to-avoid-.patch new file mode 100644 index 00000000000..b5592e6992d --- /dev/null +++ b/package/android-tools/0011-core-fastboot-fastboot.c-reorder-functions-to-avoid-.patch @@ -0,0 +1,54 @@ +From 9724d78fda4eb023f83d2fd30e665b436d7a7f97 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 14 Jul 2024 11:41:10 +0200 +Subject: [PATCH] core/fastboot/fastboot.c: reorder functions to avoid implicit + definition +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The match_fastboot() function uses match_fastboot_with_serial() but is +implemented before it, causing an implicit definition. Re-order the +functions to avoid this. + +Fixes: + +core/fastboot/fastboot.c:191:12: error: implicit declaration of function ‘match_fastboot_with_serial’ [-Wimplicit-function-declaration] + +Upstream: N/A, we're too far from upstream +Signed-off-by: Thomas Petazzoni +--- + core/fastboot/fastboot.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/core/fastboot/fastboot.c b/core/fastboot/fastboot.c +index 3de6d7d..9b2c86f 100644 +--- a/core/fastboot/fastboot.c ++++ b/core/fastboot/fastboot.c +@@ -186,11 +186,6 @@ oops: + } + #endif + +-int match_fastboot(usb_ifc_info *info) +-{ +- return match_fastboot_with_serial(info, serial); +-} +- + int match_fastboot_with_serial(usb_ifc_info *info, const char *local_serial) + { + if(!(vendor_id && (info->dev_vendor == vendor_id)) && +@@ -217,6 +212,11 @@ int match_fastboot_with_serial(usb_ifc_info *info, const char *local_serial) + return 0; + } + ++int match_fastboot(usb_ifc_info *info) ++{ ++ return match_fastboot_with_serial(info, serial); ++} ++ + int list_devices_callback(usb_ifc_info *info) + { + if (match_fastboot_with_serial(info, NULL) == 0) { +-- +2.45.2 + diff --git a/package/android-tools/0012-core-libsparse-sparse_read.c-add-missing-output_file.patch b/package/android-tools/0012-core-libsparse-sparse_read.c-add-missing-output_file.patch new file mode 100644 index 00000000000..9a6a77eceb6 --- /dev/null +++ b/package/android-tools/0012-core-libsparse-sparse_read.c-add-missing-output_file.patch @@ -0,0 +1,37 @@ +From 2812c2005cfa4bfc5741651c8310e36f28c0327e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 14 Jul 2024 11:41:56 +0200 +Subject: [PATCH] core/libsparse/sparse_read.c: add missing output_file.h + include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +sparse_read.c uses read_all() without including the header file +containing its prototype, causing: + +core/libsparse/sparse_read.c:122:31: error: implicit declaration of function ‘read_all’ [-Wimplicit-function-declaration] + +Fix this by including output_file.h. + +Upstream: N/A, we're too far from upstream +Signed-off-by: Thomas Petazzoni +--- + core/libsparse/sparse_read.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/core/libsparse/sparse_read.c b/core/libsparse/sparse_read.c +index 704bcfa..0a8f838 100644 +--- a/core/libsparse/sparse_read.c ++++ b/core/libsparse/sparse_read.c +@@ -32,6 +32,7 @@ + #include "sparse_crc32.h" + #include "sparse_file.h" + #include "sparse_format.h" ++#include "output_file.h" + + #if defined(__APPLE__) && defined(__MACH__) + #define lseek64 lseek +-- +2.45.2 + diff --git a/package/android-tools/0013-extras-ext4_utils-make_ext4fs_main.c-disable-Android.patch b/package/android-tools/0013-extras-ext4_utils-make_ext4fs_main.c-disable-Android.patch new file mode 100644 index 00000000000..c11e88bf07e --- /dev/null +++ b/package/android-tools/0013-extras-ext4_utils-make_ext4fs_main.c-disable-Android.patch @@ -0,0 +1,54 @@ +From 83f9bed233b86dd2bbf603611b13b673caeccb69 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 14 Jul 2024 11:46:51 +0200 +Subject: [PATCH] extras/ext4_utils/make_ext4fs_main.c: disable + Android-specific code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since we are not building with the Android code, we do not have the +implementation of the selinux_android_file_context_handle(). However, +its only call site is when 'mountpoint' is set, and 'mountpoint' +cannot be non-NULL in non-Android cases due to how the -a option is +parsed: + + case 'a': + #ifdef ANDROID + fs_config_func = fs_config; + mountpoint = optarg; + #else + fprintf(stderr, "can't set android permissions - built without android support\n"); + usage(argv[0]); + exit(EXIT_FAILURE); + #endif + +So also compile out the code calling +selinux_android_file_context_handle() when ANDROID is not set. + +Fixes: + +make_ext4fs_main.c:155:25: error: implicit declaration of function ‘selinux_android_file_context_handle’ [-Wimplicit-function-declaration] + +Upstream: N/A, we're too far from upstream +Signed-off-by: Thomas Petazzoni +--- + extras/ext4_utils/make_ext4fs_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extras/ext4_utils/make_ext4fs_main.c b/extras/ext4_utils/make_ext4fs_main.c +index 17d3735..cb58011 100644 +--- a/extras/ext4_utils/make_ext4fs_main.c ++++ b/extras/ext4_utils/make_ext4fs_main.c +@@ -149,7 +149,7 @@ int main(int argc, char **argv) + } + } + +-#if !defined(HOST) ++#if !defined(HOST) && defined(ANDROID) + // Use only if -S option not requested + if (!sehnd && mountpoint) { + sehnd = selinux_android_file_context_handle(); +-- +2.45.2 + diff --git a/package/android-tools/0014-core-adbd-adb.c-open-code-capset.patch b/package/android-tools/0014-core-adbd-adb.c-open-code-capset.patch new file mode 100644 index 00000000000..1496b8bca43 --- /dev/null +++ b/package/android-tools/0014-core-adbd-adb.c-open-code-capset.patch @@ -0,0 +1,52 @@ +From 2b5060146b0890f7f1a63ef891af1358b8cdf9bc Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 14 Jul 2024 12:57:22 +0200 +Subject: [PATCH] core/adbd/adb.c: open code capset() + +capset() is apparently implemented by C libraries (at least glibc and +musl), but not exposed through a header as an official public API. + +In addition capset(2) says: + + Note: glibc provides no wrappers for these system calls, + necessitating the use of syscall(2) + +The lack of a header with a prototype for capset() was not causing any +problem so far, but GCC 14.x has become stricter on implicit +declarations, causing the build to fail with: + +core/adbd/adb.c:1296:9: error: implicit declaration of function 'capset' [-Wimplicit-function-declaration] + +So fix that by open-coding it using syscall() as suggested by the man +page. + +Upstream: N/A, we're too far from upstream +Signed-off-by: Thomas Petazzoni +--- + core/adbd/adb.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/core/adbd/adb.c b/core/adbd/adb.c +index 7fe6445..98b1de1 100644 +--- a/core/adbd/adb.c ++++ b/core/adbd/adb.c +@@ -41,6 +41,7 @@ + #if !ADB_HOST + #include "android_filesystem_config.h" + #include ++#include + #include + #include + #else +@@ -1293,7 +1294,7 @@ int adb_main(int is_daemon, int server_port) + header.pid = 0; + cap[CAP_TO_INDEX(CAP_SYS_BOOT)].effective |= CAP_TO_MASK(CAP_SYS_BOOT); + cap[CAP_TO_INDEX(CAP_SYS_BOOT)].permitted |= CAP_TO_MASK(CAP_SYS_BOOT); +- capset(&header, cap); ++ syscall(SYS_capset, &header, cap); + + D("Local port disabled\n"); + } else { +-- +2.45.2 + diff --git a/package/android-tools/0015-core-adbd-adb.c-include-correct-header-for-prctl.patch b/package/android-tools/0015-core-adbd-adb.c-include-correct-header-for-prctl.patch new file mode 100644 index 00000000000..cfbefecb268 --- /dev/null +++ b/package/android-tools/0015-core-adbd-adb.c-include-correct-header-for-prctl.patch @@ -0,0 +1,34 @@ +From c14070011e070d8674cf3578708cbae433090a47 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 14 Jul 2024 13:00:02 +0200 +Subject: [PATCH] core/adbd/adb.c: include correct header for prctl() + +As documented by prctl(2), the correct header to include for prctl() +is , not . + +Fixes: + +core/adbd/adb.c:1256:13: error: implicit declaration of function 'prctl' [-Wimplicit-function-declaration] + +Upstream: N/A, we're too far from upstream +Signed-off-by: Thomas Petazzoni +--- + core/adbd/adb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/adbd/adb.c b/core/adbd/adb.c +index 98b1de1..10f420b 100644 +--- a/core/adbd/adb.c ++++ b/core/adbd/adb.c +@@ -42,7 +42,7 @@ + #include "android_filesystem_config.h" + #include + #include +-#include ++#include + #include + #else + #include "usb_vendors.h" +-- +2.45.2 + From 07033ffa86e7816ff35b2a8b87b626b8ccfcdeb9 Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Sun, 28 Jul 2024 14:58:17 +0300 Subject: [PATCH 2387/3013] package/uclibc: fix ARC build with 4.x kernel headers Provide correct grouping for preprocessor conditions to avoid building ld.so with undefined macroses which are in use. This is a fix for package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch. Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni --- ...ix-arc-build-with-4.x-kernel-headers.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch diff --git a/package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch b/package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch new file mode 100644 index 00000000000..02a04a42dc1 --- /dev/null +++ b/package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch @@ -0,0 +1,35 @@ +From 1afc19eb6a7948afbcf3dd19091ce127a355ebcb Mon Sep 17 00:00:00 2001 +From: Dmitry Chestnykh +Date: Sun, 28 Jul 2024 14:12:39 +0300 +Subject: [PATCH] [ldso] Group conditions after `&&` + +If the conditions are not grouped we can reach +this block even if `__NR_stat` is not defined. + +`defined __NR_stat && ((!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__))` +gives us false but `LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))` +may give us true. So if linux headers version is below 5.1.0 and +__NR_stat is not defined we can have compilation error + +Signed-off-by: Dmitry Chestnykh +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=841d0729883ee0de606de161c1d6a5c37cedf575 +--- + ldso/include/dl-syscall.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h +index 9ec0eac60..180d03012 100644 +--- a/ldso/include/dl-syscall.h ++++ b/ldso/include/dl-syscall.h +@@ -141,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name, + { + return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); + } +-#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) ++#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))) + # define __NR__dl_stat __NR_stat + static __always_inline _syscall2(int, _dl_stat, const char *, file_name, + struct stat *, buf) +-- +2.45.2 + From 3f58e17fa952b9f15a7aaf060ec440b73556ecce Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 9 Aug 2024 09:24:41 +0200 Subject: [PATCH 2388/3013] package/uclibc: fix st_mtim issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The first patch to fix this issue was incomplete. Add a patch to also fix all other architectures. Fixes: - http://autobuild.buildroot.net/results/f3b/f3b3942b6b645d9523ab08d179a3f8aca7d6641c Signed-off-by: Waldemar Brodkorb Reviewed-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- ...are-st_mtim-if-defined-__USE_XOPEN2K.patch | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch diff --git a/package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch b/package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch new file mode 100644 index 00000000000..749a0984069 --- /dev/null +++ b/package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch @@ -0,0 +1,132 @@ +From 354129807db12c792696b74d0cd38f2c5d2fd704 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Fri, 9 Aug 2024 06:16:02 +0200 +Subject: [PATCH] bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), + add missing + +d0c8c185b439187b12644457bb2aa0326f25aaf7 was not complete, add +missing architectures. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=354129807db12c792696b74d0cd38f2c5d2fd704 +--- + libc/sysdeps/linux/mips/bits/stat.h | 4 ++-- + libc/sysdeps/linux/sparc/bits/stat.h | 4 ++-- + libc/sysdeps/linux/sparc64/bits/stat.h | 4 ++-- + libc/sysdeps/linux/x86_64/bits/stat.h | 4 ++-- + libc/sysdeps/linux/xtensa/bits/stat.h | 4 ++-- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/libc/sysdeps/linux/mips/bits/stat.h b/libc/sysdeps/linux/mips/bits/stat.h +index bad2a0244..81d2e4687 100644 +--- a/libc/sysdeps/linux/mips/bits/stat.h ++++ b/libc/sysdeps/linux/mips/bits/stat.h +@@ -145,7 +145,7 @@ struct stat64 + __dev_t st_rdev; /* Device number, if device. */ + long int st_pad2[2]; + __off64_t st_size; /* Size of file, in bytes. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -184,7 +184,7 @@ struct stat64 { + unsigned int st_rdev; /* Device number, if device. */ + int st_pad2[3]; + __off_t st_size; /* Size of file, in bytes. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/sparc/bits/stat.h b/libc/sysdeps/linux/sparc/bits/stat.h +index b88885fe2..0fbef8b3f 100644 +--- a/libc/sysdeps/linux/sparc/bits/stat.h ++++ b/libc/sysdeps/linux/sparc/bits/stat.h +@@ -53,7 +53,7 @@ struct stat + #else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -93,7 +93,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/sparc64/bits/stat.h b/libc/sysdeps/linux/sparc64/bits/stat.h +index 8516b159c..62b48b745 100644 +--- a/libc/sysdeps/linux/sparc64/bits/stat.h ++++ b/libc/sysdeps/linux/sparc64/bits/stat.h +@@ -58,7 +58,7 @@ struct stat + #else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -101,7 +101,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/x86_64/bits/stat.h b/libc/sysdeps/linux/x86_64/bits/stat.h +index a7412c8f9..a8c75feaa 100644 +--- a/libc/sysdeps/linux/x86_64/bits/stat.h ++++ b/libc/sysdeps/linux/x86_64/bits/stat.h +@@ -77,7 +77,7 @@ struct stat + #else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -138,7 +138,7 @@ struct stat64 + #endif + __blksize_t st_blksize; /* Optimal block size for I/O. */ + __blkcnt64_t st_blocks; /* Nr. 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +diff --git a/libc/sysdeps/linux/xtensa/bits/stat.h b/libc/sysdeps/linux/xtensa/bits/stat.h +index 045a017fd..43af825ec 100644 +--- a/libc/sysdeps/linux/xtensa/bits/stat.h ++++ b/libc/sysdeps/linux/xtensa/bits/stat.h +@@ -54,7 +54,7 @@ struct stat + unsigned long __pad2; + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ + #endif +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -94,7 +94,7 @@ struct stat64 + + unsigned long __pad2; + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#ifdef __USE_MISC ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +-- +2.30.2 + From 2a700617cc1aa14deb9f4e4f5c63e19c77901389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Sun, 11 Aug 2024 12:34:25 +0200 Subject: [PATCH 2389/3013] package/aer-inject: fix build error due to missing basename() prototype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/e613fc777051be6325d7e3c088d5f723fab518fa/ Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/aer-inject/0001-libgen-basename.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/aer-inject/0001-libgen-basename.patch diff --git a/package/aer-inject/0001-libgen-basename.patch b/package/aer-inject/0001-libgen-basename.patch new file mode 100644 index 00000000000..0762f5e3058 --- /dev/null +++ b/package/aer-inject/0001-libgen-basename.patch @@ -0,0 +1,35 @@ +From 197f51d29a01f46750fa6928409301aa8f1163d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 25 Mar 2024 09:04:40 -0700 +Subject: aer-inject: Include libgen.h for explicit basename prototype + +The prototype for basename has been removed from string.h in the latest +versions of musl [1]. This absence of prototype is flagged as an error +by some compilers, such as clang-18. To resolve this, include libgen.h +explicitly, which provides the prototype for basename. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 +Signed-off-by: Khem Raj +[sathya: Updated the commit log] +Signed-off-by: Kuppuswamy Sathyanarayanan +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/knsathya/aer-inject.git/commit/?id=197f51d29a01f46750fa6928409301aa8f1163d7 +Signed-off-by: J. Neuschaefer +--- + aer-inject.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/aer-inject.c b/aer-inject.c +index 74e7f72..eed1211 100644 +--- a/aer-inject.c ++++ b/aer-inject.c +@@ -11,6 +11,7 @@ + */ + + #include ++#include + #include + #include + #include +-- +cgit 1.2.3-korg + From 09cee6ad435d16fb1d4681591e28c597bc3e7b33 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Jul 2024 23:52:52 +0200 Subject: [PATCH 2390/3013] package/wolfssl: security bump to version 5.7.2 - Fix CVE-2024-1544, CVE-2024-5288, CVE-2024-5991 and CVE-2024-5814 - Disable option checking which is enabled by default since https://github.com/wolfSSL/wolfssl/commit/412447ac416ce76ba2a9bebbea8917258ed4c81e https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.2-stable Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f13e0014a548244cd0e617ab60b47c68c872f823) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index e705bba9fd7..9a1e8bfd4aa 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 2de93e8af588ee856fe67a6d7fce23fc1b226b74d710b0e3946bc8061f6aa18f wolfssl-5.7.0.tar.gz +sha256 0f2ed82e345b833242705bbc4b08a2a2037a33f7bf9c610efae6464f6b10e305 wolfssl-5.7.2.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 893408eca41..91ab7ca08ab 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFSSL_VERSION = 5.7.0 +WOLFSSL_VERSION = 5.7.2 WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES @@ -16,7 +16,10 @@ WOLFSSL_CONFIG_SCRIPTS = wolfssl-config WOLFSSL_AUTORECONF = YES WOLFSSL_DEPENDENCIES = host-pkgconf -WOLFSSL_CONF_OPTS = --disable-examples --disable-crypttests +WOLFSSL_CONF_OPTS = \ + --disable-examples \ + --disable-crypttests \ + --disable-option-checking ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) WOLFSSL_CONF_OPTS += --enable-all From ea282e0e5f11dcd0f9925766decb88a4306a8ef8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 13 Jul 2024 19:31:49 +0200 Subject: [PATCH 2391/3013] support/testing: new btrfs-progs runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 14b3ca20c9cb15f688dc164bb22c3c3712301d15) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + .../testing/tests/package/test_btrfs_progs.py | 127 ++++++++++++++++++ .../test_btrfs_progs/linux-btrfs.fragment | 1 + 3 files changed, 130 insertions(+) create mode 100644 support/testing/tests/package/test_btrfs_progs.py create mode 100644 support/testing/tests/package/test_btrfs_progs/linux-btrfs.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 210c8436132..b66d90d33d6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1801,6 +1801,8 @@ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_bitcoin.py F: support/testing/tests/package/test_brotli.py +F: support/testing/tests/package/test_btrfs_progs.py +F: support/testing/tests/package/test_btrfs_progs/ F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py F: support/testing/tests/package/test_coremark.py diff --git a/support/testing/tests/package/test_btrfs_progs.py b/support/testing/tests/package/test_btrfs_progs.py new file mode 100644 index 00000000000..a53efa94380 --- /dev/null +++ b/support/testing/tests/package/test_btrfs_progs.py @@ -0,0 +1,127 @@ +import os +import subprocess + +import infra.basetest + + +class TestBtrfsProgs(infra.basetest.BRTest): + # This test needs a Kernel with btrfs support. + kern_frag = \ + infra.filepath("tests/package/test_btrfs_progs/linux-btrfs.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.39" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_BTRFS_PROGS=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + # Prepare the disk image. + disk_file = os.path.join(self.builddir, "images", "disk.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", "bs=1M", "count=256"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + + # Run the emulator with a blank drive. + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = ["console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-drive", f"file={disk_file},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Check a program can run and show its version. + self.assertRunOk("btrfs --version") + + # Variables for this test. + dev = "/dev/vda" + label = "BR_TEST" + mnt_pt = "/tmp/btrfs" + data_file = f"{mnt_pt}/data.bin" + txt = "Hello Buildroot!" + subvol = f"{mnt_pt}/my-subvolume" + snapshot = f"{mnt_pt}/my-snapshot" + + # We create the btrfs filesystem on our device. + self.assertRunOk(f"mkfs.btrfs {dev}", timeout=10) + + # We set a label on this filesystem. + self.assertRunOk(f"btrfs filesystem label {dev} '{label}'") + + # We create a mount point and mount this filesystem. + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We create a file with random data, to use this new + # filesystem a bit. + self.assertRunOk(f"dd if=/dev/urandom of={data_file} bs=1M count=10") + + # We compute the sha256 hash and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We unmount the filesystem. + self.assertRunOk(f"umount {mnt_pt}") + + # We run a filesystem check (this tool is the equivalent of + # "fsck"). Since we cleanly unmounted the filesystem, + # we are not expecting any repair. This is just to test the + # program works correctly. + self.assertRunOk(f"btrfs check {dev}") + + # We query the label and check it is the one we set at the + # beginning. + out, ret = self.emulator.run(f"btrfs filesystem label {dev}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], label) + + # We remount our filesystem. + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We perform a scrub in foreground. + self.assertRunOk(f"btrfs scrub start -B {mnt_pt}") + + # We show device usage and statistics. + self.assertRunOk(f"btrfs device usage {mnt_pt}") + self.assertRunOk(f"btrfs device stats {mnt_pt}") + + # We create a btrfs subvolume and create a file in it. + self.assertRunOk(f"btrfs subvolume create {subvol}") + self.assertRunOk(f"echo '{txt}' > {subvol}/file.txt") + + # We create a read-only snapshot of this subvolume and we + # delete our file previously created. + self.assertRunOk(f"btrfs subvolume snapshot -r {subvol} {snapshot}") + self.assertRunOk(f"rm -f {subvol}/file.txt") + + # We should still see our file in our snapshot. + out, ret = self.emulator.run(f"cat {snapshot}/file.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], txt) + + # We should recompute the same sha256 hash as before, on the + # first data file we created at the beginning. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) diff --git a/support/testing/tests/package/test_btrfs_progs/linux-btrfs.fragment b/support/testing/tests/package/test_btrfs_progs/linux-btrfs.fragment new file mode 100644 index 00000000000..605c1837e10 --- /dev/null +++ b/support/testing/tests/package/test_btrfs_progs/linux-btrfs.fragment @@ -0,0 +1 @@ +CONFIG_BTRFS_FS=y From b62d671a1b5a12ae95b4bef7a1f30f85af6cd2ed Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Sat, 10 Aug 2024 17:00:28 -0700 Subject: [PATCH 2392/3013] Revert "package/chicken: move literals into text section for xtensa architecture" This reverts commit 86e51fd5fe2810bbf833b48c4914dcd2de01bdbe. Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- .../0001-xtensa-text-section-literals.patch | 30 ------------------- package/chicken/chicken.mk | 14 ++------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 package/chicken/0001-xtensa-text-section-literals.patch diff --git a/package/chicken/0001-xtensa-text-section-literals.patch b/package/chicken/0001-xtensa-text-section-literals.patch deleted file mode 100644 index b93aaf9e218..00000000000 --- a/package/chicken/0001-xtensa-text-section-literals.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e8d177f4d4e1c6bc41787ea1621e323ff4ad493e Mon Sep 17 00:00:00 2001 -From: Woodrow Douglass -Date: Mon, 22 Jul 2024 08:50:37 -0400 -Subject: [PATCH] Move literals into text section for xtensa architecture - -Upstream: https://bugs.call-cc.org/ticket/1840 -Signed-off-by: Woodrow Douglass ---- - Makefile.linux | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Makefile.linux b/Makefile.linux -index b628cda4..e97c2b94 100644 ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -52,6 +52,11 @@ USES_SONAME = yes - - # architectures - -+ifeq ($(ARCH),xtensa) -+C_COMPILER_OPTIONS += -mtext-section-literals -+LINKER_OPTIONS += -mtext-section-literals -+endif -+ - ifeq ($(ARCH),x32) - C_COMPILER_OPTIONS += -mx32 - LINKER_OPTIONS += -mx32 --- -2.39.2 - diff --git a/package/chicken/chicken.mk b/package/chicken/chicken.mk index 0520280134a..2667f7823d8 100644 --- a/package/chicken/chicken.mk +++ b/package/chicken/chicken.mk @@ -11,19 +11,9 @@ CHICKEN_LICENSE_FILES = LICENSE CHICKEN_CPE_ID_VENDOR = call-cc CHICKEN_INSTALL_STAGING = YES -# Chicken only uses the "arch" variable for some special-case compile -# arguments If it's empty, it tries to detect the arch host Filter out -# values that have an effect, or pass "unused" here -ifeq ($(NORMALIZED_ARCH),x86_64) -CHICKEN_ARCH = x86-64 -else ifeq ($(NORMALIZED_ARCH),xtensa) -CHICKEN_ARCH = xtensa -else -CHICKEN_ARCH = unused -endif - +# If ARCH is not set, it attempts to autodiscover. But it is anyway not used. CHICKEN_MAKE_OPTS = \ - ARCH="$(CHICKEN_ARCH)" \ + ARCH=unused \ C_COMPILER="$(TARGET_CC)" \ CXX_COMPILER="$(TARGET_CXX)" \ PREFIX=/usr \ From d6142f28b79748767af3f72bdc01ddf413926eb1 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Sat, 10 Aug 2024 17:00:29 -0700 Subject: [PATCH 2393/3013] package/chicken: pass TARGET_CFLAGS to the build system chicken build system expects non-standard environment variables with compiler names and compiler options. Pass buildroot TARGET_CFLAGS in chicken C_COMPILER_OPTIMIZATION_OPTIONS. Fixes: http://autobuild.buildroot.net/results/ce36170d67c4702f34bee025d8a46e5269c4573e/ Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- package/chicken/chicken.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/chicken/chicken.mk b/package/chicken/chicken.mk index 2667f7823d8..0000fc635ed 100644 --- a/package/chicken/chicken.mk +++ b/package/chicken/chicken.mk @@ -16,6 +16,7 @@ CHICKEN_MAKE_OPTS = \ ARCH=unused \ C_COMPILER="$(TARGET_CC)" \ CXX_COMPILER="$(TARGET_CXX)" \ + C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)" \ PREFIX=/usr \ PLATFORM=linux \ LIBRARIAN="$(TARGET_AR)" From 9d9a0db3d8b471ccf1721312450337ff53ed4a35 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2024 19:38:34 +0200 Subject: [PATCH 2394/3013] package/iperf3: security bump to version 3.17.1 Removed patch which is included in this release, autoreconf is not needed anymore. Updated license hash due to copyright year bump: https://github.com/esnet/iperf/commit/7b947051d5192388dfa8a18989692e7af4226c62 Fixes CVE-2024-26306. Release notes: https://github.com/esnet/iperf/releases/tag/3.17.1 https://github.com/esnet/iperf/releases/tag/3.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...1-Check-and-link-libatomic-if-needed.patch | 42 ------------------- package/iperf3/iperf3.hash | 6 +-- package/iperf3/iperf3.mk | 5 +-- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/iperf3/0001-Check-and-link-libatomic-if-needed.patch diff --git a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch b/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch deleted file mode 100644 index ddb50c46949..00000000000 --- a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bbf710e77e4a0438a2d995fd69b472e5ff054c69 Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Sun, 3 Dec 2023 12:14:05 +0100 -Subject: [PATCH] Check and link libatomic if needed - -Some architectures without native support for 64-bit atomics need -linking with libatomic. - -Signed-off-by: Julien Olivain -Upstream: https://github.com/esnet/iperf/commit/1511e9f85b548891ea53d4e378903344df1fd31e ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2594b39..ad7eaf1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -92,7 +92,19 @@ CXX="$PTHREAD_CXX" - ]) - - # Atomics --AC_CHECK_HEADERS([stdatomic.h]) -+AC_CHECK_HEADERS([stdatomic.h], -+ [AC_MSG_CHECKING([whether libatomic is required]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], -+ [AC_MSG_RESULT([no])], -+ [save_LIBS="$LIBS" -+ LIBS="$LIBS -latomic" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_ERROR([failed to find working configuration with atomics])] -+ )] -+ )], -+ [] -+) - - # Check for poll.h (it's in POSIX so everyone should have it?) - AC_CHECK_HEADERS([poll.h]) --- -2.44.0 - diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index a8634c4a7ed..ee0149daedf 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.16.tar.gz.sha256 -sha256 cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e iperf-3.16.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.17.1.tar.gz.sha256 +sha256 84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa iperf-3.17.1.tar.gz # Locally computed -sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE +sha256 3dc3e2076dd9cdea2b66d8fe213997ff25fb6171594f055b59fe25321b438f6f LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 3ab68bd13b5..1d2b57208ad 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,16 +4,13 @@ # ################################################################################ -IPERF3_VERSION = 3.16 +IPERF3_VERSION = 3.17.1 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT IPERF3_LICENSE_FILES = LICENSE IPERF3_CPE_ID_VENDOR = es -# 0001-Check-and-link-libatomic-if-needed.patch -IPERF3_AUTORECONF = YES - IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" ifeq ($(BR2_PACKAGE_OPENSSL),y) From 904acfc41e1464848daf0240251e7701954c4918 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2024 19:46:45 +0200 Subject: [PATCH 2395/3013] package/gnutls: security bump version to 3.8.6 Version 3.8.4 fixes CVE-2024-28834 & CVE-2024-28835. Release notes: 3.8.4: https://lists.gnupg.org/pipermail/gnutls-help/2024-March/004845.html 3.8.5: https://lists.gnupg.org/pipermail/gnutls-help/2024-April/004846.html 3.8.6: https://lists.gnupg.org/pipermail/gnutls-help/2024-July/004848.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 47fb34ea7cb..d9f830ec925 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig -sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz.sig +sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd gnutls-3.8.6.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index eae017aac26..479922ee5dd 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).6 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From 81e6541efe054df635947d0c143818f8cf7cb048 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Aug 2024 22:05:28 +0200 Subject: [PATCH 2396/3013] package/gnuradio: fix build with fmt >= 11.x gnuradio is failing to build since commit 6b86f076c3 "package/fmt: bump to version 11.0.1" with output: /build/gnuradio-3.10.7.0/gr-blocks/lib/message_debug_impl.cc: In member function 'void gr::blocks::message_debug_impl::log(const pmt::pmt_t&)': /build/gnuradio-3.10.7.0/gr-blocks/lib/message_debug_impl.cc:65:44: error: 'join' is not a member of 'fmt' 65 | fmt::join(begin, begin + output_length, " "), | ^~~~ This commit adds a backported upstream patch to fix the issue. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7540345284 http://autobuild.buildroot.org/results/4c92949ef74a119d9a70e4fdd55af05a66580b0c/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...o_signature-include-spdlog-ranges.h-.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch diff --git a/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch b/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch new file mode 100644 index 00000000000..6a08b8edee6 --- /dev/null +++ b/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch @@ -0,0 +1,38 @@ +From 03c9a40883e610e54b8fc3c3ce1842d68d7ce2e4 Mon Sep 17 00:00:00 2001 +From: Kefu Chai +Date: Mon, 15 Jul 2024 09:27:16 +0800 +Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for + using fmt::join() + +fmt::join() was moved into fmt/ranges.h since fmt 11, so let's +include the corresponding header in spdlog for using it. + +Signed-off-by: Kefu Chai +(cherry picked from commit 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa) +Signed-off-by: Jeff Long +Upstream: https://github.com/gnuradio/gnuradio/commit/ead459813367e7fd679dad067d1b020010d49b4f +[Julien: backported commit ead45981 from v3.10.11.0] +Signed-off-by: Julien Olivain +--- + gr-blocks/lib/message_debug_impl.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc +index 1e81aec0d..415d2be97 100644 +--- a/gr-blocks/lib/message_debug_impl.cc ++++ b/gr-blocks/lib/message_debug_impl.cc +@@ -14,6 +14,11 @@ + #include + #include + #include ++#if __has_include() ++#include ++#elif __has_include() ++#include ++#endif + #include + #include + #include +-- +2.46.0 + From 078f99a31528e27b97cc49d51bca9da95a6a036c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Aug 2024 10:53:28 +0200 Subject: [PATCH 2397/3013] Update for 2024.05.2 Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 2d97ce2a3f9..156d0550b8f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2024.05.2, released August 14th, 2024 + + Important / security related fixes. + + Various minor improvements to utils/check-package + + Defconfigs: Add download hashes for chromebook-elm, + chromebook-snow and stm32mp157a_dk1 + + Updated/fixed packages: android-tools, bcc, bitcoin, boost, + btrfs-progs, c-ares, cdrkit, check, containerd, directfb, + dump1090, ed, exim, fail2ban, frotz, fwts, gcc, gdb, go, gpm, + kexec, libarchive, libgeos, libressl, llvm, mupdf, ncftp, + nodejs, ntpsec, octave, openssh, pppd, python-mupdf, + python-ruamel-yaml, qt5webkit, rawk-hawkbit-updater, + rtl8188eu, snappy, squid, sunxi-tools, syslinux, systemd, + tcf-agent, tftpd, ubus, util-linux, uvw, webkitgtk, wolfssl, + wpewebkit, x265, xlib_libxshmfence, xvisor + + Issues resolved (http://bugs.uclibc.org): + + #15231: gcc --help -v doesn't work correctly with gcc>=10 and.. + 2024.05.1, released July 13th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index d616c08c0a8..ebf8bb8af12 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.05.1 +export BR2_VERSION := 2024.05.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1720871000 +BR2_VERSION_EPOCH = 1723625000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index b49ea474250..1f4c1b85e21 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.05.1' +RELEASE='2024.05.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 18368f6608538e2c6ea00a6c7556802be72e614e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Aug 2024 10:53:28 +0200 Subject: [PATCH 2398/3013] Update for 2024.05.2 Signed-off-by: Peter Korsgaard (cherry picked from commit 078f99a31528e27b97cc49d51bca9da95a6a036c) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index eef042823a1..67844910ee1 100644 --- a/CHANGES +++ b/CHANGES @@ -77,6 +77,29 @@ - Can't subscribe buildroot mailing list https://gitlab.com/buildroot.org/buildroot/-/issues/25 +2024.05.2, released August 14th, 2024 + + Important / security related fixes. + + Various minor improvements to utils/check-package + + Defconfigs: Add download hashes for chromebook-elm, + chromebook-snow and stm32mp157a_dk1 + + Updated/fixed packages: android-tools, bcc, bitcoin, boost, + btrfs-progs, c-ares, cdrkit, check, containerd, directfb, + dump1090, ed, exim, fail2ban, frotz, fwts, gcc, gdb, go, gpm, + kexec, libarchive, libgeos, libressl, llvm, mupdf, ncftp, + nodejs, ntpsec, octave, openssh, pppd, python-mupdf, + python-ruamel-yaml, qt5webkit, rawk-hawkbit-updater, + rtl8188eu, snappy, squid, sunxi-tools, syslinux, systemd, + tcf-agent, tftpd, ubus, util-linux, uvw, webkitgtk, wolfssl, + wpewebkit, x265, xlib_libxshmfence, xvisor + + Issues resolved (http://bugs.uclibc.org): + + #15231: gcc --help -v doesn't work correctly with gcc>=10 and.. + 2024.05.1, released July 13th, 2024 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index b49ea474250..1f4c1b85e21 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.05.1' +RELEASE='2024.05.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From c9f371e2c08d2bded89257fd9e0423770115fa1c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Aug 2024 12:07:55 +0200 Subject: [PATCH 2399/3013] docs/website: Update for 2024.05.2 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 9a36d5c5d84..349f1cc0c07 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

    buildroot-2024.02.4.tar.xz

    -

    Latest stable release: 2024.05.1

    +

    Latest stable release: 2024.05.2

    - +
    - +
    -

    buildroot-2024.05.1.tar.gz

    -

    PGP signature

    +

    buildroot-2024.05.2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2024.05.1.tar.xz

    -

    PGP signature

    +

    buildroot-2024.05.2.tar.xz

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index 001b471d4c3..1a9581423ba 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

    News

      +
    • +
      +
      +
      +

      2024.05.2 released

      +

      14 August 2024

      +
      +
      +

      The 2024.05.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.05.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.05.2 release.

      +
      +
      +
      • +
    • From 865744154a456dd2b8f602ec783d5506ca8a796f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Aug 2024 13:32:31 +0200 Subject: [PATCH 2400/3013] Update for 2024.02.5 Signed-off-by: Peter Korsgaard (cherry picked from commit 6c084947ab46aa8064947b85ea6168b12d550265) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGES b/CHANGES index 67844910ee1..84245655eb2 100644 --- a/CHANGES +++ b/CHANGES @@ -247,6 +247,28 @@ #16036: android-tools version is too old #16075: Cannot use linux kernel extensions from external tree.. +2024.02.5, released August 14th, 2024 + + Important / security related fixes. + + Various minor improvements to utils/check-package + + Defconfigs: Add download hashes for chromebook-elm, + chromebook-snow and stm32mp157a_dk1 + + Updated/fixed packages: bitcoin, boost, btrfs-progs, c-ares, + cdrkit, check, containerd, directfb, ed, exim, fwts, gcc, gdb, + go, kexec, libarchive, libgeos, libressl, mupdf, nodejs, + ntpsec, octave, openssh, pppd, python-mupdf, + python-ruamel-yaml, qt5webkit, rauc-hawkbit-updater, snappy, + squid, sunxi-tools, syslinux, systemd, tcf-agent, ubus, + util-linux, uvw, webkitgtk, wolfssl, wpewebkit, x265, + xlib_libxshmfence, xvisor + + Issues resolved (http://bugs.uclibc.org): + + #15231: gcc --help -v doesn't work correctly with gcc>=10 and.. + 2024.02.4, released July 13th, 2024 Important / security related fixes. From f089e7b488750c3344598602ae8f560676e56a8f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Aug 2024 13:47:13 +0200 Subject: [PATCH 2401/3013] docs/website: Update for 2024.02.5 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 349f1cc0c07..cbf0db6bb96 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
      Download
      -

      Latest long term support release: 2024.02.4

      +

      Latest long term support release: 2024.02.5

      - +
      - +
      -

      buildroot-2024.02.4.tar.gz

      -

      PGP signature

      +

      buildroot-2024.02.5.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2024.02.4.tar.xz

      -

      PGP signature

      +

      buildroot-2024.02.5.tar.xz

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index 1a9581423ba..487586a894d 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

      News

        +
      • +
        +
        +
        +

        2024.02.5 released

        +

        14 August 2024

        +
        +
        +

        The 2024.02.5 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.02.4 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.02.5 release.

        +
        +
        +
        • +
      • From 2a547e2c424ac08d8741dc557aee968f1b659735 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Aug 2024 15:25:06 +0200 Subject: [PATCH 2402/3013] package/hiawatha: update homepage URL The download and homepage URL for this project have been updated. The old site no longer works. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/hiawatha/Config.in | 2 +- package/hiawatha/hiawatha.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 0c35734c345..8bcee3f0988 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_HIAWATHA pipelining, keep alive connections, URL rewriting and many more. - http://www.hiawatha-webserver.org/ + https://hiawatha.leisink.net/ if BR2_PACKAGE_HIAWATHA diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 3e9cf2571b9..4c94f0067e0 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -5,7 +5,7 @@ ################################################################################ HIAWATHA_VERSION = 11.2 -HIAWATHA_SITE = https://www.hiawatha-webserver.org/files +HIAWATHA_SITE = https://hiawatha.leisink.net/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE From a631d5b3da2db55f3209546bb6a8bf0c67924cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 14 Aug 2024 13:18:21 +0200 Subject: [PATCH 2403/3013] package/qt6tools: fix missing host-qt6base dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds the host dependency host-qt6base as host-qt6tools requires the Qt cmake modules to be installed. Fixes: $ make qt6tools (...) CMake Error at CMakeLists.txt:21 (find_package): Could not find a package configuration file provided by "Qt6" (requested version 6.7.2) with any of the following names: Qt6Config.cmake qt6-config.cmake Add the installation prefix of "Qt6" to CMAKE_PREFIX_PATH or set "Qt6_DIR" to a directory containing one of the above files. If "Qt6" provides a separate development package or SDK, be sure it has been installed. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt6/qt6tools/qt6tools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk index d996f75b346..09c986cfc68 100644 --- a/package/qt6/qt6tools/qt6tools.mk +++ b/package/qt6/qt6tools/qt6tools.mk @@ -41,5 +41,7 @@ ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) QT6TOOLS_DEPENDENCIES += qt6declarative endif +HOST_QT6TOOLS_DEPENDENCIES = host-qt6base + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From e1b80b31e7677ff56e92f65ccdc00276b61ab811 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Aug 2024 12:04:25 -0600 Subject: [PATCH 2404/3013] package/vboot-utils: bump to version 4b12d392e5b12de29c582df4e717b1228e9f1594 Drop patches which are now upstream/not relevant. Add a patch adding missing USE_FLASHROM guards. Set USE_FLASHROM=0 make option to disable flashrom support. Fixes: - http://autobuild.buildroot.net/results/e55/e55af8335ef38e172e56544901510ae4dbdbff9b Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 6 - ...missing-definition-of-MTD_CHAR_MAJOR.patch | 10 +- ...d-missing-header-include-for-ssize_t.patch | 27 -- ...m_csme-add-missing-USE_FLASHROM-guar.patch | 76 +++++ .../0003-Avoid-RSA-type-redefinition.patch | 44 --- .../0004-Disable-static-futility.patch | 30 -- ...05-include-sys-sysmacros.h-for-major.patch | 53 ---- .../0006-Update-for-openssl-1.1.patch | 268 ------------------ ...-Make-vboot_version-extern-in-header.patch | 50 ---- package/vboot-utils/vboot-utils.hash | 2 +- package/vboot-utils/vboot-utils.mk | 11 +- 11 files changed, 89 insertions(+), 488 deletions(-) delete mode 100644 package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch create mode 100644 package/vboot-utils/0002-futility-platform_csme-add-missing-USE_FLASHROM-guar.patch delete mode 100644 package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch delete mode 100644 package/vboot-utils/0004-Disable-static-futility.patch delete mode 100644 package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch delete mode 100644 package/vboot-utils/0006-Update-for-openssl-1.1.patch delete mode 100644 package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8fe4a16eb82..81e48bf8590 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1328,12 +1328,6 @@ package/vala/vala-wrapper Shellcheck package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch lib_patch.Upstream package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch lib_patch.Upstream package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch lib_patch.Upstream -package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch lib_patch.Upstream -package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch lib_patch.Upstream -package/vboot-utils/0004-Disable-static-futility.patch lib_patch.Upstream -package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch lib_patch.Upstream -package/vboot-utils/0006-Update-for-openssl-1.1.patch lib_patch.Upstream -package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch lib_patch.Upstream package/vdr/0001-getloadavg.patch lib_patch.Upstream package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch lib_patch.Upstream package/vlc/0002-automake-add-subdir-objects-option.patch lib_patch.Upstream diff --git a/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch b/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch index 42410c8d13d..c988c79529e 100644 --- a/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch +++ b/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch @@ -1,4 +1,4 @@ -From 1438211660e700b2c9505863aae1cc957236b7c8 Mon Sep 17 00:00:00 2001 +From 90ed7f5cbe088912fbe0f3f45606de75602c1404 Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Thu, 21 Jan 2016 21:59:46 +0100 Subject: [PATCH] Add missing definition of MTD_CHAR_MAJOR @@ -11,12 +11,12 @@ Signed-off-by: Alex Suykov 1 file changed, 4 insertions(+) diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c -index dcfaab9..4d07aad 100644 +index afa4940e..38504aa6 100644 --- a/cgpt/cgpt_wrapper.c +++ b/cgpt/cgpt_wrapper.c -@@ -25,6 +25,10 @@ +@@ -33,6 +33,10 @@ #include "cgpt_nor.h" - #include "cryptolib.h" + #include "file_keys.h" +#ifndef MTD_CHAR_MAJOR +#define MTD_CHAR_MAJOR 90 @@ -26,5 +26,5 @@ index dcfaab9..4d07aad 100644 // off device, and hence we should not wrap around cgpt. static bool has_dash_D(int argc, const char *const argv[]) { -- -2.6.4 +2.34.1 diff --git a/package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch b/package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch deleted file mode 100644 index 4d559eabaf4..00000000000 --- a/package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b6bed8d4e9453bc74ba021c8c17e20c3b5964c37 Mon Sep 17 00:00:00 2001 -From: Alex Suykov -Date: Thu, 21 Jan 2016 22:00:34 +0100 -Subject: [PATCH] Add missing header include for ssize_t - -The code uses ssize_t which is usually defined in . - -Signed-off-by: Alex Suykov ---- - host/lib/fmap.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host/lib/fmap.c b/host/lib/fmap.c -index c95338d..e3db826 100644 ---- a/host/lib/fmap.c -+++ b/host/lib/fmap.c -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "fmap.h" - --- -2.6.4 - diff --git a/package/vboot-utils/0002-futility-platform_csme-add-missing-USE_FLASHROM-guar.patch b/package/vboot-utils/0002-futility-platform_csme-add-missing-USE_FLASHROM-guar.patch new file mode 100644 index 00000000000..890a732f71e --- /dev/null +++ b/package/vboot-utils/0002-futility-platform_csme-add-missing-USE_FLASHROM-guar.patch @@ -0,0 +1,76 @@ +From 3244ea140c1b5b07ebb30f3d17e467d853b0db0f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 13 Aug 2024 11:41:28 -0600 +Subject: [PATCH] futility/platform_csme: add missing USE_FLASHROM guards + +Fixes: +build/futility/platform_csme.o: in function `find_fmba': +futility/platform_csme.c:42: undefined reference to `find_firmware_section' +build/futility/platform_csme.o: in function `unlock_csme': +futility/platform_csme.c:200: undefined reference to `get_firmware_image_temp_file' +futility/platform_csme.c:230: undefined reference to `reload_firmware_image' + +Change-Id: I74140d38d119f2a0e6b8cf8eef3f9f05cd43bbd7 +Signed-off-by: James Hilliard +Upstream: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/5785792 +--- + futility/platform_csme.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/futility/platform_csme.c b/futility/platform_csme.c +index 2eb3ffcf..3829fe7b 100644 +--- a/futility/platform_csme.c ++++ b/futility/platform_csme.c +@@ -33,6 +33,7 @@ struct fmba { + } __attribute__((packed)); + + static struct fmba * const find_fmba(const struct firmware_image *image) { ++#ifdef USE_FLASHROM + struct firmware_section section; + const uint32_t signature = 0x0FF0A55A; + const struct fdbar *fd; +@@ -54,6 +55,9 @@ static struct fmba * const find_fmba(const struct firmware_image *image) { + return NULL; + + return (struct fmba * const)(section.data + offset); ++#else ++ return NULL; ++#endif /* USE_FLASHROM */ + } + + static bool is_flmstr1_locked(const struct fmba * const fmba) +@@ -132,6 +136,7 @@ int unlock_csme_eve(struct firmware_image *image) + return unlock_flmstrs(image, 0xffffff00, 0xffffff00, 0xffffff00); + } + ++#ifdef USE_FLASHROM + /* + * Determine the platform to pass to ifdtool (e.g. 'adl') by extracting + * CONFIG_IFD_CHIPSET from the config file in CBFS. However, old nissa firmware +@@ -183,6 +188,7 @@ static int run_ifdtool(const char *image_path, char *platform, const char *extra + free(command); + return ret; + } ++#endif /* USE_FLASHROM */ + + /* + * Unlock the CSME for recent Intel platforms (CML onwards). +@@ -193,6 +199,7 @@ static int run_ifdtool(const char *image_path, char *platform, const char *extra + */ + int unlock_csme(struct updater_config *cfg) + { ++#ifdef USE_FLASHROM + const char *temp_path; + char *platform; + int ret = -1; +@@ -245,4 +252,7 @@ cleanup: + free(platform); + + return ret; ++#else ++ return -1; ++#endif /* USE_FLASHROM */ + } +-- +2.34.1 + diff --git a/package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch b/package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch deleted file mode 100644 index 86374ca8541..00000000000 --- a/package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 593407d2b3ea3b871d55ec399671e48c84b900a7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 21 Jan 2016 22:01:37 +0100 -Subject: [PATCH] Avoid RSA type redefinition - -The host_key.h headers does: - - typedef struct rsa_st RSA; - -But this type definition is already done by the OpenSSL headers. - -While such a type redefinition is legal with recent gcc versions, it -doesn't build with older gcc versions such as gcc 4.4. - -To work around this problem, we instead use a forward declaration of -"struct rsa_st", and change the only place where the RSA type was used -by "struct rsa_st". - -Signed-off-by: Thomas Petazzoni ---- - host/lib/include/host_key.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/lib/include/host_key.h b/host/lib/include/host_key.h -index 9f98ccc..c2d01a5 100644 ---- a/host/lib/include/host_key.h -+++ b/host/lib/include/host_key.h -@@ -12,11 +12,11 @@ - #include "vboot_struct.h" - - --typedef struct rsa_st RSA; -+struct rsa_st; - - /* Private key data */ - typedef struct VbPrivateKey { -- RSA* rsa_private_key; /* Private key data */ -+ struct rsa_rt* rsa_private_key; /* Private key data */ - uint64_t algorithm; /* Algorithm to use when signing */ - } VbPrivateKey; - --- -2.6.4 - diff --git a/package/vboot-utils/0004-Disable-static-futility.patch b/package/vboot-utils/0004-Disable-static-futility.patch deleted file mode 100644 index 649d31629a2..00000000000 --- a/package/vboot-utils/0004-Disable-static-futility.patch +++ /dev/null @@ -1,30 +0,0 @@ -The package attempts to build a statically-linked host binary, futility_s, -which is not used anywhere in buildroot but may be causing build failures -if the build host lacks static libc. - -Signed-off-by: Alex Suykov - ---- a/Makefile -+++ b/Makefile -@@ -1079,7 +1079,7 @@ - # new Firmware Utility - - .PHONY: futil --futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN} -+futil: ${FUTIL_BIN} - - ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} - @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" -@@ -1091,10 +1091,10 @@ - ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} - - .PHONY: futil_install --futil_install: ${FUTIL_BIN} ${FUTIL_STATIC_BIN} -+futil_install: ${FUTIL_BIN} - @${PRINTF} " INSTALL futility\n" - ${Q}mkdir -p ${UB_DIR} -- ${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN} ${FUTIL_STATIC_BIN} -+ ${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN} - ${Q}for prog in ${FUTIL_SYMLINKS}; do \ - ln -sf futility "${UB_DIR}/$$prog"; done - diff --git a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch deleted file mode 100644 index 3ab201fc3a2..00000000000 --- a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0495287f062a0cef989e02e0aee4f4329ab155b0 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 19 Apr 2016 13:58:49 -0400 -Subject: [PATCH] include sys/sysmacros.h for major() - -The major() func is defined in the sys/sysmacros.h header, so include it -explicitly for the prototype. Upstream C libs are moving away from having -sys/types.h include it all the time implicitly. - -BUG=None -TEST=precq passes -BRANCH=None - -Change-Id: I56b84138f08ded2376193403f9c9db22c5f24f71 -Reviewed-on: https://chromium-review.googlesource.com/339680 -Commit-Ready: Mike Frysinger -Tested-by: Mike Frysinger -Reviewed-by: Bill Richardson -Signed-off-by: Giulio Benetti -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - cgpt/cgpt_wrapper.c | 1 + - futility/dump_kernel_config_lib.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c -index 4d07aadac72d..6fbfb235ba7b 100644 ---- a/cgpt/cgpt_wrapper.c -+++ b/cgpt/cgpt_wrapper.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c -index c2d59433ba71..448a2f6a831f 100644 ---- a/futility/dump_kernel_config_lib.c -+++ b/futility/dump_kernel_config_lib.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.43.0 - diff --git a/package/vboot-utils/0006-Update-for-openssl-1.1.patch b/package/vboot-utils/0006-Update-for-openssl-1.1.patch deleted file mode 100644 index 77e71e58b8e..00000000000 --- a/package/vboot-utils/0006-Update-for-openssl-1.1.patch +++ /dev/null @@ -1,268 +0,0 @@ -From 2e730b2259c701f16d473dbfb7e58e86a6e71b01 Mon Sep 17 00:00:00 2001 -From: Daniel Kurtz -Date: Fri, 18 Jan 2019 13:04:59 +0200 -Subject: [PATCH] Update for openssl 1.1 - -OpenSSL 1.1 has made significant non-backwards compatible changes to its -API as outlined in: -https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes - -BRANCH=none -BUG=chromium:738114 -TEST=cros_workon --host start vboot_reference -TEST=w/ openssl-1.0.2k: sudo emerge vboot_reference -TEST=w/ openssl-1.1.0e: sudo emerge vboot_reference - => both build ok - $ futility version - => command runs without error -TEST=cros_workon --board=soraka start vboot_reference coreboot -TEST=w/ openssl-1.0.2k: emerge-soraka vboot_reference coreboot -TEST=w/ openssl-1.1.0e: emerge-soraka vboot_reference coreboot - => All build ok - -Change-Id: I37cfc8cbb04a092eab7b0b3224f475b82609447c -Reviewed-on: https://chromium-review.googlesource.com/557739 -Commit-Ready: Daniel Kurtz -Tested-by: Daniel Kurtz -Reviewed-by: Randall Spangler -Reviewed-by: Mike Frysinger - -(cherry-picked from bce7904376beee2912932433a4634c1c25afe2f5) -Signed-off-by: Vadim Kochan ---- - futility/cmd_create.c | 5 ++++- - futility/vb2_helper.c | 7 +++++-- - host/include/openssl_compat.h | 26 ++++++++++++++++++++++++++ - host/lib/util_misc.c | 7 +++++-- - host/lib21/host_key.c | 8 +++++++- - utility/dumpRSAPublicKey.c | 19 ++++++++++++++----- - 6 files changed, 61 insertions(+), 11 deletions(-) - create mode 100644 host/include/openssl_compat.h - -diff --git a/futility/cmd_create.c b/futility/cmd_create.c -index 143ea9ae..80d3fd90 100644 ---- a/futility/cmd_create.c -+++ b/futility/cmd_create.c -@@ -13,6 +13,7 @@ - #include "2common.h" - #include "2id.h" - #include "2rsa.h" -+#include "openssl_compat.h" - #include "util_misc.h" - #include "vb2_common.h" - #include "vb2_struct.h" -@@ -170,6 +171,7 @@ static int vb2_make_keypair() - enum vb2_signature_algorithm sig_alg; - uint8_t *pubkey_buf = 0; - int has_priv = 0; -+ const BIGNUM *rsa_d; - - FILE *fp; - int ret = 1; -@@ -193,7 +195,8 @@ static int vb2_make_keypair() - goto done; - } - /* Public keys doesn't have the private exponent */ -- has_priv = !!rsa_key->d; -+ RSA_get0_key(rsa_key, NULL, NULL, &rsa_d); -+ has_priv = !!rsa_d; - if (!has_priv) - fprintf(stderr, "%s has a public key only.\n", infile); - -diff --git a/futility/vb2_helper.c b/futility/vb2_helper.c -index 51a78375..c6cc0fdd 100644 ---- a/futility/vb2_helper.c -+++ b/futility/vb2_helper.c -@@ -11,6 +11,7 @@ - #include "2common.h" - #include "2id.h" - #include "2rsa.h" -+#include "openssl_compat.h" - #include "util_misc.h" - #include "vb2_common.h" - #include "vb2_struct.h" -@@ -216,6 +217,7 @@ int ft_show_pem(const char *name, uint8_t *buf, uint32_t len, void *data) - uint8_t *keyb, *digest; - uint32_t keyb_len; - int i, bits; -+ const BIGNUM *rsa_key_n, *rsa_key_d; - - /* We're called only after ft_recognize_pem, so this should work. */ - rsa_key = rsa_from_buffer(buf, len); -@@ -223,10 +225,11 @@ int ft_show_pem(const char *name, uint8_t *buf, uint32_t len, void *data) - DIE; - - /* Use to presence of the private exponent to decide if it's public */ -- printf("%s Key file: %s\n", rsa_key->d ? "Private" : "Public", -+ RSA_get0_key(rsa_key, &rsa_key_n, NULL, &rsa_key_d); -+ printf("%s Key file: %s\n", rsa_key_d ? "Private" : "Public", - name); - -- bits = BN_num_bits(rsa_key->n); -+ bits = BN_num_bits(rsa_key_n); - printf(" Key length: %d\n", bits); - - if (vb_keyb_from_rsa(rsa_key, &keyb, &keyb_len)) { -diff --git a/host/include/openssl_compat.h b/host/include/openssl_compat.h -new file mode 100644 -index 00000000..7771f32a ---- /dev/null -+++ b/host/include/openssl_compat.h -@@ -0,0 +1,26 @@ -+/* Copyright 2017 The Chromium OS Authors. All rights reserved. -+ * Use of this source code is governed by a BSD-style license that can be -+ * found in the LICENSE file. -+ */ -+ -+#ifndef VBOOT_REFERENCE_OPENSSL_COMPAT_H_ -+#define VBOOT_REFERENCE_OPENSSL_COMPAT_H_ -+ -+#include -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+static inline void RSA_get0_key(const RSA *rsa, const BIGNUM **n, -+ const BIGNUM **e, const BIGNUM **d) -+{ -+ if (n != NULL) -+ *n = rsa->n; -+ if (e != NULL) -+ *e = rsa->e; -+ if (d != NULL) -+ *d = rsa->d; -+} -+ -+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+ -+#endif /* VBOOT_REFERENCE_OPENSSL_COMPAT_H_ */ -diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c -index 03ec683f..f0a1f7ad 100644 ---- a/host/lib/util_misc.c -+++ b/host/lib/util_misc.c -@@ -15,6 +15,7 @@ - - #include "cryptolib.h" - #include "host_common.h" -+#include "openssl_compat.h" - #include "util_misc.h" - #include "vboot_common.h" - -@@ -58,6 +59,7 @@ int vb_keyb_from_rsa(struct rsa_st *rsa_private_key, - BIGNUM *N0inv = NULL, *R = NULL, *RR = NULL; - BIGNUM *RRTemp = NULL, *NnumBits = NULL; - BIGNUM *n = NULL, *rr = NULL; -+ const BIGNUM *rsa_private_key_n; - BN_CTX *bn_ctx = BN_CTX_new(); - uint32_t n0invout; - uint32_t bufsize; -@@ -65,7 +67,7 @@ int vb_keyb_from_rsa(struct rsa_st *rsa_private_key, - int retval = 1; - - /* Size of RSA key in 32-bit words */ -- nwords = BN_num_bits(rsa_private_key->n) / 32; -+ nwords = RSA_size(rsa_private_key) / 4; - - bufsize = (2 + nwords + nwords) * sizeof(uint32_t); - outbuf = malloc(bufsize); -@@ -94,7 +96,8 @@ int vb_keyb_from_rsa(struct rsa_st *rsa_private_key, - NEW_BIGNUM(B); - #undef NEW_BIGNUM - -- BN_copy(N, rsa_private_key->n); -+ RSA_get0_key(rsa_private_key, &rsa_private_key_n, NULL, NULL); -+ BN_copy(N, rsa_private_key_n); - BN_set_word(Big1, 1L); - BN_set_word(Big2, 2L); - BN_set_word(Big32, 32L); -diff --git a/host/lib21/host_key.c b/host/lib21/host_key.c -index f7ea1622..f9419ad3 100644 ---- a/host/lib21/host_key.c -+++ b/host/lib21/host_key.c -@@ -17,6 +17,7 @@ - #include "host_common.h" - #include "host_key2.h" - #include "host_misc.h" -+#include "openssl_compat.h" - - struct vb2_text_vs_enum vb2_text_vs_algorithm[] = { - {"RSA1024 SHA1", VB2_ALG_RSA1024_SHA1}, -@@ -544,7 +545,12 @@ int vb2_public_key_hash(struct vb2_public_key *key, - - enum vb2_signature_algorithm vb2_rsa_sig_alg(struct rsa_st *rsa) - { -- int bits = BN_num_bits(rsa->n); -+ const BIGNUM *e, *n; -+ int exp, bits; -+ -+ RSA_get0_key(rsa, &n, &e, NULL); -+ exp = BN_get_word(e); -+ bits = BN_num_bits(n); - - switch (bits) { - case 1024: -diff --git a/utility/dumpRSAPublicKey.c b/utility/dumpRSAPublicKey.c -index b3b7b96b..a17b159e 100644 ---- a/utility/dumpRSAPublicKey.c -+++ b/utility/dumpRSAPublicKey.c -@@ -14,14 +14,20 @@ - #include - #include - -+#include "openssl_compat.h" -+ - /* Command line tool to extract RSA public keys from X.509 certificates - * and output a pre-processed version of keys for use by RSA verification - * routines. - */ - - int check(RSA* key) { -- int public_exponent = BN_get_word(key->e); -- int modulus = BN_num_bits(key->n); -+ const BIGNUM *n, *e; -+ int public_exponent, modulus; -+ -+ RSA_get0_key(key, &n, &e, NULL); -+ public_exponent = BN_get_word(e); -+ modulus = BN_num_bits(n); - - if (public_exponent != 65537) { - fprintf(stderr, "WARNING: Public exponent should be 65537 (but is %d).\n", -@@ -40,7 +46,8 @@ int check(RSA* key) { - */ - void output(RSA* key) { - int i, nwords; -- BIGNUM *N = key->n; -+ const BIGNUM *key_n; -+ BIGNUM *N = NULL; - BIGNUM *Big1 = NULL, *Big2 = NULL, *Big32 = NULL, *BigMinus1 = NULL; - BIGNUM *B = NULL; - BIGNUM *N0inv= NULL, *R = NULL, *RR = NULL, *RRTemp = NULL, *NnumBits = NULL; -@@ -48,14 +55,15 @@ void output(RSA* key) { - BN_CTX *bn_ctx = BN_CTX_new(); - uint32_t n0invout; - -- N = key->n; - /* Output size of RSA key in 32-bit words */ -- nwords = BN_num_bits(N) / 32; -+ nwords = RSA_size(key) / 4; - if (-1 == write(1, &nwords, sizeof(nwords))) - goto failure; - - - /* Initialize BIGNUMs */ -+ RSA_get0_key(key, &key_n, NULL, NULL); -+ N = BN_dup(key_n); - Big1 = BN_new(); - Big2 = BN_new(); - Big32 = BN_new(); -@@ -120,6 +128,7 @@ void output(RSA* key) { - - failure: - /* Free BIGNUMs. */ -+ BN_free(N); - BN_free(Big1); - BN_free(Big2); - BN_free(Big32); --- -2.14.1 - diff --git a/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch b/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch deleted file mode 100644 index 6a3929f3c0a..00000000000 --- a/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch +++ /dev/null @@ -1,50 +0,0 @@ -From df4d2000a22db673a788b8e57e8e7c0cc3cee777 Mon Sep 17 00:00:00 2001 -From: Leonard Chan -Date: Thu, 3 Oct 2019 18:53:04 -0700 -Subject: [PATCH] Make vboot_version extern in header - -When enabling `-fno-common` in Fuchsia, we get a bunch of linker errors -when linking futility: - -``` -ld.lld: error: duplicate symbol: vboot_version ->>> defined at futility.h:43 (../../third_party/vboot_reference/futility/futility.h:43) ->>> host_x63-asan_no_detect_leaks/obj/third_party/vboot_reference/futility/futility.cmd_bdb.c.o:(vboot_version) ->>> defined at futility.h:43 (../../third_party/vboot_reference/futility/futility.h:43) ->>> host_x64-asan_no_detect_leaks/obj/third_party/vboot_reference/futility/futility.cmd_create.c.o:(.bss.vboot_version+0x0) -``` - -and think this is because -fno-common places vboot_version for -unitialized global variables in the BSS section of each object file. -Making it extern instead resolves each reference to its definition in -futility/misc.c. - -Change-Id: I591f07abd1f975a8a9d078bb4366e2e0861390b4 -Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1839207 -Reviewed-by: Julius Werner -Reviewed-by: Joel Kitching -Commit-Queue: Julius Werner -Tested-by: Julius Werner - -Patch taken from upstream: https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/df4d2000a22db673a788b8e57e8e7c0cc3cee777 -Signed-off-by: Heiko Thiery ---- - futility/futility.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/futility/futility.h b/futility/futility.h -index 3bce1106..5dc426dd 100644 ---- a/futility/futility.h -+++ b/futility/futility.h -@@ -41,7 +41,7 @@ enum vboot_version { - }; - - /* What's our preferred API & data format? */ --enum vboot_version vboot_version; -+extern enum vboot_version vboot_version; - - /* Here's a structure to define the commands that futility implements. */ - struct futil_cmd_t { --- -2.20.1 - diff --git a/package/vboot-utils/vboot-utils.hash b/package/vboot-utils/vboot-utils.hash index 1b622f25bf5..13752f3a33d 100644 --- a/package/vboot-utils/vboot-utils.hash +++ b/package/vboot-utils/vboot-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3e7b7e7f831e16cb07a7a09e1b74f1fff096d99b13c0d0d90d51ec3f80acd90b vboot-utils-bbdd62f9b030db7ad8eef789aaf58a7ff9a25656-git4.tar.gz +sha256 d65c447d5b4624ffb87815071d2734c3802a73fdca56a06c910fd0ea8e82602d vboot-utils-4b12d392e5b12de29c582df4e717b1228e9f1594-git4.tar.gz sha256 cb9dc8e96aedf9120b6757a60387db10f3c1a8e3fd97bb9d0f11327be5a7ed4d LICENSE diff --git a/package/vboot-utils/vboot-utils.mk b/package/vboot-utils/vboot-utils.mk index 3f63f458cca..3058d61ad87 100644 --- a/package/vboot-utils/vboot-utils.mk +++ b/package/vboot-utils/vboot-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -VBOOT_UTILS_VERSION = bbdd62f9b030db7ad8eef789aaf58a7ff9a25656 +VBOOT_UTILS_VERSION = 4b12d392e5b12de29c582df4e717b1228e9f1594 VBOOT_UTILS_SITE = https://chromium.googlesource.com/chromiumos/platform/vboot_reference VBOOT_UTILS_SITE_METHOD = git VBOOT_UTILS_LICENSE = BSD-3-Clause @@ -26,17 +26,20 @@ HOST_VBOOT_UTILS_DEPENDENCIES = host-openssl host-util-linux host-pkgconf # does not affect futil or cgpt in any way as long as it is one of the # supported targets. +HOST_VBOOT_UTILS_MAKE_OPTS = USE_FLASHROM=0 + define HOST_VBOOT_UTILS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ + $(HOST_MAKE_ENV) $(MAKE) $(HOST_VBOOT_UTILS_MAKE_OPTS) -C $(@D) \ CC="$(HOSTCC)" \ - CFLAGS="$(HOST_CFLAGS) -D_LARGEFILE64_SOURCE -D_GNU_SOURCE" \ + CPPFLAGS="$(HOST_CFLAGS) -D_LARGEFILE64_SOURCE -D_GNU_SOURCE" \ LDFLAGS="$(HOST_LDFLAGS)" \ ARCH=arm \ futil cgpt endef define HOST_VBOOT_UTILS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ + $(HOST_MAKE_ENV) $(MAKE) $(HOST_VBOOT_UTILS_MAKE_OPTS) -C $(@D) \ + DESTDIR=$(HOST_DIR) \ futil_install cgpt_install devkeys_install endef From 9a57fab586cdfc3b991384b65cb46b941de46a20 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Aug 2024 20:57:41 +0200 Subject: [PATCH 2405/3013] package/iproute2: fix musl compile errors Add two patches to fix musl compile errors. Fixes: http://autobuild.buildroot.net/results/8d713bd911f8d6b97272a7bb5dc2c188aeb99b05 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...laration-of-function-htobe64-in-gcc-.patch | 43 +++++++++++++++++++ ...laration-of-function-basename-in-gcc.patch | 30 +++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 package/iproute2/0001-Fix-implicit-declaration-of-function-htobe64-in-gcc-.patch create mode 100644 package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch diff --git a/package/iproute2/0001-Fix-implicit-declaration-of-function-htobe64-in-gcc-.patch b/package/iproute2/0001-Fix-implicit-declaration-of-function-htobe64-in-gcc-.patch new file mode 100644 index 00000000000..318701e725b --- /dev/null +++ b/package/iproute2/0001-Fix-implicit-declaration-of-function-htobe64-in-gcc-.patch @@ -0,0 +1,43 @@ +From ea78477cba25b50e7f63f02635e6870d72dcf68e Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 14 Aug 2024 19:10:09 +0200 +Subject: [PATCH] Fix implicit declaration of function 'htobe64' in gcc 14 on + musl systems + +On musl systems with GCC 14 and above, the htobe64 function cannot be +found by default. From the man page[0], the function is from endian.h +header file. If the file is not included in, then we get the following +error message. The issue however cannot be reproduced on glibc systems. + +In file included from ../include/libgenl.h:5, + from libgenl.c:12: +../include/libnetlink.h: In function 'rta_getattr_be64': +../include/libnetlink.h:281:16: error: implicit declaration of function 'htobe64' [-Wimplicit-function-declaration] + 281 | return htobe64(rta_getattr_u64(rta)); + | ^~~~~~~ +make[1]: *** [../config.include:24: libgenl.o] Error 1 + +[0]: https://linux.die.net/man/3/htobe64 + +Signed-off-by: Brahmajit Das +Signed-off-by: Waldemar Brodkorb +Upstream: https://lore.kernel.org/netdev/20240514084335.19f5b280@hermes.local/T/ +--- + include/libnetlink.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/libnetlink.h b/include/libnetlink.h +index 30f0c2d2..77e81815 100644 +--- a/include/libnetlink.h ++++ b/include/libnetlink.h +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + struct rtnl_handle { + int fd; +-- +2.39.2 + diff --git a/package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch b/package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch new file mode 100644 index 00000000000..7ebbb498168 --- /dev/null +++ b/package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch @@ -0,0 +1,30 @@ +From 482b7362dedc57d0c9783bd83084919ccaa79e77 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 14 Aug 2024 19:43:44 +0200 +Subject: [PATCH] Fix implicit declaration of function basename in gcc-14.x + +From Alpine Linux. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/iproute2/basename.patch?ref_type=heads +--- + rdma/rdma.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/rdma/rdma.c b/rdma/rdma.c +index 131c6b2a..1e7db382 100644 +--- a/rdma/rdma.c ++++ b/rdma/rdma.c +@@ -8,6 +8,9 @@ + #include "version.h" + #include "color.h" + ++/* For basename(3) prototype */ ++#include ++ + /* Global utils flags */ + int json; + +-- +2.39.2 + From f31e860ae4cd29fd3d23871797d91b4f3667c806 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Aug 2024 20:51:41 +0200 Subject: [PATCH 2406/3013] package/ncurses: fix uClibc-ng compile error Unfortunately upstream does not use any SCM. See here for the Changelog: https://invisible-island.net/ncurses/NEWS.html#index-t20231014 "+ updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng" Fixes: - http://autobuild.buildroot.net/results/01c/01cbc188c70f53fe492128100b430857f1cd98f2 - http://autobuild.buildroot.net/results/e2b/e2ba6a5554bfa0bf9b4c2eaf9222d041204f00e9 And many more. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../0001-fix-XOPEN_SOURCE-detection.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package/ncurses/0001-fix-XOPEN_SOURCE-detection.patch diff --git a/package/ncurses/0001-fix-XOPEN_SOURCE-detection.patch b/package/ncurses/0001-fix-XOPEN_SOURCE-detection.patch new file mode 100644 index 00000000000..130ef524b47 --- /dev/null +++ b/package/ncurses/0001-fix-XOPEN_SOURCE-detection.patch @@ -0,0 +1,17 @@ +Fix detection of XOPEN_SOURCE + +Signed-off-by: Waldemar Brodkorb +Upstream: fixed in latest release, no git/svn/hg + +diff -Nur ncurses-snapshots-6_4_20230603.orig/configure ncurses-snapshots-6_4_20230603/configure +--- ncurses-snapshots-6_4_20230603.orig/configure 2023-06-04 00:07:40.000000000 +0200 ++++ ncurses-snapshots-6_4_20230603/configure 2024-08-14 20:38:03.426905460 +0200 +@@ -10411,7 +10411,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + From 1feacea6675a28c4a3dc5e7a562b035468e3490a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 Aug 2024 15:17:39 +0200 Subject: [PATCH 2407/3013] package/dc3dd: fix compile issues Add a patch from Debian to fix the autobuild issues. Furthermore something like ea2f52494c32c53a3def6dc3b0c5b9d5d7c7edf4 from cvs package is required as well. Fixes: - http://autobuild.buildroot.net/results/6a0/6a0c5dc057eb348afcd5e3859cb37059d6bd91c1 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...e.y-compile-on-QNX-and-NetBSD-5-i386.patch | 104 ++++++++++++++++++ package/dc3dd/dc3dd.mk | 2 + 2 files changed, 106 insertions(+) create mode 100644 package/dc3dd/0004-Make-getdate.y-compile-on-QNX-and-NetBSD-5-i386.patch diff --git a/package/dc3dd/0004-Make-getdate.y-compile-on-QNX-and-NetBSD-5-i386.patch b/package/dc3dd/0004-Make-getdate.y-compile-on-QNX-and-NetBSD-5-i386.patch new file mode 100644 index 00000000000..6b7344e6e6f --- /dev/null +++ b/package/dc3dd/0004-Make-getdate.y-compile-on-QNX-and-NetBSD-5-i386.patch @@ -0,0 +1,104 @@ +From: Bruno Haible +Date: Thu, 17 Sep 2009 22:42:33 +0200 +Subject: Make getdate.y compile on QNX and NetBSD 5 / i386. + +Forwarded: https://sourceforge.net/p/dc3dd/bugs/23/ +Origin: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=a68c9ab3cfc8ac7cf2a709b0c1aa93229f8635e6 +Signed-off-by: Waldemar Brodkorb +Upstream: https://sources.debian.org/patches/dc3dd/7.3.1-3/Make-getdate.y-compile-on-QNX-and-NetBSD-5-i386.patch/ +--- + lib/getdate.y | 33 ++++++++++++++++++++++----------- + m4/getdate.m4 | 14 ++++++++++++++ + 2 files changed, 36 insertions(+), 11 deletions(-) + +diff --git a/lib/getdate.y b/lib/getdate.y +index 1deec51..d2c23f2 100644 +--- a/lib/getdate.y ++++ b/lib/getdate.y +@@ -108,12 +108,21 @@ + + #define HOUR(x) ((x) * 60) + +-/* Lots of this code assumes time_t and time_t-like values fit into +- long int. It also assumes that signed integer overflow silently +- wraps around, but there's no portable way to check for that at +- compile-time. */ ++/* long_time_t is a signed integer type that contains all time_t values. */ + verify (TYPE_IS_INTEGER (time_t)); +-verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); ++#if TIME_T_FITS_IN_LONG_INT ++typedef long int long_time_t; ++#else ++typedef time_t long_time_t; ++#endif ++ ++/* Lots of this code assumes time_t and time_t-like values fit into ++ long_time_t. */ ++verify (TYPE_MINIMUM (long_time_t) <= TYPE_MINIMUM (time_t) ++ && TYPE_MAXIMUM (time_t) <= TYPE_MAXIMUM (long_time_t)); ++ ++/* FIXME: It also assumes that signed integer overflow silently wraps around, ++ but this is not true any more with recent versions of GCC 4. */ + + /* An integer value, and the number of digits in its textual + representation. */ +@@ -146,7 +155,7 @@ typedef struct + long int day; + long int hour; + long int minutes; +- long int seconds; ++ long_time_t seconds; + long int ns; + } relative_time; + +@@ -1492,20 +1501,22 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) + time_t t1 = t0 + d1; + long int d2 = 60 * pc.rel.minutes; + time_t t2 = t1 + d2; +- long int d3 = pc.rel.seconds; +- time_t t3 = t2 + d3; ++ long_time_t d3 = pc.rel.seconds; ++ long_time_t t3 = t2 + d3; + long int d4 = (sum_ns - normalized_ns) / BILLION; +- time_t t4 = t3 + d4; ++ long_time_t t4 = t3 + d4; ++ time_t t5 = t4; + + if ((d1 / (60 * 60) ^ pc.rel.hour) + | (d2 / 60 ^ pc.rel.minutes) + | ((t1 < t0) ^ (d1 < 0)) + | ((t2 < t1) ^ (d2 < 0)) + | ((t3 < t2) ^ (d3 < 0)) +- | ((t4 < t3) ^ (d4 < 0))) ++ | ((t4 < t3) ^ (d4 < 0)) ++ | (t5 != t4)) + goto fail; + +- result->tv_sec = t4; ++ result->tv_sec = t5; + result->tv_nsec = normalized_ns; + } + } +diff --git a/m4/getdate.m4 b/m4/getdate.m4 +index d160329..cfbb86f 100644 +--- a/m4/getdate.m4 ++++ b/m4/getdate.m4 +@@ -30,4 +30,18 @@ AC_DEFUN([gl_GETDATE], + AC_STRUCT_TIMEZONE + AC_REQUIRE([gl_CLOCK_TIME]) + AC_REQUIRE([gl_TM_GMTOFF]) ++ AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([[ ++#include /* for time_t */ ++#include /* for CHAR_BIT, LONG_MIN, LONG_MAX */ ++#define TYPE_MINIMUM(t) \ ++ ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) ++#define TYPE_MAXIMUM(t) \ ++ ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) ++typedef int verify_min[2 * (LONG_MIN <= TYPE_MINIMUM (time_t)) - 1]; ++typedef int verify_max[2 * (TYPE_MAXIMUM (time_t) <= LONG_MAX) - 1]; ++ ]])], ++ [AC_DEFINE([TIME_T_FITS_IN_LONG_INT], [1], ++ [Define to 1 if all 'time_t' values fit in a 'long int'.]) ++ ]) + ]) diff --git a/package/dc3dd/dc3dd.mk b/package/dc3dd/dc3dd.mk index f47f34a81aa..c31ab9e1f3f 100644 --- a/package/dc3dd/dc3dd.mk +++ b/package/dc3dd/dc3dd.mk @@ -15,4 +15,6 @@ DC3DD_LICENSE_FILES = COPYING DC3DD_AUTORECONF = YES DC3DD_AUTOPOINT = YES +DC3DD_CONF_ENV = ac_cv_func_working_mktime=yes + $(eval $(autotools-package)) From 67e6d0a3f1a0893183885b947f4472ef4c04bfc4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 Aug 2024 06:46:54 +0200 Subject: [PATCH 2408/3013] package/unbound: add missing unbound user Without the unbound user the daemon does not start on bootup. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/unbound/unbound.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index ff0262bef10..6ce6f9a1ba0 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -54,4 +54,8 @@ define UNBOUND_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S70unbound endef +define UNBOUND_USERS + unbound -1 unbound -1 * /etc/unbound - - unbound daemon +endef + $(eval $(autotools-package)) From 1feac1fb883cc33d0976d22310f58738b478e533 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 Aug 2024 06:35:43 +0200 Subject: [PATCH 2409/3013] package/atop: update to 2.11.0 See here for a changelog: https://atoptool.nl/downloadatop.php Fixes: - http://autobuild.buildroot.net/results/4f2/4f256c96c8b7c34c1f1be378ad3a535d3150e44d Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...he-user-to-pass-additional-CFLAGS-an.patch | 21 +++++++++---------- package/atop/atop.hash | 2 +- package/atop/atop.mk | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch b/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch index c4ec67ca24f..0fc8f142b14 100644 --- a/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch +++ b/package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch @@ -8,26 +8,25 @@ This is needed for some build systems. For example, Buildroot needs to disable optimizations on some CPU architectures. Upstream: https://github.com/Atoptool/atop/pull/314 +[Waldemar: rebase on top of 2.11.0] +Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index a6f196b..dae5cda 100644 +index 3a63f69..ab44eaa 100644 --- a/Makefile +++ b/Makefile -@@ -20,8 +20,8 @@ PMPATH1 = /usr/lib/pm-utils/sleep.d - PMPATH2 = /usr/lib64/pm-utils/sleep.d +@@ -21,8 +21,8 @@ PMPATH2 = /usr/lib64/pm-utils/sleep.d PMPATHD = /usr/lib/systemd/system-sleep --CFLAGS += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS --LDFLAGS = $(shell pkg-config --libs glib-2.0) -+override CFLAGS := -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security $(CFLAGS) # -DNOPERFEVENT # -DHTTPSTATS -+override LDFLAGS := $(shell pkg-config --libs glib-2.0) $(LDFLAGS) + PKG_CONFIG ?= pkg-config +-CFLAGS += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS +-LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0) ++override CFLAGS += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS ++override LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0) OBJMOD0 = version.o OBJMOD1 = various.o deviate.o procdbase.o - OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o --- -2.45.2 - + OBJMOD2 = acctproc.o photoproc.o photosyst.o cgroups.o rawlog.o ifprop.o parseable.o diff --git a/package/atop/atop.hash b/package/atop/atop.hash index a6539e6211c..8774fb577de 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 e7a673cf2c82578e7dd82ecb0dec83fd9ecb30828b2561c28a9fa5aaf75d5f93 atop-2.10.0.tar.gz +sha256 9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20 atop-2.11.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index b383932e8d8..f7dfed5e8df 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.10.0 +ATOP_VERSION = 2.11.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING @@ -18,7 +18,7 @@ ATOP_CFLAGS += -O0 endif define ATOP_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \ -C $(@D) endef From fee74a7a9f535f782626ccf0e4d88b623333fe1c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 12 Aug 2024 23:40:14 +0200 Subject: [PATCH 2410/3013] package/libgpg-error: needs MMU libgpg-error imported code using fork() in commit [1] and enabled it soon after in [2]. Those commits were first included in libgpg-error version 1.28. For reference, the libgpg-error Buildroot package was updated to that version in commit [3]. When Buildroot configuration has no MMU support (e.g. BR2_USE_MMU is not set), libgpg-error fails to build with error: /build/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: ./.libs/libgpg-error.a(libgpg_error_la-spawn-posix.o): in function '_gpgrt_process_spawn': spawn-posix.c:(.text+0x630): undefined reference to 'fork' This issue can be observed with the command: utils/test-pkg -a -p libgpg-error It will show few build failures: ... bootlin-armv7m-uclibc [ 6/41]: FAILED ... bootlin-m68k-5208-uclibc [ 8/41]: FAILED ... This commit fixes the issue by adding the dependency on BR2_USE_MMU in BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Doing so will automatically propagates this dependency to all packages using libgpg-error (and thus, already depending on this _ARCH_SUPPORTS). Fixes: http://autobuild.buildroot.org/results/dbc82ba08e6a30c2f558c8c36ad7eeb0e3cab090/ http://autobuild.buildroot.org/results/074a803de0f48cd86b9135cca50f136cccf1bcea/ http://autobuild.buildroot.org/results/4c1966a71020af31c1dc1b0a13a3928c84e75874/ ...and many others. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff;h=8f41cc23b12485404203be5881aaaadb78696b4d [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff;h=1865c0ba1769b407a3c504f1ab0a4278704a9fc1 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/692d191c8b0b3c86022e6a6ba3bd2d8f53b39f03 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libgpg-error/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index 5a2c14ead86..a0ee7ec5312 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS BR2_sh4a || BR2_sh4aeb || \ BR2_sparc || BR2_sparc64 || \ BR2_x86_64 + depends on BR2_USE_MMU # fork() config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" From e60d1c3babdf84956f963cbfee40760b72867aa4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 Aug 2024 05:57:49 +0200 Subject: [PATCH 2411/3013] package/uclibc: update to 1.0.50 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See this git shortlog for changes: Dmitry Chestnykh (2): Fix compilation with 4.x kernel headers Group conditions after `&&` Frank Mehnert (6): libdl: properly cast parameters for %p format string specifier iconv: explicit cast to `unsigned char*` iconv: explicitly state operator precedence ldso.c: use 'unsigned int' as loop variable type iconv: fix parameter type of utf8seq_is_{overlong,surrogate,illegal} iconv: prevent compiler warning during initialization with jis0208 J. Neuschäfer (1): bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), everywhere Marcus Haehnel (5): ldso/dl-vdso: avoid compiler warning if configured without vdso uclibc: Fix double promotion warning libm: Fix float conversion compiler warning features.h: add clang prerequisite macro buildsys: allow building with gcc-14 Sven Linker (1): c++: Remove deprecated dynamic exception specification Valentin Gehrke (1): arm: Replace deprecated asm instructions for ARMv8 AArch32 Waldemar Brodkorb (9): Clang support for gnu_inline attribute allow to use add SEEK_DATA/SEEK_HOLE lseek: allow SEEK_DATA/SEEK_HOLE to be used bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), add missing riscv: remove incomplete context implementation, use libucontext add memfd_create syscall wrapper getrandom: remove __USE_GNU / add GRND_INSECURE bump version for 1.0.50 release Yann Le Du (1): stdlib: increase number of static atexit handlers to 32 All buildroot patches are upstream. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../0001-allow-to-use-sys-ucontext.h.patch | 35 --- ...-compilation-with-4.x-kernel-headers.patch | 80 ------- ...are-st_mtim-if-defined-__USE_XOPEN2K.patch | 205 ------------------ ...ix-arc-build-with-4.x-kernel-headers.patch | 35 --- ...are-st_mtim-if-defined-__USE_XOPEN2K.patch | 132 ----------- package/uclibc/uclibc.hash | 4 +- package/uclibc/uclibc.mk | 2 +- 7 files changed, 3 insertions(+), 490 deletions(-) delete mode 100644 package/uclibc/0001-allow-to-use-sys-ucontext.h.patch delete mode 100644 package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch delete mode 100644 package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch delete mode 100644 package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch delete mode 100644 package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch diff --git a/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch deleted file mode 100644 index b6bd5602d94..00000000000 --- a/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 903da45dde43836e35a295226c5b1efccd413c08 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 17 Jul 2024 15:41:40 +0200 -Subject: [PATCH] allow to use - -For architectures without ucontext implementation it is possible -to use libucontext with this small adaptation. - -Signed-off-by: Waldemar Brodkorb -Upstream: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/MZCPGG56TL7SVOZY2L3AGHLREJ76BYZE/ ---- - include/ucontext.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/ucontext.h b/include/ucontext.h -index 4ce114ef1..76b4f375e 100644 ---- a/include/ucontext.h -+++ b/include/ucontext.h -@@ -23,11 +23,11 @@ - - #include - --#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ -- - /* Get machine dependent definition of data structures. */ - #include - -+#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ -+ - __BEGIN_DECLS - - /* Get user context and store it in variable pointed to by UCP. */ --- -2.30.2 - diff --git a/package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch b/package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch deleted file mode 100644 index ad3efa9638f..00000000000 --- a/package/uclibc/0002-Fix-compilation-with-4.x-kernel-headers.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 839bae66a376631ee7d5b1f5b2f5b4094c519ea8 Mon Sep 17 00:00:00 2001 -From: Dmitry Chestnykh -Date: Sat, 20 Jul 2024 17:23:45 +0300 -Subject: [PATCH] Fix compilation with 4.x kernel headers - -- Fallback to __NR_stat syscall in ld.so if we use 4.x kernel headers. -4.x kernel doesn't support 64-bit time so we can use old syscall -- Add preprocessor conditions to have fstat64 and fstatat64 in libc -with old kernel headers - -Signed-off-by: Dmitry Chestnykh -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=839bae66a376631ee7d5b1f5b2f5b4094c519ea8 ---- - ldso/include/dl-syscall.h | 4 +++- - libc/sysdeps/linux/common/fstat64.c | 3 ++- - libc/sysdeps/linux/common/fstatat64.c | 3 ++- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h -index 4f41034ad..9ec0eac60 100644 ---- a/ldso/include/dl-syscall.h -+++ b/ldso/include/dl-syscall.h -@@ -17,6 +17,8 @@ extern int _dl_errno; - #define __set_errno(X) {(_dl_errno) = (X);} - #endif - -+#include -+ - /* Pull in the arch specific syscall implementation */ - #include - /* For MAP_ANONYMOUS -- differs between platforms */ -@@ -139,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name, - { - return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); - } --#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) -+#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) - # define __NR__dl_stat __NR_stat - static __always_inline _syscall2(int, _dl_stat, const char *, file_name, - struct stat *, buf) -diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c -index 359c22af6..121b21fc8 100644 ---- a/libc/sysdeps/linux/common/fstat64.c -+++ b/libc/sysdeps/linux/common/fstat64.c -@@ -8,8 +8,9 @@ - - #include <_lfs_64.h> - #include -+#include - --#if defined(__NR_fstat64) && !defined(__UCLIBC_USE_TIME64__) -+#if defined(__NR_fstat64) && (!defined(__UCLIBC_USE_TIME64__) || LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) - # include - # include - # include "xstatconv.h" -diff --git a/libc/sysdeps/linux/common/fstatat64.c b/libc/sysdeps/linux/common/fstatat64.c -index 16dbf9215..739e84081 100644 ---- a/libc/sysdeps/linux/common/fstatat64.c -+++ b/libc/sysdeps/linux/common/fstatat64.c -@@ -9,6 +9,7 @@ - #include <_lfs_64.h> - #include - #include -+#include - - #if defined __mips__ - # include -@@ -23,7 +24,7 @@ - # define __NR_fstatat64 __NR_newfstatat - #endif - --#if defined(__NR_fstatat64) && !defined(__UCLIBC_USE_TIME64__) -+#if defined(__NR_fstatat64) && (!defined(__UCLIBC_USE_TIME64__) || LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) - # include - # include "xstatconv.h" - int fstatat64(int fd, const char *file, struct stat64 *buf, int flag) --- -2.30.2 - diff --git a/package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch b/package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch deleted file mode 100644 index 73100c2c1ba..00000000000 --- a/package/uclibc/0003-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch +++ /dev/null @@ -1,205 +0,0 @@ -From d0c8c185b439187b12644457bb2aa0326f25aaf7 Mon Sep 17 00:00:00 2001 -From: J.Neuschäfer?= -Date: Sat, 27 Jul 2024 18:47:09 +0200 -Subject: [PATCH] bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), - everywhere -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -While building software that sets _POSIX_C_SOURCE=200809L and uses -stat.st_mtim for ARM, it was noticed that st_mtim was not defined. - -This seems to be because common/bits/stat.h was picked up, which does -not take __USE_XOPEN2K8 as a reason to enable st_mtim and related -fields. This appears to be an oversight, and porting the check from -common-generic/bits/stat.h to other architectures does indeed fix the -build issue. - -This patch is based on commit 50bd6d06e ("Fix memory corruption due to -struct stat field"). - -Signed-off-by: J. Neuschäfer -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=d0c8c185b439187b12644457bb2aa0326f25aaf7 ---- - libc/sysdeps/linux/alpha/bits/stat.h | 2 +- - libc/sysdeps/linux/common/bits/stat.h | 4 ++-- - libc/sysdeps/linux/frv/bits/stat.h | 4 ++-- - libc/sysdeps/linux/ia64/bits/stat.h | 4 ++-- - libc/sysdeps/linux/m68k/bits/stat.h | 4 ++-- - libc/sysdeps/linux/mips/bits/stat.h | 4 ++-- - libc/sysdeps/linux/nds32/bits/stat.h | 4 ++-- - libc/sysdeps/linux/powerpc/bits/stat.h | 4 ++-- - 8 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/libc/sysdeps/linux/alpha/bits/stat.h b/libc/sysdeps/linux/alpha/bits/stat.h -index 88bc6617d..f2dca250d 100644 ---- a/libc/sysdeps/linux/alpha/bits/stat.h -+++ b/libc/sysdeps/linux/alpha/bits/stat.h -@@ -40,7 +40,7 @@ - - Use neat tidy anonymous unions and structures when possible. */ - --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - # if __GNUC_PREREQ(3,3) - # define __ST_TIME(X) \ - __extension__ union { \ -diff --git a/libc/sysdeps/linux/common/bits/stat.h b/libc/sysdeps/linux/common/bits/stat.h -index 07c09f50a..fc76cc3e7 100644 ---- a/libc/sysdeps/linux/common/bits/stat.h -+++ b/libc/sysdeps/linux/common/bits/stat.h -@@ -61,7 +61,7 @@ struct stat - #else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -107,7 +107,7 @@ struct stat64 - __blksize_t st_blksize; /* Optimal block size for I/O. */ - - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/frv/bits/stat.h b/libc/sysdeps/linux/frv/bits/stat.h -index 381d207f2..18321c080 100644 ---- a/libc/sysdeps/linux/frv/bits/stat.h -+++ b/libc/sysdeps/linux/frv/bits/stat.h -@@ -70,7 +70,7 @@ struct stat - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif - --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -117,7 +117,7 @@ struct stat64 - __blksize_t st_blksize; /* Optimal block size for I/O. */ - - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/ia64/bits/stat.h b/libc/sysdeps/linux/ia64/bits/stat.h -index 6723166e7..2b70b8cf8 100644 ---- a/libc/sysdeps/linux/ia64/bits/stat.h -+++ b/libc/sysdeps/linux/ia64/bits/stat.h -@@ -38,7 +38,7 @@ struct stat - int pad0; - __dev_t st_rdev; /* Device number, if device. */ - __off_t st_size; /* Size of file, in bytes. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -77,7 +77,7 @@ struct stat64 - int pad0; - __dev_t st_rdev; /* Device number, if device. */ - __off_t st_size; /* Size of file, in bytes. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/m68k/bits/stat.h b/libc/sysdeps/linux/m68k/bits/stat.h -index 7b9c3d144..70da1b384 100644 ---- a/libc/sysdeps/linux/m68k/bits/stat.h -+++ b/libc/sysdeps/linux/m68k/bits/stat.h -@@ -60,7 +60,7 @@ struct stat - #else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -106,7 +106,7 @@ struct stat64 - __blksize_t st_blksize; /* Optimal block size for I/O. */ - - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/mips/bits/stat.h b/libc/sysdeps/linux/mips/bits/stat.h -index 539fa33d2..bad2a0244 100644 ---- a/libc/sysdeps/linux/mips/bits/stat.h -+++ b/libc/sysdeps/linux/mips/bits/stat.h -@@ -60,7 +60,7 @@ struct stat - long int st_pad2[2]; - __off64_t st_size; /* Size of file, in bytes. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -103,7 +103,7 @@ struct stat { - unsigned int st_rdev; /* Device number, if device. */ - int st_pad2[3]; - __off_t st_size; /* Size of file, in bytes. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/nds32/bits/stat.h b/libc/sysdeps/linux/nds32/bits/stat.h -index c4e09e0f2..5272751f4 100644 ---- a/libc/sysdeps/linux/nds32/bits/stat.h -+++ b/libc/sysdeps/linux/nds32/bits/stat.h -@@ -64,7 +64,7 @@ struct stat - #else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -110,7 +110,7 @@ struct stat64 - __blksize_t st_blksize; /* Optimal block size for I/O. */ - - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/powerpc/bits/stat.h b/libc/sysdeps/linux/powerpc/bits/stat.h -index 7494586b5..ce2ebf896 100644 ---- a/libc/sysdeps/linux/powerpc/bits/stat.h -+++ b/libc/sysdeps/linux/powerpc/bits/stat.h -@@ -59,7 +59,7 @@ struct stat - # else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - # endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -99,7 +99,7 @@ struct stat64 - __off64_t st_size; /* Size of file, in bytes. */ - __blksize_t st_blksize; /* Optimal block size for I/O. */ - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the --- -2.30.2 - diff --git a/package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch b/package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch deleted file mode 100644 index 02a04a42dc1..00000000000 --- a/package/uclibc/0004-Fix-arc-build-with-4.x-kernel-headers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1afc19eb6a7948afbcf3dd19091ce127a355ebcb Mon Sep 17 00:00:00 2001 -From: Dmitry Chestnykh -Date: Sun, 28 Jul 2024 14:12:39 +0300 -Subject: [PATCH] [ldso] Group conditions after `&&` - -If the conditions are not grouped we can reach -this block even if `__NR_stat` is not defined. - -`defined __NR_stat && ((!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__))` -gives us false but `LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))` -may give us true. So if linux headers version is below 5.1.0 and -__NR_stat is not defined we can have compilation error - -Signed-off-by: Dmitry Chestnykh -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=841d0729883ee0de606de161c1d6a5c37cedf575 ---- - ldso/include/dl-syscall.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h -index 9ec0eac60..180d03012 100644 ---- a/ldso/include/dl-syscall.h -+++ b/ldso/include/dl-syscall.h -@@ -141,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name, - { - return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); - } --#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) -+#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))) - # define __NR__dl_stat __NR_stat - static __always_inline _syscall2(int, _dl_stat, const char *, file_name, - struct stat *, buf) --- -2.45.2 - diff --git a/package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch b/package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch deleted file mode 100644 index 749a0984069..00000000000 --- a/package/uclibc/0005-bits-stat.h-Declare-st_mtim-if-defined-__USE_XOPEN2K.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 354129807db12c792696b74d0cd38f2c5d2fd704 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 9 Aug 2024 06:16:02 +0200 -Subject: [PATCH] bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), - add missing - -d0c8c185b439187b12644457bb2aa0326f25aaf7 was not complete, add -missing architectures. - -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=354129807db12c792696b74d0cd38f2c5d2fd704 ---- - libc/sysdeps/linux/mips/bits/stat.h | 4 ++-- - libc/sysdeps/linux/sparc/bits/stat.h | 4 ++-- - libc/sysdeps/linux/sparc64/bits/stat.h | 4 ++-- - libc/sysdeps/linux/x86_64/bits/stat.h | 4 ++-- - libc/sysdeps/linux/xtensa/bits/stat.h | 4 ++-- - 5 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/libc/sysdeps/linux/mips/bits/stat.h b/libc/sysdeps/linux/mips/bits/stat.h -index bad2a0244..81d2e4687 100644 ---- a/libc/sysdeps/linux/mips/bits/stat.h -+++ b/libc/sysdeps/linux/mips/bits/stat.h -@@ -145,7 +145,7 @@ struct stat64 - __dev_t st_rdev; /* Device number, if device. */ - long int st_pad2[2]; - __off64_t st_size; /* Size of file, in bytes. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -184,7 +184,7 @@ struct stat64 { - unsigned int st_rdev; /* Device number, if device. */ - int st_pad2[3]; - __off_t st_size; /* Size of file, in bytes. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/sparc/bits/stat.h b/libc/sysdeps/linux/sparc/bits/stat.h -index b88885fe2..0fbef8b3f 100644 ---- a/libc/sysdeps/linux/sparc/bits/stat.h -+++ b/libc/sysdeps/linux/sparc/bits/stat.h -@@ -53,7 +53,7 @@ struct stat - #else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -93,7 +93,7 @@ struct stat64 - __blksize_t st_blksize; /* Optimal block size for I/O. */ - - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/sparc64/bits/stat.h b/libc/sysdeps/linux/sparc64/bits/stat.h -index 8516b159c..62b48b745 100644 ---- a/libc/sysdeps/linux/sparc64/bits/stat.h -+++ b/libc/sysdeps/linux/sparc64/bits/stat.h -@@ -58,7 +58,7 @@ struct stat - #else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -101,7 +101,7 @@ struct stat64 - __blksize_t st_blksize; /* Optimal block size for I/O. */ - - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/x86_64/bits/stat.h b/libc/sysdeps/linux/x86_64/bits/stat.h -index a7412c8f9..a8c75feaa 100644 ---- a/libc/sysdeps/linux/x86_64/bits/stat.h -+++ b/libc/sysdeps/linux/x86_64/bits/stat.h -@@ -77,7 +77,7 @@ struct stat - #else - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -138,7 +138,7 @@ struct stat64 - #endif - __blksize_t st_blksize; /* Optimal block size for I/O. */ - __blkcnt64_t st_blocks; /* Nr. 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -diff --git a/libc/sysdeps/linux/xtensa/bits/stat.h b/libc/sysdeps/linux/xtensa/bits/stat.h -index 045a017fd..43af825ec 100644 ---- a/libc/sysdeps/linux/xtensa/bits/stat.h -+++ b/libc/sysdeps/linux/xtensa/bits/stat.h -@@ -54,7 +54,7 @@ struct stat - unsigned long __pad2; - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ - #endif --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the -@@ -94,7 +94,7 @@ struct stat64 - - unsigned long __pad2; - __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ --#ifdef __USE_MISC -+#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) - /* Nanosecond resolution timestamps are stored in a format - equivalent to 'struct timespec'. This is the type used - whenever possible but the Unix namespace rules do not allow the --- -2.30.2 - diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 1067ea9b0fe..dbc3966906e 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.49/uClibc-ng-1.0.49.tar.xz.sha256 -sha256 340f9d5dd1159c69c3380654e39e567cbb304afcd3f9dfa2e9833f0fa13f5bbe uClibc-ng-1.0.49.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.50/uClibc-ng-1.0.50.tar.xz.sha256 +sha256 aed867251f4823a74ea5e3a3993d3a7c123280abe15e38dc206770c3968f21cf uClibc-ng-1.0.50.tar.xz # Locally calculated sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 31f9899f009..de834bac4f2 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.49 +UCLIBC_VERSION = 1.0.50 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From 6362dd1d1416949cfccb2469f4da4c52b4ac8491 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 15 Aug 2024 01:52:49 +0200 Subject: [PATCH 2412/3013] package/libpcap: fix m68k-cf compile issue Compilation with -Os triggers this assembler problem. The problematic C code contains a long switch statement, so everything looks like GCC Bug 104028 is triggered. Fixes: - http://autobuild.buildroot.net/results/db5/db58215fb3c7f30b6c0f0764a84271010346edfb Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libpcap/libpcap.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index a4523f22182..3d05590da30 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -57,5 +57,9 @@ ifeq ($(BR2_microblaze)$(BR2_sparc)$(BR2_sparc64),y) LIBPCAP_CFLAGS += -fPIC endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +LIBPCAP_CFLAGS += -O2 +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From f7eabe00058013c2135a4084fd622b2e1c511ff3 Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Fri, 9 Aug 2024 09:53:33 +0100 Subject: [PATCH 2413/3013] configs/beaglev_fire: update custom tarballs The Linux kernel and U-Boot custom tarballs were updated incorrectly in commit 8ce97fd550d6. Update these to select specific release tags instead of branches. Update the U-Boot and Linux hashes to match these changes. Fixes: 8ce97fd550d6 ("configs/beaglev_fire: bump Linux and U-Boot") Signed-off-by: Jamie Gibbons Tested-by: Prajna Rajendra Kumar Signed-off-by: Thomas Petazzoni --- board/beagleboard/beaglev_fire/patches/linux/linux.hash | 2 +- board/beagleboard/beaglev_fire/patches/uboot/uboot.hash | 2 +- configs/beaglev_fire_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/beagleboard/beaglev_fire/patches/linux/linux.hash b/board/beagleboard/beaglev_fire/patches/linux/linux.hash index 025d630f7dc..416a8b1550b 100644 --- a/board/beagleboard/beaglev_fire/patches/linux/linux.hash +++ b/board/beagleboard/beaglev_fire/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a45642bd69b11d9312c15faac67fbd15b0ef90a6d90662d18c0760e37165c7cc linux4microchip+fpga-2024.06.tar.gz +sha256 dcb7b41fd363729675c34545fcb514d5a94dbb3714ee10f527a26ca7716c2579 linux-linux4microchip+fpga-2024.06.tar.gz diff --git a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash index ddb73b9a718..2628d4b4fd6 100644 --- a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d9bcbebe9723ab12cbf2b60277268741e84e4aadbe7ecd8c05be046f202d8a1 linux4microchip+fpga-2024.06.tar.gz +sha256 d461c45a9c5acd019776cdcf8ab2b571315282a880dd6580431f7dd5bfac3889 uboot-linux4microchip+fpga-2024.06.tar.gz diff --git a/configs/beaglev_fire_defconfig b/configs/beaglev_fire_defconfig index 809e00ff928..5e1faf41b98 100644 --- a/configs/beaglev_fire_defconfig +++ b/configs/beaglev_fire_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux-linux4microchip+fpga-2024.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/uboot-linux4microchip+fpga-2024.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beaglev_fire" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglev_fire/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y From fd88b0104fd0e0e39edf80518f3454d94f671405 Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Fri, 9 Aug 2024 09:53:34 +0100 Subject: [PATCH 2414/3013] configs/microchip_mpfs_icicle: update custom tarballs The Linux kernel and U-Boot custom tarballs were updated incorrectly in commit 45db64545742. Update these to select specific release tags instead of branches. Update the U-Boot and Linux hashes to match these changes. Fixes: 45db64545742 ("configs/microchip_mpfs_icicle: bump Linux and U-Boot, add hashes") Signed-off-by: Jamie Gibbons Tested-by: Prajna Rajendra Kumar Signed-off-by: Thomas Petazzoni --- board/microchip/mpfs_icicle/patches/linux/linux.hash | 2 +- board/microchip/mpfs_icicle/patches/uboot/uboot.hash | 2 +- configs/microchip_mpfs_icicle_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/microchip/mpfs_icicle/patches/linux/linux.hash b/board/microchip/mpfs_icicle/patches/linux/linux.hash index 025d630f7dc..416a8b1550b 100644 --- a/board/microchip/mpfs_icicle/patches/linux/linux.hash +++ b/board/microchip/mpfs_icicle/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a45642bd69b11d9312c15faac67fbd15b0ef90a6d90662d18c0760e37165c7cc linux4microchip+fpga-2024.06.tar.gz +sha256 dcb7b41fd363729675c34545fcb514d5a94dbb3714ee10f527a26ca7716c2579 linux-linux4microchip+fpga-2024.06.tar.gz diff --git a/board/microchip/mpfs_icicle/patches/uboot/uboot.hash b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash index ddb73b9a718..2628d4b4fd6 100644 --- a/board/microchip/mpfs_icicle/patches/uboot/uboot.hash +++ b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d9bcbebe9723ab12cbf2b60277268741e84e4aadbe7ecd8c05be046f202d8a1 linux4microchip+fpga-2024.06.tar.gz +sha256 d461c45a9c5acd019776cdcf8ab2b571315282a880dd6580431f7dd5bfac3889 uboot-linux4microchip+fpga-2024.06.tar.gz diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig index 30d07550acc..4337ac34b47 100644 --- a/configs/microchip_mpfs_icicle_defconfig +++ b/configs/microchip_mpfs_icicle_defconfig @@ -7,7 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="mpfs_icicle" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/microchip/mpfs_icicle/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux-linux4microchip+fpga-2024.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/uboot-linux4microchip+fpga-2024.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="microchip_mpfs_icicle" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/uboot-fragment-rootfs.config" BR2_TARGET_UBOOT_NEEDS_DTC=y From 273160552d6540aea5d3bb1065ca296614f43c44 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 9 Aug 2024 16:30:18 +0000 Subject: [PATCH 2415/3013] boot/uboot: fix dependency on xilinx-prebuilt When building with `make -j` and PER_PACKAGE_DIRECTORIES, a race condition occurs between xilinx-prebuilt and u-boot, resulting in the following error. objcopy -O binary -I elf32-little .../images/pmufw.elf .../images/pmufw.bin objcopy: '.../images/pmufw.elf': No such file U-Boot registers a KCONFIG_FIXUP_CMD that uses the pmufw.elf from xilinx-prebuilt. But KCONFIG_FIXUP_CMDS does not use the normal DEPENDENCIES, so xilinx-prebuilt is not guaranteed to have run before fixup. Instead move the `objcopy` call out to a PRE_BUILD_HOOK so it will run after xilinx-prebuilt has finished. Signed-off-by: Brandon Maier Tested-by: Neal Frager Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 45ad1c880f7..cdb9f435f74 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -460,13 +460,17 @@ endif #ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT -UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) - +ifeq ($(suffix $(UBOOT_ZYNQMP_PMUFW_PATH)),.elf) +UBOOT_ZYNQMP_PMUFW_PATH_FINAL = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)).bin +define UBOOT_ZYNQMP_PMUFW_CONVERT + objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_PATH) $(UBOOT_ZYNQMP_PMUFW_PATH_FINAL) +endef +UBOOT_PRE_BUILD_HOOKS += UBOOT_ZYNQMP_PMUFW_CONVERT +else +UBOOT_ZYNQMP_PMUFW_PATH_FINAL = $(UBOOT_ZYNQMP_PMUFW_PATH) +endif define UBOOT_ZYNQMP_KCONFIG_PMUFW - $(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)), - objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin"), - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)")) + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH_FINAL)") endef UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) From 48e7affffa06bbe23a1cd190d0a765956cf179b0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Aug 2024 15:44:40 +0200 Subject: [PATCH 2416/3013] package/mariadb: fix build with fmt >= 11.0.1 MariaDB is failing to build since commit 6b86f076c3 "package/fmt: bump to version 11.0.1" with output: /buildroot/output/build/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/base.h:1402:29: error: passing 'const fmt::v11::formatter' as 'this' argument discards qualifiers [-fpermissive] 1402 | ctx.advance_to(cf.format(*static_cast(arg), ctx)); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This commit is fixing the issue by adding an upstream patch, rebased on the package version. Fixes: http://autobuild.buildroot.org/results/3106928a2d6b32acfb075a2840cf549a81784270/ and many others. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...le-failure-fmt-use-incompatible-with.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/mariadb/0002-MDEV-34206-compile-failure-fmt-use-incompatible-with.patch diff --git a/package/mariadb/0002-MDEV-34206-compile-failure-fmt-use-incompatible-with.patch b/package/mariadb/0002-MDEV-34206-compile-failure-fmt-use-incompatible-with.patch new file mode 100644 index 00000000000..b6c8807f440 --- /dev/null +++ b/package/mariadb/0002-MDEV-34206-compile-failure-fmt-use-incompatible-with.patch @@ -0,0 +1,35 @@ +From 69935c10b95fc7f7a2e1c3ed02831958e1a9b6a4 Mon Sep 17 00:00:00 2001 +From: Daniel Black +Date: Wed, 22 May 2024 17:43:17 +1000 +Subject: [PATCH] MDEV-34206 compile failure: fmt use incompatible with + libfmt-10.2.[2]+ + +Upstream libfmt commit https://github.com/fmtlib/fmt/commit/d70729215fba1d54862e407b626abf86ddf409bf +now requires the format function to be const. + +Adjust the function prototype so it is const and can compile.a + +Signed-off-by: Daniel Black +[Julien: add SoB line with the original patch author name] +Upstream: https://github.com/MariaDB/server/commit/4375245d5d9f01cabb6e3fd6c637535e724eae38 +Signed-off-by: Julien Olivain +--- + sql/item_strfunc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc +index 4bbf36ec1cf..2ad8a9b3ce5 100644 +--- a/sql/item_strfunc.cc ++++ b/sql/item_strfunc.cc +@@ -1392,7 +1392,7 @@ bool Item_func_sformat::fix_length_and_dec(THD *thd) + namespace fmt { + template <> struct formatter: formatter { + template +- auto format(String c, FormatContext& ctx) -> decltype(ctx.out()) { ++ auto format(String c, FormatContext& ctx) const -> decltype(ctx.out()) { + string_view name = { c.ptr(), c.length() }; + return formatter::format(name, ctx); + }; +-- +2.46.0 + From c810fb6e1157656e03e982db68230a7a2e500b19 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 15 Aug 2024 14:12:00 +0200 Subject: [PATCH 2417/3013] package/iproute2: fixup Upstream url Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...ix-implicit-declaration-of-function-basename-in-gcc.patch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch b/package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch index 7ebbb498168..3bce4b15bb5 100644 --- a/package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch +++ b/package/iproute2/0002-Fix-implicit-declaration-of-function-basename-in-gcc.patch @@ -4,9 +4,12 @@ Date: Wed, 14 Aug 2024 19:43:44 +0200 Subject: [PATCH] Fix implicit declaration of function basename in gcc-14.x From Alpine Linux. +https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/iproute2/basename.patch?ref_type=heads + +But also reported Upstream via netdev mailinglist by Gentoo people. Signed-off-by: Waldemar Brodkorb -Upstream: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/iproute2/basename.patch?ref_type=heads +Upstream: https://marc.info/?l=linux-netdev&m=172278781323421&w=2 --- rdma/rdma.c | 3 +++ 1 file changed, 3 insertions(+) From 8f31fea6d038c3390ab480e4c27837b8c720597b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 15 Aug 2024 11:30:30 +0200 Subject: [PATCH 2418/3013] package/nginx: security update to 1.26.2 Changes with nginx 1.26.2 14 Aug 2024 *) Security: processing of a specially crafted mp4 file by the ngx_http_mp4_module might cause a worker process crash (CVE-2024-7347). Thanks to Nils Bars. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/nginx/nginx.hash | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 0b45f96a454..4cf859dadc0 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b nginx-1.26.1.tar.gz +sha256 627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738 nginx-1.26.2.tar.gz # License files, locally calculated sha256 f19c4caea60247490199c5a6d0134281e3fb20b3d7577e6873c628597f5381d9 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index e63acc7b16b..d3b042c59b8 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.26.1 +NGINX_VERSION = 1.26.2 NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From b866afa68405564497dd60c1f8f33cdf71d22728 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Thu, 15 Aug 2024 11:26:14 +0200 Subject: [PATCH 2419/3013] package/qt6/qt6base: fix CVE-2024-39936 Fixes: https://security-tracker.debian.org/tracker/CVE-2024-39936 Got patch from: https://github.com/qt/qtbase/commit/2b1e36e183ce75c224305c7a94457b92f7a5cf58 Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- .../qt6/qt6base/0001-fix-CVE-2024-39936.patch | 247 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 3 + 2 files changed, 250 insertions(+) create mode 100644 package/qt6/qt6base/0001-fix-CVE-2024-39936.patch diff --git a/package/qt6/qt6base/0001-fix-CVE-2024-39936.patch b/package/qt6/qt6base/0001-fix-CVE-2024-39936.patch new file mode 100644 index 00000000000..a6778ce107f --- /dev/null +++ b/package/qt6/qt6base/0001-fix-CVE-2024-39936.patch @@ -0,0 +1,247 @@ +From fc1b8814f38c7d925d4590e9bdb16a02ca824025 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= +Date: Tue, 25 Jun 2024 17:09:35 +0200 +Subject: [PATCH] HTTP2: Delay any communication until encrypted() can be + responded to + +We have the encrypted() signal that lets users do extra checks on the +established connection. It is emitted as BlockingQueued, so the HTTP +thread stalls until it is done emitting. Users can potentially call +abort() on the QNetworkReply at that point, which is passed as a Queued +call back to the HTTP thread. That means that any currently queued +signal emission will be processed before the abort() call is processed. + +In the case of HTTP2 it is a little special since it is multiplexed and +the code is built to start requests as they are available. This means +that, while the code worked fine for HTTP1, since one connection only +has one request, it is not working for HTTP2, since we try to send more +requests in-between the encrypted() signal and the abort() call. + +This patch changes the code to delay any communication until the +encrypted() signal has been emitted and processed, for HTTP2 only. +It's done by adding a few booleans, both to know that we have to return +early and so we can keep track of what events arose and what we need to +resume once enough time has passed that any abort() call must have been +processed. + +Fixes: QTBUG-126610 +Pick-to: 6.5 6.2 5.15 5.12 +Change-Id: Ic25a600c278203256e35f541026f34a8783235ae +Reviewed-by: Marc Mutz +Reviewed-by: Volker Hilsheimer +(cherry picked from commit b1e75376cc3adfc7da5502a277dfe9711f3e0536) +Reviewed-by: Qt Cherry-pick Bot +(cherry picked from commit 0fb43e4395da34d561814242a0186999e4956e28) + +Upstream: https://github.com/qt/qtbase/commit/2b1e36e183ce75c224305c7a94457b92f7a5cf58 +Signed-off-by: Roy Kollen Svendsen +--- + src/network/access/qhttp2protocolhandler.cpp | 6 +-- + .../access/qhttpnetworkconnectionchannel.cpp | 48 ++++++++++++++++++- + .../access/qhttpnetworkconnectionchannel_p.h | 6 +++ + tests/auto/network/access/http2/tst_http2.cpp | 44 +++++++++++++++++ + 4 files changed, 99 insertions(+), 5 deletions(-) + +diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp +index 0abd99b9bc..3631b13dc8 100644 +--- a/src/network/access/qhttp2protocolhandler.cpp ++++ b/src/network/access/qhttp2protocolhandler.cpp +@@ -303,12 +303,12 @@ bool QHttp2ProtocolHandler::sendRequest() + } + } + +- if (!prefaceSent && !sendClientPreface()) +- return false; +- + if (!requests.size()) + return true; + ++ if (!prefaceSent && !sendClientPreface()) ++ return false; ++ + m_channel->state = QHttpNetworkConnectionChannel::WritingState; + // Check what was promised/pushed, maybe we do not have to send a request + // and have a response already? +diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp +index 6766989690..1e4161d1fd 100644 +--- a/src/network/access/qhttpnetworkconnectionchannel.cpp ++++ b/src/network/access/qhttpnetworkconnectionchannel.cpp +@@ -209,6 +209,10 @@ void QHttpNetworkConnectionChannel::abort() + bool QHttpNetworkConnectionChannel::sendRequest() + { + Q_ASSERT(protocolHandler); ++ if (waitingForPotentialAbort) { ++ needInvokeSendRequest = true; ++ return false; // this return value is unused ++ } + return protocolHandler->sendRequest(); + } + +@@ -221,21 +225,28 @@ bool QHttpNetworkConnectionChannel::sendRequest() + void QHttpNetworkConnectionChannel::sendRequestDelayed() + { + QMetaObject::invokeMethod(this, [this] { +- Q_ASSERT(protocolHandler); + if (reply) +- protocolHandler->sendRequest(); ++ sendRequest(); + }, Qt::ConnectionType::QueuedConnection); + } + + void QHttpNetworkConnectionChannel::_q_receiveReply() + { + Q_ASSERT(protocolHandler); ++ if (waitingForPotentialAbort) { ++ needInvokeReceiveReply = true; ++ return; ++ } + protocolHandler->_q_receiveReply(); + } + + void QHttpNetworkConnectionChannel::_q_readyRead() + { + Q_ASSERT(protocolHandler); ++ if (waitingForPotentialAbort) { ++ needInvokeReadyRead = true; ++ return; ++ } + protocolHandler->_q_readyRead(); + } + +@@ -1239,7 +1250,18 @@ void QHttpNetworkConnectionChannel::_q_encrypted() + if (!h2RequestsToSend.isEmpty()) { + // Similar to HTTP/1.1 counterpart below: + const auto &pair = std::as_const(h2RequestsToSend).first(); ++ waitingForPotentialAbort = true; + emit pair.second->encrypted(); ++ ++ // We don't send or handle any received data until any effects from ++ // emitting encrypted() have been processed. This is necessary ++ // because the user may have called abort(). We may also abort the ++ // whole connection if the request has been aborted and there is ++ // no more requests to send. ++ QMetaObject::invokeMethod(this, ++ &QHttpNetworkConnectionChannel::checkAndResumeCommunication, ++ Qt::QueuedConnection); ++ + // In case our peer has sent us its settings (window size, max concurrent streams etc.) + // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection). + } +@@ -1257,6 +1279,28 @@ void QHttpNetworkConnectionChannel::_q_encrypted() + QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection); + } + ++ ++void QHttpNetworkConnectionChannel::checkAndResumeCommunication() ++{ ++ Q_ASSERT(connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2 ++ || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct); ++ ++ // Because HTTP/2 requires that we send a SETTINGS frame as the first thing we do, and respond ++ // to a SETTINGS frame with an ACK, we need to delay any handling until we can ensure that any ++ // effects from emitting encrypted() have been processed. ++ // This function is called after encrypted() was emitted, so check for changes. ++ ++ if (!reply && h2RequestsToSend.isEmpty()) ++ abort(); ++ waitingForPotentialAbort = false; ++ if (needInvokeReadyRead) ++ _q_readyRead(); ++ if (needInvokeReceiveReply) ++ _q_receiveReply(); ++ if (needInvokeSendRequest) ++ sendRequest(); ++} ++ + void QHttpNetworkConnectionChannel::requeueHttp2Requests() + { + const auto h2RequestsToSendCopy = std::exchange(h2RequestsToSend, {}); +diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h +index c42290feca..061f20fd42 100644 +--- a/src/network/access/qhttpnetworkconnectionchannel_p.h ++++ b/src/network/access/qhttpnetworkconnectionchannel_p.h +@@ -74,6 +74,10 @@ public: + QAbstractSocket *socket; + bool ssl; + bool isInitialized; ++ bool waitingForPotentialAbort = false; ++ bool needInvokeReceiveReply = false; ++ bool needInvokeReadyRead = false; ++ bool needInvokeSendRequest = false; + ChannelState state; + QHttpNetworkRequest request; // current request, only used for HTTP + QHttpNetworkReply *reply; // current reply for this request, only used for HTTP +@@ -146,6 +150,8 @@ public: + void closeAndResendCurrentRequest(); + void resendCurrentRequest(); + ++ void checkAndResumeCommunication(); ++ + bool isSocketBusy() const; + bool isSocketWriting() const; + bool isSocketWaiting() const; +diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp +index 00efbc9832..c02e7b7b5b 100644 +--- a/tests/auto/network/access/http2/tst_http2.cpp ++++ b/tests/auto/network/access/http2/tst_http2.cpp +@@ -106,6 +106,8 @@ private slots: + + void duplicateRequestsWithAborts(); + ++ void abortOnEncrypted(); ++ + protected slots: + // Slots to listen to our in-process server: + void serverStarted(quint16 port); +@@ -1479,6 +1481,48 @@ void tst_Http2::duplicateRequestsWithAborts() + QCOMPARE(finishedCount, ExpectedSuccessfulRequests); + } + ++void tst_Http2::abortOnEncrypted() ++{ ++#if !QT_CONFIG(ssl) ++ QSKIP("TLS support is needed for this test"); ++#else ++ clearHTTP2State(); ++ serverPort = 0; ++ ++ ServerPtr targetServer(newServer(defaultServerSettings, H2Type::h2Direct)); ++ ++ QMetaObject::invokeMethod(targetServer.data(), "startServer", Qt::QueuedConnection); ++ runEventLoop(); ++ ++ nRequests = 1; ++ nSentRequests = 0; ++ ++ const auto url = requestUrl(H2Type::h2Direct); ++ QNetworkRequest request(url); ++ request.setAttribute(QNetworkRequest::Http2DirectAttribute, true); ++ ++ std::unique_ptr reply{manager->get(request)}; ++ reply->ignoreSslErrors(); ++ connect(reply.get(), &QNetworkReply::encrypted, reply.get(), [reply = reply.get()](){ ++ reply->abort(); ++ }); ++ connect(reply.get(), &QNetworkReply::errorOccurred, this, &tst_Http2::replyFinishedWithError); ++ ++ runEventLoop(); ++ STOP_ON_FAILURE ++ ++ QCOMPARE(nRequests, 0); ++ QCOMPARE(reply->error(), QNetworkReply::OperationCanceledError); ++ ++ const bool res = QTest::qWaitFor( ++ [this, server = targetServer.get()]() { ++ return serverGotSettingsACK || prefaceOK || nSentRequests > 0; ++ }, ++ 500); ++ QVERIFY(!res); ++#endif // QT_CONFIG(ssl) ++} ++ + void tst_Http2::serverStarted(quint16 port) + { + serverPort = port; +-- +2.46.0 + diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 5ab61ba3e0f..4c0392f92d9 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -10,6 +10,9 @@ QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz QT6BASE_CPE_ID_VENDOR = qt QT6BASE_CPE_ID_PRODUCT = qt +# 0001-fix-CVE-2024-39936.patch +QT6BASE_IGNORE_CVES += CVE-2024-39936 + QT6BASE_CMAKE_BACKEND = ninja QT6BASE_LICENSE = \ From 0904d3a2ee4132b2611a86d14da60285080d1adb Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 15 Aug 2024 16:07:16 +0300 Subject: [PATCH 2420/3013] package/wpebackend-fdo: add patch with missing EGL cast Import a patch that has been accepted upstream and fixes build failures caused by a missing explicit cast to EGLNativeWindowType. Fixes: http://autobuild.buildroot.net/results/92c5cc3134e92c263a0cbb4c05ef8956569e434b/ Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- ...st-to-EGLNativeWindowType-explicitly.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch diff --git a/package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch b/package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch new file mode 100644 index 00000000000..eae0d22e308 --- /dev/null +++ b/package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch @@ -0,0 +1,36 @@ +From e56a2597eb66c2221b004aa3356b06c1b071b5b5 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Wed, 14 Aug 2024 00:51:26 +0300 +Subject: [PATCH] Cast to EGLNativeWindowType explicitly + +In order to avoid off build failures due to mismatching (but +compatible) declarations of wl_egl_window and EGLNativeWindowType, +add an explicit cast to EGLNativeWindowType inside the +TargetWayland::nativeWindow() function. + +Solves the following build issue found by the Buildroot autobuilders: + + http://autobuild.buildroot.net/results/92c5cc3134e92c263a0cbb4c05ef8956569e434b/ + +Signed-off-by: Adrian Perez de Castro +Upstream: https://github.com/Igalia/WPEBackend-fdo/commit/e56a2597eb66c2221b004aa3356b06c1b071b5b5 +--- + src/egl-client-wayland.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/egl-client-wayland.cpp b/src/egl-client-wayland.cpp +index 10e02f0..22bb212 100644 +--- a/src/egl-client-wayland.cpp ++++ b/src/egl-client-wayland.cpp +@@ -63,7 +63,7 @@ TargetWayland::~TargetWayland() + + EGLNativeWindowType TargetWayland::nativeWindow() const + { +- return m_egl.window; ++ return (EGLNativeWindowType) m_egl.window; + } + + void TargetWayland::resize(uint32_t width, uint32_t height) +-- +2.46.0 + From a2675686cdc4f2255084b86dd2195e42bac7af4b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 15 Aug 2024 12:45:45 +0200 Subject: [PATCH 2421/3013] package/ffmpeg: fix microblaze compile issue Since the update of ffmpeg to 6.1.1 in commit fa36a6375dbeae131c596070570cec66c7bd2456 there are a lot of microblaze build failures. The compilation failure is triggered by GCC Bug 68485. We need to disable optimisations, or ffmpeg would add -O3, which would be present after the -O0 we add, overriding it. Fixes: - http://autobuild.buildroot.net/results/524/524cef193aec30471e55eb0eecfa39f0d6011a91 And many more. Signed-off-by: Waldemar Brodkorb [yann.morin.1998@free.fr: explain why --disable-optimizations] Signed-off-by: Yann E. MORIN --- package/ffmpeg/ffmpeg.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 19c270a14b1..a010c0168c1 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -557,6 +557,11 @@ FFMPEG_CONF_OPTS += --disable-optimizations FFMPEG_CFLAGS += -O0 endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +FFMPEG_CONF_OPTS += --disable-optimizations +FFMPEG_CFLAGS += -O0 +endif + ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) FFMPEG_CFLAGS += -marm endif From b8160fb4643fb8ce123638b60692d76143994ed6 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Thu, 15 Aug 2024 14:18:02 +0000 Subject: [PATCH 2422/3013] configs/zynqmp_zcu10*_defconfig: add missing U-Boot build dependency When building these boards with BR2_PER_PACKAGE_DIRECTORIES enabled, the following error occurs from U-Boot. tools/mkeficapsule.c:18:10: fatal error: uuid/uuid.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~ The U-Boot defconfig these boards use 'xilinx_zynqmp_virt' enables CONFIG_MKEFICAPSULE, which requires util-linux. This doesn't fail when BR2_PER_PACKAGE_DIRECTORIES is disabled. This is because host-e2fsprogs requires host-util-linux, and host-util-linux always builds before host-uboot when single-threaded. Signed-off-by: Brandon Maier Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni --- configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu104_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 3f1726a13f1..df5eba7ca08 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index b6d943333fc..793a677ab20 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 970ed40d2c9..fdf5e807950 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y From c025a655c6adba41df0d8cba0009bbfd5a95ac24 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 15 Aug 2024 22:23:54 +0200 Subject: [PATCH 2423/3013] package/python-tpm2-pytss: add missing 'depends on' In commit c72c6f26ed706474f6607f97be2925834c8baa03 ("package/python-tpm2-pytss: new package"), when the package was introduced, a dependency of a package being selected was not properly propagated: BR2_PACKAGE_PYTHON_CRYPTOGRAPHY depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS, so we should replicate this dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_CRYPTOGRAPHY Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_TPM2_PYTSS [=y] && BR2_PACKAGE_PYTHON3 [=y] && !BR2_STATIC_LIBS [=n] Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/python-tpm2-pytss/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-tpm2-pytss/Config.in b/package/python-tpm2-pytss/Config.in index 60d9e8b9d32..dec9a311d4e 100644 --- a/package/python-tpm2-pytss/Config.in +++ b/package/python-tpm2-pytss/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_TPM2_PYTSS bool "python-tpm2-pytss" depends on !BR2_STATIC_LIBS # tpm2-tss + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime @@ -11,4 +12,5 @@ config BR2_PACKAGE_PYTHON_TPM2_PYTSS https://github.com/tpm2-software/tpm2-pytss comment "python-tpm2-pytss needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_STATIC_LIBS From f367ddaf35bfb8bfdbb05846dff085a3af8178a7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 16 Aug 2024 18:55:50 +0200 Subject: [PATCH 2424/3013] package/uclibc: disable time64 for mips64 n32 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...r-n32-ABI-breaks-a-lot-of-tests-disa.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/uclibc/0001-mips64-time64-for-n32-ABI-breaks-a-lot-of-tests-disa.patch diff --git a/package/uclibc/0001-mips64-time64-for-n32-ABI-breaks-a-lot-of-tests-disa.patch b/package/uclibc/0001-mips64-time64-for-n32-ABI-breaks-a-lot-of-tests-disa.patch new file mode 100644 index 00000000000..5a12231b429 --- /dev/null +++ b/package/uclibc/0001-mips64-time64-for-n32-ABI-breaks-a-lot-of-tests-disa.patch @@ -0,0 +1,28 @@ +From dd01754e21da71706af07f3e56eade66fc9164fb Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Fri, 16 Aug 2024 16:59:28 +0200 +Subject: [PATCH] mips64: time64 for n32 ABI breaks a lot of tests, disable it + for now + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=dd01754e21da71706af07f3e56eade66fc9164fb +--- + extra/Configs/Config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in +index 454b6ddb8..86bd20d76 100644 +--- a/extra/Configs/Config.in ++++ b/extra/Configs/Config.in +@@ -1032,7 +1032,7 @@ config UCLIBC_USE_TIME64 + TARGET_i386 || \ + TARGET_m68k || \ + TARGET_microblaze || \ +- (TARGET_mips && !CONFIG_MIPS_N64_ABI) || \ ++ (TARGET_mips && !(CONFIG_MIPS_N64_ABI || CONFIG_MIPS_N32_ABI)) || \ + TARGET_or1k || \ + TARGET_powerpc || \ + TARGET_riscv32 || \ +-- +2.30.2 + From 308d2c992714520844b2dd96a4d79d688afcd28a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 00:02:04 +0200 Subject: [PATCH 2425/3013] package/gnu-efi: disable on ARM and AArch64 big-endian Since the bump of gnu-efi to version 3.0.17 in Buildroot commit fa9893ad8fb94278d7e8b80cd3e795469223faf0, the build of gnu-efi fails on ARM big endian and AArch64 big endian. Indeed, since that bump, gnu-efi builds some "apps", using a special linker file part of gnu-efi that explicitly sets the architecture: OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64") Due to this, big endian builds are now failing: armeb-buildroot-linux-gnueabi-ld: ../gnuefi/crt0-efi-arm.o: compiled for a big endian system and target is little endian armeb-buildroot-linux-gnueabi-ld: failed to merge target specific data of file ../gnuefi/crt0-efi-arm.o Since we are not really interested in supporting gnu-efi on ARM big endian and AArch64 big endian and it is not supported upstream, let's disabled on those architectures. Fixes: http://autobuild.buildroot.org/results/4d385d6759346e19664d0bded1e419f004f82b47/ (ARM big endian) http://autobuild.buildroot.net/results/b6df43408ca4cd469962c96d49d9ac7935b6dbe9/ (AArch64 big endian) Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gnu-efi/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index 4f44cf9f648..012324712cf 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS bool - default y if BR2_ARM_CPU_HAS_ARM + default y if BR2_arm && BR2_ARM_CPU_HAS_ARM default y if BR2_RISCV_64 default y if BR2_aarch64 - default y if BR2_aarch64_be default y if BR2_i386 default y if BR2_x86_64 From c58abf42c04b8cbc40bf80c21fe6516ec73c2977 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 00:02:05 +0200 Subject: [PATCH 2426/3013] package/gnu-efi: only supported on MMU-capable platforms Since commit 1f7c58145497ed01d566e08734a62feef1696807 ("package/gnu-efi: enable on RISC-V 64-bit"), we allow building on RISC-V... and that includes noMMU RISC-V. This unfortunately fails badly with: /home/autobuild/autobuild/instance-2/output-1/host/bin/../riscv64-buildroot-linux-uclibc/bin/ld.real: unrecognized option '-Wl,-elf2flt=-r' /home/autobuild/autobuild/instance-2/output-1/host/bin/../riscv64-buildroot-linux-uclibc/bin/ld.real: use the --help option for usage information Since we're anyway not interested in gnu-efi on noMMU platforms, let's not even spend time on trying to fix this and make MMU support a requirement for gnu-efi. Fixes: http://autobuild.buildroot.net/results/8b4a503939bdbe773ceee69e01a3ea16873a75fa/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gnu-efi/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index 012324712cf..2c4b78b7947 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_i386 default y if BR2_x86_64 + depends on BR2_USE_MMU config BR2_PACKAGE_GNU_EFI bool "gnu-efi" From b62f2f7f12a381c2e8d4aeb9562b6dfc87728589 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 00:02:06 +0200 Subject: [PATCH 2427/3013] package/gnu-efi: mark as not supported on ARM soft-float lib/print.c in gnu-efi contains some floating point computation. On ARM soft-float configurations, these floating point operations generate calls to __eabi_*() functions that are provided by gcc. However, gnu-efi builds some freestanding code, so it doesn't link with libgcc, and therefore the build fails with: arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1431:(.text+0x78c): undefined reference to `__aeabi_i2d' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1431:(.text+0x7a0): undefined reference to `__aeabi_dsub' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1431:(.text+0x7a4): undefined reference to `__aeabi_d2f' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1432:(.text+0x7b4): undefined reference to `__aeabi_fcmplt' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1438:(.text+0x7c8): undefined reference to `__aeabi_fmul' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1440:(.text+0x7d4): undefined reference to `__aeabi_fcmpeq' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1444:(.text+0x7f8): undefined reference to `__aeabi_fmul' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1440:(.text+0x808): undefined reference to `__aeabi_fcmpeq' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1440:(.text+0x818): undefined reference to `__aeabi_f2iz' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1451:(.text+0x834): undefined reference to `__aeabi_i2f' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1451:(.text+0x840): undefined reference to `__aeabi_fcmpeq' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1453:(.text+0x858): undefined reference to `__aeabi_fmul' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1451:(.text+0x860): undefined reference to `__aeabi_f2iz' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1451:(.text+0x868): undefined reference to `__aeabi_i2f' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1451:(.text+0x870): undefined reference to `__aeabi_fcmpeq' arm-buildroot-linux-gnueabi-ld: /output-1/build/gnu-efi-3.0.18//lib/print.c:1451:(.text+0x89c): undefined reference to `__aeabi_f2iz' Since we don't care about gnu-efi support on ARM soft-float configurations, let's disable such configurations. Note that we have chosen to use BR2_ARM_SOFT_FLOAT as we're for now making this specific to ARM as we're not sure what is the situation on other CPU architectures (for example RISC-V without FPU maybe). This can be revisited once we get more data on the behavior on other CPU architectures that can support soft-float. Fixes: http://autobuild.buildroot.net/results/98d955fd2fcf4a3db1ab46e4f553447031a23b92/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gnu-efi/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index 2c4b78b7947..35446876f6c 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS bool - default y if BR2_arm && BR2_ARM_CPU_HAS_ARM + default y if BR2_arm && BR2_ARM_CPU_HAS_ARM && !BR2_ARM_SOFT_FLOAT default y if BR2_RISCV_64 default y if BR2_aarch64 default y if BR2_i386 From 4e78b2c8b1109d8a456e426ccf03a02df5f2ee2c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 17 Aug 2024 21:37:32 +0200 Subject: [PATCH 2428/3013] package/python-huepy: add patch to fix LICENSE file installation The python-huepy has an incorrect data_files statement in its setup.py, causing the LICENSE file to be installed directly as $(TARGET_DIR)/LICENSE. This was detected because several packages were doing this, and the second package doing it (python-unittest-xml-reporting, fixed separately) was erroring out when trying to overwrite this already existing file. This commit fixes the case of python-huepy by adding a patch that has been submitted upstream. There are no autobuilder failures related to python-huepy, but this was detected while fixing http://autobuild.buildroot.net/results/2c91243b440087bbc7d051d65f553f59d05dd207/ for python-unittest-xml-reporting. This bug has been in huepy since at least 2018, so this patch can be backported to previous Buildroot versions. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- ...ta_files-installs-LICENSE-to-incorre.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch diff --git a/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch b/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch new file mode 100644 index 00000000000..3c50a44377a --- /dev/null +++ b/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch @@ -0,0 +1,38 @@ +From ee3010004a005bc852e6b9318807f373bd89e901 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 17 Aug 2024 14:10:16 +0200 +Subject: [PATCH] setup.py: drop data_files, installs LICENSE to incorrect + place + +The data_files statement in the setup() calls installs the LICENSE +file in the wrong place: in /usr/LICENSE, or even /LICENSE depending +on the configuration. + +So let's drop this, and let setuptools install the LICENSE file +automatically: since setuptools v56, the license_files attribute is +automatically assigned to a default value, which includes "LICENSE", +so there is in fact nothing to do to the get the LICENSE file +installed at the correct location. See +https://setuptools.pypa.io/en/latest/history.html#v56-0-0. + +Upstream: https://github.com/s0md3v/huepy/pull/42 +Signed-off-by: Thomas Petazzoni +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 8b5a726..bd41f1c 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,6 @@ setup( + keywords='hue, color, terminal color, colorama', + packages=find_packages(), + py_modules=['huepy'], +- data_files=[('', ['LICENSE'])], + include_package_data=True, + classifiers=[ + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', +-- +2.46.0 + From 62fd55d2722264099868e106ab5146fe65f15825 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 17 Aug 2024 14:30:38 +0200 Subject: [PATCH 2429/3013] package/libffi: fix build on ARC This commit brings two patches that have been submitted to upstream libffi by Synopsys people, to fix libffi build issues on ARC. This build issue was introduced by upstream commit c4df19c99f8d8841942e3edaadbf331d30e298c8, which landed in libffi 3.4.5, so the issue exists in Buildroot since we bumped from libffi 3.4.4 to 3.4.6 in commit f382de2b0f8a528a09bb975cc088a4342b663134, which landed in Buildroot 2024.05. This issue therefore doesn't exist in the 2024.02.x LTS branch. Fixes: http://autobuild.buildroot.net/results/3accebc6775b9a479876a5898d55bde005d4b12b/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/libffi/0002-arc-Fix-warnings.patch | 56 +++++++++++++++++++ ...ot-use-mov_s-and-movl_s-instructions.patch | 45 +++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 package/libffi/0002-arc-Fix-warnings.patch create mode 100644 package/libffi/0003-arc-Do-not-use-mov_s-and-movl_s-instructions.patch diff --git a/package/libffi/0002-arc-Fix-warnings.patch b/package/libffi/0002-arc-Fix-warnings.patch new file mode 100644 index 00000000000..45a2c9dbd74 --- /dev/null +++ b/package/libffi/0002-arc-Fix-warnings.patch @@ -0,0 +1,56 @@ +From 4f25e5be1a8a429b6925527c1cb94b6acd05642b Mon Sep 17 00:00:00 2001 +From: Yuriy Kolerov +Date: Wed, 17 Jul 2024 18:56:52 +0300 +Subject: [PATCH] arc: Fix warnings + +These warnings are fixed: + +1. A series of "unused variables". +2. Implicit conversion from a pointer to uint32_t. + +Signed-off-by: Yuriy Kolerov +Upstream: https://github.com/libffi/libffi/pull/844 +Signed-off-by: Thomas Petazzoni +--- + src/arc/ffi.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/arc/ffi.c b/src/arc/ffi.c +index d729274..0632319 100644 +--- a/src/arc/ffi.c ++++ b/src/arc/ffi.c +@@ -192,9 +192,10 @@ static void unmarshal_atom(call_builder *cb, int type, void *data) { + /* for arguments passed by reference returns the pointer, otherwise the arg is copied (up to MAXCOPYARG bytes) */ + static void *unmarshal(call_builder *cb, ffi_type *type, int var, void *data) { + size_t realign[2]; +- void *pointer; + + #if defined(__ARC64_ARCH64__) ++ void *pointer; ++ + if (type->size > 2 * __SIZEOF_POINTER__) { + /* pass by reference */ + unmarshal_atom(cb, FFI_TYPE_POINTER, (char*)&pointer); +@@ -348,7 +349,10 @@ ffi_prep_closure_loc (ffi_closure * closure, ffi_cif * cif, + void *user_data, void *codeloc) + { + uint32_t *tramp = (uint32_t *) & (closure->tramp[0]); ++ ++#if defined(__ARC64_ARCH64__) + size_t address_ffi_closure = (size_t) ffi_closure_asm; ++#endif + + switch (cif->abi) + { +@@ -367,7 +371,7 @@ ffi_prep_closure_loc (ffi_closure * closure, ffi_cif * cif, + FFI_ASSERT (tramp == codeloc); + tramp[0] = CODE_ENDIAN (0x200a1fc0); /* mov r8, pcl */ + tramp[1] = CODE_ENDIAN (0x20200f80); /* j [long imm] */ +- tramp[2] = CODE_ENDIAN (ffi_closure_asm); ++ tramp[2] = CODE_ENDIAN ((uint32_t) ffi_closure_asm); + break; + #endif + +-- +2.46.0 + diff --git a/package/libffi/0003-arc-Do-not-use-mov_s-and-movl_s-instructions.patch b/package/libffi/0003-arc-Do-not-use-mov_s-and-movl_s-instructions.patch new file mode 100644 index 00000000000..3577ddf19d5 --- /dev/null +++ b/package/libffi/0003-arc-Do-not-use-mov_s-and-movl_s-instructions.patch @@ -0,0 +1,45 @@ +From 97c273519e41a7ef2841cb7531c6eda01fc69dc2 Mon Sep 17 00:00:00 2001 +From: Yuriy Kolerov +Date: Wed, 17 Jul 2024 19:19:30 +0300 +Subject: [PATCH] arc: Do not use mov_s and movl_s instructions + +mov_s and movl_s instructions use a restricted set of registers. +However, a list of available registers for such instructions for +one ARC target may not match a list for another ARC targets. For +example, it is applicable to ARC700 and ARC HS3x/4x - build +fails because mov_s formats may be incompatible in some cases. + +The easiest and the most straightforward way to fix this issue +is to use mov and movl instead of mov_s and movl_s. + +Signed-off-by: Yuriy Kolerov +Upstream: https://github.com/libffi/libffi/pull/844 +Signed-off-by: Thomas Petazzoni +--- + src/arc/arcompact.S | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/arc/arcompact.S b/src/arc/arcompact.S +index 1d7f1a1..e749341 100644 +--- a/src/arc/arcompact.S ++++ b/src/arc/arcompact.S +@@ -39,14 +39,14 @@ + #define LARG ldl + #define SARG stl + #define ADDPTR addl +-#define MOVPTR movl_s ++#define MOVPTR movl + #else + #define PTRS 4 + #define FLTS 4 + #define LARG ld + #define SARG st + #define ADDPTR add +-#define MOVPTR mov_s ++#define MOVPTR mov + #endif + + #define FRAME_LEN (8 * PTRS + 16) +-- +2.46.0 + From 463f4c6cb86a3ab7ef5ada2d0eb27367d135277d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 17 Aug 2024 14:30:39 +0200 Subject: [PATCH 2430/3013] package/libffi: fix build on OpenRISC The build of libffi on OpenRISC is broken with GCC 14.x. This commit brings two patches, submitted upstream, that address those two build issues. Both issues always existed in the OpenRISC libffi code base. Fixes: http://autobuild.buildroot.net/results/fb95d9a0f8322a58cd266014f3dea4eaa1b483e5/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- ...ffi.c-fix-prototype-of-ffi_call_SYSV.patch | 47 +++++++++++++++++ ...-ffi.c-fix-incompatible-pointer-type.patch | 50 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 package/libffi/0004-src-or1k-ffi.c-fix-prototype-of-ffi_call_SYSV.patch create mode 100644 package/libffi/0005-src-or1k-ffi.c-fix-incompatible-pointer-type.patch diff --git a/package/libffi/0004-src-or1k-ffi.c-fix-prototype-of-ffi_call_SYSV.patch b/package/libffi/0004-src-or1k-ffi.c-fix-prototype-of-ffi_call_SYSV.patch new file mode 100644 index 00000000000..f3a7b29e3b9 --- /dev/null +++ b/package/libffi/0004-src-or1k-ffi.c-fix-prototype-of-ffi_call_SYSV.patch @@ -0,0 +1,47 @@ +From 4506e943289ed1363f3921bc201d5da76f750229 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 17 Aug 2024 12:56:22 +0200 +Subject: [PATCH] src/or1k/ffi.c: fix prototype of ffi_call_SYSV() + +The current code base of libffi on OpenRISC (or1k) fails to build with +GCC 14.x with the following error: + +../src/or1k/ffi.c: In function 'ffi_call': +../src/or1k/ffi.c:167:34: error: passing argument 3 of 'ffi_call_SYSV' from incompatible pointer type [-Wincompatible-pointer-types] + 167 | ffi_call_SYSV(size, &ecif, ffi_prep_args, rvalue, fn, cif->flags); + | ^~~~~~~~~~~~~ + | | + | void * (*)(char *, extended_cif *) +../src/or1k/ffi.c:113:27: note: expected 'void * (*)(int *, extended_cif *)' but argument is of type 'void * (*)(char *, extended_cif *)' + 113 | void *(*)(int *, extended_cif *), + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This is due to the fact that ffi_prep_args() is in fact defined as: + + void* ffi_prep_args(char *stack, extended_cif *ecif) + +so, let's fix the prototype of the function pointer, which anyway gets +passed to assembly code, so the typing gets lost. + +Upstream: https://github.com/libffi/libffi/pull/854 +Signed-off-by: Thomas Petazzoni +--- + src/or1k/ffi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/or1k/ffi.c b/src/or1k/ffi.c +index 9451d4e..157388e 100644 +--- a/src/or1k/ffi.c ++++ b/src/or1k/ffi.c +@@ -110,7 +110,7 @@ void* ffi_prep_args(char *stack, extended_cif *ecif) + + extern void ffi_call_SYSV(unsigned, + extended_cif *, +- void *(*)(int *, extended_cif *), ++ void *(*)(char *, extended_cif *), + unsigned *, + void (*fn)(void), + unsigned); +-- +2.46.0 + diff --git a/package/libffi/0005-src-or1k-ffi.c-fix-incompatible-pointer-type.patch b/package/libffi/0005-src-or1k-ffi.c-fix-incompatible-pointer-type.patch new file mode 100644 index 00000000000..e1ff003500d --- /dev/null +++ b/package/libffi/0005-src-or1k-ffi.c-fix-incompatible-pointer-type.patch @@ -0,0 +1,50 @@ +From ec39b03d891a77552ad7729ff79bf21bf3591842 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 17 Aug 2024 13:52:45 +0200 +Subject: [PATCH] src/or1k/ffi.c: fix incompatible pointer type + +The current code base of libffi on OpenRISC (or1k) fails to build with +GCC 14.x with the following error: + +../src/or1k/ffi.c: In function 'ffi_closure_SYSV': +../src/or1k/ffi.c:183:22: error: initialization of 'char *' from incompatible pointer type 'int *' [-Wincompatible-pointer-types] + 183 | char *stack_args = sp; + | ^~ + +Indeed: + + register int *sp __asm__ ("r17"); + [..] + char *stack_args = sp; + +Adopt the same logic used for: + + char *ptr = (char *) register_args; + +which consists in casting to the desired pointer type. Indeed, later +in the code stack_args is assigned to ptr (so they need to be the same +pointer type), and some arithmetic is done on ptr, so changing its +pointer type would change the behavior. + +Upstream: https://github.com/libffi/libffi/pull/854 +Signed-off-by: Thomas Petazzoni +--- + src/or1k/ffi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/or1k/ffi.c b/src/or1k/ffi.c +index 157388e..7a6d28c 100644 +--- a/src/or1k/ffi.c ++++ b/src/or1k/ffi.c +@@ -180,7 +180,7 @@ void ffi_closure_SYSV(unsigned long r3, unsigned long r4, unsigned long r5, + register int *r13 __asm__ ("r13"); + + ffi_closure* closure = (ffi_closure*) r13; +- char *stack_args = sp; ++ char *stack_args = (char*) sp; + + /* Lay the register arguments down in a continuous chunk of memory. */ + unsigned register_args[6] = +-- +2.46.0 + From 182d3556a6838c01b0d1f4e6a36da84260605298 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 17 Aug 2024 12:33:44 +0200 Subject: [PATCH 2431/3013] package/python-unittest-xml-reporting: add patch to fix LICENSE file installation The LICENSE file gets installed directly to the root of $(TARGET_DIR), which clashes with other packages: FileExistsError: File already exists: /home/autobuild/autobuild/instance-3/output-1/target/LICENSE This commit fixes this issue for the python-unittest-xml-reporting package. Other fixes will be needed for the other patches. The issue in python-unittest-xml-reporting was introduced in upstream commit c43427611390fba83ca13fbb5311bd8fece5048f, which first appeared in v3.1.0. We switched from a pre-3.1.0 version to 3.2.0 in Buildroot in commit 69ba1562d5bef8d58b430fd7d67d0f3e77acfefc, which was merged in 2023.02. Fixes: http://autobuild.buildroot.net/results/2c91243b440087bbc7d051d65f553f59d05dd207/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- ...ta_files-installs-LICENSE-to-incorre.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/python-unittest-xml-reporting/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch diff --git a/package/python-unittest-xml-reporting/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch b/package/python-unittest-xml-reporting/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch new file mode 100644 index 00000000000..4bc005f4489 --- /dev/null +++ b/package/python-unittest-xml-reporting/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch @@ -0,0 +1,40 @@ +From 662cd67695c31126d72035a818b0f5f1da5a31ca Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 17 Aug 2024 12:24:28 +0200 +Subject: [PATCH] setup.py: drop data_files, installs LICENSE to incorrect + place + +As reported in issue +https://github.com/xmlrunner/unittest-xml-reporting/issues/284, the +data_files statement in the setup() calls installs the LICENSE file in +the wrong place: in /usr/LICENSE, or even /LICENSE depending on the +configuration. + +So let's drop this, and let setuptools install the LICENSE file +automatically: since setuptools v56, the license_files attribute is +automatically assigned to a default value, which includes "LICENSE", +so there is in fact nothing to do to the get the LICENSE file +installed at the correct location. See +https://setuptools.pypa.io/en/latest/history.html#v56-0-0. + +Upstream: https://github.com/xmlrunner/unittest-xml-reporting/pull/287 +Signed-off-by: Thomas Petazzoni +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index c524ed4..afa5925 100755 +--- a/setup.py ++++ b/setup.py +@@ -27,7 +27,6 @@ setup( + description = 'unittest-based test runner with Ant/JUnit like XML reporting.', + long_description = long_description, + long_description_content_type = 'text/markdown', +- data_files = [('', ['LICENSE'])], + install_requires = ['lxml'], + license = 'BSD', + platforms = ['Any'], +-- +2.46.0 + From b19f8001c81753e2bf951c1076e7137fb23e099f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 17 Aug 2024 15:18:52 +0200 Subject: [PATCH 2432/3013] package/avahi: fix python install issue Since the update of Python to 3.12.4 in commit 76cd14167f5eb3ffe22e131ddbbecf9bc61f2ef1 avahi fails to install python subcomponents. The reason is that the obsolete imp python modul is used. Add a patch to remove the imp dependency. Fixes: - http://autobuild.buildroot.net/results/2bf/2bf391b93362204917a560705bc402585334ab3c Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- .../0002-remove-imp-from-py-compile.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/avahi/0002-remove-imp-from-py-compile.patch diff --git a/package/avahi/0002-remove-imp-from-py-compile.patch b/package/avahi/0002-remove-imp-from-py-compile.patch new file mode 100644 index 00000000000..37534a3f7ad --- /dev/null +++ b/package/avahi/0002-remove-imp-from-py-compile.patch @@ -0,0 +1,50 @@ +Remove optional imp python module dependency. + +Upstream already removed py-compile entirely in their git repository, +so the patch is not appropiate for upstream. + +Signed-off-by: Waldemar Brodkorb +Upstream: not appropiate + +diff -Nur avahi-0.8.orig/py-compile avahi-0.8/py-compile +--- avahi-0.8.orig/py-compile 2020-02-18 07:58:21.192417644 +0100 ++++ avahi-0.8/py-compile 2024-08-17 15:03:07.328733849 +0200 +@@ -116,7 +116,7 @@ + fi + + $PYTHON -c " +-import sys, os, py_compile, imp ++import sys, os, py_compile + + files = '''$files''' + +@@ -129,15 +129,12 @@ + continue + sys.stdout.write(file) + sys.stdout.flush() +- if hasattr(imp, 'get_tag'): +- py_compile.compile(filepath, imp.cache_from_source(filepath), path) +- else: +- py_compile.compile(filepath, filepath + 'c', path) ++ py_compile.compile(filepath, filepath + 'c', path) + sys.stdout.write('\n')" || exit $? + + # this will fail for python < 1.5, but that doesn't matter ... + $PYTHON -O -c " +-import sys, os, py_compile, imp ++import sys, os, py_compile + + # pypy does not use .pyo optimization + if hasattr(sys, 'pypy_translation_info'): +@@ -153,10 +150,7 @@ + continue + sys.stdout.write(file) + sys.stdout.flush() +- if hasattr(imp, 'get_tag'): +- py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) +- else: +- py_compile.compile(filepath, filepath + 'o', path) ++ py_compile.compile(filepath, filepath + 'o', path) + sys.stdout.write('\n')" 2>/dev/null || : + + # Local Variables: From 9e3388256811c943d8312db289959b74cae9536e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 11:03:39 +0200 Subject: [PATCH 2433/3013] utils/genrandconfig: remove fixups related to untested CT-NG toolchains We have accumulated a whole bunch of very old fixups to avoid issues with super old CT-NG toolchains, which we are not testing anymore, so remove those fixups. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 69 --------------------------------------------- 1 file changed, 69 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 216e733799e..cefc3dca12f 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -181,43 +181,8 @@ async def fixup_config(sysinfo, configfile): ROOTFS_SIZE = '5G' - BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): return False - # The ctng toolchain is affected by PR58854 - if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'armv5-ctng-linux-gnueabi.tar.xz"\n' in configlines: - return False - # The ctng toolchain tigger an assembler error with guile package when compiled with -Os (same issue as for CS ARM 2014.05-29) - if 'BR2_PACKAGE_GUILE=y\n' in configlines and \ - 'BR2_OPTIMIZE_S=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'armv5-ctng-linux-gnueabi.tar.xz"\n' in configlines: - return False - # The ctng toolchain is affected by PR58854 - if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'armv6-ctng-linux-uclibcgnueabi.tar.xz"\n' in configlines: - return False - # The ctng toolchain is affected by PR58854 - if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'armv7-ctng-linux-gnueabihf.tar.xz"\n' in configlines: - return False - # The ctng toolchain is affected by PR60155 - if 'BR2_PACKAGE_SDL=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'powerpc-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # The ctng toolchain is affected by PR60155 - if 'BR2_PACKAGE_LIBMPEG2=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'powerpc-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # This MIPS toolchain uses eglibc-2.18 which lacks SYS_getdents64 - if 'BR2_PACKAGE_STRONGSWAN=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: - return False - # This MIPS toolchain uses eglibc-2.18 which lacks SYS_getdents64 - if 'BR2_PACKAGE_PYTHON3=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: - return False # libffi not available on ARMv7-M, but propagating libffi arch # dependencies in Buildroot is really too much work, so we handle # this here. @@ -232,40 +197,6 @@ async def fixup_config(sysinfo, configfile): if 'BR2_PACKAGE_SUNXI_BOARDS=y\n' in configlines: configlines.remove('BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE=""\n') configlines.append('BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a10/hackberry.fex"\n') - # This MIPS uClibc toolchain fails to build the gdb package - if 'BR2_PACKAGE_GDB=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # This MIPS uClibc toolchain fails to build the rt-tests package - if 'BR2_PACKAGE_RT_TESTS=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # This MIPS uClibc toolchain fails to build the civetweb package - if 'BR2_PACKAGE_CIVETWEB=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # This MIPS ctng toolchain fails to build the python3 package - if 'BR2_PACKAGE_PYTHON3=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: - return False - # This MIPS uClibc toolchain fails to build the strace package - if 'BR2_PACKAGE_STRACE=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # This MIPS uClibc toolchain fails to build the cdrkit package - if 'BR2_PACKAGE_CDRKIT=y\n' in configlines and \ - 'BR2_STATIC_LIBS=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # uClibc vfork static linking issue - if 'BR2_PACKAGE_ALSA_LIB=y\n' in configlines and \ - 'BR2_STATIC_LIBS=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'i486-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False - # This MIPS uClibc toolchain fails to build the weston package - if 'BR2_PACKAGE_WESTON=y\n' in configlines and \ - BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: - return False # No C library for internal toolchain if 'BR2_TOOLCHAIN_BUILDROOT_NONE=y\n' in configlines: return False From 2f260084d5771728f3340ff6a86a23391133a635 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 11:03:40 +0200 Subject: [PATCH 2434/3013] utils/genrandconfig: remove support for toolchain CSV Now that the support for generating a fully random configuration has been well-tested, the whole mechanism based on a toolchain CSV isn't really useful anymore, so let's drop it to simplify the logic. Note that the autobuilder code still uses --{,no-}toolchains-csv, so we can't remove those or the autobuilders would fail. Once all supported branches no longer use those argumetns, we can drop them from the autobuilder code, then ask people to update their runners, and we will finally be able to drop those arguments. Eventually. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: keep --{,no-}toolchains-csv and explain why] Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 101 ++------------------------------------------ 1 file changed, 4 insertions(+), 97 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index cefc3dca12f..668cf012cf1 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -20,7 +20,6 @@ from binascii import hexlify import asyncio -import csv import os from random import randint import sys @@ -100,73 +99,6 @@ class SystemInfo: return not missing_requirements -def get_toolchain_configs(toolchains_csv, buildrootdir): - """Fetch and return the possible toolchain configurations - - This function returns an array of toolchain configurations. Each - toolchain configuration is itself an array of lines of the defconfig. - """ - - with open(toolchains_csv) as r: - # filter empty lines and comments - lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] - toolchains = lines - configs = [] - - (_, _, _, _, hostarch) = os.uname() - # ~2015 distros report x86 when on a 32bit install - if hostarch == 'i686' or hostarch == 'i386' or hostarch == 'x86': - hostarch = 'x86' - - for row in csv.reader(toolchains): - config = {} - configfile = row[0] - config_hostarch = row[1] - keep = False - - # Keep all toolchain configs that work regardless of the host - # architecture - if config_hostarch == "any": - keep = True - - # Keep all toolchain configs that can work on the current host - # architecture - if hostarch == config_hostarch: - keep = True - - # Assume that x86 32 bits toolchains work on x86_64 build - # machines - if hostarch == 'x86_64' and config_hostarch == "x86": - keep = True - - if not keep: - continue - - if not os.path.isabs(configfile): - configfile = os.path.join(buildrootdir, configfile) - - with open(configfile) as r: - config = r.readlines() - configs.append(config) - return configs - - -async def is_toolchain_usable(configfile, config): - """Check if the toolchain is actually usable.""" - - with open(configfile) as configf: - configlines = configf.readlines() - - # Check that the toolchain configuration is still present - for toolchainline in config: - if toolchainline not in configlines: - print("WARN: toolchain can't be used", file=sys.stderr) - print(" Missing: %s" % toolchainline.strip(), file=sys.stderr) - return False - - return True - - async def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations @@ -581,24 +513,11 @@ async def fixup_config(sysinfo, configfile): async def gen_config(args): """Generate a new random configuration - - This function generates the configuration, by choosing a random - toolchain configuration and then generating a random selection of - packages. """ sysinfo = SystemInfo() - if args.toolchains_csv: - # Select a random toolchain configuration - configs = get_toolchain_configs(args.toolchains_csv, args.buildrootdir) - - i = randint(0, len(configs) - 1) - toolchainconfig = configs[i] - else: - toolchainconfig = [] - - configlines = list(toolchainconfig) + configlines = list() # Combine with the minimal configuration minimalconfigfile = os.path.join(args.buildrootdir, @@ -658,9 +577,6 @@ async def gen_config(args): if ret: return ret - if not await is_toolchain_usable(configfile, toolchainconfig): - return 2 - # Now, generate the random selection of packages, and fixup # things if needed. # Safe-guard, in case we can not quickly come to a valid @@ -676,7 +592,7 @@ async def gen_config(args): "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randpackageconfig" if args.toolchains_csv else "randconfig") + "randconfig") ret = await proc.wait() if ret: return ret @@ -710,17 +626,8 @@ if __name__ == '__main__': parser.add_argument("--buildrootdir", "-b", help="Buildroot directory (relative to current directory)", type=str, default='.') - - toolchains_csv = parser.add_mutually_exclusive_group(required=False) - toolchains_csv.add_argument("--toolchains-csv", - dest="toolchains_csv", - help="Path of the toolchain configuration file", - type=str) - toolchains_csv.add_argument("--no-toolchains-csv", - dest="toolchains_csv", - help="Generate random toolchain configuration", - action='store_false') - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") + parser.add_argument("--toolchains-csv", help="Legacy, unused", type=str) + parser.add_argument("--no-toolchains-csv", help="Legacy, unused") args = parser.parse_args() From 3d33d394c2c9659f8c487929bf45f7daf673e521 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 11:03:41 +0200 Subject: [PATCH 2435/3013] utils/genrandconfig: rework fine-tuning logic Before calling randpackageconfig/randconfig, we were pre-generating a snippet of .config with: (1) minimal.config (2) BR2_CURL/BR2_WGET settings (3) some random selection of init system, debug, runtime debug, etc (4) enabling BR2_REPRODUCIBLE=y when diffoscope was found Now that we only use randconfig, this whole fine-tuning is completely irrelevant, as it gets overridden by "make randconfig". (1) and (3) above are useless, as randconfig does all the randomization that is needed. However, we want to preserve (2) and (4) above, so we re-implement those fixups, but *after* randconfig has done its job. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 71 ++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 53 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 668cf012cf1..c83999a7cfa 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -517,65 +517,15 @@ async def gen_config(args): sysinfo = SystemInfo() - configlines = list() - - # Combine with the minimal configuration - minimalconfigfile = os.path.join(args.buildrootdir, - 'support/config-fragments/minimal.config') - with open(minimalconfigfile) as minimalf: - configlines += minimalf.readlines() - - # Allow hosts with old certificates to download over https - configlines.append("BR2_WGET=\"wget -nd -t 3 --no-check-certificate\"\n") - configlines.append("BR2_CURL=\"curl --ftp-pasv --retry 3 --insecure\"\n") - - # Per-package folder - if randint(0, 15) == 0: - configlines.append("BR2_PER_PACKAGE_DIRECTORIES=y\n") - - # Amend the configuration with a few things. - if randint(0, 20) == 0: - configlines.append("BR2_ENABLE_DEBUG=y\n") - if randint(0, 20) == 0: - configlines.append("BR2_ENABLE_RUNTIME_DEBUG=y\n") - if randint(0, 1) == 0: - configlines.append("BR2_INIT_BUSYBOX=y\n") - elif randint(0, 15) == 0: - configlines.append("BR2_INIT_SYSTEMD=y\n") - elif randint(0, 10) == 0: - configlines.append("BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y\n") - if randint(0, 20) == 0: - configlines.append("BR2_STATIC_LIBS=y\n") - if randint(0, 20) == 0: - configlines.append("BR2_PACKAGE_PYTHON3_PY_ONLY=y\n") - if randint(0, 5) == 0: - configlines.append("BR2_OPTIMIZE_2=y\n") - if randint(0, 4) == 0: - configlines.append("BR2_SYSTEM_ENABLE_NLS=y\n") - if randint(0, 4) == 0: - configlines.append("BR2_FORTIFY_SOURCE_2=y\n") - - # Randomly enable BR2_REPRODUCIBLE 10% of times - # also enable tar filesystem images for testing - if await sysinfo.has("diffoscope") and randint(0, 10) == 0: - configlines.append("BR2_REPRODUCIBLE=y\n") - configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") - - # Write out the configuration file + # Create output directory if not os.path.exists(args.outputdir): os.makedirs(args.outputdir) + + # Calculate path to config file if args.outputdir == os.path.abspath(os.path.join(args.buildrootdir, "output")): configfile = os.path.join(args.buildrootdir, ".config") else: configfile = os.path.join(args.outputdir, ".config") - with open(configfile, "w+") as configf: - configf.writelines(configlines) - - proc = await asyncio.create_subprocess_exec( - "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = await proc.wait() - if ret: - return ret # Now, generate the random selection of packages, and fixup # things if needed. @@ -600,6 +550,21 @@ async def gen_config(args): if await fixup_config(sysinfo, configfile): break + configlines = list() + + # Allow hosts with old certificates to download over https + configlines.append("BR2_WGET=\"wget -nd -t 3 --no-check-certificate\"\n") + configlines.append("BR2_CURL=\"curl --ftp-pasv --retry 3 --insecure\"\n") + + # Randomly enable BR2_REPRODUCIBLE 10% of times + # also enable tar filesystem images for testing + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: + configlines.append("BR2_REPRODUCIBLE=y\n") + configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") + + with open(configfile, "a") as configf: + configf.writelines(configlines) + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") ret = await proc.wait() From da5c25c9f91b17a3c00ff0b35164881f2d1aa425 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 11:03:42 +0200 Subject: [PATCH 2436/3013] utils/genrandconfig: do not use BR2_BACKUP_SITE for some builds In order to test that upstream sites are still working, we need to NOT fallback to sources.buildroot.net for some builds. As there is anyway a local cache in the autobuilder instances, we need to do quite a lot of builds without any BR2_BACKUP_SITE configured to have a chance to catch issues, which is why a 50% chance is used to unset BR2_BACKUP_SITE. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index c83999a7cfa..3e178193253 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -562,6 +562,11 @@ async def gen_config(args): configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") + # From time to time, ignore sources.buildroot.net to really fetch + # from upstream + if randint(0, 1) == 0: + configlines.append("""BR2_BACKUP_SITE=""\n""") + with open(configfile, "a") as configf: configf.writelines(configlines) From ce3dedc26b9080399c44d86e14aa1704f7bf563a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 11:03:43 +0200 Subject: [PATCH 2437/3013] utils/genrandconfig: improve logging Right now, genrandconfig just spits out the random messages from the different make invocations, which isn't terribly useful. Instead, let's redirect the output of make invocations to oblivion, and add some more high level logging. As part of this logging, we're interested to see how many iterations were needed to find a valid configuration, so changed the loop logic to count from 0 to 100 instead of from 100 to 0 so that we can easily show the iteration number. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 3e178193253..8e60fd3f9ea 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -531,23 +531,27 @@ async def gen_config(args): # things if needed. # Safe-guard, in case we can not quickly come to a valid # configuration: allow at most 100 (arbitrary) iterations. - bounded_loop = 100 + loop = 0 while True: - if bounded_loop == 0: + if loop == 100: print("ERROR: cannot generate random configuration after 100 iterations", file=sys.stderr) return 1 - bounded_loop -= 1 + print("Generating configuration, loop %d" % loop) + loop += 1 proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randconfig") + "randconfig", + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL) ret = await proc.wait() if ret: return ret if await fixup_config(sysinfo, configfile): + print(" configuration valid") break configlines = list() @@ -570,20 +574,30 @@ async def gen_config(args): with open(configfile, "a") as configf: configf.writelines(configlines) + print(" olddefconfig") proc = await asyncio.create_subprocess_exec( - "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig", + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL) ret = await proc.wait() if ret: return ret + print(" savedefconfig") proc = await asyncio.create_subprocess_exec( - "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig", + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL) + ret = await proc.wait() if ret: return ret + print(" dependencies") proc = await asyncio.create_subprocess_exec( - "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies", + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL) return await proc.wait() From a7fe8c88d1d01ed59cdd477b87e26213d1ed9c21 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 19 Aug 2024 02:43:52 -0600 Subject: [PATCH 2438/3013] package/flashrom: fix cli with BR2_SHARED_LIBS Flashrom requires --default-library=both for the cli when building with BR2_SHARED_LIBS. As such set --default-library=both instead of disabling it. The cli was disabled in 8637884057ddc3c1aeb9f0dd285fc6fcf378c26b to work around a cli build issue which this fixes. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/flashrom/flashrom.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 1e7d332daee..030f6816a0c 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -10,6 +10,7 @@ FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING FLASHROM_INSTALL_STAGING = YES FLASHROM_CONF_OPTS = \ + -Dclassic_cli=enabled \ -Dclassic_cli_print_wiki=disabled \ -Dich_descriptors_tool=enabled \ -Dtests=disabled \ @@ -78,10 +79,8 @@ endif FLASHROM_CONF_OPTS += -Dprogrammer=$(subst $(space),$(comma),$(strip $(FLASHROM_PROGRAMMERS))) -ifeq ($(BR2_SHARED_LIBS),) -FLASHROM_CONF_OPTS += -Dclassic_cli=enabled -else -FLASHROM_CONF_OPTS += -Dclassic_cli=disabled +ifeq ($(BR2_SHARED_LIBS),y) +FLASHROM_CONF_OPTS += --default-library=both endif $(eval $(meson-package)) From ad6e6f5d598a9311fc9141e4b9b08820562d1792 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 19 Aug 2024 11:44:56 +0200 Subject: [PATCH 2439/3013] package/botan: needs thread support Botan commit 313e439c786d68bcf374b2cb0edfe3ffd891db94 added a dependency to pthread.h. Add a dependency to thread support. Fixes: - http://autobuild.buildroot.org/results/205/205d7505803990508bbd545393902789063ababd Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/botan/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/botan/Config.in b/package/botan/Config.in index c74128bb9d3..c61b3688013 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_BOTAN depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS help @@ -23,7 +24,8 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ C++, gcc >= 10" +comment "botan needs a toolchain w/ threads, C++, gcc >= 10" depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ + || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS From e7b3286c79436bc145fd97e78a582cab81f98e87 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sun, 18 Aug 2024 23:31:30 +0300 Subject: [PATCH 2440/3013] package/wpa_supplicant: revert upstream commit to fix brcmfmac Revert the upstream wpa_supplicant commit 41638606054 ("Mark authorization completed on driver indication during 4-way HS offload"). That commit breaks WPA2-PSK and WPA3-SAE for brcfmac driver in upstream Linux kernels. For details refer to the hostapd mailing list discussion and redhat bugzilla: - http://lists.infradead.org/pipermail/hostap/2024-August/042893.html - https://bugzilla.redhat.com/show_bug.cgi?id=2302577 Alternative option would be to disable offload in brcmfmac driver adding "brcmfmac.feature_disable=0x82000" to Linux command line. Final decision is not yet agreed upon on the hostapd mailing list, but reporter and maintainer are inclined to revert the patch. So this change adds revert to Buildroot to improve user experience for such boards as Orange Pi Zero Plus2, BananaPro, and others. Later on the patch will be updated according to hostapd upstream changes. Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- ...orization-completed-on-driver-indica.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch diff --git a/package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch b/package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch new file mode 100644 index 00000000000..89954eb7c5f --- /dev/null +++ b/package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch @@ -0,0 +1,55 @@ +From 170d8a433308ee39f87af94acaef461f8e80b67b Mon Sep 17 00:00:00 2001 +From: Janne Grunau +Date: Sun, 4 Aug 2024 13:24:42 +0200 +Subject: [PATCH] Revert "Mark authorization completed on driver indication during 4-way HS offload" + +This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5. + +Signed-off-by: Janne Grunau +Signed-off-by: Sergey Matyukevich + +Upstream: not yet sent, ongoing discussion http://lists.infradead.org/pipermail/hostap/2024-August/042893.html + +--- + wpa_supplicant/events.c | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c +index 49917f7aa..bbb3a3eda 100644 +--- a/wpa_supplicant/events.c ++++ b/wpa_supplicant/events.c +@@ -4327,23 +4327,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s, + eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) && + wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) { +- if (already_authorized) { +- /* +- * We are done; the driver will take care of RSN 4-way +- * handshake. +- */ +- wpa_supplicant_cancel_auth_timeout(wpa_s); +- wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); +- eapol_sm_notify_portValid(wpa_s->eapol, true); +- eapol_sm_notify_eap_success(wpa_s->eapol, true); +- } else { +- /* Update port, WPA_COMPLETED state from the +- * EVENT_PORT_AUTHORIZED handler when the driver is done +- * with the 4-way handshake. +- */ +- wpa_msg(wpa_s, MSG_DEBUG, +- "ASSOC INFO: wait for driver port authorized indication"); +- } ++ /* ++ * We are done; the driver will take care of RSN 4-way ++ * handshake. ++ */ ++ wpa_supplicant_cancel_auth_timeout(wpa_s); ++ wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); ++ eapol_sm_notify_portValid(wpa_s->eapol, true); ++ eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) && + wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) { + /* +-- +2.45.2 + From 2c00d0f2342d4de6cca108bcc347bd6f6fef94c6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 17 Aug 2024 13:13:27 +0200 Subject: [PATCH 2441/3013] package/mdadm: quote TARGET_LDFLAGS Fixes: - http://autobuild.buildroot.net/results/4a6/4a692e5aa5ac5cb409282a69f664c35611101b32 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/mdadm/mdadm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 153395d32ad..421f06d6953 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -21,7 +21,7 @@ MDADM_BUILD_OPTS = \ CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 \ - LDFLAGS=$(TARGET_LDFLAGS) + LDFLAGS="$(TARGET_LDFLAGS)" MDADM_INSTALL_TARGET_OPTS = install-bin From 5bdac82ee057131e4c7747296f8423fd96ac4981 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 16 Aug 2024 16:37:30 +0000 Subject: [PATCH 2442/3013] configs/zynqmp_kria_*_defconfig: add missing U-Boot build dependency When building these boards with BR2_PER_PACKAGE_DIRECTORIES enabled, the following error occurs from U-Boot. tools/mkeficapsule.c:18:10: fatal error: uuid/uuid.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~ The U-Boot defconfig these boards use 'xilinx_zynqmp_kria' enables CONFIG_EFI_CAPSULE_ON_DISK, which requires util-linux. This doesn't fail when BR2_PER_PACKAGE_DIRECTORIES is disabled. This is because host-e2fsprogs requires host-util-linux, and host-util-linux always builds before host-uboot when single-threaded. Signed-off-by: Brandon Maier Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni --- configs/zynqmp_kria_kd240_defconfig | 1 + configs/zynqmp_kria_kr260_defconfig | 1 + configs/zynqmp_kria_kv260_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index dff49b9837b..ce768056384 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k24-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 24fdea9c30c..21d01e5f2a5 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index a16da66e38d..f83ef35be37 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y From 6877647e8aff18a697d49015dd6273a9886db17e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 19 Aug 2024 20:56:04 +0200 Subject: [PATCH 2443/3013] package/asterisk: security update to 20.9.2 See here for a changelog: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-20.9.2.md And here for the security advisory: https://github.com/asterisk/asterisk/security/advisories/GHSA-c4cg-9275-6w44 Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index ee21d88d98a..9889a18c9dd 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 c928c715dc5ff783ea6cf62cca3eebdc1dc9c5d40ce9b37b0213c0eac7f4090f asterisk-20.9.1.tar.gz +sha256 6bc4d982a238397bf6b3bfa523f63a75a2d9b19edd6f33f79264f2385d05bc42 asterisk-20.9.2.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 64ec740d46e..9d44782a082 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.9.1 +ASTERISK_VERSION = 20.9.2 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From 3ba9ac62052c99d7557adf2bbad1bab0c5577a81 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 19 Aug 2024 20:39:16 +0200 Subject: [PATCH 2444/3013] package/botan: security update to 3.5.0 See here for complete changelogs: https://botan.randombit.net/news.html#version-3-5-0-2024-07-08 https://botan.randombit.net/news.html#version-3-4-0-2024-04-08 CVE-2024-34702: Fix a DoS caused by excessive name constraints. (GH CVE-2024-39312: Fix a name constraint processing error, where if permitted and excluded rules both applied to a certificate, only the permitted rules would be checked. The License hash changed because the year was updated from 2023 to 2024. Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- package/botan/botan.hash | 4 ++-- package/botan/botan.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 37e00ea9cc5..d9482719000 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 368f11f426f1205aedb9e9e32368a16535dc11bd60351066e6f6664ec36b85b9 Botan-3.3.0.tar.xz +sha256 67e8dae1ca2468d90de4e601c87d5f31ff492b38e8ab8bcbd02ddf7104ed8a9f Botan-3.5.0.tar.xz # Locally computed -sha256 1833cde7c7cc03296b1ef2ddc178b1cd7fd1c476840f32cf6aedb09ab0bc9004 license.txt +sha256 db9168bdccaaea26557094436652577cc9bf43164e8be078d88aef1342fe4fb6 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index e0bd258f575..561e7bf702a 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 3.3.0 +BOTAN_VERSION = 3.5.0 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From db32d83e42d88b4a443789dd488fba69d0d271f4 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 19 Aug 2024 19:39:29 +0000 Subject: [PATCH 2445/3013] boot/uboot: use $(TARGET_OBJCOPY) for ZynqMP pmufw.elf Converting the pmufw.elf to a binary works with any objcopy, regardless if it's from the host or cross-compiler. Prefer to use the $(TARGET_OBJCOPY) as it's always available and reproducible. Signed-off-by: Brandon Maier Reviewed-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index cdb9f435f74..2c04abc8965 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -462,8 +462,10 @@ endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT ifeq ($(suffix $(UBOOT_ZYNQMP_PMUFW_PATH)),.elf) UBOOT_ZYNQMP_PMUFW_PATH_FINAL = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)).bin +# objcopy is arch-agnostic so we can use $(TARGET_OBJCOPY) in lack of a +# microblaze objcopy define UBOOT_ZYNQMP_PMUFW_CONVERT - objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_PATH) $(UBOOT_ZYNQMP_PMUFW_PATH_FINAL) + $(TARGET_OBJCOPY) -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_PATH) $(UBOOT_ZYNQMP_PMUFW_PATH_FINAL) endef UBOOT_PRE_BUILD_HOOKS += UBOOT_ZYNQMP_PMUFW_CONVERT else From 4c487171734fc537343571b2cadcd630ac2b09cb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 23:56:26 +0200 Subject: [PATCH 2446/3013] package/flashrom: disable documentation and man-pages The build of the manpage currently fails with: ERROR: File 'doc/man8' could not be found FAILED: meson-internal__install As we don't care about man pages and documentation in Buildroot, let's disable them. The issue has nevertheless been reported at https://github.com/flashrom/flashrom/issues/329. Fixes: http://autobuild.buildroot.net/results/885a957d1b5305d3b91339487cc2a0d64dc74f5e/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/flashrom/flashrom.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 030f6816a0c..2ef9f4d1b78 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -15,7 +15,9 @@ FLASHROM_CONF_OPTS = \ -Dich_descriptors_tool=enabled \ -Dtests=disabled \ -Duse_internal_dmi=true \ - -Dwerror=false + -Dwerror=false \ + -Dman-pages=disabled \ + -Ddocumentation=disabled FLASHROM_PROGRAMMERS = \ buspirate_spi \ From 9f565397d83e7940b093fe09f749570225d7a283 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 23:56:25 +0200 Subject: [PATCH 2447/3013] package/flashrom: bump to final 1.4.0 release This commit is suitable for master because: $ git log --format=oneline v1.4.0-rc2..v1.4.0 eace095b15eb034e42d97202cad70ce979d8ca38 VERSION: Update version to 1.4.0 30c85a62c1abe07d57d5a7b523ef62c2c5b825c9 doc: Release notes for version 1.4.0 e4e0fd0d8232260af052fde52a9fb636181b2e2e meson: Fix project name as flashrom And it looks nicer to have a final 1.4.0 release than a 1.4.0-rc2 release candidate. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/flashrom/flashrom.hash | 2 +- package/flashrom/flashrom.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index cecec5273f8..17ebdee3af8 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 318c54a4143a1a05b30cecd64fbff41a0f5cd35a020622864c11fb44f8ed04d4 flashrom-1.4.0-rc2.tar.gz +sha256 b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c flashrom-1.4.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 2ef9f4d1b78..4eede48e034 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 1.4.0-rc2 +FLASHROM_VERSION = 1.4.0 FLASHROM_SITE = $(call github,flashrom,flashrom,v$(FLASHROM_VERSION)) FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING From aa50907d83947091117e869fbf98bca1747637bd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Aug 2024 14:25:20 +0200 Subject: [PATCH 2448/3013] package/systemd: account for arch dependency of vmspawn support Since upstream commit 5c57a8650630304d8434a348283b6b643fbc676b ("vmspawn: add support for -D/--directory"), src/vmspawn/vmspawn-util.h defines a QEMU_MACHINE_TYPE based on the architecture, and not all architectures are supported. This commit first appeared in systemd v256. Due to this, the unsupported architectures fail with: In file included from ../src/vmspawn/vmspawn-util.c:27: ../src/vmspawn/vmspawn-util.h:46:4: error: #error "No qemu machine defined for this architecture" 46 | # error "No qemu machine defined for this architecture" | ^~~~~ So let's add a BR2_PACKAGE_SYSTEMD_VMSPAWN_ARCH_SUPPORTS and use it to ensure vmspawn support is only used on architectures that are supported. Even though no-one selects BR2_PACKAGE_SYSTEMD_VMSPAWN (and would therefore need to inherit the BR2_PACKAGE_SYSTEMD_VMSPAWN_ARCH_SUPPORTS dependency), we nevertheless introduce BR2_PACKAGE_SYSTEMD_VMSPAWN_ARCH_SUPPORTS to make the depency list prettier than a long "depends on A || B || C || D || ...". Fixes: http://autobuild.buildroot.net/results/0e614375f731f7bfe3c6041c6e89a09c31898053/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 6708adce9ba..113a8093c4d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -599,8 +599,22 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE_DEFAULT_KEYMAP Default keymap for the system. Leave empty to not set a default keymap. +# See for which architectures QEMU_MACHINE_TYPE is defined in +# src/vmspawn/vmspawn-util.h +config BR2_PACKAGE_SYSTEMD_VMSPAWN_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + default y if BR2_x86_64 + config BR2_PACKAGE_SYSTEMD_VMSPAWN bool "enable vmspawn" + depends on BR2_PACKAGE_SYSTEMD_VMSPAWN_ARCH_SUPPORTS help systemd-vmspawn may be used to start a virtual machine from an OS image. In many ways it is similar to From 10a70b1af67cf79986c2e401f7a54aa850ea82d6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 19 Aug 2024 22:53:44 +0200 Subject: [PATCH 2449/3013] package/botan: needs gcc >= 11 The "using enum" was added in gcc 11.x [0] (see also [1]). Compile successfully tested with internal Buildroot toolchain for sparc with gcc 12.x as gcc 11.x is not available anymore. The autobuild failure will be avoided now and fixed with newer external bootlin toolchains. Fixes: - http://autobuild.buildroot.org/results/ab8/ab83b920156f5a1e51ef960e4007769b5c27d0a1 [0] https://gcc.gnu.org/projects/cxx-status.html#cxx20 [1] https://stackoverflow.com/questions/75018634/how-to-use-the-using-keyword-in-gcc-10-4 Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- package/botan/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/botan/Config.in b/package/botan/Config.in index c61b3688013..305cc2fe8ce 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS config BR2_PACKAGE_BOTAN bool "botan" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11 # C++20 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -24,8 +24,8 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ threads, C++, gcc >= 10" +comment "botan needs a toolchain w/ threads, C++, gcc >= 11" depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_11 \ || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS From 89d512729cfa5b2ef5c5165492789ba4441add19 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 19 Aug 2024 14:15:35 +0200 Subject: [PATCH 2450/3013] package/strongswan: work-around wolfssl compile issue Disable RNG support so that following build failure does not happen: In file included from ../../../../src/libstrongswan/plugins/plugin.h:28, from wolfssl_plugin.h:34, from wolfssl_plugin.c:29: wolfssl_plugin.c: In function 'get_features': ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: error: 'FEATURE_WC_RNG' undeclared (first use in this function); did you mean 'FEATURE_RNG'? 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } | ^~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: in expansion of macro '__PLUGIN_FEATURE_REGISTER' 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) __PLUGIN_FEATURE_REGISTER(type, f) | ^~~~~~~~~~~~~~~~~~~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' 248 | #define PLUGIN_REGISTER(type, f, ...) _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~~~~~~~~~ wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), | ^~~~~~~~~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: note: each undeclared identifier is reported only once for each function it appears in 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } | ^~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: in expansion of macro '__PLUGIN_FEATURE_REGISTER' 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) __PLUGIN_FEATURE_REGISTER(type, f) | ^~~~~~~~~~~~~~~~~~~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' 248 | #define PLUGIN_REGISTER(type, f, ...) _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~~~~~~~~~ wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), | ^~~~~~~~~~~~~~~ make[6]: *** [Makefile:659: wolfssl_plugin.lo] Error 1 Reported Upstream: https://github.com/strongswan/strongswan/issues/2410 This build failure started since 5.9.11 update in commit 78959665b94b412d7a82ee43e3ede14278a5d924. Fixes: http://autobuild.buildroot.net/results/278b3f74c48c858ae368d59069752adb69c05246 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/strongswan/strongswan.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 41959793a31..57cadd3a0c3 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -83,6 +83,11 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_MARIADB),mariadb) endif +# https://github.com/strongswan/strongswan/issues/2410 +ifeq ($(BR2_PACKAGE_STRONGSWAN_WOLFSSL),y) +STRONGSWAN_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DWC_NO_RNG" +endif + # disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved # problem exist since linux 4.5 header changes STRONGSWAN_CONF_OPTS += \ From 535116dd022c462fd95282ce8524a6feb1e7749c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 1 Aug 2024 10:45:45 +0200 Subject: [PATCH 2451/3013] package/skopeo: add missing dependency on host go arch support Fixes: commit 619b83a4438667cdb4cc8a7dddc79dbf6d84ec2a http://autobuild.buildroot.org/results/d1c41157ddace09399a3fc101026ae451c6a918a/ Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/skopeo/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/skopeo/Config.in.host b/package/skopeo/Config.in.host index 4a63a0829c1..b3a1c155f74 100644 --- a/package/skopeo/Config.in.host +++ b/package/skopeo/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_SKOPEO bool "host skopeo" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS help skopeo is a command line utility that performs various operations on container images and image repositories. From c06d8be7e324ff3ec69db9b2fdca5305dbc54bf3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 20 Aug 2024 00:04:55 +0200 Subject: [PATCH 2452/3013] package/systemd: now needs target and host gcc >= 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the bump of systemd from 254.13 to 256.4, systemd no longer builds with gcc <= 7: ../src/basic/mountpoint-util.c: In function ‘fstype_is_api_vfs’: ../src/basic/macro.h:385:79: error: expected ‘}’ before ‘__VA_OPT__’ for (typeof(entry) _va_sentinel_[1] = {}, _entries_[] = { __VA_ARGS__ __VA_OPT__(,) _va_sentinel_[0] }, *_current_ = _entries_; \ ^ This first error is due to upstream commit dc571cccd75db7be49b2aada64baf92e3a498c39 ("macro: terminate the temporary VA_ARGS_FOREACH() array with a sentinel"), which was made to support GCC 14.x. If we revert this commit, then this particular issue goes away with GCC 7.x, but then it fails with another fairly similar issue elsewhere: ../src/shared/varlink-idl.h:110:41: error: implicit declaration of function ‘__VA_OPT__’; did you mean ‘__TA_IBIT__’? [-Werror=implicit-function-dec laration] .fields = { __VA_ARGS__ __VA_OPT__(,) {}}, \ ^ This code was added by upstream commit e50b2a93d66eff9b41999d38b8ed5eb647e2d74c ("varlink: add IDL/introspection logic"). Upstream commit dc571cccd75db7be49b2aada64baf92e3a498c39 first appeared in v256, while e50b2a93d66eff9b41999d38b8ed5eb647e2d74c first appeared in v255. Considering systemd usual policies with the support of "old" things, it's fairly unlikely that they will care about building with older gcc versions. They even document in https://github.com/systemd/systemd/blob/main/README that they need gcc >= 8.4, so let's follow that. Fixes: http://autobuild.buildroot.net/results/53c1a79c391e3cc7c230017853ba935202c8d20d/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 4 ++-- package/systemd/Config.in.host | 2 +- system/Config.in | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 113a8093c4d..345f08590e7 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -23,8 +23,8 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 + depends on BR2_HOST_GCC_AT_LEAST_8 # host-systemd select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP diff --git a/package/systemd/Config.in.host b/package/systemd/Config.in.host index 8e00bcf5c19..fdbebaee7ad 100644 --- a/package/systemd/Config.in.host +++ b/package/systemd/Config.in.host @@ -1,4 +1,4 @@ # Select this if you need host systemd tools (e.g. systemctl) config BR2_PACKAGE_HOST_SYSTEMD bool - depends on BR2_HOST_GCC_AT_LEAST_5 + depends on BR2_HOST_GCC_AT_LEAST_8 diff --git a/system/Config.in b/system/Config.in index bc0c6eb6bc8..318c538ef1d 100644 --- a/system/Config.in +++ b/system/Config.in @@ -126,20 +126,20 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_HOST_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 + depends on BR2_HOST_GCC_AT_LEAST_8 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 8" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ - !BR2_HOST_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 comment "systemd highly recommends Linux >= 4.15" depends on BR2_INIT_SYSTEMD From c00bd4e9513a77819de05561dc7aba3c375f6d30 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 9 Jul 2024 14:16:53 +0000 Subject: [PATCH 2453/3013] .b4-config: configure `b4` for Buildroot `b4` is a commandline tool to make patch-based development easier[1]. It is primarily used for Linux kernel development, but can be configured to support any project that has a public-inbox endpoint. Buildroot has a public-inbox mirror at "https://lore.kernel.org/buildroot/". We configure some basic settings that tell `b4` where to send patches and how to use get-developers. [1] https://b4.docs.kernel.org/en/latest/ Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle (cherry picked from commit 322213e131fabd6aa6879c4f653415a35c93e63e) Signed-off-by: Peter Korsgaard --- .b4-config | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .b4-config diff --git a/.b4-config b/.b4-config new file mode 100644 index 00000000000..1943458f2fb --- /dev/null +++ b/.b4-config @@ -0,0 +1,7 @@ +# Configuration for the `b4` tool +# See https://b4.docs.kernel.org/en/latest/config.html +[b4] + send-series-to = buildroot@buildroot.org + send-auto-cc-cmd = "./utils/get-developers -e -" + +# vim: set filetype=gitconfig: From ef5c954a1f19bd4fc7843ec887a7dd2e0e181af4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 Jul 2024 21:27:19 +0200 Subject: [PATCH 2454/3013] package/ncftp: use correct SPDX license code According to https://spdx.org/licenses/, the correct license code for the "Clarified Artistic License" is ClArtistic. The only other package in Buildroot containing code under this license is google-breakpad, and it is already using the ClArtistic SPDX code. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2ca698051c50546a70e9f7b625f2ee9a2a6a2840) Signed-off-by: Peter Korsgaard --- package/ncftp/ncftp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index a3aa3fb1940..57c3a5d08b4 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -8,7 +8,7 @@ NCFTP_VERSION = 3.2.7 NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp NCFTP_TARGET_BINS = ncftp -NCFTP_LICENSE = Clarified Artistic License +NCFTP_LICENSE = ClArtistic NCFTP_LICENSE_FILES = doc/LICENSE.txt NCFTP_DEPENDENCIES = host-autoconf From 06706fa80d6e6c77ed6023bc199b6c43765a295e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:27 +0100 Subject: [PATCH 2455/3013] support/scripts/mkusers: accept user tables without terminating \n Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5d8445138bd466f80dd45dab1b9fb7279f1536eb) Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index ee09bbd1f27..08f3344518d 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -409,9 +409,8 @@ main() { fi # Read in all the file in memory, exclude empty lines and comments - while read -r line; do - ENTRIES+=( "${line}" ) - done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) + # mapfile reads all lines, even the last one if it is missing a \n + mapfile -t ENTRIES < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) # We first create groups whose gid is positive, and then we create groups # whose gid is automatic, so that, if a group is defined both with From 10babcbf2d105035990f664012f2701eb8ab4bc0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:29 +0100 Subject: [PATCH 2456/3013] support/download/check-hash: accept hash files without terminating \n Lots of people are using broken text editors that 1. do not naturally terminate text files with a final \n as is customary in UNIX text files, and 2. do not respect our .editorconfig settings, which explicitly require adding that final newline. See this nice summary of what a text file is (with references to applicable standards): https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line/12916758#12916758 So, it is not surprising that read does not read the last "line" of a file, when said "line" does not end with a newline, because it is thus not really a line. Even though we do mandate actual text files, let's be a little bit lax in this respect, because people may write packages, and their hash files, in a br2-external tree, and they may not have our .editorconfig in the directory heierarchy (e.g. if buildroot is a submodule of their br2-external tree, or whatever). mapfile does not suffer from this limitation, though, and correctly reads all lines from a file, even the final line-that-is-not-a-line. mapfile was introduced in bash 4.0, released on 2009-01-20, more than 15 years ago. Debian squeeze, released in 2011 already had bash 4.1. Those are really ancient. So, it means we can indeed expect bash version 4.0 or later; which means mapfile is available. "It should be fine!" Fixes: #15976 Reported-by: masonwardle@gmail.com Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit ac2e6b392791085bc29fa21901265a8eed4ae0ee) Signed-off-by: Peter Korsgaard --- support/download/check-hash | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/support/download/check-hash b/support/download/check-hash index 9db647885a6..d18ec8b134e 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -78,8 +78,10 @@ nb_checks=0 for h_file in "${h_files[@]}"; do [ -f "${h_file}" ] || continue : $((nb_h_files++)) - # shellcheck disable=SC2094 # we're really reading it only once - while read -r t h f; do + # mapfile reads all lines, even the last one if it is missing a \n + mapfile -t hash_lines <"${h_file}" + for hash_line in "${hash_lines[@]}"; do + read -r t h f <<<"${hash_line}" case "${t}" in ''|'#'*) # Skip comments and empty lines @@ -87,13 +89,12 @@ for h_file in "${h_files[@]}"; do ;; *) if [ "${f}" = "${base}" ]; then - # shellcheck disable=SC2094 # we're only printing the h_file filename check_one_hash "${t}" "${h}" "${file}" "${h_file}" : $((nb_checks++)) fi ;; esac - done <"${h_file}" + done done # shellcheck disable=SC2086 # nb_h_files is a non-empty int From 9fca029008d332b888ccb27f8c556bdab4b06519 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 12 Jul 2024 17:17:44 +0200 Subject: [PATCH 2457/3013] package/boost: cleanup HOST_BOOST_FLAGS - fix alphabetical ordering - put one module per line - add comment explaining why options are enabled Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5c20804afa42cb2efd57a4a333841290d35d9df6) Signed-off-by: Peter Korsgaard --- package/boost/boost.mk | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 9b1baec5bf7..bb73edfda61 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -13,12 +13,39 @@ BOOST_LICENSE_FILES = LICENSE_1_0.txt BOOST_CPE_ID_VENDOR = boost # keep host variant as minimal as possible +# regex & system are needed by host-riscv-isa-sim HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - contract container coroutine date_time exception fiber filesystem graph \ - graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace test thread timer \ - type_erasure url wave) + --without-libraries=$(subst $(space),$(comma),\ + atomic \ + chrono container \ + context \ + contract \ + coroutine \ + date_time \ + exception \ + fiber \ + filesystem \ + graph \ + graph_parallel \ + iostreams \ + json \ + locale \ + log \ + math \ + mpi \ + nowide \ + program_options \ + python \ + random \ + serialization \ + stacktrace \ + test \ + thread \ + timer \ + type_erasure \ + url \ + wave\ + ) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) From 88212cba65eb2943336832d04ad72ac8e281acbb Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 11 Jul 2024 23:03:41 +0200 Subject: [PATCH 2458/3013] package/boost: cleanup boost-context/fiber/math boost-context - requires C++11 (gcc 4.8) since 1.61 see [0] - dropped the dependency on (boost) thread in 1.77 see [1] boost-fiber - needed C++11 since it's creation in 1.61 [2] boost-math - add comment for gcc version [0] https://www.boost.org/doc/libs/1_82_0/libs/context/doc/html/context/requirements.html [1] https://github.com/boostorg/context/commit/8425e830eab0ad550db937027392c4b4a54df695 [2] https://www.boost.org/doc/libs/1_62_0/libs/fiber/doc/html/fiber/overview.html Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (cherry picked from commit 16abf80368b660b4ec59778ca5060529b77a42c5) Signed-off-by: Peter Korsgaard --- package/boost/Config.in | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 60cc0a11a2f..908a53fea03 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -50,13 +50,14 @@ config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS config BR2_PACKAGE_BOOST_CONTEXT bool "boost-context" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ - || BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - select BR2_PACKAGE_BOOST_THREAD if !BR2_TOOLCHAIN_GCC_AT_LEAST_6 help C++11 context switching library. +comment "boost-context needs a toolchain w/ C++11, gcc>=4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_BOOST_CONTRACT bool "boost-contract" # pthread_condattr_setclock @@ -72,16 +73,20 @@ config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # boost-context depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context, boost-thread select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD help - deprecated coroutine library, the non-depricated coroutine2 + deprecated coroutine library, the non-deprecated coroutine2 library is a header-only library and does not need to be selected. +comment "boost-coroutine needs a toolchain w/ C++11, gcc>=4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + comment "boost-coroutine needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -109,21 +114,20 @@ config BR2_PACKAGE_BOOST_FIBER depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_SYSTEM help C++11 userland threads library. -comment "boost-fiber needs a toolchain w/ NPTL" +comment "boost-fiber needs a toolchain w/ NPTL, C++11, gcc>=4.8" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "boost-fiber needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ - || BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_FILESYSTEM @@ -242,6 +246,9 @@ config BR2_PACKAGE_BOOST_MATH Octonions, like quaternions, are a relative of complex numbers. +comment "boost-math needs a toolchain w/ C++14, gcc>=5.0" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + config BR2_PACKAGE_BOOST_MPI bool "boost-mpi" help From 78c27b3fbcdc104e763c2da6f63f63e90a907fe3 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 19 Jun 2024 09:32:52 +0200 Subject: [PATCH 2459/3013] package/attr: add missing libgen.h header Resolves the following error when building against MUSL: tools/attr.c: In function 'main': tools/attr.c:69:20: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration] 69 | progname = basename(argv[0]); | ^~~~~~~~ tools/attr.c:69:18: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 69 | progname = basename(argv[0]); | ^ Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=8a80d895dfd779373363c3a4b62ecce5a549efb2 Fixes: http://autobuild.buildroot.net/results/c61206968eda9913e37e95a61dc3e10399503fcd/ Signed-off-by: Yegor Yefremov [Romain: use upstream patch] Signed-off-by: Romain Naour (cherry picked from commit fa241685e7f92311f5fd50ce17c1541748fe285b) Signed-off-by: Peter Korsgaard --- ...-missing-libgen.h-include-for-basena.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch diff --git a/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch b/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch new file mode 100644 index 00000000000..304177257c2 --- /dev/null +++ b/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch @@ -0,0 +1,32 @@ +From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" +Date: Sat, 30 Mar 2024 10:17:10 +0100 +Subject: [PATCH] tools/attr.c: Add missing libgen.h include for basename(3) + +Fixes compilation issue with musl and modern C99 compilers. + +See: https://bugs.gentoo.org/926294 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=8a80d895dfd779373363c3a4b62ecce5a549efb2 + +Signed-off-by: Yegor Yefremov +Signed-off-by: Romain Naour +--- + tools/attr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/attr.c b/tools/attr.c +index f12e4af..6a3c1e9 100644 +--- a/tools/attr.c ++++ b/tools/attr.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.45.0 + From 2432073c2367aade005a097230bac1b013d43397 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 8 Feb 2024 21:15:59 +0100 Subject: [PATCH 2460/3013] support/testing: add attr runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2da40a2fd7a0007ff1a51bc957980f516746a6ad) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_attr.py | 75 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 support/testing/tests/package/test_attr.py diff --git a/DEVELOPERS b/DEVELOPERS index b66d90d33d6..b13a346c5db 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1798,6 +1798,7 @@ F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py +F: support/testing/tests/package/test_attr.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_bitcoin.py F: support/testing/tests/package/test_brotli.py diff --git a/support/testing/tests/package/test_attr.py b/support/testing/tests/package/test_attr.py new file mode 100644 index 00000000000..1b43f7daf68 --- /dev/null +++ b/support/testing/tests/package/test_attr.py @@ -0,0 +1,75 @@ +import os + + +import infra.basetest + + +class TestAttr(infra.basetest.BRTest): + # Note: this test uses extended attributes (xattr). We use a ext4 + # rootfs (which fully supports xattrs). Note that tmpfs has + # partial support of xattrs, and cpio initrd has not. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ATTR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk_file = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv5", + kernel="builtin", + kernel_cmdline=["rootwait", "root=/dev/sda"], + options=["-drive", f"file={disk_file},if=scsi,format=raw"]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfattr --version") + self.assertRunOk("setfattr --version") + + test_file = "/root/file.txt" + attr_name = "buildroot" + attr_value = "is-great" + + # Create a test file. + self.assertRunOk(f"echo 'Hello Buildroot!' > {test_file}") + + # Set an extended attribute. + cmd = f"setfattr -n user.{attr_name} -v {attr_value} {test_file}" + self.assertRunOk(cmd) + + # Read back the attribute value. We add an extra "echo" to add + # a new line. getfattr --only-values prints raw attribute + # values and lack of a new line. + cmd = "getfattr" + cmd += f" -n user.{attr_name} --absolute-names --only-values" + cmd += f" {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # We read back the attribute value again, but with the "attr" + # command this time. + cmd = f"attr -q -g {attr_name} {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # List extended attributes with "attr", and check we see our + # test attribute. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn(attr_name, "\n".join(out)) + + # Remove the test attribute with setfattr. + cmd = f"setfattr -x user.{attr_name} {test_file}" + self.assertRunOk(cmd) + + # We check the test attribute is no longer listed by the attr + # command. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertNotIn(attr_name, "\n".join(out)) From 663b0c49f3564cead9a31caf2eef9740f258c6d8 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 01:00:57 +0100 Subject: [PATCH 2461/3013] support/testing: add python-msgpack runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle (cherry picked from commit d429d5d399acc9921a9a86f4ae3d589d599605e4) Signed-off-by: Peter Korsgaard --- .../testing/tests/package/sample_python_msgpack.py | 5 +++++ support/testing/tests/package/test_python_msgpack.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 support/testing/tests/package/sample_python_msgpack.py create mode 100644 support/testing/tests/package/test_python_msgpack.py diff --git a/support/testing/tests/package/sample_python_msgpack.py b/support/testing/tests/package/sample_python_msgpack.py new file mode 100644 index 00000000000..1940f708214 --- /dev/null +++ b/support/testing/tests/package/sample_python_msgpack.py @@ -0,0 +1,5 @@ +import msgpack + +packaed = msgpack.packb([1, 2, 3], use_bin_type=True) + +assert msgpack.unpackb(packaed, raw=False) == [1, 2, 3] diff --git a/support/testing/tests/package/test_python_msgpack.py b/support/testing/tests/package/test_python_msgpack.py new file mode 100644 index 00000000000..e5876e400d8 --- /dev/null +++ b/support/testing/tests/package/test_python_msgpack.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MsgPack(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MSGPACK=y + """ + sample_scripts = ["tests/package/sample_python_msgpack.py"] + timeout = 40 From 287067a8703e13eaacb97bf4e7df8f56c45108dc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Jun 2024 23:09:38 +0200 Subject: [PATCH 2462/3013] package/tar: fix linking with libiconv Backport two patches from upstream to fix linking with libiconv, e.g. with this defconfig: BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_SYSTEM_ENABLE_NLS=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_LIBICONV=y BR2_PACKAGE_TAR=y It is interesting to note that the first patch we backport is the first commit in the tar repository after the 1.35 tag, and was comitted the same day the release was cut... Fixes: https://gitlab.com/buildroot.org/buildroot/-/issues/4 http://autobuild.buildroot.net/results/c074c2e22a7f764400ecc7dd1a6cd6022fa87fb9/ Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 9a66711be1786b90f94cbb1648fa470def3486f8) Signed-off-by: Peter Korsgaard --- .../tar/0002-Fix-savannah-bug-#64441.patch | 28 +++++++++++++++++ package/tar/0003-tests-fix-LDADD.patch | 30 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 package/tar/0002-Fix-savannah-bug-#64441.patch create mode 100644 package/tar/0003-tests-fix-LDADD.patch diff --git a/package/tar/0002-Fix-savannah-bug-#64441.patch b/package/tar/0002-Fix-savannah-bug-#64441.patch new file mode 100644 index 00000000000..049e08c27b6 --- /dev/null +++ b/package/tar/0002-Fix-savannah-bug-#64441.patch @@ -0,0 +1,28 @@ +From 8632df398b2f548465ebe68b8f494c0d6f8d913d Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Tue, 18 Jul 2023 17:02:23 +0300 +Subject: Fix savannah bug #64441 + +* src/Makefile.am (tar_LDADD): Add libiconv libraries. + +[yann.morin.1998@free.fr: backport from upstream] +Upstream: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=8632df398b2f548465ebe68b8f494c0d6f8d913d +Signed-off-by: Yann E. MORIN +--- + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 36c9543..e2ec58d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,4 +52,5 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) + tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\ + $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\ + $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\ +- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) ++ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \ ++ $(LIBINTL) $(LIBICONV) +-- +cgit v1.1 + diff --git a/package/tar/0003-tests-fix-LDADD.patch b/package/tar/0003-tests-fix-LDADD.patch new file mode 100644 index 00000000000..c00f14d2c1c --- /dev/null +++ b/package/tar/0003-tests-fix-LDADD.patch @@ -0,0 +1,30 @@ +From 71530f72d21d9af00b5688948111666f62f5ec4b Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 19 Jul 2023 15:48:25 -0700 +Subject: tests: fix LDADD + +Problem reported by Christian Weisgerber in: +https://lists.gnu.org/r/bug-tar/2023-07/msg00015.html +* tests/Makefile.am (LDADD): Add $(LIBINTL), $(LIBICONV). + +[yann.morin.1998@free.fr: backport from upstream] +Upstream: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=71530f72d21d9af00b5688948111666f62f5ec4b +Signed-off-by: Yann E. MORIN +--- + tests/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 1884b72..b696f01 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -337,4 +337,5 @@ AM_CPPFLAGS = \ + LDADD = ../gnu/libgnu.a\ + $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\ + $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\ +- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) ++ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \ ++ $(LIBINTL) $(LIBICONV) +-- +cgit v1.1 + From 4170afa998c2cc4531bba7abae39b04d5c265830 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 16:26:14 +0200 Subject: [PATCH 2463/3013] package/tar: properly handle autoreconf Commit 9a66711be1786b90f94cbb1648fa470def3486f8 ("package/tar: fix linking with libiconv") added two patches that patch Makefile.am files, but it forgot to add TAR_AUTORECONF = YES. However, a gotcha is that TAR_AUTORECONF = YES would apply to both the target tar, but also the host tar. But for host-tar, we can't accept to do an autoreconf, because this would cause host-tar to have a dependency on host-{autoconf,automake,libtool}, which in turn would have a dependency on host-tar. Since anyway the patches 0002/0003 that modify Makefile.am are only useful to fix a libiconv problem that occurs when building target tar, we disable autoreconf for host-tar, and we prevent automatic autoreconf by touching the right Makefile.in files. This mess can be dropped next time we update tar, as 0002/0003 will be part of the next tar release. Fixes: http://autobuild.buildroot.net/results/efdf7cf9ede810ed7f766cc4138b16054bc0c18a/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 69cbb563a124002fcb3e2725c3516b502587f9cc) Signed-off-by: Peter Korsgaard --- package/tar/tar.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index a7e85afb72f..bf3f1b6acb8 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -12,6 +12,9 @@ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu TAR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) TAR_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +# 0002-Fix-savannah-bug-#64441.patch +# 0003-tests-fix-LDADD.patch +TAR_AUTORECONF = YES # busybox installs in /bin, so we need tar to install as well in /bin # so that we don't end up with two different tar @@ -58,4 +61,19 @@ HOST_TAR_CONF_ENV = \ CC="$(HOSTCC_NOCCACHE)" \ CXX="$(HOSTCXX_NOCCACHE)" +# Patches 0002-Fix-savannah-bug-#64441.patch and +# 0003-tests-fix-LDADD.patch are patching Makefile.am, so they do +# require TAR_AUTORECONF = YES above. However, for the host-tar +# package we can't do this: we can't have host-tar depend on +# host-{autoconf,automake,libtool} as those in turn might depend on +# host-tar. Since the patches 0002 and 0003 are only related to +# linking against libiconv, which is only an issue for the target tar, +# we do not autoreconf, and touch the corresponding Makefile.in to +# prevent them from being re-generated. +HOST_TAR_AUTORECONF = NO +define HOST_TAR_NO_AUTORECONF + touch $(@D)/src/Makefile.in $(@D)/tests/Makefile.in +endef +HOST_TAR_POST_PATCH_HOOKS += HOST_TAR_NO_AUTORECONF + $(eval $(host-autotools-package)) From 4d68f0d040c47a98e008e28ba146c6d12000262c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 11:12:14 +0200 Subject: [PATCH 2464/3013] package/dhrystone: cleanup patch stack dhrystone is basically a dead project, so there is no Git repo available anywhere, no new release, nothing. Despite that, let's reformat the patches with "git format-patch", keep the original authorship but add my SoB since I'm reintroducing the patches, and indicate the Upstream: status. Signed-off-by: Thomas Petazzoni (cherry picked from commit 95013777cf93548eee7ac3010b513d354e8b0a30) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 5 ---- ...y-the-number-of-runs-on-the-command.patch} | 22 ++++++++++---- ...m-system-rather-than-requiring-via-C.patch | 29 +++++++++++++++++++ package/dhrystone/0002-HZ.patch | 17 ----------- package/dhrystone/0003-exit.patch | 14 --------- ...trust-the-exit-status-of-the-program.patch | 26 +++++++++++++++++ ...et-prototypes-for-malloc-exit-strcpy.patch | 27 +++++++++++++++++ package/dhrystone/0004-headers.patch | 15 ---------- ...-with-C-library-using-NO_PROTOTYPES.patch} | 20 ++++++++++--- 9 files changed, 115 insertions(+), 60 deletions(-) rename package/dhrystone/{0001-cmdline-nruns.patch => 0001-let-people-specify-the-number-of-runs-on-the-command.patch} (66%) create mode 100644 package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch delete mode 100644 package/dhrystone/0002-HZ.patch delete mode 100644 package/dhrystone/0003-exit.patch create mode 100644 package/dhrystone/0003-trust-the-exit-status-of-the-program.patch create mode 100644 package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch delete mode 100644 package/dhrystone/0004-headers.patch rename package/dhrystone/{0005-prototypes.patch => 0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch} (59%) diff --git a/.checkpackageignore b/.checkpackageignore index 4eff91e184d..962ba03fe21 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -513,11 +513,6 @@ package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables package/dhcpdump/0001-use-non-bsd-structures.patch lib_patch.Upstream -package/dhrystone/0001-cmdline-nruns.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0002-HZ.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0003-exit.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0004-headers.patch lib_patch.Sob lib_patch.Upstream -package/dhrystone/0005-prototypes.patch lib_patch.Sob lib_patch.Upstream package/dht/0001-cmake.patch lib_patch.Upstream package/dillo/0001-usr-local-include.patch lib_patch.Upstream package/dillo/0002-Fix-openssl-detection.patch lib_patch.Upstream diff --git a/package/dhrystone/0001-cmdline-nruns.patch b/package/dhrystone/0001-let-people-specify-the-number-of-runs-on-the-command.patch similarity index 66% rename from package/dhrystone/0001-cmdline-nruns.patch rename to package/dhrystone/0001-let-people-specify-the-number-of-runs-on-the-command.patch index 1164610cca1..b1858268471 100644 --- a/package/dhrystone/0001-cmdline-nruns.patch +++ b/package/dhrystone/0001-let-people-specify-the-number-of-runs-on-the-command.patch @@ -1,10 +1,19 @@ -let people specify the number of runs on the command line +From 16d84fa7ecea8102680c9610d4186c4f54936b07 Mon Sep 17 00:00:00 2001 +From: Vivi Li +Date: Mon, 15 Jul 2024 11:07:11 +0200 +Subject: [PATCH] let people specify the number of runs on the command line -Patch by Vivi Li +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry_1.c | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) +diff --git a/dhry_1.c b/dhry_1.c +index 7ab02a8..97bd30f 100644 --- a/dhry_1.c +++ b/dhry_1.c -@@ -66,7 +70,7 @@ +@@ -66,7 +66,7 @@ float Microseconds, /* end of variables for time measurement */ @@ -13,7 +22,7 @@ Patch by Vivi Li /*****/ /* main program, corresponds to procedures */ -@@ -101,6 +105,13 @@ +@@ -101,6 +101,13 @@ main () /* Warning: With 16-Bit processors and Number_Of_Runs > 32000, */ /* overflow may occur for this array element. */ @@ -27,7 +36,7 @@ Patch by Vivi Li printf ("\n"); printf ("Dhrystone Benchmark, Version 2.1 (Language: C)\n"); printf ("\n"); -@@ -114,13 +125,17 @@ +@@ -114,13 +121,17 @@ main () printf ("Program compiled without 'register' attribute\n"); printf ("\n"); } @@ -51,3 +60,6 @@ Patch by Vivi Li printf ("Execution starts, %d runs through Dhrystone\n", Number_Of_Runs); +-- +2.45.2 + diff --git a/package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch b/package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch new file mode 100644 index 00000000000..064a1a95244 --- /dev/null +++ b/package/dhrystone/0002-Get-HZ-value-from-system-rather-than-requiring-via-C.patch @@ -0,0 +1,29 @@ +From 7d890402dc5a32a72d5bc0532c87576937c18eb7 Mon Sep 17 00:00:00 2001 +From: Robin Getz +Date: Mon, 15 Jul 2024 11:07:54 +0200 +Subject: [PATCH] Get HZ value from system rather than requiring via CPPFLAGS + +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dhry.h b/dhry.h +index 1714562..482d343 100644 +--- a/dhry.h ++++ b/dhry.h +@@ -359,6 +359,10 @@ + /* for "times" */ + #endif + ++#ifndef HZ ++#include ++#endif ++ + #define Mic_secs_Per_Second 1000000.0 + /* Berkeley UNIX C returns process times in seconds/HZ */ + +-- +2.45.2 + diff --git a/package/dhrystone/0002-HZ.patch b/package/dhrystone/0002-HZ.patch deleted file mode 100644 index e3b8a0e05d0..00000000000 --- a/package/dhrystone/0002-HZ.patch +++ /dev/null @@ -1,17 +0,0 @@ -Get HZ value from system rather than requiring via CPPFLAGS - -Patch by Robin Getz - ---- a/dhry.h -+++ b/dhry.h -@@ -359,6 +359,10 @@ - /* for "times" */ - #endif - -+#ifndef HZ -+#include -+#endif -+ - #define Mic_secs_Per_Second 1000000.0 - /* Berkeley UNIX C returns process times in seconds/HZ */ - diff --git a/package/dhrystone/0003-exit.patch b/package/dhrystone/0003-exit.patch deleted file mode 100644 index 8d99f4e5d75..00000000000 --- a/package/dhrystone/0003-exit.patch +++ /dev/null @@ -1,14 +0,0 @@ -trust the exit status of the program - -Patch by Robin Getz - ---- a/dhry_1.c -+++ b/dhry_1.c -@@ -274,6 +289,7 @@ - printf ("\n"); - } - -+ exit(0); - } - - diff --git a/package/dhrystone/0003-trust-the-exit-status-of-the-program.patch b/package/dhrystone/0003-trust-the-exit-status-of-the-program.patch new file mode 100644 index 00000000000..b7bc2b306c0 --- /dev/null +++ b/package/dhrystone/0003-trust-the-exit-status-of-the-program.patch @@ -0,0 +1,26 @@ +From acd266448386c805c0afded780a5d7e6903bb485 Mon Sep 17 00:00:00 2001 +From: Robin Getz +Date: Mon, 15 Jul 2024 11:08:43 +0200 +Subject: [PATCH] trust the exit status of the program + +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry_1.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dhry_1.c b/dhry_1.c +index 97bd30f..358bdc3 100644 +--- a/dhry_1.c ++++ b/dhry_1.c +@@ -285,6 +285,7 @@ main(int argc, char *argv[]) + printf ("\n"); + } + ++ exit(0); + } + + +-- +2.45.2 + diff --git a/package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch b/package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch new file mode 100644 index 00000000000..e925f1e781f --- /dev/null +++ b/package/dhrystone/0004-get-prototypes-for-malloc-exit-strcpy.patch @@ -0,0 +1,27 @@ +From 85dcf4ca20a60689479bcb143ecf8c0402822abe Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 15 Jul 2024 11:09:18 +0200 +Subject: [PATCH] get prototypes for malloc/exit/strcpy + +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dhry.h b/dhry.h +index 482d343..825ef35 100644 +--- a/dhry.h ++++ b/dhry.h +@@ -388,6 +388,8 @@ + /* General definitions: */ + + #include ++#include ++#include + /* for strcpy, strcmp */ + + #define Null 0 +-- +2.45.2 + diff --git a/package/dhrystone/0004-headers.patch b/package/dhrystone/0004-headers.patch deleted file mode 100644 index 82bb60d92d4..00000000000 --- a/package/dhrystone/0004-headers.patch +++ /dev/null @@ -1,15 +0,0 @@ -get prototypes for malloc/exit/strcpy - -Patch by Mike Frysinger - ---- a/dhry.h -+++ b/dhry.h -@@ -388,6 +388,8 @@ - /* General definitions: */ - - #include -+#include -+#include - /* for strcpy, strcmp */ - - #define Null 0 diff --git a/package/dhrystone/0005-prototypes.patch b/package/dhrystone/0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch similarity index 59% rename from package/dhrystone/0005-prototypes.patch rename to package/dhrystone/0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch index 7fdcf94ee98..4cffc25a8d2 100644 --- a/package/dhrystone/0005-prototypes.patch +++ b/package/dhrystone/0005-Avoid-collision-with-C-library-using-NO_PROTOTYPES.patch @@ -1,10 +1,19 @@ -Avoid collision with C library using NO_PROTOTYPES found in code already +From 9a701143fc38fd9f5373af70dfd5f0da0bc8e04a Mon Sep 17 00:00:00 2001 +From: Robin Getz +Date: Mon, 15 Jul 2024 11:09:55 +0200 +Subject: [PATCH] Avoid collision with C library using NO_PROTOTYPES -Patch by Robin Getz +Upstream: dead +Signed-off-by: Thomas Petazzoni +--- + dhry_1.c | 6 ++++++ + 1 file changed, 6 insertions(+) +diff --git a/dhry_1.c b/dhry_1.c +index 358bdc3..3ed1716 100644 --- a/dhry_1.c +++ b/dhry_1.c -@@ -28,7 +28,9 @@ +@@ -28,7 +28,9 @@ char Ch_1_Glob, int Arr_1_Glob [50]; int Arr_2_Glob [50] [50]; @@ -14,7 +23,7 @@ Patch by Robin Getz Enumeration Func_1 (); /* forward declaration necessary since Enumeration may not simply be int */ -@@ -45,14 +45,18 @@ +@@ -45,14 +47,18 @@ Enumeration Func_1 (); #ifdef TIMES struct tms time_info; @@ -33,3 +42,6 @@ Patch by Robin Getz #define Too_Small_Time 2 /* Measurements should last at least 2 seconds */ #endif +-- +2.45.2 + From 38b8112733e51ec23ab33a5b2ab14ca0b780b816 Mon Sep 17 00:00:00 2001 From: Steffen Persvold Date: Thu, 27 Jun 2024 12:34:40 +0200 Subject: [PATCH 2465/3013] package/dhrystone: fix build with GCC 14.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC14 will give errors for missing function declarations and missing return types : dhry_1.c:75:1: error: return type defaults to ‘int’ [-Wimplicit-int] 75 | main(int argc, char *argv[]) | ^~~~ dhry_1.c: In function ‘main’: dhry_1.c:159:5: error: implicit declaration of function ‘Proc_5’ [-Wimplicit-function-declaration] 159 | Proc_5(); | ^~~~~~ Fixes: http://autobuild.buildroot.net/results/8e65ba30efd5a6bca197f24ced2db1f8226b2c51/ Signed-off-by: Steffen Persvold Signed-off-by: Thomas Petazzoni (cherry picked from commit 3847a145c23234b3bddae3a9ceb9d2d4e6a90fc5) Signed-off-by: Peter Korsgaard --- ...06-Add-missing-function-declarations.patch | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 package/dhrystone/0006-Add-missing-function-declarations.patch diff --git a/package/dhrystone/0006-Add-missing-function-declarations.patch b/package/dhrystone/0006-Add-missing-function-declarations.patch new file mode 100644 index 00000000000..0518340e3fd --- /dev/null +++ b/package/dhrystone/0006-Add-missing-function-declarations.patch @@ -0,0 +1,152 @@ +From fd7ce4b6a9e268e60071c94852f7f00f6e60ef11 Mon Sep 17 00:00:00 2001 +From: Steffen Persvold +Date: Mon, 15 Jul 2024 11:16:36 +0200 +Subject: [PATCH] Add missing function declarations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + +GCC14 will give errors for missing function declarations and +missing return types : + +dhry_1.c:75:1: error: return type defaults to ‘int’ [-Wimplicit-int] + 75 | main(int argc, char *argv[]) + | ^~~~ +dhry_1.c: In function ‘main’: +dhry_1.c:159:5: error: implicit declaration of function ‘Proc_5’ [-Wimplicit-function-declaration] + 159 | Proc_5(); + | ^~~~~~ + +Upstream: dead +Signed-off-by: Steffen Persvold +--- + dhry_1.c | 26 +++++++++++++++++--------- + dhry_2.c | 8 ++++---- + 2 files changed, 21 insertions(+), 13 deletions(-) + +diff --git a/dhry_1.c b/dhry_1.c +index 3ed1716..cad5840 100644 +--- a/dhry_1.c ++++ b/dhry_1.c +@@ -32,6 +32,7 @@ int Arr_2_Glob [50] [50]; + extern char *malloc (); + #endif + Enumeration Func_1 (); ++Boolean Func_2 (); + /* forward declaration necessary since Enumeration may not simply be int */ + + #ifndef REG +@@ -71,8 +72,17 @@ float Microseconds, + + /* end of variables for time measurement */ + +- +-main(int argc, char *argv[]) ++/* forward declarations */ ++void Proc_1 (); ++void Proc_2 (); ++void Proc_3 (); ++void Proc_4 (); ++void Proc_5 (); ++void Proc_6 (); ++void Proc_7 (); ++void Proc_8 (); ++ ++int main(int argc, char *argv[]) + /*****/ + + /* main program, corresponds to procedures */ +@@ -295,7 +305,7 @@ main(int argc, char *argv[]) + } + + +-Proc_1 (Ptr_Val_Par) ++void Proc_1 (Ptr_Val_Par) + /******************/ + + REG Rec_Pointer Ptr_Val_Par; +@@ -329,7 +339,7 @@ REG Rec_Pointer Ptr_Val_Par; + } /* Proc_1 */ + + +-Proc_2 (Int_Par_Ref) ++void Proc_2 (Int_Par_Ref) + /******************/ + /* executed once */ + /* *Int_Par_Ref == 1, becomes 4 */ +@@ -352,7 +362,7 @@ One_Fifty *Int_Par_Ref; + } /* Proc_2 */ + + +-Proc_3 (Ptr_Ref_Par) ++void Proc_3 (Ptr_Ref_Par) + /******************/ + /* executed once */ + /* Ptr_Ref_Par becomes Ptr_Glob */ +@@ -367,7 +377,7 @@ Rec_Pointer *Ptr_Ref_Par; + } /* Proc_3 */ + + +-Proc_4 () /* without parameters */ ++void Proc_4 () /* without parameters */ + /*******/ + /* executed once */ + { +@@ -379,7 +389,7 @@ Proc_4 () /* without parameters */ + } /* Proc_4 */ + + +-Proc_5 () /* without parameters */ ++void Proc_5 () /* without parameters */ + /*******/ + /* executed once */ + { +@@ -399,5 +409,3 @@ register int l; + while (l--) *d++ = *s++; + } + #endif +- +- +diff --git a/dhry_2.c b/dhry_2.c +index 63a3d3e..25051e7 100644 +--- a/dhry_2.c ++++ b/dhry_2.c +@@ -26,8 +26,9 @@ + extern int Int_Glob; + extern char Ch_1_Glob; + ++Boolean Func_3 (); + +-Proc_6 (Enum_Val_Par, Enum_Ref_Par) ++void Proc_6 (Enum_Val_Par, Enum_Ref_Par) + /*********************************/ + /* executed once */ + /* Enum_Val_Par == Ident_3, Enum_Ref_Par becomes Ident_2 */ +@@ -61,7 +62,7 @@ Enumeration *Enum_Ref_Par; + } /* Proc_6 */ + + +-Proc_7 (Int_1_Par_Val, Int_2_Par_Val, Int_Par_Ref) ++void Proc_7 (Int_1_Par_Val, Int_2_Par_Val, Int_Par_Ref) + /**********************************************/ + /* executed three times */ + /* first call: Int_1_Par_Val == 2, Int_2_Par_Val == 3, */ +@@ -81,7 +82,7 @@ One_Fifty *Int_Par_Ref; + } /* Proc_7 */ + + +-Proc_8 (Arr_1_Par_Ref, Arr_2_Par_Ref, Int_1_Par_Val, Int_2_Par_Val) ++void Proc_8 (Arr_1_Par_Ref, Arr_2_Par_Ref, Int_1_Par_Val, Int_2_Par_Val) + /*********************************************************************/ + /* executed once */ + /* Int_Par_Val_1 == 3 */ +@@ -189,4 +190,3 @@ Enumeration Enum_Par_Val; + else /* not executed */ + return (false); + } /* Func_3 */ +- +-- +2.45.2 + From 4dbb87bb6676b82f34981f6adedccfa03a9667cd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 20 Aug 2024 08:45:31 +0200 Subject: [PATCH 2466/3013] utils/genrandconfig: fix fallout of dropping toolchain CSV Commit 2f260084d577 (utils/genrandconfig: remove support for toolchain CSV) kept the --no-toolchains-csv option, but in the rework forgot to keep it as a bool, while argparse default is to expect a string. Rather than re-introduce the action="store_true" which implies the argument is a bool, explicit make it a bool. Fixes: 2f260084d5771728f3340ff6a86a23391133a635 Reported-by: James Hilliard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 8e60fd3f9ea..ae1f0f85de4 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -611,7 +611,7 @@ if __name__ == '__main__': help="Buildroot directory (relative to current directory)", type=str, default='.') parser.add_argument("--toolchains-csv", help="Legacy, unused", type=str) - parser.add_argument("--no-toolchains-csv", help="Legacy, unused") + parser.add_argument("--no-toolchains-csv", help="Legacy, unused", type=bool) args = parser.parse_args() From 77512bba98e09c7231a2629652e464dbf882fd23 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 20 Aug 2024 09:45:20 +0200 Subject: [PATCH 2467/3013] package/aumix: update AUMIX_SITE The old URL gives 403 forbidden. Use a working sourceforge URL. Fixes: http://autobuild.buildroot.org/results/c0c3945cade7a6d7a615ac23523c93b02dbb056f Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/aumix/Config.in | 2 +- package/aumix/aumix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/aumix/Config.in b/package/aumix/Config.in index 3d3208250cd..058e73d7eeb 100644 --- a/package/aumix/Config.in +++ b/package/aumix/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_AUMIX automatically save and restore the mixer settings at shutdown and boot. - http://jpj.net/~trevor/aumix.html + https://sourceforge.net/projects/aumix/ diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk index 03072d5d359..d5c2831dcd4 100644 --- a/package/aumix/aumix.mk +++ b/package/aumix/aumix.mk @@ -6,7 +6,7 @@ AUMIX_VERSION = 2.9.1 AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2 -AUMIX_SITE = http://jpj.net/~trevor/aumix/releases +AUMIX_SITE = https://sourceforge.net/projects/aumix/files/aumix/$(AUMIX_VERSION) AUMIX_AUTORECONF = YES AUMIX_AUTOPOINT = YES AUMIX_LICENSE = GPL-2.0+ From 064e4c09fa788ccf0927fcaf3987e0f0fdc08eb7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 20 Aug 2024 19:23:43 +0200 Subject: [PATCH 2468/3013] package/ntpsec: fix host building The following build failure on xtensa: Waf: Entering directory `/home/buildroot/instance-0/output-1/build/ntpsec-1.2.3/build/host' [1/2] Processing ntpd/ntp_parser.y [2/2] Compiling build/host/ntpd/ntp_parser.tab.c gcc: error: unrecognized command-line option '-mlongcalls' gcc: error: unrecognized command-line option '-mauto-litpools' reveals that the target's CFLAGS are being used for host compilation. The patch fixes the host compilation by correctly setting the CFLAGS to be used. It should be noted that the build script used by ntpsec applies CFLAGS for host compilation and --cross-cflags for target compilation. Fixes: - http://autobuild.buildroot.org/results/9321a637f2c340ce8dcb24249676bb6c44d0dfc6 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/ntpsec/ntpsec.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index 661af788423..3acf7745cf0 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -42,6 +42,7 @@ NTPSEC_DEPENDENCIES = \ # --cross-compiler NTPSEC_CONF_OPTS = \ CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" \ --libdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/ntp \ --cross-compiler="$(TARGET_CC)" \ From d4d8881731ed745aff676b860a05abdff9ff1a0c Mon Sep 17 00:00:00 2001 From: Tan En De Date: Wed, 21 Aug 2024 13:51:46 +0800 Subject: [PATCH 2469/3013] package/libkcapi: update site path Update the site path to reflect the recent organizational changes on the chronox.de website. Fixes: - http://autobuild.buildroot.org/results/77243633783ac2d037d15d7e9c01384781fe700e Signed-off-by: Tan En De Signed-off-by: Yann E. MORIN --- package/libkcapi/libkcapi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index 11462d6e2a1..7a79dd55ae8 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -6,7 +6,7 @@ LIBKCAPI_VERSION = 1.5.0 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz -LIBKCAPI_SITE = http://www.chronox.de/libkcapi +LIBKCAPI_SITE = http://www.chronox.de/libkcapi/releases/$(LIBKCAPI_VERSION) LIBKCAPI_AUTORECONF = YES LIBKCAPI_INSTALL_STAGING = YES LIBKCAPI_LICENSE = BSD-3-Clause (library), BSD-3-Clause or GPL-2.0 (programs) From 7944b8811b801d0ad4fa1a179c2bad1db4c2976b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Aug 2024 12:38:15 +0200 Subject: [PATCH 2470/3013] package/fan-ctrl: remove package For this package, we're downloading from the CVS repository viewer, but it is gone. The only way would be to download from the CVS repository itself, but really upstream is completely dead, and this package has seen no update since it has been introduced in 2013, so let's get rid of it. Signed-off-by: Thomas Petazzoni Acked-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/fan-ctrl/Config.in | 11 ----------- package/fan-ctrl/fan-ctrl.hash | 2 -- package/fan-ctrl/fan-ctrl.mk | 27 --------------------------- 5 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 package/fan-ctrl/Config.in delete mode 100644 package/fan-ctrl/fan-ctrl.hash delete mode 100644 package/fan-ctrl/fan-ctrl.mk diff --git a/Config.in.legacy b/Config.in.legacy index c1870613afd..0bae66c3bbf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_FAN_CTRL + bool "fan-ctrl has been removed" + select BR2_LEGACY + help + This package was no longer available from SourceForge, the + upstream is completely dead. + config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE bool "flutter-dynamic-layouts-example has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index f2c63ffb6ec..317f859684f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -513,7 +513,6 @@ endmenu source "package/ev3dev-linux-drivers/Config.in" source "package/evemu/Config.in" source "package/evtest/Config.in" - source "package/fan-ctrl/Config.in" source "package/fbtft/Config.in" source "package/fconfig/Config.in" source "package/flashrom/Config.in" diff --git a/package/fan-ctrl/Config.in b/package/fan-ctrl/Config.in deleted file mode 100644 index 869631683b2..00000000000 --- a/package/fan-ctrl/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_FAN_CTRL - bool "fan-ctrl" - depends on BR2_USE_MMU # fork() - help - Fan-ctrl is a little daemon that controls the speed of one - or more system or CPU fans. It does so by monitoring - temperature inputs and selecting a fan speed from an array - of available speeds based on a set of temperature - thresholds. - - http://fan-ctrl.sourceforge.net/ diff --git a/package/fan-ctrl/fan-ctrl.hash b/package/fan-ctrl/fan-ctrl.hash deleted file mode 100644 index 4f26696785a..00000000000 --- a/package/fan-ctrl/fan-ctrl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha1 d8ba5bac15e90c36a4e908ca1c98fac83bf702ea fan-ctrl.c?revision=1.3 diff --git a/package/fan-ctrl/fan-ctrl.mk b/package/fan-ctrl/fan-ctrl.mk deleted file mode 100644 index 81a52f1e9f3..00000000000 --- a/package/fan-ctrl/fan-ctrl.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# fan-ctrl -# -################################################################################ - -# no release, so grab .c file directly from viewvc -FAN_CTRL_VERSION = 1.3 -FAN_CTRL_SOURCE = fan-ctrl.c?revision=$(FAN_CTRL_VERSION) -FAN_CTRL_SITE = http://fan-ctrl.cvs.sourceforge.net/viewvc/fan-ctrl/fan-ctrl -FAN_CTRL_LICENSE = GPL-2.0+ -FAN_CTRL_LICENSE_FILES = fan-ctrl.c - -define FAN_CTRL_EXTRACT_CMDS - cp $(FAN_CTRL_DL_DIR)/$(FAN_CTRL_SOURCE) $(@D)/fan-ctrl.c -endef - -define FAN_CTRL_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/fan-ctrl.c -o $(@D)/fan-ctrl -endef - -define FAN_CTRL_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/fan-ctrl $(TARGET_DIR)/usr/sbin/fan-ctrl -endef - -$(eval $(generic-package)) From 9f1725c4cc29fd91d05ca385c5c0cc531f295a38 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Aug 2024 13:03:34 +0200 Subject: [PATCH 2471/3013] package/ledmon: add patch fixing SSP detection Fixes: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/13.3.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared: No such file or directory /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/13.3.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: cannot find -lssp: No such file or directory collect2: error: ld returned 1 exit status make[4]: *** [Makefile:425: ledctl] Error 1 http://autobuild.buildroot.net/results/969b62c89bc37326260fb23c5652e21c0662cba2/ This issue exists since upstream commit 940149a9b53627ceabe67b01aac2859fb7c6fde0 ("Add compiler defenses flags (#145)"), which has added -fstack-protector-strong to the flags tested and used if supported. This commit first appeared in v1.0.0, which is used by Buildroot since commit b3819b761f4a06bc75fe33b785e5ff2cecc5d211 (which first appeared in 2024.05). Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- ...-AX_CHECK_LINK_FLAG-to-test-gcc-flag.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/ledmon/0002-configure.ac-use-AX_CHECK_LINK_FLAG-to-test-gcc-flag.patch diff --git a/package/ledmon/0002-configure.ac-use-AX_CHECK_LINK_FLAG-to-test-gcc-flag.patch b/package/ledmon/0002-configure.ac-use-AX_CHECK_LINK_FLAG-to-test-gcc-flag.patch new file mode 100644 index 00000000000..730eb295951 --- /dev/null +++ b/package/ledmon/0002-configure.ac-use-AX_CHECK_LINK_FLAG-to-test-gcc-flag.patch @@ -0,0 +1,49 @@ +From 0d391dbcb808755a65fcc9a8a0ceaf3aa53d153f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 19 Aug 2024 00:08:40 +0200 +Subject: [PATCH] configure.ac: use AX_CHECK_LINK_FLAG() to test gcc flags + +ledmon's configure.ac defines an AX_AM_CFLAGS_ADD() macro that allows +to test if a flag is supported by gcc, and if so add it to +AM_CFLAGS. In order to test if the flag works, it uses +AX_CHECK_COMPILE_FLAG(), which only does a *compile* test, but not +a *link* test. However, some flags such as -fstack-protector might +appear to work at compile time, but not link time. Therefore +-fstack-protector is considered functional: + +checking whether C compiler accepts -fstack-protector-strong... yes + +but the build later fails: + +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/13.3.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared: No such file or directory +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/13.3.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: cannot find -lssp: No such file or directory +collect2: error: ld returned 1 exit status + +In order to fix this, we test all flags with AX_CHECK_LINK_FLAG() +which does a full *link* of the test program. This allows to make sure +that the flag is fully functional. In our test case, +-fstack-protector-strong will be determined as being non-functional, +and therefore won't be used. + +Upstream: https://github.com/intel/ledmon/pull/244 +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d3fada5..747b168 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,7 +52,7 @@ AC_CONFIG_HEADERS([config_ac.h]) + AM_CFLAGS='-Wall -I../config' + AM_CPPFLAGS='-D_DEBUG -D_GNU_SOURCE -D_DEFAULT_SOURCE -DDMALLOC_DISABLE -DBUILD_LABEL=\""$(BUILD_LABEL)"\"' + +-AC_DEFUN([AX_AM_CFLAGS_ADD],[AX_CHECK_COMPILE_FLAG($1, AM_CFLAGS="$AM_CFLAGS $1")]) ++AC_DEFUN([AX_AM_CFLAGS_ADD],[AX_CHECK_LINK_FLAG($1, AM_CFLAGS="$AM_CFLAGS $1")]) + AX_AM_CFLAGS_ADD([-Wformat -Wformat-security]) + AX_AM_CFLAGS_ADD([-Wformat-overflow=2]) + AX_AM_CFLAGS_ADD([-Wno-strict-overflow]) +-- +2.46.0 + From df596e57b85ea3bb95ab3d04f9e393b23db319fd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 14 Jul 2024 23:35:30 +0200 Subject: [PATCH 2472/3013] support/testing: fs: new btrfs runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 009f9106d991c9adbf8e57869d4355e0f71da31b) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/fs/test_btrfs.py | 56 +++++++++++++++++++ .../tests/fs/test_btrfs/linux-btrfs.fragment | 1 + 3 files changed, 59 insertions(+) create mode 100644 support/testing/tests/fs/test_btrfs.py create mode 100644 support/testing/tests/fs/test_btrfs/linux-btrfs.fragment diff --git a/DEVELOPERS b/DEVELOPERS index b13a346c5db..297dcd06ecb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1785,6 +1785,8 @@ F: package/z3/ F: package/zynaddsubfx/ F: support/testing/tests/boot/test_optee_os.py F: support/testing/tests/boot/test_optee_os/ +F: support/testing/tests/fs/test_btrfs.py +F: support/testing/tests/fs/test_btrfs/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py diff --git a/support/testing/tests/fs/test_btrfs.py b/support/testing/tests/fs/test_btrfs.py new file mode 100644 index 00000000000..90b868a955a --- /dev/null +++ b/support/testing/tests/fs/test_btrfs.py @@ -0,0 +1,56 @@ +import os + +import infra.basetest + + +class TestBtrfs(infra.basetest.BRTest): + kern_frag = \ + infra.filepath("tests/fs/test_btrfs/linux-btrfs.fragment") + btrfs_label = "BR_TEST" + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.39" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_BTRFS_PROGS=y + BR2_TARGET_ROOTFS_BTRFS=y + BR2_TARGET_ROOTFS_BTRFS_LABEL="{btrfs_label}" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk = os.path.join(self.builddir, "images", "rootfs.btrfs") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = ["root=/dev/vda", "console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-drive", f"file={disk},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # We check our root filesystem is in btrfs format. + cmd = "mount | grep '/dev/root on / type btrfs'" + self.assertRunOk(cmd) + + # We show the root filesystem info with btrfs-progs, using the + # target btrfs-progs. + self.assertRunOk("btrfs filesystem show /") + + # We query the label and check it is the one from the + # Buildroot config. + out, ret = self.emulator.run("btrfs filesystem label /") + self.assertEqual(ret, 0) + self.assertEqual(out[0], self.btrfs_label) + + # We try to write data on the root filesystem. + self.assertRunOk("echo 'Hello Buildroot' > /root/file.txt") + self.assertRunOk("sync") diff --git a/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment b/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment new file mode 100644 index 00000000000..605c1837e10 --- /dev/null +++ b/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment @@ -0,0 +1 @@ +CONFIG_BTRFS_FS=y From 4795d2b97d6abc2c5f0c407dd6bb083fa9178cf5 Mon Sep 17 00:00:00 2001 From: Aleksandr Makarov Date: Fri, 12 Jul 2024 22:00:16 +0300 Subject: [PATCH 2473/3013] package/libest: Add support for openssl v3 libest uses functions that are no longer available in OpenSSL 3.0. Add a wrapper that calls the proper replacements depending on the version. Fixes: http://autobuild.buildroot.net/results/89024d6c1f10959282470b120d332fb32922b3b6 Signed-off-by: Aleksandr Makarov [Arnout: add Upstream: tag to patches] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 8dc7445056d1c21e4e4205cfcd92c0b539597e12) Signed-off-by: Peter Korsgaard --- ...ix-error-implicit-declaration-of-fun.patch | 64 +++++ ...libest-Add-OpenSSL-3.0-compatibility.patch | 225 ++++++++++++++++++ 2 files changed, 289 insertions(+) create mode 100644 package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch create mode 100644 package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch diff --git a/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch b/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch new file mode 100644 index 00000000000..6fd952170e3 --- /dev/null +++ b/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch @@ -0,0 +1,64 @@ +From 28c65fd9dff2f30438b98f0b71f387468259a2c3 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Fri, 12 Jul 2024 21:07:10 +0300 +Subject: [PATCH] =?UTF-8?q?package/libest:=20fix=20error:=20implicit?= + =?UTF-8?q?=20declaration=20of=20function=20=E2=80=98ERR=5Ferror=5Fstring?= + =?UTF-8?q?=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Added necessary header includes to fix 'implicit declaration' errors which occur when +using -Wimplicit-function-declaration flag. + +Upstream: https://github.com/cisco/libest/pull/132 +Signed-off-by: Aleksandr Makarov +--- + src/est/est.c | 4 +++- + src/est/est_client.c | 1 + + src/est/est_server_http.c | 2 ++ + 3 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/est/est.c b/src/est/est.c +index 8a65f87..24474c0 100644 +--- a/src/est/est.c ++++ b/src/est/est.c +@@ -42,7 +42,9 @@ + #include + #endif /* DISABLE_BACKTRACE*/ + #endif /* WIN32*/ +- ++#include ++#include ++#include + #ifndef ENABLE_CLIENT_ONLY + static char hex_chpw[] = {0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, + 0xF7, 0x0D, 0x01, 0x09, 0x07}; +diff --git a/src/est/est_client.c b/src/est/est_client.c +index 8dff9d9..5c25d4f 100644 +--- a/src/est/est_client.c ++++ b/src/est/est_client.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #include "est.h" + #include "est_locl.h" + #include "est_ossl_util.h" +diff --git a/src/est/est_server_http.c b/src/est/est_server_http.c +index 2bd08d5..ce1cece 100644 +--- a/src/est/est_server_http.c ++++ b/src/est/est_server_http.c +@@ -42,6 +42,8 @@ + #include + #include + #include ++#include ++#include + #if defined(_WIN32) + #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005 + #else +-- +2.40.1 + diff --git a/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch b/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch new file mode 100644 index 00000000000..a4c74e424a0 --- /dev/null +++ b/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch @@ -0,0 +1,225 @@ +From ad5ce7ff1cae92c151dc6f350ef943106ddd852f Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Fri, 12 Jul 2024 21:07:36 +0300 +Subject: [PATCH] package/libest: Add OpenSSL 3.0 compatibility + +The functions `FIPS_mode` and `FIPS_mode_set` are deprecated in OpenSSL 3.0, replaced by +`EVP_default_properties_is_fips_enabled` and `EVP_default_properties_enable_fips` respectively. + +This commit introduces wrappers for these new EVP APIs to maintain compatibility with OpenSSL 3.0, +while ensuring continued support for older versions of OpenSSL. + +- Implemented `is_fips_enabled` wrapper around `EVP_default_properties_is_fips_enabled` +- Implemented `enable_fips` wrapper around `EVP_default_properties_enable_fips` +- Added conditional compilation to support both new and legacy OpenSSL versions + +Upstream: https://github.com/cisco/libest/pull/132 +Signed-off-by: Aleksandr Makarov +--- + example/client-brski/estclient-brski.c | 2 +- + example/client/estclient.c | 2 +- + example/proxy/estproxy.c | 2 +- + example/server/estserver.c | 2 +- + java/jni/client.c | 2 +- + src/est/est_client.c | 12 ++++++------ + src/est/est_ossl_util.c | 18 ++++++++++++++++++ + src/est/est_ossl_util.h | 2 ++ + src/est/est_server.c | 2 +- + test/UT/US1864/us1864.c | 4 ++-- + 10 files changed, 34 insertions(+), 14 deletions(-) + +diff --git a/example/client-brski/estclient-brski.c b/example/client-brski/estclient-brski.c +index 9e63af5..6e03052 100644 +--- a/example/client-brski/estclient-brski.c ++++ b/example/client-brski/estclient-brski.c +@@ -388,7 +388,7 @@ int main (int argc, char **argv) + break; + case 'f': + /* Turn FIPS on if requested and exit if failure */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (!set_fips_return) { + printf("\nERROR setting FIPS MODE ON ...\n"); + ERR_load_crypto_strings(); +diff --git a/example/client/estclient.c b/example/client/estclient.c +index a8a2d6f..75b1272 100644 +--- a/example/client/estclient.c ++++ b/example/client/estclient.c +@@ -1280,7 +1280,7 @@ int main (int argc, char **argv) + break; + case 'f': + /* Turn FIPS on if requested and exit if failure */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (!set_fips_return) { + printf("\nERROR setting FIPS MODE ON ...\n"); + ERR_load_crypto_strings(); +diff --git a/example/proxy/estproxy.c b/example/proxy/estproxy.c +index 114bd65..6dbdbda 100644 +--- a/example/proxy/estproxy.c ++++ b/example/proxy/estproxy.c +@@ -593,7 +593,7 @@ int main (int argc, char **argv) + /* + * Turn FIPS on if user requested it and exit if failure + */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (set_fips_return != 1) { + set_fips_error = ERR_get_error(); + printf("\nERROR WHILE SETTING FIPS MODE ON exiting ....\n"); +diff --git a/example/server/estserver.c b/example/server/estserver.c +index 3539dc4..90886cf 100644 +--- a/example/server/estserver.c ++++ b/example/server/estserver.c +@@ -2285,7 +2285,7 @@ int main (int argc, char **argv) + /* turn FIPS on if user requested it + * and exit if failure. + */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (set_fips_return != 1) { + set_fips_error = ERR_get_error(); + printf("\nERROR WHILE SETTING FIPS MODE ON exiting ....\n"); +diff --git a/java/jni/client.c b/java/jni/client.c +index c5bc28e..f58d5c0 100644 +--- a/java/jni/client.c ++++ b/java/jni/client.c +@@ -179,7 +179,7 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ + */ + JNIEXPORT jint JNICALL Java_com_cisco_c3m_est_ESTClient_enable_1fips( + JNIEnv *env, jclass obj) { +- if (!FIPS_mode() && !FIPS_mode_set(1)) { ++ if (!est_is_fips_enabled() && !est_enable_fips(1)) { + ERR_print_errors_fp(stderr); + return -1; + } else { +diff --git a/src/est/est_client.c b/src/est/est_client.c +index 5c25d4f..63069af 100644 +--- a/src/est/est_client.c ++++ b/src/est/est_client.c +@@ -3183,7 +3183,7 @@ EST_ERROR est_client_enroll_internal (EST_CTX *ctx, char *cn, int *pkcs7_len, in + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -3594,7 +3594,7 @@ EST_ERROR est_client_reenroll (EST_CTX *ctx, X509 *cert, int *pkcs7_len, EVP_PKE + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -3680,7 +3680,7 @@ static EST_ERROR est_client_enroll_csr_internal (EST_CTX *ctx, X509_REQ *csr, in + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -5872,7 +5872,7 @@ static EST_ERROR est_client_brski_send_get_voucher (EST_CTX *ctx, int *cacert_le + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -6366,7 +6366,7 @@ EST_ERROR est_client_brski_send_voucher_status (EST_CTX *ctx, EST_BRSKI_STATUS_V + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -6535,7 +6535,7 @@ EST_ERROR est_client_brski_send_enroll_status (EST_CTX *ctx, EST_BRSKI_STATUS_VA + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +diff --git a/src/est/est_ossl_util.c b/src/est/est_ossl_util.c +index daa54f2..0887daa 100644 +--- a/src/est/est_ossl_util.c ++++ b/src/est/est_ossl_util.c +@@ -500,3 +500,21 @@ char *est_find_ser_num_in_subj(X509 *cert) + return(ser_num_str); + } + #endif ++ ++int est_is_fips_enabled() ++{ ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++ return EVP_default_properties_is_fips_enabled(NULL); ++#else ++ return FIPS_mode(); ++#endif ++} ++ ++int est_enable_fips(int enable) ++{ ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++ return EVP_default_properties_enable_fips(NULL, enable); ++#else ++ return FIPS_mode_set(enable); ++#endif ++} +diff --git a/src/est/est_ossl_util.h b/src/est/est_ossl_util.h +index 68ad290..2389e45 100644 +--- a/src/est/est_ossl_util.h ++++ b/src/est/est_ossl_util.h +@@ -44,4 +44,6 @@ LIBEST_TEST_API void ossl_dump_ssl_errors(void); + EST_ERROR ossl_init_cert_store(X509_STORE *store, + unsigned char *raw1, int size1); + ++int est_is_fips_enabled(); ++int est_enable_fips(int); + #endif +diff --git a/src/est/est_server.c b/src/est/est_server.c +index d047b48..979ae53 100644 +--- a/src/est/est_server.c ++++ b/src/est/est_server.c +@@ -3355,7 +3355,7 @@ EST_ERROR est_server_set_auth_mode (EST_CTX *ctx, EST_HTTP_AUTH_MODE amode) + /* + * Since HTTP digest auth uses MD5, make sure we're not in FIPS mode. + */ +- if (FIPS_mode()) { ++ if (est_is_fips_enabled()) { + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + return (EST_ERR_BAD_MODE); + } +diff --git a/test/UT/US1864/us1864.c b/test/UT/US1864/us1864.c +index 3e41cd7..1f57494 100644 +--- a/test/UT/US1864/us1864.c ++++ b/test/UT/US1864/us1864.c +@@ -218,12 +218,12 @@ static void us1864_test1 (void) + /* + * Make sure we don't allow DIGEST mode when in FIPS mode + */ +- if (!FIPS_mode_set(1)) { ++ if (!est_enable_fips(1)) { + printf("FIPS mode not supported, skipping test to prevent digest auth when in FIPS mode"); + } else { + est_rv = est_server_set_auth_mode(ctx, AUTH_DIGEST); + CU_ASSERT(est_rv == EST_ERR_BAD_MODE); +- FIPS_mode_set(0); ++ est_enable_fips(0); + } + + X509_free(x); +-- +2.40.1 + From 91cd1bef728c8d2850504a66fdae89af5c0ef258 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 22 Aug 2024 16:26:00 +0200 Subject: [PATCH 2474/3013] CHANGES: add new defconfigs missing from 2024.08-rc1 Signed-off-by: Peter Korsgaard --- CHANGES | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 84245655eb2..d5c5badaf1a 100644 --- a/CHANGES +++ b/CHANGES @@ -14,8 +14,9 @@ fuzz is accepted anymore. - Improvements to the canonical example of SysV init script - New defconfigs: arm_fvp_ebbr, beaglev_fire, cubieboard1, - imx6ulz_bsh_smm_m2_defconfig, spike_riscv32, + New defconfigs: arm_fvp_ebbr, beagleplay, beaglev_fire, + cubieboard1, imx6ulz_bsh_smm_m2_defconfig, raspberrypi5, + spike_riscv32. ti_am62ax_sk, versal_vpk180 Removed defconfigs: beagleboardx15, beaglev, imx8mpico From 106a098b7bd5520385981366abf5ef423deb7517 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 22 Aug 2024 18:21:10 +0200 Subject: [PATCH 2475/3013] Update for 2024.08-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index d5c5badaf1a..076d6162e11 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2024.08-rc2, released August 22nd, 2024 + + Fixes all over the tree. + + Infrastructure: use "-ztext" rather than "-z text" in LDFLAGS + to work around buggy build systems + + Defconfigs: Beaglev fire / Microchip mpfs icicle: Correct + Linux/U-Boot tarballs, Raspberryi 5: Correct CPU setting, + Zynqmp zcu106: use v1.0 DDR config, Zynqmp zcu10* / kria*: + Correct U-Boot dependency + + Updated/fixed packages: aer-inject, asterisk, atop, aumix, + avahi, botan, chicken, dc3dd, ffmpeg, flashrom, gnuradio, + gnu-efi, gnutls, hiawatha, iperf3, iproute2, ledmon, libffi, + libgpg-error, libkcapi, libpcap, mariadb, mdadm, ncurses, + nginx, ntpsec, python-huepy, python-tpm2-pytss, + python-unittest-xml-reporting, qt6base, qt6tools, skopeo, + strongswan, systemd, uboot, uclibc, unbound, vboot-utils, + wpa_supplicant, wpebackend-fdo + + Removed packages: fan-ctrl + 2024.08-rc1, released August 8th, 2024 Fixes all over the tree (especially related to GCC 14.x diff --git a/Makefile b/Makefile index 284a0bb20ee..55aeafde233 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.08-rc1 +export BR2_VERSION := 2024.08-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1723149000 +BR2_VERSION_EPOCH = 1724343000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index cbf0db6bb96..207ba08c8b4 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

        buildroot-2024.05.2.tar.xz

        -

        Latest release candidate: 2024.08-rc1

        +

        Latest release candidate: 2024.08-rc2

        - +
        - +
        -

        buildroot-2024.08-rc1.tar.gz

        -

        PGP signature

        +

        buildroot-2024.08-rc2.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2024.08-rc1.tar.xz

        -

        PGP signature

        +

        buildroot-2024.08-rc2.tar.xz

        +

        PGP signature

        diff --git a/docs/website/news.html b/docs/website/news.html index 487586a894d..285dfbfdde2 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2024.08-rc2 released

          +

          22 August 2024

          +
          +
          +

          Another 2 weeks, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

          + +

          Go to the downloads page to pick up the + 2024.08-rc2 + release, and report any problems found to the + mailing list or + bug tracker.

          +
          +
          +
          • +
        • From 3da3361a1b9cafb274dac776693720fe20f6681b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Aug 2024 12:56:06 +0200 Subject: [PATCH 2476/3013] support/testing: package: mariadb: fix test configuration The mysql virtual package was removed in commit 8708f3a23a "package/mysql: drop virtual package". The mariadb runtime test was authored before this mysql virtual package removal, but was merged after it, in commit 5356754d1e "support/testing: add mariadb runtime test". Due to this, this test always failed with the error: Makefile.legacy:9: *** "You have legacy configuration in your .config! Please check your configuration.". Stop. This commit fixes the issue by removing the legacy BR2_PACKAGE_MYSQL=y configuration directive. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7540345406 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_mariadb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py index 523f075db18..d40ffdba961 100644 --- a/support/testing/tests/package/test_mariadb.py +++ b/support/testing/tests/package/test_mariadb.py @@ -19,7 +19,6 @@ class TestMariaDB(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.78" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" - BR2_PACKAGE_MYSQL=y BR2_PACKAGE_MARIADB=y BR2_PACKAGE_MARIADB_SERVER=y BR2_TARGET_ROOTFS_EXT2=y From 2495630383c4a6659b6b91a58e4f71cdda283f2f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Aug 2024 15:09:49 +0200 Subject: [PATCH 2477/3013] boot/grub2: ignore CVE-2024-1048 As explained in: https://security-tracker.debian.org/tracker/CVE-2024-1048 https://www.openwall.com/lists/oss-security/2024/02/06/3 CVE-2024-1048 is related to a tool called grub-set-bootflag which only exists in the Redhat fork of Grub, and which we don't use in Buildroot, so this CVE should be ignored. Signed-off-by: Thomas Petazzoni --- boot/grub2/grub2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 6d0d71c47d0..19544b6e121 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -25,6 +25,9 @@ GRUB2_IGNORE_CVES += CVE-2019-14865 GRUB2_IGNORE_CVES += CVE-2020-15705 # vulnerability is specific to the SUSE distribution GRUB2_IGNORE_CVES += CVE-2021-46705 +# vulnerability is specific to the Redhat distribution, affects the +# grub2-set-bootflag tool, which doesn't exist upstream +GRUB2_IGNORE_CVES += CVE-2024-1048 ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES From e2f46ed03db7f07e62ce44f22dba0db53a5d2fd4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Aug 2024 15:14:46 +0200 Subject: [PATCH 2478/3013] boot/grub2: ignore CVE-2023-4001 This vulnerability is irrelevant to Buildroot, as it affects only some downstream changes from Redhat. See: https://security-tracker.debian.org/tracker/CVE-2023-4001 https://www.openwall.com/lists/oss-security/2024/01/15/3 Signed-off-by: Thomas Petazzoni --- boot/grub2/grub2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 19544b6e121..1263c63cfdf 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -25,6 +25,9 @@ GRUB2_IGNORE_CVES += CVE-2019-14865 GRUB2_IGNORE_CVES += CVE-2020-15705 # vulnerability is specific to the SUSE distribution GRUB2_IGNORE_CVES += CVE-2021-46705 +# vulnerability is specific to the Redhat distribution, affects a +# downstream change from Redhat related to password authentication +GRUB2_IGNORE_CVES += CVE-2023-4001 # vulnerability is specific to the Redhat distribution, affects the # grub2-set-bootflag tool, which doesn't exist upstream GRUB2_IGNORE_CVES += CVE-2024-1048 From 6fdbab87a2b9d00743ed9fe6caa6db365d7ca326 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 23 Aug 2024 10:31:50 +0200 Subject: [PATCH 2479/3013] DEVELOPERS: drop some entries from Thomas Huth's section I lack the time (and interest) to properly keep these entries up to date, so drop them from my section. Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d7d0af35431..426590d5c5f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3097,10 +3097,7 @@ F: package/fluent-bit/ F: package/libsoup3/ N: Thomas Huth -F: board/qemu/m68k-mcf5208/ -F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ -F: package/frotz/ F: package/kvm-unit-tests/ F: package/xorcurses/ From ed2d440a08aba129a737705b2ac4231dc1bb0be4 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 23 Aug 2024 10:40:40 +0200 Subject: [PATCH 2480/3013] package/frotz: remove the "frotz" package I'm not much interested anymore in maintaining the "frotz" package in buildroot, and since I likely was the only one who really used it in the past years, I guess it's time remove it now. Fixes: http://autobuild.buildroot.net/results/077e4756e56903f094b935af4ee8829507e0c3de/ Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/frotz/Config.in | 10 ---------- package/frotz/frotz.hash | 3 --- package/frotz/frotz.mk | 31 ------------------------------- 5 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 package/frotz/Config.in delete mode 100644 package/frotz/frotz.hash delete mode 100644 package/frotz/frotz.mk diff --git a/Config.in.legacy b/Config.in.legacy index 0bae66c3bbf..d8480106baf 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_FROTZ + bool "frotz has been removed" + select BR2_LEGACY + help + This package was causing build breakage, and was no longer + maintained in Buildroot. + config BR2_PACKAGE_FAN_CTRL bool "fan-ctrl has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 317f859684f..211080345ad 100644 --- a/package/Config.in +++ b/package/Config.in @@ -293,7 +293,6 @@ menu "Games" source "package/doom-wad/Config.in" source "package/flare-engine/Config.in" source "package/flare-game/Config.in" - source "package/frotz/Config.in" source "package/gnuchess/Config.in" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" diff --git a/package/frotz/Config.in b/package/frotz/Config.in deleted file mode 100644 index 9473f5944d2..00000000000 --- a/package/frotz/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_FROTZ - bool "frotz" - select BR2_PACKAGE_NCURSES - help - Frotz is an interpreter for old Infocom adventure games and - other Z-code games. Note that frotz cannot be run as root. - You must add a normal user to your buildroot configuration to - be able to use it. - - https://661.org/proj/if/frotz/ diff --git a/package/frotz/frotz.hash b/package/frotz/frotz.hash deleted file mode 100644 index 145aa3800fc..00000000000 --- a/package/frotz/frotz.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 bdf9131e6de49108c9f032200cea3cb4011e5ca0c9fbdbf5b0c05f7c56c81395 frotz-2.54.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frotz/frotz.mk b/package/frotz/frotz.mk deleted file mode 100644 index 4c477c396df..00000000000 --- a/package/frotz/frotz.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# Frotz -# -################################################################################ - -FROTZ_VERSION = 2.54 -FROTZ_SOURCE = frotz-$(FROTZ_VERSION).tar.bz2 -FROTZ_SITE = $(call gitlab,DavidGriffith,frotz,$(FROTZ_VERSION)) -FROTZ_DEPENDENCIES = host-pkgconf ncurses -FROTZ_LICENSE = GPL-2.0+ -FROTZ_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -FROTZ_CURSES=ncursesw -FROTZ_UTF8=yes -else -FROTZ_CURSES=ncurses -endif - -define FROTZ_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr CONFIG_DIR=/etc \ - SOUND_TYPE=none CURSES="$(FROTZ_CURSES)" USE_UTF8=$(FROTZ_UTF8) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" -endef - -define FROTZ_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/frotz $(TARGET_DIR)/usr/bin/frotz -endef - -$(eval $(generic-package)) From 8b483b3032ee5f6279f33546517e5b05b936d06b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Aug 2024 09:56:00 +0200 Subject: [PATCH 2481/3013] board/qemu/patches/arm-trusted-firmware: add v2.10 hash Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/7644930127 ERROR: No hash found for arm-trusted-firmware-v2.10-git4.tar.gz Commit d037d9c2d63e9cd47b (configs/qemu: Update defconfigs to Linux 6.6.32) enabled BR2_DOWNLOAD_FORCE_CHECK_HASHES, but forgot to take into consideration that qemu_aarch64_ebbr_defconfig uses arm-trusted-firmware v2.10 since commit 73813c56c8bb (configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A). Add the hash to fix the build. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- .../qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0b99949745e..5632db01f84 100644 --- a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 c9f0d0bf967d690edbf34b621728a6271856f2e26ed46081a285b6d627a358c5 arm-trusted-firmware-v2.7-git4.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz From e656625b8a68e15deb9afaeaa4d61de5171288a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Aug 2024 20:20:42 +0200 Subject: [PATCH 2482/3013] package/libcurl: security bump to version 8.9.1 Changelog: https://curl.se/changes.html#8_9_1 Fixes CVE-2024-7264. Signed-off-by: Bernd Kuhls Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index fa325efd7de..1d019355015 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.9.0.tar.xz.asc +# https://curl.se/download/curl-8.9.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 curl-8.9.0.tar.xz +sha256 f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5 curl-8.9.1.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 966885aedad..3661cbf5bd4 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.9.0 +LIBCURL_VERSION = 8.9.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From ebef582bd28fa183818ab973b58e167c75548a07 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Aug 2024 20:08:47 +0200 Subject: [PATCH 2483/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 429a7eabefd..eab5cb85117 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.3" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.6" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 4e05f4a7654..e8a9e0f0eb4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fa5f22fd67dd05812d39dca579320c493048e26c4a556048a12385e7ae6fc698 linux-6.10.3.tar.xz -sha256 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 linux-6.6.44.tar.xz -sha256 5eb4706f898f50881552ff5146d892132d3ffc5298033bffe27087d3a44c4573 linux-6.1.103.tar.xz +sha256 e0d50d5b74f8599375660e79f187af7493864dba5ff6671b14983376a070b3d1 linux-6.10.6.tar.xz +sha256 d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50 linux-6.6.47.tar.xz +sha256 3773c9052c7ba7432e8337ca84bee115c1a94ccef9d62b72b99ae30c4cd5f80f linux-6.1.106.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186 linux-5.15.164.tar.xz -sha256 ca09d86a6b79706c33382d3f8606f476eb07918417a87fb1815f6a4aa81f2ba1 linux-5.10.223.tar.xz -sha256 44a0c3e76031f7513ce43e22e2a9dcbf7d6a6dee065dca9b8001843a075272b2 linux-5.4.281.tar.xz +sha256 a36dd3e82ceb634afded31f2656568f57c4d9c4b399859f298b18116df11c6fe linux-5.15.165.tar.xz +sha256 19b099c67324bba6378e22dc51ad3906e4dcd6a908d137766b4bfa9174ddd11a linux-5.10.224.tar.xz +sha256 5582770976d33bb7bf9494e0fa0c49f449aa02b0133d00a5a198b6c208dd7de0 linux-5.4.282.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 544ddc7339cf1b1d1ead1992e67d11a0834ad3bc77faa063e06b5d18c682eb30 linux-4.19.319.tar.xz +sha256 9d671a12b00301b7ce63022d4e4afa3e40aa318f8f7f25a1147e602fdb1047a1 linux-4.19.320.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 83b8d1267ed..934f427e4e6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -423,13 +423,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.319" if BR2_KERNEL_HEADERS_4_19 - default "5.4.281" if BR2_KERNEL_HEADERS_5_4 - default "5.10.223" if BR2_KERNEL_HEADERS_5_10 - default "5.15.164" if BR2_KERNEL_HEADERS_5_15 - default "6.1.103" if BR2_KERNEL_HEADERS_6_1 - default "6.6.44" if BR2_KERNEL_HEADERS_6_6 - default "6.10.3" if BR2_KERNEL_HEADERS_6_10 + default "4.19.320" if BR2_KERNEL_HEADERS_4_19 + default "5.4.282" if BR2_KERNEL_HEADERS_5_4 + default "5.10.224" if BR2_KERNEL_HEADERS_5_10 + default "5.15.165" if BR2_KERNEL_HEADERS_5_15 + default "6.1.106" if BR2_KERNEL_HEADERS_6_1 + default "6.6.47" if BR2_KERNEL_HEADERS_6_6 + default "6.10.6" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 65247fcc6a12eb2443ae9861e7cd36b3881a466e Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 22 Aug 2024 14:17:09 +0200 Subject: [PATCH 2484/3013] package/python-sqlparse: security bump to version 0.5.1 Changelog: * https://sqlparse.readthedocs.io/en/latest/changes.html#release-0-5-1-jul-15-2024 * https://sqlparse.readthedocs.io/en/latest/changes.html#release-0-5-0-apr-13-2024 Version 0.5.0 fixes the following security issue [1]: Parsing heavily nested list leads to Denial of Service Build backend switched from flit to hatchling in [2]. [1] https://github.com/andialbrecht/sqlparse/security/advisories/GHSA-2m57-hf25-phgg [2] https://github.com/andialbrecht/sqlparse/commit/326a316446c3e091a93950251e3e376ebf0d4127 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-sqlparse/python-sqlparse.hash | 4 ++-- package/python-sqlparse/python-sqlparse.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-sqlparse/python-sqlparse.hash b/package/python-sqlparse/python-sqlparse.hash index 0b7c14d9aef..1fe84297243 100644 --- a/package/python-sqlparse/python-sqlparse.hash +++ b/package/python-sqlparse/python-sqlparse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlparse/json -md5 67798c7a0dae90f263d20e9ecf62c8cd sqlparse-0.4.4.tar.gz -sha256 d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c sqlparse-0.4.4.tar.gz +md5 969a64f03d7da1144fc74aad390f9db4 sqlparse-0.5.1.tar.gz +sha256 bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e sqlparse-0.5.1.tar.gz # Locally computed sha256 checksums sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 3f99eb64768..57cef1d6723 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -4,12 +4,13 @@ # ################################################################################ -PYTHON_SQLPARSE_VERSION = 0.4.4 +PYTHON_SQLPARSE_VERSION = 0.5.1 PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz -PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/65/16/10f170ec641ed852611b6c9441b23d10b5702ab5288371feab3d36de2574 -PYTHON_SQLPARSE_SETUP_TYPE = flit +PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/73/82/dfa23ec2cbed08a801deab02fe7c904bfb00765256b155941d789a338c68 +PYTHON_SQLPARSE_SETUP_TYPE = pep517 PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE +PYTHON_SQLPARSE_DEPENDENCIES = host-python-hatchling PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project PYTHON_SQLPARSE_CPE_ID_PRODUCT = sqlparse From ea6bb507b1d3841be052525936121f7e88c43fbd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 19 Aug 2024 18:03:25 -0600 Subject: [PATCH 2485/3013] utils/genrandconfig: allow overriding KCONFIG_PROBABILITY Tweaking this variable should allow us to get better coverage of packages with larger dependency trees. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index ae1f0f85de4..282a9ebdea9 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -542,7 +542,7 @@ async def gen_config(args): proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), - "KCONFIG_PROBABILITY=%d" % randint(1, 20), + "KCONFIG_PROBABILITY=%d" % args.probability, "randconfig", stdout=asyncio.subprocess.DEVNULL, stderr=asyncio.subprocess.DEVNULL) @@ -603,6 +603,21 @@ async def gen_config(args): if __name__ == '__main__': import argparse + + class Range(argparse.Action): + def __init__(self, minimum=None, maximum=None, *args, **kwargs): + self.min = minimum + self.max = maximum + kwargs["metavar"] = "[%d-%d]" % (self.min, self.max) + super(Range, self).__init__(*args, **kwargs) + + def __call__(self, parser, namespace, value, option_string=None): + if not (self.min <= value <= self.max): + msg = 'invalid choice: %r (choose from [%d-%d])' % \ + (value, self.min, self.max) + raise argparse.ArgumentError(self, msg) + setattr(namespace, self.dest, value) + parser = argparse.ArgumentParser(description="Generate a random configuration") parser.add_argument("--outputdir", "-o", help="Output directory (relative to current directory)", @@ -610,6 +625,10 @@ if __name__ == '__main__': parser.add_argument("--buildrootdir", "-b", help="Buildroot directory (relative to current directory)", type=str, default='.') + parser.add_argument("--probability", "-p", + help="Override the KCONFIG_PROBABILITY value", + type=int, action=Range, minimum=0, maximum=100, + default=randint(1, 20)) parser.add_argument("--toolchains-csv", help="Legacy, unused", type=str) parser.add_argument("--no-toolchains-csv", help="Legacy, unused", type=bool) From 1e8eca5e65f906207da77db8c972693f0ea92749 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 21 Aug 2024 09:37:41 +0200 Subject: [PATCH 2486/3013] package/elf2flt: fix riscv64 C++ compilations Fixes: http://autobuild.buildroot.org/results/63f/63f32c9d5d4097ef2b3cbba1ce665e13e9dbd430 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ..._RISCV_SET_ULEB128-R_RISCV_SUB_ULEB1.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/elf2flt/0001-riscv64-handle-R_RISCV_SET_ULEB128-R_RISCV_SUB_ULEB1.patch diff --git a/package/elf2flt/0001-riscv64-handle-R_RISCV_SET_ULEB128-R_RISCV_SUB_ULEB1.patch b/package/elf2flt/0001-riscv64-handle-R_RISCV_SET_ULEB128-R_RISCV_SUB_ULEB1.patch new file mode 100644 index 00000000000..3aba6eca08a --- /dev/null +++ b/package/elf2flt/0001-riscv64-handle-R_RISCV_SET_ULEB128-R_RISCV_SUB_ULEB1.patch @@ -0,0 +1,30 @@ +From 5b8288257c66c76cc578935276dc5b512010b6a3 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 21 Aug 2024 07:23:19 +0200 +Subject: [PATCH] riscv64: handle R_RISCV_SET_ULEB128/R_RISCV_SUB_ULEB128 + +For C++ applications or libraries like gdbserver or gmp +we need to handle these relocations. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/uclinux-dev/elf2flt/pull/35 +--- + elf2flt.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/elf2flt.c b/elf2flt.c +index 04b6b43..d5e32ab 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -840,6 +840,8 @@ output_relocs ( + case R_RISCV_SET8: + case R_RISCV_SET16: + case R_RISCV_SET32: ++ case R_RISCV_SET_ULEB128: ++ case R_RISCV_SUB_ULEB128: + continue; + case R_RISCV_32: + case R_RISCV_64: +-- +2.30.2 + From b331217a50e975e89e28741a05d1f7b60c62496a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 21 Aug 2024 10:16:53 +0200 Subject: [PATCH 2487/3013] package/libglob: update download URL Fixes: http://autobuild.buildroot.org/results/92c/92c697697c07f63f0e03ceb655b5d558e85c392e Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libglob/libglob.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libglob/libglob.mk b/package/libglob/libglob.mk index 90356b39734..52da3996580 100644 --- a/package/libglob/libglob.mk +++ b/package/libglob/libglob.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLOB_VERSION = 1.0 -LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION)) +LIBGLOB_SITE = $(call github,void-linux,libglob,$(LIBGLOB_VERSION)) LIBGLOB_LICENSE = BSD-3-Clause LIBGLOB_LICENSE_FILES = LICENSE LIBGLOB_INSTALL_STAGING = YES From d0d23b47393e0133b76437a274f724c16a7d7e2d Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 24 Aug 2024 08:07:54 +0200 Subject: [PATCH 2488/3013] package/libcuefile: fix build failure due to implicit declaration Fixes: - http://autobuild.buildroot.org/results/28f1e34166e836bf3b984f228bb09842840de82a Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .../0002-libcuefile-fedora-c99.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/libcuefile/0002-libcuefile-fedora-c99.patch diff --git a/package/libcuefile/0002-libcuefile-fedora-c99.patch b/package/libcuefile/0002-libcuefile-fedora-c99.patch new file mode 100644 index 00000000000..3f76dd315c7 --- /dev/null +++ b/package/libcuefile/0002-libcuefile-fedora-c99.patch @@ -0,0 +1,27 @@ +From 7dd8752f5aa2dccbaccb4c28a23f659df3bc0d19 Mon Sep 17 00:00:00 2001 +From: DJ Delorie +Date: Thu, 27 Apr 2023 17:24:58 -0400 +Subject: [PATCH] Fix C99 compatibility issue + +Related to: + + + + +See Also https://bugzilla.redhat.com/show_bug.cgi?id=2190307 +Signed-off-by: DJ Delorie +Signed-off-by: Dario Binacchi +Upstream: https://src.fedoraproject.org/rpms/libcuefile/blob/7dd8752f5aa2dccbaccb4c28a23f659df3bc0d19/f/libcuefile-fedora-c99.patch +--- +diff -rup a/src/cue_parse.c b/src/cue_parse.c +--- a/src/cue_parse.c 2011-06-18 07:28:43.000000000 -0400 ++++ b/src/cue_parse.c 2023-04-27 16:10:13.314263314 -0400 +@@ -1513,6 +1513,8 @@ void yyerror (char *s) + fprintf(stderr, "%d: %s\n", cue_lineno, s); + } + ++void cue_delete_buffer(void); ++ + Cd *cue_parse (FILE *fp) + { + cue_yyin = fp; From ed34c4c77b8b2a830c7a9ffb1d75c7bf1e35a7c4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 15 Aug 2024 16:31:48 +0200 Subject: [PATCH 2489/3013] package/unbound: security bump to version 1.21.0 Fixes the following security issue: - CVE-2024-43167: A NULL pointer dereference flaw was found in the ub_ctx_set_fwd function in Unbound. This issue could allow an attacker who can invoke specific sequences of API calls to cause a segmentation fault See announcement: https://nlnetlabs.nl/news/2024/Aug/15/unbound-1.21.0-released/ See also change log: https://nlnetlabs.nl/projects/unbound/download/#unbound-1-21-0 This commit also updates the _SITE url from [1] to [2], to follow the HTTP redirect, and the url published on the download page [3]. Finally, this commit adds a comment in the hash file that the PGP signature was checked. [1] https://www.unbound.net/downloads [2] https://nlnetlabs.nl/downloads/unbound [3] https://nlnetlabs.nl/projects/unbound/download Signed-off-by: Julien Olivain [Peter: Mark as security bump, add CVE info] Signed-off-by: Peter Korsgaard --- package/unbound/unbound.hash | 7 +++++-- package/unbound/unbound.mk | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 96ee80b0ecc..ba876299c25 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,8 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.20.0.tar.gz.sha256 -sha256 56b4ceed33639522000fd96775576ddf8782bb3617610715d7f1e777c5ec1dbf unbound-1.20.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.21.0.tar.gz.sha256 +# After checking pgp signature from: +# https://nlnetlabs.nl/downloads/unbound/unbound-1.21.0.tar.gz.asc +# with key: EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D +sha256 e7dca7d6b0f81bdfa6fa64ebf1053b5a999a5ae9278a87ef182425067ea14521 unbound-1.21.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 6ce6f9a1ba0..8677cb4d4eb 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,8 +4,8 @@ # ################################################################################ -UNBOUND_VERSION = 1.20.0 -UNBOUND_SITE = https://www.unbound.net/downloads +UNBOUND_VERSION = 1.21.0 +UNBOUND_SITE = https://nlnetlabs.nl/downloads/unbound UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause From 786484e631d34f9630baaa74006a8398aa19ad7d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Aug 2024 19:22:45 +0200 Subject: [PATCH 2490/3013] package/dovecot: security bump version to 2.3.21.1 Fixes CVE-2024-23184 & CVE-2024-23185: https://dovecot.org/mailman3/hyperkitty/list/dovecot-news@dovecot.org/thread/2CSVL56LFPAXVLWMGXEIWZL736PSYHP5/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index e42bb577a82..fde96f32a57 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d dovecot-2.3.21.tar.gz +sha256 2d90a178c4297611088bf7daae5492a3bc3d5ab6328c3a032eb425d2c249097e dovecot-2.3.21.1.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index b8652900d0b..e116bd3b780 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).21 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).21.1 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From 5dae8cddeecf16c791f3c138542ec51c4e627d75 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Aug 2024 19:22:46 +0200 Subject: [PATCH 2491/3013] package/dovecot-pigeonhole: bump version to 0.5.21.1 Release note of this bugfix release: https://dovecot.org/mailman3/hyperkitty/list/dovecot-news@dovecot.org/thread/4KDY5GDGPVG5ZMXKTBEKPKK764LT56WU/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 8cd3356dce2..247f74fdba4 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 1ca71d2659076712058a72030288f150b2b076b0306453471c5261498d3ded27 dovecot-2.3-pigeonhole-0.5.21.tar.gz +sha256 0377db284b620723de060431115fb2e7791e1df4321411af718201d6925c4692 dovecot-2.3-pigeonhole-0.5.21.1.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 679fd4db989..4d21ebd3959 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.21 +DOVECOT_PIGEONHOLE_VERSION = 0.5.21.1 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From 71f54e07804437df8cc389e618e7374e5c3e40d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2024 10:12:05 +0200 Subject: [PATCH 2492/3013] package/sofia-sip: fix static build with openssl >= 3.2.0 Fixes: http://autobuild.buildroot.org/results/de08bd5c68f5fcdaa5c0374a4f5051c4751ebb88/ and many others. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-fix-static-build-with-openssl-3.2.0.patch | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 package/sofia-sip/0002-fix-static-build-with-openssl-3.2.0.patch diff --git a/package/sofia-sip/0002-fix-static-build-with-openssl-3.2.0.patch b/package/sofia-sip/0002-fix-static-build-with-openssl-3.2.0.patch new file mode 100644 index 00000000000..03b17bcbbce --- /dev/null +++ b/package/sofia-sip/0002-fix-static-build-with-openssl-3.2.0.patch @@ -0,0 +1,109 @@ +From 145f80df25d23492ed3aa01b3750d7c002964332 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 5 Jan 2024 23:15:00 +0100 +Subject: [PATCH] fix static build with openssl >= 3.2.0 + +Rename tls_free into sofia_sip_tls_free as openssl also defines tls_free +since version 3.2.0 and +https://github.com/openssl/openssl/commit/1853d20a008a85d327f4faa9e07be40a85549f8e +resulting in the following static build failure: + +/home/autobuild/autobuild/instance-12/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: /home/autobuild/autobuild/instance-12/output-1/host/bin/../powerpc-buildroot-linux-uclibcspe/sysroot/usr/lib/libssl.a(libssl-lib-tls_common.o): in function `tls_free': +tls_common.c:(.text+0x808): multiple definition of `tls_free'; ../libsofia-sip-ua/.libs/libsofia-sip-ua.a(tport_tls.o):tport_tls.c:(.text+0x1128): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/ee862bdafd44c8c56f77e2702ee0a7462634fa0b + +Upstream: https://github.com/freeswitch/sofia-sip/pull/240 + +Signed-off-by: Fabrice Fontaine +--- + libsofia-sip-ua/tport/tport_tls.c | 10 +++++----- + libsofia-sip-ua/tport/tport_tls.h | 2 +- + libsofia-sip-ua/tport/tport_type_tls.c | 4 ++-- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libsofia-sip-ua/tport/tport_tls.c b/libsofia-sip-ua/tport/tport_tls.c +index a17186de..0739c93f 100644 +--- a/libsofia-sip-ua/tport/tport_tls.c ++++ b/libsofia-sip-ua/tport/tport_tls.c +@@ -460,7 +460,7 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti) + return 0; + } + +-void tls_free(tls_t *tls) ++void sofia_sip_tls_free(tls_t *tls) + { + int ret; + if (!tls) +@@ -473,7 +473,7 @@ void tls_free(tls_t *tls) + /* The return value -1 means that the connection wasn't actually established */ + /* so it should be safe to not call shutdown again. We need to clear the eror */ + /* queue for other connections though. */ +- tls_log_errors(3, "tls_free", 0); ++ tls_log_errors(3, "sofia_sip_tls_free", 0); + ret = 1; + } + } while (ret != 1); +@@ -514,7 +514,7 @@ tls_t *tls_init_master(tls_issues_t *ti) + + if (tls_init_context(tls, ti) < 0) { + int err = errno; +- tls_free(tls); ++ sofia_sip_tls_free(tls); + errno = err; + return NULL; + } +@@ -544,7 +544,7 @@ tls_t *tls_init_master(tls_issues_t *ti) + + if (tls->bio_con == NULL) { + tls_log_errors(1, "tls_init_master", 0); +- tls_free(tls); ++ sofia_sip_tls_free(tls); + errno = EIO; + return NULL; + } +@@ -581,7 +581,7 @@ tls_t *tls_init_secondary(tls_t *master, int sock, int accept) + + if (tls->con == NULL) { + tls_log_errors(1, "tls_init_secondary", 0); +- tls_free(tls); ++ sofia_sip_tls_free(tls); + errno = EIO; + return NULL; + } +diff --git a/libsofia-sip-ua/tport/tport_tls.h b/libsofia-sip-ua/tport/tport_tls.h +index e8d04a14..3a5fde22 100644 +--- a/libsofia-sip-ua/tport/tport_tls.h ++++ b/libsofia-sip-ua/tport/tport_tls.h +@@ -81,7 +81,7 @@ typedef struct tport_tls_primary_s { + + tls_t *tls_init_master(tls_issues_t *tls_issues); + tls_t *tls_init_secondary(tls_t *tls_master, int sock, int accept); +-void tls_free(tls_t *tls); ++void sofia_sip_tls_free(tls_t *tls); + int tls_get_socket(tls_t *tls); + void tls_log_errors(unsigned level, char const *s, unsigned long e); + ssize_t tls_read(tls_t *tls); +diff --git a/libsofia-sip-ua/tport/tport_type_tls.c b/libsofia-sip-ua/tport/tport_type_tls.c +index e030e706..fa72eed8 100644 +--- a/libsofia-sip-ua/tport/tport_type_tls.c ++++ b/libsofia-sip-ua/tport/tport_type_tls.c +@@ -276,7 +276,7 @@ static int tport_tls_init_master(tport_primary_t *pri, + static void tport_tls_deinit_primary(tport_primary_t *pri) + { + tport_tls_primary_t *tlspri = (tport_tls_primary_t *)pri; +- tls_free(tlspri->tlspri_master), tlspri->tlspri_master = NULL; ++ sofia_sip_tls_free(tlspri->tlspri_master), tlspri->tlspri_master = NULL; + } + + static int tport_tls_init_secondary(tport_t *self, int socket, int accepted, +@@ -303,7 +303,7 @@ static void tport_tls_deinit_secondary(tport_t *self) + + /* XXX - PPe: does the tls_shutdown zap everything but socket? */ + if (tlstp->tlstp_context != NULL) +- tls_free(tlstp->tlstp_context); ++ sofia_sip_tls_free(tlstp->tlstp_context); + tlstp->tlstp_context = NULL; + + su_free(self->tp_home, tlstp->tlstp_buffer); From 0196ec4198771e5fe83d6df02c7cd3b13c0ce05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Sat, 24 Aug 2024 22:11:02 +0200 Subject: [PATCH 2493/3013] package/x264: disable assembly code on x86 + musl + PIC/PIE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The x264 package uses large amounts of non-PIC assembly code (e.g. common/x86/dct-a.asm), which results in textrels, which aren't supported by musl-libc's dynamic linker. Disable x264's assembly code when compiling for x86 with PIC/PIE and musl-libc to avoid this particular incompatibility. Reported-by: Yann Morin Fixes: https://lore.kernel.org/buildroot/ZrsirnrvgsEIpAJI@tl-lnx-nyma7486-2/ Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni --- package/x264/x264.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 97caf194663..e96d993017f 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -14,9 +14,15 @@ X264_INSTALL_STAGING = YES X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale ifeq ($(BR2_i386)$(BR2_x86_64),y) +ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_PIC_PIE),yy) +# libx264 uses large amounts of non-pic assembly code, resulting in text +# section relocations, which are not supported on musl-libc's ld.so. +X264_CONF_OPTS += --disable-asm +else # nasm needed for assembly files X264_DEPENDENCIES += host-nasm X264_CONF_ENV += AS="$(HOST_DIR)/bin/nasm" +endif else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y) # We need to pass gcc as AS, because the ARM assembly files have to be # preprocessed From e33db30aab02188c8b3aae6451d26288d06d7a15 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Aug 2024 06:20:33 +0200 Subject: [PATCH 2494/3013] package/xserver_xorg-server: security update to 21.1.13 Fixes the following security issues: - CVE-2024-31080: Heap buffer overread/data leakage in ProcXIGetSelectedEvents - CVE-2024-31081: Heap buffer overread/data leakage in ProcXIPassiveGrabDevice - CVE-2024-31082: Heap buffer overread/data leakage in ProcAppleDRICreatePixmap - CVE-2024-31083: User-after-free in ProcRenderAddGlyphs For more details, see thee security page of Xorg: https://www.x.org/wiki/Development/Security/ Signed-off-by: Waldemar Brodkorb [Peter: add actual list of CVEs] Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index be636936e2a..3520de242f3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2024-January/003442.html -sha256 1aa0ee1adad0b2db7f291f3823a4ab240c7f4aea710e89f5ef4aa232b6833403 xorg-server-21.1.11.tar.gz -sha512 e41bf71955691e66084a67fc20643632087f0326d5eddc31e6edd118d05005b8ab536738c181f4c352f331ec8fc8f23ae1b45f237592fa5d7eddbffe43638b08 xorg-server-21.1.11.tar.gz +# From https://lists.x.org/archives/xorg-announce/2024-April/003504.html +sha256 2864b6a5359ab41c5a6132c69b5d0c9af6eb85ad26d433edb012c914029de752 xorg-server-21.1.13.tar.gz +sha512 9bf5617d577dd3526a9578daedc1f2e3527da6913841f8fc78a2bda311ebf1560e84e31942cb8133a2a2ac99487c13b9153db6fb2d00859fc24d053f6b91fe34 xorg-server-21.1.13.tar.gz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 1d0807ffeca..05ba938c309 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.11 +XSERVER_XORG_SERVER_VERSION = 21.1.13 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From 10088427cf3b714db85a1d10e6a023c2639bd790 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Mon, 26 Aug 2024 15:20:47 +0800 Subject: [PATCH 2495/3013] package/postgresql: security bump version to 16.4 Release notes: - https://www.postgresql.org/docs/release/16.4/ - https://www.postgresql.org/about/news/postgresql-164-158-1413-1316-1220-and-17-beta-3-released-2910/ Fixes CVE-2024-7348: - https://www.postgresql.org/support/security/CVE-2024-7348/ Signed-off-by: Scott Fan Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index d917a03ebba..1d9a9081b74 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v16.2/postgresql-16.3.tar.bz2.sha256 -sha256 331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585 postgresql-16.3.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v16.4/postgresql-16.4.tar.bz2.sha256 +sha256 971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f postgresql-16.4.tar.bz2 # License file, Locally calculated sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 0a1d98079a1..4021a54300f 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 16.3 +POSTGRESQL_VERSION = 16.4 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 74f327e2869841b499d66cac6a7bd8a83b1269f5 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Mon, 26 Aug 2024 15:20:48 +0800 Subject: [PATCH 2496/3013] package/postgresql: fix typo in init script info printout Signed-off-by: Scott Fan Signed-off-by: Peter Korsgaard --- package/postgresql/S50postgresql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/S50postgresql b/package/postgresql/S50postgresql index 1ece4fca9e2..f8077600de9 100644 --- a/package/postgresql/S50postgresql +++ b/package/postgresql/S50postgresql @@ -6,7 +6,7 @@ umask 077 if [ ! -f /var/lib/pgsql/PG_VERSION ]; then - echo "Initializing postgresql data base..." + echo "Initializing postgresql database..." su - postgres -c '/usr/bin/pg_ctl initdb -D /var/lib/pgsql' echo "done" fi From 2383768cdf03ad78a89a0b4355c4e1a576c2d219 Mon Sep 17 00:00:00 2001 From: Mattia Narducci Date: Sat, 24 Aug 2024 18:43:26 +0200 Subject: [PATCH 2497/3013] package/proftpd: fix group name preventing server from starting Replace the group name 'nogroup' with 'nobody' in the default ProFTPD configuration file. This fixes the following error when starting the server: proftpd[110]: fatal: Group: Unknown group 'nogroup' on line 30 of '/etc/proftpd.conf' Fixes: 0d887cc2b4 ("system: replace nogroup with nobody") Signed-off-by: Mattia Narducci Signed-off-by: Peter Korsgaard --- package/proftpd/proftpd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index cd7d2326725..72a0fe9354f 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -130,6 +130,7 @@ endif define PROFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf + $(SED) 's/^\(Group\s\+\)nogroup/\1nobody/' $(TARGET_DIR)/etc/proftpd.conf $(PROFTPD_INSTALL_FTPQUOTA) $(PROFTPD_INSTALL_FTPASSWD) endef From cf647b69fbeec000663bd9b55047e7c2d69217f8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 25 Aug 2024 10:42:20 +0200 Subject: [PATCH 2498/3013] package/norm: fix build issue with waf >= 2.1.0 To fix build issues with modern Python versions, commit 8012a86f5cf751f9c4d5d4a63f6502a6ac60d13a ("package/norm: use external waf") switched the norm package from using its internal waf copy to using our external waf package. Then, in fd5623150dcc23441c4f0bd586378daeb91d66ea ("package/waf: bump to v2.1.1"), we updated out external waf to a newer version, which breaks the API around ArgParse, see upstream commit: https://gitlab.com/ita1024/waf/-/commit/bd5c22d484734f7c1b77e16c91a10c7a44fa6c8a: This causes breakage when building the norm package. Fabrice had already submitted patches upstream, to both the "protolib" project (which is used as a submodule in norm) and to the "norm" project. These pull requests are still pending, but let's backport the patches that seem reasonable and that fix the build issue. Fixes: http://autobuild.buildroot.net/results/f005d513434d42d26e601096b94b4070586118b2/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...lib-wscript-fix-build-with-waf-2.1.0.patch | 53 +++++++++++++++++++ ...005-wscript-fix-build-with-waf-2.1.0.patch | 35 ++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 package/norm/0004-protolib-wscript-fix-build-with-waf-2.1.0.patch create mode 100644 package/norm/0005-wscript-fix-build-with-waf-2.1.0.patch diff --git a/package/norm/0004-protolib-wscript-fix-build-with-waf-2.1.0.patch b/package/norm/0004-protolib-wscript-fix-build-with-waf-2.1.0.patch new file mode 100644 index 00000000000..827a607fb0c --- /dev/null +++ b/package/norm/0004-protolib-wscript-fix-build-with-waf-2.1.0.patch @@ -0,0 +1,53 @@ +From c35a9dc031cda1406eff7de1f199ad55949b17c6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 24 Aug 2024 21:28:16 +0200 +Subject: [PATCH] protolib/wscript: fix build with waf >= 2.1.0 + +Replace add_option_group by add_argument_group and add_option by +add_argument to avoid the following build failure with waf 2.1.0 and +https://gitlab.com/ita1024/waf/-/commit/bd5c22d484734f7c1b77e16c91a10c7a44fa6c8a: + + File "/home/autobuild/autobuild/instance-21/output-1/build/norm-1.5.8/protolib/wscript", line 37, in options + bind_opts = ctx.parser.add_option_group('Language Bindings', 'Use during configure step.') + ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/USNavalResearchLaboratory/protolib/pull/47 +Signed-off-by: Thomas Petazzoni +--- + protolib/wscript | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/protolib/wscript b/protolib/wscript +index 97dda93..97f65f6 100644 +--- a/protolib/wscript ++++ b/protolib/wscript +@@ -34,18 +34,18 @@ def options(ctx): + ctx.load('python') + ctx.load('java') + +- bind_opts = ctx.parser.add_option_group('Language Bindings', 'Use during configure step.') +- bind_opts.add_option('--build-python', action='store_true', ++ bind_opts = ctx.parser.add_argument_group('Language Bindings', 'Use during configure step.') ++ bind_opts.add_argument('--build-python', action='store_true', + help='Build Python bindings [default:false]') +- bind_opts.add_option('--build-java', action='store_true', ++ bind_opts.add_argument('--build-java', action='store_true', + help='Build Java bindings [default:false]') + +- build_opts = ctx.parser.add_option_group('Compile Options', 'Use during build step.') +- build_opts.add_option('--debug', action='store_true', ++ build_opts = ctx.parser.add_argument_group('Compile Options', 'Use during build step.') ++ build_opts.add_argument('--debug', action='store_true', + help='Build in debug mode [default:release]') +- build_opts.add_option('--enable-wx', action='store_true', ++ build_opts.add_argument('--enable-wx', action='store_true', + help='Enable checking for wxWidgets.') +- build_opts.add_option('--enable-static-library', action='store_true', ++ build_opts.add_argument('--enable-static-library', action='store_true', + help='Enable installing static library. [default:false]') + + def configure(ctx): +-- +2.46.0 + diff --git a/package/norm/0005-wscript-fix-build-with-waf-2.1.0.patch b/package/norm/0005-wscript-fix-build-with-waf-2.1.0.patch new file mode 100644 index 00000000000..7260beefc29 --- /dev/null +++ b/package/norm/0005-wscript-fix-build-with-waf-2.1.0.patch @@ -0,0 +1,35 @@ +From 9f7a9b72ff5a7313793bba86962f9677970c9b4c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 27 Jul 2024 20:41:45 +0200 +Subject: [PATCH] wscript: fix build with waf >= 2.1.0 + +Replace add_option_group by add_argument_group to a build failure with +waf 2.1.0 and +https://gitlab.com/ita1024/waf/-/commit/bd5c22d484734f7c1b77e16c91a10c7a44fa6c8a: + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/USNavalResearchLaboratory/norm/pull/86 +[Thomas: small change needed to backport on version 1.5.8] +Signed-off-by: Thomas Petazzoni +--- + wscript | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wscript b/wscript +index 0fdae96..6a8c22a 100644 +--- a/wscript ++++ b/wscript +@@ -47,8 +47,8 @@ system = platform.system().lower() + + def options(ctx): + ctx.recurse('protolib') +- build_opts = ctx.parser.add_option_group('Compile/install Options', 'Use during build/install step.') +- build_opts.add_option('--enable-static-library', action='store_true', ++ build_opts = ctx.parser.add_argument_group('Compile/install Options', 'Use during build/install step.') ++ build_opts.add_argument('--enable-static-library', action='store_true', + help='Enable building and installing static library. [default:false]') + + +-- +2.46.0 + From c1a6987da9bfebac25db0d05fa69a706a933889f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Aug 2024 13:58:36 +0200 Subject: [PATCH 2499/3013] package/fbset: update download URL Fixes: http://autobuild.buildroot.org/results/13e/13e28650fc58fc62c801a664d79616c6dd39a8ac Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/fbset/Config.in | 2 +- package/fbset/fbset.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fbset/Config.in b/package/fbset/Config.in index b4ef41f0a4a..9422d5bca4a 100644 --- a/package/fbset/Config.in +++ b/package/fbset/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_FBSET simple and unique interface to access different kinds of graphic displays. - http://users.telenet.be/geertu/Linux/fbdev/ + http://g33rt.be/migrated/Linux/fbdev/ diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index 8d2a477f8b0..526cba40d30 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -5,7 +5,7 @@ ################################################################################ FBSET_VERSION = 2.1 -FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev +FBSET_SITE = http://g33rt.be/migrated/Linux/fbdev FBSET_DEPENDENCIES = host-bison host-flex FBSET_LICENSE = GPL-2.0 FBSET_LICENSE_FILES = fbset.c From 2965632a312008f10ce608b6d1ef67837ff6dc69 Mon Sep 17 00:00:00 2001 From: Woodrow Douglass Date: Mon, 26 Aug 2024 09:10:25 -0400 Subject: [PATCH 2500/3013] package/chicken: security bump to 5.4.0 This release includes a fix for CVE-2022-45145. Also, a copyright date in the LICENSE file changed, so the hash for it has changed too. Signed-off-by: Woodrow Douglass Signed-off-by: Thomas Petazzoni --- package/chicken/chicken.hash | 6 +++--- package/chicken/chicken.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/chicken/chicken.hash b/package/chicken/chicken.hash index 5a553da7924..18f6693a7ae 100644 --- a/package/chicken/chicken.hash +++ b/package/chicken/chicken.hash @@ -1,4 +1,4 @@ -# From https://code.call-cc.org/releases/5.3.0/chicken-5.3.0.tar.gz.sha256 -sha256 c3ad99d8f9e17ed810912ef981ac3b0c2e2f46fb0ecc033b5c3b6dca1bdb0d76 chicken-5.3.0.tar.gz +# From https://code.call-cc.org/releases/5.4.0/chicken-5.4.0.tar.gz.sha256 +sha256 3c5d4aa61c1167bf6d9bf9eaf891da7630ba9f5f3c15bf09515a7039bfcdec5f chicken-5.4.0.tar.gz # Locally computed -sha256 b434ac92e094214136a6b5032f0dc9da97f22cef084ac1d0131b02a09e2caa37 LICENSE +sha256 c0ed699d5c4a8687f90a6488244f7f57d48a7f2d42bb7461b08a0d69a07d4f58 LICENSE diff --git a/package/chicken/chicken.mk b/package/chicken/chicken.mk index 0000fc635ed..ca5f7569953 100644 --- a/package/chicken/chicken.mk +++ b/package/chicken/chicken.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHICKEN_VERSION = 5.3.0 +CHICKEN_VERSION = 5.4.0 CHICKEN_SITE = https://code.call-cc.org/releases/$(CHICKEN_VERSION) CHICKEN_LICENSE = BSD-3-Clause CHICKEN_LICENSE_FILES = LICENSE From 4f0243567d74323082e53c46e777b326476f5c2d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2024 19:03:11 +0200 Subject: [PATCH 2501/3013] package/php: fix build on arm Fixes: http://autobuild.buildroot.org/results/5e8ef91d84018ccdf85f2156292feb3460bfe698/ Without this patch configure wrongfully detects aarch64 support: checking for aarch64 CRC32 API... yes Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...onfigure-check-for-aarch64-CRC32-API.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch diff --git a/package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch b/package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch new file mode 100644 index 00000000000..46e6558dcde --- /dev/null +++ b/package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch @@ -0,0 +1,56 @@ +From 5947db6bb8e336252337fb0194c3b8e834d100b6 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 25 Aug 2024 18:00:29 +0200 +Subject: [PATCH] Fix GH-15587: Autotools: fix configure check for aarch64 + CRC32 API + +On arm32 bit the check succeeds leading to a build error later on: + +/home/autobuild/autobuild/instance-3/output-1/build/php-8.3.10/ext/standard/crc32.c:70:12: + error: 'armv8-a' does not support feature 'nothing' + 70 | # pragma GCC target ("+nothing+crc") + +Upstream: https://github.com/php/php-src/commit/5947db6bb8e336252337fb0194c3b8e834d100b6 + +Co-authored-by: Thomas Petazzoni +[http://lists.busybox.net/pipermail/buildroot/2024-August/761151.html] +Signed-off-by: Bernd Kuhls +--- + configure.ac | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1142c9459d71..fb59a81700f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -738,11 +738,25 @@ AC_FUNC_ALLOCA + PHP_TIME_R_TYPE + PHP_CHECK_IN_ADDR_T + +-AC_CACHE_CHECK([for aarch64 CRC32 API], ac_cv_func___crc32d, +-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[__crc32d(0, 0);]])],[ac_cv_func___crc32d=yes],[ac_cv_func___crc32d="no"])]) +-if test "$ac_cv_func___crc32d" = "yes"; then +- AC_DEFINE([HAVE_AARCH64_CRC32], [1], [Define when aarch64 CRC32 API is available.]) +-fi ++AC_CACHE_CHECK([for aarch64 CRC32 API], [ac_cv_func___crc32d], ++[AC_LINK_IFELSE([AC_LANG_PROGRAM([ ++#include ++# if defined(__GNUC__) ++# if!defined(__clang__) ++# pragma GCC push_options ++# pragma GCC target ("+nothing+crc") ++# elif defined(__APPLE__) ++# pragma clang attribute push(__attribute__((target("crc"))), apply_to=function) ++# else ++# pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function) ++# endif ++# endif ++], [__crc32d(0, 0);])], ++[ac_cv_func___crc32d=yes], ++[ac_cv_func___crc32d=no])]) ++AS_VAR_IF([ac_cv_func___crc32d], [yes], ++ [AC_DEFINE([HAVE_AARCH64_CRC32], [1], ++ [Define to 1 when aarch64 CRC32 API is available.])]) + + dnl Check for asm goto support. + AC_CACHE_CHECK([for asm goto], ac_cv__asm_goto, From 42d95c00a9257b1bcd0d559fa5e8e5b35abde08e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 24 Aug 2024 15:03:07 -0300 Subject: [PATCH 2502/3013] configs/mx25pdk: remove defconfig The imx25pdk board has been removed from U-Boot and I no longer have access to the board. Remove its support. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - DEVELOPERS | 1 - board/freescale/imx25pdk/readme.txt | 54 ----------------------------- configs/mx25pdk_defconfig | 35 ------------------- 4 files changed, 91 deletions(-) delete mode 100644 board/freescale/imx25pdk/readme.txt delete mode 100644 configs/mx25pdk_defconfig diff --git a/.checkpackageignore b/.checkpackageignore index 81e48bf8590..4cfc202153c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -191,7 +191,6 @@ configs/microchip_sama5d2_icp_mmc_dev_defconfig lib_defconfig.ForceCheckHash configs/microchip_sama7g5ek_mmc_defconfig lib_defconfig.ForceCheckHash configs/microchip_sama7g5ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash configs/minnowboard_max_defconfig lib_defconfig.ForceCheckHash -configs/mx25pdk_defconfig lib_defconfig.ForceCheckHash configs/mx53loco_defconfig lib_defconfig.ForceCheckHash configs/mx6udoo_defconfig lib_defconfig.ForceCheckHash configs/nexbox_a95x_defconfig lib_defconfig.ForceCheckHash diff --git a/DEVELOPERS b/DEVELOPERS index 426590d5c5f..0b590f0ec20 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -980,7 +980,6 @@ F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig F: configs/imx8mqevk_defconfig -F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig F: configs/mx53loco_defconfig F: configs/mx6cubox_defconfig diff --git a/board/freescale/imx25pdk/readme.txt b/board/freescale/imx25pdk/readme.txt deleted file mode 100644 index 1aece6c9b3c..00000000000 --- a/board/freescale/imx25pdk/readme.txt +++ /dev/null @@ -1,54 +0,0 @@ -************************** -Freescale i.MX25 PDK board -************************** - -This file documents the Buildroot support for the Freescale i.MX25 PDK board. - -Build -===== - -First, configure Buildroot for the i.MX25 PDK board: - - make mx25pdk_defconfig - -Build all components: - - make - -You will find in output/images/ the following files: - - imx25-pdk.dtb - - rootfs.ext4 - - rootfs.tar - - sdcard.img - - u-boot.imx - - zImage - -Create a bootable SD card -========================= - -To determine the device associated to the SD card have a look in the -/proc/partitions file: - - cat /proc/partitions - -Buildroot prepares a bootable "sdcard.img" image in the output/images/ -directory, ready to be dumped on a SD card. Launch the following -command as root: - - dd if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the card content. Use with care! *** - -For details about the medium image layout, see the definition in -board/freescale/common/imx/genimage.cfg.template. - -Boot the i.MX25 PDK board -========================= - -To boot your newly created system: -- insert the SD card in the SD slot of the board; -- put a USB cable into the Debug USB Port and connect using a terminal - emulator at 115200 bps, 8n1; -- power on the board. - -Enjoy! diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig deleted file mode 100644 index ec4f8b8289d..00000000000 --- a/configs/mx25pdk_defconfig +++ /dev/null @@ -1,35 +0,0 @@ -# Architecture -BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx25pdk" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" -BR2_TARGET_UBOOT_FORMAT_IMX=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v4_v5" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx25-pdk" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From f14e03ba21491407d2aaa47e782cc0e924ab6164 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Aug 2024 21:07:19 +0200 Subject: [PATCH 2503/3013] package/libuecc: switch to a functional Github repo The https://projects.universe-factory.net/attachments/download/85 URL no longer works, so let's switch to what appears to be the official Github repo: https://github.com/neocturne/libuecc The v7 in this Github is 100% identical to the v7 that was available from https://projects.universe-factory.net/attachments/download/85. Also at https://metadata.ftp-master.debian.org/changelogs//main/libu/libuecc/libuecc_7-5_copyright Debian lists https://github.com/NeoRaider/libuecc as the source, and this URL redirects to https://github.com/neocturne/libuecc. Thanks to the original tarball being a .tar.xz, and our Github macro generating a .tar.gz, the filename is different, and therefore the different hash will not be an issue. Fixes: http://autobuild.buildroot.org/results/c4c24bd06bc7889c46d78e14d5bef528340d4463/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libuecc/libuecc.hash | 4 +--- package/libuecc/libuecc.mk | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/libuecc/libuecc.hash b/package/libuecc/libuecc.hash index b72519f1679..7ac5860cd13 100644 --- a/package/libuecc/libuecc.hash +++ b/package/libuecc/libuecc.hash @@ -1,5 +1,3 @@ -# from https://projects.universe-factory.net/projects/fastd/files -md5 5cd543cb8e7bce83a22c07a0579c95a1 libuecc-7.tar.xz # computed locally -sha256 b94aef08eab5359d0facaa7ead2ce81b193eef0c61379d9835213ebc0a46257a libuecc-7.tar.xz +sha256 465a6584c991c13fddf36700328c44fee9a3baff9025fb5f232b34d003d715e0 libuecc-7.tar.gz sha256 ec4d9fcc3a37a7998a9ea4decf38f4c0c91a44fd05bb17638c52fe16f2b12e23 COPYRIGHT diff --git a/package/libuecc/libuecc.mk b/package/libuecc/libuecc.mk index aad26e5aff6..6251edb6365 100644 --- a/package/libuecc/libuecc.mk +++ b/package/libuecc/libuecc.mk @@ -5,8 +5,7 @@ ################################################################################ LIBUECC_VERSION = 7 -LIBUECC_SITE = https://projects.universe-factory.net/attachments/download/85 -LIBUECC_SOURCE = libuecc-$(LIBUECC_VERSION).tar.xz +LIBUECC_SITE = $(call github,neocturne,libuecc,v$(LIBUECC_VERSION)) LIBUECC_LICENSE = BSD-2-Clause LIBUECC_LICENSE_FILES = COPYRIGHT LIBUECC_INSTALL_STAGING = YES From 4780e11726e392151677a60f5bb8afb581fa7221 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Aug 2024 12:41:53 +0200 Subject: [PATCH 2504/3013] package/gcc: add GCC patch to fix PowerPC64/musl build issue PowerPC64/musl toolchains currently fail to build with: In file included from ../../../libquadmath/math/sqrtq.c:13: ../../../libquadmath/math/../../libgcc/soft-fp/quad.h:69:1: error: unable to emulate 'TF' 69 | typedef float TFtype __attribute__ ((mode (TF))); | ^~~~~~~ make[4]: *** [Makefile:979: math/sqrtq.lo] Error 1 This issue has been reported upstream as https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007, and has been fixed as https://gcc.gnu.org/g:3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b. This commit simply backports the upstream GCC fix. This issue was new with GCC 14.x, so only GCC 14.x needs to be fixed. Fixes: http://autobuild.buildroot.org/results/529bec7ef338842030d3340d9b21d8fd16d8639d/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...up-libquadmath-math-sqrtq.c-compilat.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/gcc/14.2.0/0003-libquadmath-Fix-up-libquadmath-math-sqrtq.c-compilat.patch diff --git a/package/gcc/14.2.0/0003-libquadmath-Fix-up-libquadmath-math-sqrtq.c-compilat.patch b/package/gcc/14.2.0/0003-libquadmath-Fix-up-libquadmath-math-sqrtq.c-compilat.patch new file mode 100644 index 00000000000..b6ed2ffed85 --- /dev/null +++ b/package/gcc/14.2.0/0003-libquadmath-Fix-up-libquadmath-math-sqrtq.c-compilat.patch @@ -0,0 +1,57 @@ +From ba9356565695728ce0c852f7de3de27f8745611d Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek +Date: Sat, 3 Aug 2024 20:37:54 +0200 +Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in + some powerpc* configurations [PR116007] + +My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation. +Unfortunately, that seems to fail building in some powerpc* configurations, where +TFmode isn't available. +quad.h has: + #ifndef TFtype + typedef float TFtype __attribute__ ((mode (TF))); + #endif +and uses TFtype. quad.h has: + /* Define the complex type corresponding to __float128 + ("_Complex __float128" is not allowed) */ + #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__) + typedef _Complex float __attribute__((mode(TC))) __complex128; + #else + typedef _Complex float __attribute__((mode(KC))) __complex128; + #endif +with the conditional and KCmode use added during porting of libquadmath +to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__ +isn't defined; I could define it to float __attribute__ ((mode (KF))) but it +seemed easier to just define it to __float128 which should do the same thing. + +2024-08-03 Jakub Jelinek + + PR target/116007 + * math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__ + define to __float128 before including soft-fp.h and quad.h. + +(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b) +Upstream: https://gcc.gnu.org/g:3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b +Upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007 +Signed-off-by: Thomas Petazzoni +--- + libquadmath/math/sqrtq.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c +index 8ca2828d42c..a58998a0667 100644 +--- a/libquadmath/math/sqrtq.c ++++ b/libquadmath/math/sqrtq.c +@@ -9,6 +9,9 @@ + && defined(FE_TOWARDZERO) \ + && defined(FE_INEXACT) + #define USE_SOFT_FP 1 ++#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__) ++#define TFtype __float128 ++#endif + #include "../../libgcc/soft-fp/soft-fp.h" + #include "../../libgcc/soft-fp/quad.h" + #endif +-- +2.46.0 + From 345c94ad4e709116c7a22d143aae9ef815e8dfeb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 21 Aug 2024 20:12:10 +0200 Subject: [PATCH 2505/3013] package/zabbix: fixup download URL Fixes: http://autobuild.buildroot.org/results/9ff/9ffb4a9e3b2291498d0ccf3c9124bebc466860bc Zabbix 6.2.x is EOL and the tarballs have now been moved under oldstable/. Signed-off-by: Waldemar Brodkorb [Peter: extend commit message] Signed-off-by: Peter Korsgaard --- package/zabbix/zabbix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 76568f5a18c..18fb01decac 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -6,7 +6,7 @@ ZABBIX_VERSION_MAJOR = 6.2 ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 -ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) +ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/oldstable/$(ZABBIX_VERSION_MAJOR) ZABBIX_SELINUX_MODULES = zabbix ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING From 210df8fc4a6c70f020131545987158535ad21b48 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 13:56:49 +0100 Subject: [PATCH 2506/3013] support/testing: add python-asn1crypto runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 2fe638af2632424b826843675311f9a258a57b71) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ .../tests/package/sample_python_asn1crypto.py | 11 +++++++++++ .../testing/tests/package/test_python_asn1crypto.py | 13 +++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 support/testing/tests/package/sample_python_asn1crypto.py create mode 100644 support/testing/tests/package/test_python_asn1crypto.py diff --git a/DEVELOPERS b/DEVELOPERS index 297dcd06ecb..923d0269623 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2152,6 +2152,8 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/selinux-python/ +F: support/testing/tests/package/sample_python_asn1crypto.py +F: support/testing/tests/package/test_python_asn1crypto.py F: utils/config F: utils/diffconfig diff --git a/support/testing/tests/package/sample_python_asn1crypto.py b/support/testing/tests/package/sample_python_asn1crypto.py new file mode 100644 index 00000000000..0b104875726 --- /dev/null +++ b/support/testing/tests/package/sample_python_asn1crypto.py @@ -0,0 +1,11 @@ +from asn1crypto import pem, x509 + + +with open('/etc/ssl/certs/ISRG_Root_X2.pem', 'rb') as f: + der_bytes = f.read() + if pem.detect(der_bytes): + type_name, headers, der_bytes = pem.unarmor(der_bytes) + +cert = x509.Certificate.load(der_bytes) + +assert cert.subject.native["common_name"] == "ISRG Root X2" diff --git a/support/testing/tests/package/test_python_asn1crypto.py b/support/testing/tests/package/test_python_asn1crypto.py new file mode 100644 index 00000000000..97df3d3ac83 --- /dev/null +++ b/support/testing/tests/package/test_python_asn1crypto.py @@ -0,0 +1,13 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Asn1Crypto(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ASN1CRYPTO=y + """ + sample_scripts = ["tests/package/sample_python_asn1crypto.py"] + timeout = 40 From 23b6c3f58c1bb577168e2a003bea6d310ed757ef Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 27 Aug 2024 06:31:09 +0200 Subject: [PATCH 2507/3013] package/freeipmi: fix gcc 14.x issues Directly from upstream stable git repository, fixes for gcc 14.x issues. Only the changelog entries, which do not apply, where removed. Fixes: http://autobuild.buildroot.org/results/b33/b33e72b3348427f2f772e5c29dd3753958597058 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...ipmi-sel-string-supermicro-common.h-.patch | 36 ++++++++++++ ...sensors-fix-header-guard-definitions.patch | 57 +++++++++++++++++++ ...003-ipmi-sensors-add-missing-include.patch | 28 +++++++++ 3 files changed, 121 insertions(+) create mode 100644 package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch create mode 100644 package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch create mode 100644 package/freeipmi/0003-ipmi-sensors-add-missing-include.patch diff --git a/package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch b/package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch new file mode 100644 index 00000000000..848539e7c31 --- /dev/null +++ b/package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch @@ -0,0 +1,36 @@ +From 9239a686e4bfd862145f4654017112a0f8cbbb0d Mon Sep 17 00:00:00 2001 +From: Albert Chu +Date: Fri, 22 Mar 2024 21:07:28 -0700 +Subject: [PATCH] libfreeipmi/sel/ipmi-sel-string-supermicro-common.h: Add + missing function prototype. + +Signed-off-by: Albert Chu +[Waldemar: removed Changelog patching] +Signed-off-by: Waldemar Brodkorb +Upstream: http://git.savannah.gnu.org/cgit/freeipmi.git/commit/?h=freeipmi-1-6-0-stable&id=9239a686e4bfd862145f4654017112a0f8cbbb0d +--- + libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | 10 ++++++++++ + 1 files changed, 15 insertions(+) + +diff --git a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h +index 5785f2b64..be5e41d7d 100644 +--- a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h ++++ b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h +@@ -39,4 +39,14 @@ int sel_string_output_supermicro_overheat_event_data1_class_oem (ipmi_sel_ctx_t + unsigned int *wlen, + struct ipmi_sel_system_event_record_data *system_event_record_data); + ++int sel_string_output_supermicro_dimm_event_data2_event_data3 (ipmi_sel_ctx_t ctx, ++ struct ipmi_sel_entry *sel_entry, ++ uint8_t sel_record_type, ++ char *buf, ++ unsigned int buflen, ++ unsigned int flags, ++ unsigned int *wlen, ++ struct ipmi_sel_system_event_record_data *system_event_record_data, ++ int *oem_rv); ++ + #endif /* IPMI_SEL_STRING_SUPERMICRO_COMMON_H */ +-- +2.30.2 + diff --git a/package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch b/package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch new file mode 100644 index 00000000000..b04b3058358 --- /dev/null +++ b/package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch @@ -0,0 +1,57 @@ +From c3d1a3f5c550940577076ce2c4595b470ae963c3 Mon Sep 17 00:00:00 2001 +From: Albert Chu +Date: Sun, 24 Mar 2024 13:11:55 -0700 +Subject: [PATCH] ipmi-sensors: fix header guard definitions + +Signed-off-by: Albert Chu +[Waldemar: removed Changelog patching] +Signed-off-by: Waldemar Brodkorb +Upstream: https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?h=freeipmi-1-6-0-stable&id=c3d1a3f5c550940577076ce2c4595b470ae963c3 +--- + ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h | 2 +- + ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h | 2 +- + ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h | 2 +- + 3 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h b/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h +index 0b11e61ce..4ae808cda 100644 +--- a/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h ++++ b/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h +@@ -17,7 +17,7 @@ + */ + + #ifndef IPMI_SENSORS_OEM_INTEL_S2600JF_H +-#define IPMI_SENSORS_OEM_INTEL_H ++#define IPMI_SENSORS_OEM_INTEL_S2600JF_H + + #include "ipmi-sensors.h" + +diff --git a/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h b/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h +index 0607b125d..5c6410b7b 100644 +--- a/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h ++++ b/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h +@@ -17,7 +17,7 @@ + */ + + #ifndef IPMI_SENSORS_OEM_INTEL_S2600WP_H +-#define IPMI_SENSORS_OEM_INTEL_H ++#define IPMI_SENSORS_OEM_INTEL_S2600WP_H + + #include "ipmi-sensors.h" + +diff --git a/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h b/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h +index f4f3dc85b..204295bd8 100644 +--- a/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h ++++ b/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h +@@ -17,7 +17,7 @@ + */ + + #ifndef IPMI_SENSORS_OEM_INTEL_S5500WB_H +-#define IPMI_SENSORS_OEM_INTEL_H ++#define IPMI_SENSORS_OEM_INTEL_S5500WB_H + + #include "ipmi-sensors.h" + +-- +2.39.2 + diff --git a/package/freeipmi/0003-ipmi-sensors-add-missing-include.patch b/package/freeipmi/0003-ipmi-sensors-add-missing-include.patch new file mode 100644 index 00000000000..8bc44165a02 --- /dev/null +++ b/package/freeipmi/0003-ipmi-sensors-add-missing-include.patch @@ -0,0 +1,28 @@ +From 6ac6f816dbfc83d8cd4f4f163b0f8ff1062d883e Mon Sep 17 00:00:00 2001 +From: Albert Chu +Date: Mon, 25 Mar 2024 13:57:45 -0700 +Subject: [PATCH] ipmi-sensors: add missing include + +Signed-off-by: Albert Chu +[Waldemar: removed Changelog patching] +Signed-off-by: Waldemar Brodkorb +Upstream: https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?h=freeipmi-1-6-0-stable&id=6ac6f816dbfc83d8cd4f4f163b0f8ff1062d883e +--- + ipmi-sensors/ipmi-sensors-oem-intel.c | 1 + + 1 files changed, 1 insertions(+) + +diff --git a/ipmi-sensors/ipmi-sensors-oem-intel.c b/ipmi-sensors/ipmi-sensors-oem-intel.c +index 5e0f3733a..3fc022e3d 100644 +--- a/ipmi-sensors/ipmi-sensors-oem-intel.c ++++ b/ipmi-sensors/ipmi-sensors-oem-intel.c +@@ -34,6 +34,7 @@ + #include "ipmi-sensors-oem-intel.h" + #include "ipmi-sensors-oem-intel-s5500wb.h" + #include "ipmi-sensors-oem-intel-s2600jf.h" ++#include "ipmi-sensors-oem-intel-s2600wp.h" + #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h" + #include "ipmi-sensors-oem-intel-node-manager.h" + +-- +2.39.2 + From e5cc7ad5fd04c080a81de1b857537f392ee88dbb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Aug 2024 23:02:28 +0200 Subject: [PATCH 2508/3013] package/python3: security bump to version 3.12.5 Fixes the following security issues: - gh-121957: Fixed missing audit events around interactive use of Python, now also properly firing for python -i, as well as for python -m asyncio. The event in question is cpython.run_stdin. https://github.com/python/cpython/issues/121957 For more details, see the changelog: https://docs.python.org/release/3.12.5/whatsnew/changelog.html#python-3-12-5 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 598164dca6d..d680a96810c 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3123/ -md5 d68f25193eec491eb54bc2ea664a05bd Python-3.12.4.tar.xz +# From https://www.python.org/downloads/release/python-3125/ +md5 02c7d269e077f4034963bba6befdc715 Python-3.12.5.tar.xz # Locally computed -sha256 f6d419a6d8743ab26700801b4908d26d97e8b986e14f95de31b32de2b0e79554 Python-3.12.4.tar.xz +sha256 fa8a2e12c5e620b09f53e65bcd87550d2e5a1e2e04bf8ba991dcc55113876397 Python-3.12.5.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 7d6c9fe93f7..b31e6df141b 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).5 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From 250a9b7c0a2eca4c46c192d2b7167e847d84adfe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 27 Aug 2024 05:55:51 +0200 Subject: [PATCH 2509/3013] package/enscript: fix gcc 14.x compile issue Fixes: http://autobuild.buildroot.org/results/eb5/eb53b42db0d4bcaf574380d5a89a096cc4ce4b14 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...ible-implicit-declaration-of-built-i.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/enscript/0001-Solving-incompatible-implicit-declaration-of-built-i.patch diff --git a/package/enscript/0001-Solving-incompatible-implicit-declaration-of-built-i.patch b/package/enscript/0001-Solving-incompatible-implicit-declaration-of-built-i.patch new file mode 100644 index 00000000000..ae950c331a0 --- /dev/null +++ b/package/enscript/0001-Solving-incompatible-implicit-declaration-of-built-i.patch @@ -0,0 +1,29 @@ +From 300ecf85a8fe166a39f9dd818945c7b8a970db39 Mon Sep 17 00:00:00 2001 +From: Wim Stockman +Date: Mon, 12 Feb 2024 22:52:50 +0100 +Subject: [PATCH] Solving incompatible implicit declaration of built-in + function 'strlen' + +Signed-off-by: Wim Stockman +Signed-off-by: Waldemar Brodkorb +Upstream: https://git.savannah.gnu.org/cgit/enscript.git/commit/?id=300ecf85a8fe166a39f9dd818945c7b8a970db39 +--- + compat/getopt.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/compat/getopt.c b/compat/getopt.c +index 752f28a..19f50e1 100644 +--- a/compat/getopt.c ++++ b/compat/getopt.c +@@ -34,6 +34,8 @@ + #include + #endif + ++#include ++ + #if !defined (__STDC__) || !__STDC__ + /* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +-- +2.39.2 + From 62ccb5b25d421f5df5a6ee7a88db21159f3c5e23 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 24 Aug 2024 10:29:56 +0200 Subject: [PATCH 2510/3013] package/comix-cursors: update COMIX_CURSORS_SITE The project moved to Gitlab and renamed it's archive. Fix the download URL and update the hash. Fixes: http://autobuild.buildroot.org/results/734/734917ff9f613f07e6995c1f333eab1ee8bc5760 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/comix-cursors/comix-cursors.hash | 2 +- package/comix-cursors/comix-cursors.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/comix-cursors/comix-cursors.hash b/package/comix-cursors/comix-cursors.hash index b66a61423b9..b3975e1e3e7 100644 --- a/package/comix-cursors/comix-cursors.hash +++ b/package/comix-cursors/comix-cursors.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9e68ea8ff230dcc793528aa5da9a38b9bf61c478cd6868b4e4f5da659746a019 ComixCursors-0.9.1.tar.bz2 +sha256 7248f2da98fea475e590aa657d8581593516530d014a9ddbac8667d1b5f3a02b comixcursors-0.9.1.tar.bz2 diff --git a/package/comix-cursors/comix-cursors.mk b/package/comix-cursors/comix-cursors.mk index 7b034ccee78..3e063711822 100644 --- a/package/comix-cursors/comix-cursors.mk +++ b/package/comix-cursors/comix-cursors.mk @@ -5,8 +5,8 @@ ################################################################################ COMIX_CURSORS_VERSION = 0.9.1 -COMIX_CURSORS_SITE = https://limitland.gitlab.io/comixcursors -COMIX_CURSORS_SOURCE = ComixCursors-$(COMIX_CURSORS_VERSION).tar.bz2 +COMIX_CURSORS_SITE = $(call gitlab,limitland,comixcursors,$(COMIX_CURSORS_VERSION)) +COMIX_CURSORS_SOURCE = comixcursors-$(COMIX_CURSORS_VERSION).tar.bz2 COMIX_CURSORS_LICENSE = GPL-3.0 COMIX_CURSORS_STRIP_COMPONENTS = 0 From 180216631a64d5319ab0420cf7b37acb4fa0799c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 24 Aug 2024 10:30:46 +0200 Subject: [PATCH 2511/3013] package/szip: update SZIP_SITE Fix broken link. While at it, use $(SZIP_VERSION) inside SZIP_SITE instead of duplicating the version. Fixes: http://autobuild.buildroot.org/results/35d/35d08103bbd0da22a5e111f1f86f28aba7062ee6 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/szip/szip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/szip/szip.mk b/package/szip/szip.mk index 7a8a5a82e61..869fc9c358a 100644 --- a/package/szip/szip.mk +++ b/package/szip/szip.mk @@ -5,7 +5,7 @@ ################################################################################ SZIP_VERSION = 2.1.1 -SZIP_SITE = http://www.hdfgroup.org/ftp/lib-external/szip/2.1.1/src +SZIP_SITE = https://docs.hdfgroup.org/archive/support/ftp/lib-external/szip/$(SZIP_VERSION)/src SZIP_LICENSE = szip license SZIP_LICENSE_FILES = COPYING SZIP_INSTALL_STAGING = YES From b10a791c08641038998159dc89b73f0e9f122445 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 16 Jul 2024 11:43:05 +0200 Subject: [PATCH 2512/3013] package/nodejs: security bump to v20.15.1 Release Notes: https://nodejs.org/en/blog/release/v20.15.1 Fixes the following CVE's: CVE-2024-36138 - Bypass incomplete fix of CVE-2024-27980 (High) CVE-2024-22020 - Bypass network import restriction via data URL (Medium) CVE-2024-22018 - fs.lstat bypasses permission model (Low) CVE-2024-36137 - fs.fchown/fchmod bypasses permission model (Low) CVE-2024-37372 - Permission model improperly processes UNC paths (Low) Also these additional CVE's were fixed in the v20.12.1 and v20.12.2 releases [1][2]: CVE-2024-27983 - Assertion failed in node::http2::Http2Session::~Http2Session() leads to HTTP/2 server crash- (High) CVE-2024-27982 - HTTP Request Smuggling via Content Length Obfuscation - (Medium) CVE-2024-27980 - Command injection via args parameter of child_process.spawn without shell option enabled on Windows NodeJS tests are passing: $ ./support/testing/run-tests -o ./outputs/ -k tests.package.test_nodejs -d dl 12:02:58 TestNodeJSModuleHostSrc Starting 12:02:58 TestNodeJSModuleHostSrc Building 13:17:15 TestNodeJSModuleHostSrc Building done 13:17:23 TestNodeJSModuleHostSrc Cleaning up .13:17:23 TestNodeJSModuleHostBin Starting 13:17:23 TestNodeJSModuleHostBin Building 14:06:15 TestNodeJSModuleHostBin Building done 14:06:20 TestNodeJSModuleHostBin Cleaning up .14:06:20 TestNodeJSBasic Starting 14:06:20 TestNodeJSBasic Building 14:55:40 TestNodeJSBasic Building done 14:55:45 TestNodeJSBasic Cleaning up LICENSE hash changed due to changes in vendored components: * copyright year update and adding spdx identifier [1] [1] https://nodejs.org/en/blog/release/v20.12.1 [2] https://nodejs.org/en/blog/release/v20.12.2 [3] https://github.com/nodejs/node/commit/d5a316f5ea3fade3140c2ae35c144b500fb5d758 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit bffb6a2339bbfe28a0ca2399716c3966af4a623c) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2cbbf766f5c..61bda55098f 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.12.0/SHASUMS256.txt.asc -sha256 007ca2699cf6e84290e5bed844ed66ef9d707d23561dfaf117212b7dce216ba7 node-v20.12.0-linux-arm64.tar.xz -sha256 668fb421a24be596c98f00a31049fbf6ada14d221b7382e0f1caa55ab421431a node-v20.12.0-linux-armv7l.tar.xz -sha256 78dc3b7ad993c332684802e35c1f0de2b76193d13394bc89e3bab216828587c7 node-v20.12.0-linux-ppc64le.tar.xz -sha256 0a126adf5b6a5eb11a37bad76a0c626a18f20b6811322e68aae0e3cf9bf580bd node-v20.12.0-linux-x64.tar.xz -sha256 76e5346cebfd581528f699f764f4d1a6e87cb818b696708f235ddcb625a0f78d node-v20.12.0.tar.xz +# From https://nodejs.org/dist/v20.15.1/SHASUMS256.txt.asc +sha256 10d47a46ef208b3e4b226e4d595a82659123b22397ed77b7975d989114ec317e node-v20.15.1-linux-arm64.tar.xz +sha256 7bc120efdd8018f6915471b963d9b80adf4ed406d6dc9edb4ae944b85f505c4c node-v20.15.1-linux-armv7l.tar.xz +sha256 b33e684802251397ad62ad3f8a1836267ee8b7723f87f669470018ad0035287b node-v20.15.1-linux-ppc64le.tar.xz +sha256 26700f8d3e78112ad4a2618a9c8e2816e38a49ecf0213ece80e54c38cb02563f node-v20.15.1-linux-x64.tar.xz +sha256 fdd53a5729d936691a2a1151046fb4897721cb8b0fca2af957823a9b40fe0c34 node-v20.15.1.tar.xz # Locally calculated -sha256 d3a9fbfe0a1fb78627ee296cd5ca5b498822d4d1c5da3b8e8100c41bd7b791fd LICENSE +sha256 49cd410e0fe6a8879a40d0764092d1e6114cc85fe41d4efed990d028eec25582 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9ed51fbe9ba..104d2cf258c 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.12.0 +NODEJS_COMMON_VERSION = 20.15.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From 029a9060538d398205a5317aed680cdb6744f33f Mon Sep 17 00:00:00 2001 From: Fred Lefranc Date: Wed, 17 Jul 2024 14:11:46 +0200 Subject: [PATCH 2513/3013] package/busybox: fix build with glibc 2.39 When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97, it removed the deprecated libcrypt support. Until the upgrade of glibc to 2.39, Busybox could rely on the libcrypt provided by glibc. Since version 2.39, glibc no longer provides libcrypt, causing a build failure with Busybox configurations that have CONFIG_USE_BB_CRYPT disabled. To fix this, add the libxcrypt dependency to Busybox when BR2_PACKAGE_LIBXCRYPT is selected. The user is still responsible for enabling BR2_PACKAGE_LIBXCRYPT when their Busybox configuration has CONFIG_USE_BB_CRYPT disabled. Signed-off-by: Fred Lefranc Signed-off-by: Thomas Petazzoni (cherry picked from commit a22f17881cce09c285067be096a683c523620826) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index eb5e7ad9222..d25e5bf4688 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -164,6 +164,10 @@ define BUSYBOX_SET_MDEV endef endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +BUSYBOX_DEPENDENCIES += libxcrypt +endif + # sha passwords need USE_BB_CRYPT_SHA ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) define BUSYBOX_SET_CRYPT_SHA From bfc86676cf8c1e0fbb27534fb237783684f3f6e0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 17 Jul 2024 17:12:54 +0200 Subject: [PATCH 2514/3013] package/uclibc: add patch for libucontext usage *ucontext functions are only implemented for a subset of uClibc supported architectures. To allow the external library libucontext to be used this small patch is required. Tested for riscv64. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit f761a8c4516d88d70ae6f5d192fdb99cafa761a6) Signed-off-by: Peter Korsgaard --- .../0001-allow-to-use-sys-ucontext.h.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/uclibc/0001-allow-to-use-sys-ucontext.h.patch diff --git a/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch new file mode 100644 index 00000000000..b6bd5602d94 --- /dev/null +++ b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch @@ -0,0 +1,35 @@ +From 903da45dde43836e35a295226c5b1efccd413c08 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 17 Jul 2024 15:41:40 +0200 +Subject: [PATCH] allow to use + +For architectures without ucontext implementation it is possible +to use libucontext with this small adaptation. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/MZCPGG56TL7SVOZY2L3AGHLREJ76BYZE/ +--- + include/ucontext.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/ucontext.h b/include/ucontext.h +index 4ce114ef1..76b4f375e 100644 +--- a/include/ucontext.h ++++ b/include/ucontext.h +@@ -23,11 +23,11 @@ + + #include + +-#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ +- + /* Get machine dependent definition of data structures. */ + #include + ++#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ ++ + __BEGIN_DECLS + + /* Get user context and store it in variable pointed to by UCP. */ +-- +2.30.2 + From 4b00891da14eb67f5390a5650c0cf96e7f84cb07 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 12 Jun 2024 19:06:03 +0200 Subject: [PATCH 2515/3013] package/libgtk3: bump to version 3.24.42 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit d40e57e945e8348f74d0228e00c9424ce3bfb68a) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 0fa4873443a..a1d8b1694d1 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.41.sha256sum -sha256 47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa gtk+-3.24.41.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.sha256sum +sha256 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2 gtk+-3.24.42.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 7e5882f830e..547fd194a5a 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).41 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).42 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From e3b8078432404c0d4312e5b84788d1dd6502a008 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 17 Jul 2024 19:02:56 +0200 Subject: [PATCH 2516/3013] package/libgtk3: security bump to version 3.24.43 fix CVE-2024-6655 (Library injection from CWD) Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit c51f9881d6737ba63ae4ce6f1ea436eeec364e09) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index a1d8b1694d1..6a682a74121 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.sha256sum -sha256 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2 gtk+-3.24.42.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.43.sha256sum +sha256 7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7 gtk+-3.24.43.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 547fd194a5a..d6d7c64a547 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).42 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).43 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From cdc2e042a1dbed4a197d54feac74f62577096bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Wed, 3 Apr 2024 21:30:38 +0000 Subject: [PATCH 2517/3013] docs/manual: promote using fixed version for kernel headers when contributing a board MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the default (newest) kernel headers series changes the build can break. Example error message: Incorrect selection of kernel headers: expected 6.8.x, got 6.5.x In the above case the defconfig used: BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.9" The kernel headers were not specified, so the build defaulted to using the kernel sources as header source and the default (newest) header series. From .config: BR2_KERNEL_HEADERS_AS_KERNEL=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y Signed-off-by: Gero Schwäricke Signed-off-by: Arnout Vandecappelle (cherry picked from commit eb519ad7cc716347dbf0f9707ff282a97b21f623) Signed-off-by: Peter Korsgaard --- docs/manual/adding-board-support.adoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-board-support.adoc b/docs/manual/adding-board-support.adoc index 9501262086a..be7699668d1 100644 --- a/docs/manual/adding-board-support.adoc +++ b/docs/manual/adding-board-support.adoc @@ -32,7 +32,11 @@ Always use fixed versions or commit hashes for the different components, not the "latest" version. For example, set +BR2_LINUX_KERNEL_CUSTOM_VERSION=y+ and +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE+ to the kernel version you tested -with. +with. If you are using the buildroot toolchain +BR2_TOOLCHAIN_BUILDROOT+ +(which is the default), additionally ensure that the same kernel headers +are used (+BR2_KERNEL_HEADERS_AS_KERNEL+, which is also the default) and +set the custom kernel headers series to match your kernel version +(+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_*+). It is recommended to use as much as possible upstream versions of the Linux kernel and bootloaders, and to use as much as possible default From 96d32fd6564ee124b9d325cab7c301820e4363a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 14:29:08 +0200 Subject: [PATCH 2518/3013] package/mpir: fix build with host gcc >= 14 Fix the following build failure with host gcc >= 14 which enables -Werror=implicit-function-declaration (https://gcc.gnu.org/gcc-14/porting_to.html): configure:9998: checking build system compiler /usr/bin/gcc configure:10011: /usr/bin/gcc conftest.c conftest.c: In function 'main': conftest.c:4:3: error: implicit declaration of function 'exit' [-Wimplicit-function-declaration] 4 | exit(0); | ^~~~ conftest.c:1:1: note: include '' or provide a declaration of 'exit' +++ |+#include 1 | int conftest.c:4:3: warning: incompatible implicit declaration of built-in function 'exit' [-Wbuiltin-declaration-mismatch] 4 | exit(0); | ^~~~ conftest.c:4:3: note: include '' or provide a declaration of 'exit' configure:10014: $? = 1 configure:10021: result: no configure:10026: error: Specified CC_FOR_BUILD doesn't seem to work Fixes: - http://autobuild.buildroot.org/results/3ab381f06d5dc030039b6f6f8d19feb55cf3367d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3bb426628c19f04cbad6821c1a68f008043d7808) Signed-off-by: Peter Korsgaard --- ...-Fix-configure-failures-with-Xcode12.patch | 116 ++++++++++++++++++ package/mpir/mpir.mk | 2 + 2 files changed, 118 insertions(+) create mode 100644 package/mpir/0002-Fix-configure-failures-with-Xcode12.patch diff --git a/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch b/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch new file mode 100644 index 00000000000..453515f9267 --- /dev/null +++ b/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch @@ -0,0 +1,116 @@ +From bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb Mon Sep 17 00:00:00 2001 +From: Mitchell Blank Jr +Date: Mon, 21 Dec 2020 12:05:19 +0000 +Subject: [PATCH] Fix configure failures with Xcode12 + +Changes are needed becuase Xcode12 includes a default of +-Werror,-Wimplicit-function-declaration which means that +even something like calling "exit(0);" is a compile failure +if you haven't done a "#include " first (as C99 +requires, but most other compilers will just warn about) + +I don't know if the "long long reliability test 2" test which +tries to provoke a crash on a particular gcc 3.3 build still +does what it was originally intended to do with my change. +Of course, I doubt anyone has tried to use that compiler in +years. + +Fixes #290 + +Upstream: https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb +Signed-off-by: Fabrice Fontaine +--- + acinclude.m4 | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 91c35bc23..620a629ef 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -589,9 +589,9 @@ extern + #endif + __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) + {t1 c,x,r;int i;if(v0){c=1;for(i=1;iconftest.c <conftest.c < + int + main () + { +- exit(0); ++ return 0; + } + double d; + double diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk index 5dbd760aa1f..46cd35e4365 100644 --- a/package/mpir/mpir.mk +++ b/package/mpir/mpir.mk @@ -11,6 +11,8 @@ MPIR_LICENSE = LGPL-3.0+ MPIR_LICENSE_FILES = COPYING.LIB MPIR_INSTALL_STAGING = YES MPIR_DEPENDENCIES = gmp host-yasm +# 0002-Fix-configure-failures-with-Xcode12.patch +MPIR_AUTORECONF = YES ifeq ($(BR2_MIPS_NABI32),y) MPIR_CONF_OPTS += ABI=n32 From 3f0b87bf31154c5e93bed52a1a1d1d1d2d9a8fa1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 14:40:08 +0200 Subject: [PATCH 2519/3013] package/cpuload: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: read_cpu_stat.c: In function 'cpudata_new': read_cpu_stat.c:49:17: error: implicit declaration of function 'error'; did you mean 'perror'? [-Wimplicit-function-declaration] 49 | error("too many cpus"); | ^~~~~ | perror Fixes: - http://autobuild.buildroot.org/results/3bca2659011d123d7b7a0ca19c4e868643d45766 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d3e1821cc6496bfab19e4fe3be9fe6223e8f8176) Signed-off-by: Peter Korsgaard --- .../0001-Changed-error-calls-to-perror.patch | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 package/cpuload/0001-Changed-error-calls-to-perror.patch diff --git a/package/cpuload/0001-Changed-error-calls-to-perror.patch b/package/cpuload/0001-Changed-error-calls-to-perror.patch new file mode 100644 index 00000000000..6672bec6779 --- /dev/null +++ b/package/cpuload/0001-Changed-error-calls-to-perror.patch @@ -0,0 +1,115 @@ +From ffd61eaa72acf123dea0c80ed3774656289ab49f Mon Sep 17 00:00:00 2001 +From: roiec +Date: Wed, 5 Jan 2022 17:12:05 +0200 +Subject: [PATCH] Changed 'error' calls to 'perror' + +Upstream: https://github.com/kelvincheung/cpuload/pull/1 +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 60 ++++++++++++++++++++++++++++++++++++++++++++ + src/graph_cpu_load.c | 4 +-- + src/read_cpu_stat.c | 2 +- + 3 files changed, 63 insertions(+), 3 deletions(-) + create mode 100644 .gitignore + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..c2ae907 +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,60 @@ ++# Prerequisites ++*.d ++ ++# Object files ++*.o ++*.ko ++*.obj ++*.elf ++ ++# Linker output ++*.ilk ++*.map ++*.exp ++ ++# Precompiled Headers ++*.gch ++*.pch ++ ++# Libraries ++*.lib ++*.a ++*.la ++*.lo ++ ++# Shared objects (inc. Windows DLLs) ++*.dll ++*.so ++*.so.* ++*.dylib ++ ++# Executables ++*.exe ++*.out ++*.app ++*.i*86 ++*.x86_64 ++*.hex ++ ++# Debug files ++*.dSYM/ ++*.su ++*.idb ++*.pdb ++ ++# Kernel Module Compile Results ++*.mod* ++*.cmd ++.tmp_versions/ ++modules.order ++Module.symvers ++Mkfile.old ++dkms.conf ++ ++#images ++*.tgz ++*.img ++ ++ ++#build ++configure +diff --git a/src/graph_cpu_load.c b/src/graph_cpu_load.c +index e4b7785..525d9ed 100644 +--- a/src/graph_cpu_load.c ++++ b/src/graph_cpu_load.c +@@ -132,7 +132,7 @@ void graph_new_line(char *str, unsigned long color) + graph_last_x = graph_last_y = -1; + + if (graph_data_index >= MAX_GRAPH_DATA - 2) +- error("Too many graph data."); ++ perror("Too many graph data."); + + graph_data[graph_data_index++] = DATUM_COLOR; + graph_data[graph_data_index++] = color; +@@ -145,7 +145,7 @@ void graph_new_line(char *str, unsigned long color) + void graph_add_point(int size, int amount) + { + if (graph_data_index >= MAX_GRAPH_DATA - 4) +- error("Too many graph data."); ++ perror("Too many graph data."); + + graph_data[graph_data_index++] = DATUM_SIZE; + graph_data[graph_data_index++] = size; +diff --git a/src/read_cpu_stat.c b/src/read_cpu_stat.c +index 3d014be..ff51d7f 100644 +--- a/src/read_cpu_stat.c ++++ b/src/read_cpu_stat.c +@@ -46,7 +46,7 @@ ProcessList *cpudata_new(void) + fclose(file); + + if (cpu > cpus -1) { +- error("too many cpus"); ++ perror("too many cpus"); + exit(1); + } + From 40c35798dbd588c682d08544f79c081f105a13b3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 16:26:29 +0200 Subject: [PATCH 2520/3013] package/autossh: fix build with gcc >= 14 Include stdio.h to avoid that __progname check wrongly returned that the function is unavailable with gcc >= 14 which enables -Werror=implicit-function-declaration (https://gcc.gnu.org/gcc-14/porting_to.html): configure:5231: checking if libc defines __progname configure:5249: /home/autobuild/autobuild/instance-7/output-1/host/bin/sh4-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c >&5 conftest.c: In function 'main': conftest.c:73:27: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration] 73 | extern char *__progname; printf("%s", __progname); | ^~~~~~ conftest.c:1:1: note: include '' or provide a declaration of 'printf' 1 | /* confdefs.h */ conftest.c:73:27: warning: incompatible implicit declaration of built-in function 'printf' [-Wbuiltin-declaration-mismatch] 73 | extern char *__progname; printf("%s", __progname); | ^~~~~~ conftest.c:73:27: note: include '' or provide a declaration of 'printf' resulting in the following static build failure: /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/sh4-buildroot-linux-musl/14.1.0/../../../../sh4-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/sh4-buildroot-linux-musl/sysroot/lib/libc.a(libc.o):(.bss.__progname+0x0): multiple definition of `__progname'; autossh.o:(.bss+0x120): first defined here Fixes: - http://autobuild.buildroot.org/results/5d80a8096d0f5529cbd86903a74f3bab3d230f4a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 65672b9cd099b71dcfec1d982af1f35824b851d4) Signed-off-by: Peter Korsgaard --- ....ac-fix-__progname-check-with-gcc-14.patch | 52 +++++++++++++++++++ package/autossh/autossh.mk | 1 + 2 files changed, 53 insertions(+) create mode 100644 package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch diff --git a/package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch b/package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch new file mode 100644 index 00000000000..a5173281107 --- /dev/null +++ b/package/autossh/0001-configure.ac-fix-__progname-check-with-gcc-14.patch @@ -0,0 +1,52 @@ +From 3a74eff481f37975e04f00db4923b1c16f93497d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 20 Jul 2024 16:06:37 +0200 +Subject: [PATCH] configure.ac: fix __progname check with gcc >= 14 + +Include stdio.h to avoid that __progname check wrongly returns that +the function is unavailable with gcc >= 14 which enables +-Werror=implicit-function-declaration +(https://gcc.gnu.org/gcc-14/porting_to.html): + +configure:5231: checking if libc defines __progname +configure:5249: /home/autobuild/autobuild/instance-7/output-1/host/bin/sh4-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c >&5 +conftest.c: In function 'main': +conftest.c:73:27: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration] + 73 | extern char *__progname; printf("%s", __progname); + | ^~~~~~ +conftest.c:1:1: note: include '' or provide a declaration of 'printf' + 1 | /* confdefs.h */ +conftest.c:73:27: warning: incompatible implicit declaration of built-in function 'printf' [-Wbuiltin-declaration-mismatch] + 73 | extern char *__progname; printf("%s", __progname); + | ^~~~~~ +conftest.c:73:27: note: include '' or provide a declaration of 'printf' + +resulting in the following static build failure: + +/home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/sh4-buildroot-linux-musl/14.1.0/../../../../sh4-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/sh4-buildroot-linux-musl/sysroot/lib/libc.a(libc.o):(.bss.__progname+0x0): multiple definition of `__progname'; autossh.o:(.bss+0x120): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/5d80a8096d0f5529cbd86903a74f3bab3d230f4a + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/Autossh/autossh/pull/9 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4bb9380..dadb523 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -132,7 +132,7 @@ AC_CHECK_LIB(socket, connect) + # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ +- AC_TRY_LINK([], ++ AC_TRY_LINK([ #include ], + [ extern char *__progname; printf("%s", __progname); ], + [ ac_cv_libc_defines___progname="yes" ], + [ ac_cv_libc_defines___progname="no" ] +-- +2.43.0 + diff --git a/package/autossh/autossh.mk b/package/autossh/autossh.mk index 899e5cdb525..fbb525bcca2 100644 --- a/package/autossh/autossh.mk +++ b/package/autossh/autossh.mk @@ -10,6 +10,7 @@ AUTOSSH_SOURCE = autossh-$(AUTOSSH_VERSION).tgz AUTOSSH_LICENSE = Modified BSD AUTOSSH_LICENSE_FILES = autossh.c # Fix AC_ARG_WITH code generation for --with-ssh +# 0001-configure.ac-fix-__progname-check-with-gcc-14.patch AUTOSSH_AUTORECONF = YES AUTOSSH_CONF_OPTS = --with-ssh=/usr/bin/ssh From 3e47cc5995ccbbb1428e733867e7a4fccdb38f72 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 11:37:43 +0200 Subject: [PATCH 2521/3013] package/libcli: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: libcli.c: In function 'cli_register_command': libcli.c:430:27: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] 430 | if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; | ^~~~~~ libcli.c:430:27: note: earlier argument should specify number of elements, later size of each element Fixes: - http://autobuild.buildroot.org/results/a170d27689e069cf58f830bdd74f604364ee503b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a5466a4303d7652c217139bf0dc0b1eb9d6ba0c5) Signed-off-by: Peter Korsgaard --- ...rameters-for-Wcalloc-transposed-args.patch | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch diff --git a/package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch b/package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch new file mode 100644 index 00000000000..909de2b74dd --- /dev/null +++ b/package/libcli/0001-Swap-calloc-parameters-for-Wcalloc-transposed-args.patch @@ -0,0 +1,96 @@ +From 42e798e3f8b4a092be26bc91c9f87e5593f0d302 Mon Sep 17 00:00:00 2001 +From: Gwyn Ciesla +Date: Wed, 31 Jan 2024 14:40:42 -0600 +Subject: [PATCH] Swap calloc parameters for -Wcalloc-transposed-args + +Upstream: https://github.com/dparrish/libcli/pull/93 +Signed-off-by: Fabrice Fontaine +--- + libcli.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/libcli.c b/libcli.c +index 88c23d8..32ceeae 100644 +--- a/libcli.c ++++ b/libcli.c +@@ -427,7 +427,7 @@ struct cli_command *cli_register_command(struct cli_def *cli, struct cli_command + struct cli_command *c; + + if (!command) return NULL; +- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; ++ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL; + c->command_type = CLI_REGULAR_COMMAND; + c->callback = callback; + c->next = NULL; +@@ -597,7 +597,7 @@ struct cli_def *cli_init() { + struct cli_def *cli; + struct cli_command *c; + +- if (!(cli = calloc(sizeof(struct cli_def), 1))) return 0; ++ if (!(cli = calloc(1, sizeof(struct cli_def)))) return 0; + + cli->buf_size = 1024; + if (!(cli->buffer = calloc(cli->buf_size, 1))) { +@@ -1957,7 +1957,7 @@ int cli_match_filter_init(struct cli_def *cli, int argc, char **argv, struct cli + char *search_flags = cli_get_optarg_value(cli, "search_flags", NULL); + + filt->filter = cli_match_filter; +- filt->data = state = calloc(sizeof(struct cli_match_filter_state), 1); ++ filt->data = state = calloc(1, sizeof(struct cli_match_filter_state)); + if (!state) return CLI_ERROR; + + if (!strcmp(cli->pipeline->current_stage->words[0], "include")) { +@@ -2050,7 +2050,7 @@ int cli_range_filter_init(struct cli_def *cli, int argc, char **argv, struct cli + // from the command line processing and continue + + filt->filter = cli_range_filter; +- filt->data = state = calloc(sizeof(struct cli_range_filter_state), 1); ++ filt->data = state = calloc(1, sizeof(struct cli_range_filter_state)); + if (state) { + state->from = from; + state->to = to; +@@ -2087,7 +2087,7 @@ int cli_count_filter_init(struct cli_def *cli, int argc, UNUSED(char **argv), st + } + + filt->filter = cli_count_filter; +- if (!(filt->data = calloc(sizeof(int), 1))) return CLI_ERROR; ++ if (!(filt->data = calloc(1, sizeof(int)))) return CLI_ERROR; + + return CLI_OK; + } +@@ -2144,7 +2144,7 @@ struct cli_command *cli_register_filter(struct cli_def *cli, const char *command + struct cli_command *c; + + if (!command) return NULL; +- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; ++ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL; + + c->command_type = CLI_FILTER_COMMAND; + c->init = init; +@@ -2256,7 +2256,7 @@ struct cli_optarg *cli_register_optarg(struct cli_command *cmd, const char *name + goto CLEANUP; + } + } +- if (!(optarg = calloc(sizeof(struct cli_optarg), 1))) goto CLEANUP; ++ if (!(optarg = calloc(1, sizeof(struct cli_optarg)))) goto CLEANUP; + if (!(optarg->name = strdup(name))) goto CLEANUP; + if (help && !(optarg->help = strdup(help))) goto CLEANUP; + +@@ -2532,7 +2532,7 @@ struct cli_command *cli_int_register_buildmode_command(struct cli_def *cli, stru + struct cli_command *c; + + if (!command) return NULL; +- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL; ++ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL; + + c->flags = flags; + c->callback = callback; +@@ -3095,7 +3095,7 @@ int cli_int_execute_pipeline(struct cli_def *cli, struct cli_pipeline *pipeline) + struct cli_pipeline_stage *stage = &pipeline->stage[stage_num]; + pipeline->current_stage = stage; + cli->found_optargs = stage->found_optargs; +- *filt = calloc(sizeof(struct cli_filter), 1); ++ *filt = calloc(1, sizeof(struct cli_filter)); + if (*filt) { + if ((rc = stage->command->init(cli, stage->num_words, stage->words, *filt) != CLI_OK)) { + break; From 0836bb91722daa27744ab28644f2b07a56047bf8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 22:22:31 +0200 Subject: [PATCH 2522/3013] package/augeas: bump to version 1.14.1 This bump will fix the following build failure with gcc >= 14 thanks to https://github.com/hercules-team/augeas/commit/792fb220a31a42043de6962fac6a1f6c030d67c5: internal.c: In function 'xstrerror': internal.c:436:12: error: returning 'int' from a function with return type 'const char *' makes pointer from integer without a cast [-Wint-conversion] 436 | return strerror_r(errnum, buf, len); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/hercules-team/augeas/blob/release-1.14.1/NEWS Fixes: - http://autobuild.buildroot.org/results/65014642966721115ae4050c23b083a7f39e1300 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 321e065516a64198f586632bd83411767d98fe6c) Signed-off-by: Peter Korsgaard --- package/augeas/augeas.hash | 5 ++--- package/augeas/augeas.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/augeas/augeas.hash b/package/augeas/augeas.hash index 03b71349acb..b3b2a2427c8 100644 --- a/package/augeas/augeas.hash +++ b/package/augeas/augeas.hash @@ -1,4 +1,3 @@ -# Locally calculated after checking pgp signature from -# http://download.augeas.net/augeas-1.12.0.tar.gz.sig -sha256 321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87 augeas-1.12.0.tar.gz +# Locally calculated +sha256 368bfdd782e4b9c7163baadd621359c82b162734864b667051ff6bcb57b9edff augeas-1.14.1.tar.gz sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/package/augeas/augeas.mk b/package/augeas/augeas.mk index a0bc2945654..ac4bc7d0bee 100644 --- a/package/augeas/augeas.mk +++ b/package/augeas/augeas.mk @@ -4,8 +4,8 @@ # ################################################################################ -AUGEAS_VERSION = 1.12.0 -AUGEAS_SITE = http://download.augeas.net +AUGEAS_VERSION = 1.14.1 +AUGEAS_SITE = https://github.com/hercules-team/augeas/releases/download/release-$(AUGEAS_VERSION) AUGEAS_INSTALL_STAGING = YES AUGEAS_LICENSE = LGPL-2.1+ AUGEAS_LICENSE_FILES = COPYING From 006f172dd96603d88fdcf33d978927dfb5f4e3c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 21:55:05 +0200 Subject: [PATCH 2523/3013] package/zsh: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: termcap.c:45:14: error: conflicting types for 'boolcodes'; have 'char *[]' 45 | static char *boolcodes[] = { | ^~~~~~~~~ In file included from ../../Src/zshterm.h:1, from ../../Src/zsh_system.h:932, from ../../Src/zsh.mdh:17, from termcap.mdh:17, from termcap.c:38: /home/autobuild/autobuild/instance-0/output-1/host/or1k-buildroot-linux-uclibc/sysroot/usr/include/term.h:764:56: note: previous declaration of 'boolcodes' with type 'const char * const[]' 764 | extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[]; | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/fe2f7170465e96cc1de3dae139a25f615331f4b9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 910e91f3b0311bc9dc5ef00c43b6e3c930eac300) Signed-off-by: Peter Korsgaard --- ...er-types-in-terminfo-global-variable.patch | 51 +++++++++++++++++++ package/zsh/zsh.mk | 2 + 2 files changed, 53 insertions(+) create mode 100644 package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch diff --git a/package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch b/package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch new file mode 100644 index 00000000000..c67c374918f --- /dev/null +++ b/package/zsh/0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch @@ -0,0 +1,51 @@ +From 4c89849c98172c951a9def3690e8647dae76308f Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 8 Dec 2023 21:58:07 +0100 +Subject: [PATCH] 52383: Avoid incompatible pointer types in terminfo global + variable checks + +Upstream: https://sourceforge.net/p/zsh/code/ci/4c89849c98172c951a9def3690e8647dae76308f +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 3 +++ + configure.ac | 12 ++++++------ + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2a8221e1f..2871dcb7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1768,27 +1768,27 @@ if test x$zsh_cv_path_term_header != xnone; then + fi + + AC_MSG_CHECKING(if boolcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) + AC_MSG_RESULT($boolcodes) + + AC_MSG_CHECKING(if numcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) + AC_MSG_RESULT($numcodes) + + AC_MSG_CHECKING(if strcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) + AC_MSG_RESULT($strcodes) + + AC_MSG_CHECKING(if boolnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) + AC_MSG_RESULT($boolnames) + + AC_MSG_CHECKING(if numnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) + AC_MSG_RESULT($numnames) + + AC_MSG_CHECKING(if strnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) + AC_MSG_RESULT($strnames) + + dnl There are apparently defective terminal library headers on some diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index e790bf4c5ea..7e577fa9e1d 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -13,6 +13,8 @@ ZSH_CONF_ENV = zsh_cv_sys_nis=no zsh_cv_sys_nis_plus=no ZSH_LICENSE = MIT-like ZSH_LICENSE_FILES = LICENCE ZSH_CPE_ID_VENDOR = zsh +# 0001-52383-Avoid-incompatible-pointer-types-in-terminfo-global-variable.patch +ZSH_AUTORECONF = YES # zsh uses TRY_RUN to determine these ZSH_CONF_OPTS += \ From 186e4e79d8a67969ace817e7ab848177a31586eb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 21:31:42 +0200 Subject: [PATCH 2524/3013] package/openswan: select libxcrypt if needed Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-7/output-1/build/openswan-3.0.0/programs/pluto/xauth.c:36:10: fatal error: crypt.h: No such file or directory 36 | #include | ^~~~~~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/df7cce809e3e4aa92e700a3fc5105c6c20f21f6b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 29d29569ebde681d28db9d6bc123d3487e240134) Signed-off-by: Peter Korsgaard --- package/openswan/Config.in | 1 + package/openswan/openswan.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/openswan/Config.in b/package/openswan/Config.in index 724654e984d..31c4a66b35c 100644 --- a/package/openswan/Config.in +++ b/package/openswan/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_OPENSWAN depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 select BR2_PACKAGE_GMP select BR2_PACKAGE_IPROUTE2 + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Openswan is an implementation of IPsec for Linux diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index 4c6a779f0da..64218810f80 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -22,6 +22,10 @@ OPENSWAN_DEPENDENCIES += libcurl OPENSWAN_MAKE_OPTS += USE_LIBCURL=true endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +OPENSWAN_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENSWAN_DEPENDENCIES += openssl OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true From 1b7369b6b876d971e27a459233b1e121eba69aff Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 21:01:40 +0200 Subject: [PATCH 2525/3013] package/libcoap: enable required libopenssl options libcoap unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859 libcoap also unconditionally uses PSK Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/6bd3e1390cbbc59b9b3d030c2a401e45e9d173da - http://autobuild.buildroot.org/results/f243209454feed4f33f759786c2023c576a2cd3d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 33d25f08f97450cea7a415582dc2110b2bc828c2) Signed-off-by: Peter Korsgaard --- package/libcoap/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcoap/Config.in b/package/libcoap/Config.in index 6e0c1905bcb..950aee5279b 100644 --- a/package/libcoap/Config.in +++ b/package/libcoap/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBCOAP bool "libcoap" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help libcoap is a C implementation of a lightweight application-protocol for devices that are constrained their From 9b8eefd7aa86e890aa139f4e6f1a8453f0e7a884 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:27:51 +0200 Subject: [PATCH 2526/3013] package/libupnp: bump to version 1.4.19 https://github.com/pupnp/pupnp/blob/release-1.14.19/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3a4bd98d11550081db622327fd8cab570c0ad077) Signed-off-by: Peter Korsgaard --- package/libupnp/libupnp.hash | 2 +- package/libupnp/libupnp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 6fd4678c0d7..86437a7339b 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 16a7cee93ce2868ae63ab1a8164dc7de43577c59983b9f61293a310d6888dceb libupnp-1.14.18.tar.bz2 +sha256 b6423c573b758d09539f5e6c4712c1a9fd35dccf835f81d99473d50a50ad49b0 libupnp-1.14.19.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 61e52c095a4..cd148d14d06 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.14.18 +LIBUPNP_VERSION = 1.14.19 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = \ http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) From 8af9dacc2a7a790940b138fefd735d91667bf116 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:41:18 +0200 Subject: [PATCH 2527/3013] package/libxslt: bump to version 1.1.42 https://gitlab.gnome.org/GNOME/libxslt/-/blob/v1.1.42/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f3461d083b53ac262dd31e2b93281cecdc8d3147) Signed-off-by: Peter Korsgaard --- package/libxslt/libxslt.hash | 4 ++-- package/libxslt/libxslt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 7597e7954de..dd67940c8a8 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.sha256sum -sha256 2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0 libxslt-1.1.39.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.42.sha256sum +sha256 85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb libxslt-1.1.42.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 8098937ef39..b5bb22f9aed 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.39 +LIBXSLT_VERSION = 1.1.42 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES From 94828223e40b8911e28f9885e1833af67fc896f5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:46:10 +0200 Subject: [PATCH 2528/3013] package/ksmbd-tools: bump to version 3.5.2 https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b409766234a3aabb33918b935b58704822345e9e) Signed-off-by: Peter Korsgaard --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index c3e6ebefe5c..3367886d553 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ab377b3044c48382303f3f7ec95f2e1a17592c774d70b2a11f32952099dbb214 ksmbd-tools-3.5.1.tar.gz +sha256 5da7fb4cb4368f9abf56f6f9fbc17b25e387876bed9ff7ee0d6f1140ef07c8d7 ksmbd-tools-3.5.2.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index c56c6e10bbc..261eddad7c5 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.5.1 +KSMBD_TOOLS_VERSION = 3.5.2 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING From fcaba8e25fc25a6f9f8f82d020aa2e1eb5a5ee51 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Jul 2024 13:45:57 +0200 Subject: [PATCH 2529/3013] support/testing: add mawk runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit f04a95f79f087869a44ea3d63d55ce7b27b8e922) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_mawk.py | 114 +++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 support/testing/tests/package/test_mawk.py diff --git a/DEVELOPERS b/DEVELOPERS index 923d0269623..ec3b49e2d00 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1864,6 +1864,7 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py diff --git a/support/testing/tests/package/test_mawk.py b/support/testing/tests/package/test_mawk.py new file mode 100644 index 00000000000..5caf77c1169 --- /dev/null +++ b/support/testing/tests/package/test_mawk.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestMawk(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MAWK=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def basic_mawk_tests(self): + # Check the program can execute + self.assertRunOk("mawk --version") + + # Check "mawk" can return a specific exit code + code = 123 + cmd = "mawk 'BEGIN { exit(" + str(code) + "); }'" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, code) + + # Run a basic print program + test_string = "Hello Buildroot" + cmd = "mawk 'BEGIN {print \"" + test_string + "\"; }'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], test_string) + + def create_test_data(self): + # Create some test data + entries = ["one", "two", "three", "four"] + for entry in entries: + self.assertRunOk(f"echo {entry} >> data1.txt") + + def add_line_numbers(self): + # Add line numbers with mawk + cmd = "mawk '{ print NR \"\\t\" $1; }' data1.txt > data2.txt" + self.assertRunOk(cmd) + + def sum_column(self): + # Check the sum of the first column is 1+2+3+4 == 10 + awk_prg = "BEGIN { SUM = 0; } { SUM = SUM + $1; } END { print SUM; }" + cmd = f"mawk '{awk_prg}' data2.txt" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(int(output[0]), 10) + + def uppercase_column(self): + # Extract only column 2 and convert it to upper case + cmd = "mawk '{ print toupper($2); }' data2.txt > data3.txt" + self.assertRunOk(cmd) + + # Prepare the same output using "data1.txt" and the "tr" command, + # for verification + cmd = "tr a-z A-Z < data1.txt > data3-tr.txt" + self.assertRunOk(cmd) + + # "mawk" and "tr" output are expected to be the same + self.assertRunOk("cmp data3.txt data3-tr.txt") + + def mawk_head(self): + # Show the first 2 lines of a file + cmd = "mawk 'NR <= 2 { print $0; }' data2.txt > data4.txt" + self.assertRunOk(cmd) + + # Prepare the same output using the "head" command + cmd = "head -2 data2.txt > data4-head.txt" + self.assertRunOk(cmd) + + # "mawk" and "tr" output are expected to be the same + self.assertRunOk("cmp data4.txt data4-head.txt") + + def mawk_specific(self): + # Use the "-W dump" mawk specific option. + # See: https://invisible-island.net/mawk/manpage/mawk.html + # We create an arbitrary awk program with an integer and + # string constant. We then check those constants are in the + # mawk "assembler" output. + awk_int = 12345 + awk_str = "Buildroot" + awk_expr = f"print ($1 + {awk_int}) \"{awk_str}\";" + awk_prg = "BEGIN { " + awk_expr + " }" + cmd = f"mawk -W dump '{awk_prg}'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + out_str = "\n".join(output) + self.assertIn(str(awk_int), out_str) + self.assertIn(awk_str, out_str) + + def mawk_numeric(self): + value = 1234 + squared_value = value * value + cmd = "mawk 'BEGIN { print sqrt(" + str(squared_value) + "); }'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(int(output[0]), value) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.basic_mawk_tests() + self.create_test_data() + self.add_line_numbers() + self.sum_column() + self.uppercase_column() + self.mawk_head() + self.mawk_specific() + self.mawk_numeric() From fa2f8886dfb822cce96c3fa25d6b0e2fdb737245 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Jul 2024 19:38:34 +0200 Subject: [PATCH 2530/3013] support/testing: add gpsd runtime testing Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 9c8f6dc5e4d7244b493e290c055202cadc9a12cb) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_gpsd.py | 56 +++++++++++++++++++ .../rootfs-overlay/root/udp-nmea.log | 6 ++ 3 files changed, 64 insertions(+) create mode 100644 support/testing/tests/package/test_gpsd.py create mode 100644 support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log diff --git a/DEVELOPERS b/DEVELOPERS index ec3b49e2d00..12379434e1d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1833,6 +1833,8 @@ F: support/testing/tests/package/test_gnuplot.py F: support/testing/tests/package/test_gnuplot/ F: support/testing/tests/package/test_gnuradio.py F: support/testing/tests/package/test_gnuradio/ +F: support/testing/tests/package/test_gpsd.py +F: support/testing/tests/package/test_gpsd/ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py new file mode 100644 index 00000000000..deed586c17b --- /dev/null +++ b/support/testing/tests/package/test_gpsd.py @@ -0,0 +1,56 @@ +import os +import time + +import infra.basetest + + +class TestGpsd(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_gpsd/rootfs-overlay") + # This test is using the gpsfake Python script. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GPSD=y + BR2_PACKAGE_PYTHON3=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can execute. + self.assertRunOk("gpsd --version") + + # Since gpsd needs a real GPS device, we stop the service. + self.assertRunOk("/etc/init.d/S50gpsd stop") + + # We start the "gpsfake" GPS emulator instead. + cmd = "gpsfake" + cmd += " --slow --cycle 0.1 --quiet" + cmd += "/root/udp-nmea.log &> /dev/null &" + self.assertRunOk(cmd) + + # Wait a bit, to let the gpsfake and gpsd to settle... + time.sleep(3 * self.timeout_multiplier) + + # List the GPS devices. We should see our local UDP test GPS. + out, ret = self.emulator.run("gpsctl") + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith("udp://127.0.0.1")) + self.assertIn("NMEA0183", out[0]) + + # Collect some of our fake GPS data, and check we got the + # coordinates from our test data file. + # Our expected coordinates are: + # https://www.openstreetmap.org/#map=19/43.60439/1.44336 + out, ret = self.emulator.run("gpscsv --header 0 --count 3") + self.assertEqual(ret, 0) + _, gps_lat, gps_long, _ = out[0].split(",") + self.assertAlmostEqual(float(gps_lat), 43.60439) + self.assertAlmostEqual(float(gps_long), 1.44336) diff --git a/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log new file mode 100644 index 00000000000..f3730da7c50 --- /dev/null +++ b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log @@ -0,0 +1,6 @@ +# Name: NMEA 0183 messages for gpsd Buildroot test +# Transport: UDP +# For packet format, see: +# https://gpsd.gitlab.io/gpsd/NMEA.html +$GPGGA,123456.789,4336.2634,N,0126.6016,E,1,04,1.7,143.5,M,,,,*3A +$GPZDA,123456.789,20,07,2024,2,00*64 From 1519399c31dd514b3555f0807dd7472ae1eaf074 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 23 Jul 2024 00:39:22 +0200 Subject: [PATCH 2531/3013] support/testing: package: gpsd: fix gpsfake command line The gpsfake command line has a typo (a missing space), which makes the next gpsctl command to always fail. This commit fixes the issue by adding the missing space. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7391792948 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 49156a0fa4a48d5d80f03c3854f631f312b486d4) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_gpsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index deed586c17b..7ca59739814 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -33,7 +33,7 @@ def test_run(self): # We start the "gpsfake" GPS emulator instead. cmd = "gpsfake" cmd += " --slow --cycle 0.1 --quiet" - cmd += "/root/udp-nmea.log &> /dev/null &" + cmd += " /root/udp-nmea.log &> /dev/null &" self.assertRunOk(cmd) # Wait a bit, to let the gpsfake and gpsd to settle... From 24c56c6d88a641d2b79b91271b727bb71be2be00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 19 Jul 2024 16:17:59 +0200 Subject: [PATCH 2532/3013] package/micropython: change URL to HTTPS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni (cherry picked from commit ade6e41831c2b1f82028dda9744c6b64907e20ef) Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 849a5452f45..b466fbaf2d2 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_MICROPYTHON 3 programming language that is optimised to run on a microcontroller. - http://micropython.org + https://micropython.org if BR2_PACKAGE_MICROPYTHON From 69aa915c689650d2aabdc187dad0ed74c942ac8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 19 Jul 2024 16:18:00 +0200 Subject: [PATCH 2533/3013] package/micropython: adjust name in description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the name from "Micro Python" (two words) to "MicroPython" (camelcase), to match the official website and documentation. Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni (cherry picked from commit 161c25aee11650a4a6b22ca2a88fa0f84ee6b357) Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index b466fbaf2d2..f532b3bdb5e 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MICROPYTHON depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS help - Micro Python is a lean and fast implementation of the Python + MicroPython is a lean and fast implementation of the Python 3 programming language that is optimised to run on a microcontroller. From da80fbd0a77f130af8f0fc444d8d7528576e15d2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Jun 2024 10:15:41 +0200 Subject: [PATCH 2534/3013] package/iproute2: bump to version 6.9.0 Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (cherry picked from commit 4e39f5571304ba92fdfc8286fea6c50824b04e56) Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index d57a93de7d1..a716bf75a18 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce iproute2-6.8.0.tar.xz +sha256 2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0 iproute2-6.9.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 3db2ab925d0..525101aff11 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.8.0 +IPROUTE2_VERSION = 6.9.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 6aa0b165333fa0fc65d639989734630ef9827c5d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 09:01:47 +0200 Subject: [PATCH 2535/3013] package/iproute2: bump to version 6.10 This bump will fix the following build failure with gcc >= 14 thanks to https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=53a89bfd86fff1a00cc77cabb8457a03eaa3bc7d: ../include/json_print.h: In function 'print_tv': ../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types] 58 | value); \ | ^~~~~ | | | const struct timeval * Fixes: - http://autobuild.buildroot.org/results/c47c1e13659e4bfcccd98ebd22949e9dd278079e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 7ecca28e209b811b1ece19f114a2bde4bf5639be) Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index a716bf75a18..0760183b9e6 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0 iproute2-6.9.0.tar.xz +sha256 91a62f82737b44905a00fa803369c447d549e914e9a2a4018fdd75b1d54e8dce iproute2-6.10.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 525101aff11..08b890b3311 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.9.0 +IPROUTE2_VERSION = 6.10.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 83601534d3ffbb1c32d2e0556681eed57b10743e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 09:40:52 +0200 Subject: [PATCH 2536/3013] package/ibm-sw-tpm2: bump to version rev183-2024-03-27 - Refresh first patch - Drop second patch (fix differentl by https://sourceforge.net/p/ibmswtpm2/tpm2/ci/ebe82ac82fef97feddc558f3c3ad16baf67e6921/) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d00c2409a59ac7529b0175c7207a446713489cf3) Signed-off-by: Peter Korsgaard --- ...01-Use-LONG_BIT-to-define-RADIX_BITS.patch | 65 +++++++++---------- .../0002-Add-support-for-OpenSSL-3-2-x.patch | 28 -------- package/ibm-sw-tpm2/ibm-sw-tpm2.hash | 2 +- package/ibm-sw-tpm2/ibm-sw-tpm2.mk | 2 +- 4 files changed, 33 insertions(+), 64 deletions(-) delete mode 100644 package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch diff --git a/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch index bb5d3a96ee5..8d83116dfcb 100644 --- a/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch +++ b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch @@ -14,52 +14,49 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio [Bernd: rebased for git rev 5452af422edeff70fcae8ea99dd28a0922051d7b] Signed-off-by: Bernd Kuhls +[Fabrice: rebase for rev183-2024-03-27] +Signed-off-by: Fabrice Fontaine --- src/LibSupport.h | 21 +++------------------ src/TcpServerPosix.c | 1 + src/makefile | 2 ++ 3 files changed, 6 insertions(+), 18 deletions(-) -diff --git a/src/LibSupport.h b/src/LibSupport.h +diff --git a/src/tpm_radix.h b/src/tpm_radix.h index 5055560..48b1e16 100644 ---- a/src/LibSupport.h -+++ b/src/LibSupport.h -@@ -64,32 +64,9 @@ - #ifndef _LIB_SUPPORT_H_ - #define _LIB_SUPPORT_H_ - --/* kgold added power and s390 */ +--- a/src/tpm_radix.h ++++ b/src/tpm_radix.h +@@ -61,27 +61,9 @@ + //** Introduction + // Common defines for supporting large numbers and cryptographic buffer sizing. + //********************* -#ifndef RADIX_BITS --# if defined(__x86_64__) || defined(__x86_64) \ -- || defined(__amd64__) || defined(__amd64) \ -- || defined(_WIN64) || defined(_M_X64) \ -- || defined(_M_ARM64) || defined(__aarch64__) \ -- || defined(__powerpc64__) || defined(__PPC64__) || defined(__ppc64__) \ -- || defined(__s390x__) --# define RADIX_BITS 64 --# elif defined(__i386__) || defined(__i386) || defined(i386) \ -- || defined(_WIN32) || defined(_M_IX86) \ -- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__) \ -- || defined(__powerpc__) || defined(__PPC__) --# define RADIX_BITS 32 --# elif defined(__riscv) || defined(__riscv__) --# if __riscv_xlen == 32 --# define RADIX_BITS 32 --# elif __riscv_xlen == 64 --# define RADIX_BITS 64 --# else --# error Unsupported __riscv_xlen value --# endif --# else --# error Unable to determine RADIX_BITS from compiler environment --# endif --#endif // RADIX_BITS +-# if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) \ +- || defined(__amd64) || defined(_WIN64) || defined(_M_X64) || defined(_M_ARM64) \ +- || defined(__aarch64__) || defined(__PPC64__) || defined(__s390x__) \ +- || defined(__powerpc64__) || defined(__ppc64__) +-# define RADIX_BITS 64 +-# elif defined(__i386__) || defined(__i386) || defined(i386) || defined(_WIN32) \ +- || defined(_M_IX86) +-# define RADIX_BITS 32 +-# elif defined(_M_ARM) || defined(__arm__) || defined(__thumb__) +-# define RADIX_BITS 32 +-# elif defined(__riscv) +-// __riscv and __riscv_xlen are standardized by the RISC-V community and should be available +-// on any compliant compiler. +-// +-// https://github.com/riscv-non-isa/riscv-toolchain-conventions +-# define RADIX_BITS __riscv_xlen +-# else +-# error Unable to determine RADIX_BITS from compiler environment +-# endif +-#endif // RADIX_BITS +#include + +#define RADIX_BITS LONG_BIT - // These macros use the selected libraries to the proper include files. - #define LIB_QUOTE(_STRING_) #_STRING_ + #if RADIX_BITS == 64 + # define RADIX_BYTES 8 diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c index cad0402..6293cdd 100644 --- a/src/TcpServerPosix.c diff --git a/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch b/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch deleted file mode 100644 index 6732efce8cd..00000000000 --- a/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch +++ /dev/null @@ -1,28 +0,0 @@ -From beea0f97b3c95ec69f3e269df1af87eb2cdd3c46 Mon Sep 17 00:00:00 2001 -From: Otto Hollmann -Date: Tue, 12 Dec 2023 13:58:32 +0100 -Subject: [PATCH] Add support for OpenSSL 3.2.x - -Upstream: https://github.com/kgoldman/ibmswtpm2/pull/13 -Signed-off-by: Fabrice Fontaine ---- - src/TpmToOsslMath.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/TpmToOsslMath.h b/src/TpmToOsslMath.h -index 0b18191..1271937 100644 ---- a/src/TpmToOsslMath.h -+++ b/src/TpmToOsslMath.h -@@ -76,10 +76,10 @@ - * As of release 3.0.0, OPENSSL_VERSION_NUMBER is a combination of the - * major (M), minor (NN) and patch (PP) version into a single integer 0xMNN00PP0L - */ --#if OPENSSL_VERSION_NUMBER > 0x30100ff0L -+#if OPENSSL_VERSION_NUMBER > 0x30200ff0L - // Check the bignum_st definition in crypto/bn/bn_lcl.h or crypto/bn/bn_local.h and either update - // the version check or provide the new definition for this version. --// Currently safe for all 3.1.x -+// Currently safe for all 3.2.x - # error Untested OpenSSL version - #elif OPENSSL_VERSION_NUMBER >= 0x10100000L - // from crypto/bn/bn_lcl.h diff --git a/package/ibm-sw-tpm2/ibm-sw-tpm2.hash b/package/ibm-sw-tpm2/ibm-sw-tpm2.hash index 392fb598156..3c2d0e758fd 100644 --- a/package/ibm-sw-tpm2/ibm-sw-tpm2.hash +++ b/package/ibm-sw-tpm2/ibm-sw-tpm2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 da7799baa1d38cd9d2f491006de45d38805db9d5a77c38af6e78728bd318f93e ibm-sw-tpm2-5452af422edeff70fcae8ea99dd28a0922051d7b-git4.tar.gz +sha256 239cea3ec99cb31fb25c1ba4fe9b98a862bb20daefefeba8908d370bedd42a31 ibm-sw-tpm2-rev183-2024-03-27-git4.tar.gz sha256 dd2d31b560011ea673e197251e710e52669d911367d83cd3cfd018f8ed58bde9 LICENSE diff --git a/package/ibm-sw-tpm2/ibm-sw-tpm2.mk b/package/ibm-sw-tpm2/ibm-sw-tpm2.mk index 4df61fe0281..67ecd459238 100644 --- a/package/ibm-sw-tpm2/ibm-sw-tpm2.mk +++ b/package/ibm-sw-tpm2/ibm-sw-tpm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IBM_SW_TPM2_VERSION = 5452af422edeff70fcae8ea99dd28a0922051d7b +IBM_SW_TPM2_VERSION = rev183-2024-03-27 IBM_SW_TPM2_SITE = https://git.code.sf.net/p/ibmswtpm2/tpm2 IBM_SW_TPM2_SITE_METHOD = git IBM_SW_TPM2_LICENSE = BSD-3-Clause From 3d5741d911f5a44263458c63cc989ffc14b80877 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 09:40:53 +0200 Subject: [PATCH 2537/3013] package/ibm-sw-tpm2: fix build with openssl 3.3.x Fix the following build failure with openssl 3.3.x raised since commit 6d5ce8609f17a3403d1148a0bbf7a2bdb5ec7f67: In file included from BnValues.h:327, from Global.h:80, from Tpm.h:78, from AuditCommands.c:62: TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version 83 | # error Untested OpenSSL version | ^~~~~ Fixes: 6d5ce8609f17a3403d1148a0bbf7a2bdb5ec7f67 - http://autobuild.buildroot.org/results/2fb5e1cb792fe25ef860ff8111622cd1ff3770bf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 75ec656c36ba2b5bf617acc6e946ef7aa97f948e) Signed-off-by: Peter Korsgaard --- ...lMath.h-fix-build-with-openssl-3.3.x.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch diff --git a/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch b/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch new file mode 100644 index 00000000000..a349c05d4cc --- /dev/null +++ b/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch @@ -0,0 +1,40 @@ +From 1b5d9eb91f0d24d09d711ef839d301ee8b640d61 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jul 2024 09:08:39 +0200 +Subject: [PATCH] src/BnToOsslMath.h: fix build with openssl 3.3.x + +Fix the following build failure with openssl 3.3.x: + +In file included from BnValues.h:327, + from Global.h:80, + from Tpm.h:78, + from AuditCommands.c:62: +TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version + 83 | # error Untested OpenSSL version + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/2fb5e1cb792fe25ef860ff8111622cd1ff3770bf + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/kgoldman/ibmswtpm2/pull/15 +--- + src/BnToOsslMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h +index df4bcfb..72939ea 100644 +--- a/src/BnToOsslMath.h ++++ b/src/BnToOsslMath.h +@@ -77,7 +77,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x30200ff0L ++#if OPENSSL_VERSION_NUMBER >= 0x30300ff0L + // Check the bignum_st definition against the one below and either update the + // version check or provide the new definition for this version. + # error Untested OpenSSL version +-- +2.43.0 + From 32844c4ca256bd40d441a85dcf45769c8758dca5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 12:24:30 +0200 Subject: [PATCH 2538/3013] package/tftpd: bump to latest git commit - Update hash of tftpd.c (changes not related to license) - --include=$(@D)/autoconf/m4 and --disable-tcpwrappers must be passed since https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/commit/?id=fefaa2cc5c2ae1537fccbb552496787130feeeaa - This bump will also fix the following musl build failure raised since latest bump in ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb: In file included from tftpsubs.h:41, from tftpsubs.c:34: /home/autobuild/autobuild/instance-9/output-1/build/tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0/config.h:209:13: error: conflicting types for 'socklen_t'; have 'int' 209 | typedef int socklen_t; | ^~~~~~~~~ Fixes: ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb - http://autobuild.buildroot.org/results/4b5320013d8ab50499a459d64a71e0b71814fb2f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d4a84e61615553ff678d3c3b52ed33f898e9fcc9) Signed-off-by: Peter Korsgaard --- package/tftpd/tftpd.hash | 4 ++-- package/tftpd/tftpd.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tftpd/tftpd.hash b/package/tftpd/tftpd.hash index 3fab9dba073..5a4e87f689c 100644 --- a/package/tftpd/tftpd.hash +++ b/package/tftpd/tftpd.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9bdb3e2ab2b68e4d8cd057d102395c362baf07c7b052f1d5e40e5190afecc15e tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0-git4.tar.gz +sha256 452b2d630f884d80a7c4c324aa8248470224048ffb9473e3490460658b8ebea4 tftpd-2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1-git4.tar.gz # Hash for license file -sha256 5936d0764cb6e8f2f5ce8a11c249d81037b5f275f5983e8538ee4fbe57195369 tftpd/tftpd.c +sha256 9c46847a03d4cf290616a173d526b9bbdfcaf6846cbc01f361989b4e61f2d72e tftpd/tftpd.c diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 81b67f82cec..73ac7006a48 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -TFTPD_VERSION = e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0 +TFTPD_VERSION = 2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1 TFTPD_SITE = https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git TFTPD_SITE_METHOD = git -TFTPD_CONF_OPTS = --without-tcpwrappers +TFTPD_CONF_OPTS = --disable-tcpwrappers TFTPD_LICENSE = BSD-4-Clause TFTPD_LICENSE_FILES = tftpd/tftpd.c TFTPD_CPE_ID_VENDOR = tftpd-hpa_project @@ -15,6 +15,7 @@ TFTPD_CPE_ID_PRODUCT = tftpd-hpa TFTPD_SELINUX_MODULES = tftp # From git TFTPD_AUTORECONF = YES +TFTPD_AUTORECONF_OPTS = --include=$(@D)/autoconf/m4 define TFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp From 6718560ed9a9cbf60a2042d4472656caa53e755e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 17:00:11 +0200 Subject: [PATCH 2539/3013] package/unbound: select BR2_PACKAGE_LIBOPENSSL_ENGINES unbound unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859: sldns/keyraw.c:167:35: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function) 167 | if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { | ^~~~~~~~~~~~~~~~~ Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/b7782f5ba54543df53a835552632f58d4ad6c082 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ec7ae882e048ce4ca5c2b72cb884b8d1ef33c6cc) Signed-off-by: Peter Korsgaard --- package/unbound/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/Config.in b/package/unbound/Config.in index ae2ebfd9757..c8d697113ca 100644 --- a/package/unbound/Config.in +++ b/package/unbound/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_UNBOUND depends on !BR2_STATIC_LIBS select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help Unbound is a validating, recursive, and caching DNS resolver. From 453ed0edfec858bf63c32917e6a5bbfa3c8584ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 17:01:16 +0200 Subject: [PATCH 2540/3013] package/unbound: security bump to version 1.20.0 This release has a fix for the DNSBomb issue CVE-2024-33655. This has a low severity for Unbound, since it makes Unbound complicit in targeting others, but does not affect Unbound so much. This security release also fixes CVE-2024-1931. https://nlnetlabs.nl/news/2024/May/08/unbound-1.20.0-released https://nlnetlabs.nl/news/2024/Mar/14/unbound-1.19.3-released https://nlnetlabs.nl/news/2024/Mar/07/unbound-1.19.2-released Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 7ce07b7b29d08e09f52ca81c9d25728726c87d57) Signed-off-by: Peter Korsgaard --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 843026abc78..96ee80b0ecc 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 -sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.20.0.tar.gz.sha256 +sha256 56b4ceed33639522000fd96775576ddf8782bb3617610715d7f1e777c5ec1dbf unbound-1.20.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 5128d0e420e..ff0262bef10 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.19.1 +UNBOUND_VERSION = 1.20.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From 55a126c8292eec04126bc5df8b6023d9682d7eac Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 00:26:57 +0200 Subject: [PATCH 2541/3013] package/apr-util: needs engine support when built with libopenssl Buildroot commit 623d3bbe43e9193aa8e3395367d01af59071b859 disables engine support when BR2_PACKAGE_LIBOPENSSL_ENGINES is not set. Fixes: http://autobuild.buildroot.net/results/e472618ca9ff4a3cf460f607a8dfa317832ca622/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3d46d9760b97f1782f0f1f617682c18864b5e2b2) Signed-off-by: Peter Korsgaard --- package/apr-util/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index c1a967bdecf..f7c119db485 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_APR_UTIL depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help The utility library for the apache runtime project From 3688161940abec23677499f79ff44d8f54465879 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 23:16:28 +0200 Subject: [PATCH 2542/3013] package/apr-util: requires DES in openssl Enable DES in openssl to avoid the following build failure raised since commit a83d41867c8d69a77d5cd0a665aa216af5340359: crypto/apr_crypto_openssl.c: In function 'crypto_cipher_mechanism': crypto/apr_crypto_openssl.c:385:27: error: implicit declaration of function 'EVP_des_ede3_cbc'; did you mean 'NID_des_ede3_cbc'? [-Wimplicit-function-declaration] 385 | key->cipher = EVP_des_ede3_cbc(); | ^~~~~~~~~~~~~~~~ | NID_des_ede3_cbc Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359 - http://autobuild.buildroot.org/results/4b1088a705f8564f85e629316f5cfc92953f0047 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 8bb67c230b9d32d91bc85e5563f3453cb50d7a38) Signed-off-by: Peter Korsgaard --- package/apr-util/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index f7c119db485..06b6c2684cf 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_APR_UTIL depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help The utility library for the apache runtime project From 645d271e451b83e3c58998999fbea380e7139dd0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Jul 2024 22:57:31 +0200 Subject: [PATCH 2543/3013] support/testing: add nmap runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5510d2890fc628bf08805f83e3430d759c15a8ec) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_nmap.py | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 support/testing/tests/package/test_nmap.py diff --git a/DEVELOPERS b/DEVELOPERS index 12379434e1d..043e558652d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1881,6 +1881,7 @@ F: support/testing/tests/package/test_netsnmp/ F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_nmap.py F: support/testing/tests/package/test_ntp.py F: support/testing/tests/package/test_ntp/ F: support/testing/tests/package/test_numactl.py diff --git a/support/testing/tests/package/test_nmap.py b/support/testing/tests/package/test_nmap.py new file mode 100644 index 00000000000..92b085ece9a --- /dev/null +++ b/support/testing/tests/package/test_nmap.py @@ -0,0 +1,42 @@ +import os +import time + +import infra.basetest + + +class TestNmap(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_NMAP=y + BR2_PACKAGE_NMAP_NCAT=y + BR2_PACKAGE_NMAP_NMAP=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("nmap --version") + + # We open few ports, using the nmap netcat "nc" commands. + ports = [21, 23, 25, 80] + for port in ports: + cmd = f"nc -l -p {port} /dev/null &" + self.assertRunOk(cmd) + + time.sleep(1 * self.timeout_multiplier) + + # We run a local port scan. We should see in the output the + # ports we previously opened. + out, ret = self.emulator.run("nmap -n -sS 127.0.0.1", timeout=20) + self.assertEqual(ret, 0) + nmap_out = "\n".join(out) + for port in ports: + self.assertRegex(nmap_out, f"{port}/tcp *open") From 22b3ef2e30883f91baa49693648c62e1e8f13c31 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 22:04:30 +0200 Subject: [PATCH 2544/3013] package/vorbis-tools: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: codec_skeleton.c: In function 'skeleton_process_fisbone_message_header': codec_skeleton.c:119:9: error: implicit declaration of function 'utf8_decode' [-Wimplicit-function-declaration] 119 | if (utf8_decode(header, &decoded) < 0) { | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/bb5d56d836e7d0f2a62daa9954878ad6e0b190ed Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit a1bd5b31f255a8864a53a54de22a3b07fe799931) Signed-off-by: Peter Korsgaard --- .../0001-fix-build-with-gcc-14.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/vorbis-tools/0001-fix-build-with-gcc-14.patch diff --git a/package/vorbis-tools/0001-fix-build-with-gcc-14.patch b/package/vorbis-tools/0001-fix-build-with-gcc-14.patch new file mode 100644 index 00000000000..a05ce8a5849 --- /dev/null +++ b/package/vorbis-tools/0001-fix-build-with-gcc-14.patch @@ -0,0 +1,51 @@ +From f4a31fe975ea37537f39ace4420aee893b7e0b1a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jul 2024 21:57:38 +0200 +Subject: [PATCH] fix build with gcc >= 14 + +Add missing includes to avoid the following build failure with gcc >= +14: + +codec_skeleton.c: In function 'skeleton_process_fisbone_message_header': +codec_skeleton.c:119:9: error: implicit declaration of function 'utf8_decode' [-Wimplicit-function-declaration] + 119 | if (utf8_decode(header, &decoded) < 0) { + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/bb5d56d836e7d0f2a62daa9954878ad6e0b190ed + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/xiph/vorbis-tools/pull/48 +--- + ogginfo/codec_skeleton.c | 2 ++ + share/utf8.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/ogginfo/codec_skeleton.c b/ogginfo/codec_skeleton.c +index a27f8da..f906f8c 100644 +--- a/ogginfo/codec_skeleton.c ++++ b/ogginfo/codec_skeleton.c +@@ -28,6 +28,8 @@ + + #include "private.h" + ++#include "utf8.h" ++ + typedef struct { + bool supported; + uint16_t version_major; +diff --git a/share/utf8.c b/share/utf8.c +index be378d1..e819b67 100644 +--- a/share/utf8.c ++++ b/share/utf8.c +@@ -28,6 +28,7 @@ + #include + #include + ++#include "charset.h" + #include "utf8.h" + + +-- +2.43.0 + From 56c02aa6c9a8b2f4eb564f0ccc073a588be51303 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 22 Jul 2024 12:20:44 +0200 Subject: [PATCH 2545/3013] package/ruby: update to 3.3.4 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 89c9c131fe96235768bdb68fd67a3fc3626b8a39) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 4ac6200bca9..3831e701fb0 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -sha512 c58e9be9b5ab48191fbf7d67e13f0ec42ee71ed338170e0f7b246708e9cfc617ce65098f5ce7ab32d4305e785642d3e44253462104d5b9c4abcb1a4113f48347 ruby-3.3.1.tar.xz +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +sha512 b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb ruby-3.3.4.tar.xz # License files, Locally calculated sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index fcc637c5ea0..08ecbf5941e 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).4 RUBY_VERSION_EXT = 3.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From 4737f8407e57f4eb7fd15d92b3d8c1622bef22d3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 12:48:59 +0200 Subject: [PATCH 2546/3013] package/apr: fix musl build strerror_r on musl always returns an int since its addition back in 2011 with https://git.musl-libc.org/cgit/musl/commit/src/string/strerror_r.c?id=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01 As a result, setting ac_cv_strerror_r_rc_int to no results in the following build failure since bump to version 1.7.2 in commit 783cd8d90d37b5e0b59d6f0bfca6667855b2b9e1: misc/unix/errorcodes.c: In function 'native_strerror': misc/unix/errorcodes.c:385:9: error: assignment to 'const char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 385 | msg = strerror_r(statcode, buf, bufsize); | ^ Fixes: 783cd8d90d37b5e0b59d6f0bfca6667855b2b9e1 - http://autobuild.buildroot.org/results/9a42a4427ff64d47da61c731abb99d7585781cdd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 6f34e68217264fb62c48ce28c48bf759b30fef0e) Signed-off-by: Peter Korsgaard --- package/apr/apr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/apr/apr.mk b/package/apr/apr.mk index cb8c12dd657..d4526a41725 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -39,7 +39,7 @@ APR_CONF_ENV = \ ac_cv_sizeof_struct_iovec=8 \ ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ - ac_cv_strerror_r_rc_int=no \ + ac_cv_strerror_r_rc_int=$(if $(BR2_TOOLCHAIN_USES_MUSL),yes,no) \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes \ apr_cv_epoll=yes \ From 3e445665ba2093fdc75dfe12bd4960f63a25915d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 12:10:28 +0200 Subject: [PATCH 2547/3013] package/brcm-patchram-plus: bump to latest git commit This bump will fix the following build failure with gcc >= 14: main.c: In function 'read_event': main.c:715:25: error: implicit declaration of function 'read'; did you mean 'fread'? [-Wimplicit-function-declaration] 715 | while ((count = read(fd, &buffer[i], len)) < len) { | ^~~~ | fread Fixes: - http://autobuild.buildroot.org/results/67965a5245c3d98d683e2c788352bf7c1cf4f00e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a0ebcac06b76c4f3c6b7c2d2382ddfeee85d5c1d) Signed-off-by: Peter Korsgaard --- package/brcm-patchram-plus/brcm-patchram-plus.hash | 2 +- package/brcm-patchram-plus/brcm-patchram-plus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/brcm-patchram-plus/brcm-patchram-plus.hash b/package/brcm-patchram-plus/brcm-patchram-plus.hash index f6910e714be..20bc56034c6 100644 --- a/package/brcm-patchram-plus/brcm-patchram-plus.hash +++ b/package/brcm-patchram-plus/brcm-patchram-plus.hash @@ -1,3 +1,3 @@ # locally computed -sha256 febad69fbc9185b4c6a31188cf381fd280b88d93cb7f5a40dfdbab9c599c29a7 brcm-patchram-plus-95b7b6916d661a4da3f9c0adf52d5e1f4f8ab042.tar.gz +sha256 1287021683e0e71b679b157020f047a44032f3af879b257ff0b94d8d4c3d016d brcm-patchram-plus-15bd6638dd6d3a37d22dbc18059f6d9eb885f057.tar.gz sha256 26324f5c563b7e338c2876c8abe90c3681c1e9a6163fc59b494c94ad6493eda4 COPYING diff --git a/package/brcm-patchram-plus/brcm-patchram-plus.mk b/package/brcm-patchram-plus/brcm-patchram-plus.mk index 329571d9a9c..d8733307690 100644 --- a/package/brcm-patchram-plus/brcm-patchram-plus.mk +++ b/package/brcm-patchram-plus/brcm-patchram-plus.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRCM_PATCHRAM_PLUS_VERSION = 95b7b6916d661a4da3f9c0adf52d5e1f4f8ab042 +BRCM_PATCHRAM_PLUS_VERSION = 15bd6638dd6d3a37d22dbc18059f6d9eb885f057 BRCM_PATCHRAM_PLUS_SITE = $(call github,AsteroidOS,brcm-patchram-plus,$(BRCM_PATCHRAM_PLUS_VERSION)) BRCM_PATCHRAM_PLUS_LICENSE = Apache-2.0 BRCM_PATCHRAM_PLUS_LICENSE_FILES = COPYING From 7b16d1e482d7df6a9576141f64150627005fd3c6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 11:54:45 +0200 Subject: [PATCH 2548/3013] package/sconeserver: select libxcrypt if needed Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: In file included from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/ScriptBase.h:25, from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.h:26, from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.cpp:23: /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/sconex.h:124:12: fatal error: crypt.h: No such file or directory 124 | # include | ^~~~~~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/24461bdb0a5d9a062b682ae3aeefa73c0408040b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 701cf686bdfd6c579c4d90768a6a3dab6858d942) Signed-off-by: Peter Korsgaard --- package/sconeserver/Config.in | 1 + package/sconeserver/sconeserver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index cce21fc860e..d1a8a031bec 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 10a0a22597f..bb0da12d4ce 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,6 +10,7 @@ SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_DEPENDENCIES = \ host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ pcre \ zlib # disable image as it fails to build with ImageMagick From 6677d9c4e18107cbf3dc691dea3beb801e03df98 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Fri, 30 Aug 2024 15:55:45 +0200 Subject: [PATCH 2549/3013] docs/manual: fix description of how to reply to Patch v1 not set to 'superseded' when replying to with v2. I'm using git version 2.46.0. The manual says the following is the correct way to use the '--in-reply-to' option: git send-email --in-reply-to= Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- docs/manual/contribute.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index fe3ae963a58..ffaff6f857b 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -517,7 +517,7 @@ address you register in https://patchwork.ozlabs.org/project/buildroot/list/[patchwork] should match the one you use for sending patches to the mailing list. -You can also add the +--in-reply-to + option when +You can also add the +--in-reply-to=+ option when submitting a patch to the mailing list. The id of the mail to reply to can be found under the "Message Id" tag on https://patchwork.ozlabs.org/project/buildroot/list/[patchwork]. The From 0b5feb52afd2165be21a1dfb8f8f870eab9b9acb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Aug 2024 19:20:57 +0200 Subject: [PATCH 2550/3013] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index eab5cb85117..526dd9ff009 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.7" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index e8a9e0f0eb4..ebaad029b86 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 e0d50d5b74f8599375660e79f187af7493864dba5ff6671b14983376a070b3d1 linux-6.10.6.tar.xz -sha256 d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50 linux-6.6.47.tar.xz -sha256 3773c9052c7ba7432e8337ca84bee115c1a94ccef9d62b72b99ae30c4cd5f80f linux-6.1.106.tar.xz +sha256 900d567ff01824708ce24c3b37faaef03e6f6145411dd447a6ff2edc8c5db3a9 linux-6.10.7.tar.xz +sha256 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 linux-6.6.48.tar.xz +sha256 f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 linux-6.1.107.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 a36dd3e82ceb634afded31f2656568f57c4d9c4b399859f298b18116df11c6fe linux-5.15.165.tar.xz sha256 19b099c67324bba6378e22dc51ad3906e4dcd6a908d137766b4bfa9174ddd11a linux-5.10.224.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 934f427e4e6..51706f582a6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -427,9 +427,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.282" if BR2_KERNEL_HEADERS_5_4 default "5.10.224" if BR2_KERNEL_HEADERS_5_10 default "5.15.165" if BR2_KERNEL_HEADERS_5_15 - default "6.1.106" if BR2_KERNEL_HEADERS_6_1 - default "6.6.47" if BR2_KERNEL_HEADERS_6_6 - default "6.10.6" if BR2_KERNEL_HEADERS_6_10 + default "6.1.107" if BR2_KERNEL_HEADERS_6_1 + default "6.6.48" if BR2_KERNEL_HEADERS_6_6 + default "6.10.7" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 2bd1723c0a5224efca245edf6930aa485e29341b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 30 Aug 2024 10:26:49 +0200 Subject: [PATCH 2551/3013] support/scripts/genimage.sh: drop gzip compression Commit 6889056f1eb4 (support/scripts/genimage.sh: support creating a bmap image) added unconditional gzip compression of the genimage outputs if bmap-tools is enabled, which is problematic for a number of reasons: - The gzip invocation is not reproducable (E.G. does not use -n) - The original file is removed, dropping the sparse info - It hardcodes policy, E.G. bmap supports a number of different compression algorithms / compression may not be desired for all images / different compression levels may be desired So drop the compression step. If desired, compression can be done with a post-image script. Signed-off-by: Peter Korsgaard Acked-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- support/scripts/genimage.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh index b479ec9e0b0..df224241ab1 100755 --- a/support/scripts/genimage.sh +++ b/support/scripts/genimage.sh @@ -54,6 +54,5 @@ if grep -Eq "^BR2_PACKAGE_HOST_BMAP_TOOLS=y$" "${BR2_CONFIG}"; then continue fi bmaptool create "${image_path}" -o "${image_path}.bmap" - gzip -c "${image_path}" > "${image_path}.gz" done < <(grep '^image ' "${GENIMAGE_CFG}" | cut -d ' ' -f 2) fi From d2777c335a3534a4771120af793d4216a6cb7b22 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 19:28:43 +0200 Subject: [PATCH 2552/3013] package/libfreefare: bump to latest git commit This bump will fix the following build failure with gcc >= 14 thanks to https://github.com/nfc-tools/libfreefare/commit/494233d33b3a9d21da1bb0f1c59606820afe4691 mifare_desfire_crypto.c: In function 'cmac': mifare_desfire_crypto.c:139:23: error: implicit declaration of function 'malloc' [-Wimplicit-function-declaration] 139 | uint8_t *buffer = malloc (padded_data_length (len, kbs)); | ^~~~~~ mifare_desfire_crypto.c:69:1: note: include '' or provide a declaration of 'malloc' 68 | #include "freefare_internal.h" +++ |+#include 69 | Fixes: - http://autobuild.buildroot.org/results/778be216f62b8c2e05aba1b3e297dab0c6c6ccd0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d1e812e739d0de9554c4e8a62fbc8743746b4aa7) Signed-off-by: Peter Korsgaard --- package/libfreefare/libfreefare.hash | 4 ++-- package/libfreefare/libfreefare.mk | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/libfreefare/libfreefare.hash b/package/libfreefare/libfreefare.hash index 9115518a3f3..6ef30513d14 100644 --- a/package/libfreefare/libfreefare.hash +++ b/package/libfreefare/libfreefare.hash @@ -1,5 +1,5 @@ -# From https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-0.4.0/libfreefare-0.4.0.tar.bz2 -sha256 bfa31d14a99a1247f5ed49195d6373de512e3eb75bf1627658b40cf7f876bc64 libfreefare-0.4.0.tar.bz2 +# Locally computed +sha256 48db20cccdf3435a9f205bcbb67dbd4eec055991d21840fb419874efd9ce9df8 libfreefare-c2b0cfa4b9fb0e4be88604f00b7a2405618d5abc.tar.gz # Hash for license file: sha256 be6209dfd763a0ba77fbe990cfd2512804441d8b5f0cad927baa3341b50fcade COPYING diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk index 16f15b34e4e..7065c441dcd 100644 --- a/package/libfreefare/libfreefare.mk +++ b/package/libfreefare/libfreefare.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBFREEFARE_VERSION = 0.4.0 -LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2 -# Do not use the github helper here, the generated tarball is *NOT* -# the same as the one uploaded by upstream for the release. -LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION) +LIBFREEFARE_VERSION = c2b0cfa4b9fb0e4be88604f00b7a2405618d5abc +LIBFREEFARE_SITE = $(call github,nfc-tools,libfreefare,$(LIBFREEFARE_VERSION)) LIBFREEFARE_DEPENDENCIES = host-pkgconf libnfc openssl LIBFREEFARE_LICENSE = LGPL-3.0+ with exception LIBFREEFARE_LICENSE_FILES = COPYING +# From git +LIBFREEFARE_AUTORECONF = YES LIBFREEFARE_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` $(eval $(autotools-package)) From 59f3f3222c014cec46b68c153ac92d7c5c03cf07 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Jul 2024 19:09:12 +0200 Subject: [PATCH 2553/3013] support/testing: add iproute2 runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 91738f5093f80eeda8637b9a73636539d6937475) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + .../testing/tests/package/test_iproute2.py | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 support/testing/tests/package/test_iproute2.py diff --git a/DEVELOPERS b/DEVELOPERS index 043e558652d..9a97df47e52 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1841,6 +1841,7 @@ F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_iproute2.py F: support/testing/tests/package/test_iptables.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py diff --git a/support/testing/tests/package/test_iproute2.py b/support/testing/tests/package/test_iproute2.py new file mode 100644 index 00000000000..91d9006e23c --- /dev/null +++ b/support/testing/tests/package/test_iproute2.py @@ -0,0 +1,77 @@ +import os + +import infra.basetest + + +class TestIpRoute2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPROUTE2=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. This also check we are + # actually using the version from the iproute2 package, rather + # than the BusyBox version (which does not understand this + # option). + self.assertRunOk("ip -Version") + + # We run simple invocations of iproute2 tools. + self.assertRunOk("ifstat") + self.assertRunOk("ip link show dev lo") + + # Buildroot is supposed to have setup the loopback "lo" + # interface. We should be able to ping any address in + # the 127.0.0.0/8 subnet. + addrs = ["127.0.0.1", "127.0.1.2", "127.1.2.3"] + ping_cmd = "ping -c 3 -i 0.2" + for addr in addrs: + self.assertRunOk(f"{ping_cmd} {addr}") + + # We now change this 127.0.0.1/8 to a /16. + self.assertRunOk("ip addr del 127.0.0.1/8 dev lo") + self.assertRunOk("ip addr add 127.0.0.1/16 dev lo") + + # The IPs in the 127.0.0.0/16 subnet are still supposed to + # ping... + addrs = ["127.0.0.1", "127.0.1.2"] + for addr in addrs: + self.assertRunOk(f"{ping_cmd} {addr}") + # ...but the IP outside is supposed to fail. + _, ret = self.emulator.run(f"{ping_cmd} 127.1.2.3") + self.assertNotEqual(ret, 0) + + # We add a prohibited route. + self.assertRunOk("ip route add prohibit 127.0.1.0/24") + + # Now, only 127.0.0.1 is supposed to ping... + self.assertRunOk(f"{ping_cmd} 127.0.0.1") + # ...while the other IPs expected to fail. + addrs = ["127.0.1.2", "127.1.2.3"] + for addr in addrs: + _, ret = self.emulator.run(f"{ping_cmd} {addr}") + self.assertNotEqual(ret, 0) + + # We should be able to see our prohibited route. + out, ret = self.emulator.run("ip route list") + self.assertEqual(ret, 0) + self.assertEqual(out[0].strip(), "prohibit 127.0.1.0/24") + + # We create a new network namespace, and create a new shell + # process in it. + self.assertRunOk("ip netns add br-test") + self.assertRunOk("ip netns exec br-test /bin/sh") + + # Since we are in a new namespace, we should no longer see the + # prohibited route. The route list output should be empty. + out, ret = self.emulator.run("ip route list") + self.assertEqual(ret, 0) + self.assertEqual(len(out), 0) From 2736c84728154eb9ac7cddd6f887506f805becc7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 14:29:41 +0200 Subject: [PATCH 2554/3013] package/bandwidthd: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: parser.c: In function 'yyparse': parser.c:1196:16: error: implicit declaration of function 'yylex' [-Wimplicit-function-declaration] 1196 | yychar = yylex (); | ^~~~~ While at it, update Upstream tag of first patch Fixes: - http://autobuild.buildroot.org/results/33364071de4e5e51a2ac2337b82d145f71e0e64a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 41cc0f22722e3fbb2581a4f399c2e304fdb061a1) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...c-bandwidthd.h-fix-build-with-gcc-10.patch | 2 +- ...2-src-parser.y-fix-build-with-gcc-14.patch | 36 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch diff --git a/.checkpackageignore b/.checkpackageignore index 962ba03fe21..5fd67b5c125 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -402,7 +402,6 @@ package/avahi/S05avahi-setup.sh lib_sysv.Indent lib_sysv.Variables package/avahi/S50avahi-daemon lib_sysv.Indent lib_sysv.Variables package/babeld/S50babeld Shellcheck lib_sysv.Indent lib_sysv.Variables package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch lib_patch.Upstream -package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/bash/0001-input.h-add-missing-include-on-stdio.h.patch lib_patch.Upstream package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch lib_patch.Upstream package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch lib_patch.Upstream diff --git a/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch b/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch index e7d0dec8d6b..727e18ea84f 100644 --- a/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch +++ b/package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch @@ -15,7 +15,7 @@ Fixes: - http://autobuild.buildroot.org/results/6308c8ee38b6017215038d47c009b238113bd36f Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nroach44/bandwidthd/pull/1] +Upstream: https://github.com/nroach44/bandwidthd/commit/dde68ed77114d7b19bfed3068edefc9dc0644445 --- src/bandwidthd.h | 4 ++-- src/graph.c | 1 + diff --git a/package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch b/package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch new file mode 100644 index 00000000000..d31070855cf --- /dev/null +++ b/package/bandwidthd/0002-src-parser.y-fix-build-with-gcc-14.patch @@ -0,0 +1,36 @@ +From 96f5ad56b1bb872c2c24f0c83d06d94ae2936838 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 22 Jul 2024 14:08:45 +0200 +Subject: [PATCH] src/parser.y: fix build with gcc >= 14 + +Fix the following build failure with gcc >= 14: + +parser.c: In function 'yyparse': +parser.c:1196:16: error: implicit declaration of function 'yylex' [-Wimplicit-function-declaration] + 1196 | yychar = yylex (); + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/33364071de4e5e51a2ac2337b82d145f71e0e64a + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/nroach44/bandwidthd/pull/3 +--- + src/parser.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser.y b/src/parser.y +index d9acc10..15ce61c 100644 +--- a/src/parser.y ++++ b/src/parser.y +@@ -11,6 +11,7 @@ + #include + #include "bandwidthd.h" + ++extern int yylex (void); + extern unsigned int SubnetCount; + extern struct SubnetData SubnetTable[]; + extern struct config config; +-- +2.43.0 + From a5362fe2a5c94573526765ff8fac6d10a91e4782 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 17:59:09 +0200 Subject: [PATCH 2555/3013] package/faifa: bump to latest git commit - Drop patches (already in version) - libevent is mandatory since https://github.com/ffainelli/faifa/commit/d2339c2a7680e7c87555650e19123e27e1f12031 - This bump will fix the following build failure with gcc >= 14: hpav_cfg.c: In function 'pushbutton_request': hpav_cfg.c:256:37: error: passing argument 2 of 'send_vendor_pkt' makes pointer from integer without a cast [-Wint-conversion] 256 | return send_vendor_pkt(ctx, mac, HPAV_MMTYPE_MS_PB_ENC, | ^~~ | | | uint8_t {aka unsigned char} hpav_cfg.c:123:64: note: expected 'const uint8_t *' {aka 'const unsigned char *'} but argument is of type 'uint8_t' {aka 'unsigned char'} 123 | static int send_vendor_pkt(struct context *ctx, const uint8_t *to, | ~~~~~~~~~~~~~~~^~ hpav_cfg.c: In function 'main': hpav_cfg.c:406:48: error: passing argument 2 of 'pushbutton_request' makes integer from pointer without a cast [-Wint-conversion] 406 | ret = pushbutton_request(&ctx, mac); | ^~~ | | | uint8_t * {aka unsigned char *} hpav_cfg.c:254:60: note: expected 'uint8_t' {aka 'unsigned char'} but argument is of type 'uint8_t *' {aka 'unsigned char *'} 254 | static int pushbutton_request(struct context *ctx, uint8_t mac) | ~~~~~~~~^~~ Fixes: - http://autobuild.buildroot.org/results/5a65337366e52c6234d8d154b7e9a0296e02f1dd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 061b5806d13a4bb9c4941e4564c2e681ef36a618) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 -- ...y-include-endian.h-for-BYTE_ORDER-ma.patch | 32 ------------------- ...t-include-linux-if_ether.h-for-musl-.patch | 32 ------------------- ...-fix-asbolute-symlink-of-libfaifa.so.patch | 32 ------------------- package/faifa/Config.in | 1 + package/faifa/faifa.hash | 2 +- package/faifa/faifa.mk | 6 ++-- 7 files changed, 5 insertions(+), 103 deletions(-) delete mode 100644 package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch delete mode 100644 package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch delete mode 100644 package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5fd67b5c125..7dbe81fc26e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -588,9 +588,6 @@ package/exim/0003-Skip-version-check-and-symlink-installation.patch lib_patch.Up package/exim/S86exim lib_sysv.Indent lib_sysv.Variables package/expect/0001-enable-cross-compilation.patch lib_patch.Upstream package/expect/0002-allow-tcl-build-directory.patch lib_patch.Upstream -package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch lib_patch.Upstream -package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch lib_patch.Upstream -package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch lib_patch.Upstream package/fail2ban/S60fail2ban Shellcheck lib_sysv.Variables package/fakedate/fakedate Shellcheck package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch lib_patch.Upstream diff --git a/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch b/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch deleted file mode 100644 index 79da360807a..00000000000 --- a/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bfe43f4b4f249cee8c77059d7c89ebbc521d4d93 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 14 Sep 2015 22:25:12 +0200 -Subject: [PATCH] sha2.c: explicitly include endian.h for BYTE_ORDER macro - -Fixes a build issue with the musl C library, which doesn't indirectly -include endian.h from any of the included system headers: - -http://autobuild.buildroot.net/results/17b/17bde543db253c008079b04c5e341f804160f59c/build-end.log - -Upstream-Status: submitted (https://github.com/ffainelli/faifa/pull/12) - -Signed-off-by: Peter Korsgaard ---- - sha2.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sha2.c b/sha2.c -index f2f5132..4c8a72d 100644 ---- a/sha2.c -+++ b/sha2.c -@@ -40,6 +40,7 @@ - #include - #include - -+#include "endian.h" - #include "sha2.h" - - /* --- -2.1.4 - diff --git a/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch b/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch deleted file mode 100644 index c5547a5e10a..00000000000 --- a/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 36eed08a3783df6bb8d92d3c80cd47d0660eeb12 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 16:27:37 +0100 -Subject: [PATCH] hpav_cfg.c: do not include linux/if_ether.h for musl - compatibility - -Fixes a build issue with the musl C library -http://autobuild.buildroot.net/results/dc6/dc6e4d7327d2031ef921cccd814605dec73a0f9c/build-end.log - -Patch sent upstream: https://github.com/ffainelli/faifa/pull/13 - -Signed-off-by: Bernd Kuhls ---- - hpav_cfg.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/hpav_cfg.c b/hpav_cfg.c -index 7cc53af..45d3f0a 100644 ---- a/hpav_cfg.c -+++ b/hpav_cfg.c -@@ -53,8 +53,6 @@ - #include - #include - --#include -- - #include "homeplug_av.h" - #include "crypto.h" - --- -2.7.0.rc3 - diff --git a/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch b/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch deleted file mode 100644 index 876d2a60f47..00000000000 --- a/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d16abf61049947c451a6411a13fc15dda32feb47 Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Sat, 6 Sep 2014 11:23:02 -0700 -Subject: [PATCH] Makefile.in: fix asbolute symlink of libfaifa.so - -Fixes #7 - -Signed-off-by: Florian Fainelli -[Upstream: da2e279fd736d05bcd0ee6e4609c44fece017ba8] -Signed-off-by: Thomas Petazzoni ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index ba65bee..9dec7ee 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -98,9 +98,9 @@ install: installman strip - $(INSTALL) -m0755 hpav_cfg $(DESTDIR)$(sbindir) - $(INSTALL) -d $(DESTDIR)$(libdir) - $(INSTALL) -m0644 $(LIB_SONAME) $(DESTDIR)$(libdir) -- ln -sf $(DESTDIR)$(libdir)/$(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SHARED_SO) - $(INSTALL) -d $(DESTDIR)$(includedir)/faifa - cp $(HEADERS) $(DESTDIR)$(includedir)/faifa -+ cd $(DESTDIR)$(libdir) && ln -sf $(LIB_SONAME) $(LIB_SHARED_SO) - - strip: - $(STRIP) $(APP) --- -2.23.0 - diff --git a/package/faifa/Config.in b/package/faifa/Config.in index 486f35d5089..202b69bcd28 100644 --- a/package/faifa/Config.in +++ b/package/faifa/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FAIFA bool "faifa" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBPCAP help Faifa can configure any Intellon-based Power Line diff --git a/package/faifa/faifa.hash b/package/faifa/faifa.hash index 658dae4a719..1b0608b898a 100644 --- a/package/faifa/faifa.hash +++ b/package/faifa/faifa.hash @@ -1,3 +1,3 @@ # locally computed -sha256 6eada81f3d21f80b5848338b627784981064d728f8e377e5cf973d31640d4489 faifa-0.1.tar.gz +sha256 bae36f77d02ea25a0f8e2fa3db0b0efe7e5cb7331cf0ea97470036b7f299a5c1 faifa-fb91bf684fd19f03115b8dc76b57bb5a5a4ec05b.tar.gz sha256 9b62e4601b2b9cd5719a393e88ed71a8304048862502db765ed9d6ff8cf38c5e COPYING diff --git a/package/faifa/faifa.mk b/package/faifa/faifa.mk index e5dc1574822..1cc7795e0f4 100644 --- a/package/faifa/faifa.mk +++ b/package/faifa/faifa.mk @@ -4,10 +4,10 @@ # ################################################################################ -FAIFA_VERSION = 0.1 -FAIFA_SITE = $(call github,ffainelli,faifa,v$(FAIFA_VERSION)) +FAIFA_VERSION = fb91bf684fd19f03115b8dc76b57bb5a5a4ec05b +FAIFA_SITE = $(call github,ffainelli,faifa,$(FAIFA_VERSION)) FAIFA_INSTALL_STAGING = YES -FAIFA_DEPENDENCIES = libpcap host-autoconf +FAIFA_DEPENDENCIES = libevent libpcap host-autoconf FAIFA_LICENSE = BSD-3-Clause FAIFA_LICENSE_FILES = COPYING From 99d8028b7755ba9719fa265cc5c4ece8a7e53cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Mon, 22 Jul 2024 18:57:16 +0200 Subject: [PATCH 2556/3013] package/zfs: fix uClibc support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update addresses the issue of uClibc support by skipping ZFS tests that require SEEK_DATA support. This is a work-in-progress patch while we wait for an upstream fix. Current upstream efforts can be followed here: https://github.com/openzfs/zfs/pull/16169 Context: - OpenZFS includes a test for a bug that occurs when copying a large number of PUNCHED files. - OpenZFS has backported this test to v2.2.x. - uClibc does not support SEEK_DATA and SEEK_HOLE. - The ZFS test `cp_stress` can not be compiled using uClibc. This commit fix: - https://gitlab.com/buildroot.org/buildroot/-/jobs/7391793226 Signed-off-by: José Luis Salvador Rufo Signed-off-by: Thomas Petazzoni (cherry picked from commit f17fa2c905845c5a9c5aa55866cd44af176e558a) Signed-off-by: Peter Korsgaard --- ...s-ignore-if-SEEK_DATA-is-not-defined.patch | 162 ++++++++++++++++++ package/zfs/zfs.mk | 2 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch diff --git a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch new file mode 100644 index 00000000000..f47c615d109 --- /dev/null +++ b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch @@ -0,0 +1,162 @@ +From 93e7f8889072047276da11fe6a525d3f0ea16205 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= + +Date: Sat, 11 May 2024 22:40:12 +0200 +Subject: [PATCH] tests/cp_files: ignore if SEEK_DATA is not defined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case +cp_files if SEEK_DATA is not defined. + +Signed-off-by: José Luis Salvador Rufo +Upstream: https://github.com/openzfs/zfs/pull/16169 +--- + config/user-unistd.m4 | 24 ++++++++++++++++++++++++ + config/user.m4 | 1 + + config/zfs-build.m4 | 1 + + tests/test-runner/bin/zts-report.py.in | 1 + + tests/zfs-tests/Makefile.am | 2 ++ + tests/zfs-tests/cmd/Makefile.am | 6 +++++- + tests/zfs-tests/tests/Makefile.am | 14 +++++++++----- + 7 files changed, 43 insertions(+), 6 deletions(-) + create mode 100644 config/user-unistd.m4 + +diff --git a/config/user-unistd.m4 b/config/user-unistd.m4 +new file mode 100644 +index 000000000..302bc0bde +--- /dev/null ++++ b/config/user-unistd.m4 +@@ -0,0 +1,24 @@ ++dnl # ++dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case. ++dnl # ++AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [ ++ AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA) ++ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++ #ifndef _GNU_SOURCE ++ #define _GNU_SOURCE ++ #endif ++ #include ++ #if defined(SEEK_DATA) ++ int ok; ++ #else ++ error fail ++ #endif ++ ]])], [ ++ user_unistd_seek_data=yes ++ AC_MSG_RESULT([yes]) ++ ], [ ++ user_unistd_seek_data=no ++ AC_MSG_RESULT([no]) ++ ]) ++]) +diff --git a/config/user.m4 b/config/user.m4 +index 6ec27a5b2..2326a44be 100644 +--- a/config/user.m4 ++++ b/config/user.m4 +@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ + ZFS_AC_CONFIG_USER_LIBAIO + ZFS_AC_CONFIG_USER_LIBATOMIC + ZFS_AC_CONFIG_USER_LIBFETCH ++ ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA + ZFS_AC_CONFIG_USER_AIO_H + ZFS_AC_CONFIG_USER_CLOCK_GETTIME + ZFS_AC_CONFIG_USER_PAM +diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 +index bb5a85d81..578692676 100644 +--- a/config/zfs-build.m4 ++++ b/config/zfs-build.m4 +@@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ + [test "x$qatsrc" != x ]) + AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) + AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) ++ AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ]) + AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) + ]) + +diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in +index ecc50f487..3a00345ed 100755 +--- a/tests/test-runner/bin/zts-report.py.in ++++ b/tests/test-runner/bin/zts-report.py.in +@@ -162,6 +162,7 @@ known = { + ['FAIL', rewind_reason], + 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], + 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], ++ 'cp_files/cp_stress': ['SKIP', 16169], + 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], + 'privilege/setup': ['SKIP', na_reason], + 'refreserv/refreserv_004_pos': ['FAIL', known_reason], +diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am +index 3dd1a6452..8ae790057 100644 +--- a/tests/zfs-tests/Makefile.am ++++ b/tests/zfs-tests/Makefile.am +@@ -13,8 +13,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test + %C%_tests_functional_hkdf_hkdf_test_LDADD = \ + libzpool.la + ++if WANT_UNISTD_SEEK_DATA + scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files + scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood ++endif + + if BUILD_LINUX + scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile +diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am +index 23848a82f..69bba3039 100644 +--- a/tests/zfs-tests/cmd/Makefile.am ++++ b/tests/zfs-tests/cmd/Makefile.am +@@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec + scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile + scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached + scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write +-scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files + scripts_zfs_tests_bin_PROGRAMS += %D%/ctime + scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update + scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write +@@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test + scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket + + ++if WANT_UNISTD_SEEK_DATA ++scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files ++endif ++ ++ + scripts_zfs_tests_bin_PROGRAMS += %D%/badsend + %C%_badsend_LDADD = \ + libzfs_core.la \ +diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am +index cc66d762f..1e9f06a7e 100644 +--- a/tests/zfs-tests/tests/Makefile.am ++++ b/tests/zfs-tests/tests/Makefile.am +@@ -1394,11 +1394,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ + functional/compression/l2arc_encrypted.ksh \ + functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ + functional/compression/setup.ksh \ +- functional/cp_files/cleanup.ksh \ +- functional/cp_files/cp_files_001_pos.ksh \ +- functional/cp_files/cp_files_002_pos.ksh \ +- functional/cp_files/cp_stress.ksh \ +- functional/cp_files/setup.ksh \ + functional/crtime/cleanup.ksh \ + functional/crtime/crtime_001_pos.ksh \ + functional/crtime/setup.ksh \ +@@ -2108,3 +2103,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ + functional/idmap_mount/idmap_mount_003.ksh \ + functional/idmap_mount/idmap_mount_004.ksh \ + functional/idmap_mount/idmap_mount_005.ksh ++ ++if WANT_UNISTD_SEEK_DATA ++nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ ++ functional/cp_files/cleanup.ksh \ ++ functional/cp_files/cp_files_001_pos.ksh \ ++ functional/cp_files/cp_files_002_pos.ksh \ ++ functional/cp_files/cp_stress.ksh \ ++ functional/cp_files/setup.ksh ++endif +-- +2.45.2 + diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index fa6d282f8c3..e0fa3926704 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,7 +12,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-config-user-check-for-aio.h.patch +# 0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch ZFS_AUTORECONF = YES ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux From 0712ca832638136a303c17d7f794bf79151b2397 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Apr 2024 13:31:20 +0200 Subject: [PATCH 2557/3013] support/testing: add 4th runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit b09ae4f0454105afd2b41b2a49f4682d9ee57769) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_4th.py | 55 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 support/testing/tests/package/test_4th.py diff --git a/DEVELOPERS b/DEVELOPERS index 9a97df47e52..777d90f2c92 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1796,6 +1796,7 @@ F: support/testing/tests/package/sample_python_mpmath.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/sample_python_sympy.py +F: support/testing/tests/package/test_4th.py F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ diff --git a/support/testing/tests/package/test_4th.py b/support/testing/tests/package/test_4th.py new file mode 100644 index 00000000000..c020c825b31 --- /dev/null +++ b/support/testing/tests/package/test_4th.py @@ -0,0 +1,55 @@ +import os +from math import sqrt + +import infra.basetest + + +class Test4th(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_4TH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We set the DIR4TH variable where 4th demos and libraries are + # installed. + self.assertRunOk("export DIR4TH=/usr/share/4th/") + + # We run a simple "hello world" demo. + out, ret = self.emulator.run("4th cxq demo/hello.4th") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello world!") + + # We run a demo doing some square root maths. + out, ret = self.emulator.run("4th cxq demo/squares.4th") + self.assertEqual(ret, 0) + self.assertTrue(len(out) > 1) + for line in out[1:]: + columns = line.split() + value = float(columns[0]) + value_sqrt = float(columns[1]) + result_check = sqrt(value) + self.assertAlmostEqual(value_sqrt, result_check, delta=0.1) + + # We run a word count demo and the 4th source file. We save + # the word count for a later check. + out, ret = self.emulator.run("4th cxq wc.4th /usr/share/4th/wc.4th") + self.assertEqual(ret, 0) + wc_out = out[0].split() + + # We run the same command using system "wc" command. We expect + # the same numbers. + out, ret = self.emulator.run("wc /usr/share/4th/wc.4th") + self.assertEqual(ret, 0) + self.assertEqual(out[0].split(), wc_out) + + # We run a slightly more complex computation example. + self.assertRunOk("4th cxq fractals.4th") From 8524286659a2c8cca1d3b59a8ca79119892e3573 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 14 May 2024 12:36:29 +0200 Subject: [PATCH 2558/3013] package/hostapd: drop duplicate host-pkgconf dependency host-pkgconf already defined as dependency in package ingress. Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni (cherry picked from commit 2dc37e5c5b216b2e93f05c015a16a52b9402693f) Signed-off-by: Peter Korsgaard --- package/hostapd/hostapd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 8981d9247e4..5756510e1dd 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -25,7 +25,7 @@ HOSTAPD_CONFIG_DISABLE = # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -HOSTAPD_DEPENDENCIES += host-pkgconf libopenssl +HOSTAPD_DEPENDENCIES += libopenssl HOSTAPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' else From a2bac4d1a5b623abcc6ff92323c5563bf4744f7e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 27 Jun 2024 22:53:32 +0200 Subject: [PATCH 2559/3013] package/am335x-pru-package: fix download issue am335x-pru-package is downloaded with the github helper, so the tarball is generated "on-the-fly" by github. It looks like the process to generate those tarballs has changed, again. The hash for the archive has recently changed. The delta is in the way directories are stored in the tarball: it looks like the "basename" of the directory path has been split off from the "dirname", into a separate field: @@ -270078,8 +270078,8 @@ 0041efd0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041efe0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041eff0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +0041f000 50 52 55 5f 50 52 55 74 6f 50 52 55 5f 49 6e 74 |PRU_PRUtoPRU_Int| +0041f010 65 72 72 75 70 74 2f 00 00 00 00 00 00 00 00 00 |errupt/.........| 0041f020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| @@ -270104,8 +270104,8 @@ 0041f170 34 61 64 35 37 63 63 31 39 35 66 32 38 62 66 35 |4ad57cc195f28bf5| 0041f180 65 35 38 35 63 33 64 34 34 36 61 62 61 36 65 65 |e585c3d446aba6ee| 0041f190 37 30 39 36 2f 70 72 75 5f 73 77 2f 65 78 61 6d |7096/pru_sw/exam| -0041f1a0 70 6c 65 5f 61 70 70 73 2f 50 52 55 5f 50 52 55 |ple_apps/PRU_PRU| -0041f1b0 74 6f 50 52 55 5f 49 6e 74 65 72 72 75 70 74 00 |toPRU_Interrupt.| +0041f1a0 70 6c 65 5f 61 70 70 73 00 00 00 00 00 00 00 00 |ple_apps........| +0041f1b0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1d0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| Switch to using a git download, which uses our reproducible way of generating archives. Once extracted, the files have been verified to be identical to the ones in the archive on s.b.o. Signed-off-by: Yann E. MORIN Cc: Frank Hunleth Signed-off-by: Thomas Petazzoni (cherry picked from commit 5206e1dba2ccb8e65fc960362017c72799b0e5df) Signed-off-by: Peter Korsgaard --- package/am335x-pru-package/am335x-pru-package.hash | 2 +- package/am335x-pru-package/am335x-pru-package.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/am335x-pru-package/am335x-pru-package.hash b/package/am335x-pru-package/am335x-pru-package.hash index ad386fe04be..157fa566eb8 100644 --- a/package/am335x-pru-package/am335x-pru-package.hash +++ b/package/am335x-pru-package/am335x-pru-package.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz +sha256 bd90d57d210c2ec1835d701c5d12e228801cb41afebf591e2c146a4dc49c296f am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096-git4.tar.gz sha256 f0fcdf9b2090896389eb4b784f23be96d5544c5ce5282d84f82ae9a8e8331beb pru_sw/utils/LICENCE.txt diff --git a/package/am335x-pru-package/am335x-pru-package.mk b/package/am335x-pru-package/am335x-pru-package.mk index 24a5df4815a..9c65ee13873 100644 --- a/package/am335x-pru-package/am335x-pru-package.mk +++ b/package/am335x-pru-package/am335x-pru-package.mk @@ -5,7 +5,8 @@ ################################################################################ AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096 -AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION)) +AM335X_PRU_PACKAGE_SITE = https://github.com/beagleboard/am335x_pru_package +AM335X_PRU_PACKAGE_SITE_METHOD = git AM335X_PRU_PACKAGE_LICENSE = BSD-3-Clause AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt AM335X_PRU_PACKAGE_DEPENDENCIES = host-am335x-pru-package From 917c414e680393740e5342e662f562d29814efc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Fri, 23 Feb 2024 17:13:53 -0300 Subject: [PATCH 2560/3013] =?UTF-8?q?DEVELOPERS:=20add=20Fl=C3=A1vio=20Tap?= =?UTF-8?q?aj=C3=B3s=20for=20python-paho-mqtt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni (cherry picked from commit a10979754ffbf41b2fb09da934213b60065c26ad) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 777d90f2c92..88489a99bec 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1095,6 +1095,7 @@ F: package/python-pymodbus/ N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/python-paho-mqtt/ F: package/python-sqlalchemy/ F: package/rsyslog/ From 001e416759368b35c91b21f2099e800da3c7713a Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 13:37:52 +0100 Subject: [PATCH 2561/3013] package/python-can/Config.in: sort selects Sort python builtin modules before external python libs. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 0d582054e131bb6e13d27b2bdfc76a1a30067775) Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index a00c9263cff..61955a2b00b 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. From 5826cc2d9f33e47db6165ef12a2763a0b8a4aea4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 00:09:22 +0200 Subject: [PATCH 2562/3013] package/coreutils: fix glibc build with gcc >= 14 ac_cv_func_strerror_r_char_p is hardcoded to no since commit 74b9bf9945921a7b0504b4b546a4bc26f2adcc45 back in 2005 however strerror_r only returns an int with musl. With glibc or uclibc, strerror_r returns a char* or an int depending on _GNU_SOURCE value resulting in the following build failure with gcc >= 14: strerror_r.c: In function 'rpl_strerror_r': strerror_r.c:207:9: error: assignment to 'int' from 'char *' makes integer from pointer without a cast [-Wint-conversion] 207 | ret = strerror_r (errnum, buf, buflen); | ^ To fix this build failure, don't hardcode ac_cv_func_strerror_r_char_p to let coreutils pick the correct value Fixes: - http://autobuild.buildroot.org/results/8bc649ca5490b0c29c90383edfa2e693f154ebc4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 2822fdd0bc2a961544e38cf0f8c6f4bd22855714) Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 846d4fa5672..89f494310e7 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -27,7 +27,6 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ ac_cv_func_getgroups=yes \ ac_cv_func_getgroups_works=yes \ ac_cv_func_getloadavg=no \ - ac_cv_func_strerror_r_char_p=no \ ac_cv_func_strnlen_working=yes \ ac_cv_have_decl_strerror_r=yes \ ac_cv_have_decl_strnlen=yes \ From d9e49f09b47e9b3601911cdee291f5f1d1022a0b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 10:16:37 +0200 Subject: [PATCH 2563/3013] package/fluent-bit: bump to version 3.1.3 - Rebase second patch - This bump will fix the following build failure with gcc >= 14 thanks to https://github.com/fluent/fluent-bit/commit/1f8a672dbd8121ff5fbbd955dfbdda7cf4357fd7: In file included from /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/flb_tls.c:24: /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/openssl.c: In function 'tls_context_server_alpn_select_callback': /home/autobuild/autobuild/instance-12/output-1/build/fluent-bit-3.0.4/src/tls/openssl.c:220:40: error: passing argument 1 of 'SSL_select_next_proto' from incompatible pointer type [-Wincompatible-pointer-types] 220 | result = SSL_select_next_proto(out, | ^~~ | | | const unsigned char ** https://fluentbit.io/announcements/v3.1.3/ https://fluentbit.io/announcements/v3.1.2/ https://fluentbit.io/announcements/v3.1.1/ https://fluentbit.io/announcements/v3.1.0/ https://fluentbit.io/announcements/v3.0.7/ https://fluentbit.io/announcements/v3.0.6/ https://fluentbit.io/announcements/v3.0.5/ Fixes: - http://autobuild.buildroot.org/results/8f9fcc0ec9c915a40fe402d7c643fa83f7f6a261 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 618aaf07af50bdf302c88716a8ff15d3aec3f024) Signed-off-by: Peter Korsgaard --- ...fka-CMakeLists.txt-allow-compilation-with.patch | 14 ++++++++------ package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch index bcfe3ea8591..fd3d9ce7223 100644 --- a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch +++ b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch @@ -9,15 +9,17 @@ e.g. fluent-bit is a c-only library, so allow compilation without cxx Upstream: https://github.com/confluentinc/librdkafka/pull/4366 Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt +[Fabrice: update for 3.1.3] +Signed-off-by: Fabrice Fontaine --- lib/librdkafka-2.3.0/CMakeLists.txt | 18 ++++++++++-- lib/librdkafka-2.3.0/examples/CMakeLists.txt | 31 +++++++++++++------- 2 files changed, 35 insertions(+), 14 deletions(-) -diff --git a/lib/librdkafka-2.3.0/CMakeLists.txt b/lib/librdkafka-2.3.0/CMakeLists.txt +diff --git a/lib/librdkafka-2.4.0/CMakeLists.txt b/lib/librdkafka-2.4.0/CMakeLists.txt index 7f3dd0fc6..c1ee93062 100644 ---- a/lib/librdkafka-2.3.0/CMakeLists.txt -+++ b/lib/librdkafka-2.3.0/CMakeLists.txt +--- a/lib/librdkafka-2.4.0/CMakeLists.txt ++++ b/lib/librdkafka-2.4.0/CMakeLists.txt @@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2) include("packaging/cmake/parseversion.cmake") parseversion("src/rdkafka.h") @@ -57,10 +59,10 @@ index 7f3dd0fc6..c1ee93062 100644 if(RDKAFKA_BUILD_EXAMPLES) add_subdirectory(examples) -diff --git a/lib/librdkafka-2.3.0/examples/CMakeLists.txt b/lib/librdkafka-2.3.0/examples/CMakeLists.txt +diff --git a/lib/librdkafka-2.4.0/examples/CMakeLists.txt b/lib/librdkafka-2.4.0/examples/CMakeLists.txt index 8c0079abe..c9336b729 100644 ---- a/lib/librdkafka-2.3.0/examples/CMakeLists.txt -+++ b/lib/librdkafka-2.3.0/examples/CMakeLists.txt +--- a/lib/librdkafka-2.4.0/examples/CMakeLists.txt ++++ b/lib/librdkafka-2.4.0/examples/CMakeLists.txt @@ -5,8 +5,10 @@ endif(WIN32) add_executable(producer producer.c ${win32_sources}) target_link_libraries(producer PUBLIC rdkafka) diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 6fcf4fac3e7..a3dbf5f5448 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b439f89e879e538849e9106fe450bcf58da5034dfc316af4d2a837423786ed11 fluent-bit-3.0.4.tar.gz +sha256 4c745066223811047e3911c19db118eadec579ca62ef833a1b1fb573acd8cb85 fluent-bit-3.1.3.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13bd4ddecb1..5463682e454 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 3.0.4 +FLUENT_BIT_VERSION = 3.1.3 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From 9b38882f06279a5e12b65af4c53f11b9a56f76f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 10:02:50 +0200 Subject: [PATCH 2564/3013] package/fluent-bit: renumber patch Commit 94e072849e6c86a8c75402b1e600642673ebfb57 forgot to renumber latest patch Fixes: 94e072849e6c86a8c75402b1e600642673ebfb57 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit e996d399b82aac7ebd7565bd33afe4d1b3635395) Signed-off-by: Peter Korsgaard --- ...04-Enhance-setting-write-gs-base-with-cmake-variable-30.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/fluent-bit/{0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch => 0004-Enhance-setting-write-gs-base-with-cmake-variable-30.patch} (100%) diff --git a/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch b/package/fluent-bit/0004-Enhance-setting-write-gs-base-with-cmake-variable-30.patch similarity index 100% rename from package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch rename to package/fluent-bit/0004-Enhance-setting-write-gs-base-with-cmake-variable-30.patch From 26dbdb76f7238c5220c7d2ece7fe9995f7c76935 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 23 Jul 2024 19:28:15 +0300 Subject: [PATCH 2565/3013] package/uuu: update upstream link NXP repositories moved to a new location. The old URL redirects to the new one. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 3f31c4ef33eff191fc17cd0f8aa4d3d4ad9ed2c4) Signed-off-by: Peter Korsgaard --- package/uuu/Config.in.host | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/Config.in.host b/package/uuu/Config.in.host index 0ed064feb6e..99f20ee0709 100644 --- a/package/uuu/Config.in.host +++ b/package/uuu/Config.in.host @@ -12,7 +12,7 @@ config BR2_PACKAGE_HOST_UUU sudo sh -c "uuu -udev >> /etc/udev/rules.d/70-uuu.rules" sudo udevadm control --reload - https://github.com/NXPmicro/mfgtools + https://github.com/nxp-imx/mfgtools comment "host uuu needs a toolchain w/ host gcc >= 4.9" depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 63556b9938a..e57828a0ca6 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -6,7 +6,7 @@ UUU_VERSION = 1.5.182 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz -UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) +UUU_SITE = https://github.com/nxp-imx/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE HOST_UUU_DEPENDENCIES = \ From 6f7d3f3b803820f6f909c32f18bfc64f90072904 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 23 Jul 2024 18:30:25 +0200 Subject: [PATCH 2566/3013] board/qemu/arm-vexpress-tz: fix typos in readme file Fix typos in QEMU arm-vexpress-tz readme file where 'i.e.' occurrences should be replaced with 'e.g.'. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni (cherry picked from commit bfa3c1932fd5127b73eae1549a84b9c4125e3e0a) Signed-off-by: Peter Korsgaard --- board/qemu/arm-vexpress-tz/readme.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 3e84fe63919..920777afd46 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -26,7 +26,7 @@ If you want to emulate more cores, use "-smp {1|2|3|4}" to select the number of cores. Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" -brings network support that is used i.e. in OP-TEE regression tests. +brings network support that is used e.g. in OP-TEE regression tests. -- Boot Details -- @@ -38,7 +38,7 @@ non-secure bootloader (BL33 stage). QEMU natively hosts and loads in RAM the QEMU ARM target device tree. OP-TEE reads and modifies its content according to OP-TEE configuration. -Enable TF-A traces from LOG_LEVEL (I.e LOG_LEVEL=40) from +Enable TF-A traces from LOG_LEVEL (e.g. LOG_LEVEL=40) from BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. @@ -53,7 +53,7 @@ serial interface. The OP-TEE OS uses the QEMU second serial interface. To get the OP-TEE OS traces, append a second -serial argument after --serial stdio in the QEMU command line. I.e, the following enables 2 serial +-serial stdio in the QEMU command line. E.g., the following enables 2 serial consoles over telnet connections: cd output/images && ../host/bin/qemu-system-arm \ From b88bcdc9aa4284bf615076c9de45b9bd576bb517 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 18:25:33 +0200 Subject: [PATCH 2567/3013] package/dvb-apps: fix build with gcc >= 14 Workaround for glibc 2.31 added by commit bbe170dbcf4ddb63e76299214e2c18b16e5cf016 back in 2020 is incorrect as it writes new_time (a pointer on time_t) into timespec.tv_sec (i.e. time_t). This mistake raises the following build failure with gcc >= 14: dvbdate.c: In function 'set_time': dvbdate.c:313:18: error: assignment to '__time_t' {aka 'long int'} from 'time_t *' {aka 'long int *'} makes integer from pointer without a cast [-Wint-conversion] 313 | s.tv_sec = new_time; | ^ It shall be noted that gentoo also spotted this mistake: https://gitweb.gentoo.org/repo/gentoo.git/commit/media-tv/linuxtv-dvb-apps/files?id=81e99f1c753d1cb564be29b22dcd8927830c4b9a Fixes: bbe170dbcf4ddb63e76299214e2c18b16e5cf016 - http://autobuild.buildroot.org/results/e99b9ebf602d307fbc32f2a367e95177f53a68f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit fcfc399b1dfca3601a0d5734ad1ceaaf91f9f50f) Signed-off-by: Peter Korsgaard --- package/dvb-apps/0006-fix-glibc-2.31.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/dvb-apps/0006-fix-glibc-2.31.patch b/package/dvb-apps/0006-fix-glibc-2.31.patch index 079a24f1498..51c03d3e2e2 100644 --- a/package/dvb-apps/0006-fix-glibc-2.31.patch +++ b/package/dvb-apps/0006-fix-glibc-2.31.patch @@ -4,6 +4,8 @@ as stime func doesn't exists anymore in newer versions of glibc >= 2.31 due to obseletion, a replacment with clock_settime is inorder to fix the issue. Signed-off-by: Dagg Stompler +[Fabrice: fix for gcc >= 14] +Signed-off-by: Fabrice Fontaine --- a/util/dvbdate/dvbdate.c +++ b/util/dvbdate/dvbdate.c @@ -13,7 +15,7 @@ Signed-off-by: Dagg Stompler { - if (stime(new_time)) { + struct timespec s = {0}; -+ s.tv_sec = new_time; ++ s.tv_sec = *new_time; + + if (clock_settime(CLOCK_REALTIME, &s)) { perror("Unable to set time"); From 38d3f5b4761b560d70709f63d06a793e16ce337a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 22:53:06 +0200 Subject: [PATCH 2568/3013] package/speex: ARM5E needs ARM mode Add a dependency on ARM mode for ARM5E to fix the following build failure on Cortex-M3 which only supports Thumb2 mode: /tmp/ccJHSu7y.s:158: Error: selected processor does not support `smulbb r1,r6,lr' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1575da3a8ea2bcde7fa9885df317a12d5c36918f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 28be64c1e0ad0ba014257cda116c2f07236d0d4b) Signed-off-by: Peter Korsgaard --- package/speex/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/speex/Config.in b/package/speex/Config.in index c4e3df5dcd3..134e6e4b35b 100644 --- a/package/speex/Config.in +++ b/package/speex/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_SPEEX_ARM4 config BR2_PACKAGE_SPEEX_ARM5E bool default y - depends on BR2_arm && !BR2_PACKAGE_SPEEX_ARM4 + depends on BR2_arm && BR2_ARM_CPU_HAS_ARM && \ + !BR2_PACKAGE_SPEEX_ARM4 endif From a36740decfdc67b9ee5c0efd991e8b20e097454f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 14:01:40 +0200 Subject: [PATCH 2569/3013] package/procps-ng: security bump to version 4.0.4 - Fixes CVE-2023-4016 - Drop all patches (already in version) and so also drop autoreconf - This bump will also fix the following build failure with gcc >= 14: pgrep.c: In function 'main': pgrep.c:1066:37: error: implicit declaration of function 'pidfd_open'; did you mean 'fdopen'? [-Wimplicit-function-declaration] 1066 | int pidfd = pidfd_open(procs[i].num, 0); | ^~~~~~~~~~ | fdopen https://gitlab.com/procps-ng/procps/-/blob/v4.0.4/NEWS Fixes: - http://autobuild.buildroot.org/results/bd7b49123905c580842a3dd3b7a338d5aedf55d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d79f40dbbe98983bc657d4c82d46b38b8283351b) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - .../0001-configure-Add--disable-w.patch | 93 ------------------- ...ssing-nl_langinfo-on-certain-configs.patch | 34 ------- .../procps-ng/0003-fix-pifd_open-check.patch | 59 ------------ package/procps-ng/procps-ng.hash | 8 +- package/procps-ng/procps-ng.mk | 4 +- 6 files changed, 5 insertions(+), 196 deletions(-) delete mode 100644 package/procps-ng/0001-configure-Add--disable-w.patch delete mode 100644 package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch delete mode 100644 package/procps-ng/0003-fix-pifd_open-check.patch diff --git a/.checkpackageignore b/.checkpackageignore index 7dbe81fc26e..f643e1ef878 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1212,9 +1212,6 @@ package/pptp-linux/0002-fix-parallel-build.patch lib_patch.Upstream package/prboom/0001-libpng-1.4.patch lib_patch.Upstream package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch lib_patch.Upstream package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch lib_patch.Upstream -package/procps-ng/0001-configure-Add--disable-w.patch lib_patch.Upstream -package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch lib_patch.Upstream -package/procps-ng/0003-fix-pifd_open-check.patch lib_patch.Upstream package/procps-ng/S02sysctl lib_sysv.Variables package/proftpd/S50proftpd Shellcheck lib_sysv.Indent lib_sysv.Variables package/prosody/0001-enable-syslog.patch lib_patch.Upstream diff --git a/package/procps-ng/0001-configure-Add--disable-w.patch b/package/procps-ng/0001-configure-Add--disable-w.patch deleted file mode 100644 index 8a699df5a62..00000000000 --- a/package/procps-ng/0001-configure-Add--disable-w.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 1524a625e693b956ce0b5091c9f89f24fb7e8614 Mon Sep 17 00:00:00 2001 -From: "Issam E. Maghni" -Date: Fri, 23 Apr 2021 15:58:36 -0400 -Subject: [PATCH] configure: Add --disable-w - -[Retrieved (and backported) from: -https://gitlab.com/procps-ng/procps/-/commit/1524a625e693b956ce0b5091c9f89f24fb7e8614] -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 21 +++++++++++++++------ - configure.ac | 6 ++++++ - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index de15e137..d2356872 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -47,8 +47,7 @@ bin_PROGRAMS = \ - pwdx \ - tload \ - uptime \ -- vmstat \ -- w -+ vmstat - if BUILD_PWAIT - bin_PROGRAMS += pwait - endif -@@ -60,8 +59,7 @@ usrbin_exec_PROGRAMS += \ - pkill \ - pmap \ - uptime \ -- vmstat \ -- w -+ vmstat - endif - - lib_LTLIBRARIES = \ -@@ -74,7 +72,6 @@ dist_man_MANS = \ - pmap.1 \ - uptime.1 \ - vmstat.8 \ -- w.1 \ - ps/procps.1 - - if !CYGWIN -@@ -137,6 +134,19 @@ else - EXTRA_DIST += kill.1 - endif - -+if BUILD_W -+if CYGWIN -+usrbin_exec_PROGRAMS += w -+else -+bin_PROGRAMS += w -+endif -+ -+dist_man_MANS += w.1 -+w_SOURCES = w.c lib/fileutils.c -+else -+ EXTRA_DIST += w.1 -+endif -+ - if WITH_NCURSES - if !CYGWIN - bin_PROGRAMS += \ -@@ -213,7 +223,6 @@ endif - tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c - uptime_SOURCES = uptime.c lib/fileutils.c - vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c --w_SOURCES = w.c lib/fileutils.c - - # proc/libprocps.la - -diff --git a/configure.ac b/configure.ac -index 750c0fbb..3e83fb88 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -234,6 +234,12 @@ AC_ARG_ENABLE([kill], - [], [enable_kill=yes] - ) - AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes) -+AC_ARG_ENABLE([w], -+ AS_HELP_STRING([--disable-w], [do not build w]), -+ [], [enable_w=yes] -+) -+AM_CONDITIONAL(BUILD_W, test "x$enable_w" = xyes) -+ - AM_CONDITIONAL(LINUX, test "x$host_os" = xlinux-gnu) - AM_CONDITIONAL(CYGWIN, test "x$host_os" = xcygwin) - --- -GitLab - diff --git a/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch b/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch deleted file mode 100644 index f3e2b126a6f..00000000000 --- a/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2763b9880a7aab569694d6ee3170dd7341a26b84 Mon Sep 17 00:00:00 2001 -From: "Issam E. Maghni" -Date: Fri, 23 Apr 2021 16:53:39 -0400 -Subject: [PATCH] escape.c: Fix missing nl_langinfo on certain configs - -[Retrieved from: -https://gitlab.com/procps-ng/procps/-/commit/2763b9880a7aab569694d6ee3170dd7341a26b84] -Signed-off-by: Fabrice Fontaine ---- - proc/escape.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/proc/escape.c b/proc/escape.c -index 2e8fb7dd..cf4a80de 100644 ---- a/proc/escape.c -+++ b/proc/escape.c -@@ -24,13 +24,13 @@ - #include "procps.h" - #include "escape.h" - #include "readproc.h" -+#include "nls.h" - - #if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - # include - # include - # include /* MB_CUR_MAX */ - # include --# include - #endif - - #define SECURE_ESCAPE_ARGS(dst, bytes, cells) do { \ --- -GitLab - diff --git a/package/procps-ng/0003-fix-pifd_open-check.patch b/package/procps-ng/0003-fix-pifd_open-check.patch deleted file mode 100644 index 7152901e707..00000000000 --- a/package/procps-ng/0003-fix-pifd_open-check.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0cce3e981540c28d2f703b9ab16c04d0df8fa03d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 3 Nov 2022 18:24:53 +0100 -Subject: [PATCH] fix pifd_open check - -Replace AC_CHECK_FUNC by AC_CHECK_FUNCS otherwise HAVE_PIDFD_OPEN will -never be defined resulting in the following build failure if pidfd_open -is available but __NR_pidfd_open is not available: - -pgrep.c: In function 'pidfd_open': -pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? - 748 | return syscall(__NR_pidfd_open, pid, flags); - | ^~~~~~~~~~~~~~~ - | pidfd_open - -This build failure is raised since the addition of pwait in version -3.3.17 and -https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da - -Fixes: - - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/procps-ng/procps/-/merge_requests/166] ---- - configure.ac | 2 +- - src/pgrep.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 629881a6..1a3ccdb8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,7 +160,7 @@ AC_TRY_COMPILE([#include ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - --AC_CHECK_FUNC([pidfd_open], [enable_pwait=yes], [ -+AC_CHECK_FUNCS([pidfd_open], [enable_pwait=yes], [ - AC_MSG_CHECKING([for __NR_pidfd_open]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include -diff --git a/pgrep.c b/pgrep.c -index c4ad5da3..29cfedf7 100644 ---- a/pgrep.c -+++ b/pgrep.c -@@ -38,7 +38,7 @@ - #include - #include - --#if defined(ENABLE_PWAIT) && !defined(HAVE_PIDFD_OPEN) -+#if defined(ENABLE_PWAIT) - #include - #include - #endif --- -2.35.1 - diff --git a/package/procps-ng/procps-ng.hash b/package/procps-ng/procps-ng.hash index 09f2ebd0cb0..0d9cd9a8358 100644 --- a/package/procps-ng/procps-ng.hash +++ b/package/procps-ng/procps-ng.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 d60613e88c2f442ebd462b5a75313d56 procps-ng-3.3.17.tar.xz -sha1 a52952e8bc6aaab812176c00d25adc4d4e1552e2 procps-ng-3.3.17.tar.xz +md5 2f747fc7df8ccf402d03e375c565cf96 procps-ng-4.0.4.tar.xz +sha1 2b859acd7060e9898ac457dbd26dbebf563cc44b procps-ng-4.0.4.tar.xz # Locally calculated after checking signature -# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.17.tar.xz.asc -sha256 4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4 procps-ng-3.3.17.tar.xz +# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.4.tar.xz.asc +sha256 22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e procps-ng-4.0.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LIB diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index ba8958d146e..c5675e2ee6e 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -4,15 +4,13 @@ # ################################################################################ -PROCPS_NG_VERSION = 3.3.17 +PROCPS_NG_VERSION = 4.0.4 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB PROCPS_NG_CPE_ID_VALID = YES PROCPS_NG_INSTALL_STAGING = YES -# We're patching configure.ac -PROCPS_NG_AUTORECONF = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) From b22f174148d3ff2a824bd71abb0d1100b1624f36 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 14:31:45 +0200 Subject: [PATCH 2570/3013] package/quotatool: bump to version 1.6.4 - Switch site to get latest release - Send patch upstream - This bump will fix the following build failure with gcc >= 14: src/main.c: In function 'main': src/main.c:211:17: error: implicit declaration of function 'quota_reset_grace'; did you mean 'xfs_reset_grace'? [-Wimplicit-function-declaration] 211 | if (! quota_reset_grace(quota, (argdata->block_reset ? GRACE_BLOCK : GRACE_INODE))) | ^~~~~~~~~~~~~~~~~ | xfs_reset_grace https://github.com/ekenberg/quotatool/blob/v1.6.4/ChangeLog Fixes: - http://autobuild.buildroot.org/results/1855bc61fb231fadab77840dcd7ef75c414fe5be Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 940d2ccfbb488acb45fb106e41ae5f0b06a116aa) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../0001-fix-missing-__P-definition-for-musl-compile.patch | 1 + package/quotatool/quotatool.hash | 2 +- package/quotatool/quotatool.mk | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index f643e1ef878..07cc5a5c11b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1299,7 +1299,6 @@ package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch lib_patch.Upstream package/quagga/0001-fix-ipctl-forwarding.patch lib_patch.Upstream package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/quagga/0003-Fix-build-with-gcc-10.patch lib_patch.Upstream -package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch lib_patch.Upstream package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream diff --git a/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch b/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch index 927e62ba8cf..534c7fe945f 100644 --- a/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch +++ b/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch @@ -15,6 +15,7 @@ Fixes: ^~~ Signed-off-by: Peter Seiderer +Upstream: https://github.com/ekenberg/quotatool/pull/28 --- src/linux/linux_quota.h | 1 + 1 file changed, 1 insertion(+) diff --git a/package/quotatool/quotatool.hash b/package/quotatool/quotatool.hash index d41fd4ed1b3..9ce9ceaec1d 100644 --- a/package/quotatool/quotatool.hash +++ b/package/quotatool/quotatool.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 e53adc480d54ae873d160dc0e88d78095f95d9131e528749fd982245513ea090 quotatool-1.6.2.tar.gz +sha256 ef6b0494c505278ae140d1e105417d73703b4b9e08a1ee1f95dca1e0c19497b7 quotatool-1.6.4.tar.gz # Hash for license files: sha256 94686eeb98a40edc64106c6f8644068d8a08816a510a3cde75e50f1bf470564d COPYING diff --git a/package/quotatool/quotatool.mk b/package/quotatool/quotatool.mk index 7b63c01316c..5a60ff7bc1b 100644 --- a/package/quotatool/quotatool.mk +++ b/package/quotatool/quotatool.mk @@ -4,8 +4,8 @@ # ################################################################################ -QUOTATOOL_VERSION = 1.6.2 -QUOTATOOL_SITE = http://quotatool.ekenberg.se +QUOTATOOL_VERSION = 1.6.4 +QUOTATOOL_SITE = $(call github,ekenberg,quotatool,v$(QUOTATOOL_VERSION)) QUOTATOOL_LICENSE = GPL-2.0 QUOTATOOL_LICENSE_FILES = COPYING From 990d0b3d10737f0b820fb1aded2d06fda3d1e4f2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 10:53:02 +0200 Subject: [PATCH 2571/3013] package/btrfs-progs: don't install host udev files Pass an empty value for udevdir to avoid the following host build failure on one of the autobuilders: /usr/bin/install -c -m755 -d /usr/lib/udev/rules.d /usr/bin/install -c -m644 64-btrfs-dm.rules 64-btrfs-zoned.rules /usr/lib/udev/rules.d /usr/bin/install: cannot create regular file '/usr/lib/udev/rules.d/64-btrfs-dm.rules': Permission denied /usr/bin/install: cannot create regular file '/usr/lib/udev/rules.d/64-btrfs-zoned.rules': Permission denied This build failure can be raised since the addition of the host variant in commit ed69859a7261ee86e71aa666d30a28e374769e15. udev rules were added by upstream in 2016 by https://github.com/kdave/btrfs-progs/commit/62c0666378eb70285b6a3052bf4144d2132a5891 Fixes: ed69859a7261ee86e71aa666d30a28e374769e15 - http://autobuild.buildroot.org/results/c46238afe8d23cf4bff4e7290a5eaebd0640eb6e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8ce17e304b02c6969e4fd51f0bde97798d49eb3b) Signed-off-by: Peter Korsgaard --- package/btrfs-progs/btrfs-progs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 9bf50ccfda7..1e4c7767f0c 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -59,5 +59,7 @@ HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-python \ --disable-convert +HOST_BTRFS_PROGS_INSTALL_OPTS = udevdir= install + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 22741d9eb6f7350650521d183a5c74810d1ae5f6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 18:38:06 +0200 Subject: [PATCH 2572/3013] package/libressl: fix powerpc64 build Fix the following build failure with powerpc64 raised since bump to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: In file included from /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/rc4/rc4_enc.c:61: /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' 75 | RC4_INT x, y; | ^~~~~~~ Fixes: 21eca49ed5110872407b76ab9337d2877c4cda24 - http://autobuild.buildroot.org/results/2533f8f642f435b40ce687b6df482c51a3fa0250 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ee00cfd09e4ffa97019c4e9384cc761995912e28) Signed-off-by: Peter Korsgaard --- ...ists-txt-Fix-HOST-variable-for-ppc64.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch diff --git a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch new file mode 100644 index 00000000000..8da8fedae27 --- /dev/null +++ b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch @@ -0,0 +1,26 @@ +From e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Fri, 19 Jul 2024 11:41:46 +0200 +Subject: [PATCH] CMakeLists.txt: Fix HOST variable for ppc64 + +The code here defined HOST_PPC64, but the rest of the build system expects HOST_POWERPC64. + +Upstream: https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c496ad97b5..670aa9a1a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -373,7 +373,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") + set(HOST_POWERPC true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") +- set(HOST_PPC64 true) ++ set(HOST_POWERPC64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") + set(HOST_RISCV64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64") From 1160c791463809ac91797c93f0ec28bff0c42f06 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 13:01:26 +0200 Subject: [PATCH 2573/3013] package/can-utils: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: j1939acd.c: In function 'main': j1939acd.c:489:38: error: passing argument 1 of 'asprintf' from incompatible pointer type [-Wincompatible-pointer-types] 489 | if (asprintf(&program_invocation_name, "%s.%s", | ^~~~~~~~~~~~~~~~~~~~~~~~ | | | const char ** Fixes: - http://autobuild.buildroot.org/results/1e2a533a936624249cd79d34983c889c3c4c2e3b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3720250420d6b35bd217950d7a0648a0ecd0a2b5) Signed-off-by: Peter Korsgaard --- ...y-poption-prefix-to-use-when-logging.patch | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch diff --git a/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch b/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch new file mode 100644 index 00000000000..36c96d59e45 --- /dev/null +++ b/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch @@ -0,0 +1,79 @@ +From d337863d9189501dbbb15467cc3dcba85946a2a3 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 22 Jul 2024 16:12:04 +0200 +Subject: [PATCH] j1939acd: remove legacy '-p' option (prefix to use when + logging) + +- remove legacy '-p' option (prefix to use when logging), fixes uclibc + compile + +Fixes: + + j1939acd.c: In function 'main': + j1939acd.c:489:38: error: passing argument 1 of 'asprintf' from incompatible pointer type [-Wincompatible-pointer-types] + 489 | if (asprintf(&program_invocation_name, "%s.%s", + | ^~~~~~~~~~~~~~~~~~~~~~~~ + | | + | const char ** + +Signed-off-by: Peter Seiderer +Upstream: https://github.com/linux-can/can-utils/commit/d337863d9189501dbbb15467cc3dcba85946a2a3 +Signed-off-by: Fabrice Fontaine +--- + j1939acd.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/j1939acd.c b/j1939acd.c +index 44bb826c..ae4e58ac 100644 +--- a/j1939acd.c ++++ b/j1939acd.c +@@ -38,7 +38,6 @@ static const char help_msg[] = + " e.g. 80,50-100,200-210 (defaults to 0-253)" "\n" + " -c, --cache=FILE Cache file to save/restore the source address" "\n" + " -a, --address=ADDRESS Start with Source Address ADDRESS" "\n" +- " -p, --prefix=STR Prefix to use when logging" "\n" + "\n" + "NAME is the 64bit nodename" "\n" + "\n" +@@ -54,14 +53,13 @@ static struct option long_opts[] = { + { "range", required_argument, NULL, 'r', }, + { "cache", required_argument, NULL, 'c', }, + { "address", required_argument, NULL, 'a', }, +- { "prefix", required_argument, NULL, 'p', }, + { }, + }; + #else + #define getopt_long(argc, argv, optstring, longopts, longindex) \ + getopt((argc), (argv), (optstring)) + #endif +-static const char optstring[] = "vr:c:a:p:?"; ++static const char optstring[] = "vr:c:a:?"; + + /* byte swap functions */ + static inline int host_is_little_endian(void) +@@ -466,9 +464,6 @@ int main(int argc, char *argv[]) + struct sockaddr_can saddr; + uint64_t cmd_name; + +-#ifdef _GNU_SOURCE +- program_invocation_name = program_invocation_short_name; +-#endif + /* argument parsing */ + while ((opt = getopt_long(argc, argv, optstring, long_opts, NULL)) != -1) + switch (opt) { +@@ -484,15 +479,6 @@ int main(int argc, char *argv[]) + case 'a': + s.current_sa = strtoul(optarg, 0, 0); + break; +- case 'p': +-#ifdef _GNU_SOURCE +- if (asprintf(&program_invocation_name, "%s.%s", +- program_invocation_short_name, optarg) < 0) +- err(1, "asprintf(program invocation name)"); +-#else +- err(0, "compile with -D_GNU_SOURCE to use -p"); +-#endif +- break; + default: + fputs(help_msg, stderr); + exit(1); From cede5364deaf54062880c43de4221d262eed7b63 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 25 Jul 2024 11:22:09 +0200 Subject: [PATCH 2574/3013] package/lrzsz: drop unused LRZSZ_POST_CONFIGURE_HOOKS As already done for LRZSZ_BUILD_HOOKS in commit 5fde4abc8d67ac2317b1de7a1b4cde8091f4e3c7, drop bogus LRZSZ_POST_CONFIGURE_HOOKS as this hook added in 2010 is also never called Fixes: 4f3f291a3bfc1893cbfb4d9803c35a4f6752784d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit e7c0125754f12acd18fa29a9ea21e7ca371ffc83) Signed-off-by: Peter Korsgaard --- package/lrzsz/lrzsz.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index d9be23540eb..7247a4bd597 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -13,11 +13,6 @@ LRZSZ_CPE_ID_VALID = YES LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) -define LRZSZ_POST_CONFIGURE_HOOKS - $(SED) "s/-lnsl//;" $(@D)/src/Makefile - $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h -endef - define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz From bf5e5d27e30e2ecfce2a195c9df98c548ffb471f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:49:58 +0200 Subject: [PATCH 2575/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b5e2f8287a73f33ac82da78f4b75c6289612510e) [Peter: drop 6.9.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 37e1a590325..b77c49d2976 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz -sha256 f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214 linux-6.6.37.tar.xz -sha256 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af linux-6.1.97.tar.xz +sha256 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef linux-6.6.41.tar.xz +sha256 b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 linux-6.1.100.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz -sha256 da1dd47febac4f7856654038a47703666da3afba348b8e96e39584e0972e2725 linux-5.10.221.tar.xz -sha256 b298436b26395b5c3ace6963836ba70d57cd61e01cff254b0e5443636c324a5e linux-5.4.279.tar.xz +sha256 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302 linux-5.15.163.tar.xz +sha256 7b2d06803b5abb03c85f171100ca9d7acd6ba245036fe9a16eb998f088b150cb linux-5.10.222.tar.xz +sha256 a976c67eb8270cac310faf1acc61305d1f9967955aca38fbdfcb0bc77d033d42 linux-5.4.280.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 062b70cc132378e1c685df44ddf7e05bab4752b690ada17b080655a63f993581 linux-4.19.317.tar.xz +sha256 0d5fa562a3c53f524f02fc11abe502c01096df73dd27d57736875e8590007493 linux-4.19.318.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9eff2fec9cd..1dd345e8b87 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -415,12 +415,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.317" if BR2_KERNEL_HEADERS_4_19 - default "5.4.279" if BR2_KERNEL_HEADERS_5_4 - default "5.10.221" if BR2_KERNEL_HEADERS_5_10 - default "5.15.162" if BR2_KERNEL_HEADERS_5_15 - default "6.1.97" if BR2_KERNEL_HEADERS_6_1 - default "6.6.37" if BR2_KERNEL_HEADERS_6_6 + default "4.19.318" if BR2_KERNEL_HEADERS_4_19 + default "5.4.280" if BR2_KERNEL_HEADERS_5_4 + default "5.10.222" if BR2_KERNEL_HEADERS_5_10 + default "5.15.163" if BR2_KERNEL_HEADERS_5_15 + default "6.1.100" if BR2_KERNEL_HEADERS_6_1 + default "6.6.41" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From ce93c5756eaba72e5413b06a933471bf6ce5ac23 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:50:53 +0200 Subject: [PATCH 2576/3013] package/apache: security bump version to 2.4.62 Fixes CVE-2024-40725 & CVE-2024-40898. Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.62 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit bac05f9b21219a209484b7df8d3b89f5d90feb99) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 2ed9c17f9a7..b281b4beabf 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.61.tar.bz2.{sha256,sha512} -sha256 ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6 httpd-2.4.61.tar.bz2 -sha512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff httpd-2.4.61.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.62.tar.bz2.{sha256,sha512} +sha256 674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec httpd-2.4.62.tar.bz2 +sha512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77 httpd-2.4.62.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 0319a968153..0a0a0b3de4a 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.61 +APACHE_VERSION = 2.4.62 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 9d9b4bf57ce9158565b7579e9389ec3798ae45fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:51:43 +0200 Subject: [PATCH 2577/3013] package/openvpn: bump version to 2.6.12 Release notes: https://sourceforge.net/p/openvpn/mailman/message/58796813/ Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3da0a950e02932c81e516d818a5b3731134376d6) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index a4ba458bd82..7ba3ea3f200 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 d60adf413d37e11e6e63531cacf2655906756046b4edffe88a13b9e2fec40d5e openvpn-2.6.11.tar.gz +sha256 1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929 openvpn-2.6.12.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 3b39d62519e..4bf5b54656d 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.11 +OPENVPN_VERSION = 2.6.12 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From 96e0b1bd7a66fdad061bcb5bbf74d4f7389f76f3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:52:18 +0200 Subject: [PATCH 2578/3013] package/fetchmail: bump version to 6.4.39 Release notes: https://sourceforge.net/p/fetchmail/mailman/message/58797299/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 5226e5f664e1ef59654fc70be94064f1614a9c25) Signed-off-by: Peter Korsgaard --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3c0403fa78b..12612ecc489 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ -sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/58797299/ +sha256 75109a1f307b538155fa05f5ef298e8298cb4deae95aed24c16b38d36ff0a186 fetchmail-6.4.39.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index c74b2596987..a9239d08556 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).39 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From 56393a6a44481d2f9c1fa0a18de0fc1f2f07c1a9 Mon Sep 17 00:00:00 2001 From: Martin Wetterwald Date: Thu, 25 Jul 2024 19:37:09 +0200 Subject: [PATCH 2579/3013] package/tinyssh: fix static-only build When using BR2_STATIC_LIBS=y, tinysshd's build was successful, but the binary didn't work on the final target: this is because a dynamically linked ELF was produced, on a target having no dynamic loader at all. Using $(TARGET_CONFIGURE_OPTS) propagates all the options and not only "CC", resulting in a correct static binary able to run on the target. Without the patch: > tinysshd: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), > dynamically linked, interpreter /lib/ld-musl-armhf.so.1, stripped With the patch: > tinysshd: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), > statically linked, stripped Fixes: a7b3de8a3b1b446c081593192c3acb847f6f5f05 Signed-off-by: Martin Wetterwald Signed-off-by: Thomas Petazzoni (cherry picked from commit 90e22ff48bb5705c146a64b75556157667b551d3) Signed-off-by: Peter Korsgaard --- package/tinyssh/tinyssh.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyssh/tinyssh.mk b/package/tinyssh/tinyssh.mk index 80b6ccb8503..e92ac628f2a 100644 --- a/package/tinyssh/tinyssh.mk +++ b/package/tinyssh/tinyssh.mk @@ -10,7 +10,7 @@ TINYSSH_LICENSE = CC0-1.0 TINYSSH_LICENSE_FILES = LICENCE define TINYSSH_BUILD_CMDS - $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" $(MAKE) -C $(@D) cross-compile + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) cross-compile endef define TINYSSH_INSTALL_TARGET_CMDS From 41e4b2210d897cc2b681fcd032b2b08e5937dc4d Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Thu, 25 Jul 2024 11:27:03 +0300 Subject: [PATCH 2580/3013] package/uclibc-ng-test: fix build with the musl C library Musl doesn't provide sys/asm.h header so we should add some defines inside mips-specific header file to avoid build errors. Fixes: http://autobuild.buildroot.net/results/af7a1d00930485f87f77762b34cae01873a8cd41/ Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni (cherry picked from commit b5c1ead57e93b32c900b58f4fd22259313fc5c0d) Signed-off-by: Peter Korsgaard --- .../0001-Fix-error-absent-sys-asm-h.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch diff --git a/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch b/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch new file mode 100644 index 00000000000..5c8cd3f4630 --- /dev/null +++ b/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch @@ -0,0 +1,59 @@ +From a99d5bdb51bdab92a303c508b2b938ee0789d614 Mon Sep 17 00:00:00 2001 +From: Dmitry Chestnykh +Date: Thu, 25 Jul 2024 09:15:11 +0300 +Subject: [PATCH] Fix errors due to absent sys/asm.h in mips64 musl build + +Upstream: https://patchwork.ozlabs.org/project/uclibc-ng/patch/20240725081519.611076-1-dm.chestnykh@gmail.com/ +Signed-off-by: Dmitry Chestnykh +--- + test/tls/tls-macros-mips.h | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/test/tls/tls-macros-mips.h b/test/tls/tls-macros-mips.h +index eed0938..bd4c5c4 100644 +--- a/test/tls/tls-macros-mips.h ++++ b/test/tls/tls-macros-mips.h +@@ -1,7 +1,40 @@ + /* Macros to support TLS testing in times of missing compiler support. */ + + #include ++#if defined(__has_include) && __has_include() + #include ++#else ++ ++#define __STRING(x) #x ++ ++#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 32) ++#define PTR_ADDIU addiu ++#define PTR_L lw ++#endif ++ ++#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _NABI32 ++ ++#if !defined __mips_isa_rev || __mips_isa_rev < 6 ++#define PTR_ADDU add ++#define PTR_ADDIU addi ++#else ++#define PTR_ADDU addu ++#define PTR_ADDIU addiu ++#endif ++ ++#define PTR_L lw ++#endif ++ ++#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 64) \ ++ || _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _ABIN32 ++ ++#define PTR_ADDU daddu ++#define PTR_ADDIU daddiu ++#define PTR_L ld ++ ++#endif ++ ++#endif + + #define __STRING2(X) __STRING(X) + #define ADDU __STRING2(PTR_ADDU) +-- +2.45.2 + From c47d8b072663f9afe447d4730ab2ec5c3676cb25 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:25 +0200 Subject: [PATCH 2581/3013] package/elfutils: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit f5226cd6b72a7b47edbc3220b3e1279526c75b31) Signed-off-by: Peter Korsgaard --- ...lly-make-Werror-conditional-to-BUILD_WERROR.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch index 565a3c1bbb0..f35c2d48aad 100644 --- a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch +++ b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch @@ -1,4 +1,4 @@ -From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001 +From 064b74d5e19847794072781405eafe8dfbfca331 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 29 May 2017 23:24:42 +0300 Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR @@ -13,26 +13,28 @@ cc1: all warnings being treated as errors [Vincent: tweak patch for 0.166] [Bernd: rebased patch for 0.177 & 0.189] +[Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: "Yann E. MORIN" Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls +Signed-off-by: Dario Binacchi --- config/eu.am | 1 - 1 file changed, 1 deletion(-) diff --git a/config/eu.am b/config/eu.am -index c2cc349ce876..99b368e09060 100644 +index e6c241f9d88a..cad1baa27a5f 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ $(USE_AFTER_FREE3_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ + $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -- -2.17.1 +2.43.0 From fa4f1e6110a8f3255670a84b070093823de714db Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 25 Jul 2024 10:06:41 +0200 Subject: [PATCH 2582/3013] package/elfutils: fix build on microblaze Fix the following build failure on microblaze: dwelf_elf_begin.c:62:1: error: symver is only supported on ELF platforms 62 | OLD_VERSION (dwelf_elf_begin, ELFUTILS_0.175) | ^~~~~~~~~~~ dwelf_elf_begin.c:62:1: error: symver is only supported on ELF platforms Fixes: - http://autobuild.buildroot.org/results/5ca2aa5c76415690ad4a85837ba47e7bcfbdbcbc Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 8ef2bb44379e4763682199ad2ecfd23d51cbacc0) Signed-off-by: Peter Korsgaard --- package/elfutils/elfutils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 4d8cc43342e..8738af7751f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -45,6 +45,10 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ELFUTILS_CONF_OPTS += --disable-symbol-versioning endif +ifeq ($(BR2_microblaze),y) +ELFUTILS_CONF_OPTS += --disable-symbol-versioning +endif + # disable for now, needs "distro" support ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod From 141f1472a57f607dda7ff169f18d89d912993802 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 26 Jul 2024 05:46:03 -0400 Subject: [PATCH 2583/3013] package/libpwquality: fix PAM module path The libpwquality package provides the pam_pwquality PAM module - the replacement for pam_cracklib that was dropped from linux-pam back in version 1.5.0. However, it currently installs it to the wrong place, so passwd and friends fail to find it. This commit sets the security directory path to /lib/security to match the corresponding setting in linux-pam.mk. Note that libpwquality has *always* installed pam_pwquality in the wrong place, since version 1.3.0 was added to buildroot in 2017 in commit 462040443ca943694fc59ec8380c82f8bf9aaddc. However, back then, linux-pam version 1.3.0 still provided pam_cracklib for advanced password checking. Linux-pam deprecated pam_cracklib in 1.4.0 but still built it for us when linux-pam.mk set --enable-cracklib. Linux-PAM deleted pam_cracklib altogether in 1.5.0, so it was not until our update to linux-pam-1.5.1 in commit 276f1e0a896698abec85500a86686bf72c79eb91 that pam_cracklib became unavailable. After that point, pam_pwquality was the only alternative for PAM-based password checking. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni (cherry picked from commit 541eb8bf7db553708ff2286995ce94b38fc8d537) Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index f12e583b2df..ba62cdfb09e 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -23,7 +23,7 @@ LIBPWQUALITY_CONF_OPTS += --disable-python-bindings endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -LIBPWQUALITY_CONF_OPTS += --enable-pam +LIBPWQUALITY_CONF_OPTS += --enable-pam --with-securedir=/lib/security LIBPWQUALITY_DEPENDENCIES += linux-pam else LIBPWQUALITY_CONF_OPTS += --disable-pam From 16ec025f81cefbe20c76f9d32036809e6d12467e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Jul 2024 10:42:48 +0200 Subject: [PATCH 2584/3013] package/libnfs: fix build with gcc >= 14 Fix the following build failure with gcc >= 14 which enables -Werror=implicit-function-declaration (https://gcc.gnu.org/gcc-14/porting_to.html): nfs-stat.c: In function 'main': nfs-stat.c:287:30: error: implicit declaration of function 'ctime' [-Wimplicit-function-declaration] 287 | printf("Access: %s", ctime( (const time_t *) &st.nfs_atime)); | ^~~~~ nfs-stat.c:177:1: note: 'ctime' is defined in header ''; this is probably fixable by adding '#include ' 176 | #include +++ |+#include 177 | char *uid_to_name(int uid) Fixes: - http://autobuild.buildroot.org/results/73c3828a4e5d275ca0dfdd5b314494e2b00393c8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c19a417674961fe6a10b566d600ceb6b4989ec8b) Signed-off-by: Peter Korsgaard --- ...0002-utils-nfs-stat.c-include-time.h.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch diff --git a/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch b/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch new file mode 100644 index 00000000000..649d84524cb --- /dev/null +++ b/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch @@ -0,0 +1,39 @@ +From 034205b6b3acd64f9c75010d8da27e2c9f1bc82f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jul 2024 18:04:05 +0200 +Subject: [PATCH] utils/nfs-stat.c: include time.h + +Include time.h to fix the following build failure with gcc >= 14 which +enables -Werror=implicit-function-declaration +(https://gcc.gnu.org/gcc-14/porting_to.html): + +nfs-stat.c: In function 'main': +nfs-stat.c:287:30: error: implicit declaration of function 'ctime' [-Wimplicit-function-declaration] + 287 | printf("Access: %s", ctime( (const time_t *) &st.nfs_atime)); + | ^~~~~ +nfs-stat.c:177:1: note: 'ctime' is defined in header ''; this is probably fixable by adding '#include ' + 176 | #include + +++ |+#include + 177 | char *uid_to_name(int uid) + +Fixes: + - http://autobuild.buildroot.org/results/73c3828a4e5d275ca0dfdd5b314494e2b00393c8 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/sahlberg/libnfs/commit/39e1ae0206fb519c551b48b0e6de57f3e764e886 +--- + utils/nfs-stat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/nfs-stat.c b/utils/nfs-stat.c +index 17ddb311..0ec33544 100644 +--- a/utils/nfs-stat.c ++++ b/utils/nfs-stat.c +@@ -50,6 +50,7 @@ WSADATA wsaData; + #include + #include + #include ++#include + #include "libnfs.h" + #include "libnfs-raw.h" + #include "libnfs-raw-mount.h" From 7bf717d3226f5c440eae1c04070e61a633c527a4 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Fri, 26 Jul 2024 18:01:52 +0200 Subject: [PATCH 2585/3013] package/busybox: fix menuconfig with GCC 14 GCC 14 errors out on the implicit return type of "main() {}". The patch also removes the /dev/null redirection of GCC stderr that hid the actual problem. Signed-off-by: Fiona Klute (WIWA) Reviewed-by: Brandon Maier Tested-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 6caf350c1a9f5c6907d109e1c55fe420ec1aebd6) Signed-off-by: Peter Korsgaard --- ...-failing-saying-ncurses-is-not-found.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch diff --git a/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch b/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch new file mode 100644 index 00000000000..4651d8c2c91 --- /dev/null +++ b/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch @@ -0,0 +1,38 @@ +From ctxnop@gmail.com Sun Jul 21 12:10:52 2024 +From: ctxnop@gmail.com (Nop) +Date: Sun, 21 Jul 2024 14:10:52 +0200 +Subject: [PATCH] menuconfig: GCC failing saying ncurses is not found + +Newer GCC increased diagnostics levels resulting in considering the +test code to be invalid. The resulting message was misleading, saying +that ncurses was not found, while the check failed for an unrelated +reason which was hidden because GCC stderr was redirected to +/dev/null. + +Signed-off-by: ctxnop +Upstream: http://lists.busybox.net/pipermail/busybox/2024-July/090840.html +[Fiona: rephrased commit message for clarity] +Signed-off-by: Fiona Klute (WIWA) +--- + scripts/kconfig/lxdialog/check-lxdialog.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh +b/scripts/kconfig/lxdialog/check-lxdialog.sh +index 5075ebf2d..c644d1d48 100755 +--- a/scripts/kconfig/lxdialog/check-lxdialog.sh ++++ b/scripts/kconfig/lxdialog/check-lxdialog.sh +@@ -45,9 +45,9 @@ trap "rm -f $tmp" 0 1 2 3 15 + + # Check if we can link to ncurses + check() { +- $cc -x c - -o $tmp 2>/dev/null <<'EOF' ++ $cc -x c - -o $tmp <<'EOF' + #include CURSES_LOC +-main() {} ++int main() { return 0; } + EOF + if [ $? != 0 ]; then + echo " *** Unable to find the ncurses libraries or the" 1>&2 +-- +2.45.2 From 88f005a95cc8e54e228936cdf18fe7f86968ea93 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 10:01:00 +0200 Subject: [PATCH 2586/3013] DEVELOPERS: add Bernd Kuhls for openvpn Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 8f1c2ad8c66eaf2be11d6621ae414709f37d893e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 88489a99bec..c19ac3cbe95 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -456,6 +456,7 @@ F: package/mpg123/ F: package/ntp/ F: package/nut/ F: package/onevpl-intel-gpu/ +F: package/openvpn/ F: package/opus/ F: package/pciutils/ F: package/perl-crypt-openssl-guess/ From 7a9446201951d4991347c9f53238ebec26d58cb5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 28 Jul 2024 18:34:10 +0200 Subject: [PATCH 2587/3013] package/gdb: move GDB 14.x patches to the right folder Commit bfefed17a9e5a421b3217685003d3b22c99de4ab ("package/gdb: bump 14.x series from 14.1 to 14.2"), which upgraded the GDB 14.x series from 14.1 to 14.2 forgot to rename the directory containing the patches, causing them to no longer be applied. The patches still apply properly with no change, so renaming the directory is sufficient. http://autobuild.buildroot.net/results/b8c6af95b244272220c63847e7cc929c9c58eee4/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 076f345accb811add37c96705ea1602a8a3b06a1) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 18 +++++++++--------- ...ne-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...e-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...-fork-inferior-include-linux-ptrace.h.patch | 0 ...-getrandom-compile-for-uclibc-v1.0.35.patch | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...8-gdbserver-Makefile.in-fix-NLS-build.patch | 0 .../0009-gdb-Fix-native-build-on-xtensa.patch | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename package/gdb/{14.1 => 14.2}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) rename package/gdb/{14.1 => 14.2}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) rename package/gdb/{14.1 => 14.2}/0003-use-asm-sgidefs.h.patch (100%) rename package/gdb/{14.1 => 14.2}/0004-gdbserver-fix-build-for-m68k.patch (100%) rename package/gdb/{14.1 => 14.2}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) rename package/gdb/{14.1 => 14.2}/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch (100%) rename package/gdb/{14.1 => 14.2}/0007-fix-musl-build-on-riscv.patch (100%) rename package/gdb/{14.1 => 14.2}/0008-gdbserver-Makefile.in-fix-NLS-build.patch (100%) rename package/gdb/{14.1 => 14.2}/0009-gdb-Fix-native-build-on-xtensa.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 07cc5a5c11b..47da52c4eb6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -662,15 +662,15 @@ package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.U package/gdb/13.2/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream -package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream -package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream -package/gdb/14.1/0003-use-asm-sgidefs.h.patch lib_patch.Upstream -package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream -package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream -package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream -package/gdb/14.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream -package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream -package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream +package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream +package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream +package/gdb/14.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream +package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream +package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream +package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream +package/gdb/14.2/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream +package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream +package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream package/gengetopt/0001-configure.ac-add-disable-doc-option.patch lib_patch.Upstream package/genpart/0001-fix-return-code.patch lib_patch.Upstream package/genromfs/0001-build-system.patch lib_patch.Sob lib_patch.Upstream diff --git a/package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/14.1/0003-use-asm-sgidefs.h.patch b/package/gdb/14.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/14.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/14.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/14.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/14.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/14.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/14.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch similarity index 100% rename from package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch rename to package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch From aa3e78f18d4ea73a8242c41bca73fbe943b157c2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:23:17 +0200 Subject: [PATCH 2588/3013] package/libcurl: bump version to 8.8.0 Changelog: https://curl.se/changes.html#8_8_0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 50bdb2a3b7ace71065dc0b8a81bebc173f84a8c4) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 7fcad973c3c..7ba45b79d7a 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.7.1.tar.xz.asc +# https://curl.se/download/curl-8.8.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd curl-8.7.1.tar.xz +sha256 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 curl-8.8.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 99320c13157..172dd220715 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.7.1 +LIBCURL_VERSION = 8.8.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From ba2fc580737b762420c2f2c751fbd1ea30bc2739 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 28 Jun 2024 17:24:17 +0300 Subject: [PATCH 2589/3013] package/libcurl: fix build with mbedtls Add upstream patch to fix compatibility with mbedtls version 2.28.x, which is broken since commit 50bdb2a3b7 (package/libcurl: bump version to 8.8.0). Fixes: http://autobuild.buildroot.net/results/66ba878386e4e478645edb6a282e82820b8dad7f http://autobuild.buildroot.net/results/7a4d9595197cf23080a23dfe9bc0e60b8145af6e http://autobuild.buildroot.net/results/9add7283813388daa95b16ef76acb3c4e9ea7c2f [Peter: mention when this issue was introduced] Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit d611acf8e9f9d598f001fec65c974b0c3f20a1f6) Signed-off-by: Peter Korsgaard --- ...-mbedtls-check-version-for-cipher-id.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch diff --git a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch new file mode 100644 index 00000000000..b7d674acfe3 --- /dev/null +++ b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch @@ -0,0 +1,56 @@ +From 0c4b4c1e93c8e869af230090f32346fdfd548f21 Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Wed, 22 May 2024 14:44:56 +0200 +Subject: [PATCH] mbedtls: check version for cipher id + +mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have been added in +mbedtls 3.2.0. Check for that version. + +Closes #13749 + +Signed-off-by: Baruch Siach +Upstream: https://github.com/curl/curl/commit/0c4b4c1e93c8e869af230090f32346fdfd548f21 +--- + lib/vtls/mbedtls.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +index ec0b10dd9a9f..98a4ea01b183 100644 +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + (struct mbed_ssl_backend_data *)connssl->backend; + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + const mbedtls_x509_crt *peercert; +- char cipher_str[64]; +- uint16_t cipher_id; + #ifndef CURL_DISABLE_PROXY + const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? + data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: +@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + return CURLE_SSL_CONNECT_ERROR; + } + +- cipher_id = (uint16_t) +- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); +- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); +- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); +- ++#if MBEDTLS_VERSION_NUMBER >= 0x03020000 ++ { ++ char cipher_str[64]; ++ uint16_t cipher_id; ++ cipher_id = (uint16_t) ++ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); ++ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); ++ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); ++ } ++#else ++ infof(data, "mbedTLS: Handshake complete"); ++#endif + ret = mbedtls_ssl_get_verify_result(&backend->ssl); + + if(!conn_config->verifyhost) +-- +2.43.0 + From b4c2cc92191a4034b30fdbeccbaeb31213cafd12 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:52:47 +0200 Subject: [PATCH 2590/3013] package/libcurl: security bump to version 8.9.0 Removed patch which is included in this release. Changelog: https://curl.se/changes.html#8_9_0 Fixes CVE-2024-6197: https://curl.se/docs/CVE-2024-6197.html CVE-2024-6874 (Apple-only): https://curl.se/docs/CVE-2024-6874.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e6816ece5b425fce6fc3e080178ff04060b8ef08) Signed-off-by: Peter Korsgaard --- ...-mbedtls-check-version-for-cipher-id.patch | 56 ------------------- package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 2 +- 3 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch diff --git a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch deleted file mode 100644 index b7d674acfe3..00000000000 --- a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0c4b4c1e93c8e869af230090f32346fdfd548f21 Mon Sep 17 00:00:00 2001 -From: Stefan Eissing -Date: Wed, 22 May 2024 14:44:56 +0200 -Subject: [PATCH] mbedtls: check version for cipher id - -mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have been added in -mbedtls 3.2.0. Check for that version. - -Closes #13749 - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/0c4b4c1e93c8e869af230090f32346fdfd548f21 ---- - lib/vtls/mbedtls.c | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) - -diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c -index ec0b10dd9a9f..98a4ea01b183 100644 ---- a/lib/vtls/mbedtls.c -+++ b/lib/vtls/mbedtls.c -@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) - (struct mbed_ssl_backend_data *)connssl->backend; - struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); - const mbedtls_x509_crt *peercert; -- char cipher_str[64]; -- uint16_t cipher_id; - #ifndef CURL_DISABLE_PROXY - const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? - data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: -@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) - return CURLE_SSL_CONNECT_ERROR; - } - -- cipher_id = (uint16_t) -- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); -- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); -- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); -- -+#if MBEDTLS_VERSION_NUMBER >= 0x03020000 -+ { -+ char cipher_str[64]; -+ uint16_t cipher_id; -+ cipher_id = (uint16_t) -+ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); -+ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); -+ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); -+ } -+#else -+ infof(data, "mbedTLS: Handshake complete"); -+#endif - ret = mbedtls_ssl_get_verify_result(&backend->ssl); - - if(!conn_config->verifyhost) --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 7ba45b79d7a..fa325efd7de 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.8.0.tar.xz.asc +# https://curl.se/download/curl-8.9.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 curl-8.8.0.tar.xz +sha256 ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 curl-8.9.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 172dd220715..966885aedad 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.8.0 +LIBCURL_VERSION = 8.9.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 7a63a484a2edfa4188c06aee2ad7ea2065549d3b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 28 Jul 2024 17:46:17 +0200 Subject: [PATCH 2591/3013] support/testing/infra/emulator.py: add host load info in run log Runtime tests running on test runners are subject to a high variability in term of performance and timing. Most or the runtime test commands are executed with a timeout, in pexpect. Slow or very loaded test runners can use the timeout_multiplier to globally increase those timeouts. Some runtime test commands sometimes needs to poll or query a state, rather than having purely sequential actions. It is sometimes hard to know, from the test writer point of view, the maximum timeout to set, or if a retry logic is needed. In order to help debugging runtime tests failing due very slow execution, this commit adds extra information on the host test runner about its load in the run log. Relevant information are: number of cpus, the load average at the moment the emulator is started and the current timeout_multiplier. Note: this change was discussed in: https://lists.buildroot.org/pipermail/buildroot/2024-July/759119.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 7a6edbc7b9166c799b43cf9a9b78422c8e20ccc0) Signed-off-by: Peter Korsgaard --- support/testing/infra/emulator.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 624740fcb16..2106d0e99b9 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -2,6 +2,8 @@ import infra +import os + class Emulator(object): @@ -73,6 +75,11 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): if kernel_cmdline: qemu_cmd += ["-append", " ".join(kernel_cmdline)] + self.logfile.write(f"> host cpu count: {os.cpu_count()}\n") + ldavg = os.getloadavg() + ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}" + self.logfile.write(f"> host loadavg: {ldavg_str}\n") + self.logfile.write(f"> timeout multiplier: {self.timeout_multiplier}\n") self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, From 14db9f6fc9b033d7cbfe8b526ee1adabb9122055 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 19:58:05 +0200 Subject: [PATCH 2592/3013] DEVELOPERS: remove Bernd Kuhls from libks I am not using this package anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c79ec67bc8763f8d630f51ffbcaf0bb6bfb71236) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index c19ac3cbe95..6aaaa6ca7fa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -419,7 +419,6 @@ F: package/libglu/ F: package/libhdhomerun/ F: package/libheif/ F: package/libilbc/ -F: package/libks/ F: package/libldns/ F: package/libmicrohttpd/ F: package/libminiupnpc/ From 0cd5f986c3550d425369fe0061ea9dc0cbf25b4d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Jul 2024 18:57:15 +0200 Subject: [PATCH 2593/3013] package/open-iscsi: open-isns is optional, not mandatory open-isns is optional, not mandatory, since bump to version 2.1.9 in commit 2314928cf828ff02939b9c0041964c3ee2dd907d and https://github.com/open-iscsi/open-iscsi/commit/713524df809396e11f42d7691bd8ead2ffc1ca6b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 948b1830423421e087f6aa4923a37ce077ed5904) Signed-off-by: Peter Korsgaard --- package/open-iscsi/Config.in | 1 - package/open-iscsi/open-iscsi.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in index e55bbfd867d..01d83615c9f 100644 --- a/package/open-iscsi/Config.in +++ b/package/open-iscsi/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPEN_ISCSI depends on !BR2_STATIC_LIBS # kmod select BR2_PACKAGE_KMOD select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_OPEN_ISNS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT help diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index d1f40d3e20d..1266db3d3fd 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -9,10 +9,17 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING README libopeniscsiusr/COPYING OPEN_ISCSI_CPE_ID_VALID = YES -OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux +OPEN_ISCSI_DEPENDENCIES = kmod openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi +ifeq ($(BR2_PACKAGE_OPEN_ISNS),y) +OPEN_ISCSI_DEPENDENCIES += open-isns +OPEN_ISCSI_CONF_OPTS += -Disns=enabled +else +OPEN_ISCSI_CONF_OPTS += -Disns=disabled +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) OPEN_ISCSI_DEPENDENCIES += systemd OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false From e0da7d18c852a40adc6a966a914064392cb832ae Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 19:48:23 +0200 Subject: [PATCH 2594/3013] package/intel-microcode: security bump version to 20240531 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240312 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240514 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240531 20240312 fixes CVE-2023-39368: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00972.html CVE-2023-38575: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00982.html CVE-2023-28746: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00898.html CVE-2023-22655: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00960.html CVE-2023-43490: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01045.html 20240514 fixes CVE-2023-45733: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01051.html CVE-2023-46103: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01052.html CVE-2023-45745: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01036.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 6eef18e6b06ab9daf79e09da5f12cd9070cabbc4) Signed-off-by: Peter Korsgaard --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 742332d552f..742be5ae792 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cee26f311f7e2c039dd48cd30f995183bde9b98fb4c3039800e2ddaf5c090e55 intel-microcode-20231114.tar.gz +sha256 c29eb35fdbd39e3ed8587e6f0b1275cc03265f230c2fcaf88e2a1556451e773f intel-microcode-20240531.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index a159baa93d3..6862565bc8d 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20231114 +INTEL_MICROCODE_VERSION = 20240531 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From 5ff452936ed477c14f17d4af3ac7e99ffe0e9649 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:51:59 +0200 Subject: [PATCH 2595/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e08708451be9e964b5a8e3a5a6f0959ad5e7c6a0) [Peter: drop 6.9.x / 6.10.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index b77c49d2976..2d22a966500 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz -sha256 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef linux-6.6.41.tar.xz -sha256 b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 linux-6.1.100.tar.xz +sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz +sha256 1ba5f93b411ead7587fe48b2eec6c656f6796d31f5e406d236913c77512497ec linux-6.1.102.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302 linux-5.15.163.tar.xz -sha256 7b2d06803b5abb03c85f171100ca9d7acd6ba245036fe9a16eb998f088b150cb linux-5.10.222.tar.xz -sha256 a976c67eb8270cac310faf1acc61305d1f9967955aca38fbdfcb0bc77d033d42 linux-5.4.280.tar.xz +sha256 ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186 linux-5.15.164.tar.xz +sha256 ca09d86a6b79706c33382d3f8606f476eb07918417a87fb1815f6a4aa81f2ba1 linux-5.10.223.tar.xz +sha256 44a0c3e76031f7513ce43e22e2a9dcbf7d6a6dee065dca9b8001843a075272b2 linux-5.4.281.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 0d5fa562a3c53f524f02fc11abe502c01096df73dd27d57736875e8590007493 linux-4.19.318.tar.xz +sha256 544ddc7339cf1b1d1ead1992e67d11a0834ad3bc77faa063e06b5d18c682eb30 linux-4.19.319.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1dd345e8b87..cf19b59d90a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -415,12 +415,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.318" if BR2_KERNEL_HEADERS_4_19 - default "5.4.280" if BR2_KERNEL_HEADERS_5_4 - default "5.10.222" if BR2_KERNEL_HEADERS_5_10 - default "5.15.163" if BR2_KERNEL_HEADERS_5_15 - default "6.1.100" if BR2_KERNEL_HEADERS_6_1 - default "6.6.41" if BR2_KERNEL_HEADERS_6_6 + default "4.19.319" if BR2_KERNEL_HEADERS_4_19 + default "5.4.281" if BR2_KERNEL_HEADERS_5_4 + default "5.10.223" if BR2_KERNEL_HEADERS_5_10 + default "5.15.164" if BR2_KERNEL_HEADERS_5_15 + default "6.1.102" if BR2_KERNEL_HEADERS_6_1 + default "6.6.43" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 30450215aef6b077ad08f2a0740aa247dbbd84d3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Sep 2024 21:47:44 +0200 Subject: [PATCH 2596/3013] Update for 2024.08-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 14 ++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 076d6162e11..fd4851be57e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +2024.08-rc3, released September 1st, 2024 + + Fixes all over the tree. + + Removed defconfigs: mx25pdk + + Updated/fixed packages: chicken, comix-cursors, dovecot, + dovecot-pigeonhole, elf2flt, enscript, fbset, freeipmi, gcc, + grub2, libcuefile, libcurl, libglob, libuecc, norm, php, + postgresql, proftpd, python-sqlparse, python3, sofia-sip, + szip, unbound, x264, xserver_xorg-server, zabbix + + Removed packages: frotz + 2024.08-rc2, released August 22nd, 2024 Fixes all over the tree. diff --git a/Makefile b/Makefile index 55aeafde233..50cfbcbcf45 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.08-rc2 +export BR2_VERSION := 2024.08-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1724343000 +BR2_VERSION_EPOCH = 1725220000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 207ba08c8b4..dd3327577d9 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

          buildroot-2024.05.2.tar.xz

          -

          Latest release candidate: 2024.08-rc2

          +

          Latest release candidate: 2024.08-rc3

          - +
          - +
          -

          buildroot-2024.08-rc2.tar.gz

          -

          PGP signature

          +

          buildroot-2024.08-rc3.tar.gz

          +

          PGP signature

          - +
          - +
          -

          buildroot-2024.08-rc2.tar.xz

          -

          PGP signature

          +

          buildroot-2024.08-rc3.tar.xz

          +

          PGP signature

          diff --git a/docs/website/news.html b/docs/website/news.html index 285dfbfdde2..f43881614af 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

          News

            +
          • +
            +
            +
            +

            2024.08-rc3 released

            +

            1 September 2024

            +
            +
            +

            2024.08-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

            + +

            Head to the downloads page to pick up the + 2024.08-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

            +
            +
            +
            • +
          • From 37d815cbf48762f2a5d66b3f352c5b4612c9867e Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:08 +0000 Subject: [PATCH 2597/3013] package/pkg-kconfig: fix *-savedefconfig under ppd The 'linux-savedefconfig' target fails with the below error when PER_PACKAGE_DIRECTORIES is enabled and the 'host-finalize' target hasn't run yet. scripts/Kconfig.include:39: C compiler '.../buildroot/output/host/bin/arm-buildroot-linux-gnueabihf-gcc' not found The 'PPD' variable isn't defined for this target, so 'BR_PATH' falls back to the final host directory. Reported-by: Nathaniel Roach Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit de11afaa3458eae781582e61e0de6a91e9e48d0e) Signed-off-by: Peter Korsgaard --- package/pkg-kconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index f4f35bf96ab..6bf3d6b4be9 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -270,6 +270,7 @@ $(1)-check-configuration-done: ifeq ($$($(2)_KCONFIG_SUPPORTS_DEFCONFIG),YES) .PHONY: $(1)-savedefconfig +$(1)-savedefconfig: PKG=$(2) $(1)-savedefconfig: $(1)-check-configuration-done $$(call kconfig-package-savedefconfig,$(2)) endif From 36617cbcfe4b693333052fe0d0c123f5cb949102 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:09 +0000 Subject: [PATCH 2598/3013] package/pkg-kconfig: fix *-diff-config under ppd The 'linux-diff-config' target fails with the below error when PER_PACKAGE_DIRECTORIES is enabled and the 'host-finalize' target hasn't run yet. scripts/Kconfig.include:39: C compiler '.../buildroot/output/host/bin/arm-buildroot-linux-gnueabihf-gcc' not found The 'PPD' variable isn't defined for this target, so 'BR_PATH' falls back to the final host directory. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 641084bfb37856f79db86d9dbd6638ec70fc9681) Signed-off-by: Peter Korsgaard --- package/pkg-kconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 6bf3d6b4be9..684342bcef6 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -301,6 +301,7 @@ endif # defconfig + fragments (if any) and the current configuration. # Note: it preserves the timestamp of the current configuration when moving it # around. +$(1)-diff-config: PKG=$(2) $(1)-diff-config: $(1)-check-configuration-done $$(Q)cp -a $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_DIR)/.config.dc.bak $$(call kconfig-package-merge-config,$(2),$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG),\ From 330edde813f963d596724b47ace37acce9140b36 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:10 +0000 Subject: [PATCH 2599/3013] package/pkg-kconfig: cleanup savedefconfig MAKE The kconfig infra defines a 'PKG_KCONFIG_MAKE' var that wraps all the standard kconfig options. Switch to this so we aren't duplicating the logic. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 009d31b438b2c402fa959a9041f5cc9b050a1f8f) Signed-off-by: Peter Korsgaard --- package/pkg-kconfig.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 684342bcef6..8000de16c49 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -33,8 +33,7 @@ PKG_KCONFIG_COMMON_OPTS = \ # Macro to save the defconfig file # $(1): the name of the package in upper-case letters define kconfig-package-savedefconfig - $($(1)_MAKE_ENV) $($(1)_MAKE) -C $($(1)_DIR) \ - $(PKG_KCONFIG_COMMON_OPTS) $($(1)_KCONFIG_OPTS) savedefconfig + $($(1)_KCONFIG_MAKE) savedefconfig endef # The correct way to regenerate a .config file is to use 'make olddefconfig'. From 50ee7ce8143028141a657c2e8e621f89c691fbb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 19 Jul 2024 23:03:24 +0200 Subject: [PATCH 2600/3013] package/gcc: fix build with BR2_TIME_BITS_64=y On the architectures that supports libsanitizer (part of gcc), the build is currently failing with BR2_TIME_BITS_64=y. This is because some code in libsanitizer unsets _FILE_OFFSET_BITS, but building code with _FILE_OFFSET_BITS unset, but _TIME_BITS set isn't legal. To fix this, this commit backports two changes: - One change to also unset _TIME_BITS in sanitizer_platform_limits_posix.cpp. This change is upstream in LLVM, and already part of GCC 14.x, so we only bringing it to GCC 12.x and GCC 13.x. - A second change doing the same modification, but in sanitizer_procmaps_solaris.cpp, which as crazy as it might sound, also gets compiled on Linux platforms (but to basically an empty file). This change has been submitted upstream to both LLVM and gcc. Notes: - the special PowerPC SPE version of GCC cannot be affected, as only uClibc-ng is used for this architecture, and uClibc-ng doesn't use _TIME_BITS=64 (but now default to 64-bit time_t on 32-bit architectures, like musl does). - the special ARC version doesn't need patching because libsanitizer doesn't support the ARC architecture, so it doesn't get built Fixes: http://autobuild.buildroot.net/results/ff2dbfdabf0bb6a0d82ea8a80122ab97fd75bd3f/ https://gitlab.com/buildroot.org/buildroot/-/issues/16 Signed-off-by: Thomas Petazzoni (cherry picked from commit 81a4b6e7b8b5bb368bce940798bf8432fb420851) Signed-off-by: Peter Korsgaard --- ...-along-with-_FILE_OFFSET_BITS-on-Lin.patch | 44 +++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ ...-along-with-_FILE_OFFSET_BITS-on-Lin.patch | 44 +++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ 5 files changed, 247 insertions(+) create mode 100644 package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch create mode 100644 package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch create mode 100644 package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch create mode 100644 package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch create mode 100644 package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch diff --git a/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch new file mode 100644 index 00000000000..386c9287f69 --- /dev/null +++ b/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch @@ -0,0 +1,44 @@ +From e45f12ecf703eed45515d451cf014fba32e7410b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Feb 2023 11:48:35 -0800 +Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux + +On 32-bit glibc>=2.34 systems using 64bit time_t build fails because +_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 + +Fixes + +``` +/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed + only with _FILE_OFFSET_BITS=64" +| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" +| ^ +| 1 error generated. +``` + +Reviewed By: thesamesam, MaskRay + +Differential Revision: https://reviews.llvm.org/D140812 + +Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index bfdccd5df07..4cedcbfb4bf 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -18,6 +18,7 @@ + // depends on _FILE_OFFSET_BITS setting. + // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #endif + + // Must go after undef _FILE_OFFSET_BITS. +-- +2.45.2 + diff --git a/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 00000000000..80c3378d7b5 --- /dev/null +++ b/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 940a0c955bca98aba937c4bfe3fe4a4c17dddb85 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index e16c4e938cb..ca88cf2c2df 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + #include "sanitizer_common.h" +-- +2.45.2 + diff --git a/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch new file mode 100644 index 00000000000..a3be0914b9c --- /dev/null +++ b/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch @@ -0,0 +1,44 @@ +From 88b73eedcfa0fc58aee2555377e6f7d4de153282 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Feb 2023 11:48:35 -0800 +Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux + +On 32-bit glibc>=2.34 systems using 64bit time_t build fails because +_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 + +Fixes + +``` +/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed + only with _FILE_OFFSET_BITS=64" +| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" +| ^ +| 1 error generated. +``` + +Reviewed By: thesamesam, MaskRay + +Differential Revision: https://reviews.llvm.org/D140812 + +Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index bcbd143d19d..1b23898b374 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -18,6 +18,7 @@ + // depends on _FILE_OFFSET_BITS setting. + // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #endif + + // Must go after undef _FILE_OFFSET_BITS. +-- +2.45.2 + diff --git a/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 00000000000..73b09ac3890 --- /dev/null +++ b/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 7ad54084a2c07cca6d03dfe274893e903852d359 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index eeb49e2afe3..1b23fd4d512 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +-- +2.45.2 + diff --git a/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 00000000000..b9dfcd0d013 --- /dev/null +++ b/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 71de45698f60f8feabc0e91336f1e2fb387902df Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index eeb49e2afe3..1b23fd4d512 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +-- +2.45.2 + From e9de732aacd7386d62d4a673002b975e17e1a5f2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 22:44:53 +0200 Subject: [PATCH 2601/3013] package/freerdp: security bump version to 2.11.7 See release announce: https://www.freerdp.com/2024/04/22/2_11_7-release Note: this release is flagged as a "security" bump from the upstream release note. While there is no allocated CVEs, commits in this release are backported fixes from oss-fuzz. See: https://github.com/FreeRDP/FreeRDP/compare/2.11.6...2.11.7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit b382ede065e1260582d6d27ddb34b0450fce4e5e) Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 9ac9b25066a..1007215cd66 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.6.tar.gz.sha256 -sha256 ad5a0c7761b18af914041ed50902d6c9fd553e65eeba8a1bea41c4149980b84c freerdp-2.11.6.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.7.tar.gz.sha256 +sha256 5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3 freerdp-2.11.7.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 8e359cbb4f7..e8c8f320a9b 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.6 +FREERDP_VERSION = 2.11.7 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From d5fb36257b0e1b507c627b5c4f0e026d70584e44 Mon Sep 17 00:00:00 2001 From: Thomas Bonnefille Date: Thu, 1 Aug 2024 16:59:58 +0200 Subject: [PATCH 2602/3013] package/ffmpeg: add optional dependency on jack Add automatic JACK audio sound server support to ffmpeg if either JACK or JACK2 are enabled. Signed-off-by: Thomas Bonnefille Signed-off-by: Thomas Petazzoni (cherry picked from commit 15e411d800999a70cc04a8d506ead40ea3dba210) Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 87c482656c6..5b2d33883d3 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -82,6 +82,16 @@ else FFMPEG_CONF_OPTS += --disable-ffplay endif +ifeq ($(BR2_PACKAGE_JACK1),y) +FFMPEG_CONF_OPTS += --enable-libjack +FFMPEG_DEPENDENCIES += jack1 +else ifeq ($(BR2_PACKAGE_JACK2),y) +FFMPEG_CONF_OPTS += --enable-libjack +FFMPEG_DEPENDENCIES += jack2 +else +FFMPEG_CONF_OPTS += --disable-libjack +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) FFMPEG_DEPENDENCIES += libv4l FFMPEG_CONF_OPTS += --enable-libv4l2 From f10881b5b08784c4b31f1f2a49af99173e5b6a00 Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Thu, 1 Aug 2024 21:12:34 +0200 Subject: [PATCH 2603/3013] board/udoo/neo/readme.txt: provide more details This patch adds more information to the Udoo Neo's readme, e.g., UART pins and baudrate. Signed-off-by: Kilian Zinnecker Signed-off-by: Thomas Petazzoni (cherry picked from commit 008e37b3aeb304919a3eb4d1c47b2b4d49ec49db) Signed-off-by: Peter Korsgaard --- board/udoo/neo/readme.txt | 54 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/board/udoo/neo/readme.txt b/board/udoo/neo/readme.txt index 94ebcc12f2f..e9f9fbac1c1 100644 --- a/board/udoo/neo/readme.txt +++ b/board/udoo/neo/readme.txt @@ -1,12 +1,36 @@ MX6X Udoo Neo board - +=================== http://www.udoo.org/udoo-neo/ +Build: +====== + To build a minimal support for these boards: $ make mx6sx_udoo_neo_defconfig $ make +Files created in the output directory: +====================================== + +output/images +. +├── boot.scr +├── imx6sx-udoo-neo-basic.dtb +├── imx6sx-udoo-neo-extended.dtb +├── imx6sx-udoo-neo-full.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── SPL +├── u-boot.bin +├── u-boot.img +└── zImage + +Creating bootable SD card: +========================== + Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on an SD card: @@ -14,3 +38,31 @@ dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. + +Booting: +======== + +Serial console: +--------------- +The Udoo Neo features the serial console "UART1" on the pin header "P7". The +Uart pins are as follows (see board labels): + +pin 46: rx +pin 47: tx + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +Documentation: +============== + +documentation link: +------------------- +https://www.udoo.org/docs-neo/Introduction/Introduction.html + +forum link: +----------- +https://www.udoo.org/forum/forums/udoo-neo.39/ From 1bab2c9374775e57746a89b10534ddc2fe86d605 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 2 Sep 2024 11:44:04 +0200 Subject: [PATCH 2604/3013] configs/pandaboard_defconfig: drop defconfig The defconfig has failed to build since May with the change to GCC 13.x, E.G.: https://gitlab.com/buildroot.org/buildroot/-/jobs/6865597768 I no longer have access to a pandaboard. Pandaboard/omap4 support has recently been dropped from u-boot: https://lists.denx.de/pipermail/u-boot/2024-July/558846.html And (part of) the kernel support is also getting removed: https://patchwork.kernel.org/project/linux-media/patch/815a789d-85a5-44a1-8b9c-429ac0101e3f@xs4all.nl/ So drop the defconfig here as well. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - DEVELOPERS | 2 -- board/pandaboard/genimage.cfg | 27 -------------------- board/pandaboard/readme.txt | 46 --------------------------------- configs/pandaboard_defconfig | 48 ----------------------------------- 5 files changed, 124 deletions(-) delete mode 100644 board/pandaboard/genimage.cfg delete mode 100644 board/pandaboard/readme.txt delete mode 100644 configs/pandaboard_defconfig diff --git a/.checkpackageignore b/.checkpackageignore index 4cfc202153c..96358d0d6cf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -221,7 +221,6 @@ configs/orangepi_zero3_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero_plus2_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero_plus_defconfig lib_defconfig.ForceCheckHash -configs/pandaboard_defconfig lib_defconfig.ForceCheckHash configs/pc_x86_64_bios_defconfig lib_defconfig.ForceCheckHash configs/pc_x86_64_efi_defconfig lib_defconfig.ForceCheckHash configs/pcengines_apu2_defconfig lib_defconfig.ForceCheckHash diff --git a/DEVELOPERS b/DEVELOPERS index 0b590f0ec20..59f3b032024 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2553,7 +2553,6 @@ F: board/librecomputer/lafrite/ F: board/nexbox/a95x/ F: board/openblocks/a6/ F: board/orangepi/ -F: board/pandaboard/ F: board/roseapplepi/ F: board/visionfive/ F: boot/shim/ @@ -2566,7 +2565,6 @@ F: configs/nezha_defconfig F: configs/openblocks_a6_defconfig F: configs/orangepi_pc_defconfig F: configs/orangepi_r1_defconfig -F: configs/pandaboard_defconfig F: configs/roseapplepi_defconfig F: configs/sheevaplug_defconfig F: configs/visionfive_defconfig diff --git a/board/pandaboard/genimage.cfg b/board/pandaboard/genimage.cfg deleted file mode 100644 index dfe388227ec..00000000000 --- a/board/pandaboard/genimage.cfg +++ /dev/null @@ -1,27 +0,0 @@ -image boot.vfat { - vfat { - files = { - "MLO", - "u-boot.img" - } - } - - size = 8M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/board/pandaboard/readme.txt b/board/pandaboard/readme.txt deleted file mode 100644 index 80a20c27436..00000000000 --- a/board/pandaboard/readme.txt +++ /dev/null @@ -1,46 +0,0 @@ -Pandaboard -========== - -This file documents the Buildroot support for the Pandaboard, a -low-power, low-cost single-board computer development platform based -on the Texas Instruments OMAP4 system on a chip (SoC). - -Configuring and building Buildroot ----------------------------------- - -Start from the defconfig: - - $ make pandaboard_defconfig - -You can edit build options the usual way: - - $ make menuconfig - -When you are happy with the setup, run: - - $ make - -The result of the build with the default settings should be these files: - - output/images - +-- MLO - +-- omap4-panda-a4.dtb - +-- omap4-panda.dtb - +-- omap4-panda-es.dtb - +-- rootfs.ext4 - +-- sdcard.img - +-- u-boot.img - +-- zImage - -How to write the SD card ------------------------- - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - -Where /dev/sdX is the device node of your SD card (may be /dev/mmcblkX -instead depending on setup). diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig deleted file mode 100644 index 376ecfe5044..00000000000 --- a/configs/pandaboard_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y - -# System -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" -BR2_SYSTEM_DHCP="eth0" - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pandaboard/genimage.cfg" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap4-panda-es omap4-panda omap4-panda-a4" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap4_panda" -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="MLO" - -# Required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From 88f120d031456fd439bca2ac8a96f9b7477b35cc Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Thu, 29 Aug 2024 15:12:29 +0200 Subject: [PATCH 2605/3013] package/midori: drop package The original WebKitGTK-based Midori is no longer maintained and doesn't build since WebKitGTK moved to libsoup3 as of commit 38a098df133aaa2ebf09742054b02db5a44f58e5. Last WebKitGTK based release: https://github.com/midori-browser/core/tree/v9.0. New browser, based on Gecko/Firefox: https://github.com/goastian/midori-desktop. The intention is also to start migrating WebKitGTK to GTK4, as this is now the default version. See: https://webkitgtk.org/2024/03/27/webkigit-2.44.html. Signed-off-by: Thomas Devoogdt Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - Config.in.legacy | 8 +++ package/Config.in | 1 - .../0001-disable-vala-fatal-warnings.patch | 30 ----------- ...ion-to-specify-path-to-g-ir-compiler.patch | 37 ------------- package/midori/Config.in | 52 ------------------- package/midori/midori.hash | 3 -- package/midori/midori.mk | 35 ------------- 8 files changed, 8 insertions(+), 160 deletions(-) delete mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch delete mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch delete mode 100644 package/midori/Config.in delete mode 100644 package/midori/midori.hash delete mode 100644 package/midori/midori.mk diff --git a/.checkpackageignore b/.checkpackageignore index 96358d0d6cf..a824a50c491 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -892,8 +892,6 @@ package/metacity/0001-add-libm-reference.patch lib_patch.Upstream package/metacity/0002-gconf.patch lib_patch.Upstream package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream -package/midori/0001-disable-vala-fatal-warnings.patch lib_patch.Upstream -package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch lib_patch.Upstream package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch lib_patch.Upstream package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index d8480106baf..d1f892dded3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_MIDORI + bool "midori has been removed" + select BR2_LEGACY + help + The original WebKitGTK-based Midori is no longer maintained + and doesn't build since WebKitGTK moved to libsoup3 as of + commit 38a098df133aaa2ebf09742054b02db5a44f58e5. + config BR2_PACKAGE_FROTZ bool "frotz has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 211080345ad..f33c4780f8e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -331,7 +331,6 @@ comment "Graphic applications" source "package/kmscube/Config.in" source "package/libva-utils/Config.in" source "package/mesa3d-demos/Config.in" - source "package/midori/Config.in" source "package/netsurf/Config.in" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" diff --git a/package/midori/0001-disable-vala-fatal-warnings.patch b/package/midori/0001-disable-vala-fatal-warnings.patch deleted file mode 100644 index c3f245f1418..00000000000 --- a/package/midori/0001-disable-vala-fatal-warnings.patch +++ /dev/null @@ -1,30 +0,0 @@ -From be91b1260d3215119e4ab5b19012ab80d6ff788d Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 11 Oct 2021 16:58:34 -0700 -Subject: [PATCH] disable vala fatal warnings - -When building midori in a buildroot directory cloned from git, the git -descript --tags command return tags from buildroot, which in turn sets -the --fatal-warnings flag. Disable --fatal-warnings unconditionally. - -Signed-off-by: Adam Duskett ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e72f08..39941e2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ execute_process(COMMAND "git" "describe" "--tags" - if (REVISION) - set(CORE_VERSION "${REVISION}") - # All warnings are errors in development builds -- set(VALAFLAGS ${VALAFLAGS} --fatal-warnings) -+ set(VALAFLAGS ${VALAFLAGS} --disable-assert) - else () - # No runtime type checks - set(VALAFLAGS ${VALAFLAGS} --disable-assert) --- -2.30.2 - diff --git a/package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch b/package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch deleted file mode 100644 index 4bbcbaaf125..00000000000 --- a/package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 118ac24b2c488f490ee8814336291a58eae45395 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Tue, 12 Oct 2021 13:21:19 -0700 -Subject: [PATCH] add option to specify path to g-ir-compiler - -By default, find_program (GIR_COMPILER_BIN g-ir-compiler) returns the host path -to g-ir-compiler, which is undesirable in a cross-compile environment. - -Add an option to manually specify a path to the g-ir-compiler. - -Signed-off-by: Adam Duskett ---- - core/CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index c4982de..6584229 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -66,7 +66,13 @@ set_target_properties("${LIBCORE}" PROPERTIES - VERSION ${LIBCORE_VERSION} - ) - --find_program (GIR_COMPILER_BIN g-ir-compiler) -+option(GIR_COMPILER_PATH "Specify a path to g-ir-compiler" OFF) -+if(GIR_COMPILER_PATH) -+ set(GIR_COMPILER_BIN "${GIR_COMPILER_PATH}") -+else() -+ find_program (GIR_COMPILER_BIN g-ir-compiler) -+endif(GIR_COMPILER_PATH) -+ - add_custom_target(${LIBCORE_GIR}.typelib ALL - COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir - --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib --- -2.30.2 - diff --git a/package/midori/Config.in b/package/midori/Config.in deleted file mode 100644 index 6029c0a9dfa..00000000000 --- a/package/midori/Config.in +++ /dev/null @@ -1,52 +0,0 @@ -config BR2_PACKAGE_MIDORI_ARCH_SUPPORTS - bool - default y - depends on BR2_USE_MMU - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gcr -> libgcrypt -> libgpg-error - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - depends on !BR2_BINFMT_FLAT # webkitgtk -> icu - -comment "midori needs a glibc toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 8" - depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - !BR2_HOST_GCC_AT_LEAST_8 || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_USE_WCHAR - -comment "midori needs libgtk3 w/ X11 or wayland backend" - depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS - depends on !BR2_PACKAGE_LIBGTK3_X11 && \ - !BR2_PACKAGE_LIBGTK3_WAYLAND - -config BR2_PACKAGE_MIDORI - bool "midori" - depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS # webkitgtk - depends on BR2_INSTALL_LIBSTDCPP # webkitgtk - depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk - depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 - depends on BR2_USE_WCHAR # granite, gcr, libsoup, libpeas, gobject-introspection - depends on BR2_PACKAGE_LIBGTK3 - depends on BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND - select BR2_PACKAGE_GCR - select BR2_PACKAGE_GRANITE - select BR2_PACKAGE_JSON_GLIB - select BR2_PACKAGE_LIBARCHIVE - select BR2_PACKAGE_LIBPEAS - select BR2_PACKAGE_LIBPEAS_WIDGETS - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PYTHON3 # gobject-introspection - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_WEBKITGTK - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Midori is a lightweight web browser based on WebKit - - https://github.com/midori-browser/core diff --git a/package/midori/midori.hash b/package/midori/midori.hash deleted file mode 100644 index f14ec6d9292..00000000000 --- a/package/midori/midori.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 5e0a531455c47b0ff7589940aa2b0d9c16f59c99ba933e5fcdcab68114262016 midori-v9.0.tar.gz -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/midori/midori.mk b/package/midori/midori.mk deleted file mode 100644 index aeafa9bfdc2..00000000000 --- a/package/midori/midori.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# midori -# -################################################################################ - -MIDORI_VERSION = 9.0 -MIDORI_SOURCE = midori-v$(MIDORI_VERSION).tar.gz -MIDORI_SITE = https://github.com/midori-browser/core/releases/download/v$(MIDORI_VERSION) -MIDORI_LICENSE = LGPL-2.1+ -MIDORI_LICENSE_FILES = COPYING -MIDORI_CPE_ID_VENDOR = midori-browser -MIDORI_DEPENDENCIES = \ - host-intltool \ - host-librsvg \ - host-pkgconf \ - host-vala \ - host-python3 \ - gcr \ - gobject-introspection \ - granite \ - json-glib \ - libarchive \ - libgtk3 \ - libpeas \ - libsoup \ - libxml2 \ - sqlite \ - webkitgtk \ - $(TARGET_NLS_DEPENDENCIES) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -MIDORI_CONF_OPTS += -DGIR_COMPILER_PATH=$(STAGING_DIR)/usr/bin/g-ir-compiler - -$(eval $(cmake-package)) From e40c6f2156cd59082fd02c37b24c3a2750eee809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Sun, 1 Sep 2024 18:40:07 +0200 Subject: [PATCH 2606/3013] package/aer-inject: switch upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to a commit in Linux[1], the upstream of aer-inject changed to https://github.com/intel/aer-inject. [1]: https://git.kernel.org/linus/a29e5290e3566ae4db4e6fe5f31caf23118c82b6 Signed-off-by: J. Neuschäfer Signed-off-by: Yann E. MORIN --- package/aer-inject/aer-inject.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/aer-inject/aer-inject.mk b/package/aer-inject/aer-inject.mk index 6bc9cb44da7..7516ef63aca 100644 --- a/package/aer-inject/aer-inject.mk +++ b/package/aer-inject/aer-inject.mk @@ -5,7 +5,7 @@ ################################################################################ AER_INJECT_VERSION = 9bd5e2c7886fca72f139cd8402488a2235957d41 -AER_INJECT_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git +AER_INJECT_SITE = https://github.com/intel/aer-inject.git AER_INJECT_SITE_METHOD = git AER_INJECT_LICENSE = GPL-2.0 AER_INJECT_LICENSE_FILES = README From 9194f49cf4f8e07df9ddc48f0c5b4a13df855805 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 2 Aug 2024 07:11:07 +0200 Subject: [PATCH 2607/3013] package/gcc: update to 14.2.0 List of bugs which were resolved in 14.2.0: https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=14.2 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit f3148385f89bf052a420933c05dcd4e40f114c77) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 +- .../0001-disable-split-stack-for-non-thread-builds.patch | 0 ...libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename package/gcc/{14.1.0 => 14.2.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) rename package/gcc/{14.1.0 => 14.2.0}/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 47da52c4eb6..05e97ebccc0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -638,7 +638,7 @@ package/gamin/0002-no-const-return.patch lib_patch.Sob lib_patch.Upstream package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch lib_patch.Upstream package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream diff --git a/package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/14.2.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch similarity index 100% rename from package/gcc/14.1.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch rename to package/gcc/14.2.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 5d3b803c78f..911bc2f4dea 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -75,7 +75,7 @@ config BR2_GCC_VERSION default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "12.4.0" if BR2_GCC_VERSION_12_X default "13.3.0" if BR2_GCC_VERSION_13_X - default "14.1.0" if BR2_GCC_VERSION_14_X + default "14.2.0" if BR2_GCC_VERSION_14_X default "arc-2023.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 4534655790f..b7c53f8fbed 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -6,8 +6,8 @@ sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3c sha512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 gcc-12.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-13.3.0/sha512.sum sha512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 gcc-13.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.1.0/sha512.sum -sha512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea gcc-14.1.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.2.0/sha512.sum +sha512 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396 gcc-14.2.0.tar.xz # Locally calculated (fetched from Github) sha512 4dca20f517a42bb027fec605965b09fb917a535eebf3fe3e811d93476b02b1962df5ad4665f117bd44c2ec8e8015d51a44c00591761fe5f259c201ac5c7d920f gcc-arc-2023.09-release.tar.gz From 611adf8283db28f2dfb572161b1b760314ca9730 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 08:33:55 +0200 Subject: [PATCH 2608/3013] package/odb: properly format Upstream: tags in patches All patches of the odb package already contained relevant Upstream information, just not formatted according to how we expect it. Let's fix that, and drop the .checkpackageignore entries that are no longer needed. Signed-off-by: Thomas Petazzoni (cherry picked from commit 84ae3b04fe6cd70a4abccc5d9e19218583410c16) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 13 ------------- ...de-in-gcc.hxx-appears-to-be-no-longer-nece.patch | 2 +- package/odb/0002-Remove-gratuitous-classes.patch | 2 +- ...ial-work-to-make-ODB-compatible-with-GCC-6.patch | 2 +- ...04-Make-compilable-with-GCC-6-in-C-14-mode.patch | 2 +- ...ix-bug-in-GCC-6-input_location-translation.patch | 2 +- package/odb/0006-Adapt-to-changes-in-GCC-8.patch | 2 +- ...007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch | 2 +- ...adaptation-to-be-compatible-with-previous-.patch | 2 +- ...le-namespace-aliases-when-parsing-GCC-tree.patch | 2 +- .../odb/0010-Add-initial-support-for-GCC-9.patch | 2 +- package/odb/0011-Adjust-to-changes-in-GCC-10.patch | 2 +- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 2 +- ...me-lookup-ambiguity-causing-error-with-GCC.patch | 2 +- 14 files changed, 13 insertions(+), 26 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 05e97ebccc0..640da2eb28b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1102,19 +1102,6 @@ package/numactl/0001-link-with-latomic-if-needed-again.patch lib_patch.Upstream package/nuttcp/0001-susv3-legacy.patch lib_patch.Upstream package/nvidia-driver/0001-use-LDFLAGS.patch lib_patch.Upstream package/octave/0001-Fix-BLAS-library-integer-size-detection.patch lib_patch.Upstream -package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch lib_patch.Upstream -package/odb/0002-Remove-gratuitous-classes.patch lib_patch.Upstream -package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch lib_patch.Upstream -package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch lib_patch.Upstream -package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch lib_patch.Upstream -package/odb/0006-Adapt-to-changes-in-GCC-8.patch lib_patch.Upstream -package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch lib_patch.Upstream -package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch lib_patch.Upstream -package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch lib_patch.Upstream -package/odb/0010-Add-initial-support-for-GCC-9.patch lib_patch.Upstream -package/odb/0011-Adjust-to-changes-in-GCC-10.patch lib_patch.Upstream -package/odb/0012-Adjust-to-changes-in-GCC-11.patch lib_patch.Upstream -package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch lib_patch.Upstream package/ofono/0001-uclibc-backtrace.patch lib_patch.Upstream package/ofono/S46ofono lib_sysv.Variables package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch lib_patch.Upstream diff --git a/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch b/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch index 0216038f2cd..a9366d6fb8b 100644 --- a/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch +++ b/package/odb/0001-tm.h-include-in-gcc.hxx-appears-to-be-no-longer-nece.patch @@ -6,7 +6,7 @@ Subject: [PATCH] include in gcc.hxx appears to be no longer necessary On MIPS this file pulls in enum processor which conflicts with our class processor. -[Upstream: f0bbc17aeed1b636782a4b92e8191d90f310d0a2] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=f0bbc17aeed1b636782a4b92e8191d90f310d0a2 Signed-off-by: Kamel Bouhara --- odb/gcc.hxx | 2 -- diff --git a/package/odb/0002-Remove-gratuitous-classes.patch b/package/odb/0002-Remove-gratuitous-classes.patch index f2d9303e095..7fd70e8a21e 100644 --- a/package/odb/0002-Remove-gratuitous-classes.patch +++ b/package/odb/0002-Remove-gratuitous-classes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove gratuitous classes In the process also get rid of global class processor which conflicts with enum processor on MIPS. -[Upstream: bbc39ffe31c67506b4c03fc56fa3adcb925b6325] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=bbc39ffe31c67506b4c03fc56fa3adcb925b6325 Signed-off-by: Kamel Bouhara --- odb/context.hxx | 3 ++- diff --git a/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch b/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch index e2b97cca6c9..4c936f44535 100644 --- a/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch +++ b/package/odb/0003-Initial-work-to-make-ODB-compatible-with-GCC-6.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 5 Feb 2016 16:01:42 +0200 Subject: [PATCH] Initial work to make ODB compatible with GCC 6 -[Upstream: 511dcf67322ad87fb32f97d1cf7725c129e83898] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=511dcf67322ad87fb32f97d1cf7725c129e83898 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 4 ++++ diff --git a/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch b/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch index 57288af0445..8911590ec10 100644 --- a/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch +++ b/package/odb/0004-Make-compilable-with-GCC-6-in-C-14-mode.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Mon, 8 Feb 2016 18:39:21 +0200 Subject: [PATCH] Make compilable with GCC 6 in C++14 mode -[Upstream: 61d13eb53ade9f30a64892a901401bda5e42c335] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=61d13eb53ade9f30a64892a901401bda5e42c335 Signed-off-by: Kamel Bouhara --- odb/gcc.hxx | 9 ++++++--- diff --git a/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch b/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch index 4e8c8f4fc33..af682502c90 100644 --- a/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch +++ b/package/odb/0005-Fix-bug-in-GCC-6-input_location-translation.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 23 Dec 2016 10:18:01 +0200 Subject: [PATCH] Fix bug in GCC 6 input_location translation -[Upstream: ec777147024fde72e4411cc6b1e1e49f4a1d1804] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=ec777147024fde72e4411cc6b1e1e49f4a1d1804 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 8 ++++++++ diff --git a/package/odb/0006-Adapt-to-changes-in-GCC-8.patch b/package/odb/0006-Adapt-to-changes-in-GCC-8.patch index c0ef4e8bfa3..2f907de6632 100644 --- a/package/odb/0006-Adapt-to-changes-in-GCC-8.patch +++ b/package/odb/0006-Adapt-to-changes-in-GCC-8.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Tue, 7 Nov 2017 14:58:43 +0200 Subject: [PATCH] Adapt to changes in GCC 8 -[Upstream: 356630ced28f3101e8e2d88e3c52f8d3008515c7] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=356630ced28f3101e8e2d88e3c52f8d3008515c7 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 16 ++++++++++++++-- diff --git a/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch b/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch index bf856eb487e..e3fbc21ae65 100644 --- a/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch +++ b/package/odb/0007-Switch-to-C-11-get-rid-of-auto_ptr-use.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Tue, 7 Nov 2017 10:37:53 +0200 Subject: [PATCH] Switch to C++11, get rid of auto_ptr use -[Upstream: 6e374de9ae2f2978f2fca3390aba4ea3f72bfade] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=6e374de9ae2f2978f2fca3390aba4ea3f72bfade Signed-off-by: Kamel Bouhara --- odb/Makefile.am | 5 +++++ diff --git a/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch b/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch index b89c35fb8fe..818a95db739 100644 --- a/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch +++ b/package/odb/0008-Fix-GCC-8-adaptation-to-be-compatible-with-previous-.patch @@ -4,7 +4,7 @@ Date: Tue, 7 Nov 2017 16:57:35 +0200 Subject: [PATCH] Fix GCC 8 adaptation to be compatible with previous versions -[Upstream: 006bbc5748a8197d7874550cc9186545f1c55ad8] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=006bbc5748a8197d7874550cc9186545f1c55ad8 Signed-off-by: Kamel Bouhara --- odb/validator.cxx | 6 ++++++ diff --git a/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch b/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch index bac7abea1f9..dbe2d533bd0 100644 --- a/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch +++ b/package/odb/0009-Handle-namespace-aliases-when-parsing-GCC-tree.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 5 Oct 2018 07:20:18 +0200 Subject: [PATCH] Handle namespace aliases when parsing GCC tree -[Upstream: 3a1788234bfaa96ee093b68e9ba02cf7d5bdffe6] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=3a1788234bfaa96ee093b68e9ba02cf7d5bdffe6 Signed-off-by: Kamel Bouhara --- odb/parser.cxx | 5 +++++ diff --git a/package/odb/0010-Add-initial-support-for-GCC-9.patch b/package/odb/0010-Add-initial-support-for-GCC-9.patch index dd36882bc56..c6c4c0a52d0 100644 --- a/package/odb/0010-Add-initial-support-for-GCC-9.patch +++ b/package/odb/0010-Add-initial-support-for-GCC-9.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Fri, 15 Mar 2019 17:37:28 +0200 Subject: [PATCH] Add initial support for GCC 9 -[Upstream: 841140bbf13ae2bfaa5978a181718cda0a8edae7] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=841140bbf13ae2bfaa5978a181718cda0a8edae7 Signed-off-by: Kamel Bouhara --- odb/cxx-lexer.cxx | 33 +++++++++++++++++++++++++++------ diff --git a/package/odb/0011-Adjust-to-changes-in-GCC-10.patch b/package/odb/0011-Adjust-to-changes-in-GCC-10.patch index 33d46d792eb..0da8b09bf19 100644 --- a/package/odb/0011-Adjust-to-changes-in-GCC-10.patch +++ b/package/odb/0011-Adjust-to-changes-in-GCC-10.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Wed, 17 Jun 2020 11:22:11 +0200 Subject: [PATCH] Adjust to changes in GCC 10 -[Upstream: 060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=060bb7eb4d008fbd4a9fa8ef7c5e33c9e483eb52 Signed-off-by: Thomas Petazzoni --- odb/gcc.hxx | 7 +++++-- diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch index 2959a71dea2..e5601b048e2 100644 --- a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Wed, 31 Mar 2021 10:45:21 +0200 Subject: [PATCH] Adjust to changes in GCC 11 -[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=61d80f051293a7449a09081f60f48b8377bfbbad Signed-off-by: Thomas Petazzoni --- odb/gcc.hxx | 20 ++++++++++++++++++++ diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch index 79c3d982fa4..fed8b6319b0 100644 --- a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -3,7 +3,7 @@ From: Boris Kolpackov Date: Wed, 7 Jul 2021 09:26:57 +0200 Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 -[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=47035c0f72efd99a2210cd45db6e42423fb74533 Signed-off-by: Thomas Petazzoni --- odb/relational/header.hxx | 2 ++ From 1b5461642e379f75aa12b64b2267730447f6c9b7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 08:35:41 +0200 Subject: [PATCH 2609/3013] package/odb: backport upstream patch to fix GCC 14.x build issue Fixes: http://autobuild.buildroot.net/results/f1b802e65273ae348569f37feb7e4bd2a04bb46e/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 905b9c8868fc4b021d7d7e0bce331f17d5e20d71) Signed-off-by: Peter Korsgaard --- ...-compiler-plugin-to-work-with-GCC-14.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch diff --git a/package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch b/package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch new file mode 100644 index 00000000000..bcab6c12ed1 --- /dev/null +++ b/package/odb/0014-Update-ODB-compiler-plugin-to-work-with-GCC-14.patch @@ -0,0 +1,66 @@ +From 4bd8af5dbd1f58bf631b4d5af90086f214553157 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Thu, 25 Apr 2024 07:15:47 +0200 +Subject: [PATCH] Update ODB compiler plugin to work with GCC 14 + +Upstream: https://git.codesynthesis.com/cgit/odb/odb/commit/?id=acb0c5194690d2751d2211bf91aec21da2fadc26 +Signed-off-by: Thomas Petazzoni +--- + odb/cxx-lexer.cxx | 4 +++- + odb/processor.cxx | 18 +++++++++++++++--- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index acd13be6..e283abd5 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -217,7 +217,9 @@ cxx_string_lexer () + linemap_init (&line_map_); + #endif + +-#if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 6 ++#if BUILDING_GCC_MAJOR >= 14 ++ line_map_.m_round_alloc_size = ggc_round_alloc_size; ++#elif BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 6 + line_map_.round_alloc_size = ggc_round_alloc_size; + #endif + +diff --git a/odb/processor.cxx b/odb/processor.cxx +index c787e0d1..8f273545 100644 +--- a/odb/processor.cxx ++++ b/odb/processor.cxx +@@ -438,8 +438,14 @@ namespace + // functions. Note that TREE_PUBLIC() returns something + // other than what we need. + // +- if (!DECL_NONSTATIC_MEMBER_FUNCTION_P (f) || +- TREE_PRIVATE (f) || TREE_PROTECTED (f)) ++ if ( ++#if BUILDING_GCC_MAJOR >= 14 ++ !DECL_OBJECT_MEMBER_FUNCTION_P (f) ++#else ++ !DECL_NONSTATIC_MEMBER_FUNCTION_P (f) ++#endif ++ || TREE_PRIVATE (f) ++ || TREE_PROTECTED (f)) + continue; + + found_type r (k == "get" +@@ -548,7 +554,13 @@ namespace + #endif + // We are only interested in non-static member functions. + // +- if (!DECL_NONSTATIC_MEMBER_FUNCTION_P (f)) ++ if ( ++#if BUILDING_GCC_MAJOR >= 14 ++ !DECL_OBJECT_MEMBER_FUNCTION_P (f) ++#else ++ !DECL_NONSTATIC_MEMBER_FUNCTION_P (f) ++#endif ++ ) + continue; + + if ((k == "get" +-- +2.45.2 + From 1baed8fbd3db296f5db66da6c8a3b60ca699baa2 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 2 Aug 2024 12:44:37 +0200 Subject: [PATCH 2610/3013] package/mdio-tools: enable CONFIG_NETDEVICES mdio-tools depends on CONFIG_MDIO_DEVICE in order for mdiobus driver to be built, but CONFIG_MDIO_DEVICE depends on CONFIG_NETDEVICES which we are not enabling so on platforms without it enabled in kernel config building mdio-tools will fail with: ERROR: modpost: "mdio_find_bus" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_c45_read" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_read" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_c45_write" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_write" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! So enable CONFIG_NETDEVICES as well to make sure CONFIG_MDIO_DEVICE can be enabled. Fixes: http://autobuild.buildroot.net/results/edf47df96cde6094c890c0b74034cced90335a39/ Signed-off-by: Robert Marko Signed-off-by: Thomas Petazzoni (cherry picked from commit b95fff0185803bac5c8cfb558d60234e59a1469b) Signed-off-by: Peter Korsgaard --- package/mdio-tools/mdio-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdio-tools/mdio-tools.mk b/package/mdio-tools/mdio-tools.mk index 16eba747344..b42ea41c79b 100644 --- a/package/mdio-tools/mdio-tools.mk +++ b/package/mdio-tools/mdio-tools.mk @@ -14,6 +14,7 @@ MDIO_TOOLS_MODULE_SUBDIRS = kernel define MDIO_TOOLS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) $(call KCONFIG_ENABLE_OPT,CONFIG_MDIO_DEVICE) endef From 83c7e07828e8fc9d932b46fe65dbb0cf8c0dd6d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 11:33:12 +0200 Subject: [PATCH 2611/3013] package/cwiid: fix build with gcc >= 14 Fix the following build failure with gcc >= 14: led.c: In function 'wmplugin_exec': led.c:86:42: error: assignment to 'struct cwiid_btn_message *' from incompatible pointer type 'struct cwiid_btn_mesg *' [-Wincompatible-pointer-types] 86 | btn_mesg = &mesg[i].btn_mesg; | ^ Fixes: - http://autobuild.buildroot.org/results/a3bde74ff2137d088f4261e62930859bfe460cb9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f0877f5f9db6d14e39bd9c82ad13937906a2ab62) Signed-off-by: Peter Korsgaard --- ...gins-led-led.c-fix-build-with-gcc-14.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch diff --git a/package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch b/package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch new file mode 100644 index 00000000000..ba8121802be --- /dev/null +++ b/package/cwiid/0003-wminput-plugins-led-led.c-fix-build-with-gcc-14.patch @@ -0,0 +1,37 @@ +From 10106fdb4cc833faa3c2fcb980d0a4eb121fe19d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 23 Jul 2024 10:31:32 +0200 +Subject: [PATCH] wminput/plugins/led/led.c: fix build with gcc >= 14 + +Fix the following build failure with gcc >= 14: + +led.c: In function 'wmplugin_exec': +led.c:86:42: error: assignment to 'struct cwiid_btn_message *' from incompatible pointer type 'struct cwiid_btn_mesg *' [-Wincompatible-pointer-types] + 86 | btn_mesg = &mesg[i].btn_mesg; + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/a3bde74ff2137d088f4261e62930859bfe460cb9 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/abstrakraft/cwiid/pull/47 +--- + wminput/plugins/led/led.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wminput/plugins/led/led.c b/wminput/plugins/led/led.c +index 93b96d9..591f365 100644 +--- a/wminput/plugins/led/led.c ++++ b/wminput/plugins/led/led.c +@@ -72,7 +72,7 @@ struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[]) + { + int i; + uint8_t button; +- struct cwiid_btn_message *btn_mesg; ++ struct cwiid_btn_mesg *btn_mesg; + + uint8_t led_state = (Led1 ? CWIID_LED1_ON : 0) + | (Led2 ? CWIID_LED2_ON : 0) +-- +2.43.0 + From 75b881e95cc1372038f54fcf920ff251cf72d1f7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 19:47:44 +0200 Subject: [PATCH 2612/3013] package/bcusdk: fixup upstream tag in patch 0001 The patch 0001 has been submitted upstream, but the formatting of the tag was not correct, let's fix this. Signed-off-by: Thomas Petazzoni (cherry picked from commit 668867bfed9a4decd7fd74d87d742368030b9399) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../0001-fd_set-requires-inclusion-of-sys-select.h.patch | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 640da2eb28b..bc52d45933a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -411,7 +411,6 @@ package/bc/0003-dc-fix-exit-code-of-q-command.patch lib_patch.Upstream package/bc/0004-no-gen-libmath.patch lib_patch.Upstream package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch lib_patch.Upstream package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch lib_patch.Upstream -package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch lib_patch.Upstream package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch lib_patch.Upstream package/bearssl/0001-Fix-missing-objdir-dependency.patch lib_patch.Upstream package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch lib_patch.Upstream diff --git a/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch b/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch index 723de5c1a29..f89658836f7 100644 --- a/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch +++ b/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch @@ -7,8 +7,7 @@ According to POSIX.1-2001, the definition fd_set and related macros is in , so it should be included in files using fd_set to make the code compatible with all standard C libraries. -Submitted upstream: https://sourceforge.net/p/bcusdk/patches/3/ - +Upstream: https://sourceforge.net/p/bcusdk/patches/3/ Signed-off-by: Thomas Petazzoni --- eibd/examples/common.h | 1 + From a0d1df2ac511404241f6f74d00bcde4b8fdeba8b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Aug 2024 19:44:56 +0200 Subject: [PATCH 2613/3013] package/bcusdk: fix build with host GCC 14.x With GCC 14.x as the host compiler, bcusdk fails to build as follows: configure: error: Specified CC_FOR_BUILD doesn't seem to work This is due to missing includes in the test programs used in the configure script to check the host compiler. We fix this with patch 0003. However, this patch requires to autoreconf the package, and autoreconf would need the definition of AM_PATH_XML2, which would require libxml2 even though we don't have libxml2 as a dependency of this package (we don't enable the features that requires libxml2). As it turns out that the AM_PATH_XML2 macro is in fact deprecated, we replaced it by its equivalent using PKG_CHECK_MODULES(), which is in fact exactly how AM_PATH_XML2 is implemented in upstream libxml2. Fixes: http://autobuild.buildroot.net/results/458880bd6c207e5bb7afce1a1186f204c30c0941/ Signed-off-by: Thomas Petazzoni (cherry picked from commit e4109c1d2d28f737409dce2e346661cbf20084c6) Signed-off-by: Peter Korsgaard --- ....m4-include-stdlib.h-in-test-program.patch | 50 +++++++++++++++++++ ...lace-obsolete-AM_PATH_XML2-by-PKG_CH.patch | 40 +++++++++++++++ package/bcusdk/bcusdk.mk | 6 ++- 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch create mode 100644 package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch diff --git a/package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch b/package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch new file mode 100644 index 00000000000..36b8f3d744c --- /dev/null +++ b/package/bcusdk/0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch @@ -0,0 +1,50 @@ +From 1c78aa3541f730e9624504168fb0e1f413e5cbb8 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 2 Aug 2024 19:28:36 +0200 +Subject: [PATCH] m4/ccforbuild.m4: include in test program + +The GMP_PROG_CC_FOR_BUILD_WORKS and GMP_PROG_EXEEXT_FOR_BUILD macros +do various checks to verify if the host compiler works, but their test +programs lack the inclusion of , needed for exit(). This +causes a build failure with gcc 14.x: + +conftest.c: In function 'main': +conftest.c:4:3: error: implicit declaration of function 'exit' [-Wimplicit-function-declaration] + 4 | exit(0); + +which then causes the configure script to think that the host compiler +does not work: + +configure: error: Specified CC_FOR_BUILD doesn't seem to work + +so let's include to fix this issue. + +Upstream: https://sourceforge.net/p/bcusdk/patches/4/ +Signed-off-by: Thomas Petazzoni +--- + m4/ccforbuild.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/m4/ccforbuild.m4 b/m4/ccforbuild.m4 +index a466cab..389deaa 100644 +--- a/m4/ccforbuild.m4 ++++ b/m4/ccforbuild.m4 +@@ -66,6 +66,7 @@ AC_DEFUN([GMP_PROG_CC_FOR_BUILD_WORKS], + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c < + int + main () + { +@@ -140,6 +141,7 @@ AC_DEFUN([GMP_PROG_EXEEXT_FOR_BUILD], + AC_CACHE_CHECK([for build system executable suffix], + gmp_cv_prog_exeext_for_build, + [cat >conftest.c < + int + main () + { +-- +2.45.2 + diff --git a/package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch b/package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch new file mode 100644 index 00000000000..899f8c0f3b0 --- /dev/null +++ b/package/bcusdk/0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch @@ -0,0 +1,40 @@ +From 8402c1ffccb2eeb47581d2d80b81e94433cdacb7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 2 Aug 2024 19:35:02 +0200 +Subject: [PATCH] configure.in: replace obsolete AM_PATH_XML2 by + PKG_CHECK_MODULES + +According to the libxml2 code: + + AM_PATH_XML2 is deprecated, use PKG_CHECK_MODULES instead + +See: + + https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/libxml.m4 + +Upstream: https://sourceforge.net/p/bcusdk/patches/5/ +Signed-off-by: Thomas Petazzoni +--- + configure.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 7f3a8bd..82176d9 100644 +--- a/configure.in ++++ b/configure.in +@@ -81,7 +81,11 @@ AM_CONDITIONAL(HAVE_ONLYEIBD, test x$onlyeibd = xtrue) + + if test x$onlyeibd = xfalse ; then + +-AM_PATH_XML2(2.6.16,,[AC_MSG_ERROR([limxml2 not found])]) ++PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.16], [], [AC_MSG_ERROR([limxml2 not found])]) ++XML_CPPFLAGS=$XML_CFLAGS ++AC_SUBST(XML_CPPFLAGS) ++AC_SUBST(XML_LIBS) ++ + AC_PATH_PROG(TAS,[m68hc05-as],,[$PATH:$bindir:$prefix/bin]) + AC_PATH_PROG(TLD,[m68hc05-ld],,[$PATH:$bindir:$prefix/bin]) + AC_PATH_PROG(TAR,[m68hc05-ar],,[$PATH:$bindir:$prefix/bin]) +-- +2.45.2 + diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk index f14b23c7cc9..4defd29ba10 100644 --- a/package/bcusdk/bcusdk.mk +++ b/package/bcusdk/bcusdk.mk @@ -10,6 +10,9 @@ BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib BCUSDK_LICENSE = GPL-2.0+ BCUSDK_LICENSE_FILES = COPYING BCUSDK_INSTALL_STAGING = YES +# 0003-m4-ccforbuild.m4-include-stdlib.h-in-test-program.patch +# 0004-configure.in-replace-obsolete-AM_PATH_XML2-by-PKG_CH.patch +BCUSDK_AUTORECONF = YES BCUSDK_CONF_OPTS = \ --enable-onlyeibd \ --enable-ft12 \ @@ -21,7 +24,8 @@ BCUSDK_CONF_OPTS = \ --without-pth-test \ --with-pth=$(STAGING_DIR)/usr -BCUSDK_DEPENDENCIES = libpthsem +# host-pkgconf is only needed because of autoreconf +BCUSDK_DEPENDENCIES = libpthsem host-pkgconf ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) BCUSDK_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) From 4d7d17c7282afa61465d1ba9afcdb16f6f80e7ef Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 15:20:58 +0200 Subject: [PATCH 2614/3013] package/pistache: needs NPTL pistache needs NPTL as it unconditionally uses pthread_setname_np since https://github.com/pistacheio/pistache/commit/b283c32963a7cb0500cf69555d320a6e9e252850 resulting in the following uclibc build failure since commit 82e61bed8208857d5d13c384c89086c4dd4e1e79: ../src/common/reactor.cc: In lambda function: ../src/common/reactor.cc:512:25: error: 'pthread_setname_np' was not declared in this scope; did you mean 'pthread_setcanceltype'? 512 | pthread_setname_np(pthread_self(), | ^~~~~~~~~~~~~~~~~~ | pthread_setcanceltype Fixes: 82e61bed8208857d5d13c384c89086c4dd4e1e79 - http://autobuild.buildroot.org/results/b2b22e4f9684aca0246650673fd8c33019712ddf - http://autobuild.buildroot.org/results/1597bfe2a57cd3aef54d331447dd81cae020d434 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b6db4e2a79da7aadcbe2beda3e00381afb9e3f28) Signed-off-by: Peter Korsgaard --- package/pistache/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index ca2d2833cdc..e66c24d86d8 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PISTACHE bool "pistache" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_RAPIDJSON help @@ -12,8 +12,8 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar" +comment "pistache needs a toolchain w/ C++, gcc >= 7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_USE_WCHAR From bf24fbf66ae110c679dfd27a5c4c12235eddd3ab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 15:30:04 +0200 Subject: [PATCH 2615/3013] package/rtty: bump to version 8.1.2 - Drop patch (already in version) - This bump will fix the following build failure with musl >= 1.2.5 thanks to https://github.com/zhaojh329/rtty/commit/eb6394c3d83a21a8825e47b40659cfe0ead33b6f: /home/autobuild/autobuild/instance-22/output-1/build/rtty-8.1.0/src/file.c: In function 'start_upload_file': /home/autobuild/autobuild/instance-22/output-1/build/rtty-8.1.0/src/file.c:156:24: error: implicit declaration of function 'basename' [-Werror=implicit-function-declaration] 156 | const char *name = basename(path); | ^~~~~~~~ https://github.com/zhaojh329/rtty/releases/tag/v8.1.2 https://github.com/zhaojh329/rtty/releases/tag/v8.1.1 Fixes: - http://autobuild.buildroot.org/results/382405b421a8ea7b5b3beb553f47fa20427fa3c3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ca742a985cc9acc40fff3539c696e64fa040f1c4) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...keLists.txt-prefer-pkg_check_modules.patch | 40 ------------------- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 2 +- 4 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch diff --git a/.checkpackageignore b/.checkpackageignore index bc52d45933a..d7114b38a94 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1316,7 +1316,6 @@ package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch lib_patch.Upstream package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch lib_patch.Upstream package/rtmpdump/0001-include-limits.h.patch lib_patch.Upstream package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patch.Upstream -package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream package/rubix/0001-dont-use-legacy-functions.patch lib_patch.Upstream package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch lib_patch.Upstream diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch deleted file mode 100644 index 37140504456..00000000000 --- a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 26 Feb 2023 20:39:11 +0100 -Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules - -Prefer pkg_check_modules over find_package to avoid the following static -build failure with openssl and -latomic: - -/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': -ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' - -Fixes: - - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/ssl/pull/4] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt -index 4868bf7..36488c7 100644 ---- a/src/ssl/CMakeLists.txt -+++ b/src/ssl/CMakeLists.txt -@@ -14,10 +14,10 @@ endif() - - find_package(PkgConfig QUIET) - --find_package(OpenSSL) -+pkg_check_modules(OPENSSL openssl) - - if (NOT OPENSSL_FOUND) -- pkg_check_modules(OPENSSL openssl) -+ find_package(OpenSSL) - endif() - - find_package(WolfSSL) --- -2.39.1 - diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index a6ccb5c2e67..004314eea18 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz +sha256 522b0fc5e032c3b84ac707abce8ac4ff5609900011f8f300ce4f4246abac0acc rtty-8.1.2.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index b2fac144322..618971c9a33 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 8.1.0 +RTTY_VERSION = 8.1.2 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE From 5456131b7ae8000af66009bdde3cf6b1536284a1 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 27 Jun 2024 22:33:32 +0300 Subject: [PATCH 2616/3013] package/wpewebkit: disable libdrm usage when not available Pass USE_LIBDRM=OFF to the wpewebkit CMake configuration step when the libdrm package has not been selected. WPE WebKit can be built without libdrm support, and it will still work with backends that use other platform-specific methods to handle graphics buffers and/or presenting content onto an output. For example this is the case with wpebackend-rdk configured to use rpi-userland, which uses dispmanx to produce the output instead of DRM/KMS. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 65f8174648a3df922892cfac1ad15279d1bffde3) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index ecb3b3e352b..9daca79fc73 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -87,6 +87,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=ON +WPEWEBKIT_DEPENDENCIES += libdrm +else +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=OFF +endif + ifeq ($(BR2_PACKAGE_WOFF2),y) WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON WPEWEBKIT_DEPENDENCIES += woff2 From 3455df79bcbe3f46eea04b17a0e6504cf9f2e338 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:23:57 +0200 Subject: [PATCH 2617/3013] package/gpsd: condition python stuff to the proper kconfig option Currently, we have a Kconfig symbol to enable the python support in gpsd, but the condition at configure time is based on whether the python package is enabled. So, if a user does not enable python support in gpsd, they still get it. Switch to using the proper symbol. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Reviewed-by: Jan Havran Signed-off-by: Thomas Petazzoni (cherry picked from commit 9696d277565159029e74efb9eae16b4a670bf945) Signed-off-by: Peter Korsgaard --- package/gpsd/gpsd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 1d4013d1222..c57fad83c34 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -178,7 +178,7 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" From 83112fb33fcc88062962d58ab85ec5d7bc8eca82 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:23:58 +0200 Subject: [PATCH 2618/3013] package/gpsd: fix comment about wchar requirement The comment does not follow the coding style, so update it appropriately. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b88d2b51a4bd2d825d71730bde934dc9991fc6cf) Signed-off-by: Peter Korsgaard --- package/gpsd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 8c28c05efd6..44615f4e433 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -84,7 +84,7 @@ config BR2_PACKAGE_GPSD_PYTHON Python libraries and tools for the gpsd service daemon including gpsfake test harness. -comment "GPSD python support not available with toolchain w/o wide characters support" +comment "python support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR comment "Protocols" From 7389a013007d421c56934e8f8908d1cbbc94a630 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 25 Jul 2024 09:39:08 +0200 Subject: [PATCH 2619/3013] package/mokutil: force libopenssl mokutil unconditionally uses X509_get0_subject_key_id resulting in the following build failure with libressl since its addition in commit 2e6e121496bfcbe09c018558be13733077b6df9b: /home/autobuild/autobuild/instance-18/output-1/host/lib/gcc/i686-buildroot-linux-uclibc/13.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: mokutil-efi_x509.o: in function `get_cert_skid': efi_x509.c:(.text+0x4e6): undefined reference to `X509_get0_subject_key_id' Fixes: 2e6e121496bfcbe09c018558be13733077b6df9b - http://autobuild.buildroot.org/results/88b549734eae4b25de1b8e1c4f04bace0a7e7418 - http://autobuild.buildroot.org/results/05ac319bfb2a252f3dcdc5d04761f276afb53b6f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 1941fe3d82236f4b4e92eedf6e7f7a34db70016e) Signed-off-by: Peter Korsgaard --- package/mokutil/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mokutil/Config.in b/package/mokutil/Config.in index dd02078b4e1..8895b66d203 100644 --- a/package/mokutil/Config.in +++ b/package/mokutil/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_MOKUTIL select BR2_PACKAGE_KEYUTILS select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help mokutil is a tool to import or delete the machines owner keys (MOK) stored in the database of shim. From 84202115a298f70f7545220a4996dad31e82ed31 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 11:20:05 +0200 Subject: [PATCH 2620/3013] DEVELOPERS: remove Maeva Manuel Maeva told me personally she will no longer contribute to Buildroot for the time being. This commit removes all the associated DEVELOPERS entries. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 92d652df4869d073e383d9d44b5c43e338d83c29) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 6aaaa6ca7fa..39eb895f643 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2095,11 +2095,6 @@ N: Ludwig Kormann F: board/in-circuit/ F: configs/icnova* -N: Maeva Manuel -F: board/freescale/imx8qmmek/ -F: configs/freescale_imx8qmmek_defconfig -F: package/freescale-imx/imx-seco/ - N: Mahyar Koshkouei F: package/ffmpeg/ F: package/mpv/ From eb39c88509efeb2f6f1fb0228ef53fed423c9ae1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 20 Feb 2024 23:07:20 +0100 Subject: [PATCH 2621/3013] support/testing: add make runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e1e49069d5fc67b434de94637409c6ced915dea) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_make.py | 82 +++++++++++++++++++ .../test_make/rootfs-overlay/root/Makefile | 23 ++++++ 3 files changed, 107 insertions(+) create mode 100644 support/testing/tests/package/test_make.py create mode 100644 support/testing/tests/package/test_make/rootfs-overlay/root/Makefile diff --git a/DEVELOPERS b/DEVELOPERS index 39eb895f643..1ee1e0f6275 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1869,6 +1869,8 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_make.py +F: support/testing/tests/package/test_make/ F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ diff --git a/support/testing/tests/package/test_make.py b/support/testing/tests/package/test_make.py new file mode 100644 index 00000000000..2ec62826bec --- /dev/null +++ b/support/testing/tests/package/test_make.py @@ -0,0 +1,82 @@ +import os + +import infra.basetest + + +class TestMake(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_make/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_MAKE=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def gen_expected_str(self, count): + """Return the expected string generated by the test Makefile""" + return "".join(map(lambda x: str(x), range(1, count+1))) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("make --version") + + # We touch the Makefile to set its modification time to the + # current system time. This is to avoid warnings from Make + # about having files with timestamps in the future. This is + # because the minimal system running in the emulator might not + # set the clock to the real time, and the Makefile has a + # correct timestamp from the build host (which is likely at + # the correct time). + self.assertRunOk("touch Makefile") + + # We test the "message" target and check we get the expected + # string. + out, ret = self.emulator.run("make message") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") + + # We redo the same test, this time by passing a new message + # with a variable. + msg = "This is Another Message..." + out, ret = self.emulator.run(f"make message MESSAGE='{msg}'") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We run a simple "make" invocation, using the defaults. + self.assertRunOk("make") + + # We check the generated output contains the expected string. + expected_str = self.gen_expected_str(10) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) + + # Clean the previous invocation. + self.assertRunOk("make clean") + + # We check a output generated file is no longer present. + self.assertRunOk("test ! -e output.txt") + + # We run an invocation with a larger COUNT value. GNU Make + # version 4.4 introduced the --shuffle option, which shuffle + # rules. We use it with a constant seed, in order to have a + # stable reshuffling in all test runs. We also include in this + # execution a request for parallel jobs. + count = 50 + seed = 123456 + self.assertRunOk(f"make -j10 --shuffle={seed} COUNT={count}") + + # Despite the pseudo-randomization in the previous invocation, + # the expected output should be correctly ordered. + expected_str = self.gen_expected_str(count) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) diff --git a/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile new file mode 100644 index 00000000000..7ac86945a5e --- /dev/null +++ b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile @@ -0,0 +1,23 @@ +MESSAGE ?= "Hello Buildroot!" +COUNT ?= 10 + +LIST = $(shell seq $(COUNT)) +INPUTS = $(addsuffix .in.txt,$(LIST)) +OUTPUT = output.txt + +.PHONY: all +all: $(OUTPUT) + +.PHONY: clean +clean: + $(RM) $(OUTPUT) *.in.txt + +.PHONY: message +message: + @echo $(MESSAGE) + +%.in.txt: + echo $(subst .in.txt,,$@) > $@ + +$(OUTPUT): $(INPUTS) + (cat $? | tr -d '\n' ; echo) > $@ From 11dda46ff2b76a1d9e2737dc598a2c74e328f7e8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 17 Feb 2024 19:45:20 +0100 Subject: [PATCH 2622/3013] support/testing: add mariadb runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 5356754d1e11174274553f2f7329edd7e8c7fd68) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_mariadb.py | 195 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 support/testing/tests/package/test_mariadb.py diff --git a/DEVELOPERS b/DEVELOPERS index 1ee1e0f6275..3fc57b5ecc1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1871,6 +1871,7 @@ F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py F: support/testing/tests/package/test_make.py F: support/testing/tests/package/test_make/ +F: support/testing/tests/package/test_mariadb.py F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py new file mode 100644 index 00000000000..523f075db18 --- /dev/null +++ b/support/testing/tests/package/test_mariadb.py @@ -0,0 +1,195 @@ +import os + +import infra.basetest + + +class TestMariaDB(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.78" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_MYSQL=y + BR2_PACKAGE_MARIADB=y + BR2_PACKAGE_MARIADB_SERVER=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="512M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + # Configuration for the test + db_adminuser = "root" + db_admin = "mysql" + db_user = "br_user" + db_name = "br_database" + backup_file = "dump.sql" + + def run_user_db_query(self, user, database, query, opts=None): + cmd = f"mariadb --user={user} --database={database}" + cmd += f' --execute="{query}"' + if opts is not None: + cmd += " " + opts + self.assertRunOk(cmd) + + def run_admin_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_adminuser, self.db_admin, query, opts) + + def run_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_user, self.db_name, query, opts) + + def cleanup_database(self): + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will prevent errors during the + # user/db creation. + + # Drop the test database, if it exists. + sql_query = f"DROP USER IF EXISTS {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Drop the test user, if it exists. + sql_query = f"DROP DATABASE IF EXISTS {self.db_name};" + self.run_admin_sql_query(sql_query) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "2G", + "-smp", "2", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the server binary can execute. + self.assertRunOk("mariadbd --version") + + # Check the client binary can execute. + self.assertRunOk("mariadb --version") + + # Check the server is ready. + self.assertRunOk("mariadb-admin ping") + + # Query the server version from the client. + sql_query = "SELECT version();" + self.run_admin_sql_query(sql_query, opts="-N -s") + + self.cleanup_database() + + # Create a new user. + sql_query = f"CREATE USER {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Create a new database. + sql_query = f"CREATE DATABASE {self.db_name}" + sql_query += " COMMENT = 'Test Database for Buildroot Test';" + self.run_admin_sql_query(sql_query) + + # Grant all permission on this new database to our test user. + sql_query = "GRANT ALL PRIVILEGES" + sql_query += f" ON {self.db_name}.*" + sql_query += f" TO {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + self.create_tables() + + self.insert_data() + + self.query_database() + + # Update a table. + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Backup the test database. + cmd = f"mariadb-dump --user={self.db_user}" + cmd += f" {self.db_name} > {self.backup_file}" + self.assertRunOk(cmd) + + # Drop all the tables. + sql_query = "DROP TABLE fruit_colors, fruits, colors;" + self.run_sql_query(sql_query) + + # Query the server status. + self.assertRunOk("mariadb-admin status") + + # Stop the server. + self.assertRunOk("/etc/init.d/S97mysqld stop") + + # Check the server is stopped. + _, exit_code = self.emulator.run("mariadb-admin ping") + self.assertNotEqual(exit_code, 0) + + # Restart the server. + self.assertRunOk("/etc/init.d/S97mysqld start") + + # Restore the backup. + cmd = f"mariadb --user={self.db_user} --database={self.db_name}" + cmd += f" < {self.backup_file}" + self.assertRunOk(cmd) + + # Query one last time our data, to check the backup + # restoration succeeded. + self.query_database() From e0fcc10522e9629260e6d58008170ca432b16396 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Aug 2024 12:56:06 +0200 Subject: [PATCH 2623/3013] support/testing: package: mariadb: fix test configuration The mysql virtual package was removed in commit 8708f3a23a "package/mysql: drop virtual package". The mariadb runtime test was authored before this mysql virtual package removal, but was merged after it, in commit 5356754d1e "support/testing: add mariadb runtime test". Due to this, this test always failed with the error: Makefile.legacy:9: *** "You have legacy configuration in your .config! Please check your configuration.". Stop. This commit fixes the issue by removing the legacy BR2_PACKAGE_MYSQL=y configuration directive. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7540345406 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit 3da3361a1b9cafb274dac776693720fe20f6681b) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_mariadb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py index 523f075db18..d40ffdba961 100644 --- a/support/testing/tests/package/test_mariadb.py +++ b/support/testing/tests/package/test_mariadb.py @@ -19,7 +19,6 @@ class TestMariaDB(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.78" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" - BR2_PACKAGE_MYSQL=y BR2_PACKAGE_MARIADB=y BR2_PACKAGE_MARIADB_SERVER=y BR2_TARGET_ROOTFS_EXT2=y From dc53c20200d5825df8fee19a6574af49fc2a1a90 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:45:00 +0200 Subject: [PATCH 2624/3013] package/libxml2: security bump version to 2.12.9 Fixes CVE-2024-34459 (2.12.7) & CVE-2024-40896. Release notes: https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.news https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.8.news https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.news Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 45651cdb851bcd5af06bb94d824b078b03d4f187) Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 086bb410986..73fd0ecedfa 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.6.sha256sum -sha256 889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb libxml2-2.12.6.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.sha256sum +sha256 59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590 libxml2-2.12.9.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index e7ed6fb7527..b69722b21d4 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).9 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From 935111fd263119d65771a0b8f0a16d372d0b6462 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:33 +0200 Subject: [PATCH 2625/3013] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 179bf242d564e18db278b39fdf67e43ec6806e28) [Peter: drop 6.10.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 2d22a966500..9abc988070e 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz -sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz -sha256 1ba5f93b411ead7587fe48b2eec6c656f6796d31f5e406d236913c77512497ec linux-6.1.102.tar.xz +sha256 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 linux-6.6.44.tar.xz +sha256 5eb4706f898f50881552ff5146d892132d3ffc5298033bffe27087d3a44c4573 linux-6.1.103.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186 linux-5.15.164.tar.xz sha256 ca09d86a6b79706c33382d3f8606f476eb07918417a87fb1815f6a4aa81f2ba1 linux-5.10.223.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cf19b59d90a..0080c944ea8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -419,8 +419,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.281" if BR2_KERNEL_HEADERS_5_4 default "5.10.223" if BR2_KERNEL_HEADERS_5_10 default "5.15.164" if BR2_KERNEL_HEADERS_5_15 - default "6.1.102" if BR2_KERNEL_HEADERS_6_1 - default "6.6.43" if BR2_KERNEL_HEADERS_6_6 + default "6.1.103" if BR2_KERNEL_HEADERS_6_1 + default "6.6.44" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 64cfac7087e38fffbf5a009e7c392cd80a1be753 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 3 Aug 2024 13:42:03 -0400 Subject: [PATCH 2626/3013] package/swaybg: bump to version 1.2.1 See also: https://github.com/swaywm/swaybg/releases/tag/v1.2.1 Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni (cherry picked from commit 2143e8f8351c177d7fce87ccacba042afea94f93) Signed-off-by: Peter Korsgaard --- package/swaybg/swaybg.hash | 5 +++-- package/swaybg/swaybg.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/swaybg/swaybg.hash b/package/swaybg/swaybg.hash index 62bf048d612..e528349db90 100644 --- a/package/swaybg/swaybg.hash +++ b/package/swaybg/swaybg.hash @@ -1,3 +1,4 @@ -# Locally computed, tarball verified with GPG signature -sha256 c0205b34f1fad94553b6cb2c2b983cc33186018026058cad0b841a00bc3087e3 swaybg-1.2.0.tar.gz +# Locally calculated after checking pgp signature: +# https://github.com/swaywm/swaybg/releases/download/v1.2.1/swaybg-1.2.1.tar.gz.sig +sha256 6af1fdf0e57b1cc5345febed786b761fea0e170943a82639f94cfaed7df84f8f swaybg-1.2.1.tar.gz sha256 95224d118a325daf31828afcca98cd958d53f0a7cdd856b50b1be8ac44832faf LICENSE diff --git a/package/swaybg/swaybg.mk b/package/swaybg/swaybg.mk index 90a8cb5d809..87374e035ee 100644 --- a/package/swaybg/swaybg.mk +++ b/package/swaybg/swaybg.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWAYBG_VERSION = 1.2.0 +SWAYBG_VERSION = 1.2.1 SWAYBG_SITE = https://github.com/swaywm/swaybg/releases/download/v$(SWAYBG_VERSION) SWAYBG_LICENSE = MIT SWAYBG_LICENSE_FILES = LICENSE From 6a2d1d947ebed68529534edabe86737e44c1e6bc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 09:19:07 +0200 Subject: [PATCH 2627/3013] package/fluent-bit: fix SSP compile issues with uClibc-ng Let's disable Security flags for the Buildsystem and let it handled by Buildroot itself. Fixes: - http://autobuild.buildroot.net/results/c9e/c9ed27a51a68429b2ed2d8eebb1afc919ecbead1/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit f6a975f24e044ffdb717a96537395cc40c43aa70) Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 5463682e454..10e639a3d51 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -15,6 +15,7 @@ FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ + -DFLB_SECURITY=No \ -DFLB_EXAMPLES=No \ -DFLB_CHUNK_TRACE=No \ -DFLB_PREFER_SYSTEM_LIBS=Yes \ From e87365ffb48f2d553c27bb545f9d0ae422df444d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 11:31:28 +0200 Subject: [PATCH 2628/3013] package/openldap: update to 2.5.18 See here for a Changelog: https://openldap.org/software/release/changes_lts.html Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 61ad5516485a1b4518c4997c9a146a5faa96e6d2) Signed-off-by: Peter Korsgaard --- package/openldap/openldap.hash | 4 ++-- package/openldap/openldap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 1383c6aef88..32bd83f3498 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,5 +1,5 @@ # Verified by locally checking against the SHA3-512 hash available in -# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.16.sha3-512 +# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.18.sha3-512 # Locally computed -sha256 546ba591822e8bb0e467d40c4d4a30f89d937c3a507fe83a578f582f6a211327 openldap-2.5.16.tgz +sha256 2670ae43d8d99dd6b1ba182101d982350d613d09c098eb1607ea6b36e6b51d3e openldap-2.5.18.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 9cebff99dcb..68cfb89c41d 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.5.16 +OPENLDAP_VERSION = 2.5.18 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License From 8194a727a211bb944d78eb0b82ab952fb8083a5a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Aug 2024 17:32:14 +0200 Subject: [PATCH 2629/3013] package/tllist: update download URL Fix download URL. Tarball is renamed, too. Fixes: http://autobuild.buildroot.org/results/950/950688493021c12c4dea98ac4b220355d917ff69 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/tllist/tllist.hash | 2 +- package/tllist/tllist.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/tllist/tllist.hash b/package/tllist/tllist.hash index 2806d62355c..73d382767a8 100644 --- a/package/tllist/tllist.hash +++ b/package/tllist/tllist.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f3fe2f7433719cec816c63937a7aa36e566bd317763ef46d11562073ab6361d 1.1.0.tar.gz +sha256 a1f0ce0dc4fcb4ce59c37202a1d914c853a8bd2d7c5d57d623b15a8dd9778767 tllist-1.1.0.tar.gz sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE diff --git a/package/tllist/tllist.mk b/package/tllist/tllist.mk index 69a34a65ab8..26e21ccbe1f 100644 --- a/package/tllist/tllist.mk +++ b/package/tllist/tllist.mk @@ -5,8 +5,7 @@ ################################################################################ TLLIST_VERSION = 1.1.0 -TLLIST_SOURCE = $(TLLIST_VERSION).tar.gz -TLLIST_SITE = https://codeberg.org/dnkl/tllist/archive +TLLIST_SITE = https://codeberg.org/dnkl/tllist/releases/download/$(TLLIST_VERSION) TLLIST_LICENSE = MIT TLLIST_LICENSE_FILES = LICENSE # header only From 67270f2c3b63acedcca8e151d365af1036d60534 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 16:16:01 +0200 Subject: [PATCH 2630/3013] package/nginx: security update to 1.26.1 See here for a Changelog and CVE's: http://nginx.org/en/CHANGES-1.26 Patch 0006 is no longer required as the openssl library is found without this patch, which does not apply anymore. Patch 0009 is no longer required as it was fixed in another way upstream: https://hg.nginx.org/nginx/rev/fb989e24c60a Patch 0011 is upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 Reorder the remaining patches and update .checkpackageignore accordingly. The LICENSE file is changed, the year changed from 2022 to 2024. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 761259c93400bc806611a242c7dc3df7ff67c231) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 8 +- ...-auto-lib-libgd-conf-use-pkg-config.patch} | 0 ...auto-lib-openssl-conf-use-pkg-config.patch | 251 ------------------ ...inux_config.h-only-include-dlfcn.h-.patch} | 0 ...of-endianness-for-cross-compilation.patch} | 0 ...to-os-linux-fix-build-with-libxcrypt.patch | 38 --- ...ix-compile-error-in-configure-script.patch | 33 --- package/nginx/nginx.hash | 4 +- package/nginx/nginx.mk | 2 +- 9 files changed, 6 insertions(+), 330 deletions(-) rename package/nginx/{0007-auto-lib-libgd-conf-use-pkg-config.patch => 0006-auto-lib-libgd-conf-use-pkg-config.patch} (100%) delete mode 100644 package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch rename package/nginx/{0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch => 0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch} (100%) rename package/nginx/{0010-Allow-forcing-of-endianness-for-cross-compilation.patch => 0008-Allow-forcing-of-endianness-for-cross-compilation.patch} (100%) delete mode 100644 package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch delete mode 100644 package/nginx/0011-Fix-compile-error-in-configure-script.patch diff --git a/.checkpackageignore b/.checkpackageignore index d7114b38a94..94060e44919 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1076,11 +1076,9 @@ package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch li package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch lib_patch.Upstream package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch lib_patch.Upstream package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch lib_patch.Upstream -package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch lib_patch.Upstream -package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch lib_patch.Upstream -package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch lib_patch.Upstream -package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch lib_patch.Upstream -package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream +package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch lib_patch.Upstream +package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch lib_patch.Upstream +package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream package/nginx/S50nginx lib_sysv.Indent lib_sysv.Variables package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch lib_patch.Upstream package/nmap/0001-libdnet-wrapper-configure.patch lib_patch.Upstream diff --git a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch similarity index 100% rename from package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch rename to package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch diff --git a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch b/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch deleted file mode 100644 index 43387296589..00000000000 --- a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch +++ /dev/null @@ -1,251 +0,0 @@ -From 4ba4b1e0bd1b69e124eb34c95ae9e7c087370efa Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Fri, 6 May 2016 14:48:31 +0100 -Subject: [PATCH] auto/lib/openssl/conf: use pkg-config - -Change to using pkg-config to find the path to openssl and its -dependencies. - -Signed-off-by: Martin Bark ---- - auto/lib/openssl/conf | 187 +++++++++++++++++++++--------------------- - 1 file changed, 94 insertions(+), 93 deletions(-) - -diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf -index 4fb52df7..9f30490d 100644 ---- a/auto/lib/openssl/conf -+++ b/auto/lib/openssl/conf -@@ -1,4 +1,3 @@ -- - # Copyright (C) Igor Sysoev - # Copyright (C) Nginx, Inc. - -@@ -7,123 +6,125 @@ if [ $OPENSSL != NONE ]; then - - case "$CC" in - -- cl | bcc32) -- have=NGX_OPENSSL . auto/have -- have=NGX_SSL . auto/have -- -- CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" -- -- CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" -- CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" -- -- if [ -f $OPENSSL/ms/do_ms.bat ]; then -- # before OpenSSL 1.1.0 -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" -- else -- # OpenSSL 1.1.0+ -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" -- fi -- -- # libeay32.lib requires gdi32.lib -- CORE_LIBS="$CORE_LIBS gdi32.lib" -- # OpenSSL 1.0.0 requires crypt32.lib -- CORE_LIBS="$CORE_LIBS crypt32.lib" -- ;; -- -- *) -- have=NGX_OPENSSL . auto/have -- have=NGX_SSL . auto/have -- -- CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" -- CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" -- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" -- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" -- CORE_LIBS="$CORE_LIBS $NGX_LIBDL" -- CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" -- -- if [ "$NGX_PLATFORM" = win32 ]; then -- CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" -- fi -- ;; -+ cl | bcc32) -+ have=NGX_OPENSSL . auto/have -+ have=NGX_SSL . auto/have -+ -+ CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" -+ -+ CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" -+ CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" -+ -+ if [ -f $OPENSSL/ms/do_ms.bat ]; then -+ # before OpenSSL 1.1.0 -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" -+ else -+ # OpenSSL 1.1.0+ -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" -+ fi -+ -+ # libeay32.lib requires gdi32.lib -+ CORE_LIBS="$CORE_LIBS gdi32.lib" -+ # OpenSSL 1.0.0 requires crypt32.lib -+ CORE_LIBS="$CORE_LIBS crypt32.lib" -+ ;; -+ -+ *) -+ have=NGX_OPENSSL . auto/have -+ have=NGX_SSL . auto/have -+ -+ CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" -+ CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" -+ CORE_LIBS="$CORE_LIBS $NGX_LIBDL" -+ CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" -+ -+ if [ "$NGX_PLATFORM" = win32 ]; then -+ CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" -+ fi -+ ;; - esac - - else - - if [ "$NGX_PLATFORM" != win32 ]; then - -- OPENSSL=NO -+ OPENSSL=NO - -- ngx_feature="OpenSSL library" -- ngx_feature_name="NGX_OPENSSL" -- ngx_feature_run=no -- ngx_feature_incs="#include " -- ngx_feature_path= -- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" -- ngx_feature_test="SSL_CTX_set_options(NULL, 0)" -- . auto/feature -+ ngx_feature="OpenSSL library" -+ ngx_feature_name="NGX_OPENSSL" -+ ngx_feature_run=no -+ ngx_feature_incs="#include " -+ ngx_feature_path= -+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl| -+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" -+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" -+ ngx_feature_test="SSL_CTX_set_options(NULL, 0)" -+ . auto/feature - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # FreeBSD port -+ # FreeBSD port - -- ngx_feature="OpenSSL library in /usr/local/" -- ngx_feature_path="/usr/local/include" -+ ngx_feature="OpenSSL library in /usr/local/" -+ ngx_feature_path="/usr/local/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # NetBSD port -+ # NetBSD port - -- ngx_feature="OpenSSL library in /usr/pkg/" -- ngx_feature_path="/usr/pkg/include" -+ ngx_feature="OpenSSL library in /usr/pkg/" -+ ngx_feature_path="/usr/pkg/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # MacPorts -+ # MacPorts - -- ngx_feature="OpenSSL library in /opt/local/" -- ngx_feature_path="/opt/local/include" -+ ngx_feature="OpenSSL library in /opt/local/" -+ ngx_feature_path="/opt/local/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = yes ]; then -- have=NGX_SSL . auto/have -- CORE_INCS="$CORE_INCS $ngx_feature_path" -- CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -- OPENSSL=YES -- fi -+ if [ $ngx_found = yes ]; then -+ have=NGX_SSL . auto/have -+ CORE_INCS="$CORE_INCS $ngx_feature_path" -+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -+ OPENSSL=YES -+ fi - fi - - if [ $OPENSSL != YES ]; then -@@ -136,7 +137,7 @@ into the system, or build the OpenSSL library statically from the source - with nginx by using --with-openssl= option. - - END -- exit 1 -+ exit 1 - fi - - fi --- -2.17.1 - diff --git a/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch similarity index 100% rename from package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch rename to package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch diff --git a/package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch b/package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch similarity index 100% rename from package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch rename to package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch diff --git a/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch b/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch deleted file mode 100644 index 8b368d946f2..00000000000 --- a/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 79f1fe5251afc4e22a138b0c8f44fc9c94093b8b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 2 Apr 2021 09:18:26 +0200 -Subject: [PATCH] auto/os/linux: fix build with libxcrypt - -If crypt_r is found in libcrypt, add -lcrypt to CORE_LIBS to avoid the -following build failure with libxcrypt: - -objs/ngx_modules.o \ --lpcre -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lcrypto -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lxslt -lxml2 -lGeoIP \ --Wl,-E -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: objs/src/os/unix/ngx_user.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/nginx-1.18.0/src/os/unix/ngx_user.c:18: undefined reference to `crypt_r' - -Fixes: - - http://autobuild.buildroot.org/results/79a51b0d348e756517b5c9ce815a67f5c657e7e6 - -Signed-off-by: Fabrice Fontaine ---- - auto/os/linux | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/auto/os/linux b/auto/os/linux -index 5e280eca..04682812 100644 ---- a/auto/os/linux -+++ b/auto/os/linux -@@ -232,6 +232,9 @@ ngx_feature_test="struct crypt_data cd; - crypt_r(\"key\", \"salt\", &cd);" - . auto/feature - -+if [ $ngx_found = yes ]; then -+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -+fi - - ngx_include="sys/vfs.h"; . auto/include - --- -2.30.2 - diff --git a/package/nginx/0011-Fix-compile-error-in-configure-script.patch b/package/nginx/0011-Fix-compile-error-in-configure-script.patch deleted file mode 100644 index 672162759e2..00000000000 --- a/package/nginx/0011-Fix-compile-error-in-configure-script.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e1bcac837f6aeabc4ddece06ecbcf2bcca8dd651 Mon Sep 17 00:00:00 2001 -From: Edgar Bonet -Date: Thu, 16 May 2024 11:15:10 +0200 -Subject: [PATCH] Configure: fixed building libatomic test. - -Using "long *" instead of "AO_t *" leads either to -Wincompatible-pointer-types -or -Wpointer-sign warnings, depending on whether long and size_t are compatible -types (e.g., ILP32 versus LP64 data models). Notably, -Wpointer-sign warnings -are enabled by default in Clang only, and -Wincompatible-pointer-types is an -error starting from GCC 14. - -Signed-off-by: Edgar Bonet -Upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 ---- - auto/lib/libatomic/conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf -index d1e484a..0f12b9c 100644 ---- a/auto/lib/libatomic/conf -+++ b/auto/lib/libatomic/conf -@@ -20,7 +20,7 @@ else - #include " - ngx_feature_path= - ngx_feature_libs="-latomic_ops" -- ngx_feature_test="long n = 0; -+ ngx_feature_test="AO_t n = 0; - if (!AO_compare_and_swap(&n, 0, 1)) - return 1; - if (AO_fetch_and_add(&n, 1) != 1) --- -2.34.1 - diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 24bc588d855..0b45f96a454 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d nginx-1.24.0.tar.gz +sha256 f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b nginx-1.26.1.tar.gz # License files, locally calculated -sha256 ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320 LICENSE +sha256 f19c4caea60247490199c5a6d0134281e3fb20b3d7577e6873c628597f5381d9 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 7bd2173b489..e63acc7b16b 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.24.0 +NGINX_VERSION = 1.26.1 NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From 6384a77dfb598603fcbadfd8345f508921ac5654 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:26 +0200 Subject: [PATCH 2631/3013] package/ffmpeg: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit 06b5ce9f04123a985e7543d5aadae60e14399401) Signed-off-by: Peter Korsgaard --- .../ffmpeg/0003-libavutil-Fix-mips-build.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index ee2d1db8bdf..a52d7fc347b 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -1,4 +1,4 @@ -From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001 +From e9d97f9d29ce57d7a5a62607c2a08e091a06de6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Jun 2021 08:54:53 +0200 Subject: [PATCH] libavutil: Fix mips build @@ -11,16 +11,18 @@ Patch sent upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure | 2 ++ libavutil/mips/cpu.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 6bfd98b384..773a7d516c 100755 +index a89cfa6d959d..6ec00df75312 100755 --- a/configure +++ b/configure -@@ -2191,6 +2191,7 @@ HEADERS_LIST=" +@@ -2227,6 +2227,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,8 +30,8 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6361,6 +6361,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa - check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox +@@ -6472,6 +6473,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa + check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox check_headers windows.h check_headers asm/types.h +check_headers sys/auxv.h @@ -37,7 +39,7 @@ index 6bfd98b384..773a7d516c 100755 # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c -index 59619d54de..19196de50b 100644 +index 59619d54dee3..19196de50b59 100644 --- a/libavutil/mips/cpu.c +++ b/libavutil/mips/cpu.c @@ -19,7 +19,7 @@ @@ -68,5 +70,5 @@ index 59619d54de..19196de50b 100644 return cpu_flags_cpucfg(); else -- -2.29.2 +2.34.1 From e30fe15c919733ce0a2b2c914b3c819681ec627b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Aug 2024 19:19:47 +0200 Subject: [PATCH 2632/3013] package/ffmpeg: bump version to 6.1.2 Rebased patch 0003. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit baf5a1f0da5cd0deaca214d8ced77b5a1937626c) Signed-off-by: Peter Korsgaard --- package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 5 +++-- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index a52d7fc347b..aeb272c459e 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -10,7 +10,8 @@ Fixes https://trac.ffmpeg.org/ticket/9138 Patch sent upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html -Signed-off-by: Bernd Kuhls +[Bernd: rebased for version 6.1.2] +Signed-off-by: Bernd Kuhls [Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: Dario Binacchi --- @@ -23,9 +24,9 @@ index a89cfa6d959d..6ec00df75312 100755 --- a/configure +++ b/configure @@ -2227,6 +2227,7 @@ HEADERS_LIST=" - opencv2_core_core_c_h OpenGL_gl3_h poll_h + pthread_np_h + sys_auxv_h sys_param_h sys_resource_h diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index f70ff5da833..630bd70c564 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968 ffmpeg-6.1.1.tar.xz +sha256 3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 ffmpeg-6.1.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 5b2d33883d3..19c270a14b1 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 6.1.1 +FFMPEG_VERSION = 6.1.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = https://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 80a726e85bf65f57a5d993f60d43a7061fd409d2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 5 Aug 2024 21:38:44 +0200 Subject: [PATCH 2633/3013] package/fluidsynth: bump to version 2.3.6 For change log since v2.3.5, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.6 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit f9f2ade9bb207d2481b12a325bba7cee5a3e9cbf) Signed-off-by: Peter Korsgaard --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 91d8778cbfd..0f54ad254e2 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d fluidsynth-2.3.5.tar.gz +sha256 3340d73286b28fe6e5150fbe12648d4640e86c64c228878b572773bd08cac531 fluidsynth-2.3.6.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index ef05b6a5699..3105162bda9 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.5 +FLUIDSYNTH_VERSION = 2.3.6 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From ab10088867f87311550b2c4d7e657d5b1276bf2a Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 6 Aug 2024 01:39:44 +0300 Subject: [PATCH 2634/3013] DEVELOPERS: assign Adrian Perez for sysprof Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 03505e34570d65ead565e13b0998b05a12ab95ac) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3fc57b5ecc1..09de5c823b0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -59,6 +59,7 @@ F: package/libepoxy/ F: package/libmanette/ F: package/libpsl/ F: package/libwpe/ +F: package/sysprof/ F: package/webkitgtk/ F: package/wlroots/ F: package/woff2/ @@ -3236,7 +3237,6 @@ N: Will Newton F: package/enchant/ F: package/erlang/ F: package/libmicrohttpd/ -F: package/sysprof/ F: package/time/ N: Will Wagner From 4d26c6214e4c86e17e64aab8b3326e9aa742b99f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 6 Aug 2024 05:48:26 +0100 Subject: [PATCH 2635/3013] package/gcc-bare-metal: bump to gcc 14.2.0 This patch bumps gcc-bare-metal to gcc 14.2.0. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni (cherry picked from commit f00b18c48aa7e1fdf68ac49a1d143eb664c05826) Signed-off-by: Peter Korsgaard --- package/gcc-bare-metal/14.1.0 | 1 - package/gcc-bare-metal/14.2.0 | 1 + package/gcc-bare-metal/gcc-bare-metal.mk | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 120000 package/gcc-bare-metal/14.1.0 create mode 120000 package/gcc-bare-metal/14.2.0 diff --git a/package/gcc-bare-metal/14.1.0 b/package/gcc-bare-metal/14.1.0 deleted file mode 120000 index e519bfb6fdc..00000000000 --- a/package/gcc-bare-metal/14.1.0 +++ /dev/null @@ -1 +0,0 @@ -../gcc/14.1.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/14.2.0 b/package/gcc-bare-metal/14.2.0 new file mode 120000 index 00000000000..07372368505 --- /dev/null +++ b/package/gcc-bare-metal/14.2.0 @@ -0,0 +1 @@ +../gcc/14.2.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk index 2f36b491255..501f12bc335 100644 --- a/package/gcc-bare-metal/gcc-bare-metal.mk +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOST_GCC_BARE_METAL_VERSION = 14.1.0 +HOST_GCC_BARE_METAL_VERSION = 14.2.0 HOST_GCC_BARE_METAL_SITE = \ https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION) HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz From 9172ffc3b425e2520827d0592b1fffef59b906c5 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 2 Sep 2024 22:57:06 +0200 Subject: [PATCH 2636/3013] package/babeld: update URL site As reported in [1], version 1.9.2 has been moved to another archive, and it is recommended to use https://github.com/jech/babeld as the official repository. The use of the github macro: $(call github,jech,babeld,babeld-$(BABELD_VERSION)) would have downloaded a file with the same name (e.g. babeld-1.9.2.tar.gz) but with a different hash from the one downloaded from the previous URL, creating unacceptable backward compatibility issues. Therefore, it was decided to download the package via the git method. In this way, the downloaded file is babeld-babeld-1.9.2-git4.tar.gz, thus with a different name, to which its SHA can be associated without side effects, except for breaking the release monitoring process. Unfortunately, for now, we will have to live with this limitation. Particularly interesting are the explanations provided by Yann E. Morin, which you can find in [2], that guided the creation of this patch. Fixes: - http://autobuild.buildroot.org/results/2447060c86acf1bd8d6ee0bcf8f9b6adcdfc50c9 [1] https://alioth-lists.debian.net/pipermail/babel-users/2024-August/004187.html [2] https://patchwork.ozlabs.org/project/buildroot/patch/20240901063634.3504315-1-dario.binacchi@amarulasolutions.com/ Co-Developed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/babeld/babeld.hash | 2 +- package/babeld/babeld.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/babeld/babeld.hash b/package/babeld/babeld.hash index 2e0513efa01..1c534d6184a 100644 --- a/package/babeld/babeld.hash +++ b/package/babeld/babeld.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 154f00e0a8bf35d6ea9028886c3dc5c3c342dd1a367df55ef29a547b75867f07 babeld-1.9.2.tar.gz +sha256 22549e27645ecb9ef4c715a3cbeea01fa2dc7ea6951e8f97dc9c4a7b2a1de8f5 babeld-babeld-1.9.2-git4.tar.gz sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE diff --git a/package/babeld/babeld.mk b/package/babeld/babeld.mk index 785fa2bce9f..ac32e798c85 100644 --- a/package/babeld/babeld.mk +++ b/package/babeld/babeld.mk @@ -4,8 +4,9 @@ # ################################################################################ -BABELD_VERSION = 1.9.2 -BABELD_SITE = http://www.pps.univ-paris-diderot.fr/~jch/software/files +BABELD_VERSION = babeld-1.9.2 +BABELD_SITE = https://github.com/jech/babeld +BABELD_SITE_METHOD = git BABELD_LICENSE = MIT BABELD_LICENSE_FILES = LICENCE From 09324c843bfb1944af8e0b553b0a8d9983fbebe5 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 2 Sep 2024 22:57:07 +0200 Subject: [PATCH 2637/3013] DEVELOPERS: add Dario Binacchi for babeld Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 59f3b032024..919a91dd259 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -790,6 +790,7 @@ F: configs/imx6ulz_bsh_smm_m2_defconfig F: configs/imx8mn_bsh_smm_s2_defconfig F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: configs/stm32f769_disco_sd_defconfig +F: package/babeld/ F: package/sscep/ F: package/uuu/ From 5d4d2326a71a9aec40a69d50c5cd93852ad8d78c Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 01:21:26 +0100 Subject: [PATCH 2638/3013] Revert "docs/website/support.html: document irc channel permission changes" This didn't work out as planned, neither the restriction of muting unregistered users, nor the exception for matrix users worked as planned. The channel mode has been reverted to +R (meaning only registered users are allowed to join) and an exception for *that* has been introduced for matrix users via +e. The channel modes are documented in [1]. [1] https://www.oftc.net/ChannelModes/ This reverts commit d1e6d7845b0f3b450709b84a6e4fc4527f12b196. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit bede54c774ef59640cc1b4d9fd1dabfc69e4ecdb) Signed-off-by: Peter Korsgaard --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 28873c6d76f..13d63b13a9e 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

            -

            Note that due to excessive spamming on IRC, you can only talk in the - channel if you are a registered user with +

            Note that due to excessive spamming on IRC, the channel can only be + joined if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

            From 6e87183d0cc86a832169f9e5e5330fefcb9c2430 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 11:11:40 +0100 Subject: [PATCH 2639/3013] package/htop: fix BR2_SHARED_STATIC_LIBS build With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a --enable-static flags causing htop to be built as a static binary. Adding a --disable-static reverts this. This will fix the following build failure with hwloc raised since bump to version 3.3.0 in commit 09243186df3168022f0b23b8a9677c6313033769 and https://github.com/htop-dev/htop/commit/c8a61850dd31ab64eb8ad83929ce86d2adbeb96c: /home/autobuild/autobuild/instance-3/output-1/host/bin/mipsel-buildroot-linux-gnu-gcc -std=c99 -pedantic -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -I/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -I/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/include/libxml2 -Wall -Wcast-align -Wcast-qual -Wextra -Wfloat-equal -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -Wunused -Wwrite-strings -Wnull-dereference -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"/etc\"" -I"./linux" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=2 -static -rdynamic -static -o htop htop.o Action.o Affinity.o AffinityPanel.o AvailableColumnsPanel.o AvailableMetersPanel.o BatteryMeter.o CategoriesPanel.o ClockMeter.o ColorsPanel.o ColumnsPanel.o CommandLine.o CommandScreen. o Compat.o CPUMeter.o CRT.o DateMeter.o DateTimeMeter.o DiskIOMeter.o DisplayOptionsPanel.o DynamicColumn.o DynamicMeter.o DynamicScreen.o EnvScreen.o FileDescriptorMeter.o FunctionBar.o Hashtable.o Header.o HeaderOptionsPanel.o HostnameMeter.o IncSet.o InfoScreen.o ListItem.o LoadAverageMeter.o Machine.o MainPanel.o MemoryMeter.o MemorySwapMeter.o Meter.o MetersPanel.o NetworkIOMeter.o Object.o OpenFilesScreen.o OptionItem.o Panel.o Process.o ProcessLocksScreen.o ProcessTable.o Row.o RichString.o Scheduling.o ScreenManager.o ScreensPanel.o ScreenTabsPanel.o Settings.o SignalsPanel.o SwapMeter.o SysArchMeter.o Table.o TasksMeter.o TraceScreen.o UptimeMeter.o UsersTable.o Vector.o XUtils.o generic/gettime.o generic/hostname.o generic/uname.o linux/CGroupUtils.o linux/HugePageMeter.o linux/IOPriorityPanel.o linux/LibSensors.o linux/LinuxMachine.o linux/LinuxProcess.o linux/LinuxProcessTable.o linux/Platform.o linux/PressureStallMeter.o linux/SELinuxMeter.o linux/SystemdMeter.o linux/Z ramMeter.o zfs/ZfsArcMeter.o zfs/ZfsCompressedArcMeter.o -lcap -llzma -L/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lncurses -lm -L/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -lhwloc /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Action.o: in function `Action_setUserOnly': Action.c:(.text+0x2490): warning: Using 'getpwnam' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Settings.o: in function `Settings_new': Settings.c:(.text+0x2dd0): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/libhwloc.a(topology-xml-libxml.o): in function `hwloc_libxml_free_buffer': topology-xml-libxml.c:(.text+0x2c): undefined reference to `xmlFree' Fixes: - http://autobuild.buildroot.org/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 21f312a53e49a3338db870df778665e42cf72dbf) Signed-off-by: Peter Korsgaard --- package/htop/htop.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 6dbaae3796f..4fa8e4fb5fa 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -17,6 +17,16 @@ HTOP_LICENSE_FILES = COPYING # provided by autoconf relies on wchar_t. HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 +# --enable-static has a non-standard semantic in htop, and causes the +# main binary to be linked statically, not just the production of +# static libraries. This causes issues with BR2_SHARED_STATIC_LIBS as +# htop is linked statically, but pkg-config returns results relevant +# for a shared library build. Since htop is only building an +# application, let's disable this bogus behavior. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +HTOP_CONF_OPTS += --disable-static +endif + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc From 056fe139e4a007d439af883f75a76f3c6c1c0712 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 6 Aug 2024 23:28:50 +0200 Subject: [PATCH 2640/3013] support/testing: package: gpsd: fix test by enabling python support Commit 9696d27756 "package/gpsd: condition python stuff to the proper kconfig option" changed the condition in which the gpsd python scripts are installed. After that change, the "gpsfake" command (which is a python script) is no longer found and the runtime test is failing. This commit fixes the issue by reflecting the change in the runtime test Buildroot configuration. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit b6f4d79df21b2affa1ccc5133c44647072d21058) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_gpsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index 7ca59739814..2c44e25cec5 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -11,7 +11,7 @@ class TestGpsd(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ f""" BR2_PACKAGE_GPSD=y - BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_GPSD_PYTHON=y BR2_ROOTFS_OVERLAY="{rootfs_overlay}" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set From f69dcc46b8343ae50eafaa4b801a084365fee3d4 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Aug 2024 10:22:50 +0200 Subject: [PATCH 2641/3013] package/python-django: security bump to version 5.0.8 Django 5.0.7 fixes the following CVEs: * CVE-2024-38875: Potential denial-of-service vulnerability in django.utils.html.urlize() * CVE-2024-39329: Username enumeration through timing difference for users with unusable passwords * CVE-2024-39330: Potential directory-traversal via Storage.save() * CVE-2024-39614: Potential denial-of-service vulnerability in get_supported_language_variant() Django 5.0.8 fixes the following CVEs: * CVE-2024-41989: Memory exhaustion in django.utils.numberformat.floatformat() * CVE-2024-41990: Potential denial-of-service vulnerability in django.utils.html.urlize() * CVE-2024-41991: Potential denial-of-service vulnerability in django.utils.html.urlize() and AdminURLFieldWidget * CVE-2024-42005: Potential SQL injection in QuerySet.values() and values_list() Further release Notes: https://docs.djangoproject.com/en/5.0/releases/ Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit f777ce1fd6b9e0537593a70940dc23f4ca177054) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index d5684a083c0..a5a8c7426db 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 1009c48d70060cadb40000cc15a8058a Django-5.0.3.tar.gz -sha256 5fb37580dcf4a262f9258c1f4373819aacca906431f505e4688e37f3a99195df Django-5.0.3.tar.gz +md5 fb167eef987a98421cad62036868a1ca Django-5.0.8.tar.gz +sha256 ebe859c9da6fead9c9ee6dbfa4943b04f41342f4cea2c4d8c978ef0d10694f2b Django-5.0.8.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 258ff9e0c1c..2c5c20ee4db 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.3 +PYTHON_DJANGO_VERSION = 5.0.8 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/e1/b1/ac6a16aaf0049637b50afbcf06b8ec2fa5c6ce42d4ae6ba66bbaf4c3609a +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/79/1c/55733805bb735e26fee0430045efdb61df6fd704b6aebf2154875ef9e6a9 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From c6a47974b0950a7c0b9a8b3cefb229ed0f4da658 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 2 Sep 2024 21:00:20 +0300 Subject: [PATCH 2642/3013] package/wpa_supplicant: macsec offload needs headers >= v5.7 Hardware offload in Linux macsec driver is enabled in compile time if libnl version is >= v3.6. However this is not enough for successful build since enum 'macsec_offload' has been added to Linux headers only since Linux >= v5.7. Add upstream commit that extends compile time condition for the enablement of the macsec hardware offload adding Linux headers version check. Fixes: - http://autobuild.buildroot.net/results/b59d5bc5bd17683a3a1e3577c40c802e81911f84/ Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- ...dware-offload-requires-Linux-headers.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/wpa_supplicant/0002-macsec_linux-Hardware-offload-requires-Linux-headers.patch diff --git a/package/wpa_supplicant/0002-macsec_linux-Hardware-offload-requires-Linux-headers.patch b/package/wpa_supplicant/0002-macsec_linux-Hardware-offload-requires-Linux-headers.patch new file mode 100644 index 00000000000..7330319d060 --- /dev/null +++ b/package/wpa_supplicant/0002-macsec_linux-Hardware-offload-requires-Linux-headers.patch @@ -0,0 +1,53 @@ +From 809d9d8172db8e2a08ff639875f838b5b86d2641 Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Thu, 22 Aug 2024 00:03:41 +0300 +Subject: [PATCH] macsec_linux: Hardware offload requires Linux headers >= v5.7 + +Hardware offload in Linux macsec driver is enabled in compile time if +libnl version is >= v3.6. This is not sufficient for successful build +since enum 'macsec_offload' has been added to Linux header if_link.h +in kernels v5.6 and v5.7, see commits: +- https://github.com/torvalds/linux/commit/21114b7feec29e4425a3ac48a037569c016a46c8 +- https://github.com/torvalds/linux/commit/76564261a7db80c5f5c624e0122a28787f266bdf + +New libnl with older Linux headers is a valid combination. This is how +hostapd build failure has been detected by Buildroot autobuilder, see: +- http://autobuild.buildroot.net/results/b59d5bc5bd17683a3a1e3577c40c802e81911f84/ + +Extend compile time condition for the enablement of the macsec hardware +offload adding Linux headers version check. + +Fixes: 40c139664439 ("macsec_linux: Add support for MACsec hardware offload") +Signed-off-by: Sergey Matyukevich + +Upstream: https://w1.fi/cgit/hostap/commit/?id=809d9d8172db8e2a08ff639875f838b5b86d2641 + +--- + src/drivers/driver_macsec_linux.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/drivers/driver_macsec_linux.c b/src/drivers/driver_macsec_linux.c +index c86715498..fad47a292 100644 +--- a/src/drivers/driver_macsec_linux.c ++++ b/src/drivers/driver_macsec_linux.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + #include "utils/common.h" +@@ -32,7 +33,8 @@ + + #define UNUSED_SCI 0xffffffffffffffff + +-#if LIBNL_VER_NUM >= LIBNL_VER(3, 6) ++#if (LIBNL_VER_NUM >= LIBNL_VER(3, 6) && \ ++ LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)) + #define LIBNL_HAS_OFFLOAD + #endif + +-- +2.46.0 + From 8d9628acba4b40d19dacaff7e7c5d302059dce03 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 1 Sep 2024 21:44:22 +0200 Subject: [PATCH 2643/3013] configs/imx8mqevk: bump TF-A, U-Boot and Linux Kernel version The imx8mqevk_defconfig is failing to build the arm-trusted-firmware package, with the error message: plat/imx/imx8m/hab.c: In function 'imx_hab_handler': plat/imx/imx8m/hab.c:65:57: error: array subscript 0 is outside array bounds of 'uint32_t[0]' {aka 'unsigned int[]'} [-Werror=array-bounds=] 65 | #define HAB_RVT_CHECK_TARGET_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x18)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is happening since commit dc0f721 "package/gcc: switch to 13.x as default". This commit fixes this build failure by updating the TF-A, U-Boot and Linux Kernel. Note: this imx8mqevk_defconfig uses the upstream Kernel (in contrast of the freescale_imx8mqevk_defconfig which is using the NXP BSP Kernel version). Also, this new uboot version needs gnutls and openssl, so the corresponding options are added to the defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7691701411 Signed-off-by: Julien Olivain Reviewed-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx8mqevk_defconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/imx8mqevk_defconfig b/configs/imx8mqevk_defconfig index 943a4799326..350b863ec9d 100644 --- a/configs/imx8mqevk_defconfig +++ b/configs/imx8mqevk_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -19,15 +19,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,rel_imx_5.4.24_2.1.0)/imx-atf-rel_imx_5.4.24_2.1.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,rel_imx_5.4.24_2.1.0)/uboot-imx-rel_imx_5.4.24_2.1.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y From ec12fde5d5da5d3f132a1a59fafd49bc522378c0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 2 Sep 2024 23:43:43 +0200 Subject: [PATCH 2644/3013] package/gerbera: fix build against fmt 11 The commit adds a backported upstream patch to fix the following build failure: build/gerbera-1.12.1/src/cds/cds_objects.cc: In static member function 'static std::string CdsObject::mapFlags(int)': build/gerbera-1.12.1/src/cds/cds_objects.cc:174:35: error: 'join' is not a member of 'fmt' Upstreaming the patch was added in version 2.2.0. Fixes: - http://autobuild.buildroot.org/results/aaf054b0bb336d45203b0d869ec6f9e00528ec8e Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .../0002-Build-against-fmt-11.0.0.patch | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 package/gerbera/0002-Build-against-fmt-11.0.0.patch diff --git a/package/gerbera/0002-Build-against-fmt-11.0.0.patch b/package/gerbera/0002-Build-against-fmt-11.0.0.patch new file mode 100644 index 00000000000..27dc05e5cb1 --- /dev/null +++ b/package/gerbera/0002-Build-against-fmt-11.0.0.patch @@ -0,0 +1,136 @@ +From bb9e80f4225d4ecb0d75d80c16b0ba3ddb12b1dc Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Mon, 2 Sep 2024 23:30:19 +0200 +Subject: [PATCH] Build against fmt 11.0.0 + +Signed-off-by: Dario Binacchi +Upstream: backport from upstream https://github.com/gerbera/gerbera/commit/f1f266efbb0a6adac160e428cd14c20f6ecd3e5d +--- + README.md | 2 +- + scripts/install-spdlog.sh | 4 +++- + scripts/versions.sh | 2 +- + src/database/sql_format.h | 3 +++ + src/util/logger.h | 5 ++++- + src/util/url_utils.cc | 7 ++++++- + test/scripting/mock/duk_helper.cc | 4 +++- + 7 files changed, 21 insertions(+), 6 deletions(-) + +diff --git a/README.md b/README.md +index a1992738f009..990a9af8855f 100644 +--- a/README.md ++++ b/README.md +@@ -53,7 +53,7 @@ sudo make install + | libiconv | | | | Required | Charset conversion | | + | sqlite3 | 3.7.0 | 3.35.5 | 3.36.0 | Required | Database storage | | + | zlib | | | | Required | Data compression | | +-| [fmtlib] | 7.1.3 | 7.1.3 | 9.1.0 | Required | Fast string formatting | | ++| [fmtlib] | 7.1.3 | 9.1.0 | 11.0.0 | Required | Fast string formatting | | + | [spdlog] | 1.8.1 | 1.8.5 | 1.11.0 | Required | Runtime logging | | + | [duktape] | 2.1.0 | 2.6.0 | 2.7.0 | Optional | Scripting Support | Enabled | + | mysql | | | | Optional | Alternate database storage | Disabled | +diff --git a/scripts/install-spdlog.sh b/scripts/install-spdlog.sh +index 8a758e35b579..5c1426e3d44f 100755 +--- a/scripts/install-spdlog.sh ++++ b/scripts/install-spdlog.sh +@@ -39,7 +39,9 @@ fi + mkdir build + cd build + +-cmake .. -DSPDLOG_FMT_EXTERNAL=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED} ++cmake .. -DSPDLOG_FMT_EXTERNAL=ON \ ++ -DBUILD_SHARED_LIBS=${BUILD_SHARED} \ ++ -DSPDLOG_BUILD_EXAMPLE=OFF + + if command -v nproc >/dev/null 2>&1; then + make "-j$(nproc)" +diff --git a/scripts/versions.sh b/scripts/versions.sh +index 19a0f80f79ac..8c1ffe7d590d 100644 +--- a/scripts/versions.sh ++++ b/scripts/versions.sh +@@ -36,7 +36,7 @@ else + EBML="1.4.4" + EXIV2="v0.27.5" + FFMPEGTHUMBNAILER="2.2.2" +- FMT="9.1.0" ++ FMT="11.0.0" + GOOGLETEST="1.12.1" + LASTFM="0.4.0" + MATROSKA="1.7.1" +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 551122eb7cf7..d64edae69372 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -26,6 +26,9 @@ + #define __SQL_FORMAT_H__ + + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + + struct SQLIdentifier { + constexpr SQLIdentifier(std::string_view name, char quote_begin, char quote_end) +diff --git a/src/util/logger.h b/src/util/logger.h +index a121ead31e95..d51e60430ed9 100644 +--- a/src/util/logger.h ++++ b/src/util/logger.h +@@ -36,6 +36,9 @@ + + #include + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + #include + #include + #include +@@ -135,7 +138,7 @@ template + struct fmt::formatter, char>> + : formatter> { + template +- auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) + { + return fmt::formatter>::format( + static_cast>(value), ctx); +diff --git a/src/util/url_utils.cc b/src/util/url_utils.cc +index b1c9fecef863..84f6f3be43d4 100644 +--- a/src/util/url_utils.cc ++++ b/src/util/url_utils.cc +@@ -23,11 +23,16 @@ Gerbera - https://gerbera.io/ + + #include "url_utils.h" // API + ++#include "exceptions.h" ++ ++ + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + #include + + #include "common.h" +-#include "exceptions.h" + + namespace URLUtils { + +diff --git a/test/scripting/mock/duk_helper.cc b/test/scripting/mock/duk_helper.cc +index 71bdc5d025f7..f1ab1cfef8a7 100644 +--- a/test/scripting/mock/duk_helper.cc ++++ b/test/scripting/mock/duk_helper.cc +@@ -24,8 +24,10 @@ + #include "duk_helper.h" + #include + #include +-#include + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + #include + + std::vector DukTestHelper::arrayToVector(duk_context* ctx, duk_idx_t idx) +-- +2.43.0 + From f69fe48404edaf83514920beecc46b2ab83927f1 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 1 Sep 2024 08:45:08 +0200 Subject: [PATCH 2645/3013] package/armadillo: temporarily update the site URL Following an email exchange with Conrad Sand, one of the maintainers of the project, I learned that version 9.900.2 has been moved to https://sourceforge.net/projects/arma/files/retired/. This patch fixes the package download error, waiting for a subsequent patch that will restore the previous URL to bump to a more recent version. Adding the .RETIRED suffix to the downloaded tarball generated the following error: armadillo-9.900.2.tar.xz.RETIRED: OK (sha256: d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05) >>> armadillo 9.900.2 Extracting buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED | buildroot/output/host/bin/tar --strip-components=1 -C buildroot/output/build/armadillo-9.900.2 -xf - /bin/bash: line 1: buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED: Permission denied buildroot/output/host/bin/tar: This does not look like a tar archive buildroot/output/host/bin/tar: Exiting with failure status due to previous errors make[1]: *** [package/pkg-generic.mk:213: buildroot/output/build/armadillo-9.900.2/.stamp_extracted] Error 2 which required the addition of ARMADILLO_EXTRACT_CMDS to be fixed. Finally, it was also necessary to modify the tarball's hash. Fixes: - http://autobuild.buildroot.org/results/d4e9e7b453960a4f62a199344b30b729a4f235bc Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/armadillo/armadillo.hash | 2 +- package/armadillo/armadillo.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/armadillo/armadillo.hash b/package/armadillo/armadillo.hash index cc91fb456aa..9b19b8c8c4a 100644 --- a/package/armadillo/armadillo.hash +++ b/package/armadillo/armadillo.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05 armadillo-9.900.2.tar.xz +sha256 d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05 armadillo-9.900.2.tar.xz.RETIRED # License files, locally calculated sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk index 8661bfd9da8..81684a44f72 100644 --- a/package/armadillo/armadillo.mk +++ b/package/armadillo/armadillo.mk @@ -5,8 +5,8 @@ ################################################################################ ARMADILLO_VERSION = 9.900.2 -ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz -ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma +ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz.RETIRED +ARMADILLO_SITE = https://sourceforge.net/projects/arma/files/retired ARMADILLO_INSTALL_STAGING = YES ARMADILLO_LICENSE = Apache-2.0 ARMADILLO_LICENSE_FILES = LICENSE.txt @@ -30,4 +30,8 @@ ARMADILLO_CONF_OPTS += -DLAPACK_FOUND=ON ARMADILLO_DEPENDENCIES += lapack endif +define ARMADILLO_EXTRACT_CMDS + $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) $($(PKG)_DL_DIR)/$(ARMADILLO_SOURCE) +endef + $(eval $(cmake-package)) From 73a5ae259d1a27356469c445b27294d1c0223dfb Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 1 Sep 2024 08:45:09 +0200 Subject: [PATCH 2646/3013] DEVELOPERS: add Dario Binacchi for armadillo Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 919a91dd259..069965680b2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -790,6 +790,7 @@ F: configs/imx6ulz_bsh_smm_m2_defconfig F: configs/imx8mn_bsh_smm_s2_defconfig F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: configs/stm32f769_disco_sd_defconfig +F: package/armadillo/ F: package/babeld/ F: package/sscep/ F: package/uuu/ From 73432ca62555d3e0d54f2f26df32169427ff2e6a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 18 Jun 2024 11:23:29 +0200 Subject: [PATCH 2647/3013] package/cryptsetup: bump version to 2.7.3 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c56e71b46007bc1d70e9c13267109abe4776f49) Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 531432aaaf2..dfee537a4a4 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 da5d1419e2a86e01aa32fd79582cd54d208857cb541bca2fd426a5ff1aaabbc3 cryptsetup-2.7.1.tar.xz +sha256 b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456 cryptsetup-2.7.3.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index b15f4585763..d5046d99433 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From f1387b8003ba6e881efa214d0ef9f3227f10d9ca Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 7 Aug 2024 22:55:09 +0200 Subject: [PATCH 2648/3013] package/cryptsetup: bump version to 2.7.4 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit eea735bb6d89d99e8d536b839300e0432a3fcaab) Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index dfee537a4a4..e0cb65642d4 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456 cryptsetup-2.7.3.tar.xz +sha256 dce29903a58f7b774fe61191e7e6de955de0f40d9e27b0028ffcf3438c0e9480 cryptsetup-2.7.4.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d5046d99433..15cadb28408 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From cf09b890c9b34b69d36879ed25adb259becca0c1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Aug 2024 00:16:17 +0200 Subject: [PATCH 2649/3013] DEVELOPERS: drop Ariel D'Alessandro : host aspmx.l.google.com[2a00:1450:400c:c07::1a] said: 550-5.2.1 The email account that you tried to reach is inactive. For more 550-5.2.1 information, go to 550 5.2.1 https://support.google.com/mail/?p=DisabledUser ffacd0b85a97d-36bbd075381si7797549f8f.548 - gsmtp (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni (cherry picked from commit 53116d091562fb260460382fa295738323decf3d) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 09de5c823b0..c3b1d66b016 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -258,12 +258,6 @@ F: configs/snps_archs38_axs103_defconfig F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig -N: Ariel D'Alessandro -F: board/bsh/ -F: configs/imx8mn_bsh_smm_s2_pro_defconfig -F: package/axfsutils/ -F: package/mali-t76x/ - N: Arnaud Aujon F: package/espeak/ From 1fcb43692cd63d999b22bc6426441df6daea4cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Thu, 8 Aug 2024 18:06:07 +0200 Subject: [PATCH 2650/3013] package/zfs: replace wip patch by upstream patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Salvador Rufo Signed-off-by: Thomas Petazzoni (cherry picked from commit 08edb3c22a61b6de28e1472faceaebc3399b6537) Signed-off-by: Peter Korsgaard --- ...ll-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch | 70 ++++++++ ...s-ignore-if-SEEK_DATA-is-not-defined.patch | 162 ------------------ package/zfs/zfs.mk | 3 - 3 files changed, 70 insertions(+), 165 deletions(-) create mode 100644 package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch delete mode 100644 package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch diff --git a/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch new file mode 100644 index 00000000000..64972c4f570 --- /dev/null +++ b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch @@ -0,0 +1,70 @@ +From 2ccefd4aff98cf355c7d13b3f92bb4d390dfa522 Mon Sep 17 00:00:00 2001 +From: Tino Reichardt +Date: Sun, 4 Aug 2024 11:58:13 +0200 +Subject: [PATCH] ZTS: small fix for SEEK_DATA/SEEK_HOLE tests + +Some libc's like uClibc lag the proper definition of SEEK_DATA +and SEEK_HOLE. Since we have only two files in ZTS which use +these definitons, let's define them by hand: + +``` +#ifndef SEEK_DATA +#define SEEK_DATA 3 +#endif +#ifndef SEEK_HOLE +#define SEEK_HOLE 4 +#endif +``` + +There should be no failures, because: +- FreeBSD has support for SEEK_DATA/SEEK_HOLE since FreeBSD 8 +- Linux has it since Linux 3.1 +- the libc will submit the parameters unchanged to the kernel + +Signed-off-by: Tino Reichardt +Signed-off-by: José Luis Salvador Rufo +Upstream: https://github.com/openzfs/zfs/commit/bd949b10bed3d99e3b40249d9c8d74a0b4304774 +--- + tests/zfs-tests/cmd/mmap_seek.c | 10 ++++++++++ + tests/zfs-tests/tests/functional/cp_files/seekflood.c | 7 +++++++ + 2 files changed, 17 insertions(+) + +diff --git a/tests/zfs-tests/cmd/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek.c +index 7be92d109565..2d250554a13f 100644 +--- a/tests/zfs-tests/cmd/mmap_seek.c ++++ b/tests/zfs-tests/cmd/mmap_seek.c +@@ -35,6 +35,16 @@ + #include + #endif + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#ifndef SEEK_HOLE ++#define SEEK_HOLE 4 ++#endif ++#endif ++ + static void + seek_data(int fd, off_t offset, off_t expected) + { +diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +index 02c2c8e6eca5..f832db85970d 100644 +--- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c ++++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +@@ -36,6 +36,13 @@ + #include + #include + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#endif ++ + #define DATASIZE (4096) + char data[DATASIZE]; + diff --git a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch deleted file mode 100644 index f47c615d109..00000000000 --- a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 93e7f8889072047276da11fe6a525d3f0ea16205 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= - -Date: Sat, 11 May 2024 22:40:12 +0200 -Subject: [PATCH] tests/cp_files: ignore if SEEK_DATA is not defined -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case -cp_files if SEEK_DATA is not defined. - -Signed-off-by: José Luis Salvador Rufo -Upstream: https://github.com/openzfs/zfs/pull/16169 ---- - config/user-unistd.m4 | 24 ++++++++++++++++++++++++ - config/user.m4 | 1 + - config/zfs-build.m4 | 1 + - tests/test-runner/bin/zts-report.py.in | 1 + - tests/zfs-tests/Makefile.am | 2 ++ - tests/zfs-tests/cmd/Makefile.am | 6 +++++- - tests/zfs-tests/tests/Makefile.am | 14 +++++++++----- - 7 files changed, 43 insertions(+), 6 deletions(-) - create mode 100644 config/user-unistd.m4 - -diff --git a/config/user-unistd.m4 b/config/user-unistd.m4 -new file mode 100644 -index 000000000..302bc0bde ---- /dev/null -+++ b/config/user-unistd.m4 -@@ -0,0 +1,24 @@ -+dnl # -+dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case. -+dnl # -+AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [ -+ AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA) -+ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ #ifndef _GNU_SOURCE -+ #define _GNU_SOURCE -+ #endif -+ #include -+ #if defined(SEEK_DATA) -+ int ok; -+ #else -+ error fail -+ #endif -+ ]])], [ -+ user_unistd_seek_data=yes -+ AC_MSG_RESULT([yes]) -+ ], [ -+ user_unistd_seek_data=no -+ AC_MSG_RESULT([no]) -+ ]) -+]) -diff --git a/config/user.m4 b/config/user.m4 -index 6ec27a5b2..2326a44be 100644 ---- a/config/user.m4 -+++ b/config/user.m4 -@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ - ZFS_AC_CONFIG_USER_LIBAIO - ZFS_AC_CONFIG_USER_LIBATOMIC - ZFS_AC_CONFIG_USER_LIBFETCH -+ ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA - ZFS_AC_CONFIG_USER_AIO_H - ZFS_AC_CONFIG_USER_CLOCK_GETTIME - ZFS_AC_CONFIG_USER_PAM -diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 -index bb5a85d81..578692676 100644 ---- a/config/zfs-build.m4 -+++ b/config/zfs-build.m4 -@@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ - [test "x$qatsrc" != x ]) - AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) - AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) -+ AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ]) - AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) - ]) - -diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in -index ecc50f487..3a00345ed 100755 ---- a/tests/test-runner/bin/zts-report.py.in -+++ b/tests/test-runner/bin/zts-report.py.in -@@ -162,6 +162,7 @@ known = { - ['FAIL', rewind_reason], - 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], - 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], -+ 'cp_files/cp_stress': ['SKIP', 16169], - 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], - 'privilege/setup': ['SKIP', na_reason], - 'refreserv/refreserv_004_pos': ['FAIL', known_reason], -diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am -index 3dd1a6452..8ae790057 100644 ---- a/tests/zfs-tests/Makefile.am -+++ b/tests/zfs-tests/Makefile.am -@@ -13,8 +13,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test - %C%_tests_functional_hkdf_hkdf_test_LDADD = \ - libzpool.la - -+if WANT_UNISTD_SEEK_DATA - scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files - scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood -+endif - - if BUILD_LINUX - scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile -diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am -index 23848a82f..69bba3039 100644 ---- a/tests/zfs-tests/cmd/Makefile.am -+++ b/tests/zfs-tests/cmd/Makefile.am -@@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec - scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write --scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files - scripts_zfs_tests_bin_PROGRAMS += %D%/ctime - scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update - scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write -@@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test - scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket - - -+if WANT_UNISTD_SEEK_DATA -+scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files -+endif -+ -+ - scripts_zfs_tests_bin_PROGRAMS += %D%/badsend - %C%_badsend_LDADD = \ - libzfs_core.la \ -diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am -index cc66d762f..1e9f06a7e 100644 ---- a/tests/zfs-tests/tests/Makefile.am -+++ b/tests/zfs-tests/tests/Makefile.am -@@ -1394,11 +1394,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/compression/l2arc_encrypted.ksh \ - functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ - functional/compression/setup.ksh \ -- functional/cp_files/cleanup.ksh \ -- functional/cp_files/cp_files_001_pos.ksh \ -- functional/cp_files/cp_files_002_pos.ksh \ -- functional/cp_files/cp_stress.ksh \ -- functional/cp_files/setup.ksh \ - functional/crtime/cleanup.ksh \ - functional/crtime/crtime_001_pos.ksh \ - functional/crtime/setup.ksh \ -@@ -2108,3 +2103,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/idmap_mount/idmap_mount_003.ksh \ - functional/idmap_mount/idmap_mount_004.ksh \ - functional/idmap_mount/idmap_mount_005.ksh -+ -+if WANT_UNISTD_SEEK_DATA -+nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ -+ functional/cp_files/cleanup.ksh \ -+ functional/cp_files/cp_files_001_pos.ksh \ -+ functional/cp_files/cp_files_002_pos.ksh \ -+ functional/cp_files/cp_stress.ksh \ -+ functional/cp_files/setup.ksh -+endif --- -2.45.2 - diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index e0fa3926704..e51ade55a42 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,9 +12,6 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch -ZFS_AUTORECONF = YES - ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux # sysvinit installs only a commented-out modules-load.d/ config file From 5f8758451a079bae9b9bd045ecedf78469686e1b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Aug 2024 21:21:26 +0200 Subject: [PATCH 2651/3013] package/mjpg-streamer: fix undefined symbol error Fixes runtime error: dlopen: /usr/lib/mjpg-streamer/input_uvc.so: undefined symbol: resolutions_help Patch was suggested by Thomas: http://lists.busybox.net/pipermail/buildroot/2024-August/759732.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit fdbc8d97cb166ce721df96acda6d291f6f2c4aa9) Signed-off-by: Peter Korsgaard --- ...-all-symbols-of-mjpg_streamer-binary.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch diff --git a/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch new file mode 100644 index 00000000000..771ee838327 --- /dev/null +++ b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch @@ -0,0 +1,33 @@ +From fbde1593948ae95f287b2167d0bec5b27948cc01 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Aug 2024 17:04:55 +0200 +Subject: [PATCH] Export all symbols of mjpg_streamer binary + +Fixes runtime error with stripped binary + + dlopen: /usr/lib/mjpg-streamer/input_uvc.so: undefined symbol: resolutions_help + +Source: http://lists.busybox.net/pipermail/buildroot/2024-August/759732.html + +Upstream: https://github.com/jacksonliam/mjpg-streamer/pull/401 + +Signed-off-by: Bernd Kuhls +--- + mjpg-streamer-experimental/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mjpg-streamer-experimental/CMakeLists.txt b/mjpg-streamer-experimental/CMakeLists.txt +index cf26620..3ff12cd 100644 +--- a/mjpg-streamer-experimental/CMakeLists.txt ++++ b/mjpg-streamer-experimental/CMakeLists.txt +@@ -92,6 +92,7 @@ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + add_executable(mjpg_streamer mjpg_streamer.c + utils.c) + ++set_property(TARGET mjpg_streamer PROPERTY ENABLE_EXPORTS ON) + target_link_libraries(mjpg_streamer pthread dl) + install(TARGETS mjpg_streamer DESTINATION bin) + +-- +2.39.2 + From 4cf319c2670e8b5c1a437e504f99558ee90f8ccb Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 3 Sep 2024 17:56:21 +0200 Subject: [PATCH 2652/3013] package/cache-calibrator: fix build failure for implicit declaration Fixes: - http://autobuild.buildroot.org/results/db996c894c810ff5c7f4263975d1def0edef6d55 Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- ...e-due-to-getpagesize-implicit-declar.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/cache-calibrator/0002-Fix-build-failure-due-to-getpagesize-implicit-declar.patch diff --git a/package/cache-calibrator/0002-Fix-build-failure-due-to-getpagesize-implicit-declar.patch b/package/cache-calibrator/0002-Fix-build-failure-due-to-getpagesize-implicit-declar.patch new file mode 100644 index 00000000000..fcad6694816 --- /dev/null +++ b/package/cache-calibrator/0002-Fix-build-failure-due-to-getpagesize-implicit-declar.patch @@ -0,0 +1,33 @@ +From 29c4e0038b212e953cc59ac8b31d4541db758a3d Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Tue, 3 Sep 2024 17:43:44 +0200 +Subject: [PATCH] Fix build failure due to getpagesize implicit declaration + +The patch fixes the following build error: + +calibrator.c: In function 'runCache': +calibrator.c:267:24: error: implicit declaration of function 'getpagesize' [-Wimplicit-function-declaration] + +Signed-off-by: Dario Binacchi +Upstream: sent to Stefan Manegold Stefan.Manegold@cwi.nl +--- + calibrator.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/calibrator.c b/calibrator.c +index e045dfdcb96b..fd2fadb26020 100644 +--- a/calibrator.c ++++ b/calibrator.c +@@ -37,9 +37,7 @@ + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +-/* + #include +-*/ + #include + #include + #include +-- +2.43.0 + From 3cf1a6f80d3bb6a97b22111534dfeaa129b73d21 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Wed, 28 Aug 2024 13:02:13 +0200 Subject: [PATCH 2653/3013] package/qt6/qt6declarative: fix typo Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6declarative/qt6declarative.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk index 57a89a3b6e7..ecf14d3323d 100644 --- a/package/qt6/qt6declarative/qt6declarative.mk +++ b/package/qt6/qt6declarative/qt6declarative.mk @@ -1,6 +1,6 @@ ################################################################################ # -# qt6declaratve +# qt6declarative # ################################################################################ From ac51d214659139ad8260b21b1e94cb631994fc62 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Aug 2024 14:15:37 +0200 Subject: [PATCH 2654/3013] package/p910nd: update download URL Project moved to Github. Update download URL and hash. License file got renamed, but it is still GPLv2. Fixes: http://autobuild.buildroot.org/results/6e0/6e0e34c342fe712d5314de80488a2d034a2f5983/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/p910nd/p910nd.hash | 4 ++-- package/p910nd/p910nd.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/p910nd/p910nd.hash b/package/p910nd/p910nd.hash index 93b13899096..0f69e402d59 100644 --- a/package/p910nd/p910nd.hash +++ b/package/p910nd/p910nd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f p910nd-0.97.tar.bz2 -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 a1bcc2dd75bad4e00a9de5098dbd970e8380f978fc09292bcfa15852af6a6964 p910nd-0.97.tar.gz +sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d LICENSE.md diff --git a/package/p910nd/p910nd.mk b/package/p910nd/p910nd.mk index 163ab1bcf2e..fea8aafd501 100644 --- a/package/p910nd/p910nd.mk +++ b/package/p910nd/p910nd.mk @@ -5,10 +5,9 @@ ################################################################################ P910ND_VERSION = 0.97 -P910ND_SITE = http://downloads.sourceforge.net/project/p910nd/p910nd/$(P910ND_VERSION) -P910ND_SOURCE = p910nd-$(P910ND_VERSION).tar.bz2 +P910ND_SITE = $(call github,kenyapcomau,p910nd,$(P910ND_VERSION)) P910ND_LICENSE = GPL-2.0 -P910ND_LICENSE_FILES = COPYING +P910ND_LICENSE_FILES = LICENSE.md define P910ND_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) From a784191d3fd77a7af444495c065d55f1c5889943 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Aug 2024 14:59:40 +0200 Subject: [PATCH 2655/3013] package/fbdump: fix gcc 14.x issue Following error is seen with gcc 14.x: /home/autobuild/autobuild/instance-0/output-1/host/bin/armeb-buildroot-linux-uclibcgnueabi-gcc -DHAVE_CONFIG_H -I. -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -O2 -fomit-frame-pointer -s -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -c `test -f 'main.c' || echo './'`main.c main.c: In function 'main': main.c:82:49: error: passing argument 4 of 'Options_parse' from incompatible pointer type [-Wincompatible-pointer-types] 82 | if( Options_parse( opt_template, &opts, argc, argv ) != 0 ) | ^~~~ | | | char ** In file included from main.c:17: options.h:32:83: note: expected 'const char **' but argument is of type 'char **' 32 | int Options_parse( const OptionTemplate *tmplt, void *opts, int argc, const char *argv[] ); | ~~~~~~~~~~~~^~~~~~ make[3]: *** [Makefile:240: main.o] Error 1 make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/fbdump-0.4.2/src' make[2]: *** [Makefile:201: all-recursive] Error 1 make[2]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/fbdump-0.4.2' make[1]: *** [Makefile:156: all] Error 2 make[1]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/fbdump-0.4.2' Fixes: http://autobuild.buildroot.net/results/3a0/3a0abff75023e257f3d6048688485a380b72fbb3 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/fbdump/0001-fix-gcc14-compile-issue.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 package/fbdump/0001-fix-gcc14-compile-issue.patch diff --git a/package/fbdump/0001-fix-gcc14-compile-issue.patch b/package/fbdump/0001-fix-gcc14-compile-issue.patch new file mode 100644 index 00000000000..a554b4faf60 --- /dev/null +++ b/package/fbdump/0001-fix-gcc14-compile-issue.patch @@ -0,0 +1,15 @@ +Signed-off-by: Waldemar Brodkorb +Upstream: N/A no SCM, not active anymore + +diff -Nur fbdump-0.4.2.orig/src/main.c fbdump-0.4.2/src/main.c +--- fbdump-0.4.2.orig/src/main.c 2007-03-03 04:14:37.000000000 +0100 ++++ fbdump-0.4.2/src/main.c 2024-08-16 09:25:42.828125778 +0200 +@@ -58,7 +58,7 @@ + } + + +-int main( int argc, char *argv[] ) ++int main( int argc, const char *argv[] ) + { + Options opts = { + .fbdev = DEFAULT_DEVICE, From 248c2d045e780b23e6ed19fec1f242460ac464e3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 3 Sep 2024 20:05:29 +0200 Subject: [PATCH 2656/3013] boot/arm-trusted-firmware: add -no-pie to LDFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arm Trusted Firmware (TF-A) v2.11 fails to build in some situations with the error message: ld: build/qemu/release/bl1/bl1.elf: error: PHDR segment not covered by LOAD segment This error can be reproduced with the commands: make qemu_aarch64_ebbr_defconfig utils/config --set-str BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE v2.11 make olddefconfig make This issue was reported in [1]. This error is coming from a check that was made more strict since binutils ld 2.34. This error message is normally related to dynamic linker, so it should normally not apply to a package like TF-A. When BR2_SHARED_LIBS=y (shared libraries only) and BR2_PIC_PIE=y (Build code with PIC/PIE), the Buildroot toolchain-wrapper will try to enable position-independent code/executables. See [2]. This configuration is a common default. Arm Trusted Firmware (TF-A) build system, on its side, tries to detect if the toolchain enables PIE automatically. It does so by checking if --enable-default-pie is in the output of "$(CC) -v". If found, the TF-A build system tries to disable PIE globally (it can be explicitly enabled again with the ENABLE_PIE=1 build variable, in some specific configurations). This detection mechanism is not working with the Buildroot toolchain wrapper which is enabling PIE silently. See [3]. Commit 1061ed6c "boot/arm-trusted-firmware: add -fno-PIE to CFLAGS" added the option -fno-PIE in CFLAGS for that reason. See [4]. TF-A >= v2.11 now needs the same treatment for LDFLAGS. This is because TF-A switched the default linker from "ld" to "gcc", in upstream commit [5]. This change makes the Buildroot toolchain wrapper to enable PIE at link, without passing the "--no-dynamic-linker" option that would normally avoids this ld error. Also, even if there is no defconfigs using the BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION config directive, it is worth mentioning that the Buildroot TF-A "latest version" was updated to v2.11 in commit 9c50759cd "boot/arm-trusted-firmware: bump to v2.11". See [6]. This latest version is the default choice. So Buildroot is subject to generate this build failure. This can be reproduced with the commands: cat <.config BR2_aarch64=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TOOLCHAIN_EXTERNAL=y EOF make olddefconfig make arm-trusted-firmware This commit fixes the issue by adding the option "-no-pie" in LDFLAGS. This will prevent the Buildroot toolchain wrapper to enable PIE, for versions using "gcc" as a linker. This change should also remain compatible with older TF-A < 2.11 using "ld" as a linker, since "-no-pie" is also a valid ld option. Fixes: ld: build/qemu/release/bl1/bl1.elf: error: PHDR segment not covered by LOAD segment [1] https://github.com/TrustedFirmware-A/trusted-firmware-a/issues/26 [2] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08-rc3/toolchain/toolchain-wrapper.c?ref_type=tags#L403 [3] https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a.git/+/refs/tags/v2.11.0/Makefile#711 [4] https://gitlab.com/buildroot.org/buildroot/-/commit/1061ed6c6273e90618b05ddc0cb66be17364da33 [5] https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a.git/+/2f1c5e7eb1775b252fa4998e10093b8ac34ca699%5E%21/ [6] https://gitlab.com/buildroot.org/buildroot/-/commit/9c50759cd1677e1739078239a1e86fb1d62e33e8 Reported-by: Vincent Stehlé Tested-by: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index a3a44feea94..172a930b5c7 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -77,11 +77,13 @@ endif ifeq ($(BR2_PIC_PIE),y) ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-PIE +ARM_TRUSTED_FIRMWARE_LDFLAGS += -no-pie endif ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ - CFLAGS="$(ARM_TRUSTED_FIRMWARE_CFLAGS)" + CFLAGS="$(ARM_TRUSTED_FIRMWARE_CFLAGS)" \ + LDFLAGS="$(ARM_TRUSTED_FIRMWARE_LDFLAGS)" ifeq ($(BR2_ARM_CPU_ARMV7A),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 From efd5f1aae45e841bf1a40c977253f1cb5e229396 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 4 Sep 2024 00:03:41 +0200 Subject: [PATCH 2657/3013] package/mender: needs libopenssl engine support Buildroot commit 623d3bbe43e9193aa8e3395367d01af59071b859 disables engine support when BR2_PACKAGE_LIBOPENSSL_ENGINES is not set. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7717334889 http://autobuild.buildroot.org/results/818/818f8c156311010d03d2f64b42231f486b543837 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/mender/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mender/Config.in b/package/mender/Config.in index 4831548f76d..c9b9d0b757b 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MENDER select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help From 8de200895c9ee06d6d8e20fb5809a143dcead6a5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 4 Sep 2024 07:37:01 +0200 Subject: [PATCH 2658/3013] package/libopenssl: security bump version to 3.3.2 Fixes the following security issues: - CVE-2024-6119: Possible denial of service in X.509 name checks [Moderate severity] https://openssl-library.org/news/secadv/20240903.txt - CVE-2024-5535: SSL_select_next_proto buffer overread [Low severity] https://openssl-library.org/news/secadv/20240528.txt Updated _SITE and project URL according to https://openssl-library.org/post/2024-04-30-releases-distribution-changes/ Signed-off-by: Bernd Kuhls [Peter: add CVE details] Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 4 ++-- package/openssl/Config.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index dd1c99f7a77..52fce1eb3a5 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.3.1.tar.gz.sha256 -sha256 777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e openssl-3.3.1.tar.gz +# From https://github.com/openssl/openssl/releases/download/openssl-3.3.2/openssl-3.3.2.tar.gz.sha256 +sha256 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 openssl-3.3.2.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 89a9189bb85..82b924c557c 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.3.1 -LIBOPENSSL_SITE = https://www.openssl.org/source +LIBOPENSSL_VERSION = 3.3.2 +LIBOPENSSL_SITE = https://github.com/openssl/openssl/releases/download/openssl-$(LIBOPENSSL_VERSION) LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 LIBOPENSSL_LICENSE_FILES = LICENSE.txt diff --git a/package/openssl/Config.in b/package/openssl/Config.in index 30db152fadb..d255a055961 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -35,7 +35,7 @@ config BR2_PACKAGE_LIBOPENSSL (TLS v1) as well as a full-strength general-purpose cryptography library. - http://www.openssl.org/ + https://openssl-library.org/ Note: Some helper scripts need perl. From 6a506262e4d7bb1b0bc3b9ab3de9f14dfebd78dc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 4 Sep 2024 22:28:36 +0200 Subject: [PATCH 2659/3013] package/clamav: security bump version to 1.0.7 Fixes CVE-2024-20505 & CVE-2024-20506: https://blog.clamav.net/2024/09/clamav-141-132-107-and-010312-security.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index b2b7bfb9871..8e8351cf002 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 12dcd842b6c46e5a9fdf2f5c16304efafe53310ac4605990465651b0c42227b2 clamav-1.0.6.tar.gz +sha256 f4d67240a8b2e882e18f864529040084617de066cdab9b7684951ace6ea6f3cf clamav-1.0.7.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index eb3abaa21c9..d748a33db7d 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.6 +CLAMAV_VERSION = 1.0.7 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ From f18790aedc9da2d42d94c28f7293b4251cddb5cb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 4 Sep 2024 22:38:01 +0200 Subject: [PATCH 2660/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 526dd9ff009..e38f8104e08 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index ebaad029b86..ffc25f79593 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 900d567ff01824708ce24c3b37faaef03e6f6145411dd447a6ff2edc8c5db3a9 linux-6.10.7.tar.xz -sha256 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 linux-6.6.48.tar.xz -sha256 f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 linux-6.1.107.tar.xz +sha256 c0923235779d4606bba87f72b6fe11f796e9e40c1ca9f4d5dbe04cd47ee3c595 linux-6.10.8.tar.xz +sha256 2c56dac2b70859c16b4ef651befb0d28c227498bd3eee08e8a45a357f22dd3b7 linux-6.6.49.tar.xz +sha256 3f4e4e89a00e221a6dd1174779e0028794f44f4624ad6a31c79f3b7796688ca2 linux-6.1.108.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a36dd3e82ceb634afded31f2656568f57c4d9c4b399859f298b18116df11c6fe linux-5.15.165.tar.xz -sha256 19b099c67324bba6378e22dc51ad3906e4dcd6a908d137766b4bfa9174ddd11a linux-5.10.224.tar.xz -sha256 5582770976d33bb7bf9494e0fa0c49f449aa02b0133d00a5a198b6c208dd7de0 linux-5.4.282.tar.xz +sha256 e56caae259b85b7685ee589075d58bb7b227024497a60fa27a7b43e0b48839cf linux-5.15.166.tar.xz +sha256 85d7bf3a807538b9032e3f798ab978da9b77352bcb526534038c351a4f39e01c linux-5.10.225.tar.xz +sha256 250c6a3199b42a1cb1427c9bbeacf5d90fb91bcf9f227195f484a1c877e1f797 linux-5.4.283.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 9d671a12b00301b7ce63022d4e4afa3e40aa318f8f7f25a1147e602fdb1047a1 linux-4.19.320.tar.xz +sha256 f13aa1465a2578a910f64b65d743d167466edfb1e0671bc70fa2328cb66b06d9 linux-4.19.321.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 51706f582a6..52971ca8bd3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -423,13 +423,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.320" if BR2_KERNEL_HEADERS_4_19 - default "5.4.282" if BR2_KERNEL_HEADERS_5_4 - default "5.10.224" if BR2_KERNEL_HEADERS_5_10 - default "5.15.165" if BR2_KERNEL_HEADERS_5_15 - default "6.1.107" if BR2_KERNEL_HEADERS_6_1 - default "6.6.48" if BR2_KERNEL_HEADERS_6_6 - default "6.10.7" if BR2_KERNEL_HEADERS_6_10 + default "4.19.321" if BR2_KERNEL_HEADERS_4_19 + default "5.4.283" if BR2_KERNEL_HEADERS_5_4 + default "5.10.225" if BR2_KERNEL_HEADERS_5_10 + default "5.15.166" if BR2_KERNEL_HEADERS_5_15 + default "6.1.108" if BR2_KERNEL_HEADERS_6_1 + default "6.6.49" if BR2_KERNEL_HEADERS_6_6 + default "6.10.8" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 87bdffd543a1e52ea2cfe6b67618e310bcd96a52 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 31 Aug 2024 13:36:26 +0200 Subject: [PATCH 2661/3013] package/libgtk4: fix execinfo compile error ../testsuite/reftests/gtk-reftest.c:28:10: fatal error: execinfo.h: No such file or directory We don't need the test suite, so disable it. Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- package/libgtk4/libgtk4.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgtk4/libgtk4.mk b/package/libgtk4/libgtk4.mk index 8cb7fd03848..48bfc80c00f 100644 --- a/package/libgtk4/libgtk4.mk +++ b/package/libgtk4/libgtk4.mk @@ -26,6 +26,7 @@ LIBGTK4_DEPENDENCIES = \ LIBGTK4_CONF_OPTS = \ -Dbuild-tests=false \ + -Dbuild-testsuite=false \ -Dmedia-ffmpeg=disabled \ -Dprint-cpdb=disabled \ -Dvulkan=disabled \ From 253bbaae01a4ee200072d3851e7d37887086065f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 9 Aug 2024 14:12:08 +0200 Subject: [PATCH 2662/3013] package/ffmpeg: fix gcc 14.x compile issue Fixes: - http://autobuild.buildroot.net/results/a04/a040cbc991da14c68302062ce96121b1e55c690e Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit ade2db3ad2e2693ba5e4bfdad0aa75eabe9e5e4c) Signed-off-by: Peter Korsgaard --- ...ay-dvd-Use-correct-pointer-types-on-.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch diff --git a/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch new file mode 100644 index 00000000000..a77a0cf5ece --- /dev/null +++ b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch @@ -0,0 +1,52 @@ +From 347a70f101be28f8d78e8fd62ffc3a78324f49e9 Mon Sep 17 00:00:00 2001 +From: Andreas Rheinhardt +Date: Thu, 28 Mar 2024 05:35:36 +0100 +Subject: [PATCH] avcodec/pcm-bluray/dvd: Use correct pointer types on BE + +Signed-off-by: Andreas Rheinhardt +Signed-off-by: Waldemar Brodkorb +Upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/347a70f101be28f8d78e8fd62ffc3a78324f49e9 +--- + libavcodec/pcm-bluray.c | 5 +++-- + libavcodec/pcm-dvd.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c +index f65609514a..235020d78f 100644 +--- a/libavcodec/pcm-bluray.c ++++ b/libavcodec/pcm-bluray.c +@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, + samples *= num_source_channels; + if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { + #if HAVE_BIGENDIAN +- bytestream2_get_buffer(&gb, dst16, buf_size); ++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size); + #else + do { + *dst16++ = bytestream2_get_be16u(&gb); +@@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, + if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { + do { + #if HAVE_BIGENDIAN +- bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2); ++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, ++ avctx->ch_layout.nb_channels * 2); + dst16 += avctx->ch_layout.nb_channels; + #else + channel = avctx->ch_layout.nb_channels; +diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c +index 419b2a138f..319746c62e 100644 +--- a/libavcodec/pcm-dvd.c ++++ b/libavcodec/pcm-dvd.c +@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, + switch (avctx->bits_per_coded_sample) { + case 16: { + #if HAVE_BIGENDIAN +- bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); ++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size); + dst16 += blocks * s->block_size / 2; + #else + int samples = blocks * avctx->ch_layout.nb_channels; +-- +2.39.2 + From e8ba4ef9bb594cf6719f220b9950089ae390b198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Sun, 11 Aug 2024 12:34:25 +0200 Subject: [PATCH 2663/3013] package/aer-inject: fix build error due to missing basename() prototype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/e613fc777051be6325d7e3c088d5f723fab518fa/ Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni (cherry picked from commit 2a700617cc1aa14deb9f4e4f5c63e19c77901389) Signed-off-by: Peter Korsgaard --- package/aer-inject/0001-libgen-basename.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/aer-inject/0001-libgen-basename.patch diff --git a/package/aer-inject/0001-libgen-basename.patch b/package/aer-inject/0001-libgen-basename.patch new file mode 100644 index 00000000000..0762f5e3058 --- /dev/null +++ b/package/aer-inject/0001-libgen-basename.patch @@ -0,0 +1,35 @@ +From 197f51d29a01f46750fa6928409301aa8f1163d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 25 Mar 2024 09:04:40 -0700 +Subject: aer-inject: Include libgen.h for explicit basename prototype + +The prototype for basename has been removed from string.h in the latest +versions of musl [1]. This absence of prototype is flagged as an error +by some compilers, such as clang-18. To resolve this, include libgen.h +explicitly, which provides the prototype for basename. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 +Signed-off-by: Khem Raj +[sathya: Updated the commit log] +Signed-off-by: Kuppuswamy Sathyanarayanan +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/knsathya/aer-inject.git/commit/?id=197f51d29a01f46750fa6928409301aa8f1163d7 +Signed-off-by: J. Neuschaefer +--- + aer-inject.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/aer-inject.c b/aer-inject.c +index 74e7f72..eed1211 100644 +--- a/aer-inject.c ++++ b/aer-inject.c +@@ -11,6 +11,7 @@ + */ + + #include ++#include + #include + #include + #include +-- +cgit 1.2.3-korg + From 18d0a974fdc5a9575eee65b8bf323569614e564a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2024 19:38:34 +0200 Subject: [PATCH 2664/3013] package/iperf3: security bump to version 3.17.1 Removed patch which is included in this release, autoreconf is not needed anymore. Updated license hash due to copyright year bump: https://github.com/esnet/iperf/commit/7b947051d5192388dfa8a18989692e7af4226c62 Fixes CVE-2024-26306. Release notes: https://github.com/esnet/iperf/releases/tag/3.17.1 https://github.com/esnet/iperf/releases/tag/3.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 9d9a0db3d8b471ccf1721312450337ff53ed4a35) Signed-off-by: Peter Korsgaard --- ...1-Check-and-link-libatomic-if-needed.patch | 42 ------------------- package/iperf3/iperf3.hash | 6 +-- package/iperf3/iperf3.mk | 5 +-- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/iperf3/0001-Check-and-link-libatomic-if-needed.patch diff --git a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch b/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch deleted file mode 100644 index ddb50c46949..00000000000 --- a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bbf710e77e4a0438a2d995fd69b472e5ff054c69 Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Sun, 3 Dec 2023 12:14:05 +0100 -Subject: [PATCH] Check and link libatomic if needed - -Some architectures without native support for 64-bit atomics need -linking with libatomic. - -Signed-off-by: Julien Olivain -Upstream: https://github.com/esnet/iperf/commit/1511e9f85b548891ea53d4e378903344df1fd31e ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2594b39..ad7eaf1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -92,7 +92,19 @@ CXX="$PTHREAD_CXX" - ]) - - # Atomics --AC_CHECK_HEADERS([stdatomic.h]) -+AC_CHECK_HEADERS([stdatomic.h], -+ [AC_MSG_CHECKING([whether libatomic is required]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], -+ [AC_MSG_RESULT([no])], -+ [save_LIBS="$LIBS" -+ LIBS="$LIBS -latomic" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_ERROR([failed to find working configuration with atomics])] -+ )] -+ )], -+ [] -+) - - # Check for poll.h (it's in POSIX so everyone should have it?) - AC_CHECK_HEADERS([poll.h]) --- -2.44.0 - diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index a8634c4a7ed..ee0149daedf 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.16.tar.gz.sha256 -sha256 cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e iperf-3.16.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.17.1.tar.gz.sha256 +sha256 84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa iperf-3.17.1.tar.gz # Locally computed -sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE +sha256 3dc3e2076dd9cdea2b66d8fe213997ff25fb6171594f055b59fe25321b438f6f LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 3ab68bd13b5..1d2b57208ad 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,16 +4,13 @@ # ################################################################################ -IPERF3_VERSION = 3.16 +IPERF3_VERSION = 3.17.1 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT IPERF3_LICENSE_FILES = LICENSE IPERF3_CPE_ID_VENDOR = es -# 0001-Check-and-link-libatomic-if-needed.patch -IPERF3_AUTORECONF = YES - IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" ifeq ($(BR2_PACKAGE_OPENSSL),y) From 7189e33c3c629dfc819c4723bd401f8b9470d7fc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2024 19:46:45 +0200 Subject: [PATCH 2665/3013] package/gnutls: security bump version to 3.8.6 Version 3.8.4 fixes CVE-2024-28834 & CVE-2024-28835. Release notes: 3.8.4: https://lists.gnupg.org/pipermail/gnutls-help/2024-March/004845.html 3.8.5: https://lists.gnupg.org/pipermail/gnutls-help/2024-April/004846.html 3.8.6: https://lists.gnupg.org/pipermail/gnutls-help/2024-July/004848.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 904acfc41e1464848daf0240251e7701954c4918) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 47fb34ea7cb..d9f830ec925 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig -sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz.sig +sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd gnutls-3.8.6.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 8a4f3345aa9..7b754e215a2 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).6 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From 28252450c4418d6544992563029448a27cbbc8b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Aug 2024 15:25:06 +0200 Subject: [PATCH 2666/3013] package/hiawatha: update homepage URL The download and homepage URL for this project have been updated. The old site no longer works. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 2a547e2c424ac08d8741dc557aee968f1b659735) Signed-off-by: Peter Korsgaard --- package/hiawatha/Config.in | 2 +- package/hiawatha/hiawatha.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 0c35734c345..8bcee3f0988 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_HIAWATHA pipelining, keep alive connections, URL rewriting and many more. - http://www.hiawatha-webserver.org/ + https://hiawatha.leisink.net/ if BR2_PACKAGE_HIAWATHA diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 3e9cf2571b9..4c94f0067e0 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -5,7 +5,7 @@ ################################################################################ HIAWATHA_VERSION = 11.2 -HIAWATHA_SITE = https://www.hiawatha-webserver.org/files +HIAWATHA_SITE = https://hiawatha.leisink.net/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE From 769d71ae84c7a3d43ee92a1d126b2937713cc811 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 6 Sep 2024 14:47:44 +0200 Subject: [PATCH 2667/3013] Update for 2024.08 Signed-off-by: Peter Korsgaard --- CHANGES | 15 +++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index fd4851be57e..544931921bb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +2024.08, released September 6th, 2024 + + Various fixes. + + Fixed defconfigs: imx8mqevk: Bump TF-A, U-Boot and Linux to + fix build with gcc 13.x + + Removed defconfigs: pandaboard + + Updated/fixed packages: aer-inject, arm-trusted-firmware, + armadillo, babeld, cache-calibrator, clamav, fbdump, gerbera, + libgtk4, libopenssl, mender, p910nd, tllist, wpa_supplicant + + Removed packages: midori + 2024.08-rc3, released September 1st, 2024 Fixes all over the tree. diff --git a/Makefile b/Makefile index 50cfbcbcf45..43730c02b2b 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.08-rc3 +export BR2_VERSION := 2024.08 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1725220000 +BR2_VERSION_EPOCH = 1725627000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index dd3327577d9..60b84cc9418 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

            buildroot-2024.02.5.tar.xz

            -

            Latest stable release: 2024.05.2

            +

            Latest stable release: 2024.08

            - +
            - +
            -

            buildroot-2024.05.2.tar.gz

            -

            PGP signature

            +

            buildroot-2024.08.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2024.05.2.tar.xz

            -

            PGP signature

            +

            buildroot-2024.08.tar.xz

            +

            PGP signature

            diff --git a/docs/website/news.html b/docs/website/news.html index f43881614af..c09db758a63 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

            News

              +
            • +
              +
              +
              +

              2024.08 released

              +

              6 September 2024

              +
              +
              +

              The stable 2024.08 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2024.08 release.

              +
              +
              +
              • +
            • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 1f4c1b85e21..2251a992dca 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.05.2' +RELEASE='2024.08' ### Change here for more memory/cores ### VM_MEMORY=2048 From e4a5ab3b319753f41e2b5cf22e90b6b0304ca225 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Sep 2024 09:38:08 +0200 Subject: [PATCH 2668/3013] Update for 2024.05.3 Signed-off-by: Peter Korsgaard --- CHANGES | 38 ++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 156d0550b8f..00ec6d8fc8b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,41 @@ +2024.05.3, released September 9th, 2024 + + Important / security related fixes. + + A large number of GCC 14.x compilation fixes and additional + runtime tests. + + Infrastructure: + - Be more robust against text files (for package hashes and + users) incorrectly missing a terminating newline. + + - Fix various issues with the pkg-kconfig infrastructure and + per-package-directories builds + (BR2_PER_PACKAGE_DIRECTORIES). + + Updated/fixed packages: aer-inject, am335x-pru-package, + apache, apr, apr-util, attr, augeas, autossh, bandwidthd, + bcusdk, boost, brcm-patchram-plus, btrfs-progs, busybox, + can-utils, coreutils, cpuload, cryptsetup, cwiid, dhrystone, + dvb-apps, elfutils, faifa, fetchmail, ffmpeg, fluent-bit, + fluidsynth, freerdp, gcc, gcc-bare-metal, gdb, gnutls, gpsd, + hiawatha, hostapd, htop, ibm-sw-tpm2, intel-microcode, iperf3, + iproute2, ksmbd-tools, libcli, libcoap, libcurl, libest, + libfreefare, libgtk3, libngs, libpwquality, libressl, libupnp, + libxml2, libxslt, lrzsz, mdio-tools, micropython, + mjpg-streamer, mokutil, mpir, ncftp, nginx, nodejs, odb, + open-iscsi, openldap, openswan, openvpn, pistache, procps-ng, + python-django, quotatool, rtty, ruby, sconeserver, speex, + swaybg, tar, tftpd, tinyssh, uclibc, uclibc-ng-test, unbound, + uuu, vorbus-tools, wpewebkit, zfs, zsh + + Issues resolved: + - TAR-1.35 will not build for target (host-variant will build) + https://gitlab.com/buildroot.org/buildroot/-/issues/4 + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + 2024.05.2, released August 14th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index ebf8bb8af12..8cc747a8095 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.05.2 +export BR2_VERSION := 2024.05.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1723625000 +BR2_VERSION_EPOCH = 1725867000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 1f4c1b85e21..730d9fbbb77 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.05.2' +RELEASE='2024.05.3' ### Change here for more memory/cores ### VM_MEMORY=2048 From 5c6e7340adff349f2c67b3de486ae328ca4b68a0 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 9 Sep 2024 15:22:18 +0200 Subject: [PATCH 2669/3013] package/python-django: security bump to 5.0.9 Fixes: * CVE-2024-45230 * CVE-2024-45231 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index a5a8c7426db..413745e1330 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 fb167eef987a98421cad62036868a1ca Django-5.0.8.tar.gz -sha256 ebe859c9da6fead9c9ee6dbfa4943b04f41342f4cea2c4d8c978ef0d10694f2b Django-5.0.8.tar.gz +md5 8669004de8eb7f1a558400f9103c0001 Django-5.0.9.tar.gz +sha256 6333870d342329b60174da3a60dbd302e533f3b0bb0971516750e974a99b5a39 Django-5.0.9.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 2c5c20ee4db..8232a900263 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.8 +PYTHON_DJANGO_VERSION = 5.0.9 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/79/1c/55733805bb735e26fee0430045efdb61df6fd704b6aebf2154875ef9e6a9 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/fa/7b/176ce335cba42342b8f20efbdd5eb27067a0b34ee2203e051b34bedca0d9 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From f066ea7f9c5539e326c1072d15745915fa9b71f6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 7 Sep 2024 19:16:29 +0200 Subject: [PATCH 2670/3013] arch/Config.in.arc: fix indentation Signed-off-by: Yann E. MORIN (cherry picked from commit 2ba879cc38733f5160b0729bac1b9e2f001f35e1) Signed-off-by: Peter Korsgaard --- arch/Config.in.arc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/Config.in.arc b/arch/Config.in.arc index 388d3496bca..f367c491311 100644 --- a/arch/Config.in.arc +++ b/arch/Config.in.arc @@ -3,7 +3,7 @@ choice default BR2_arc770d depends on BR2_arc help - Specific CPU to use + Specific CPU to use config BR2_arc750d bool "ARC 750D" @@ -40,12 +40,12 @@ config BR2_archs38_full config BR2_archs4x_rel31 bool "ARC HS48 rel 31" help - Build for HS48 release 3.1 + Build for HS48 release 3.1 config BR2_archs4x bool "ARC HS48" help - Latest release of HS48 processor + Latest release of HS48 processor - Dual and Quad multiply and MAC operations - Double-precision FPU From a0890d709b56871c1d939ab696468bfe043ba381 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 7 Sep 2024 19:17:14 +0200 Subject: [PATCH 2671/3013] package: fix a few Config.in indentation Signed-off-by: Yann E. MORIN (cherry picked from commit a7552293bb01e6189d3bad14bbf071431510a1ad) Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 2 +- package/mmc-utils/Config.in | 6 +++--- package/rauc/Config.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 25c5758b850..1977263db8e 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -143,7 +143,7 @@ config BR2_PACKAGE_KODI_BLUEZ select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID help - Enable bluetooth support + Enable bluetooth support comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/mmc-utils/Config.in b/package/mmc-utils/Config.in index d938b5dea34..3275ba0d441 100644 --- a/package/mmc-utils/Config.in +++ b/package/mmc-utils/Config.in @@ -11,9 +11,9 @@ if BR2_PACKAGE_MMC_UTILS config BR2_PACKAGE_MMC_UTILS_ENABLE_DANGEROUS_COMMANDS bool "Enable dangerous commands" help - Enable support for dangerous commands in mmc-utils. mmc-utils - considers turning on permanent write protection on a device a - "dangerous command" and doesn't offer it by default. + Enable support for dangerous commands in mmc-utils. mmc-utils + considers turning on permanent write protection on a device a + "dangerous command" and doesn't offer it by default. endif diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 01a321e3dda..af0b99c36b2 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -33,7 +33,7 @@ config BR2_PACKAGE_RAUC_GPT select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBFDISK help - This option enables support for GPT partition tables. + This option enables support for GPT partition tables. config BR2_PACKAGE_RAUC_NETWORK bool "network support" From f6c0475732c4266cd3fa8b22eddb3fcff486da9c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 9 Jun 2024 09:54:44 +0200 Subject: [PATCH 2672/3013] Makefile: run PPD and RPATH fixup in host-fialize Currently, the gdbinit is generated and installed during post install hooks, either from the gdb package, or from the external-toolchain package. When using per-package directories (PPD), the staging directory of the either package is stored in the generated gdbinit, which is not going to be valid when all the PPD staging dirs get merged into the final staging: it would lack any library installed afterwards, i.e. mostly everything would be missing (but the libraries from the C toolchain in the case of an external toolchain). Similarly, all the RPATH will point to various PPD drectories. This does not cause any issue when the final host is aggregated, because the PPD directories still exist when we call programs from there (e.g. from the fs infra, or from post-image scripts). However, we knew that would not always be possible to keep the PPD directories: we have the prepare-sdk rule that runs a cleanup pass on the RPATH, and also applies the generic PPD fixups. When we introduced prepare-sdk in c32ad51cbf2a (core/sdk: generate the SDK tarball ourselves), we did not yet have support for PPD for the host directory, and especially, we did not have the host-finalize rule, which was only introduced in d0f4f95e390b (Makefile: rework main directory creation logic) which kick-started the introduction of PPD. At that point, we did not realise that the rpath fixups from prepare-sdk, would be better moved to the new host-finalize rule, because that had no impact unless one would need an SDK. Later, in 25e60fbe1cab (Makefile: fix SDK relocation for per-package-dirs), we eventually introduced the PPD generic fixups in the prepare-sdk rule. Again, we did not realise that those fixups would be better placed in the host-finalize rule rather than the prepare-sdk. While fixing the RPATH in host-finalize is not critical, fixing up the PPD paths actually is, as the gdbinit case demonstrate. As such, move the PPD fixups to the host-finalize step, and while at it, also move the RPATH fixups. This now does not leave much to do in the prepare-sdk step, and that could very well be moved to the host-finalize rule as well. However, some people may have started to rely on prepare-sdk in its 6 years of existence, and the little script it installs is not needed unless one really needs an SDK. So leave it as it is for now. Reported-by: Casey Reeves Signed-off-by: Yann E. MORIN Tested-by: Casey Reeves Cc: Thomas Petazzoni Cc: Brandon Maier Tested-by: Brandon Maier Acked-by: TIAN Yuanhao (cherry picked from commit a87abcf6da65f3e6aa257aaab58a24eec32a5903) Signed-off-by: Peter Korsgaard --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 43730c02b2b..a84b83c1a98 100644 --- a/Makefile +++ b/Makefile @@ -597,14 +597,7 @@ world: target-post-image .PHONY: prepare-sdk prepare-sdk: world - @$(call MESSAGE,"Rendering the SDK relocatable") - PARALLEL_JOBS=$(PARALLEL_JOBS) \ - PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \ - $(TOPDIR)/support/scripts/fix-rpath host - PARALLEL_JOBS=$(PARALLEL_JOBS) \ - PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \ - $(TOPDIR)/support/scripts/fix-rpath staging - $(call ppd-fixup-paths,$(BASE_DIR)) + @$(call MESSAGE,"Preparing the SDK") $(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh mkdir -p $(HOST_DIR)/share/buildroot echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location @@ -722,6 +715,13 @@ STAGING_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.t host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK) @$(call MESSAGE,"Finalizing host directory") $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR),copy) + $(Q)PARALLEL_JOBS=$(PARALLEL_JOBS) \ + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \ + $(TOPDIR)/support/scripts/fix-rpath host + $(Q)PARALLEL_JOBS=$(PARALLEL_JOBS) \ + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \ + $(TOPDIR)/support/scripts/fix-rpath staging + $(call ppd-fixup-paths,$(BASE_DIR)) .PHONY: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) From bd83efd28888f0e5d6781ba6d4f6d89802ad8b80 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Sep 2024 17:27:46 +0200 Subject: [PATCH 2673/3013] support/misc/Vagrantfile: move to Debian bullseye (12) Ubuntu Bionic (18.04) was EOL'ed in June 2023: https://ubuntu.com//blog/18-04-end-of-standard-support And the VM image is only available in virtualbox format: https://app.vagrantup.com/ubuntu/boxes/bionic64 So move to Debian bullseye (12), matching what we do for the docker image. This is available in virtualbox and libvirt (qemu) format: https://app.vagrantup.com/debian/boxes/bullseye64 Bullseye does not come with rsync out of the box, so install it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 6cedd92744341c1c9b5f76026db05a9fd653485d) Signed-off-by: Peter Korsgaard --- support/misc/Vagrantfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 2251a992dca..8252f555b61 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -12,7 +12,7 @@ VM_MEMORY=2048 VM_CORES=1 Vagrant.configure('2') do |config| - config.vm.box = 'ubuntu/bionic64' + config.vm.box = 'debian/bullseye64' config.vm.provider :vmware_fusion do |v, override| v.vmx['memsize'] = VM_MEMORY @@ -42,12 +42,10 @@ Vagrant.configure('2') do |config| end config.vm.provision 'shell', privileged: true, inline: - "sed -i 's|deb http://us.archive.ubuntu.com/ubuntu/|deb mirror://mirrors.ubuntu.com/mirrors.txt|g' /etc/apt/sources.list - dpkg --add-architecture i386 + "dpkg --add-architecture i386 apt-get -q update - apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine apt-get -q -y install build-essential libncurses5-dev \ - git bzr cvs mercurial subversion libc6:i386 unzip bc + git bzr cvs mercurial rsync subversion libc6:i386 unzip bc apt-get -q -y autoremove apt-get -q -y clean update-locale LC_ALL=C" From 30f9e284d98df4c923b6f52a0564aabeae867833 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Sep 2024 17:27:47 +0200 Subject: [PATCH 2674/3013] support/misc/Vagrantfile: support libvirt provider And configure memory/CPU like for the other providers. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 75b543880ceaeb8ff039b0cf3a2ba3e1d38aba37) Signed-off-by: Peter Korsgaard --- support/misc/Vagrantfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 8252f555b61..1155026ee39 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -29,6 +29,11 @@ Vagrant.configure('2') do |config| end end + config.vm.provider :libvirt do |v, override| + v.memory = VM_MEMORY + v.cpus = VM_CORES + end + config.vm.provision 'shell' do |s| s.inline = 'echo Setting up machine name' From 4124af66264ec5057ec359851c711bc69aa7469a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:41 +0200 Subject: [PATCH 2675/3013] docs/manual/adding-packages-asciidoc.adoc: fix resources typo in example As FOO_RESOURCES hints, the correct spelling is resources so use that. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 5fca562ee88b07472cdb68e166ebc7f576d1c6f1) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-asciidoc.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-asciidoc.adoc b/docs/manual/adding-packages-asciidoc.adoc index d68978b1cbd..c34b9ffc2a6 100644 --- a/docs/manual/adding-packages-asciidoc.adoc +++ b/docs/manual/adding-packages-asciidoc.adoc @@ -112,7 +112,7 @@ Here is a complete example that uses all variables and all hooks: 05: ################################################################################ 06: 07: FOO_SOURCES = $(sort $(wildcard $(FOO_DOCDIR)/*)) -08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/ressources)) +08: FOO_RESOURCES = $(sort $(wildcard $(FOO_DOCDIR)/resources)) 09: 10: FOO_TOC_DEPTH = 2 11: FOO_TOC_DEPTH_HTML = 1 From 8d22410d933a03bf071e96604cce4cdc0bec05f7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:42 +0200 Subject: [PATCH 2676/3013] docs/manual/adding-packages-linux-kernel-spec-infra.adoc: fix information typo Plural of information is also information. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c88a61759981562a85cb6a45b9db945ef6ccfa1e) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-linux-kernel-spec-infra.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc index 3b3daebf557..9fd3b566a59 100644 --- a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc +++ b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc @@ -107,7 +107,7 @@ Let's look at an example on how to add a new Linux extension +foo+. First, create the package +foo+ that provides the extension: this package is a standard package; see the previous chapters on how to create such a package. This package is in charge of downloading the -sources archive, checking the hash, defining the licence informations +sources archive, checking the hash, defining the licence information and building user space tools if any. Then create the 'Linux extension' proper: create a new menu entry in From 889abedd5b995264f8bac43bb19b4566468557e7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:43 +0200 Subject: [PATCH 2677/3013] docs/manual/adding-packages-meson.adoc: fix occurrences typo Occurrences is with double-c-double-r. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6762761957f956b91ca3956370548e5a29e9bd42) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-meson.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-meson.adoc b/docs/manual/adding-packages-meson.adoc index 16135b12978..01891e03cc1 100644 --- a/docs/manual/adding-packages-meson.adoc +++ b/docs/manual/adding-packages-meson.adoc @@ -61,7 +61,7 @@ added to +FOO_DEPENDENCIES+. Note that the support for +baz+ is explicitly disabled at line 20, if the package is not selected. To sum it up, to add a new meson-based package, the Makefile example can be -copied verbatim then edited to replace all occurences of +FOO+ with the +copied verbatim then edited to replace all occurrences of +FOO+ with the uppercase name of the new package and update the values of the standard variables. From 0f20caa178251015022741cb3b161b33856a9248 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:44 +0200 Subject: [PATCH 2678/3013] docs/manual/customize-outside-br.adoc: fix 'or' typo It is OR, not OT. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 777c081abef77511da585c53b9de4e44b913af46) Signed-off-by: Peter Korsgaard --- docs/manual/customize-outside-br.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/customize-outside-br.adoc b/docs/manual/customize-outside-br.adoc index 5e653f1603e..78065489d46 100644 --- a/docs/manual/customize-outside-br.adoc +++ b/docs/manual/customize-outside-br.adoc @@ -191,7 +191,7 @@ tree. For some packages, Buildroot provides a choice between two (or more) implementations of API-compatible such packages. For example, there is -a choice to choose either libjpeg ot jpeg-turbo; there is one between +a choice to choose either libjpeg or jpeg-turbo; there is one between openssl or libressl; there is one to select one of the known, pre-configured toolchains... From 7fab58374d0349769d01ab174bf00e01cf11115d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:45 +0200 Subject: [PATCH 2679/3013] docs/manual/migrating.adoc: fix occurrence typo Occurrence is with double-c-double-r. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6ee748089347966eea5aced1e42fc25d9cbfc2aa) Signed-off-by: Peter Korsgaard --- docs/manual/migrating.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/migrating.adoc b/docs/manual/migrating.adoc index ed2be1c6c9f..d99c7797993 100644 --- a/docs/manual/migrating.adoc +++ b/docs/manual/migrating.adoc @@ -62,7 +62,7 @@ $ echo 'name: NAME_OF_YOUR_TREE' >external.desc Be careful when choosing a name: It has to be unique and be made with only ASCII characters from the set +[A-Za-z0-9_]+. - * Then, change every occurence of +BR2_EXTERNAL+ in your br2-external + * Then, change every occurrence of +BR2_EXTERNAL+ in your br2-external tree with the new variable: + ---- From f0027556593aacb12136ff572b9b54d2a4af9d02 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:46 +0200 Subject: [PATCH 2680/3013] docs/manual/migrating.adoc: fix accommodate typo Accommodate is with double-m. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit eba958eb5dcb5065e932fb8740299390ba3bff28) Signed-off-by: Peter Korsgaard --- docs/manual/migrating.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/migrating.adoc b/docs/manual/migrating.adoc index d99c7797993..69bf0dc2214 100644 --- a/docs/manual/migrating.adoc +++ b/docs/manual/migrating.adoc @@ -143,7 +143,7 @@ The download backends have been extended in various ways. fields (`devmajor` and `devminor`), which has an impact in the metadata stored in the archives (but the content of files is not affected). -To accomodate those changes, the archive suffix has been updated or +To accommodate those changes, the archive suffix has been updated or added: * for git: +-git4+ From a5b3306b0495a4f8c4e7a48d501e96c981d65938 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:47 +0200 Subject: [PATCH 2681/3013] docs/manual/using-buildroot-toolchain.adoc: fix overridden typo Overridden is with double-r-double-d. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d729696451c899b8db149f9f6346db3f1b678ad5) Signed-off-by: Peter Korsgaard --- docs/manual/using-buildroot-toolchain.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/using-buildroot-toolchain.adoc b/docs/manual/using-buildroot-toolchain.adoc index 09408ef05af..fd9dda753bc 100644 --- a/docs/manual/using-buildroot-toolchain.adoc +++ b/docs/manual/using-buildroot-toolchain.adoc @@ -16,7 +16,7 @@ Alternatively, Buildroot can also export the toolchain and the development files of all selected packages, as an SDK, by running the command +make sdk+. This generates a tarball of the content of the host directory +output/host/+, named +_sdk-buildroot.tar.gz+ (which can be -overriden by setting the environment variable +BR2_SDK_PREFIX+) and +overridden by setting the environment variable +BR2_SDK_PREFIX+) and located in the output directory +output/images/+. This tarball can then be distributed to application developers, when From 3c7f868fe6d82d22125a7101b7209550cb27d976 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:48 +0200 Subject: [PATCH 2682/3013] docs/website/copyright.txt: fix aboard typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6cb031802d100b36c086b1a732bf887bf4304aab) Signed-off-by: Peter Korsgaard --- docs/website/copyright.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/copyright.txt b/docs/website/copyright.txt index 3fe19bab8b6..4d19bbf828d 100644 --- a/docs/website/copyright.txt +++ b/docs/website/copyright.txt @@ -18,7 +18,7 @@ GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THIS WEBSITE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR LOSS OF HAIR, LOSS OF LIFE, LOSS OF MEMORY, LOSS OF YOUR CARKEYS, MISPLACEMENT OF YOUR PAYCHECK, OR COMMANDER DATA BEING RENDERED UNABLE TO ASSIST THE -STARFLEET OFFICERS ABORD THE STARSHIP ENTERPRISE TO RECALIBRATE THE MAIN +STARFLEET OFFICERS ABOARD THE STARSHIP ENTERPRISE TO RECALIBRATE THE MAIN DEFLECTOR ARRAY, LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE WEBSITE TO OPERATE WITH YOUR WEBBROWSER), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. From e5f7a9fb71679c9cba30f4067c09fce33d44d055 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:49 +0200 Subject: [PATCH 2683/3013] docs/website/news.html: fix information typo Plural of information is also information. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit cd6584715ea4cec33d587ccb965fc599081c6233) Signed-off-by: Peter Korsgaard --- docs/website/news.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/news.html b/docs/website/news.html index c09db758a63..abd2f8e5438 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -7352,7 +7352,7 @@

              2012.08-rc3 released

              We have a new release candidate! Various fixes, and - addition of licensing informations on many + addition of licensing information on many packages. See CHANGES file for details

              @@ -7374,7 +7374,7 @@

              2012.08-rc2 released

              We have a new release candidate! Various fixes, and addition - of licensing informations on many + of licensing information on many packages. See CHANGES file for details

              From 828f9053d9a8b262aa4676a67147a6eee17e70f5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:50 +0200 Subject: [PATCH 2684/3013] package/alure: fix grammar and dependencies typo in comment Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: fix grammar] Signed-off-by: Yann E. MORIN (cherry picked from commit 43357baf4b7bc370f216c38a9df4b17fa6710e80) Signed-off-by: Peter Korsgaard --- package/alure/alure.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alure/alure.mk b/package/alure/alure.mk index f0eca8a2ee2..fe27bfd12be 100644 --- a/package/alure/alure.mk +++ b/package/alure/alure.mk @@ -12,8 +12,8 @@ ALURE_INSTALL_STAGING = YES ALURE_DEPENDENCIES = openal -# Disabling alure examples remove the dependecies on physfs and dump libraries. -# Enable at least one built-in decoder (wave). +# Disabling alure examples removes the dependencies on physfs and dump +# libraries. Enable at least one built-in decoder (wave). ALURE_CONF_OPTS = -DALURE_INSTALL=ON \ -DALURE_BUILD_EXAMPLES=OFF \ -DALURE_ENABLE_WAVE=ON From 04d64ab6d563a30cee48318c4a070f6aaab5f72c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:51 +0200 Subject: [PATCH 2685/3013] package/audit: fix deactivate typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 413479ffce7b3f3a401a74caed255f40ff0203cf) Signed-off-by: Peter Korsgaard --- package/audit/audit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 76828571ca0..c703acc5593 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -17,7 +17,7 @@ AUDIT_CONF_OPTS = --without-python --without-python3 --disable-zos-remote # src/libev has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif From 0d56cfabf462b7d90a8aa15549d9e196da3741b5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:52 +0200 Subject: [PATCH 2686/3013] package/avahi: fix appropriate typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit fcb823ffdcfc3d89503f859a1042a56ad5d47f46) Signed-off-by: Peter Korsgaard --- package/avahi/0002-remove-imp-from-py-compile.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/avahi/0002-remove-imp-from-py-compile.patch b/package/avahi/0002-remove-imp-from-py-compile.patch index 37534a3f7ad..ba92275206e 100644 --- a/package/avahi/0002-remove-imp-from-py-compile.patch +++ b/package/avahi/0002-remove-imp-from-py-compile.patch @@ -1,10 +1,10 @@ Remove optional imp python module dependency. Upstream already removed py-compile entirely in their git repository, -so the patch is not appropiate for upstream. +so the patch is not appropriate for upstream. Signed-off-by: Waldemar Brodkorb -Upstream: not appropiate +Upstream: not appropriate diff -Nur avahi-0.8.orig/py-compile avahi-0.8/py-compile --- avahi-0.8.orig/py-compile 2020-02-18 07:58:21.192417644 +0100 From 923a6df874afd1dca8c9b3a26132fa568350f017 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:53 +0200 Subject: [PATCH 2687/3013] package/bc: fix typos in patch descriptions Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e2a0ab180c13ecb41b1c1aea65c9ca69fbe8bc90) Signed-off-by: Peter Korsgaard --- package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch | 2 +- .../0002-notice-read-and-write-errors-on-input-and-output.patch | 2 +- package/bc/0004-no-gen-libmath.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch b/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch index 03d15f5524f..5ff6125f677 100644 --- a/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch +++ b/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch @@ -3,7 +3,7 @@ From: Matt Weber Date: Fri, 13 Sep 2019 13:45:02 -0500 Subject: [PATCH] bc: use MAKEINFO variable for docs -Use the appropiate MAKEINFO variable rather than the hardcoded makeinfo +Use the appropriate MAKEINFO variable rather than the hardcoded makeinfo command directly, otherwise missing logic never works. Fixes: diff --git a/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch b/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch index 87654e3c143..7649ae8c4f5 100644 --- a/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch +++ b/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch @@ -16,7 +16,7 @@ Quoting from the bug report: were correct. I _think_ I got them all. -iwj. -- Ian Jackson Tue, 4 Apr 2006 17:21:02 +0100 -Upsteam: +Upstream: https://sources.debian.org/patches/bc/1.07.1-2/05_notice_read_write_errors.diff/ [Reformatted to GIT for 1.0.7.1 by Matt W] diff --git a/package/bc/0004-no-gen-libmath.patch b/package/bc/0004-no-gen-libmath.patch index 7cd506be2c7..15b7b9e5a8a 100644 --- a/package/bc/0004-no-gen-libmath.patch +++ b/package/bc/0004-no-gen-libmath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] no gen libmath These rules are not cross-friendly so delete them. libmath has been generated offline and included as part of this patch as the fbc tool -used to generate that header is assuming the cross archtecture and +used to generate that header is assuming the cross architecture and can't execute. Upstream: From dbc9de026b3423832e721740bf39369f1d323195 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:54 +0200 Subject: [PATCH 2688/3013] package/bcache-tools: fix compatibility typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 4c046460d2b120816478b4ae82793e7617e80f7c) Signed-off-by: Peter Korsgaard --- .../0001-Don-t-inline-crc64-for-gcc-5-compatability.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch b/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch index 1a437a84fbb..bd3358c2077 100644 --- a/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch +++ b/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch @@ -1,4 +1,4 @@ -Don't inline crc64 for gcc-5 compatability +Don't inline crc64 for gcc-5 compatibility This patch is backported from Debian and it fixes the following error: @@ -11,7 +11,7 @@ Signed-off-by: Vicente Olivert Riera From: David Mohr Date: Tue, 26 May 2015 20:34:31 -0600 -Subject: Don't inline crc64 for gcc-5 compatability +Subject: Don't inline crc64 for gcc-5 compatibility Forwarded: http://article.gmane.org/gmane.linux.kernel.bcache.devel/2919 From 8d5f51706da7218888df80c67b210d37432f563c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:55 +0200 Subject: [PATCH 2689/3013] package/bcusdk: fix definition typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 2619c021891daed6a1dfce4bacecf825434108cd) Signed-off-by: Peter Korsgaard --- ...002-eibd-fix-endless-recursion-when-using-USB-backends.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch b/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch index 3b90289c885..c31f0c0c8c9 100644 --- a/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch +++ b/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch @@ -6,7 +6,7 @@ Subject: [PATCH] eibd: drop local clock_gettime in USB backends clock_gettime is defined locally, and calls pth_int_time, which in turn calls clock_gettime. The USB backend shouldn't overrule clock_gettime in the first place. -This patch fixes this endless recursion by removing the local defition. +This patch fixes this endless recursion by removing the local definition. Signed-off-by: Kurt Van Dijck --- From fc1b43b2e69ba92e58b13ed66fdba5d9f668b144 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:56 +0200 Subject: [PATCH 2690/3013] package/boost: fix typos in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit add472910818f7c77fc54f13a5a44ffc9c90228a) Signed-off-by: Peter Korsgaard --- package/boost/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 908a53fea03..c7c90aa9ab1 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -4,7 +4,7 @@ comment "boost needs a toolchain w/ C++, threads, wchar" config BR2_PACKAGE_BOOST bool "boost" depends on BR2_INSTALL_LIBSTDCPP - # Boost could theorically be built with threading=single, but + # Boost could theoretically be built with threading=single, but # that unfortunately doesn't work. Until someone fixes that, # let's depend on threads. depends on BR2_TOOLCHAIN_HAS_THREADS @@ -241,7 +241,7 @@ config BR2_PACKAGE_BOOST_MATH C++ standard. Quaternions are a relative of complex numbers often used to - parameterise rotations in three dimentional space. + parameterise rotations in three dimensional space. Octonions, like quaternions, are a relative of complex numbers. From c35946ccada2f20b78525a24d18b510d9a0c6bd7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:57 +0200 Subject: [PATCH 2691/3013] package/c-icap-modules: fix Additional typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e277ef8affc38ecae5b70943d13fb3a8b78def4a) Signed-off-by: Peter Korsgaard --- package/c-icap-modules/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-icap-modules/Config.in b/package/c-icap-modules/Config.in index 616456b4dc6..7114131f046 100644 --- a/package/c-icap-modules/Config.in +++ b/package/c-icap-modules/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_C_ICAP_MODULES bool "c-icap-modules" depends on BR2_PACKAGE_C_ICAP help - Additionals modules for c-icap server. + Additional modules for c-icap server. http://c-icap.sourceforge.net/ From 2cc170a99e30b0f42ea895f9235cdec64df483d2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:58 +0200 Subject: [PATCH 2692/3013] package/chocolate-doom: fix multiple typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 8e6d5e49fe49192777f90116fbc8d0a125165eaa) Signed-off-by: Peter Korsgaard --- .../0001-Remove-redundant-demoextend-definition.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch b/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch index bbfbdbb2d68..06bf54c5831 100644 --- a/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch +++ b/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch @@ -4,7 +4,7 @@ Date: Sun, 15 Mar 2020 16:55:33 -0500 Subject: [PATCH] Remove redundant demoextend definition GCC 10 enables -fno-common by default, which causes the linker to fail when -there are multple definitions of a global variable. +there are multiple definitions of a global variable. See https://gcc.gnu.org/gcc-10/porting_to.html From 1e6d3f7babbf2975cac2749aa245dfe00576da16 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:07:59 +0200 Subject: [PATCH 2693/3013] package/collectd: fix typos in help text / comment Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9a11cb9bdd92da964ce1d5141c21558e6df02808) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 6 +++--- package/collectd/collectd.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 5f39507cffd..39c0d352e56 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -288,7 +288,7 @@ config BR2_PACKAGE_COLLECTD_GPS bool "gps" select BR2_PACKAGE_GPSD help - Reports the number of sattelites seen by and precision + Reports the number of satellites seen by and precision of a GPS receiver. config BR2_PACKAGE_COLLECTD_HUGEPAGES @@ -471,7 +471,7 @@ config BR2_PACKAGE_COLLECTD_PING bool "ping" select BR2_PACKAGE_LIBOPING help - Mesures network latency using ICMP "echo requests". + Measures network latency using ICMP "echo requests". config BR2_PACKAGE_COLLECTD_POSTGRESQL bool "postgresql" @@ -493,7 +493,7 @@ comment "postgresql support can't be built with Optimize for fast" config BR2_PACKAGE_COLLECTD_PROCESSES bool "processes" help - Collects the number of processes gruped by state. + Collects the number of processes grouped by state. config BR2_PACKAGE_COLLECTD_PROTOCOLS bool "protocols" diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index b47b2efaba8..7bfe556e90f 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -38,7 +38,7 @@ endif COLLECTD_CONF_ENV += CFLAGS="$(COLLECTD_CFLAGS)" # -# NOTE: There's also a third availible setting "intswap", which might +# NOTE: There's also a third available setting "intswap", which might # be needed on some old ARM hardware (see [2]), but is not being # accounted for as per discussion [1] # From 755f3532d31928be4ecb0dfc4ac0a2680482acbf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:00 +0200 Subject: [PATCH 2694/3013] package/dcron: fix opening typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit be495963ed8c6c3b781915af45fd92c27b2bef1d) Signed-off-by: Peter Korsgaard --- ...1-main.c-add-newline-to-logfile-openning-error-message.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch b/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch index 6abc3105e4a..fe0a33d1afc 100644 --- a/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch +++ b/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch @@ -1,7 +1,7 @@ From 2710bc67cd920323da9b23a3d60193577bd43d71 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 20 Jul 2019 00:27:31 -0300 -Subject: [PATCH] main.c: add newline to logfile openning error message +Subject: [PATCH] main.c: add newline to logfile opening error message Signed-off-by: Carlos Santos [Upstream status: https://github.com/dubiousjim/dcron/pull/22] From 530bfe46dc17794690a4272b951070fc4d3e6eb4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:01 +0200 Subject: [PATCH 2695/3013] package/dmalloc: fix deactivate typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 1fe75a9a621730dbd13036b18d553ae90da61191) Signed-off-by: Peter Korsgaard --- package/dmalloc/dmalloc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 5bd6691725a..c3f958094b0 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -42,7 +42,7 @@ endif # dmalloc has some assembly function that are not present in thumb1 mode: # Error: lo register required -- `str lr,[sp,#4]' -# so, we desactivate thumb mode +# so, we deactivate thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) DMALLOC_CFLAGS += -marm endif From 82b82594e8d0697e03539c883657aaa4f13fb808 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:02 +0200 Subject: [PATCH 2696/3013] package/dvblast: fix which typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 1a05d2f16ffe77d0572674d74cd13419c7cc69cd) Signed-off-by: Peter Korsgaard --- package/dvblast/0001-missing-lm.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dvblast/0001-missing-lm.patch b/package/dvblast/0001-missing-lm.patch index 2efbec4648c..f287db58190 100644 --- a/package/dvblast/0001-missing-lm.patch +++ b/package/dvblast/0001-missing-lm.patch @@ -1,6 +1,6 @@ dvblast: fix static linking -dvblast links to -lev, wihch uses functions from the maths library, +dvblast links to -lev, which uses functions from the maths library, like floor(). When linking to a shared libev.so, that dependency is automatically From 5ba2961cc91325bc06e529dd2a1d6049b6eb6e61 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:03 +0200 Subject: [PATCH 2697/3013] package/elftosb: fix typos in patch descriptions Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit a4c81a7a07a5fae6ab99188aee8539a8b9a5a0e3) Signed-off-by: Peter Korsgaard --- package/elftosb/0001-fixes-includes.patch | 2 +- package/elftosb/0002-force-cxx-compiler.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/elftosb/0001-fixes-includes.patch b/package/elftosb/0001-fixes-includes.patch index eaf8ebad98a..ba84d126bc3 100644 --- a/package/elftosb/0001-fixes-includes.patch +++ b/package/elftosb/0001-fixes-includes.patch @@ -1,4 +1,4 @@ -This patch uses system include files instead of a hard coded system path to fixe +This patch uses system include files instead of a hard coded system path to fix potential compilation failure on systems that do not populate system header files in /usr/include/.. diff --git a/package/elftosb/0002-force-cxx-compiler.patch b/package/elftosb/0002-force-cxx-compiler.patch index efa92d11713..2dc0394f869 100644 --- a/package/elftosb/0002-force-cxx-compiler.patch +++ b/package/elftosb/0002-force-cxx-compiler.patch @@ -19,7 +19,7 @@ Thus, elftosb should either: - use gcc and link against libc and libm; - or use g++ and link against libstdc++. -Because elftosb is written in C++, this patch implement the sencond option, using +Because elftosb is written in C++, this patch implement the second option, using g++ and linking against libstdc++. Signed-off-by: Samuel Martin From 1d5cb8c6db58cf74896ff197ab8ca5af28650cbe Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:04 +0200 Subject: [PATCH 2698/3013] package/erlang: fix inadvertently typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9c70f31956312c5d64baf80f2fb198012c922bd4) Signed-off-by: Peter Korsgaard --- package/erlang/erlang.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 84d2f4e898d..f9956d4468e 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -48,7 +48,7 @@ ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR) ERLANG_CONF_OPTS = --without-javac # Force ERL_TOP to the downloaded source directory. This prevents -# Erlang's configure script from inadvertantly using files from +# Erlang's configure script from inadvertently using files from # a version of Erlang installed on the host. ERLANG_CONF_ENV += ERL_TOP=$(@D) HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D) From 657687322bdefa8ebb55f3121920bc223c30a498 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:05 +0200 Subject: [PATCH 2699/3013] package/exiv2: fix 'information see' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 987cfd586ed6eb65250fd243393d7f33fdc403ab) Signed-off-by: Peter Korsgaard --- package/exiv2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/exiv2/Config.in b/package/exiv2/Config.in index 3e3e502751d..8407c25b417 100644 --- a/package/exiv2/Config.in +++ b/package/exiv2/Config.in @@ -39,6 +39,6 @@ config BR2_PACKAGE_EXIV2_LENSDATA This database comes from a thirdparty and is free to use in non-commercial, GPL or open source software only. - For more informations src/nikonmn_int.cpp. + For more information see src/nikonmn_int.cpp. endif From 4365f248359a404c351a70b689939d09901cf042 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:06 +0200 Subject: [PATCH 2700/3013] package/falcosecurity-libs: fix which typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6ce119ca021c69339739781b8321a7870fb18d7e) Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index 4245f9581ae..3783b8421b8 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -44,7 +44,7 @@ define FALCOSECURITY_LIBS_LINUX_CONFIG_FIXUPS endef # falcosecurity-libs creates the module Makefile from a template, which contains -# a single place-holder, KBUILD_FLAGS, wich is only replaced with debug flags, +# a single place-holder, KBUILD_FLAGS, which is only replaced with debug flags, # which we don't care about here. # So, just replace the place-holder with the only meaningful value: nothing. # For the DRIVER_NAME, we set it to FALCOSECURITY_LIBS_DRIVER_NAME. From b0bfaa8d5ae53ac24896d3ce9bd2d6badb813190 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:07 +0200 Subject: [PATCH 2701/3013] package/fbgrab: fix framebuffer typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ae471a7d3dc291ea07652b82c7239bc4b2a83284) Signed-off-by: Peter Korsgaard --- package/fbgrab/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fbgrab/Config.in b/package/fbgrab/Config.in index b1d8755f325..39c7834d502 100644 --- a/package/fbgrab/Config.in +++ b/package/fbgrab/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_FBGRAB select BR2_PACKAGE_LIBPNG help FBGrab is a framebuffer screenshot program, capturing the - linux frambuffer and converting it to a png-picture. + linux framebuffer and converting it to a png-picture. https://github.com/GunnarMonell/fbgrab From 74c4478ea9ec07656af7204bbe2f2f1538e60220 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:08 +0200 Subject: [PATCH 2702/3013] package/fcgiwrap: fix explicitly typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 05b18efb7ba4b3d17ed4b4f46525768477630016) Signed-off-by: Peter Korsgaard --- package/fcgiwrap/0001-use-LIBS-from-configure.patch | 2 +- package/fcgiwrap/fcgiwrap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fcgiwrap/0001-use-LIBS-from-configure.patch b/package/fcgiwrap/0001-use-LIBS-from-configure.patch index 12563c42758..3f8606945f5 100644 --- a/package/fcgiwrap/0001-use-LIBS-from-configure.patch +++ b/package/fcgiwrap/0001-use-LIBS-from-configure.patch @@ -1,7 +1,7 @@ Makefile.in: Use LIBS from configure rather than specifying -lfcgi manually. libfcgi needs libm and fcgiwrap does not use libtool or pkgconf to -detect libfcgi, so we need to add -lm explicitely when using static +detect libfcgi, so we need to add -lm explicitly when using static libs. Buildroot does this by providing LIBS=-lm to configure when needed. However fcgiwrap does not use Automake and its Makefile.in ignores LIBS from configure. Fix it with this patch. diff --git a/package/fcgiwrap/fcgiwrap.mk b/package/fcgiwrap/fcgiwrap.mk index 62c4c1369db..4845f013fa4 100644 --- a/package/fcgiwrap/fcgiwrap.mk +++ b/package/fcgiwrap/fcgiwrap.mk @@ -20,7 +20,7 @@ FCGIWRAP_CONF_OPTS += --without-systemd endif # libfcgi needs libm and fcgiwrap does not use libtool or pkgconf to -# detect libfcgi, so we need to add -lm explicitely when using static +# detect libfcgi, so we need to add -lm explicitly when using static # libs. ifeq ($(BR2_STATIC_LIBS),y) FCGIWRAP_CONF_OPTS += LIBS=-lm From 17076edc906efe2554f31f14d90dcb5717b3ce5a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:09 +0200 Subject: [PATCH 2703/3013] package/flex: fix typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 892d7d784ea9033e4109195a1985dbcc03a0000c) Signed-off-by: Peter Korsgaard --- ...3-build-make-it-possible-to-disable-the-build-of-the-d.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch b/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch index ffe30d367fa..30a782ee9bf 100644 --- a/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch +++ b/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch @@ -4,7 +4,7 @@ Date: Fri, 29 Sep 2017 18:03:51 +0200 Subject: [PATCH] build: make it possible to disable the build of the documentation -When targetting embedded evices, the documentation is not needed. +When targeting embedded devices, the documentation is not needed. Building the documentation default to whether the program is built. From c299d465b8d3de1b4e3765815ac3931b8a59c117 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:10 +0200 Subject: [PATCH 2704/3013] package/flutter-engine: fix typos in comments Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit cccd164fd63010ac01c8c797203362f0c3bfa7ac) Signed-off-by: Peter Korsgaard --- package/flutter-engine/Config.in | 2 +- package/flutter-engine/gen-tarball | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/flutter-engine/Config.in b/package/flutter-engine/Config.in index 00bcd05cd41..610c26d9333 100644 --- a/package/flutter-engine/Config.in +++ b/package/flutter-engine/Config.in @@ -1,4 +1,4 @@ -# Flutter includes a vender copy of clang which is mandatory to use for +# Flutter includes a vendor copy of clang which is mandatory to use for # compiling. These are the supported architectures. config BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS bool diff --git a/package/flutter-engine/gen-tarball b/package/flutter-engine/gen-tarball index 23b121d1f95..5bfb8f60e81 100755 --- a/package/flutter-engine/gen-tarball +++ b/package/flutter-engine/gen-tarball @@ -66,10 +66,10 @@ gen_tarball() { # There are two issues with the flutter-engine buildsystem: # - it expects empty directories created by gclient.py to be present; that # means we can't use the mk_tar_gz helper method from support/download/helpers, - # becasue it does not include emnpty directories; + # because it does not include empty directories; # - it insists on having a full git repositoy, with .git et al., which means # we can't generate a reproducible archive anyway. - # So we jsut create a plain tarball. + # So we just create a plain tarball. ${TAR} -C "${SCRATCH_DIR}"/src -czf "${TARBALL_NAME}" . mv "${TARBALL_NAME}" "${TARBALL_DL_PATH}" } From c0682780f35192c464bcda73fec7fcb3925aaedc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:11 +0200 Subject: [PATCH 2705/3013] package/flutter-pi: fix Raspberry typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit a0c020317dc591edb3582543606b638157dc918d) Signed-off-by: Peter Korsgaard --- package/flutter-pi/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in index 223e29749c4..ec2ef707378 100644 --- a/package/flutter-pi/Config.in +++ b/package/flutter-pi/Config.in @@ -24,7 +24,7 @@ menuconfig BR2_PACKAGE_FLUTTER_PI Desktop & have X11 or Wayland load up; just boot into the command-line. - Although flutter-pi is only tested on a Rasberry Pi 4 + Although flutter-pi is only tested on a Raspberry Pi 4 2GB, it should work fine on other linux platforms supported by Flutter so long as there is support for KMS and DRI. From ff0edf24509c67937672f4e69894271b96ab08ef Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:12 +0200 Subject: [PATCH 2706/3013] package/gcc: fix explicitly typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d5bb8fff5f8636ce8b4a063668440efe9489d8d3) Signed-off-by: Peter Korsgaard --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index e4780353cb5..b39ca8566d0 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -233,7 +233,7 @@ HOST_GCC_COMMON_CONF_OPTS += --with-fp-32="$(GCC_TARGET_FP32_MODE)" endif # musl/uClibc-ng does not work with biarch powerpc toolchains, we -# need to configure gcc explicitely for 32 Bit for CPU's supporting +# need to configure gcc explicitly for 32 Bit for CPU's supporting # 64 Bit and 32 Bit ifneq ($(GCC_TARGET_CPU),) ifeq ($(BR2_powerpc),y) From fee0865740a1a7a9cd943f3695f9f3c7e0d7ff83 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:13 +0200 Subject: [PATCH 2707/3013] package/gdb: fix program typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 27277a2bc90326f9bfda3aacc2ef494bf207a8ec) Signed-off-by: Peter Korsgaard --- package/gdb/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 49ee4b3728c..8cbd52cff59 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -52,7 +52,7 @@ config BR2_PACKAGE_GDB_SERVER depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY help Build the gdbserver stub to run on the target. - A full gdb is needed to debug the progam. + A full gdb is needed to debug the program. config BR2_PACKAGE_GDB_DEBUGGER bool "full debugger" From 1395e6cedcc1263077eeb8501d0348c3e915090a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:14 +0200 Subject: [PATCH 2708/3013] package/genpart: fix typos and grammar in patch description Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: also fix grammar] Signed-off-by: Yann E. MORIN (cherry picked from commit e009783505e80e80a49f57a0abd9aa2b417063bb) Signed-off-by: Peter Korsgaard --- package/genpart/0001-fix-return-code.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/genpart/0001-fix-return-code.patch b/package/genpart/0001-fix-return-code.patch index ec18c82f8ca..6ecf0d9bc2c 100644 --- a/package/genpart/0001-fix-return-code.patch +++ b/package/genpart/0001-fix-return-code.patch @@ -1,7 +1,7 @@ -genpart: return 0 if partition writen OK, with no do_magic +genpart: return 0 if partition written OK, with no do_magic -If do_magic is false, we don't won't write the 0xaa55 magic. -However, if we succesfully wrote the partition entry, we still +If do_magic is false, we won't write the 0xaa55 magic. +However, if we successfully wrote the partition entry, we still want to return 0 to indicate success. Signed-off-by: "Yann E. MORIN" From e9fe4e6cb9f4cdb6a37964c2e3934703c746a558 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:15 +0200 Subject: [PATCH 2709/3013] package/gerbera: fix guaranteed typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 4a66a2af64abbf1e501fd3c7d79bd41cea36a244) Signed-off-by: Peter Korsgaard --- package/gerbera/gerbera.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index 6616a83e746..f3f05b364d3 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -80,7 +80,7 @@ else GERBERA_CONF_OPTS += -DWITH_MATROSKA=OFF endif -# Either libupnp or libnpupnp are guranteed to be enabled +# Either libupnp or libnpupnp are guaranteed to be enabled ifeq ($(BR2_PACKAGE_LIBNPUPNP),y) GERBERA_DEPENDENCIES += libnpupnp GERBERA_CONF_OPTS += -DWITH_NPUPNP=ON From 506c14d8e1ff272c7ad4a3653d3d131030b9fb3f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:16 +0200 Subject: [PATCH 2710/3013] package/go-src: fix variable typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c31189363b65b390fe8c0fddf03f26f933451d89) Signed-off-by: Peter Korsgaard --- .../0001-build.go-explicit-option-for-crosscompilation.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch index 992a83a644d..c7cf02ced27 100644 --- a/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch +++ b/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch @@ -7,7 +7,7 @@ Actually if GOHOSTOS == GOOS || GOHOSTARCH == GOARCH the go build system assume it's not cross compiling and uses the same toolchain also for the bootstrap. This is a problem in case the cross compilation mandates a different toolchain for bootstrap and target. This patch adds -GO_ASSUME_CROSSCOMPILING varible to assure that in case of cross +GO_ASSUME_CROSSCOMPILING variable to assure that in case of cross compilation CC_FOR_TARGET can be different from CC. Signed-off-by: Angelo Compagnucci From 78e646240fc79d08efd9c3f73042f8aef3f6e34e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:17 +0200 Subject: [PATCH 2711/3013] package/go: fix convenience typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 5aa9b105b96dda4d0db6fc11f4c8abe09a63ed33) Signed-off-by: Peter Korsgaard --- package/go/go.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/go/go.mk b/package/go/go.mk index 660c7a9bada..91aa31f76c0 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -65,7 +65,7 @@ else ifeq ($(BR2_s390x),y) GO_GOARCH = s390x endif -# For the convienience of target packages. +# For the convenience of target packages. HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TARGET_ENV = \ $(HOST_GO_COMMON_ENV) \ From 75feb672cb92affebfcdd2ed3920eb4ef18e6fdb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:18 +0200 Subject: [PATCH 2712/3013] package/gobject-introspection: fix altogether typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6d6d7bfe2333afdd4f34c2d54f27e34fc3c6b9ba) Signed-off-by: Peter Korsgaard --- package/gobject-introspection/0001-disable-tests.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index 8de216c039e..a39f51617bd 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] disable tests If introspection data on the host is not built, meson throws the error: "Unknown variable "typelibs". Because tests are not required, removing -the subdir tests alltogether fixes this issue. +the subdir tests altogether fixes this issue. Signed-off-by: Adam Duskett --- From c2c336ce64a821426c829dfb073eb7c5c1070dc9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:19 +0200 Subject: [PATCH 2713/3013] package/gtest: fix explanation typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e9beedc3d4151dfaca41922e98d0a6a9f0ce690e) Signed-off-by: Peter Korsgaard --- package/gtest/gtest.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index c252ede818b..832c494ff55 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -18,7 +18,7 @@ GTEST_CPE_ID_PRODUCT = google_test # gtest. # So, force to build gtest as a static library. # -# For further details, refer to the explaination given in the README file from +# For further details, refer to the explanation given in the README file from # the gtest sources. GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF From 42f828d28b7842fa497fcdb374c87fa7494db574 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:20 +0200 Subject: [PATCH 2714/3013] package/hddtemp: fix information typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d5451c18c03e5f2b0ca545afc33ce1bdb35d1b00) Signed-off-by: Peter Korsgaard --- package/hddtemp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hddtemp/Config.in b/package/hddtemp/Config.in index 0e022524614..23fef3d23a9 100644 --- a/package/hddtemp/Config.in +++ b/package/hddtemp/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_HDDTEMP select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help hddtemp is a small utility that gives you the temperature of - your hard drive by reading S.M.A.R.T. informations, for drives + your hard drive by reading S.M.A.R.T. information, for drives that support this feature. https://github.com/vitlav/hddtemp From b6544fbb6c050a88058132d5edf99394873d5d43 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:21 +0200 Subject: [PATCH 2715/3013] package/heirloom-mailx: fix attachments typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 30a9d7d129908080667845fdc167f149cb92c665) Signed-off-by: Peter Korsgaard --- package/heirloom-mailx/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/heirloom-mailx/Config.in b/package/heirloom-mailx/Config.in index c5b0bcbea7b..ed2a5194366 100644 --- a/package/heirloom-mailx/Config.in +++ b/package/heirloom-mailx/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_HEIRLOOM_MAILX importantly on embedded systems, as a mail composition program and SMTP client, in order to send e-mail from shell scripts. It supports SMTP authentication (login, plain, - cram-md5), SMTPS, MIME encoding of attachements, and more. + cram-md5), SMTPS, MIME encoding of attachments, and more. http://heirloom.sourceforge.net/mailx.html From 8edb067494eb17e63c561d3c6bf19bcebe3ed07a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Sep 2024 09:08:22 +0200 Subject: [PATCH 2716/3013] package/hostapd: fix proprietary typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ffc872d5f87a565a766ac21cd9d4b2a54c9b4f48) Signed-off-by: Peter Korsgaard --- package/hostapd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index f4206ceea5a..660274ddf01 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -54,7 +54,7 @@ config BR2_PACKAGE_HOSTAPD_ACS depends on BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 help Enable support for standard ACS (Automatic Channel Selection). - Some propietary drivers use a custom algorithm which requires + Some proprietary drivers use a custom algorithm which requires channel to be set to '0' (which enables ACS in the config), causing hostapd to use the standard one which doesn't work for those cases. From 2c372847af86b104d8f75558239ae880370c0009 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 11 Sep 2024 21:19:11 +0200 Subject: [PATCH 2717/3013] gitlab: fix issue template The two lines with the Buildroot version and the system os-release details are rendered on a single line, "because Markdown". Make that a two-item list, to be sure they are on properly rendered. Signed-off-by: Yann E. MORIN (cherry picked from commit 6a1e297a31ed3257876fcba5064dbce36b1e670c) Signed-off-by: Peter Korsgaard --- .gitlab/issue_templates/default.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/issue_templates/default.md b/.gitlab/issue_templates/default.md index c3f23e54ba7..968d6aab641 100644 --- a/.gitlab/issue_templates/default.md +++ b/.gitlab/issue_templates/default.md @@ -33,8 +33,8 @@ _Note: issues missing any information may get closed without further ado._ --- ### What I did -**Buildroot commit sha1**: _get this with `git describe HEAD`_ -**Distribution of the build machine**: _get this with `NAME` and `VERSION` from `/etc/os-release`_ +- **Buildroot commit sha1**: _get this with `git describe HEAD`_ +- **Distribution of the build machine**: _get this with `NAME` and `VERSION` from `/etc/os-release`_ _Here, describe what you did:_ - _any special environment variables: CC, CXX, TARGET, CROSS_COMPILE, etc…_ From 328bd0be09b4c71e2650b85b3a075e9c5a4e7546 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 16 Aug 2024 03:39:29 +0200 Subject: [PATCH 2718/3013] package/bind: security bump to 9.18.28 Fixes the following security issues: - CVE-2024-0760: A flood of DNS messages over TCP may make the server unstable https://kb.isc.org/docs/cve-2024-0760 - CVE-2024-1737: BIND's database will be slow if a very large number of RRs exist at the same name https://kb.isc.org/docs/cve-2024-1737 - CVE-2024-1975: SIG(0) can be used to exhaust CPU resources https://kb.isc.org/docs/cve-2024-1975 - CVE-2024-4076: Assertion failure when serving both stale cache data and authoritative zone content https://kb.isc.org/docs/cve-2024-4076 Bind 9.16.x is EOL since April 2024. See here for what version should be used in production: https://kb.isc.org/docs/aa-01540 Remove patch 0001 as CC_FOR_BUILD is used in upstream code to compile host utility gen. Use BIND_AUTORECONF = YES to avoid a Debian 12 libtool bug. Otherwise rndc linking fails. See here for a bug report to bind9 project: https://gitlab.isc.org/isc-projects/bind9/-/issues/4840 See here for a changelog: https://downloads.isc.org/isc/bind9/9.18.28/doc/arm/html/notes.html COPYRIGHT file has been updated, following Copyright holders were added: Copyright Joyent, Inc. and other Node contributors. All rights reserved. Signed-off-by: Waldemar Brodkorb Reviewed-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (cherry picked from commit c9515c8b63bc9bc84b52b731c2c72031acd240d2) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/bind/0001-cross.patch | 34 ---------------------------------- package/bind/bind.hash | 8 ++++---- package/bind/bind.mk | 9 +++++---- 4 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 package/bind/0001-cross.patch diff --git a/.checkpackageignore b/.checkpackageignore index a824a50c491..b2cce42ebdf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -336,7 +336,6 @@ package/benejson/0001-c-std.patch lib_patch.Upstream package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch lib_patch.Upstream package/berkeleydb/0001-cwd-db_config.patch lib_patch.Upstream package/berkeleydb/0002-atomic_compare_exchange.patch lib_patch.Upstream -package/bind/0001-cross.patch lib_patch.Upstream package/bind/S81named Shellcheck lib_sysv.Indent lib_sysv.Variables package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch lib_patch.Upstream package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch lib_patch.Upstream diff --git a/package/bind/0001-cross.patch b/package/bind/0001-cross.patch deleted file mode 100644 index f39be2f8377..00000000000 --- a/package/bind/0001-cross.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 505cc9fcadda5607dc4c5bacb03928c0b35162a8 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 4 Nov 2020 17:51:38 +0100 -Subject: [PATCH] Use host compiler to build 'gen' since it's run when - building. - -Signed-off-by: Gustavo Zacarias -[Fabrice: updated for 9.11.10] -Signed-off-by: Fabrice Fontaine -Signed-off-by: Petr Vorel ---- - lib/dns/Makefile.in | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in -index 8fc4e94f26..4ac92857e0 100644 ---- a/lib/dns/Makefile.in -+++ b/lib/dns/Makefile.in -@@ -184,10 +184,8 @@ code.h: gen - ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; } - - gen: gen.c -- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ -- ${LFS_CFLAGS} ${LFS_LDFLAGS} \ -- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \ -- ${BUILD_LIBS} ${LFS_LIBS} -+ ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \ -+ ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c - - timestamp: include libdns.@A@ - touch timestamp --- -2.29.1 - diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 482b046c8d1..feb3430a738 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc -# with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz -sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT +# Verified from https://ftp.isc.org/isc/bind9/9.18.28/bind-9.18.28.tar.xz.asc +# with key 706B6C28620E76F91D11F7DF510A642A06C52CEC +sha256 e7cce9a165f7b619eefc4832f0a8dc16b005d29e3890aed6008c506ea286a5e7 bind-9.18.28.tar.xz +sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 0d81ffabd68..217c9916fd3 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.48 +BIND_VERSION = 9.18.28 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. @@ -24,13 +24,14 @@ BIND_TARGET_SERVER_SBIN += lwresd named named-checkconf named-checkzone BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate -BIND_CONF_ENV = \ - BUILD_CC="$(TARGET_CC)" \ - LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` +# avoid potential Debian 12 libtool 2.4.7 bug +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=929396 +BIND_AUTORECONF = YES BIND_CONF_OPTS = \ --without-cmocka \ --without-lmdb \ --enable-epoll \ + --disable-doh \ --disable-backtrace \ --with-openssl=$(STAGING_DIR)/usr From c04b02323c7274f78f77c2665618793c2c3eb98d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 16 Aug 2024 03:40:54 +0200 Subject: [PATCH 2719/3013] package/nginx: fix static build error In commit 761259c93400bc806611a242c7dc3df7ff67c231 the SSL patch was removed, without testing any static compilation. Reintroduce a small version of the original patch. Upstream does not use pkg-config, so the patch is Buildroot specific and not suitable for upstreaming. Fixes: - http://autobuild.buildroot.net/results/a85/a85b00dfe9b55607390ebacc0e4e55c7cfbace3a Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (cherry picked from commit 6cda3504086e4c4b6acd24212e4d568684442243) Signed-off-by: Peter Korsgaard --- ...auto-lib-openssl-conf-use-pkg-config.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/nginx/0009-auto-lib-openssl-conf-use-pkg-config.patch diff --git a/package/nginx/0009-auto-lib-openssl-conf-use-pkg-config.patch b/package/nginx/0009-auto-lib-openssl-conf-use-pkg-config.patch new file mode 100644 index 00000000000..05fb48b76e5 --- /dev/null +++ b/package/nginx/0009-auto-lib-openssl-conf-use-pkg-config.patch @@ -0,0 +1,34 @@ +From 232ac61984720401b0c3854da1644ec20ed218e0 Mon Sep 17 00:00:00 2001 +From: Martin Bark +Date: Thu, 15 Aug 2024 19:47:23 +0200 +Subject: [PATCH] auto/lib/openssl/conf: use pkg-config + +Change to using pkg-config to find the path to openssl and its +dependencies. + +Signed-off-by: Martin Bark +Signed-off-by: Waldemar Brodkorb +Upstream: not suitable +--- + auto/lib/openssl/conf | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf +index fdf430dff..c9fe4c8bf 100644 +--- a/auto/lib/openssl/conf ++++ b/auto/lib/openssl/conf +@@ -63,8 +63,9 @@ else + ngx_feature_name="NGX_OPENSSL" + ngx_feature_run=no + ngx_feature_incs="#include " +- ngx_feature_path= +- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" ++ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl| ++ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" ++ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" + ngx_feature_test="SSL_CTX_set_options(NULL, 0)" + . auto/feature + +-- +2.39.2 + From 618b1b056c624f397530f64ff4c932bf83cf59e0 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Fri, 16 Aug 2024 12:06:59 +0300 Subject: [PATCH 2720/3013] package: move wireplumber from Graphics to Audio/Video WirePlumber is a PipeWire session manager, essential to the operation of PipeWire in most use cases. It is not a graphical application, nor does it support graphics in any way. It is only there to support PipeWire and it should be kept together with PipeWire in the menus. Signed-off-by: George Kiagiadakis Signed-off-by: Arnout Vandecappelle (cherry picked from commit 14b1b8ca8dc92851aa7400af432874621cfdb776) Signed-off-by: Peter Korsgaard --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index f33c4780f8e..74e63419d64 100644 --- a/package/Config.in +++ b/package/Config.in @@ -61,6 +61,7 @@ menu "Audio and video applications" source "package/vlc/Config.in" source "package/vorbis-tools/Config.in" source "package/wavpack/Config.in" + source "package/wireplumber/Config.in" source "package/yavta/Config.in" source "package/ympd/Config.in" source "package/zynaddsubfx/Config.in" @@ -1760,7 +1761,6 @@ menu "Graphics" source "package/waylandpp/Config.in" source "package/webkitgtk/Config.in" source "package/webp/Config.in" - source "package/wireplumber/Config.in" source "package/wlroots/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" From 43d9a911b2dc6a01e86fe74c426cec097f9cf5da Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 11 Sep 2024 22:47:19 +0200 Subject: [PATCH 2721/3013] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ee67e4baffc8bb0577a265ad4ffe814acfad5397) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e38f8104e08..023fa0a2ecb 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index ffc25f79593..5c745f7c7cd 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 c0923235779d4606bba87f72b6fe11f796e9e40c1ca9f4d5dbe04cd47ee3c595 linux-6.10.8.tar.xz -sha256 2c56dac2b70859c16b4ef651befb0d28c227498bd3eee08e8a45a357f22dd3b7 linux-6.6.49.tar.xz -sha256 3f4e4e89a00e221a6dd1174779e0028794f44f4624ad6a31c79f3b7796688ca2 linux-6.1.108.tar.xz +sha256 a4489b70e0a7c2dc8f501b9cd7fc76989be2febb5519e163ecf816064f2f6858 linux-6.10.9.tar.xz +sha256 c065e36daf28210060c91a37ef3e92ac5814784e634577e04e406297ead2e86e linux-6.6.50.tar.xz +sha256 732ff40ac63642c5ddbb7d65c24c90ed08b95af0e8c92df4739e9703eec01ac1 linux-6.1.109.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e56caae259b85b7685ee589075d58bb7b227024497a60fa27a7b43e0b48839cf linux-5.15.166.tar.xz sha256 85d7bf3a807538b9032e3f798ab978da9b77352bcb526534038c351a4f39e01c linux-5.10.225.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 52971ca8bd3..003c2f6a66d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -427,9 +427,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.283" if BR2_KERNEL_HEADERS_5_4 default "5.10.225" if BR2_KERNEL_HEADERS_5_10 default "5.15.166" if BR2_KERNEL_HEADERS_5_15 - default "6.1.108" if BR2_KERNEL_HEADERS_6_1 - default "6.6.49" if BR2_KERNEL_HEADERS_6_6 - default "6.10.8" if BR2_KERNEL_HEADERS_6_10 + default "6.1.109" if BR2_KERNEL_HEADERS_6_1 + default "6.6.50" if BR2_KERNEL_HEADERS_6_6 + default "6.10.9" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From b0a601d8c601b6ba67f8da725fc29ba3ab16f71f Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 11 Sep 2024 17:50:23 +0200 Subject: [PATCH 2722/3013] package/rp-pppoe: fixup download URL As reported in [1], the download of rp-pppoe-3.15.tar.gz is no longer guaranteed from the download section of the project. Fortunately, Jacon Kroon is hosting the RP-PPPoE source code for versions 3.15 and 4.0 in a location that permits automated downloads. Fixes: - http://autobuild.buildroot.org/results/8676456feec9dd401152887101ad1a9ce96cb769 [1] https://dianne.skoll.ca/pipermail/rp-pppoe/2024q3/000652.html Cc: Jaco Kroon Cc: Dianne Skoll Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit de42743f1b7f05517fc4f8eba73ddaee2e4c9ae8) Signed-off-by: Peter Korsgaard --- package/rp-pppoe/rp-pppoe.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index f50f1e5a1fd..75f2290442b 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -5,7 +5,7 @@ ################################################################################ RP_PPPOE_VERSION = 3.15 -RP_PPPOE_SITE = https://dianne.skoll.ca/projects/rp-pppoe/download +RP_PPPOE_SITE = https://downloads.uls.co.za/rp-pppoe RP_PPPOE_LICENSE = GPL-2.0 RP_PPPOE_LICENSE_FILES = doc/LICENSE RP_PPPOE_CPE_ID_VALID = YES From 243df597f3fd2b53d73a453211141aaf3127c2a9 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 8 Sep 2024 20:28:56 +0200 Subject: [PATCH 2723/3013] package/xenomai: fixup download URL As reported in [1], https://xenomai.org/downloads/xenomai/stable has been moved to https://ftp.denx.de/pub/xenomai/xenomai/stable. Fixes: - http://autobuild.buildroot.org/results/83061154a9c21ecf981fdf5b4c02be6a793a8e56 [1] https://lore.kernel.org/xenomai/95d4f7a6-1237-4ae0-9fb6-3979fa058bcc@siemens.com Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 30bc9d9b1b86a0682f72f96a715381d0e221ef51) Signed-off-by: Peter Korsgaard --- package/xenomai/xenomai.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index 9356919259b..378e51ad3e2 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -14,7 +14,7 @@ XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY)) XENOMAI_SITE_METHOD = git else XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 -XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable +XENOMAI_SITE = https://ftp.denx.de/pub/xenomai/xenomai/stable endif # We're patching configure.ac XENOMAI_AUTORECONF = YES From b903a3b3933a2e32ffabef844a410cc74edeb760 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:08 +0200 Subject: [PATCH 2724/3013] package/icu: fix typos in help text and patch description Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c186db4741b30ae02f700e93649b7b04d5bf1ea2) Signed-off-by: Peter Korsgaard --- package/icu/0002-workaround-toolchain-bugs.patch | 2 +- package/icu/Config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/icu/0002-workaround-toolchain-bugs.patch b/package/icu/0002-workaround-toolchain-bugs.patch index b5f25d0a136..f6b124cc2a0 100644 --- a/package/icu/0002-workaround-toolchain-bugs.patch +++ b/package/icu/0002-workaround-toolchain-bugs.patch @@ -1,7 +1,7 @@ Workaround toolchain bugs Many of ARM Sourcery CodeBench toolchain have a bug when compiling -icu's translit.cpp source file. The bug is trigerred when there is a +icu's translit.cpp source file. The bug is triggered when there is a combination of "-W -Wall" and "-Os", and causes an internal compiler error. The bug has been reported to Mentor Graphics. diff --git a/package/icu/Config.in b/package/icu/Config.in index 8b410bfdb6a..4ed662e8874 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH help This option allows to define the path to a custom data library generated with http://apps.icu-project.org/datacustom/ - Make sure you select the appropiate version to match the one + Make sure you select the appropriate version to match the one provided by buildroot. Leave empty to not use this functionality. From df61e43aab3693144bd74a02b4b05593d14be675 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:09 +0200 Subject: [PATCH 2725/3013] package/irda-utils: fix typos in patch descriptions Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 1961a86751cc550dd54e0c68b3bd131fad3168d4) Signed-off-by: Peter Korsgaard --- package/irda-utils/0001-daemon.patch | 2 +- package/irda-utils/0002-nommu.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/irda-utils/0001-daemon.patch b/package/irda-utils/0001-daemon.patch index f6034a75b44..9f01de20aef 100644 --- a/package/irda-utils/0001-daemon.patch +++ b/package/irda-utils/0001-daemon.patch @@ -2,7 +2,7 @@ written by Mike Frysinger https://sourceforge.net/tracker/?func=detail&aid=3132053&group_id=5616&atid=305616 -Rather than using the fork function (which doesnt work on nommu +Rather than using the fork function (which doesn't work on nommu systems), simply use the daemon() function instead (which does work). this should work the same before and after for all systems. diff --git a/package/irda-utils/0002-nommu.patch b/package/irda-utils/0002-nommu.patch index bc76bd3957c..13c5ad2a7c9 100644 --- a/package/irda-utils/0002-nommu.patch +++ b/package/irda-utils/0002-nommu.patch @@ -3,7 +3,7 @@ written by Mike Frysinger https://sourceforge.net/tracker/?func=detail&aid=3132056&group_id=5616&atid=305616 nommu systems cannot fork() as the hardware cannot support -it. irattach uses it as a minor optimization, but it isnt +it. irattach uses it as a minor optimization, but it isn't necessary for correct functioning of the utility. so add a NO_FORK define so we nommu peeps can do CFLAGS="... -DNO_FORK=1 ..." and use it in our embedded systems. From 141386925066982e23224d64971cce4858e58268 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:10 +0200 Subject: [PATCH 2726/3013] package/json-for-modern-cpp: fix design typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 9178a339cf0af2348b5ef2e38c17292f904b2b8e) Signed-off-by: Peter Korsgaard --- package/json-for-modern-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-for-modern-cpp/Config.in b/package/json-for-modern-cpp/Config.in index b045cba6844..34fc4e29e26 100644 --- a/package/json-for-modern-cpp/Config.in +++ b/package/json-for-modern-cpp/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_JSON_FOR_MODERN_CPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_INSTALL_LIBSTDCPP help - Json for modern c++ has the following desing goals in mind: + Json for modern c++ has the following design goals in mind: - Intuitive syntax. In languages such as Python, JSON feels like a first class data type. All the operator magic of From 7a597b92f129759d6d76bc6636197dd87e52214b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:11 +0200 Subject: [PATCH 2727/3013] package/keepalived: fix summarize typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c21f235838f66a08f927570d398012297ffe251d) Signed-off-by: Peter Korsgaard --- package/keepalived/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/keepalived/Config.in b/package/keepalived/Config.in index 2a0663fed06..98512912fd1 100644 --- a/package/keepalived/Config.in +++ b/package/keepalived/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_KEEPALIVED checks. Keepalived implements a framework based on three family checks: Layer3, Layer4 & Layer5. This framework gives the daemon the ability of checking a LVS server pool - states. Keepalived can be sumarize as a LVS driving daemon. + states. Keepalived can be summarized as a LVS driving daemon. http://www.keepalived.org/ From 5ce885b30b80b1d532f3f9a0b69e792a295b43cd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:12 +0200 Subject: [PATCH 2728/3013] package/kexec-lite: fix utility typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 98e1dae3a39c622d755ada474c693e33109a47d5) Signed-off-by: Peter Korsgaard --- package/kexec-lite/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kexec-lite/Config.in b/package/kexec-lite/Config.in index 89184b0b7c1..71bd619ae4c 100644 --- a/package/kexec-lite/Config.in +++ b/package/kexec-lite/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_KEXEC_LITE select BR2_PACKAGE_DTC select BR2_PACKAGE_DTC_PROGRAMS help - Kexec is a user space utiltity for loading another kernel + Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with it. From 7cedebe44eaad7d1171d851a917340703eaf7b1a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:13 +0200 Subject: [PATCH 2729/3013] package/lbreakout2: fix typos in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 2e868977128db012764e491b9b7dc4978efacbd0) Signed-off-by: Peter Korsgaard --- package/lbreakout2/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lbreakout2/Config.in b/package/lbreakout2/Config.in index eeb8a06966f..3397df97b99 100644 --- a/package/lbreakout2/Config.in +++ b/package/lbreakout2/Config.in @@ -5,9 +5,9 @@ config BR2_PACKAGE_LBREAKOUT2 help LBreakout2 is the successor to LBreakout, a breakout-style arcade game in the manner of Arkanoid. Requires SDL, libpng, - and optionnally SDL_mixer/SDL_net. + and optionally SDL_mixer/SDL_net. A display with minimum 640x480 resolution, a keyboard and a - mouse are recommanded. + mouse are recommended. http://lgames.sourceforge.net/index.php?project=LBreakout2 From 736d908465c347fa30ebac8e1f53b4024b6646f6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:14 +0200 Subject: [PATCH 2730/3013] package/libcddb: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c581396b9165cd690c65b446e37b4523c2127fb4) Signed-off-by: Peter Korsgaard --- package/libcddb/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcddb/Config.in b/package/libcddb/Config.in index f2bb827829f..71797a27120 100644 --- a/package/libcddb/Config.in +++ b/package/libcddb/Config.in @@ -15,6 +15,6 @@ if BR2_PACKAGE_LIBCDDB config BR2_PACKAGE_LIBCDDB_INSTALL_CDDB_QUERY bool "install cddb_query" help - cddb_query is an optionnal libcddb test program. + cddb_query is an optional libcddb test program. endif From 2d17c16ff7154524d2ee004fd3c3e6f8a2401e58 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:15 +0200 Subject: [PATCH 2731/3013] package/libcoap: fix typo in help text Rewrap the whole help text as with the typo fix the line is a bit longer and no longer fits within the limits defined by our check-package coding style checking. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 08926081d879f03477e3d5f4a326e01be07c0d60) Signed-off-by: Peter Korsgaard --- package/libcoap/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libcoap/Config.in b/package/libcoap/Config.in index 950aee5279b..2bd6b742e9d 100644 --- a/package/libcoap/Config.in +++ b/package/libcoap/Config.in @@ -5,9 +5,9 @@ config BR2_PACKAGE_LIBCOAP help libcoap is a C implementation of a lightweight application-protocol for devices that are constrained their - resources such as computing power, RF range, memory, bandwith, - or network packet sizes. This protocol, CoAP, is standardized - by the IETF as RFC 7252. For further information related to - CoAP, see . + resources such as computing power, RF range, memory, + bandwidth, or network packet sizes. This protocol, CoAP, is + standardized by the IETF as RFC 7252. For further + information related to CoAP, see . https://github.com/obgm/libcoap From 94b0b7d79c20e74aa78a56311ed7f5109f8d0c1b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:16 +0200 Subject: [PATCH 2732/3013] package/libee: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 686caaa5d47b2553b4a99109aa171a996cebf79b) Signed-off-by: Peter Korsgaard --- package/libee/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libee/Config.in b/package/libee/Config.in index 9a3411ef291..f7dd821bc06 100644 --- a/package/libee/Config.in +++ b/package/libee/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_LIBEE convenient API layer above the CEE standard. However, CEE is not finished. At the time of this writing, CEE is under heavy development and even some of its core data structures - (like the data dictionary and taxonmy) have not been fully + (like the data dictionary and taxonomy) have not been fully specified. http://www.libee.org From 043fe663907dfe2627f3b12a2417a0867902ee15 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:17 +0200 Subject: [PATCH 2733/3013] package/libev: fix deactivate typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 568a90b7afc05f9752d3077ea1646fb0aa8d060d) Signed-off-by: Peter Korsgaard --- package/libev/libev.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libev/libev.mk b/package/libev/libev.mk index cbd5433d76e..80832d0c112 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -12,7 +12,7 @@ LIBEV_LICENSE_FILES = LICENSE # libev has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif From bcf93b1c398b8f4da93be705d2f5ce02b73ad5fa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:18 +0200 Subject: [PATCH 2734/3013] package/libfreeglut: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit ce7a0875cd0ae59b59e0818112b5afd3f2cf37ec) Signed-off-by: Peter Korsgaard --- package/libfreeglut/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfreeglut/Config.in b/package/libfreeglut/Config.in index ccb2d5cddcf..a3e20fd5092 100644 --- a/package/libfreeglut/Config.in +++ b/package/libfreeglut/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_LIBFREEGLUT OpenGL Utility Toolkit (GLUT) library. GLUT (and hence FreeGLUT) takes care of all the system-specific chores required for creating windows, initializing OpenGL contexts, - and handling input events, to allow for trully portable OpenGL + and handling input events, to allow for truly portable OpenGL programs. http://freeglut.sourceforge.net From 9e45b5366dd070a299a9056e77525b0e0bfa57e5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:19 +0200 Subject: [PATCH 2735/3013] package/libftdi: fix automatically typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b6c3cc6d0f6e7d29d43e385584b2c2d64e3f923) Signed-off-by: Peter Korsgaard --- package/libftdi/libftdi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk index 257342622f2..2cd2fa7e41a 100644 --- a/package/libftdi/libftdi.mk +++ b/package/libftdi/libftdi.mk @@ -16,7 +16,7 @@ LIBFTDI_AUTORECONF = YES LIBFTDI_CONF_OPTS = --without-examples -# configure detect it automaticaly so we need to force it +# configure detect it automatically so we need to force it ifeq ($(BR2_PACKAGE_LIBFTDI_CPP),y) LIBFTDI_LICENSE += , GPL-2.0 with exception (ftdipp) LIBFTDI_LICENSE_FILES += COPYING.GPL From ce1a4448809e875544d47de00b2af890e2adf2d1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:20 +0200 Subject: [PATCH 2736/3013] package/libglib2: fix deferring typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 1a61cfda1e44c8c55456d71a644e70f37d567e6c) Signed-off-by: Peter Korsgaard --- package/libglib2/libglib2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index bffc565f11b..c33df70b255 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -124,7 +124,7 @@ endef # Compile schemas at target finalization since other packages install # them as well, and better do it in a central place. -# It's used at run time so it doesn't matter defering it. +# It's used at run time so it doesn't matter deferring it. define LIBGLIB2_COMPILE_SCHEMAS $(HOST_DIR)/bin/glib-compile-schemas \ $(STAGING_DIR)/usr/share/glib-2.0/schemas \ From 934b8d9ffd6b4f7666a5b88ba4147692aeb57574 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:21 +0200 Subject: [PATCH 2737/3013] package/libgtk4: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 09721a74d908f10352b56785d71e7e44ed2bb8c4) Signed-off-by: Peter Korsgaard --- package/libgtk4/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libgtk4/Config.in b/package/libgtk4/Config.in index af7f57b80e3..99553fc44ef 100644 --- a/package/libgtk4/Config.in +++ b/package/libgtk4/Config.in @@ -96,7 +96,7 @@ config BR2_PACKAGE_LIBGTK4_DEMO select BR2_PACKAGE_SHARED_MIME_INFO select BR2_PACKAGE_HICOLOR_ICON_THEME help - The GTK source base contains demo/exmaple programs. + The GTK source base contains demo/example programs. This option allows to install them to the target. endif From 40161617be2ad3457434a52f3059b81c1891da07 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:22 +0200 Subject: [PATCH 2738/3013] package/libkrb5: fix deactivate typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 45bb5fbdae591f4f5c40ff3433d375f4d7a5d9d9) Signed-off-by: Peter Korsgaard --- package/libkrb5/libkrb5.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 08bc74eb34d..def627d422d 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -36,7 +36,7 @@ LIBKRB5_CONF_OPTS = \ # libkrb5 has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif From 16598bdf5ea9e87f4ad8146c603d109e48403c36 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:23 +0200 Subject: [PATCH 2739/3013] package/libmad: fix deactivate typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 01cc093a980fae3a2f9a632b4a91e5b766e0ec82) Signed-off-by: Peter Korsgaard --- package/libmad/libmad.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 9f3396b1a4e..db04d22e928 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -33,7 +33,7 @@ LIBMAD_AUTORECONF = YES # libmad has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) LIBMAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif From 83d384ac0f4907c7c6cc8100a47553a918ce88bb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:24 +0200 Subject: [PATCH 2740/3013] package/libmodsecurity: fix locally typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit f6e32b6910fdcd1c41bbcc5fe4357d6488175006) Signed-off-by: Peter Korsgaard --- package/libmodsecurity/libmodsecurity.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 2221a8a37d7..dbe43d18e74 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,5 +1,5 @@ # From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz -# Localy calculated +# Locally calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE From 7495b6bb4f9ae8dd1f94cc6ffc7eea1d97b5499c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:25 +0200 Subject: [PATCH 2741/3013] package/libnetconf2: fix library typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c805d1e7c7a7de0b88157e08860fb3bc3ae3b50d) Signed-off-by: Peter Korsgaard --- package/libnetconf2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnetconf2/Config.in b/package/libnetconf2/Config.in index 34934325fa0..1763243120c 100644 --- a/package/libnetconf2/Config.in +++ b/package/libnetconf2/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBNETCONF2 https://github.com/CESNET/libnetconf2 -comment "libnetconf2 needs a toolchain w/ threads, dynamic libraray" +comment "libnetconf2 needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS From b4c08cf4700cb05c5593bd9a60d90609d6f3130a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:26 +0200 Subject: [PATCH 2742/3013] package/libnss: fix overridden typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 339c50ecdc47cae80f6079721eafeb053df6e1ef) Signed-off-by: Peter Korsgaard --- ...1-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch index 7b3abea307e..90dffad96e2 100644 --- a/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch +++ b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bug 1801182 - Allow overriding OS_ARCH, OS_TEST and OS_RELEASE in Makefile Starting from Make 4.3.91 simple expanded variables can't be safely -overriden via command line anymore, so let's use conditional expanded +overridden via command line anymore, so let's use conditional expanded variables to override OS_ARCH, OS_TEST and OS_RELEASE. Signed-off-by: Giulio Benetti From 48ab6da3ef03515fed48269bd990fffea874caa7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:27 +0200 Subject: [PATCH 2743/3013] package/libpam-nfc: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 415542a23536e9a1db7ae7daf13c068352af4a2a) Signed-off-by: Peter Korsgaard --- package/libpam-nfc/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpam-nfc/Config.in b/package/libpam-nfc/Config.in index ce3a3eeb195..3dce8d8e4af 100644 --- a/package/libpam-nfc/Config.in +++ b/package/libpam-nfc/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_LIBPAM_NFC bool "libpam-nfc" select BR2_PACKAGE_LIBNFC help - NFC-based PAM authentification module. + NFC-based PAM authentication module. https://github.com/nfc-tools/pam_nfc From 511d9df4f576918e3fc2b3e2ec4960f17f7c306f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:28 +0200 Subject: [PATCH 2744/3013] package/libpeas: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit b4eb041af172164f3f6bf808fabcef3f99ff685d) Signed-off-by: Peter Korsgaard --- package/libpeas/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpeas/Config.in b/package/libpeas/Config.in index 430e668ee7e..33fae14d4c4 100644 --- a/package/libpeas/Config.in +++ b/package/libpeas/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBPEAS select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBGLIB2 help - libpeas is a gobject-based plugins engine, and is targetted at + libpeas is a gobject-based plugins engine, and is targeted at giving every application the chance to assume its own extensibility. It also has a set of features including, but not limited to: From 6485c37fa39865c28b09ce451f0d72a53f304ddb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:29 +0200 Subject: [PATCH 2745/3013] package/libvirt: fix typo in init script comment Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 6599d68a66a242cfae9d484da2f7fdaa50c3aa31) Signed-off-by: Peter Korsgaard --- package/libvirt/S92libvirtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvirt/S92libvirtd b/package/libvirt/S92libvirtd index 736519f3d06..35368ef5a2b 100644 --- a/package/libvirt/S92libvirtd +++ b/package/libvirt/S92libvirtd @@ -47,7 +47,7 @@ load_modules() { } # -# If libvirtd dies it leves behind one stale dnsmasq per virtual network that +# If libvirtd dies it leaves behind one stale dnsmasq per virtual network that # must be killed before starting libvirtd again. # rm_stale_dnsmasq() { From 1b6e22b6a4d47a67762e6c57260fd6a9d4b8fbfb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 09:19:30 +0200 Subject: [PATCH 2746/3013] package/libxcrypt: fix insecure typo Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 893602e69d1cd728a24c2cad6b877cb0c3da51cd) Signed-off-by: Peter Korsgaard --- package/libxcrypt/libxcrypt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index d39186eecb9..60901988ac8 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -15,7 +15,7 @@ LIBXCRYPT_INSTALL_STAGING = YES LIBXCRYPT_CONF_OPTS = --disable-werror HOST_LIBXCRYPT_CONF_OPTS = --disable-werror -# Disable obsolete and unsecure API +# Disable obsolete and insecure API LIBXCRYPT_CONF_OPTS += --disable-obsolete_api HOST_LIBXCRYPT_CONF_OPTS += --disable-obsolete_api From 66425c8e1485b83551bb0d8704a01521ed5309e9 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 11 Sep 2024 21:18:58 +0000 Subject: [PATCH 2747/3013] package/go: security bump to version 1.22.7 Fixes the following CVEs: CVE-2024-34155: go/parser: stack exhaustion in all Parse* functions CVE-2024-34156: encoding/gob: stack exhaustion in Decoder.Decode CVE-2024-34158: go/build/constraint: stack exhaustion in Parse https://go.dev/doc/devel/release#go1.22.7 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 8d371dbe55ea641f7afa3c00ea6475012b8e84fc) Signed-off-by: Peter Korsgaard --- package/go/go-src/go-src.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go-src/go-src.hash b/package/go/go-src/go-src.hash index d300f6e2c90..f5727390f74 100644 --- a/package/go/go-src/go-src.hash +++ b/package/go/go-src/go-src.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 go1.22.5.src.tar.gz +sha256 66432d87d85e0cfac3edffe637d5930fc4ddf5793313fe11e4a0f333023c879f go1.22.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 91aa31f76c0..dd3650e3e53 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.22.5 +GO_VERSION = 1.22.7 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache From a14661a72d61d803e1b2e315e0ba154506b8ea41 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 6 Sep 2024 23:57:19 +0200 Subject: [PATCH 2748/3013] package/php: bump version to 8.3.11 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/437 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 8331fb05925b33fbff1b08367470652e31996b39) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 3a6f60680b6..7df051df4e0 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 a0f2179d00931fe7631a12cbc3428f898ca3d99fe564260c115af381d2a1978d php-8.3.10.tar.xz +sha256 b862b098a08ab9bf4b36ed12c7d0d9f65353656b36fb0e3c5344093aceb35802 php-8.3.11.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 0487c03b613..d7788107c18 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.10 +PHP_VERSION = 8.3.11 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From cc70cadb3224686779b50cbd2480a77e38d5a9e4 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 9 Sep 2024 08:33:39 +0200 Subject: [PATCH 2749/3013] package/xenomai: fix build with gcc 11 The commit adds an upstream patch to fix the following build failure: latency.c: In function 'dump_histo_gnuplot': latency.c:415:9: error: 'fclose' called on pointer returned from a mismatched allocation function [-Werror=mismatched-dealloc] 415 | fclose(ifp); | ^~~~~~~~~~~ latency.c:404:15: note: returned from 'popen' 404 | ifp = popen(xconf, "r"); | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e15ccef2f2bd58482204b5061f77e76a8a540ebd Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 17642f50323041e4f9fa0cb1d6f703e646ee4548) Signed-off-by: Peter Korsgaard --- ...y-Use-corresponding-pclose-for-popen.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/xenomai/3.0.10/0005-testsuite-latency-Use-corresponding-pclose-for-popen.patch diff --git a/package/xenomai/3.0.10/0005-testsuite-latency-Use-corresponding-pclose-for-popen.patch b/package/xenomai/3.0.10/0005-testsuite-latency-Use-corresponding-pclose-for-popen.patch new file mode 100644 index 00000000000..a144c4ece35 --- /dev/null +++ b/package/xenomai/3.0.10/0005-testsuite-latency-Use-corresponding-pclose-for-popen.patch @@ -0,0 +1,30 @@ +From 6fe6b75bef4b4bb9723b12f0e9ebfd9877e00a44 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Sat, 16 Oct 2021 19:52:28 +0200 +Subject: [PATCH] testsuite/latency: Use corresponding pclose for popen + +Was found by latest gcc-11 and -Werror=mismatched-dealloc. + +Signed-off-by: Jan Kiszka +Signed-off-by: Dario Binacchi +Upstream: https://source.denx.de/Xenomai/xenomai/-/commit/6fe6b75bef4b4bb9723b12f0e9ebfd9877e00a44 +--- + testsuite/latency/latency.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testsuite/latency/latency.c b/testsuite/latency/latency.c +index a0e6f4826084..6cd3a28b44f6 100644 +--- a/testsuite/latency/latency.c ++++ b/testsuite/latency/latency.c +@@ -412,7 +412,7 @@ static void dump_histo_gnuplot(int32_t *histogram, time_t duration) + fputs(buf, ofp); + } + +- fclose(ifp); ++ pclose(ifp); + + dump_data: + for (n = 0; n < histogram_size && histogram[n] == 0; n++) +-- +2.43.0 + From 0b0c59a4d015affee54a6af4efb4ea0894e08a12 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 11 Sep 2024 06:33:04 +0200 Subject: [PATCH 2750/3013] package/asterisk: security update to 20.9.3 See here for the Changelog: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-20.9.3.md Fixes CVE-2024-42491. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 400973657202e2820704ff31d540dafc27bd8671) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 9889a18c9dd..fe3e3642a4e 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 6bc4d982a238397bf6b3bfa523f63a75a2d9b19edd6f33f79264f2385d05bc42 asterisk-20.9.2.tar.gz +sha256 a15099a5c776045e96b0da2534606c8dbd13bc1ffcbe325f7cfd74dc1d29decb asterisk-20.9.3.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 9d44782a082..c7b97a1ad45 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.9.2 +ASTERISK_VERSION = 20.9.3 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From 4a161d729bae688fd577e7754815b6e1ccf82f9d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 10 Sep 2024 23:05:56 +0200 Subject: [PATCH 2751/3013] package/genpart: change homepage and download location The old homepage is no more, and the download location has changed. Update both to the new download location. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 629c6254ce158f3a15f11149a65066473c17fbd9) Signed-off-by: Peter Korsgaard --- package/genpart/Config.in | 2 +- package/genpart/Config.in.host | 2 +- package/genpart/genpart.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/genpart/Config.in b/package/genpart/Config.in index 64288452ea6..b8b8c16f669 100644 --- a/package/genpart/Config.in +++ b/package/genpart/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_GENPART line arguments and dump it to stdout. No CHS magic is done, only lba entries are filled out. - http://www.pengutronix.de/software/genpart/index_en.html + https://public.pengutronix.de/software/genpart diff --git a/package/genpart/Config.in.host b/package/genpart/Config.in.host index d8b9eb61b09..f821bc9e8b6 100644 --- a/package/genpart/Config.in.host +++ b/package/genpart/Config.in.host @@ -5,4 +5,4 @@ config BR2_PACKAGE_HOST_GENPART line arguments and dump it to stdout. No CHS magic is done, only lba entries are filled out. - http://www.pengutronix.de/software/genpart/index_en.html + https://public.pengutronix.de/software/genpart diff --git a/package/genpart/genpart.mk b/package/genpart/genpart.mk index 2aa2c710c0a..b48a0ac3582 100644 --- a/package/genpart/genpart.mk +++ b/package/genpart/genpart.mk @@ -6,7 +6,7 @@ GENPART_VERSION = 1.0.2 GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2 -GENPART_SITE = http://www.pengutronix.de/software/genpart/download +GENPART_SITE = https://public.pengutronix.de/software/genpart # genpart has no license embedded in its source release. # However, their project page mentions: # > This community portal offers an overview about our own OSS From 090890c5f7ff1cf970995ba6be50ccc1f0fad67f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 14 Sep 2024 12:20:01 +0200 Subject: [PATCH 2752/3013] package/qt6/qt6tools: don't build examples and tests in host variant Signed-off-by: Thomas Petazzoni (cherry picked from commit 138d83721b101e621fc6143ebb94954ac833a9e4) Signed-off-by: Peter Korsgaard --- package/qt6/qt6tools/qt6tools.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk index 09c986cfc68..12b6667baee 100644 --- a/package/qt6/qt6tools/qt6tools.mk +++ b/package/qt6/qt6tools/qt6tools.mk @@ -41,6 +41,10 @@ ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) QT6TOOLS_DEPENDENCIES += qt6declarative endif +HOST_QT6TOOLS_CONF_OPTS = \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + HOST_QT6TOOLS_DEPENDENCIES = host-qt6base $(eval $(cmake-package)) From 7e31c9deac00f59d99aa545f5939bba73a0020ca Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Wed, 11 Sep 2024 15:18:29 +0200 Subject: [PATCH 2753/3013] package/qt6/qt6svg: host variant depends on host-qt6base Without this, building just host-qt6svg fails. Signed-off-by: Christian Hitz Signed-off-by: Thomas Petazzoni (cherry picked from commit 480d667a1907f84630bf061537c14fdb73a33eda) Signed-off-by: Peter Korsgaard --- package/qt6/qt6svg/qt6svg.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk index a9d7eaef510..08570c7f9c2 100644 --- a/package/qt6/qt6svg/qt6svg.mk +++ b/package/qt6/qt6svg/qt6svg.mk @@ -36,5 +36,8 @@ QT6SVG_DEPENDENCIES = \ host-pkgconf \ qt6base +HOST_QT6SVG_DEPENDENCIES = \ + host-qt6base + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From 5db78454b230652164db6e2a5eef91f65f891b5e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 14 Sep 2024 12:15:26 +0200 Subject: [PATCH 2754/3013] DEVELOPERS: drop Samuel Martin Samuel Martin has not been around in the Buildroot community for many, many years. His last posting on the mailing list was on July 2018. So let's not pretend those packages are actually maintained, and let's stop spamming Samuel with lots of patches and autobuilder failures. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit d8b83b861c5f503481c47c4fc9335dc3e87b027a) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 069965680b2..d954fdc7ff2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2876,20 +2876,6 @@ F: package/zoxide/ N: Sam Lancia F: package/lrzip/ -N: Samuel Martin -F: package/armadillo/ -F: package/cwiid/ -F: package/flite/ -F: package/nginx/ -F: package/opencv3/ -F: package/openobex/ -F: package/pkg-cmake.mk -F: package/python-numpy/ -F: package/scrub/ -F: package/urg/ -F: package/ussp-push/ -F: support/misc/toolchainfile.cmake.in - N: Sam Voss F: package/ripgrep/ From f70be8d584004524bda546735ac14f3fbc30cbf1 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 14 Sep 2024 11:54:58 +0200 Subject: [PATCH 2755/3013] package/pkg-generic.mk: legal-info: create redist directory for override Commit aacca7f0639bac6bb3fb262d0b1738c4387edeb0 introduced the possibility to also create tarballs for packages that are local or overridden (i.e., with a custom version). However, it forgot to create the directory in which that tarball is stored. The original patch did, but it was reworked by Arnout to use mk_tar_gz instead of tar directly, and the mkdir was dropped there. This failure was silent because the mk_tar_gz function doesn't exit on error. The following error was printed but ignored: support/download/helpers: line 68: .../legal-info/sources/busybox-custom/busybox-custom.tar.gz: No such file or directory Create the directory before calling mk_tar_gz. Signed-off-by: Arnout Vandecappelle Cc: Nicolas Carrier Reported-by: Yann E. MORIN Signed-off-by: Yann E. MORIN (cherry picked from commit d1945f143d4c8cfc541c17ec6ce03c45e2a09155) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 171163dcb44..69352b3730b 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1163,6 +1163,7 @@ ifneq ($$($(2)_OVERRIDE_SRCDIR),) $$(Q)rsync -au --chmod=u=rwX,go=rX $$(RSYNC_VCS_EXCLUSIONS) \ $(call qstrip,$$($(2)_OVERRIDE_SRCDIR))/ \ $$($(2)_BUILDDIR)/.legal-info-rsync/ + $$(Q)mkdir -p $$($(2)_REDIST_SOURCES_DIR) $$(Q). support/download/helpers; set -x; cd $$($(2)_BUILDDIR); TAR=$$(TAR) mk_tar_gz \ $$($(2)_BUILDDIR)/.legal-info-rsync/ \ $$($(2)_BASENAME_RAW) \ From edde5c1a44b995036c1173ad2040f1a8be8d323a Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 14 Sep 2024 11:54:59 +0200 Subject: [PATCH 2756/3013] package/pkg-generic.mk: legal-info: make sure host-tar is available Commit aacca7f0639bac6bb3fb262d0b1738c4387edeb0 introduced the possibility to also create tarballs for packages that are local or overridden (i.e., with a custom version). However, it doesn't work correctly for PPD, because the PPD-host-tar and gzip are not available. This failure was silent because the mk_tar_gz function doesn't exit on error. The following error was printed but ignored: support/download/helpers: line 62: .../per-package/busybox/host/bin/tar: No such file or directory Call prepare-per-package-directory before calling mk_tar_gz which uses it. Note that we use only tar and gzip here, not all of DOWNLOAD_DEPENDENCIES, because tar and gzip are the only ones we really use. Also add this dependency to the legal-info target. We use an order-only dependency even though that makes not difference for a phony target, but this makes it similar to how it's done for the stamp targets. Note also that this dependency is redundant, because there is already a dependency on the foo-rsync target which does depend on DOWNLOAD_DEPENDENCIES. We still add the dependency explicitly in case things change with the foo-rsync target in the future. Signed-off-by: Arnout Vandecappelle Cc: Nicolas Carrier Reported-by: Yann E. MORIN Signed-off-by: Yann E. MORIN (cherry picked from commit f4681fc417a057f46f00ac95474251944843a050) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 69352b3730b..48cc8ec8005 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1008,6 +1008,9 @@ $(1)-rsync: $$($(2)_TARGET_RSYNC) $(1)-source: $(1)-legal-source: +# For override, legal-info uses host-tar and host-gzip +$(1)-legal-info: | $(BR2_GZIP_HOST_DEPENDENCY) $(BR2_TAR_HOST_DEPENDENCY) + $(1)-external-deps: @echo "file://$$($(2)_OVERRIDE_SRCDIR)" @@ -1163,6 +1166,7 @@ ifneq ($$($(2)_OVERRIDE_SRCDIR),) $$(Q)rsync -au --chmod=u=rwX,go=rX $$(RSYNC_VCS_EXCLUSIONS) \ $(call qstrip,$$($(2)_OVERRIDE_SRCDIR))/ \ $$($(2)_BUILDDIR)/.legal-info-rsync/ + $$(call prepare-per-package-directory,$$(BR2_GZIP_HOST_DEPENDENCY) $$(BR2_TAR_HOST_DEPENDENCY)) $$(Q)mkdir -p $$($(2)_REDIST_SOURCES_DIR) $$(Q). support/download/helpers; set -x; cd $$($(2)_BUILDDIR); TAR=$$(TAR) mk_tar_gz \ $$($(2)_BUILDDIR)/.legal-info-rsync/ \ From be164d261dff183796b95021053a8032aeea18b3 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 14 Sep 2024 11:55:00 +0200 Subject: [PATCH 2757/3013] package/pkg-generic.mk: legal-info: proper double-dollar Everything inside the generic-package macro should be double-dollared, except for $(1) $(2) etc. There was still a $(call ...) that was not double-dollared in the legal-info target. The result is that OVERRIDE_SRCDIR isn't actually qstrip'ed. Double dollar the $(call ...) like everywhere else. Signed-off-by: Arnout Vandecappelle Cc: Nicolas Carrier Reported-by: Yann E. MORIN Signed-off-by: Yann E. MORIN (cherry picked from commit 109c7c437c9743a6fd71a5653c634d7ba7514df9) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 48cc8ec8005..e67f1416042 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1164,7 +1164,7 @@ ifneq ($$($(2)_OVERRIDE_SRCDIR),) $$(Q)rm -rf $$($(2)_BUILDDIR)/.legal-info-rsync $$(Q)mkdir -p $$($(2)_BUILDDIR)/.legal-info-rsync $$(Q)rsync -au --chmod=u=rwX,go=rX $$(RSYNC_VCS_EXCLUSIONS) \ - $(call qstrip,$$($(2)_OVERRIDE_SRCDIR))/ \ + $$(call qstrip,$$($(2)_OVERRIDE_SRCDIR))/ \ $$($(2)_BUILDDIR)/.legal-info-rsync/ $$(call prepare-per-package-directory,$$(BR2_GZIP_HOST_DEPENDENCY) $$(BR2_TAR_HOST_DEPENDENCY)) $$(Q)mkdir -p $$($(2)_REDIST_SOURCES_DIR) From a6be28c767dcf95b1645d0dd6c9e9b49c6163614 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 14 Sep 2024 11:55:01 +0200 Subject: [PATCH 2758/3013] package/pkg-generic.mk: remove set -x in mk_tar_gz call The set -x was added for debugging, and forgotten to be removed afterwards. Remove it now. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN (cherry picked from commit 23eb63ec75a40cea36b1a91956ac4b34ae937a03) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index e67f1416042..9ec84d0f453 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1168,7 +1168,7 @@ ifneq ($$($(2)_OVERRIDE_SRCDIR),) $$($(2)_BUILDDIR)/.legal-info-rsync/ $$(call prepare-per-package-directory,$$(BR2_GZIP_HOST_DEPENDENCY) $$(BR2_TAR_HOST_DEPENDENCY)) $$(Q)mkdir -p $$($(2)_REDIST_SOURCES_DIR) - $$(Q). support/download/helpers; set -x; cd $$($(2)_BUILDDIR); TAR=$$(TAR) mk_tar_gz \ + $$(Q). support/download/helpers; cd $$($(2)_BUILDDIR); TAR=$$(TAR) mk_tar_gz \ $$($(2)_BUILDDIR)/.legal-info-rsync/ \ $$($(2)_BASENAME_RAW) \ @0 \ From d69b380c3c97f28e9fd97bf275daf6b5166ad62b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:18 +0200 Subject: [PATCH 2759/3013] package/linux-firmware: fix typo in Config.in prompt Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit abfefc0a148fef85cc159dbaf19454f0d4d1cc3a) Signed-off-by: Peter Korsgaard --- package/linux-firmware/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 651ca450876..a10317c4942 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -596,7 +596,7 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X (qede) config BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X - bool "Realtek 8152/8153/8156 USB Ethernet Adapaters" + bool "Realtek 8152/8153/8156 USB Ethernet Adapters" help Firmware files for Realtek 8152/8153/8156 based USB Ethernet adapters. From 027850d2e5702f3c9d6da6862c4aed25856b62d0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:19 +0200 Subject: [PATCH 2760/3013] package/linux-fusion: fix version typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 42385486e72f845948512669c1a416c1c361dc8b) Signed-off-by: Peter Korsgaard --- package/linux-fusion/0001-fix-for-linux-4-and-above.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-fusion/0001-fix-for-linux-4-and-above.patch b/package/linux-fusion/0001-fix-for-linux-4-and-above.patch index 689d9bf107f..bc9e9365106 100644 --- a/package/linux-fusion/0001-fix-for-linux-4-and-above.patch +++ b/package/linux-fusion/0001-fix-for-linux-4-and-above.patch @@ -1,6 +1,6 @@ Fix build for linux >= 4.x -Instead of relying on testing for '3' as the linux kernel major verison, +Instead of relying on testing for '3' as the linux kernel major version, check that it is 2.x to include the proper Makefile, otherwise forcibly include the .26 Makefile, that is good for 3.x and 4.x too. From 3c34715aa9d82f36c271fb9dd70234cdee879814 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:20 +0200 Subject: [PATCH 2761/3013] package/linux-zigbee: fix these typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 1789b5feb66f909486cba40a9f0be44d9706b3d0) Signed-off-by: Peter Korsgaard --- package/linux-zigbee/0001-test-serial-Remove-test-serial.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch b/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch index 8cd9d754c0d..95e52b3c951 100644 --- a/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch +++ b/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch @@ -5,7 +5,7 @@ Subject: [PATCH] test-serial: Remove test-serial This folders only contains python tests scripts which would force us to enable a dependency to host-python which seems kind of silly since -theses are only tests scripts. +these are only tests scripts. Signed-off-by: Maxime Hadjinlian --- From 0852d93cbea66eea81513f271a44b673e43239f1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:21 +0200 Subject: [PATCH 2762/3013] package/lldpd: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 28cdb718eae4a91e4c42ab4202d789dc9d20a25e) Signed-off-by: Peter Korsgaard --- package/lldpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lldpd/Config.in b/package/lldpd/Config.in index 3e0446986fe..04dd6040b6e 100644 --- a/package/lldpd/Config.in +++ b/package/lldpd/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LLDPD select BR2_PACKAGE_LIBEVENT help lldpd is a 802.1ab implementation (LLDP) to help you locate - neighbors of all your equipments. + neighbors of all your equipment. LLDP allows you to know exactly on which port is a server (and reciprocally). From 3f059c0d3c61bbd756a3aea7f74241b1b73cd4c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:22 +0200 Subject: [PATCH 2763/3013] package/lmbench: fix 'timing out' typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 39b784bd5772fa14294b5da750143e5532dd68f3) Signed-off-by: Peter Korsgaard --- ...3-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch b/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch index 6c3e7370e11..9702693c8e6 100644 --- a/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch +++ b/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch @@ -1,7 +1,7 @@ From d85b61666aa2728f68b69d02bfb162c432df709f Mon Sep 17 00:00:00 2001 From: vgupta Date: Sat, 3 Mar 2012 10:02:24 +0000 -Subject: [PATCH] TOO_LONG 100 usec to prevent memsize from timingout @80Mhz +Subject: [PATCH] TOO_LONG 100 usec to prevent memsize from timing out @80Mhz git-svn-id: http://sjvm-subversion02.internal.synopsys.com/svn/OSS/ARC_Linux/tests/lmbench-3.0-a9@157318 4eed8e25-bc12-0410-818a-f70ee6866280 From 26585c72d1c259244b0ee6e4a42ef47e266e113e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:23 +0200 Subject: [PATCH 2764/3013] package/lua-augeaus: fix assignment typo Signed-off-by: Peter Korsgaard Acked-by: Herve Codina Signed-off-by: Yann E. MORIN (cherry picked from commit edb2d45e058c58acdd2db135c056c5c253041b03) Signed-off-by: Peter Korsgaard --- package/lua-augeas/lua-augeas.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lua-augeas/lua-augeas.mk b/package/lua-augeas/lua-augeas.mk index 930cf49b86f..8a7f2b5f7b4 100644 --- a/package/lua-augeas/lua-augeas.mk +++ b/package/lua-augeas/lua-augeas.mk @@ -11,7 +11,7 @@ LUA_AUGEAS_LICENSE_FILES = COPYRIGHT LUA_AUGEAS_DEPENDENCIES = luainterpreter augeas host-pkgconf # LDFLAGS=$(LDFLAGS) is present to pass LDFLAGS from environment to the command -# line. With LDFLAGS set in the command line, related ordinary asignment present +# line. With LDFLAGS set in the command line, related ordinary assignment present # in the makefile are ignored and so lua-augeas makefile cannot not add '-L/lib' # to this value. LUA_AUGEAS_CONF_OPTS= \ From 1e32ef4c1456fc490baf00c6af9d90a7ca744c41 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:24 +0200 Subject: [PATCH 2765/3013] package/luabitop: fix typo in hash comment Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit f5ad59e948c5be1800bbfbaca7f4d83124221e2a) Signed-off-by: Peter Korsgaard --- package/luabitop/luabitop.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/luabitop/luabitop.hash b/package/luabitop/luabitop.hash index 02757a6b08b..cfbf2b65166 100644 --- a/package/luabitop/luabitop.hash +++ b/package/luabitop/luabitop.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot sha256 fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e luabitop-1.0.2-1.src.rock -# Locally calcuated +# Locally calculated sha256 25e331120d0c2f95fa2ac6e439ca920f0a4362c366a4c7382d843113743a3ba5 LuaBitOp-1.0.2/README From 40afb3d5b52cd49efbd13f9f894ccfb87d7b2b79 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:25 +0200 Subject: [PATCH 2766/3013] package/madplay: fix typos in comments Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 2465cdb48ac0b3c720e736656e1776affa7bad4c) Signed-off-by: Peter Korsgaard --- package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch | 2 +- package/madplay/madplay.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch b/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch index 7d3fb8ddc60..448139e0ba9 100644 --- a/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch +++ b/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch @@ -3,7 +3,7 @@ configure.ac: call AM_MKINSTALLDIRS to substitute @MKINSTALLDIRS@ MKINSTALLDIRS is obsolete and doesn't get automatically called. Force call AM_MKINSTALLDIRS() macro to substitute every @MKINSTALLDIRS@ -occurence in *.in files. +occurrence in *.in files. Signed-off-by: Giulio Benetti diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index 91ee44ab5f4..b9162dd2fdd 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -18,7 +18,7 @@ MADPLAY_AUTORECONF = YES # madplay uses libmad which has some assembly function that is not present in # Thumb mode: # Error: selected processor does not support `smull r8,r9,r2,r4' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) MADPLAY_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif From ba222b59766de993c4329de82ac4414e5bd32b8b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:26 +0200 Subject: [PATCH 2767/3013] package/make: fix accidentally typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit b185bfccbfcbf6804f52b374ee8be0ae4bd7f071) Signed-off-by: Peter Korsgaard --- package/make/make.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/make/make.mk b/package/make/make.mk index e194e15873b..1d1a976eb44 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -23,7 +23,7 @@ HOST_MAKE_DEPENDENCIES = host-pkgconf HOST_MAKE_CONF_OPTS = --without-guile # Configure host-make binary to be 'host-make' to ensure it isn't -# accidently used by packages when they invoke recursive / sub-make. +# accidentally used by packages when they invoke recursive / sub-make. HOST_MAKE_CONF_OPTS += --program-prefix=host- $(eval $(autotools-package)) From 511b426a75496820665a345cefa5fea700cd8b58 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:27 +0200 Subject: [PATCH 2768/3013] package/makedevs/makedevs.c: fix typos And replace Couldn't with 'Could not' for clarity. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 79d062ab99fef3d7bb5982ac99d9cfcbe6d0cd83) Signed-off-by: Peter Korsgaard --- package/makedevs/makedevs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index a5c9c7d64d1..be76155ab6d 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -165,7 +165,7 @@ int bb_make_directory (char *path, long mode, int flags) } /* Since the directory exists, don't attempt to change * permissions if it was the full target. Note that - * this is not an error conditon. */ + * this is not an error condition. */ if (!c) { umask(mask); return 0; @@ -480,11 +480,11 @@ int main(int argc, char **argv) } if (optind >= argc || (rootdir=argv[optind])==NULL) { - bb_error_msg_and_die("root directory not speficied"); + bb_error_msg_and_die("root directory not specified"); } if (chdir(rootdir) != 0) { - bb_perror_msg_and_die("Couldnt chdir to %s", rootdir); + bb_perror_msg_and_die("Could not chdir to %s", rootdir); } umask(0); From d22c7d0f2262c3ffed8de52cbe7af93622e77f21 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:28 +0200 Subject: [PATCH 2769/3013] package/minizip: fix typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 4fd7aa3f4aa54d6f7324b3c446420f26d010494b) Signed-off-by: Peter Korsgaard --- package/minizip/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/minizip/Config.in b/package/minizip/Config.in index 98eb4dec164..3c3670b7845 100644 --- a/package/minizip/Config.in +++ b/package/minizip/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_MINIZIP help Enables to extract files from a .zip archive file. It is compatible with PKZip 2.04g, WinZip, InfoZip, - MimarSinan Codex Suite 2002 tools, and compatible sofware. + MimarSinan Codex Suite 2002 tools, and compatible software. https://github.com/zlib-ng/minizip-ng From e1dc75fdba1fe7fb6bf5bbd718956891d5c8f13f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:29 +0200 Subject: [PATCH 2770/3013] package/mpg123: fix deactivate typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 21697b50db70cc4c0bba287eee8a99a8a1b640b9) Signed-off-by: Peter Korsgaard --- package/mpg123/mpg123.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index af036132d2c..dbf595e172a 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -15,7 +15,7 @@ MPG123_DEPENDENCIES = host-pkgconf # mpg123 has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `smull r3,ip,r2,r10' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) MPG123_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif From b6d097aaedaefe0cf95c19a9bbb1764bbfed1659 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:30 +0200 Subject: [PATCH 2771/3013] package/mrouted: fix typos and grammar Signed-off-by: Peter Korsgaard Cc: Federico Pellegrin [yann.morin.1998@free.fr: s/is/are/ (noticed by Federico)] Signed-off-by: Yann E. MORIN (cherry picked from commit 271ea8be96abf1b30b999075500aaf91f992c25c) Signed-off-by: Peter Korsgaard --- package/mrouted/Config.in | 3 ++- package/mrouted/mrouted.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mrouted/Config.in b/package/mrouted/Config.in index 95b4fb3825f..de99303bfaf 100644 --- a/package/mrouted/Config.in +++ b/package/mrouted/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_MROUTED source. This package comes with mrouted and mroutectl. Where the latter is used to query status and control operation. - Note: at least two interfaces with MULTICAST flag is requried. + Note: at least two interfaces with MULTICAST flag are + required. http://github.com/troglobit/mrouted diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 0d2071c4f07..7b5f5039f63 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -23,7 +23,7 @@ define MROUTED_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/mrouted.service endef -# We will asume that CONFIG_NET and CONFIG_INET are already +# We will assume that CONFIG_NET and CONFIG_INET are already # set in the kernel configuration provided by the user. define MROUTED_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_IP_MULTICAST) From dcc8b10cc70957cfe2266c7cd2ee51dcdfeae13a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:31 +0200 Subject: [PATCH 2772/3013] package/musepack: fix occurring typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 66dbf094d3a8613fc594c9d6ae1be7c0d19757ce) Signed-off-by: Peter Korsgaard --- package/musepack/0004-missing-sys-select.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/musepack/0004-missing-sys-select.patch b/package/musepack/0004-missing-sys-select.patch index 1e3a4b11405..64efbc47337 100644 --- a/package/musepack/0004-missing-sys-select.patch +++ b/package/musepack/0004-missing-sys-select.patch @@ -1,7 +1,7 @@ Add missing include This header is needed when types like fd_set are used. This fixes a -build issue occuring on the musl C library. +build issue occurring on the musl C library. Signed-off-by: Bernd Kuhls [Thomas: better commit log.] From 747fcc5e7a02287caba7805d502b976b1c17de48 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:32 +0200 Subject: [PATCH 2773/3013] package/net-tools: fix appropriate typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0353d684828acfac36321c3f84c27b61c5ec61f7) Signed-off-by: Peter Korsgaard --- package/net-tools/net-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index 0744bf18cbb..03e1c734064 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -16,7 +16,7 @@ define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) endef -# Enable I18N when appropiate +# Enable I18N when appropriate ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) define NET_TOOLS_ENABLE_I18N $(SED) 's:I18N 0:I18N 1:' $(@D)/config.h From 80c395b83cd93e8a2687d6e1fe45c48dd6680073 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:33 +0200 Subject: [PATCH 2774/3013] package/nginx-modsecurity: fix locally typo in hash comment Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 486358c959b6144d90da5837505608e000f90d6f) Signed-off-by: Peter Korsgaard --- package/nginx-modsecurity/nginx-modsecurity.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index 0cd2ee07cd1..698dbc7da6e 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ # From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz -# Localy calculated +# Locally calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE From d65a720a00576707457de448d2834b5b3116604d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:34 +0200 Subject: [PATCH 2775/3013] package/nginx: fix symmetric typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit acbff448619596895267e972ebc2bdad2b0fb12b) Signed-off-by: Peter Korsgaard --- package/nginx/nginx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index d3b042c59b8..7a5455def71 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -93,7 +93,7 @@ endif # - pcre-jit (want to rebuild pcre) # Notes: -# * Feature/module option are *not* symetric. +# * Feature/module option are *not* symmetric. # If a feature is on by default, only its --without-xxx option exists; # if a feature is off by default, only its --with-xxx option exists. # * The configure script fails if unknown options are passed on the command From bd4c654b78a51f7c32d765e7329cc653affa4067 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:35 +0200 Subject: [PATCH 2776/3013] package/nload: fix transferred typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 7281269982a063b800e289b50ccabe8b25a47243) Signed-off-by: Peter Korsgaard --- package/nload/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nload/Config.in b/package/nload/Config.in index c938d8eae84..6c2cab7fe40 100644 --- a/package/nload/Config.in +++ b/package/nload/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_NLOAD nload is a console application which monitors network traffic and bandwidth usage in real time. It visualizes the in- and outgoing traffic using two graphs and provides additional info - like total amount of transfered data and min/max network + like total amount of transferred data and min/max network usage. http://www.roland-riegel.de/nload/ From e7ae0ea2d0aa9fd8de3a83a7fbef7dfed260a590 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:36 +0200 Subject: [PATCH 2777/3013] package/nodejs-src: fix convenient typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 28a53f8f55019f67a6f840cb4cfb1eb14028f8d1) Signed-off-by: Peter Korsgaard --- ...4-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nodejs/nodejs-src/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/nodejs-src/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch index 25c26b43bd1..ffb8e67a640 100644 --- a/package/nodejs/nodejs-src/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch +++ b/package/nodejs/nodejs-src/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to NPM installs modules in /usr/lib/node_modules/, but by default NodeJS searches for them only in /usr/lib/node/. We could also set the -NODE_PATH environment variable, but it is more convienient to have +NODE_PATH environment variable, but it is more convenient to have NodeJS configured by default to find modules where they are installed. This issue is discussed at From ecd1646cc8295a65bea08fc615361024a0aca069 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Sep 2024 14:43:37 +0200 Subject: [PATCH 2778/3013] package/nvidia-driver: fix targeting typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 812bb30412cb87f3c05048b6a1030af0e4aab40b) Signed-off-by: Peter Korsgaard --- package/nvidia-driver/0001-use-LDFLAGS.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/0001-use-LDFLAGS.patch b/package/nvidia-driver/0001-use-LDFLAGS.patch index 9ce237f9595..fe87cb0e3d8 100644 --- a/package/nvidia-driver/0001-use-LDFLAGS.patch +++ b/package/nvidia-driver/0001-use-LDFLAGS.patch @@ -5,7 +5,7 @@ the default emulation is correct for the current architecture. However, that might not be the case when the toolchain default is not the same as the current arch. For example, if the toolchain defaults to -i386 and is capable of x86_64, and we're targetting x86_64 (or the +i386 and is capable of x86_64, and we're targeting x86_64 (or the opposite), the link would fail because the ld emulation is incorrect: .../i686-pc-linux-gnu-ld: Relocatable linking with relocations from From cadcb1f90819533e71067306d35a4d8b1f443e9e Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Wed, 11 Sep 2024 15:19:23 +0200 Subject: [PATCH 2779/3013] package/qt6/qt6core5compat: enable QML compat modules When BR2_PACKAGE_QT6DECLARATIVE_QUICK is enabled the QML compatibility modules should be built and installed. Signed-off-by: Christian Hitz Signed-off-by: Thomas Petazzoni (cherry picked from commit 8d5468491806dee13f3cf51cccedd11c21081c38) Signed-off-by: Peter Korsgaard --- package/qt6/qt6core5compat/qt6core5compat.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/qt6/qt6core5compat/qt6core5compat.mk b/package/qt6/qt6core5compat/qt6core5compat.mk index 0b6d9369cb1..aeb5ddd9313 100644 --- a/package/qt6/qt6core5compat/qt6core5compat.mk +++ b/package/qt6/qt6core5compat/qt6core5compat.mk @@ -36,4 +36,10 @@ QT6CORE5COMPAT_DEPENDENCIES = \ host-pkgconf \ qt6base +# When Qt::Quick is available, qt6core5compat will build additional +# QML compatibility modules +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE_QUICK),y) +QT6CORE5COMPAT_DEPENDENCIES += qt6declarative +endif + $(eval $(cmake-package)) From a0e4c65124aaeea3d50ea4a397ac1ea59346aae6 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 11 Sep 2024 19:19:37 +0200 Subject: [PATCH 2780/3013] boot/grub2: needs host-python3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the build host does not have a Python interpreter installed, host-grub2 is failing to configure due to this missing interpreter. Note that host-grub2 is the first package to fail because it is a dependency of grub2. The grub2 target package has the same dependency requirement. The issue can be quickly reproduced on a host without Python with the commands: cat <.config BR2_aarch64=y BR2_TARGET_GRUB2=y BR2_TOOLCHAIN_EXTERNAL=y EOF make olddefconfig make grub2 grub2 autotools configure.ac search for a Python interpreter since upstream commit [1] 8b467844e "python: Use AM_PATH_PYTHON to determine interpreter for gentpl.py", first included in grub v2.04 released on 2019-07-04. For reference, grub2 has been updated to that version in commit [2] ea7ec41c "boot/grub2: bump to verson 2.04". This commit fixes the issue by adding the host-python3 dependency to host-grub2 and grub2. Fixes: checking for a Python interpreter with version >= 2.6... none configure: error: no suitable Python interpreter found [1] https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=8b467844e11170077c8ca727c39d2bd36eeb5f08 [2] https://gitlab.com/buildroot.org/buildroot/-/commit/ea7ec41cf64e86a692ac45e0d012c6e8199ef110 Reported-by: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 86bb1b2360bdaed069cd087541f4edad1d5ce925) Signed-off-by: Peter Korsgaard --- boot/grub2/grub2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 1263c63cfdf..7c95adc739b 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -9,8 +9,8 @@ GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING -GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-grub2 -HOST_GRUB2_DEPENDENCIES = host-bison host-flex host-gawk +GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-grub2 host-python3 +HOST_GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-python3 GRUB2_INSTALL_IMAGES = YES # CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which From 77206b822084c2345854372d3fd26703c0ce80bb Mon Sep 17 00:00:00 2001 From: Yuriy Kolerov Date: Fri, 23 Aug 2024 18:25:47 +0300 Subject: [PATCH 2781/3013] package/glibc: drop support of ARC 7x0 targets Synopsys ARC 7x0 family is not supported by glibc. Thus, it is necessary to prevent selecting glibc while configuring for that processors family. Fixes: http://autobuild.buildroot.net/results/9f0a4d69aed71a840b1c278a9623c9687207ffc6/ http://autobuild.buildroot.org/results/fa9960365bd54872762d5e959b98882b86c5e956/ Signed-off-by: Yuriy Kolerov Signed-off-by: Thomas Petazzoni (cherry picked from commit 5aecb99902c35ed48435d7bd7945a0ff58048940) Signed-off-by: Peter Korsgaard --- package/glibc/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 81c64083f47..6075d28874c 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS default y if BR2_x86_64 default y if BR2_microblaze default y if BR2_nios2 - default y if BR2_arc && BR2_ARC_ATOMIC_EXT + default y if BR2_arc && BR2_ARC_ATOMIC_EXT && !BR2_arc750d && !BR2_arc770d depends on !BR2_POWERPC_CPU_HAS_SPE depends on BR2_RISCV_ISA_RVA || !BR2_riscv depends on BR2_USE_MMU From 0746a50e01901677e056ff504b3b4087bf06550c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 23 Aug 2024 19:57:07 +0200 Subject: [PATCH 2782/3013] support/testing: add exfatprogs runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit f36652898770d92a90ba6240f96cab679457b33e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + .../testing/tests/package/test_exfatprogs.py | 99 +++++++++++++++++++ .../test_exfatprogs/linux-exfat.fragment | 1 + 3 files changed, 102 insertions(+) create mode 100644 support/testing/tests/package/test_exfatprogs.py create mode 100644 support/testing/tests/package/test_exfatprogs/linux-exfat.fragment diff --git a/DEVELOPERS b/DEVELOPERS index d954fdc7ff2..68bc8843e69 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1856,6 +1856,8 @@ F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_ed.py F: support/testing/tests/package/test_ethtool.py F: support/testing/tests/package/test_ethtool/ +F: support/testing/tests/package/test_exfatprogs.py +F: support/testing/tests/package/test_exfatprogs/ F: support/testing/tests/package/test_file.py F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py diff --git a/support/testing/tests/package/test_exfatprogs.py b/support/testing/tests/package/test_exfatprogs.py new file mode 100644 index 00000000000..1b0b117b008 --- /dev/null +++ b/support/testing/tests/package/test_exfatprogs.py @@ -0,0 +1,99 @@ +import os +import subprocess + +import infra.basetest + + +class TestExfatProgs(infra.basetest.BRTest): + # This test needs a Kernel with exfat support. + kern_frag = \ + infra.filepath("tests/package/test_exfatprogs/linux-exfat.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_EXFATPROGS=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + # Prepare the disk image. + disk_file = os.path.join(self.builddir, "images", "disk.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", "bs=1M", "count=256"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + + # Run the emulator with a blank drive. + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = ["console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-drive", f"file={disk_file},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Variables for this test. + dev = "/dev/vda" + label = "BR_TEST" + mnt_pt = "/tmp/exfat" + data_file = f"{mnt_pt}/data.bin" + + # We create the exfat filesystem on our device. + self.assertRunOk(f"mkfs.exfat {dev}") + + # We set a label on this filesystem. + self.assertRunOk(f"exfatlabel {dev} '{label}'") + + # We create a mount point and mount this filesystem. + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We create a file with random data, to use this new + # filesystem a bit. + self.assertRunOk(f"dd if=/dev/urandom of={data_file} bs=1M count=10") + + # We compute the sha256 hash and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We unmount the filesystem. + self.assertRunOk(f"umount {mnt_pt}") + + # We run a filesystem check. Since we cleanly unmounted the + # filesystem, we are not expecting any repair. This is just to + # test the program works correctly. + self.assertRunOk(f"fsck.exfat -v {dev}") + + # We query the label and check it is the one we set at the + # beginning. + out, ret = self.emulator.run(f"exfatlabel {dev}") + self.assertEqual(ret, 0) + self.assertEqual(out[1], f"label: {label}") + + # We remount our filesystem. + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We should recompute the same sha256 hash as before, on the + # first data file we created at the beginning. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) diff --git a/support/testing/tests/package/test_exfatprogs/linux-exfat.fragment b/support/testing/tests/package/test_exfatprogs/linux-exfat.fragment new file mode 100644 index 00000000000..e0332e3d376 --- /dev/null +++ b/support/testing/tests/package/test_exfatprogs/linux-exfat.fragment @@ -0,0 +1 @@ +CONFIG_EXFAT_FS=y From df341bd3475c62d0fa20216644af78eb71c60e39 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 24 Aug 2024 16:19:35 +0200 Subject: [PATCH 2783/3013] support/testing: add pv runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 8c5e4be97c8083589665420e438d8b43515b3a00) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_pv.py | 57 ++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 support/testing/tests/package/test_pv.py diff --git a/DEVELOPERS b/DEVELOPERS index 68bc8843e69..c5b80d3b18d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1940,6 +1940,7 @@ F: support/testing/tests/package/test_pciutils.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_pigz.py F: support/testing/tests/package/test_postgresql.py +F: support/testing/tests/package/test_pv.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_hkdf.py diff --git a/support/testing/tests/package/test_pv.py b/support/testing/tests/package/test_pv.py new file mode 100644 index 00000000000..cfa3c293924 --- /dev/null +++ b/support/testing/tests/package/test_pv.py @@ -0,0 +1,57 @@ +import os + +import infra.basetest + + +class TestPv(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_PV=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can run. + self.assertRunOk("pv --version") + + # We check that "pv" works like the "cat" command. We print a + # message on its standard input and redirect its output to a + # file. We also force the pv terminal width to 80, since + # "infra.emulator" is setting a large width to prevent + # line wrapping. + msg = "Hello Buildroot!" + out_file = "/tmp/out.txt" + cmd = f"echo '{msg}' | pv -w80 > {out_file}" + self.assertRunOk(cmd) + + # We check the pv output file contains exactly our message. + cmd = f"cat {out_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # Finally, we check that "pv" correctly shows a progress + # bar. We print few lines, one per second into "pv" setup in + # line mode. We check the last pv status line contains the + # correct count and a "100%" string that shows completion. + lines = 5 + print_ln_cmd = f"( for X in $(seq {lines}) ; do echo $X ; sleep 1 ; done )" + cmd = f"{print_ln_cmd} | pv -s{lines} -l -w80 > /dev/null" + out, ret = self.emulator.run(cmd, timeout=10) + self.assertEqual(ret, 0) + # pv updates status may contain extra spaces, and is updated + # with carriage return characters. We strip lines and filter + # out empty remaining lines, to make sure we get the last + # meaningful status line. + pv_out = [ln.strip() for ln in out] + pv_out = [ln for ln in pv_out if ln] + last_line = pv_out[-1] + self.assertTrue(last_line.startswith(str(lines))) + self.assertTrue(last_line.endswith("100%")) From 2520b55ae9d7bf8bf4bacb440f961b7583faf18e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 14 Sep 2024 15:01:48 -0300 Subject: [PATCH 2784/3013] configs/imx6slevk: update the kernel to 6.6.51 Kernel 5.15 fails to build with GCC 13. Update to kernel 6.6.51 to avoid the build failure. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7803199854 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 31ead1c082e6e75424e25707024cafa28806a381) Signed-off-by: Peter Korsgaard --- configs/imx6slevk_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx6slevk_defconfig b/configs/imx6slevk_defconfig index 9448267e2b2..d78f2ecff0c 100644 --- a/configs/imx6slevk_defconfig +++ b/configs/imx6slevk_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -16,10 +16,10 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.51" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sl-evk" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From 11d52d7e4d65704c87c6e85b31341ed2a6320f73 Mon Sep 17 00:00:00 2001 From: Hugo Cornelis Date: Sat, 14 Sep 2024 19:27:10 +0200 Subject: [PATCH 2785/3013] package/procps-ng: link the w command with systemd or elogin libs. The build of procps-ng was broken when systemd was enabled. Applying commit ca004d46 of procps-ng upstream to explictly link the 'w' command to libsystemd or elogind even though libproc2 is linked to it. This was (likely) broken since the upgrade to procps-ng v4.0.4 with commit d79f40dbbe98983bc657d4c82d46b38b8283351b. Fixes: https://gitlab.com/buildroot.org/buildroot/-/issues/28 Fixes: http://autobuild.buildroot.org/results/e8b/e8bae7bfd7d6a7987f3afa199d8d944429144817/build-end.log Signed-off-by: Hugo Cornelis [yann.morin.1998@free.fr: don't number patch 1/1; add fixes tag] Signed-off-by: Yann E. MORIN (cherry picked from commit 3b870057c646a6b7abc822d3ce2ea0f41683420b) Signed-off-by: Peter Korsgaard --- ...1-build-sys-Add-systemd-elogind-to-w.patch | 48 +++++++++++++++++++ package/procps-ng/procps-ng.mk | 3 ++ 2 files changed, 51 insertions(+) create mode 100644 package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch diff --git a/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch b/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch new file mode 100644 index 00000000000..4a8b2a6a8b7 --- /dev/null +++ b/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch @@ -0,0 +1,48 @@ +From 788248ee631b3b5f82073c36320fc3f4a3c8f9ba Mon Sep 17 00:00:00 2001 +From: Craig Small +Date: Thu, 31 Aug 2023 22:24:23 +1000 +Subject: [PATCH] build-sys: Add systemd/elogind to w + +Depending on the compiler flags, w needs to be explictly linked +to libsystemd or elogind even though libproc2 is linked to it. + +Signed-off-by: Craig Small +Upstream: https://gitlab.com/procps-ng/procps/-/commit/ca004d4657d5e8b468a4552ede429be53193a3a9 +Signed-off-by: Hugo Cornelis +--- + Makefile.am | 7 +++++++ + NEWS | 3 +++ + 2 files changed, 10 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index f70c8fb1..ddfc0141 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -149,6 +149,13 @@ endif + + dist_man_MANS += man/w.1 + src_w_SOURCES = src/w.c local/fileutils.c ++src_w_LDADD = $(LDADD) ++if WITH_SYSTEMD ++src_w_LDADD += @SYSTEMD_LIBS@ ++endif ++if WITH_ELOGIND ++src_w_LDADD += @ELOGIND_LIBS@ ++endif + else + EXTRA_DIST += man/w.1 + endif +diff --git a/NEWS b/NEWS +index 3f2158d4..4ad9f74e 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,6 @@ ++procps-ng-NEXT ++--------------- ++ + procps-ng-4.0.4 + --------------- + * library (API & ABI unchanged) +-- +2.34.1 + diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 2f28e3571e2..1002d6340fc 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -14,6 +14,9 @@ PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) +# Applying 0001-build-sys-Add-systemd-elogind-to-w.patch touches Makefile.am +PROCPS_NG_AUTORECONF = YES + ifeq ($(BR2_PACKAGE_SYSTEMD),y) PROCPS_NG_DEPENDENCIES += systemd PROCPS_NG_CONF_OPTS += --with-systemd From d8210fd0eb28124409acef80f1b2333876660b71 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Sat, 14 Sep 2024 20:38:50 +0200 Subject: [PATCH 2786/3013] package/ffmpeg: fix build error ffmpeg builds with `--enable-vaapi` opt made GCC v14 and 32 bit target will throw an 'Wincompatible-pointer-types' error. This is a downport of an upstreamed commit but not yet present in any ffmpeg version that fix the pointer type. Fixes: - http://autobuild.buildroot.org/results/f5f/f5f2d16226ad9500ecf046779d5282ee071a54d3/ Signed-off-by: Thomas Perale Signed-off-by: Thomas Petazzoni (cherry picked from commit 24fc2f9d177b897f0c204f2c6611e6a3ed306a3d) Signed-off-by: Peter Korsgaard --- ...hwcontext-vaapi-use-the-correct-type.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch diff --git a/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch b/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch new file mode 100644 index 00000000000..177b4f1885c --- /dev/null +++ b/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch @@ -0,0 +1,28 @@ +From 6f8e365a2af2b6b21701d41eed3b2e3f8a436eeb Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Wed, 31 Jul 2024 10:00:54 -0300 +Subject: [PATCH] avutil/hwcontext_vaapi: use the correct type for + VASurfaceAttribExternalBuffers.buffers + +Should fix ticket #11115. + +Signed-off-by: James Almer +Upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/6f8e365a2af2b6b21701d41eed3b2e3f8a436eeb +Signed-off-by: Thomas Perale +--- + libavutil/hwcontext_vaapi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c +index 4cb25dd03212e..15fd84aa40679 100644 +--- a/libavutil/hwcontext_vaapi.c ++++ b/libavutil/hwcontext_vaapi.c +@@ -1225,7 +1225,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, + + if (!use_prime2 || vas != VA_STATUS_SUCCESS) { + int k; +- unsigned long buffer_handle; ++ uintptr_t buffer_handle; + VASurfaceAttribExternalBuffers buffer_desc; + VASurfaceAttrib buffer_attrs[2] = { + { From 7f19d7720fa358aeecdeaf547ce5c53fa526c261 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 14 Sep 2024 21:04:07 +0200 Subject: [PATCH 2787/3013] package/cryptsetup: bump version to 2.7.5 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 9b9ac7f6c0437ec86a912871d61eef038d6b1657) Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index e0cb65642d4..e46cfbdf29e 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 dce29903a58f7b774fe61191e7e6de955de0f40d9e27b0028ffcf3438c0e9480 cryptsetup-2.7.4.tar.xz +sha256 d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522 cryptsetup-2.7.5.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 15cadb28408..52f79e177f1 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).5 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From e4990b58c94ef6262b00c33f7f071d594c3d7dd3 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sat, 14 Sep 2024 23:02:38 +0300 Subject: [PATCH 2788/3013] package/wpewebkit: security bump to version 2.44.4 Fixes security issues CVE-2024-40776, CVE-2024-40779, CVE-2024-40780, CVE-2024-40782, CVE-2024-40789, and CVE-2024-4558. Security advisory: https://wpewebkit.org/security/WSA-2024-0004.html Release notes: https://wpewebkit.org/release/wpewebkit-2.44.3.html https://wpewebkit.org/release/wpewebkit-2.44.4.html Patch "0001-Remove-ARM-specific-declarations-in-FELighting.patch" has been included as part of the fixes in version 2.44.3 and is therefore removed. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 064ddfc99742c9e8fe688faf8a9c92d4c905f455) Signed-off-by: Peter Korsgaard --- ...-specific-declarations-in-FELighting.patch | 68 ------------------- package/wpewebkit/wpewebkit.hash | 8 +-- package/wpewebkit/wpewebkit.mk | 2 +- 3 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch diff --git a/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch b/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch deleted file mode 100644 index 9e2bc86fef0..00000000000 --- a/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Mon, 27 May 2024 02:09:58 +0300 -Subject: [PATCH] Cherry-pick 279334@main (36d1b5d7c0ef). - - Remove ARM-specific declarations in FELighting.h unneeded after 272873@main - - Unreviewed build fix. - - * Source/WebCore/platform/graphics/filters/FELighting.h: Remove unneeded - declarations for the getPowerCoefficients() and platformApplyNeon() - functions, which are now defined elsewhere; and were causing a build - failure due to usage of the protected LightingData type. - * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp: - (WebCore::FELightingNeonParallelApplier::applyPlatformParallel const): - Add missing LightType:: namespace to uses of LS_POINT and LS_SPOT. - - Canonical link: https://commits.webkit.org/279334@main - -Canonical link: https://commits.webkit.org/274313.261@webkitglib/2.44 - -Signed-off-by: Adrian Perez de Castro -Upstream: https://github.com/WebKit/WebKit/commit/8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 ---- - .../cpu/arm/filters/FELightingNeonParallelApplier.cpp | 4 ++-- - Source/WebCore/platform/graphics/filters/FELighting.h | 5 ----- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp -index 04d855fa6d71..5f4250d87b61 100644 ---- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp -+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp -@@ -542,14 +542,14 @@ void FELightingNeonParallelApplier::applyPlatformParallel(const LightingData& da - floatArguments.colorBlue = color.blue; - floatArguments.padding4 = 0; - -- if (data.lightSource->type() == LS_POINT) { -+ if (data.lightSource->type() == LightType::LS_POINT) { - neonData.flags |= FLAG_POINT_LIGHT; - auto& pointLightSource = downcast(*data.lightSource); - floatArguments.lightX = pointLightSource.position().x(); - floatArguments.lightY = pointLightSource.position().y(); - floatArguments.lightZ = pointLightSource.position().z(); - floatArguments.padding2 = 0; -- } else if (data.lightSource->type() == LS_SPOT) { -+ } else if (data.lightSource->type() == LightType::LS_SPOT) { - neonData.flags |= FLAG_SPOT_LIGHT; - auto& spotLightSource = downcast(*data.lightSource); - floatArguments.lightX = spotLightSource.position().x(); -diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 4efab920b1c3..dcd80b6f42b7 100644 ---- a/Source/WebCore/platform/graphics/filters/FELighting.h -+++ b/Source/WebCore/platform/graphics/filters/FELighting.h -@@ -68,11 +68,6 @@ protected: - - std::unique_ptr createSoftwareApplier() const override; - --#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) -- static int getPowerCoefficients(float exponent); -- inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); --#endif -- - Color m_lightingColor; - float m_surfaceScale; - float m_diffuseConstant; --- -2.45.2 - diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 790adbb0d4e..7a7cef15a54 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.44.2.tar.xz.sums -md5 0e2a6d05b000e79c51c537ab3261b171 wpewebkit-2.44.2.tar.xz -sha1 5bded217fab25aea776e41158fcdbd72d69a612e wpewebkit-2.44.2.tar.xz -sha256 2a3d23cb4fb071ca0db3a09c5a85f27b8bcc6094a2026d3b7407bed4f99218f7 wpewebkit-2.44.2.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.44.4.tar.xz.sums +md5 4d91f3ff629c9356dcff866b68a4646f wpewebkit-2.44.4.tar.xz +sha1 ef1ea0484e9ec17a362afe9a709fe0754f05cc14 wpewebkit-2.44.4.tar.xz +sha256 cd6042c63a6f883cc1586e5cea94e846aaaee6a864c14988e8af4ef4f362ba3b wpewebkit-2.44.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 36de0213f3e..6a8e9c637c2 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -5,7 +5,7 @@ ################################################################################ # The middle number is even for stable releases, odd for development ones. -WPEWEBKIT_VERSION = 2.44.2 +WPEWEBKIT_VERSION = 2.44.4 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From 15e4ee06c3d56bceb961ac4800c67301827bc170 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 7 Sep 2024 19:31:23 +0200 Subject: [PATCH 2789/3013] utils/check-package: require exactly 1 TAB and 2 SP on help text 1st line Test that the first line starts exactly with one TAB and exactly two spaces before the text. Signed-off-by: Yann E. MORIN Cc: Florian Fainelli Cc: Ricardo Martincoski Signed-off-by: Thomas Petazzoni (cherry picked from commit f9e6d39e8e0615d3a71ea1aef9d0d1e206f4c42c) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index f26ca0d8980..bf975d7a3bb 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -154,6 +154,7 @@ def check_line(self, lineno, text): class HelpText(_CheckFunction): HELP_TEXT_FORMAT = re.compile(r"^\t .{,62}$") + HELP_TEXT_FORMAT_1 = re.compile(r"^\t \S.{,61}$") URL_ONLY = re.compile(r"^(http|https|git)://\S*$") def before(self): @@ -170,12 +171,18 @@ def check_line(self, lineno, text): return if text.strip() == "help": self.help_text = True + self.help_first_line = True return if not self.help_text: return - if self.HELP_TEXT_FORMAT.match(text.rstrip()): + if self.help_first_line: + help_text_match = self.HELP_TEXT_FORMAT_1 + self.help_first_line = False + else: + help_text_match = self.HELP_TEXT_FORMAT + if help_text_match.match(text.rstrip()): return if self.URL_ONLY.match(text.strip()): return From d9b36ca5f1022a89f21bf2efc850f391b0e2ba0a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 18 Aug 2024 13:26:52 +0200 Subject: [PATCH 2790/3013] support/testing: fs: new erofs runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 21e9bb0967a6534e73138a8e645a5c80fc442b0d) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/fs/test_erofs.py | 51 +++++++++++++++++++ .../tests/fs/test_erofs/linux-erofs.fragment | 1 + 3 files changed, 54 insertions(+) create mode 100644 support/testing/tests/fs/test_erofs.py create mode 100644 support/testing/tests/fs/test_erofs/linux-erofs.fragment diff --git a/DEVELOPERS b/DEVELOPERS index c5b80d3b18d..8755ec77a70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1821,6 +1821,8 @@ F: support/testing/tests/boot/test_optee_os.py F: support/testing/tests/boot/test_optee_os/ F: support/testing/tests/fs/test_btrfs.py F: support/testing/tests/fs/test_btrfs/ +F: support/testing/tests/fs/test_erofs.py +F: support/testing/tests/fs/test_erofs/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py diff --git a/support/testing/tests/fs/test_erofs.py b/support/testing/tests/fs/test_erofs.py new file mode 100644 index 00000000000..47c75262e02 --- /dev/null +++ b/support/testing/tests/fs/test_erofs.py @@ -0,0 +1,51 @@ +import os + +import infra.basetest + + +class TestErofs(infra.basetest.BRTest): + kern_frag = \ + infra.filepath("tests/fs/test_erofs/linux-erofs.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.46" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_EROFS_UTILS=y + BR2_TARGET_ROOTFS_EROFS=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + root_dev = "/dev/vda" + disk = os.path.join(self.builddir, "images", "rootfs.erofs") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = [f"root={root_dev}", "console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-drive", f"file={disk},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # We check our root filesystem is in erofs format. + cmd = "mount | grep '/dev/root on / type erofs'" + self.assertRunOk(cmd) + + # Since we are on a read-only mounted filesystem, we can run a + # check... + self.assertRunOk(f"fsck.erofs {root_dev}") + + # We check we can dump the superblock. + self.assertRunOk(f"dump.erofs -s {root_dev}") + + # We check we can dump statistics on the image. + self.assertRunOk(f"dump.erofs -S {root_dev}") diff --git a/support/testing/tests/fs/test_erofs/linux-erofs.fragment b/support/testing/tests/fs/test_erofs/linux-erofs.fragment new file mode 100644 index 00000000000..e14017aae45 --- /dev/null +++ b/support/testing/tests/fs/test_erofs/linux-erofs.fragment @@ -0,0 +1 @@ +CONFIG_EROFS_FS=y From 6cb4e004270f019a44335883470bb60763ce534b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 Aug 2024 10:10:19 +0200 Subject: [PATCH 2791/3013] package/lighttpd: fix sparc/sparc64 compilation From Upstream git, two patches to fix sparc/sparc64 specific compile issues. Fixes: http://autobuild.buildroot.org/results/c35/c35f9b78b8f114bb795ed162585d707331954b4b Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 06b1f1fbd36b063ef5c2322817ee78b43dd1c7b3) Signed-off-by: Peter Korsgaard --- ...ial-value-for-Linux-POLLRDHUP-on-SPA.patch | 34 ++++++++ ...ue-for-Linux-POLLRDHUP-on-SPARC-fixe.patch | 85 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 package/lighttpd/0002-Revert-core-special-value-for-Linux-POLLRDHUP-on-SPA.patch create mode 100644 package/lighttpd/0003-core-special-value-for-Linux-POLLRDHUP-on-SPARC-fixe.patch diff --git a/package/lighttpd/0002-Revert-core-special-value-for-Linux-POLLRDHUP-on-SPA.patch b/package/lighttpd/0002-Revert-core-special-value-for-Linux-POLLRDHUP-on-SPA.patch new file mode 100644 index 00000000000..eebfa3a1133 --- /dev/null +++ b/package/lighttpd/0002-Revert-core-special-value-for-Linux-POLLRDHUP-on-SPA.patch @@ -0,0 +1,34 @@ +From 88ff3763dae65371eab9f8a22ac1c95c96fe4490 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Tue, 23 Apr 2024 00:16:29 -0400 +Subject: [PATCH] Revert "[core] special value for Linux POLLRDHUP on SPARC" + (fixes #3251) + +This reverts commit f14f9142f4487704e2ce0f196263c091accdb12c. + +x-ref: + "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc" + https://redmine.lighttpd.net/issues/3251 + +Signed-off-by: Waldemar Brodkorb +Upstream: https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/88ff3763dae65371eab9f8a22ac1c95c96fe4490 +--- + src/fdevent.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/fdevent.h b/src/fdevent.h +index e9c380b0..1b0a062f 100644 +--- a/src/fdevent.h ++++ b/src/fdevent.h +@@ -40,8 +40,6 @@ struct fdnode_st { + #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \ + || defined(__FreeBSD__) + #define FDEVENT_RDHUP 0x4000 +-#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) +-#define FDEVENT_RDHUP 0x0800 + #else + #define FDEVENT_RDHUP 0x2000 + #endif +-- +2.30.2 + diff --git a/package/lighttpd/0003-core-special-value-for-Linux-POLLRDHUP-on-SPARC-fixe.patch b/package/lighttpd/0003-core-special-value-for-Linux-POLLRDHUP-on-SPARC-fixe.patch new file mode 100644 index 00000000000..f3996d185e8 --- /dev/null +++ b/package/lighttpd/0003-core-special-value-for-Linux-POLLRDHUP-on-SPARC-fixe.patch @@ -0,0 +1,85 @@ +From 524614455554163ec78b27b89ff52bbf7fe96958 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Wed, 24 Apr 2024 03:07:37 -0400 +Subject: [PATCH] [core] special value for Linux POLLRDHUP on SPARC (fixes + #3251) + +x-ref: + "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc" + https://redmine.lighttpd.net/issues/3251 + +Signed-off-by: Waldemar Brodkorb +Upstream: https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/524614455554163ec78b27b89ff52bbf7fe96958 +--- + src/fdevent.h | 2 ++ + src/fdevent_impl.c | 18 ++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/src/fdevent.h b/src/fdevent.h +index 1b0a062f..556a1445 100644 +--- a/src/fdevent.h ++++ b/src/fdevent.h +@@ -40,6 +40,8 @@ struct fdnode_st { + #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \ + || defined(__FreeBSD__) + #define FDEVENT_RDHUP 0x4000 ++#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++#define FDEVENT_RDHUP 0x2800 /*(0x2000 EPOLLRDHUP | 0x0800 POLLRDHUP)*/ + #else + #define FDEVENT_RDHUP 0x2000 + #endif +diff --git a/src/fdevent_impl.c b/src/fdevent_impl.c +index 8bfc1cc6..c84c8df5 100644 +--- a/src/fdevent_impl.c ++++ b/src/fdevent_impl.c +@@ -338,6 +338,11 @@ fdevent_linux_sysepoll_event_set (fdevents *ev, fdnode *fdn, int events) + struct epoll_event ep; + #ifndef EPOLLRDHUP + events &= ~FDEVENT_RDHUP; ++ #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ if (events & FDEVENT_RDHUP) { ++ events &= ~FDEVENT_RDHUP; ++ events |= EPOLLRDHUP; ++ } + #endif + ep.events = events | EPOLLERR | EPOLLHUP; + ep.data.ptr = fdn; +@@ -376,7 +381,11 @@ fdevent_linux_sysepoll_init (fdevents *ev) + ck_static_assert(EPOLLERR == FDEVENT_ERR); + ck_static_assert(EPOLLHUP == FDEVENT_HUP); + #ifdef EPOLLRDHUP ++ #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ ck_static_assert(EPOLLRDHUP & FDEVENT_RDHUP); ++ #else + ck_static_assert(EPOLLRDHUP == FDEVENT_RDHUP); ++ #endif + #endif + + ev->type = FDEVENT_HANDLER_LINUX_SYSEPOLL; +@@ -770,6 +779,11 @@ fdevent_poll_event_set (fdevents *ev, fdnode *fdn, int events) + + #ifndef POLLRDHUP + events &= ~FDEVENT_RDHUP; ++ #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ if (events & FDEVENT_RDHUP) { ++ events &= ~FDEVENT_RDHUP; ++ events |= POLLRDHUP; ++ } + #endif + + if (k >= 0) { +@@ -854,7 +868,11 @@ fdevent_poll_init (fdevents *ev) + ck_static_assert(POLLHUP == FDEVENT_HUP); + ck_static_assert(POLLNVAL == FDEVENT_NVAL); + #ifdef POLLRDHUP ++ #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ ck_static_assert(POLLRDHUP & FDEVENT_RDHUP); ++ #else + ck_static_assert(POLLRDHUP == FDEVENT_RDHUP); ++ #endif + #endif + + ev->type = FDEVENT_HANDLER_POLL; +-- +2.30.2 + From 9c5e04561b45114eb04ab4df25c3aec32dfaf906 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 15 Sep 2024 17:26:32 +0200 Subject: [PATCH 2792/3013] docs/manual/manual.adoc: unbreak BR2_VERSION logic The behaviour of asciidoc on my laptop (Debian 10.2.0-1) changed at the end of last year, causing the BR2_VERSION logic to no longer work: grep 'manual generated' buildroot-2023.02.*/docs/manual/manual.text buildroot-2023.02.6/docs/manual/manual.text:Buildroot 2023.02.6 manual generated on 2023-10-16 08:41:26 UTC from buildroot-2023.02.7/docs/manual/manual.text:Buildroot ${BR2_VERSION%%-git*} manual generated on 2023-11-14 buildroot-2023.02.8/docs/manual/manual.text:Buildroot ${BR2_VERSION%%-git*} manual generated on 2023-12-04 We don't really NEED to strip the -git suffix; indeed, for a git tag, there would be not -git suffix, while for any other commit there will be one and we want to see it (e.g. in the nightly manual, or on a development branch locally). So just drop that to unbreak the version output. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: explain why wew don't want to drop it] Signed-off-by: Yann E. MORIN (cherry picked from commit ec270a08150980e37e36eeb43f4471ed8f7d662e) Signed-off-by: Peter Korsgaard --- docs/manual/manual.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/manual.adoc b/docs/manual/manual.adoc index 31d5f80bae7..cfcc3e52a9e 100644 --- a/docs/manual/manual.adoc +++ b/docs/manual/manual.adoc @@ -4,7 +4,7 @@ = The Buildroot user manual :toc: -Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate} +Buildroot {sys:echo $BR2_VERSION} manual generated on {localdate} {localtime} from git revision {sys:git rev-parse --short HEAD} The Buildroot manual is written by the Buildroot developers. From f104f0f9e7fbdcdaedf7c3380e907b0845665c2e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 6 Sep 2024 00:17:43 +0200 Subject: [PATCH 2793/3013] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kernel commit [1] introduced MSM GPU driver header generation with a Python script. This commit was first included in v6.10. This driver is also enabled as a module in the arm64 architecture default configuration. See [2]. This is a common situation. This missing dependency is not detected in the Buildroot CI, because the reference docker image contains a python3 interpreter. See [3]. For information, the Linux latest kernel version was updated in Buildroot commit 2b6dba00b "linux: bump latest version to 6.10". See [4]. The issue can be observed by running the following commands on a host without the python3 interpreter installed: cat <.config BR2_aarch64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TOOLCHAIN_EXTERNAL=y EOF make olddefconfig make linux The Kernel build fails with output: GENHDR drivers/gpu/drm/msm/generated/a2xx.xml.h /bin/sh: 1: python3: not found make[7]: *** [drivers/gpu/drm/msm/Makefile:176: drivers/gpu/drm/msm/generated/a2xx.xml.h] Error 127 This commit fixes this issue by introducing a new BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3 configuration that will need to be selected in relevant situations. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0fddd045f88e34d6160785a3a5e506d374566454 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/arm64/configs/defconfig?h=v6.10.8#n868 [3] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08-rc3/support/docker/Dockerfile?ref_type=tags#L40 [4] https://gitlab.com/buildroot.org/buildroot/-/commit/2b6dba00be27a09bc7e88faf0871f82bf95589cf Reported-by: Vincent Stehlé Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit abce4a2b365276a7fa081d327289e5e6d8bdca7e) Signed-off-by: Peter Korsgaard --- linux/Config.in | 11 +++++++++++ linux/linux.mk | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 023fa0a2ecb..b4e88214d62 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -492,6 +492,17 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE such as "BTF: .tmp_vmlinux.btf: pahole (pahole) is not available". +config BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3 + bool "Needs host python3" + help + Some Linux kernel configuration options (such as the + CONFIG_DRM_MSM in v6.10 and greater) require a host python3 + interpreter. Enabling this option will ensure host-python3 + gets built before the Linux kernel. + + Enable this option if you get a Linux kernel build failure + such as "python3: not found". + # Linux extensions source "linux/Config.ext.in" diff --git a/linux/linux.mk b/linux/linux.mk index 16d9f194708..92035d0da9e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -138,6 +138,10 @@ define LINUX_FIXUP_CONFIG_PAHOLE_CHECK endef endif +ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3),y) +LINUX_DEPENDENCIES += host-python3 +endif + # If host-uboot-tools is selected by the user, assume it is needed to # create a custom image ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y) From 6b0b1682a8a4f8b4d18385671fecce6de5435d8c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 29 Sep 2024 18:37:52 +0200 Subject: [PATCH 2794/3013] linux: replace host-python3 with BR2_PYTHON3_HOST_DEPENDENCY Commit abce4a2b3 "linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3" [1] introduced a Kernel dependency on host-python3. Since the Kernel does not have any specific requirements on host Python modules, or recent host Python version, this commit replaces the host-python3 dependency with BR2_PYTHON3_HOST_DEPENDENCY. This will skip the host-python3 compilation if a sufficient version (3.4 or greater at the time of this commit) is already present on host. This will save build time. This optimization was suggested by Peter, in [2]. Note 1: this commit was checked to ensure that Kernel v6.10.9 arm64 defconfig (which does require a python3 interpreter to build) is working with Python 3.4. Note 2: BR2_PYTHON3_HOST_DEPENDENCY was introduced in commit b60729784 "support/dependencies: add a check for python3" [3]. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/abce4a2b365276a7fa081d327289e5e6d8bdca7e [2] https://lists.buildroot.org/pipermail/buildroot/2024-September/763967.html [3] https://gitlab.com/buildroot.org/buildroot/-/commit/b60729784ab1c2f75dca30f924f4dd3176713ae8 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit b98062f7301bc72d2a59cca733f36525405d3bb9) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 92035d0da9e..28d0ac50e3f 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -139,7 +139,7 @@ endef endif ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3),y) -LINUX_DEPENDENCIES += host-python3 +LINUX_DEPENDENCIES += $(BR2_PYTHON3_HOST_DEPENDENCY) endif # If host-uboot-tools is selected by the user, assume it is needed to From e7074c3efbbb27a9eff6b4e6b33affcd5411202a Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 16 Sep 2024 07:02:31 +0200 Subject: [PATCH 2795/3013] package/sysklogd: bump to v2.6.2 From https://github.com/troglobit/sysklogd/releases/tag/v2.6.2: - syslog.conf: misplaced continuation character in example - Add facility aliases for RFC5424 compliance: LOG_CRON2 and LOG_AUDIT, including facilitynames[] = cron2, audit. Used by the native logger tool (and any clients linking to libsyslog) - Fix data corruption using the listen directive, introduced in 2.6.0 - Fix IPv6 addresses in listen directive, introduced in 2.6.0 - Fix logging to remote IPv6 address, add support for parsing [fdd5::6979:c0ff:ee87:8f92]:123 style addresses - Fix initial delay for unresolvable remote target. When a DNS name cannot be resolved, e.g., critically at boot, syslogd blocked with default resolver timeout (5 * 2 sec) Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN (cherry picked from commit 91afa8c8ccdfa668b59e00dc566585c6b450dc87) Signed-off-by: Peter Korsgaard --- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 0a5790a1a5d..8b1cd63a73a 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 e35d5c5f55019976302ac9818890bd6b6858db257506f0e9afaa718a8dee9cc3 sysklogd-2.6.1.tar.gz +sha256 40a3bb593d7507e49a4379f48ae8a9bc4b68dcc583efcdbf3b9056128442c92a sysklogd-2.6.2.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 86bd4ef168d..eeb3a3748df 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.6.1 +SYSKLOGD_VERSION = 2.6.2 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From 52f9df9222e705402db234d84c977ab1bee68f6f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 17 Sep 2024 11:25:47 +0200 Subject: [PATCH 2796/3013] docs/website/docs.html: use HTTPS for nightly.buildroot.org links Browsers nowadays complain about HTTP downloads (E.G. manual.pdf) from a site served over HTTPS, so also use HTTPS for the nightly.buildroot.org manual links. Signed-off-by: Peter Korsgaard (cherry picked from commit 06397d26a0cef5ddce0b04919acac8f4d63dacbf) Signed-off-by: Peter Korsgaard --- docs/website/docs.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/website/docs.html b/docs/website/docs.html index 85b005004dc..ee3eb3d0659 100644 --- a/docs/website/docs.html +++ b/docs/website/docs.html @@ -26,7 +26,7 @@

              HTML
              Stable | - Nightly + Nightly

              @@ -45,7 +45,7 @@

              HTML

              PDF
              Stable | - Nightly + Nightly

      @@ -64,7 +64,7 @@

      PDF

      ASCII
      Stable | - Nightly + Nightly

      From 3b15f7defba72b427e9d4b4eb0730d9f7359b585 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 11 Sep 2024 21:09:00 +0200 Subject: [PATCH 2797/3013] support/scripts: fix RPATH fixups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit a87abcf6da65 (Makefile: run PPD and RPATH fixup in host-fialize) (sic) moved the fixups peviously done in prepare-sdk, to host-finalize. This exposed a bug in fix-rpath, when RPATH contains multiple entries, like: /PPD/host-foo/host/lib:/PPD/host-foo/host/lib/foo In that situation, we want to get rid of /PPD/host-foo and replace it with the finale HOST_DIR, so we mangle the RPATH with a sed expression. However, that sed expression only ever replaces the first match, as it is missing the 'g' option. Thus, the second (and following) parts of RPATH are still referring to the PPD, and thus patchelf does not find it relative to the final HOST_DIR, amd rops it. This eventually lead to a final RPATH set as $ORIGIN/../lib instead of the expected $ORIGIN/../lib:$ORIGIN/../lib/foo This is the case for host-systemd, which installs some of its libraries in $PREFIX/lib/systemd/ and adds an RPATH set appropriately to /PPD/host-systemd/host/lib:/PPD/host-systemd/host/lib/systemd and that gets incorrectly mangled. Fixes: https://gitlab.com/buildroot.org/buildroot/-/issues/39 Also fix a typo in the comment just above. Reported-by: José Luis Salvador Rufo @jlsalvador Signed-off-by: Yann E. MORIN Tested-by: José Luis Salvador Rufo Reviewed-by: José Luis Salvador Rufo Tested-by: Adam Duskett Reviewed-by: Adam Duskett Signed-off-by: Peter Korsgaard (cherry picked from commit 2100a76d9ef620d9749352fb85f83720412598ec) Signed-off-by: Peter Korsgaard --- support/scripts/fix-rpath | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/fix-rpath b/support/scripts/fix-rpath index 1e58646ceaa..d3421504a53 100755 --- a/support/scripts/fix-rpath +++ b/support/scripts/fix-rpath @@ -84,9 +84,9 @@ patch_file() { # work with the --make-rpath-relative ${rootdir} invocation as # the per-package host directory is not within ${rootdir}. So, # we rewrite all RPATHs pointing to per-package directories so - # that they point to the global host directry. + # that they point to the global host directory. # shellcheck disable=SC2001 # ${var//search/replace} hard when search or replace have / in them - changed_rpath="$(echo "${rpath}" | sed "s@${PER_PACKAGE_DIR}/[^/]\+/host@${HOST_DIR}@")" + changed_rpath="$(echo "${rpath}" | sed "s@${PER_PACKAGE_DIR}/[^/]\+/host@${HOST_DIR}@g")" if test "${rpath}" != "${changed_rpath}" ; then "${PATCHELF}" --set-rpath "${changed_rpath}" "${file}" fi From ec2b0f56d009c22d68749cc0f16824344189e4e4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 17:59:49 +0200 Subject: [PATCH 2798/3013] utils/config: fix don't typo Signed-off-by: Peter Korsgaard Reviewed-by: Marcus Folkesson Signed-off-by: Yann E. MORIN (cherry picked from commit b3e5bcec658b8b20740c30fcd18ed3eac5ee1a3e) Signed-off-by: Peter Korsgaard --- utils/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/config b/utils/config index 5f5e4362e5b..dfaaf46cd79 100755 --- a/utils/config +++ b/utils/config @@ -30,7 +30,7 @@ commands: options: --file config-file .config file to change (default .config) - --keep-case|-k Keep next symbols' case (dont' upper-case it) + --keep-case|-k Keep next symbols' case (don't upper-case it) --package|-p Operate on package (set prefix to BR2_PACKAGE_) $myname doesn't check the validity of the .config file. This is done at next From 499d0a5bf1c4672841ea7d51d97f9d0652dc2b5b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 17:59:50 +0200 Subject: [PATCH 2799/3013] utils/docker-run: fix symmetry typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6bcdbccb7f09cc7635038cc67d001bee802a15e3) Signed-off-by: Peter Korsgaard --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 1adb02d74e6..849df66d54a 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -78,7 +78,7 @@ if [ "${GIT_DIR}" ]; then # 'repo' stores .git/objects separately. if [ -L "${GIT_DIR}/objects" ]; then - # GITDIR is already an absolute path, but for symetry + # GITDIR is already an absolute path, but for symmetry # with the above, keep the same cd+readlink construct. OBJECTS_DIR="$(cd "${MAIN_DIR}"; readlink -e "${GIT_DIR}/objects")" mountpoints+=( "${OBJECTS_DIR}" ) From 68135035ad8518eb6f73c2964ae617984507b590 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 17:59:51 +0200 Subject: [PATCH 2800/3013] utils/getdeveloperlib.py: fix retrieve typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ed2cb54252b5eec9ba66ed29fe5539c4c4d3958c) Signed-off-by: Peter Korsgaard --- utils/getdeveloperlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index 469360b801c..b5e7b89e72e 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -85,7 +85,7 @@ def get_all_test_cases(suite): def list_unittests(): - """Use the unittest module to retreive all test cases from a given + """Use the unittest module to retrieve all test cases from a given directory""" loader = unittest.TestLoader() suite = loader.discover(os.path.join(brpath, "support", "testing")) From f3b41a04599d5459d67a92980092bd95c9c79b82 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 17:59:52 +0200 Subject: [PATCH 2801/3013] utils/readme.txt: fix 'typos' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 37574ab12a46602c31c103a82b8ef6a58968dfc7) Signed-off-by: Peter Korsgaard --- utils/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/readme.txt b/utils/readme.txt index 6488d13c758..b5862f1fb98 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -14,7 +14,7 @@ brmake check-package a script that checks the coding style across the buildroot tree. It checks package's Config.in and .mk files, runs shellcheck for all shell - scripts, flake8 for python files, checks for typoes, etc. + scripts, flake8 for python files, checks for typos, etc. It checks the .checkpackageignore file if errors should be ignored and errors if there's a file listed that doesn't produce an error. From 5c75ee937a1ad0d72e8d11b88301f79ac88859a1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 17:59:53 +0200 Subject: [PATCH 2802/3013] utils/scanpypi: fix typos Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: s/contents/content/] Signed-off-by: Yann E. MORIN (cherry picked from commit aa79ae24a8c3422cfe293ab1b3e315fad049bd6c) Signed-off-by: Peter Korsgaard --- utils/scanpypi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 5a58550145e..8765a983237 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -292,7 +292,7 @@ class BuildrootPackage(): def extract_package(self, tmp_path): """ - Extract the package contents into a directrory + Extract the package content into a directory Keyword arguments: tmp_path -- directory where you want the package to be extracted @@ -440,7 +440,7 @@ class BuildrootPackage(): def __create_mk_download_info(self): """ - Create the lines refering to the download information of the + Create the lines referring to the download information of the .mk file """ lines = [] @@ -471,7 +471,7 @@ class BuildrootPackage(): def __create_mk_setup(self): """ - Create the line refering to the setup method of the package of the + Create the line referring to the setup method of the package of the .mk file There are two things you can use to make an installer @@ -556,7 +556,7 @@ class BuildrootPackage(): def __create_mk_license(self): """ - Create the lines referring to the package's license informations of the + Create the lines referring to the package's license information of the .mk file The license's files are found by searching the package (case insensitive) @@ -755,7 +755,7 @@ def main(): continue if package.metadata_name.lower() == 'setuptools': # setuptools imports itself, that does not work very well - # with the monkey path at the begining + # with the monkey path at the beginning print('Error: setuptools cannot be built using scanPyPI') continue @@ -827,7 +827,7 @@ def main(): print("NOTE: Remember to also make an update to the DEVELOPERS file") print(" and include an entry for the pkg in packages/Config.in") print() - # printing an empty line for visual confort + # printing an empty line for visual comfort finally: shutil.rmtree(tmp_path) From 246c103203faa558164223188eb6d3decd28afd4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 17:59:54 +0200 Subject: [PATCH 2803/3013] utils/update-rust: fix 'following' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit f1ceb3687f16634ee0f41de278d875280f96bdc0) Signed-off-by: Peter Korsgaard --- utils/update-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update-rust b/utils/update-rust index 3301434d703..0f40f2e2b68 100755 --- a/utils/update-rust +++ b/utils/update-rust @@ -27,7 +27,7 @@ RUST_HOSTS = [ # BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS # - package/rustc/rustc.mk: # RUSTC_TARGET_NAME -# and check whether one of the follwoing needs updating: +# and check whether one of the following needs updating: # - package/rustc/Config.in.host: # BR2_PACKAGE_HOST_RUSTC_ARCH # BR2_PACKAGE_HOST_RUSTC_ABI From fcdc7c2dde7f19e7cbb2944a45c24a1b5cf7abe2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 22:49:18 +0200 Subject: [PATCH 2804/3013] toolchain/helpers.mk: fix 'unsupported' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit edd87c76521a3eb2984c5475b4014d922aae0e2b) Signed-off-by: Peter Korsgaard --- toolchain/helpers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 839ee278d03..f3fdaaec07c 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -324,7 +324,7 @@ check_arm_abi = \ __CROSS_CC=$(strip $1) ; \ EXT_TOOLCHAIN_TARGET=`LANG=C $${__CROSS_CC} -v 2>&1 | grep ^Target | cut -f2 -d ' '` ; \ if ! echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \ - echo "External toolchain uses the unsuported OABI" ; \ + echo "External toolchain uses the unsupported OABI" ; \ exit 1 ; \ fi ; \ if ! echo 'int main(void) {}' | $${__CROSS_CC} -x c -o $(BUILD_DIR)/.br-toolchain-test.tmp - ; then \ From aeaba3875420729130e7affad8dc00fb56d43e1a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 22:49:19 +0200 Subject: [PATCH 2805/3013] toolchain/toolchain-wrapper.c: fix 'potentially' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ea4179f3ae4b37b4e2deb84ef474ac693ab8c4d4) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index e4368897607..db11cdb6ab8 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -134,7 +134,7 @@ static const struct str_len_s unsafe_paths[] = { { NULL, 0 }, }; -/* Unsafe options are options that specify a potentialy unsafe path, +/* Unsafe options are options that specify a potentially unsafe path, * that will be checked by check_unsafe_path(), below. */ static const struct str_len_s unsafe_opts[] = { From 4ca5d89653c9ad86ecbaa69a12027cdcfd404601 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:19 +0200 Subject: [PATCH 2806/3013] support/dependencies/dependencies.sh: fix 'mimic' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ca4eca4bfa7e1b2603de7834433eb29e86ed1e01) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 6d5fc360376..fb0defd0c91 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -143,7 +143,7 @@ fi # Check bash # We only check bash is available, setting SHELL appropriately is done -# in the top-level Makefile, and we mimick the same sequence here +# in the top-level Makefile, and we mimic the same sequence here if [ -n "${BASH}" ]; then : elif [ -x /bin/bash ]; then : elif [ -z "$( sh -c 'echo $BASH' )" ]; then From 480970866479a758500542eea8d92a8683396bff Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:20 +0200 Subject: [PATCH 2807/3013] support/kconfig: fix 'multiple' typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit b0a9bc9ce75c80c67bcc8330841bbcb6ee9b9998) Signed-off-by: Peter Korsgaard --- .../18-merge-config.sh-create-temporary-files-in-tmp.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch b/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch index f2a261f3086..053366e2fb4 100644 --- a/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch +++ b/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch @@ -5,7 +5,7 @@ Date: Mon, 7 Dec 2015 12:08:45 -0200 merge_config.sh: create temporary files in /tmp Creating temporary files in /tmp (or the path pointed by $TMPDIR) allows the - buildroot top directory to be read-only and shareable between multible builds. + buildroot top directory to be read-only and shareable between multiple builds. This follows what other scripts do, e.g. check-kernel-headers.sh. Signed-off-by: Henrique Marks From 03824b9a6d62e6d62262ac6eaf79b20b49328e6e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:21 +0200 Subject: [PATCH 2808/3013] support/misc/Buildroot.cmake: fix 'after all' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 8f0872fee36fd2370359946aa088509a88675955) Signed-off-by: Peter Korsgaard --- support/misc/Buildroot.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/misc/Buildroot.cmake b/support/misc/Buildroot.cmake index 761b6d7ae25..3f8cd22f7d3 100644 --- a/support/misc/Buildroot.cmake +++ b/support/misc/Buildroot.cmake @@ -1,4 +1,4 @@ -# Impersonate a Linux system. Afterall, that's what we are... +# Impersonate a Linux system. After all, that's what we are... set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM ${CMAKE_SYSTEM_NAME}) include(Platform/Linux) From 3d5595d8f721022d26197239e3317b4d336c5dfa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:22 +0200 Subject: [PATCH 2809/3013] support/misc/utils.mk: fix typos Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 146c1d38defee5114f994e1e6d3f80ce63e117bd) Signed-off-by: Peter Korsgaard --- support/misc/utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/misc/utils.mk b/support/misc/utils.mk index 4d0efcced0b..5275006d6da 100644 --- a/support/misc/utils.mk +++ b/support/misc/utils.mk @@ -40,7 +40,7 @@ SHARP_SIGN := \# # In other words, every letter is substituted one by one. # # The caseconvert-helper allows us to create this definition out of the -# [FROM] and [TO] lists, so we don't need to write down every substition +# [FROM] and [TO] lists, so we don't need to write down every substitution # manually. The uses of $ and $$ quoting are chosen in order to do as # much expansion as possible up-front. # @@ -131,7 +131,7 @@ QUOTE = ' # Once everything has been escaped, it is passed between single quotes # (that's why the single-quotes are escaped they way they are, above, # and why the dollar sign is not escaped) to printf(1). A trailing -# newline is apended, too. +# newline is appended, too. # # Note: leading or trailing spaces are *not* stripped. # From a24532ff04b6b4969344ec5d9246a6a0b074b10a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:23 +0200 Subject: [PATCH 2810/3013] support/scripts/cve.py: fix 'useful' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit da0d6d5834b64df84a4e713d971c4c7d52bf06e7) Signed-off-by: Peter Korsgaard --- support/scripts/cve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index e25825581e0..5af6e0c43f6 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -120,7 +120,7 @@ def each_product(self): def parse_node(self, node): """ Parse the node inside the configurations section to extract the - cpe information usefull to know if a product is affected by + cpe information useful to know if a product is affected by the CVE. Actually only the product name and the version descriptor are needed, but we also provide the vendor name. """ From 04557874c1dca323dca48b8ff98d932f41fab3d9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:24 +0200 Subject: [PATCH 2811/3013] support/scripts/graph-build-time: fix 'auxiliary' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9c9aa7ffba7336086c07fd79a0e9c0b2873605dc) Signed-off-by: Peter Korsgaard --- support/scripts/graph-build-time | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 1edc3b3c00e..abbbb26151e 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -311,7 +311,7 @@ def read_data(input_file): reader = csv.reader(input_file, delimiter=':') pkgs = [] - # Auxilliary function to find a package by name in the list. + # Auxiliary function to find a package by name in the list. def getpkg(name): for p in pkgs: if p.name == name: From 917a81b3424fc99094756582840e4bb41940be22 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:25 +0200 Subject: [PATCH 2812/3013] support/scripts/pkg-stats: fix 'dictionary' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db6a029a50a36adb86549b22f556b4f66e072417) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 4dc1857a9e6..f143af64469 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1209,7 +1209,7 @@ def dump_html(packages, stats, date, commit, output): def dump_json(packages, defconfigs, stats, date, commit, output): - # Format packages as a dictionnary instead of a list + # Format packages as a dictionary instead of a list # Exclude local field that does not contains real date excluded_fields = ['url_worker', 'name', 'tree_path'] pkgs = { From b4cae331e84ae63462706849e82a1177c1ee86c9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:26 +0200 Subject: [PATCH 2813/3013] support/testing/tests/init/test_systemd.py: fix 'on top' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c89a111f06c2584b3f9994b8ead7c5a9caad7295) Signed-off-by: Peter Korsgaard --- support/testing/tests/init/test_systemd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 7bbc112a561..05a65223b32 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -198,7 +198,7 @@ def test_run(self): # The following tests are all about read-only rootfs, and exercise either -# using an un-populated factory for /var, or an overlaysfs ontop of a +# using an un-populated factory for /var, or an overlaysfs on top of a # pre-populated /var. They all specialise the TestInitSystemSystemdRo* # test cases above. From ade2368faee0b237e934357f8a218218224434fc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:27 +0200 Subject: [PATCH 2814/3013] support/testing/tests/package/test_acpica.py: fix typos in comments Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 670f6a4bf5a457eaa95340a68a976fb94b89306f) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_acpica.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_acpica.py b/support/testing/tests/package/test_acpica.py index f7dd64d7f01..adfb93d5046 100644 --- a/support/testing/tests/package/test_acpica.py +++ b/support/testing/tests/package/test_acpica.py @@ -43,12 +43,12 @@ def test_run(self): cmd += " | grep -F '\"Hello Buildroot!\"'" self.assertRunOk(cmd) - # INT1 is exepcted to be 12345678 + # INT1 is expected to be 12345678 cmd = "acpiexec -b 'evaluate INT1' dsdt.aml" cmd += " | grep -F 12345678" self.assertRunOk(cmd) - # Evalute the TEST method which prints its argument + # Evaluate the TEST method which prints its argument cmd = "acpiexec -b 'evaluate TST2 \"Hello World\"' dsdt.aml" cmd += " | grep -F 'Arg0=Hello World'" self.assertRunOk(cmd) From de55528c6e175ea710b86dfe10eb72cafc063d69 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:28 +0200 Subject: [PATCH 2815/3013] support/testing/tests/package/test_bash.py: fix 'running' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c62de54852239da4e74fc1a3d23e60cdfd296751) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_bash.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_bash.py b/support/testing/tests/package/test_bash.py index f0ee8cadc12..7ec6e85ef97 100644 --- a/support/testing/tests/package/test_bash.py +++ b/support/testing/tests/package/test_bash.py @@ -28,7 +28,7 @@ def test_run(self): self.assertEqual(out[0], "", "Already running bash instead of busybox' sh") self.assertRunOk("bash -il") - # Twist! The above command is still runing, it's just that + # Twist! The above command is still running, it's just that # bash did display the prompt we expect. Check we are indeed # actually bash out, _ = self.emulator.run('echo "${BASH}"') From 557d2e0e56af42ad479deac523287a380002d09d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:29 +0200 Subject: [PATCH 2816/3013] support/testing/tests/package/test_compressor_base.py: fix 'extension' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 68316831e478417066ff7515774ef0aeda2bb6a3) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_compressor_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_compressor_base.py b/support/testing/tests/package/test_compressor_base.py index 6555584c103..e822c211398 100644 --- a/support/testing/tests/package/test_compressor_base.py +++ b/support/testing/tests/package/test_compressor_base.py @@ -24,7 +24,7 @@ class TestCompressorBase(infra.basetest.BRTest): in unset, the default value is "compress_cmd" appended with " -t". compressed_file_ext - - the file extention of compressed files created by the + - the file extension of compressed files created by the compress command. (ex: ".gz") if unset, the default value is a dot "." appended with the value of "compress_cmd". From 07222174fdf4bdd078d8221ee60d848ce4c9a649 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:30 +0200 Subject: [PATCH 2817/3013] support/testing/tests/package/test_cryptsetup.py: fix 'encrypted' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 28c56bc26f2c8b4cbeb8124178b349b1bf5b6f57) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_cryptsetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_cryptsetup.py b/support/testing/tests/package/test_cryptsetup.py index 759dfd7c5f2..e409ea93e68 100644 --- a/support/testing/tests/package/test_cryptsetup.py +++ b/support/testing/tests/package/test_cryptsetup.py @@ -109,7 +109,7 @@ def test_run(self): self.assertRunOk(f"cryptsetup close {dm_name}") # We are NOT supposed to find our plain text message on the - # crypted storage device. + # encrypted storage device. _, ret = self.emulator.run(f"grep -Fq '{msg}' {dev}", timeout=10) self.assertNotEqual(ret, 0) From f0a248e16c58e1d9441d19d9c42f2923603fec8b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:31 +0200 Subject: [PATCH 2818/3013] support/testing/tests/package/test_ddrescue.py: fix 'normally' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 98f7a32d05ba509461cc58103c359d3b67f00ef5) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_ddrescue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_ddrescue.py b/support/testing/tests/package/test_ddrescue.py index 22069714218..989abc8f017 100644 --- a/support/testing/tests/package/test_ddrescue.py +++ b/support/testing/tests/package/test_ddrescue.py @@ -76,7 +76,7 @@ def test_run(self): # Where a normal 'dd' fails, 'ddrescue' is expected to succeed self.assertRunOk(f"ddrescue {dm_dev} {ddrescue_img}") - # ddrescue does not normaly write any output data when there + # ddrescue does not normally write any output data when there # is I/O error on the input. The intent is to preserve any # data that could have been read in a previous pass. There is # one exception, when the output is a non-existing regular From aaabe7720f25e144dc74d52753539d9e1509fff2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:32 +0200 Subject: [PATCH 2819/3013] support/testing/tests/package/test_iptables.py: fix 'OUTPUT' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 1772ad2f5f34e28bf845c45ce355e888cdea9f63) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_iptables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_iptables.py b/support/testing/tests/package/test_iptables.py index ee57b315589..924a483ddb7 100644 --- a/support/testing/tests/package/test_iptables.py +++ b/support/testing/tests/package/test_iptables.py @@ -40,7 +40,7 @@ def test_run(self): self.assertRunOk("iptables --version") # We delete all rules in all chains. We also set default - # policies to ACCEPT for INPUT and OUPUT chains. This should + # policies to ACCEPT for INPUT and OUTPUT chains. This should # already be the case (default Kernel config). This makes sure # this test starts from a known state and also those common # command invocations works. From b347b512502991605b3a1532299e0ffdbae20e81 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:33 +0200 Subject: [PATCH 2820/3013] support/testing/tests/package/test_micropython.py: fix 'returned' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 4a8aafecf026a099e4b55d10a38b9dfd9b576e60) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_micropython.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_micropython.py b/support/testing/tests/package/test_micropython.py index 371deb29782..cc0e5854c87 100644 --- a/support/testing/tests/package/test_micropython.py +++ b/support/testing/tests/package/test_micropython.py @@ -16,7 +16,7 @@ class TestMicroPython(infra.basetest.BRTest): def run_upy_code(self, python_code, opts=""): cmd = f'micropython {opts} -c "{python_code}"' output, ret = self.emulator.run(cmd) - self.assertEqual(ret, 0, f"could not run '{cmd}', returnd {ret}: '{output}'") + self.assertEqual(ret, 0, f"could not run '{cmd}', returned {ret}: '{output}'") return output def test_run(self): From c6c872f4949cf1e955a981694f19e400fbf6dbf9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:34 +0200 Subject: [PATCH 2821/3013] support/testing/tests/package/test_mtools.py: fix 'unformatted' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 064f879d960986f2e82ee0439b29cf487fcf85c9) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_mtools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_mtools.py b/support/testing/tests/package/test_mtools.py index 4a232bc9268..23ec08b6d63 100644 --- a/support/testing/tests/package/test_mtools.py +++ b/support/testing/tests/package/test_mtools.py @@ -26,7 +26,7 @@ def test_run(self): # Create an empty image file to hold the FAT partition self.assertRunOk(f"dd if=/dev/zero of={dos_img} bs=1M count=1") - # Any Mtools command is expected to fail on an unformated + # Any Mtools command is expected to fail on an unformatted # partition. cmd = f"minfo {mtools_opts} ::" _, exit_code = self.emulator.run(cmd) From c0a0849e7221dde08e77e7cc8db4a1e12ee9b36d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:08:35 +0200 Subject: [PATCH 2822/3013] support/testing/tests/package/test_weston/overlay/etc/weston.ini: fix 'independent' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0ab62e5d257bd36ca8fe5f570d18f6619fa11fbe) Signed-off-by: Peter Korsgaard --- .../testing/tests/package/test_weston/overlay/etc/weston.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_weston/overlay/etc/weston.ini b/support/testing/tests/package/test_weston/overlay/etc/weston.ini index 534b5c1f4ad..1d710ca7276 100644 --- a/support/testing/tests/package/test_weston/overlay/etc/weston.ini +++ b/support/testing/tests/package/test_weston/overlay/etc/weston.ini @@ -1,5 +1,5 @@ # The shell "clock-format" is set to "none", in order to have stable -# display output, independant from the time. The display output can +# display output, independent from the time. The display output can # then be reliably checked with VKMS CRC. # "startup-animation" and "close-animation" are set to "none" for # faster transitions (fade animations with a software GLES From e83ec66f83a49c34fb56af5e68234901367bccbd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:40 +0200 Subject: [PATCH 2823/3013] linux/linux.mk: fix 'parser' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9c604ef86f32ccb71e050cd92b2ab72659f9474c) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 28d0ac50e3f..111a21f039d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -86,7 +86,7 @@ LINUX_DEPENDENCIES += \ $(if $(BR2_PACKAGE_FIRMWARE_IMX),firmware-imx) \ $(if $(BR2_PACKAGE_WIRELESS_REGDB),wireless-regdb) -# Starting with 4.16, the generated kconfig paser code is no longer +# Starting with 4.16, the generated kconfig parser code is no longer # shipped with the kernel sources, so we need flex and bison, but # only if the host does not have them. LINUX_KCONFIG_DEPENDENCIES = \ From 5ad23bdad05885e4a2fa45bfdb638ccb16425957 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:41 +0200 Subject: [PATCH 2824/3013] boot/arm-trusted-firmware/Config.in: fix 'platform' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 2e3c0ab1b7bbe8bb5a5abb493fc81e166593ac8f) Signed-off-by: Peter Korsgaard --- boot/arm-trusted-firmware/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 02a6db795a1..5ba4e083701 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -77,7 +77,7 @@ endif config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM string "ATF platform" help - Target plaform to build for. + Target platform to build for. config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD string "ATF target board" From efd28be743c72fd178f219f2e526dfdfa8fca2bd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:42 +0200 Subject: [PATCH 2825/3013] boot/barebox/barebox.mk: fix 'allows' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9e3fdb87f0e2a03e32c3a91875434f7b722a17d4) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index fe366989b9d..929ed48ada8 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -26,7 +26,7 @@ else ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_GIT),y) $(1)_SITE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL)) $(1)_SITE_METHOD = git # Override the default value of _SOURCE to 'barebox-*' so that it is not -# downloaded a second time for barebox-aux; also alows avoiding the hash +# downloaded a second time for barebox-aux; also allows avoiding the hash # check: $(1)_SOURCE = barebox-$$($(1)_VERSION)$$(BR_FMT_VERSION_git).tar.gz else From e877a047b37ca20ff19b037ad550cdded563c540 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:43 +0200 Subject: [PATCH 2826/3013] boot/edk2/edk2.mk: fix 'release' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit a52fd38060f092edbb7f558217770e136899d19f) Signed-off-by: Peter Korsgaard --- boot/edk2/edk2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 87ac80c88f4..e5816b353a2 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -24,7 +24,7 @@ endif else EDK2_BUILD_TYPE = RELEASE # DEBUG_ON_SERIAL_PORT is only valid in debug builds, so useless to set -# it (enabled or disabled) on a relase build. +# it (enabled or disabled) on a release build. endif # Build system notes. From 206c6f0acd9329580f11f5da5620129a4ac9d671 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:44 +0200 Subject: [PATCH 2827/3013] boot/grub2/Config.in: fix 'targeting' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0fa6bd5a964e8b8cd9d3728b0bb72d088d380a71) Signed-off-by: Peter Korsgaard --- boot/grub2/Config.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index 7c235e96f71..e1f2fc105e4 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -53,7 +53,7 @@ config BR2_TARGET_GRUB2_I386_PC depends on BR2_i386 || BR2_x86_64 select BR2_TARGET_GRUB2_HAS_LEGACY_BOOT help - Select this option if the platform you're targetting is a + Select this option if the platform you're targeting is a x86 or x86-64 legacy BIOS based platform. config BR2_TARGET_GRUB2_I386_EFI @@ -62,7 +62,7 @@ config BR2_TARGET_GRUB2_I386_EFI select BR2_TARGET_GRUB2_HAS_PTF select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting has a + Select this option if the platform you're targeting has a 32 bits EFI BIOS. Note that some x86-64 platforms use a 32 bits EFI BIOS, and this option should be used in this case. @@ -72,7 +72,7 @@ config BR2_TARGET_GRUB2_X86_64_EFI select BR2_TARGET_GRUB2_HAS_PTF select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting has a + Select this option if the platform you're targeting has a 64 bits EFI BIOS. config BR2_TARGET_GRUB2_ARM_UBOOT @@ -80,7 +80,7 @@ config BR2_TARGET_GRUB2_ARM_UBOOT depends on BR2_arm select BR2_TARGET_GRUB2_HAS_LEGACY_BOOT help - Select this option if the platform you're targetting is an + Select this option if the platform you're targeting is an ARM u-boot platform, and you want to boot Grub 2 as an u-boot compatible image. @@ -90,7 +90,7 @@ config BR2_TARGET_GRUB2_ARM_EFI select BR2_TARGET_GRUB2_HAS_PTF select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting is an + Select this option if the platform you're targeting is an ARM platform and you want to boot Grub 2 as an EFI application. @@ -99,7 +99,7 @@ config BR2_TARGET_GRUB2_ARM64_EFI depends on BR2_aarch64 select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting is an + Select this option if the platform you're targeting is an Aarch64 platform and you want to boot Grub 2 as an EFI application. @@ -108,7 +108,7 @@ config BR2_TARGET_GRUB2_RISCV64_EFI depends on BR2_RISCV_64 select BR2_TARGET_GRUB2_HAS_EFI_BOOT help - Select this option if the platform you're targetting is a + Select this option if the platform you're targeting is a 64bit RISC-V platform and you want to boot Grub 2 as an EFI application. From 0243bc0795f8ca5014fc8dc4b16d3e6db71d8857 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:45 +0200 Subject: [PATCH 2828/3013] boot/optee-os/optee-os.mk: fix 'PLATFORM' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 7bd00d5506e8572f316a9b742b78039e0743d86b) Signed-off-by: Peter Korsgaard --- boot/optee-os/optee-os.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 6b04a0f5e13..c6de49c1512 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -65,7 +65,7 @@ OPTEE_OS_MAKE_OPTS += \ CFG_ARM32_core=y endif -# Get mandatory PLAFORM and optional PLATFORM_FLAVOR and additional +# Get mandatory PLATFORM and optional PLATFORM_FLAVOR and additional # variables OPTEE_OS_MAKE_OPTS += PLATFORM=$(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)) ifneq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR)),) From 720c61fff9aefb2cd18bc5edb47d3c814dd12269 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:46 +0200 Subject: [PATCH 2829/3013] boot/shim/shim.mk: fix 'deactivate' typo Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6dc6a747fd44ab908f430c0895e6f6cbd03412e5) Signed-off-by: Peter Korsgaard --- boot/shim/shim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index ae57677320f..f5b3d1cee6e 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -22,7 +22,7 @@ SHIM_MAKE_OPTS = \ # shim has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) SHIM_CFLAGS += -marm endif From d9e4a18b9c0ce63d0372e6fc7108ca568a94c75b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Sep 2024 23:28:47 +0200 Subject: [PATCH 2830/3013] boot/uboot: fix typos Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ab34bdcb38f950ac5232397e1168a9c1b66b2af4) Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 2 +- boot/uboot/uboot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index c4d052595c3..dd806936148 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -150,7 +150,7 @@ config BR2_TARGET_UBOOT_DEFAULT_ENV_FILE Text file containing the variables to be used as the default environment in U-Boot. - If empty, let U-Boot generate the default enviromnent from the + If empty, let U-Boot generate the default environment from the source code and other U-Boot configuration values, which is the default behaviour. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 2c04abc8965..ab534a8b3a2 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -54,7 +54,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y) UBOOT_BINS += u-boot -# To make elf usable for debuging on ARC use special target +# To make elf usable for debugging on ARC use special target ifeq ($(BR2_arc),y) UBOOT_MAKE_TARGET += mdbtrick endif From 8c3b1b77cfdac667269e3d1bcaf9741d62a81769 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Fri, 20 Sep 2024 19:39:06 +0200 Subject: [PATCH 2831/3013] docs/manual/configure.adoc: fix location of Busybox inittab Commit 89d39fc7a392 "initscripts: new package" moved the inittab packaged for Busybox init from system/skeleton/etc to package/busybox. The manual, however, still points to the old location, so let's fix it. Signed-off-by: Edgar Bonet Signed-off-by: Yann E. MORIN (cherry picked from commit 99b1685fd8db8e63c37edac4e544f62ead245b90) Signed-off-by: Peter Korsgaard --- docs/manual/configure.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/configure.adoc b/docs/manual/configure.adoc index d27cdf3eb96..e0358aa0f9e 100644 --- a/docs/manual/configure.adoc +++ b/docs/manual/configure.adoc @@ -399,7 +399,7 @@ can be chosen from +System configuration+, +Init system+: BusyBox +inittab+ syntax is special: do not use a random +inittab+ documentation from the Internet to learn about BusyBox +inittab+). The default +inittab+ in Buildroot is stored in - +system/skeleton/etc/inittab+. Apart from mounting a few important + +package/busybox/inittab+. Apart from mounting a few important filesystems, the main job the default inittab does is to start the +/etc/init.d/rcS+ shell script, and start a +getty+ program (which provides a login prompt). From c196cbcb21f8ba97c3977fee934307e7b7e87078 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 17 Sep 2024 20:21:18 +0200 Subject: [PATCH 2832/3013] package/libcurl: security bump version to 8.10.0 Changelog: https://curl.se/changes.html#8_10_0 Fixes CVE-2024-8096. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit d68b999787a0e0838c3bb2d5966f11d8a349a49b) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 1d019355015..d0feafde1e4 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.9.1.tar.xz.asc +# https://curl.se/download/curl-8.10.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5 curl-8.9.1.tar.xz +sha256 e6b142f0e85e954759d37e26a3627e2278137595be80e3a860c4353e4335e5a0 curl-8.10.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3661cbf5bd4..681799c6ace 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.9.1 +LIBCURL_VERSION = 8.10.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From e5874289eb66e5880eaa95203f37874cb4afe6a0 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sun, 22 Sep 2024 10:35:22 -0700 Subject: [PATCH 2833/3013] package/libcurl: bump version to 8.10.1 Changelog - https://curl.se/ch/8.10.1.html Signed-off-by: Akhilesh Nema Signed-off-by: Yann E. MORIN (cherry picked from commit 5370103e64384d0111a6bb722a1b1591b12e4a5f) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index d0feafde1e4..4817ec11d60 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.10.0.tar.xz.asc +# https://curl.se/download/curl-8.10.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 e6b142f0e85e954759d37e26a3627e2278137595be80e3a860c4353e4335e5a0 curl-8.10.0.tar.xz +sha256 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee curl-8.10.1.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 681799c6ace..b81e3551951 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.10.0 +LIBCURL_VERSION = 8.10.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 4f96c2851d45e903b8c1fb2f2e5e37bf43f401d8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 23 Sep 2024 19:06:36 +0200 Subject: [PATCH 2834/3013] package/busybox: patch to fix tc build on 6.8+ kernels Fixes a build error introduced by bumping the linux kernel headers to 6.8 with buildroot commit 807a44925697b9567d5bd9872a334a073b3dcf55. No autobuilder failures were recorded with this problem. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit d28d24dbc543cf8365a11582bdf1b8aa0e39bc89) Signed-off-by: Peter Korsgaard --- ...emoved-the-definitions-related-to-CB.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch diff --git a/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch b/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch new file mode 100644 index 00000000000..d997f00e82e --- /dev/null +++ b/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch @@ -0,0 +1,70 @@ +From c4f93565acf3718111cdbaea15e1a8aacf2f44cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Mon, 23 Sep 2024 18:56:00 +0200 +Subject: [PATCH] tc: Fix compilation with Linux v6.8-rc1 + +Linux v6.8-rc1 removed the definitions related to CBQ: +https://github.com/torvalds/linux/commit/33241dca486264193ed68167c8eeae1fb197f3df +making tc fail to build. +Add some #ifdefs to handle this missing support. + +Upstream: http://lists.busybox.net/pipermail/busybox/2024-March/090678.html +Bug report: https://bugs.busybox.net/show_bug.cgi?id=15931 + +Signed-off-by: Bernd Kuhls +--- + networking/tc.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/networking/tc.c b/networking/tc.c +index 3a79fd2d9..d08fd1359 100644 +--- a/networking/tc.c ++++ b/networking/tc.c +@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n) + return 0; + } + #endif ++ ++#ifndef TCA_CBQ_MAX ++/* ++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ. ++ * See https://git.kernel.org/linus/33241dca48626 ++ */ ++#else + static int cbq_print_opt(struct rtattr *opt) + { + struct rtattr *tb[TCA_CBQ_MAX+1]; +@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt) + done: + return 0; + } ++#endif + + static FAST_FUNC int print_qdisc( + const struct sockaddr_nl *who UNUSED_PARAM, +@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + prio_print_opt(tb[TCA_OPTIONS]); ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this qdisc */ + printf("(options for %s)", name); +@@ -442,9 +452,11 @@ static FAST_FUNC int print_class( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/ ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + /* cbq_print_copt() is identical to cbq_print_opt(). */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this class */ + printf("(options for %s)", name); +-- +2.39.5 + From 8f83cdaaff5a5867726c9f73092abe847ccb4532 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sun, 22 Sep 2024 13:57:44 -0700 Subject: [PATCH 2835/3013] package/libpcap: security bump version to 1.10.5 Fixes the following security issues: CVE-2023-7256: Clean up sock_initaddress() and its callers to avoid double frees in some cases. CVE-2024-8006: Fix pcap_findalldevs_ex() not to crash if passed a file:// URL with a path to a directory that cannot be opened. Changelog: https://github.com/the-tcpdump-group/libpcap/blob/bbcbc9174df3298a854daee2b3e666a4b6e5383a/CHANGES Signed-off-by: Akhilesh Nema Signed-off-by: Yann E. MORIN (cherry picked from commit 0982498c6735a2d90b5540370d17e48c31c962bc) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/libpcap/libpcap.hash | 4 ++-- package/libpcap/libpcap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 34339c12619..7f53b99b8ca 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz.sig -sha256 ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f libpcap-1.10.4.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.5.tar.gz.sig +sha256 37ced90a19a302a7f32e458224a00c365c117905c2cd35ac544b6880a81488f0 libpcap-1.10.5.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 3d05590da30..67adb0a9789 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.4 +LIBPCAP_VERSION = 1.10.5 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE From 2113a945cd1b18c7eccb33cdceebc25063e583b9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 25 Sep 2024 19:52:59 +0300 Subject: [PATCH 2836/3013] package/libcurl: drop link-with-openssl workaround Upstream curl commit f057de5a1a950 ("libcurl.pc: add `Requires.private`, `Requires` for static linking") deals with proper pkg-config configuration since version 8.9.0. Our local libcurl.pc modification we added back in commit 61d322c3d258 (package/cURL: fix static link whith openSSL) is no longer needed. Signed-off-by: Baruch Siach [yann.morin.1998@free.fr: this is not a "revert", reword commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit a5cef5339bd26f9d161d080d352d4adfe7627434) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index b81e3551951..9bf7724e7d5 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -190,11 +190,6 @@ LIBCURL_CONF_OPTS += \ --disable-tftp endif -define LIBCURL_FIX_DOT_PC - printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in -endef -LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC) - ifeq ($(BR2_PACKAGE_LIBCURL_CURL),) define LIBCURL_TARGET_CLEANUP rm -rf $(TARGET_DIR)/usr/bin/curl From 8588985bb232061d59fc214d4d95d5df0dcf6171 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:44 +0200 Subject: [PATCH 2837/3013] package/qlibc: fix 'consistent' typo in help text Also add a missing article one line above. Signed-off-by: Peter Korsgaard [Arnout: fix additional typo] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 4390361bb517db2e9764b512304f3de41458c666) Signed-off-by: Peter Korsgaard --- package/qlibc/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qlibc/Config.in b/package/qlibc/Config.in index ad6f1fee552..cbdf5e15c13 100644 --- a/package/qlibc/Config.in +++ b/package/qlibc/Config.in @@ -8,8 +8,8 @@ config BR2_PACKAGE_QLIBC qLibc is currently one of the most functionally complete public licensed C/C++ libraries. The C/C++ library which includes all kinds of containers and general library - routines. It provides ready-made set of common container - APIs with consistant API look. + routines. It provides a ready-made set of common container + APIs with consistent API look. https://github.com/wolkykim/qlibc From e0467347ed39b01c09cee6cd405bd8e24e21b7f5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:45 +0200 Subject: [PATCH 2838/3013] package/qt5: fix 'paths' typo in comment Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 296b54936502a1bfd9e37f65751163be8dd14b0a) Signed-off-by: Peter Korsgaard --- package/qt5/qt5.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 783dbd8c144..21f6a8bc735 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -12,7 +12,7 @@ include $(sort $(wildcard package/qt5/*/*.mk)) # The file "qt.conf" can be used to override the hard-coded paths that are # compiled into the Qt library. We need it to make "qmake" relocatable and -# tweak the per-package install pathes +# tweak the per-package install paths define QT5_INSTALL_QT_CONF rm -f $(HOST_DIR)/bin/qt.conf sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ From d1b3a69a87dd8749bd00d4fe76aa2bfa85fd1229 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:46 +0200 Subject: [PATCH 2839/3013] package/qt5base: fix 'from' typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 53e265522ff758f45839b43d6685e54693b3c91c) Signed-off-by: Peter Korsgaard --- ...ing-compilation-for-obscure-EGLNativeDisplayType-types.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch b/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch index 3621cdb2d35..9e89d8a5cfe 100644 --- a/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch +++ b/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch @@ -27,7 +27,7 @@ It is to be noted, though, that in some ABIs (like x32), the size of a nativeDisplay that is not already a pointer, might be bigger than that of a pointer. There is not much we can do here anyway, since there would be no way to fit that in a void* to begin with, and the build will still -fail for those situations. Those types of ABIs are far frome being +fail for those situations. Those types of ABIs are far from being widespread, the most prominent one, x32, even being retired... To be noted further: a more usual solution (as suggested in QTBUG-72567 From 842eb8b54fdcc77b1655b386dcb0af80cb4b778b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:47 +0200 Subject: [PATCH 2840/3013] package/qt5enginio: fix 'versioning' typo in comment Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 7426aaddeea3da229aa42310cb890cec56e4fbdb) Signed-off-by: Peter Korsgaard --- package/qt5/qt5enginio/qt5enginio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk index a9572db28bc..b74775f298a 100644 --- a/package/qt5/qt5enginio/qt5enginio.mk +++ b/package/qt5/qt5enginio/qt5enginio.mk @@ -4,7 +4,7 @@ # ################################################################################ -# Qt5Enginio does not follow Qt versionning +# Qt5Enginio does not follow Qt versioning # see https://bugreports.qt.io/browse/QTBUG-50111 QT5ENGINIO_VERSION = 1.6.3 QT5ENGINIO_SITE = https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules From 5ab1fb461e90d06ad46d3d5867235851f9aba2f1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:48 +0200 Subject: [PATCH 2841/3013] package/qt5connectivity: fix 'peripherals' typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 6367eb49654f37ee8da58cbc62f6af22f7a22d6d) Signed-off-by: Peter Korsgaard --- package/qt5/qt5connectivity/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 244d01676d1..1ac77d7b320 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_QT5CONNECTIVITY developers using C++. Qt Connectivity module provides support for Bluetooth/NFC - peripherials. + peripherals. https://doc.qt.io/qt-5/qtbluetooth-index.html https://doc.qt.io/qt-5/qtnfc-index.html From c13d79854db10bda6341d2a001d1f507c836ca7d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:49 +0200 Subject: [PATCH 2842/3013] package/qt5virtualkeyboard: fix 'Portuguese' typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit e23e49e5d586755bbaa2c9ea73073433472102b9) Signed-off-by: Peter Korsgaard --- package/qt5/qt5virtualkeyboard/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in index 4cac6fd275d..efe837e5f97 100644 --- a/package/qt5/qt5virtualkeyboard/Config.in +++ b/package/qt5/qt5virtualkeyboard/Config.in @@ -31,7 +31,7 @@ config BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS - Norwegian (nb_NO) - Persian/Farsi (fa_FA) - Polish (pl_PL) - - Portugese (pt_PT) + - Portuguese (pt_PT) - Romanian (ro_RO) - Russian (ru_RU) - Simplified Chinese (zh_CN) From 8e241ea84ffe11cac6e8470f3da1123cdd270d2c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:50 +0200 Subject: [PATCH 2843/3013] package/rapidxml: fix 'compilation' typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit f301c007c70a2bfe26f0098a55f56a19ea61c299) Signed-off-by: Peter Korsgaard --- ...1-ensure-internal-print-operations-are-declared-before.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch b/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch index fcf1b3cce6c..18c42415e1e 100644 --- a/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch +++ b/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch @@ -2,7 +2,7 @@ Stock rapidxml-1.13 does not allow implementers of the `rapidxml_print.hpp` header to build under GCC 4.7 (or newer) due to -compliation issues. This is a result of "Name lookup changes" introduced +compilation issues. This is a result of "Name lookup changes" introduced in GCC 4.7 [1]. The following adds forward declarations required to compile with GCC 4.7+. From 78ea2e4ccd1e5b636d3bfbfeb04487c1fbe894b9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:51 +0200 Subject: [PATCH 2844/3013] package/rapidxml: fix 'usability' typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit d21e6f815df3a1814b752b9b48c99b13903f3239) Signed-off-by: Peter Korsgaard --- package/rapidxml/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rapidxml/Config.in b/package/rapidxml/Config.in index 76b2248ec27..9b6ee748448 100644 --- a/package/rapidxml/Config.in +++ b/package/rapidxml/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_RAPIDXML bool "rapidxml" help RapidXml is an attempt to create the fastest XML parser - possible, while retaining useability, portability and + possible, while retaining usability, portability and reasonable W3C compatibility. It is an in-situ parser with parsing speed approaching speed of strlen function executed on the same data. From d034b179ea674d23907866a2df2cac720f26dc75 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:52 +0200 Subject: [PATCH 2845/3013] package/redis: fix 'defaults' typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1e37c852a5a15978ba4b2dbc4f6630ad585c8334) Signed-off-by: Peter Korsgaard --- .../redis/0003-redis.conf-adjust-defauts-for-buildroot.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch b/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch index 6ad81a493d2..c1fc8acf6f6 100644 --- a/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch +++ b/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch @@ -1,7 +1,7 @@ From f79d1d1bf9e6f54b67e5482602084fbff7fd9cc9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 12:50:34 -0300 -Subject: [PATCH] redis.conf: adjust defauts for buildroot +Subject: [PATCH] redis.conf: adjust defaults for buildroot Based on Martin Bark's patch hence archlinux package. We just need to specify a proper db directory. From 427efc1cd1128b7df531ea12c27cb9419d2ee7a3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:53 +0200 Subject: [PATCH 2846/3013] package/rlwrap: fix 'whether' typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1441be898a8b335600f9f2219051c3d50b6ee523) Signed-off-by: Peter Korsgaard --- package/rlwrap/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rlwrap/Config.in b/package/rlwrap/Config.in index 4e18dfde526..a8afc3b5f63 100644 --- a/package/rlwrap/Config.in +++ b/package/rlwrap/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_RLWRAP_SPY_ON_READLINE If we want to keep the display tidy when re-sizing the terminal window or printing multi-line prompts, we have to know whether or not readline is in horizontal-scroll-mode - (i.e. wheter long lines are scrolled or wrapped). At present, + (i.e. whether long lines are scrolled or wrapped). At present, this involves a look at a private readline variable - if you feel guilty about that, disable this option From 9f7e74ca533cb4d4b66c2a780938a639a8ae6edd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:54 +0200 Subject: [PATCH 2847/3013] package/rpi-firmware: fix 'partition' typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 0dffd8ab1ce0d7d2b47f5c1f1320265a0e5d4cb4) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index a9aeaed745c..f99c116ca22 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -66,14 +66,14 @@ config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_DB config BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE string "Path to a file stored as boot/config.txt" help - Path to a file stored as config.txt in the boot partiton + Path to a file stored as config.txt in the boot partition of the generated SD card image. config BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE string "Path to a file stored as boot/cmdline.txt" default "board/raspberrypi/cmdline.txt" # legacy help - Path to a file stored as cmdline.txt in the boot partiton + Path to a file stored as cmdline.txt in the boot partition of the generated SD card image. config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS From d797a2f2b3d5ae2b88a547b469bddfeaf048f1ce Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:55 +0200 Subject: [PATCH 2848/3013] package/selinux-python: fix 'family' typo in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 70ded7c2127e80d89a150bcf1c891c90093c5978) Signed-off-by: Peter Korsgaard --- .../selinux-python/0001-python-sepolgen-fix-ausearch-path.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch b/package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch index 31c5013d69c..7a1cf9b3864 100644 --- a/package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch +++ b/package/selinux-python/0001-python-sepolgen-fix-ausearch-path.patch @@ -19,7 +19,7 @@ tools are only ever going to run on a Linux host (by their virtue of dealing with SELinux), so the search will be reliably done by looking in PATH, so we can let Popen() bubble the resolving of an unqualified command, down to execvpe() (or the similar actual syscall of the exec*() -familly). If ausearch is then not found, Popen() raises an exception +family). If ausearch is then not found, Popen() raises an exception that is wy more informative then: FileNotFoundError: [Errno 2] No such file or directory: 'ausearch' From eaac12e842dd1767e912c0011766c8355b74cc6d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:56 +0200 Subject: [PATCH 2849/3013] package/skeleton-init-systemd: fix "won't" typo in comment Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit eb83f8e09a28e4ca978cb02b20c54e350bd71614) Signed-off-by: Peter Korsgaard --- package/skeleton-init-systemd/fakeroot_tmpfiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/skeleton-init-systemd/fakeroot_tmpfiles.sh b/package/skeleton-init-systemd/fakeroot_tmpfiles.sh index 9498638f0be..8c28ccfa14a 100755 --- a/package/skeleton-init-systemd/fakeroot_tmpfiles.sh +++ b/package/skeleton-init-systemd/fakeroot_tmpfiles.sh @@ -16,7 +16,7 @@ # such an specifier to prevent leaking host information. # # shell expansion is critical to be POSIX compliant, -# this script wont work with zsh in its default mode for example. +# this script won't work with zsh in its default mode for example. # # The script takes several measures to handle more complex stuff # like passing this correctly: From 606d7566298c583d3201e53d767cf37884d82126 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:57 +0200 Subject: [PATCH 2850/3013] package/slirp: fix typos in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 6183d8f494632cc64ae0ff6b2fffd05d0ceb9784) Signed-off-by: Peter Korsgaard --- package/slirp/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/slirp/Config.in b/package/slirp/Config.in index 38fd5277af3..57058dcd3b6 100644 --- a/package/slirp/Config.in +++ b/package/slirp/Config.in @@ -12,8 +12,8 @@ config BR2_PACKAGE_SLIRP NOTE: This package has some history of a unique kind: - - originally developped as 'slirp' by Danny Gasparovski, and - seemingly abandonned (developper /disapeared/) + - originally developed as 'slirp' by Danny Gasparovski, and + seemingly abandoned (developer /disappeared/) - then re-maintained at sourceforge by "Kelly", up to some time around 2009: http://slirp.sourceforge.net/ - during that period, QEMU (Fabrice BELLARD) forked the code From 8a66521a6cf19a0f7f9bbdc038a3c6057dc07f93 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:58 +0200 Subject: [PATCH 2851/3013] package/smcroute: fix 'assume' typo Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit d6f90873eb5d526ae07d976e0ba3063c79cdf346) Signed-off-by: Peter Korsgaard --- package/smcroute/smcroute.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index f7476f1100a..f8866f6672d 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -30,7 +30,7 @@ endef SMCROUTE_POST_INSTALL_TARGET_HOOKS += SMCROUTE_PRUNE_COMPAT_SCRIPT -# We will asume that CONFIG_NET and CONFIG_INET are already +# We will assume that CONFIG_NET and CONFIG_INET are already # set in the kernel configuration provided by the user. define SMCROUTE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_IP_MULTICAST) From b5df684e0727b403b16bfb6bd4610dd2f17de5b3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:23:59 +0200 Subject: [PATCH 2852/3013] package/socat: fix 'incompatible' typo in comment Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 4c5d82ea058edd74a5423f621543f9cffb162179) Signed-off-by: Peter Korsgaard --- package/socat/socat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 1e2880c028d..7f634c28f09 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -36,7 +36,7 @@ endif # automake, so we can't use the normal autoreconf logic. SOCAT_DEPENDENCIES = host-autoconf -# incompatibile license (GPL-3.0+) +# incompatible license (GPL-3.0+) SOCAT_CONF_OPTS = --disable-readline ifeq ($(BR2_PACKAGE_LIBOPENSSL):$(BR2_STATIC_LIBS),y:) From 70f8b08042a505fd767a26a4c16afa5b504277b1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:24:00 +0200 Subject: [PATCH 2853/3013] package/softether: fix typos in patch description Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5af5c0ac0b6057d1c4fe1dc6c6ec208c4fea8a10) Signed-off-by: Peter Korsgaard --- package/softether/0003-use-fhs-install-directories.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/softether/0003-use-fhs-install-directories.patch b/package/softether/0003-use-fhs-install-directories.patch index ba00d9b6768..f3da52c44f5 100644 --- a/package/softether/0003-use-fhs-install-directories.patch +++ b/package/softether/0003-use-fhs-install-directories.patch @@ -7,8 +7,8 @@ Install to `/usr/sbin`, `/usr/lib`, and `/var/lib` according to the Linux filesystem hierarchy standard if SoftEther is built through autotools. In a managed installation, the FHS stipulates that the application must -accomodate a read-only installation path. This requires a new `GetStateDir` -function that substitues `GetExeDir` in some parts of the code. +accommodate a read-only installation path. This requires a new `GetStateDir` +function that substitutes `GetExeDir` in some parts of the code. Taken from Github at https://github.com/dajhorn/SoftEtherVPN/commit/b9420c3bfc2a8b9d35d0c8e5f6849007c2bc21fa. From 972e56bdafeff0770ccf7d5a25417863d40afdce Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:24:01 +0200 Subject: [PATCH 2854/3013] package/sqlite: fix 'access' typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 930663032b94bf5a26ca5e0efc582b9ab57cc677) Signed-off-by: Peter Korsgaard --- package/sqlite/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 0ae9878d7b5..ce1e369b20c 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -20,7 +20,7 @@ config BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA bool "Enable convenient access to meta-data about tables and queries" help When this option is defined there are some additional APIs - enabled to acces meta-data about tables and queries (see + enabled to access meta-data about tables and queries (see https://sqlite.org/compile.html). config BR2_PACKAGE_SQLITE_ENABLE_FTS3 From 04ca8a7e73d98082a567eadfec7582d31473254b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:24:02 +0200 Subject: [PATCH 2855/3013] package/stress-ng: fix 'correctly' typo in comment Also fix conjugations of verbs. Signed-off-by: Peter Korsgaard [Arnout: fix additional typoes] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 3c4dd46791dfa7f599d132d2d6f00f3bf57fd081) Signed-off-by: Peter Korsgaard --- package/stress-ng/stress-ng.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 04427f70ecf..488a998cb81 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -28,9 +28,9 @@ define STRESS_NG_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(STRESS_NG_MAKE_FLAGS) endef -# Don't use make install otherwise stress-ng will be rebuild without -# required link libraries if any. Furthermore, using INSTALL allow to -# set the file permission correcly on the target. +# Don't use make install otherwise stress-ng will be rebuilt without +# required link libraries if any. Furthermore, using INSTALL allows to +# set the file permission correctly on the target. define STRESS_NG_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/stress-ng $(TARGET_DIR)/usr/bin/stress-ng endef From e0f78310ece297ef31a7032cee9f7da0c8a54345 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:24:03 +0200 Subject: [PATCH 2856/3013] package/supertux: fix 'according' typo in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit b55759c516b6f18f30b9e0bd185b414c56a62df8) Signed-off-by: Peter Korsgaard --- package/supertux/supertux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/supertux/supertux.mk b/package/supertux/supertux.mk index 3941632f51b..ef930b2fcdd 100644 --- a/package/supertux/supertux.mk +++ b/package/supertux/supertux.mk @@ -58,7 +58,7 @@ endif # context-sensitive by cpp. SDL_cpuinfo.h is included by SDL.h. # Including altivec.h makes arbitrary code break." # -# Acording to a bug report in GCC [1]: +# According to a bug report in GCC [1]: # "You need to use -std=g++11 or undefine bool after the include of altivec.h # as context sensitive keywords is not part of the C++11 standard". # So use gnu++11 instead of c++11 only for altivec system. From f3dae29d0344645c5cacdf0ecf4a9958788a55ff Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:24:04 +0200 Subject: [PATCH 2857/3013] package/sysklogd: fix typos in help text Signed-off-by: Peter Korsgaard [Arnout: fix additional 'recommended' typo] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 74bef5945f48fea2a863a456fa21271d136ed189) Signed-off-by: Peter Korsgaard --- package/sysklogd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index c9b9fe8c357..7c457fb25ea 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -43,9 +43,9 @@ config BR2_PACKAGE_SYSKLOGD_LOGGER help Generate log messages from scripts or from the command line. - This version of logger is receommended for use with sysklogd. + This version of logger is recommended for use with sysklogd. It makes use of the new syslogp() API for RFC5424 style logs, - e.g. MSGID, strucutred data (SD), etc. + e.g. MSGID, structured data (SD), etc. The BusyBox, or util-linux, logger tools can also be used, but are limited to RFC3164 style messages. From ee3155d7799a3d81dd296ecaa2614030ac8fce6e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Sep 2024 14:24:05 +0200 Subject: [PATCH 2858/3013] package/systemd: fix typos in help text Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 09964bc5c0f8b329cda6383a1297029354269da9) Signed-off-by: Peter Korsgaard --- package/systemd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 345f08590e7..d9545e9db04 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -99,7 +99,7 @@ menuconfig BR2_PACKAGE_SYSTEMD Notice that systemd selects the fsck wrapper from util-linux but no particular fsck. is selected. You must choose - the apropriate ones (e.g. e2fsck, from the e2fsprogs + the appropriate ones (e.g. e2fsck, from the e2fsprogs package) according to the system configuration. https://freedesktop.org/wiki/Software/systemd/ @@ -212,7 +212,7 @@ config BR2_PACKAGE_SYSTEMD_PSTORE help When this features is enabled, additional tools and services are built to support archiving contents of the persistent - storage filesytem. + storage filesystem. https://www.freedesktop.org/software/systemd/man/systemd-pstore.html From b42f1ddcc7827d7df8e9f281539d3746beabd07b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 1 Oct 2024 21:33:24 +0200 Subject: [PATCH 2859/3013] package/php: security bump version to 8.3.12 Removed patch which is included in this release. Fixes CVE-2024-8926, CVE-2024-8927, CVE-2024-9026, and CVE-2024-8925. Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/438 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit a2da88519fc1f96e517171dfb053aca8c00f7daf) Signed-off-by: Peter Korsgaard --- ...onfigure-check-for-aarch64-CRC32-API.patch | 56 ------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch diff --git a/package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch b/package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch deleted file mode 100644 index 46e6558dcde..00000000000 --- a/package/php/0006-Autotools-fix-configure-check-for-aarch64-CRC32-API.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5947db6bb8e336252337fb0194c3b8e834d100b6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 25 Aug 2024 18:00:29 +0200 -Subject: [PATCH] Fix GH-15587: Autotools: fix configure check for aarch64 - CRC32 API - -On arm32 bit the check succeeds leading to a build error later on: - -/home/autobuild/autobuild/instance-3/output-1/build/php-8.3.10/ext/standard/crc32.c:70:12: - error: 'armv8-a' does not support feature 'nothing' - 70 | # pragma GCC target ("+nothing+crc") - -Upstream: https://github.com/php/php-src/commit/5947db6bb8e336252337fb0194c3b8e834d100b6 - -Co-authored-by: Thomas Petazzoni -[http://lists.busybox.net/pipermail/buildroot/2024-August/761151.html] -Signed-off-by: Bernd Kuhls ---- - configure.ac | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1142c9459d71..fb59a81700f4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -738,11 +738,25 @@ AC_FUNC_ALLOCA - PHP_TIME_R_TYPE - PHP_CHECK_IN_ADDR_T - --AC_CACHE_CHECK([for aarch64 CRC32 API], ac_cv_func___crc32d, --[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[__crc32d(0, 0);]])],[ac_cv_func___crc32d=yes],[ac_cv_func___crc32d="no"])]) --if test "$ac_cv_func___crc32d" = "yes"; then -- AC_DEFINE([HAVE_AARCH64_CRC32], [1], [Define when aarch64 CRC32 API is available.]) --fi -+AC_CACHE_CHECK([for aarch64 CRC32 API], [ac_cv_func___crc32d], -+[AC_LINK_IFELSE([AC_LANG_PROGRAM([ -+#include -+# if defined(__GNUC__) -+# if!defined(__clang__) -+# pragma GCC push_options -+# pragma GCC target ("+nothing+crc") -+# elif defined(__APPLE__) -+# pragma clang attribute push(__attribute__((target("crc"))), apply_to=function) -+# else -+# pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function) -+# endif -+# endif -+], [__crc32d(0, 0);])], -+[ac_cv_func___crc32d=yes], -+[ac_cv_func___crc32d=no])]) -+AS_VAR_IF([ac_cv_func___crc32d], [yes], -+ [AC_DEFINE([HAVE_AARCH64_CRC32], [1], -+ [Define to 1 when aarch64 CRC32 API is available.])]) - - dnl Check for asm goto support. - AC_CACHE_CHECK([for asm goto], ac_cv__asm_goto, diff --git a/package/php/php.hash b/package/php/php.hash index 7df051df4e0..3110e205eff 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 b862b098a08ab9bf4b36ed12c7d0d9f65353656b36fb0e3c5344093aceb35802 php-8.3.11.tar.xz +sha256 f774e28633e26fc8c5197f4dae58ec9e3ff87d1b4311cbc61ab05a7ad24bd131 php-8.3.12.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index d7788107c18..32029023221 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.11 +PHP_VERSION = 8.3.12 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 615ab9a6c150aba4081a14eb4e58e62e22308eef Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Tue, 1 Oct 2024 09:53:01 +0200 Subject: [PATCH 2860/3013] package/pure-ftpd: bump version to 1.0.52 This version fixes an out-of-bound reads in the MLSD command, so upgrading is recommended. It also improves compatibility with various systems. Update the COPYING hash because of a change in copyright year Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard (cherry picked from commit 5271e90a6a2cc7633f3f917391865d2f9df54142) Signed-off-by: Peter Korsgaard --- package/pure-ftpd/pure-ftpd.hash | 4 ++-- package/pure-ftpd/pure-ftpd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pure-ftpd/pure-ftpd.hash b/package/pure-ftpd/pure-ftpd.hash index 4cbbfa15ad6..2c7a1849ff7 100644 --- a/package/pure-ftpd/pure-ftpd.hash +++ b/package/pure-ftpd/pure-ftpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 622360b86c60b563abe0e994f0a86cfe5ccfde597b29a14b0a79b6e5aa05a304 pure-ftpd-1.0.51.tar.bz2 -sha256 88c813191c1a59213c641e322cf4562618ab0116ddd7c8341c419f8863b8b0a9 COPYING +sha256 b3b879468275e0344555458c8e62465dcf525205ecf9ad78c3f208557d0c1947 pure-ftpd-1.0.52.tar.bz2 +sha256 1ec531b1bc4035019545d6a83e260a5a56d3a6bec52895393e9f25965e608e85 COPYING diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index 2c01bc8804f..fb247f51cae 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PURE_FTPD_VERSION = 1.0.51 +PURE_FTPD_VERSION = 1.0.52 PURE_FTPD_SITE = https://download.pureftpd.org/pub/pure-ftpd/releases PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC From b90349589c4562a7978cc306b9fb2da827c4bfb6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 17 Sep 2024 20:21:52 +0200 Subject: [PATCH 2861/3013] package/expat: security bump version to 2.6.3 Changelog: https://github.com/libexpat/libexpat/blob/R_2_6_3/expat/Changes Fixes CVE-2024-45490, CVE-2024-45491 & CVE-2024-45492. Follow upstream switch of project repository to github: https://sourceforge.net/p/expat/news/2022/01/project-moved-to-github/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 0509885d8dc221978fd332f9768b427ed2775942) Signed-off-by: Peter Korsgaard --- package/expat/Config.in | 2 +- package/expat/expat.hash | 6 +----- package/expat/expat.mk | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/expat/Config.in b/package/expat/Config.in index 758fb7d5166..c227912b039 100644 --- a/package/expat/Config.in +++ b/package/expat/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_EXPAT help The Expat XML Parser. - http://expat.sourceforge.net + https://libexpat.github.io/ diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 63890b54df2..e40b250ba03 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,3 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.6.2/ -md5 0cb75c8feb842c0794ba89666b762a2d expat-2.6.1.tar.xz -sha1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd expat-2.6.1.tar.xz - # Locally calculated -sha256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz +sha256 274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc expat-2.6.3.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c6b7fc8b44f..f5c6175f282 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,8 +4,8 @@ # ################################################################################ -EXPAT_VERSION = 2.6.2 -EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) +EXPAT_VERSION = 2.6.3 +EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION)) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES EXPAT_LICENSE = MIT From 87803da53c08a768c82bdc07e8b6279ae6d65fa6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 17 Sep 2024 20:21:53 +0200 Subject: [PATCH 2862/3013] package/python3: security bump version to 3.12.6 Release notes: https://www.python.org/downloads/release/python-3126/ Fixes CVE-2023-27043, CVE-2024-6232, CVE-2024-7592 & CVE-2024-8088. The fixes for bundled libexpat are irrelevant for us because python3 depends on the buildroot package. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d4cbc887a3bc6df8bf5d7c1a2a8bae349c275228) Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index d680a96810c..0cd852c3259 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3125/ -md5 02c7d269e077f4034963bba6befdc715 Python-3.12.5.tar.xz +# From https://www.python.org/downloads/release/python-3126/ +md5 cb669514937d3e894e74081627722aa5 Python-3.12.6.tar.xz # Locally computed -sha256 fa8a2e12c5e620b09f53e65bcd87550d2e5a1e2e04bf8ba991dcc55113876397 Python-3.12.5.tar.xz +sha256 1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c Python-3.12.6.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index b31e6df141b..4b328f70fb0 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).5 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From cc40eeb370f725c27f5ea98b29dadcc6ef577de1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 17 Sep 2024 20:22:27 +0200 Subject: [PATCH 2863/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d3a12bc6f1fc231948d1b6b154dd890bf6df4fa5) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index b4e88214d62..e8c0722de0f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.10" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 5c745f7c7cd..8f369e5f36c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 a4489b70e0a7c2dc8f501b9cd7fc76989be2febb5519e163ecf816064f2f6858 linux-6.10.9.tar.xz -sha256 c065e36daf28210060c91a37ef3e92ac5814784e634577e04e406297ead2e86e linux-6.6.50.tar.xz -sha256 732ff40ac63642c5ddbb7d65c24c90ed08b95af0e8c92df4739e9703eec01ac1 linux-6.1.109.tar.xz +sha256 e687e735b5eb9efb6d67b42433c93fc9118106a995514f062652873b5e809bcd linux-6.10.10.tar.xz +sha256 1c0c9a14650879c4913efdbac428ba31a540c3d987155ddf34d33e11eca008b3 linux-6.6.51.tar.xz +sha256 9ebe34b4742f8c9104678f32a6bc20e91299ebac2ae607ff2ed137d928df8f6a linux-6.1.110.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e56caae259b85b7685ee589075d58bb7b227024497a60fa27a7b43e0b48839cf linux-5.15.166.tar.xz -sha256 85d7bf3a807538b9032e3f798ab978da9b77352bcb526534038c351a4f39e01c linux-5.10.225.tar.xz -sha256 250c6a3199b42a1cb1427c9bbeacf5d90fb91bcf9f227195f484a1c877e1f797 linux-5.4.283.tar.xz +sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz +sha256 f6a19a64785965b9fcac0bcb6fd2412b45ca449495bb03592d46f9a50be51ca6 linux-5.10.226.tar.xz +sha256 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b linux-5.4.284.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 f13aa1465a2578a910f64b65d743d167466edfb1e0671bc70fa2328cb66b06d9 linux-4.19.321.tar.xz +sha256 4e27cdf999359876a0ff489bff6ece7ba5798ff37c2289db0c9e9422a9014162 linux-4.19.322.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 003c2f6a66d..067c3b96aa3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -423,13 +423,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.321" if BR2_KERNEL_HEADERS_4_19 - default "5.4.283" if BR2_KERNEL_HEADERS_5_4 - default "5.10.225" if BR2_KERNEL_HEADERS_5_10 - default "5.15.166" if BR2_KERNEL_HEADERS_5_15 - default "6.1.109" if BR2_KERNEL_HEADERS_6_1 - default "6.6.50" if BR2_KERNEL_HEADERS_6_6 - default "6.10.9" if BR2_KERNEL_HEADERS_6_10 + default "4.19.322" if BR2_KERNEL_HEADERS_4_19 + default "5.4.284" if BR2_KERNEL_HEADERS_5_4 + default "5.10.226" if BR2_KERNEL_HEADERS_5_10 + default "5.15.167" if BR2_KERNEL_HEADERS_5_15 + default "6.1.110" if BR2_KERNEL_HEADERS_6_1 + default "6.6.51" if BR2_KERNEL_HEADERS_6_6 + default "6.10.10" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 63093d7db00ad7febb0da6db3d360bd0d9dad938 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Aug 2024 20:20:41 +0200 Subject: [PATCH 2864/3013] package/samba4: bump version to 4.20.4 Release notes: https://www.samba.org/samba/history/samba-4.20.4.html Signed-off-by: Bernd Kuhls Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni (cherry picked from commit b5fe7088e842aaaed1730f2d50d60e514e052105) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index d2512f2e0a8..71fe862901e 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.20.3.tar.asc -sha256 afd5a9bb03e5c921c4c1d4e4b4fa6ea16cf798d94e5e5bffb9fd61716641cf30 samba-4.20.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.20.4.tar.asc +sha256 3a92e97eaeb345b6b32232f503e14d34f03a7aa64c451fe8c258a11bbda908e5 samba-4.20.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index d48a02140f1..f08303a3468 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.20.3 +SAMBA4_VERSION = 4.20.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 1ede9257ccbd3d072da0dd8cc6dffebd354b084e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 17 Sep 2024 20:20:42 +0200 Subject: [PATCH 2865/3013] package/samba4: bump version to 4.20.5 Release notes: https://www.samba.org/samba/history/samba-4.20.5.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b52c204e6f108949f88d35cdb0d26b21668b47f3) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 71fe862901e..2c867a03bfe 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.20.4.tar.asc -sha256 3a92e97eaeb345b6b32232f503e14d34f03a7aa64c451fe8c258a11bbda908e5 samba-4.20.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.20.5.tar.asc +sha256 0697a8a57ff8b268cc268d508ee4f9ec86fd82350e84eba47a709242b71f6962 samba-4.20.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index f08303a3468..4cece4b4774 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.20.4 +SAMBA4_VERSION = 4.20.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From a8f70006e7a73d7579c380fa142530331fbc0a1d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 30 Sep 2024 11:10:41 -0600 Subject: [PATCH 2866/3013] package/cups: security bump to version 2.4.11 Fixes the following security issue: CVE-2024-35235: Cupsd Listen arbitrary chmod 0140777 https://github.com/OpenPrinting/cups/security/advisories/GHSA-vvwp-mv6j-hw6f https://www.openwall.com/lists/oss-security/2024/06/11/1 Drop cups hash patches which are now upstream. Rebase remaining patches. Signed-off-by: James Hilliard [Peter: mark as security bump] Signed-off-by: Peter Korsgaard (cherry picked from commit 8d835ffc524e2dab66ce1421240b9eb93c8f8f6a) Signed-off-by: Peter Korsgaard --- ...move-man-from-BUILDDIRS-in-configure.patch | 7 +- package/cups/0002-Do-not-use-genstrings.patch | 8 +- ...03-Sanitize-the-installation-process.patch | 20 +- ...0004-Remove-PIE-flags-from-the-build.patch | 8 +- ...-support-for-MacOS-Win-SSL-libs-back.patch | 349 ------------------ ...sion-does-not-support-several-hashes.patch | 30 -- package/cups/cups.hash | 2 +- package/cups/cups.mk | 2 +- 8 files changed, 23 insertions(+), 403 deletions(-) delete mode 100644 package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch delete mode 100644 package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch diff --git a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch index 6b81a93de2d..30c3ddb48f5 100644 --- a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +++ b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch @@ -1,4 +1,4 @@ -From 6bc1d15250841cf17d307cfb4f35c960c23d8797 Mon Sep 17 00:00:00 2001 +From d3c595f551d2efc516c879fd6553263bed5c1aac Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 29 May 2016 19:31:50 +0200 Subject: [PATCH] Remove man from BUILDDIRS in configure @@ -15,7 +15,7 @@ Signed-off-by: Angelo Compagnucci 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 -index 3a162b6d5..fb629fdfd 100644 +index 613f01ddf..6f1bcb07e 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -462,7 +462,7 @@ LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)" @@ -27,7 +27,6 @@ index 3a162b6d5..fb629fdfd 100644 ], [core], [ BUILDDIRS="tools examples locale" ], [corelite], [ - -- -2.17.1 +2.34.1 diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch index c7d6735b5f0..d3edca29959 100644 --- a/package/cups/0002-Do-not-use-genstrings.patch +++ b/package/cups/0002-Do-not-use-genstrings.patch @@ -1,4 +1,4 @@ -From 193c8d8c55a3478ca5c9e161ce581e5794098c6d Mon Sep 17 00:00:00 2001 +From e028ca535e4150f53cd10a2deeb57b12be79fc8c Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Thu, 21 Jan 2016 23:04:49 +0100 Subject: [PATCH] Do not use genstrings @@ -23,10 +23,10 @@ Signed-off-by: Michael Trimarchi 1 file changed, 2 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index 32e2e0b..7b18879 100644 +index e36ed1190..d42d7e64e 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -186,8 +186,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ +@@ -187,8 +187,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -36,5 +36,5 @@ index 32e2e0b..7b18879 100644 # -- -2.17.1 +2.34.1 diff --git a/package/cups/0003-Sanitize-the-installation-process.patch b/package/cups/0003-Sanitize-the-installation-process.patch index 75a68487c6a..418653cfba9 100644 --- a/package/cups/0003-Sanitize-the-installation-process.patch +++ b/package/cups/0003-Sanitize-the-installation-process.patch @@ -1,4 +1,4 @@ -From e35f809c435c224954a5c7bff3f5729c5b3bc0ba Mon Sep 17 00:00:00 2001 +From 61177952e054be9569ce011218ab032c03b4db5a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 21 Jan 2016 23:21:06 +0100 Subject: [PATCH] Sanitize the installation process @@ -30,10 +30,10 @@ Signed-off-by: Olivier Schonken 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Makedefs.in b/Makedefs.in -index 3afef0a..3e4f1bd 100644 +index a2342d5c0..0d8df733b 100644 --- a/Makedefs.in +++ b/Makedefs.in -@@ -40,14 +40,14 @@ SHELL = /bin/sh +@@ -46,14 +46,14 @@ SHELL = /bin/sh # Installation programs... # @@ -55,10 +55,10 @@ index 3afef0a..3e4f1bd 100644 # # Default user, group, and system groups for the scheduler... diff --git a/conf/Makefile b/conf/Makefile -index 933d7d9..6ac5e19 100644 +index 62aa0c6fd..3cced869c 100644 --- a/conf/Makefile +++ b/conf/Makefile -@@ -72,11 +72,11 @@ install: all install-data install-headers install-libs install-exec +@@ -67,11 +67,11 @@ install: all install-data install-headers install-libs install-exec install-data: for file in $(KEEP); do \ if test -r $(SERVERROOT)/$$file ; then \ @@ -74,10 +74,10 @@ index 933d7d9..6ac5e19 100644 $(INSTALL_DIR) -m 755 $(DATADIR)/mime for file in $(REPLACE); do \ diff --git a/notifier/Makefile b/notifier/Makefile -index 3206dd0..c34a4d7 100644 +index fa2c7f2f7..34f7a0d6b 100644 --- a/notifier/Makefile +++ b/notifier/Makefile -@@ -62,7 +62,7 @@ install: all install-data install-headers install-libs install-exec +@@ -57,7 +57,7 @@ install: all install-data install-headers install-libs install-exec # install-data: @@ -87,10 +87,10 @@ index 3206dd0..c34a4d7 100644 # diff --git a/scheduler/Makefile b/scheduler/Makefile -index 251f017..25f2f5f 100644 +index 57b169387..aefa89719 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile -@@ -146,28 +146,27 @@ install-data: +@@ -142,28 +142,27 @@ install-data: echo Creating $(SERVERBIN)/driver... $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver echo Creating $(SERVERROOT)... @@ -127,5 +127,5 @@ index 251f017..25f2f5f 100644 echo Installing init scripts...; \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ -- -2.6.4 +2.34.1 diff --git a/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/package/cups/0004-Remove-PIE-flags-from-the-build.patch index c2765dff094..e4081d0e070 100644 --- a/package/cups/0004-Remove-PIE-flags-from-the-build.patch +++ b/package/cups/0004-Remove-PIE-flags-from-the-build.patch @@ -1,4 +1,4 @@ -From b341a1e1fce48012fc5bcf39337488fd33210616 Mon Sep 17 00:00:00 2001 +From 212275de62cd42ef71bbd37cebd9da6266ca5f15 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Jul 2016 12:20:21 +0200 Subject: [PATCH] Remove PIE flags from the build @@ -20,10 +20,10 @@ Signed-off-by: Michael Trimarchi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makedefs.in b/Makedefs.in -index 5f1d32f..d669ea8 100644 +index 0d8df733b..2560c0c36 100644 --- a/Makedefs.in +++ b/Makedefs.in -@@ -155,7 +155,7 @@ ALL_CXXFLAGS = -I.. -D_CUPS_SOURCE $(CXXFLAGS) \ +@@ -156,7 +156,7 @@ ALL_CXXFLAGS = -I.. -D_CUPS_SOURCE $(CXXFLAGS) \ $(ONDEMANDFLAGS) $(OPTIONS) ALL_DSOFLAGS = -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM) ALL_LDFLAGS = -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS) \ @@ -33,5 +33,5 @@ index 5f1d32f..d669ea8 100644 ARFLAGS = @ARFLAGS@ BACKLIBS = @BACKLIBS@ -- -2.17.1 +2.34.1 diff --git a/package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch b/package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch deleted file mode 100644 index 57c6b61437d..00000000000 --- a/package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch +++ /dev/null @@ -1,349 +0,0 @@ -From c6cd5e9c10edc68caf6936a3d3274f758e9cd03d Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Tue, 3 Oct 2023 13:59:40 +0200 -Subject: [PATCH] cups/hash.c: Put support for MacOS/Win SSL libs back - -- I mustn't remove their support in patch release - this should happen in -2.5 only. -- I have put back support for several hashes as well - they -should be removed in 2.5. -- restrict usage of second block hashing only if OpenSSL/LibreSSL/GnuTLS - is available - -Upstream: https://github.com/OpenPrinting/cups/commit/c6cd5e9c10edc68caf6936a3d3274f758e9cd03d -Signed-off-by: Fabrice Fontaine ---- - cups/hash.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 260 insertions(+), 11 deletions(-) - -diff --git a/cups/hash.c b/cups/hash.c -index 93ca552c8..c447bab4e 100644 ---- a/cups/hash.c -+++ b/cups/hash.c -@@ -12,8 +12,13 @@ - #include "md5-internal.h" - #ifdef HAVE_OPENSSL - # include --#else // HAVE_GNUTLS -+#elif defined(HAVE_GNUTLS) - # include -+#elif __APPLE__ -+# include -+#elif _WIN32 -+# include -+# include - #endif // HAVE_OPENSSL - - -@@ -193,17 +198,18 @@ hash_data(const char *algorithm, // I - Algorithm - const void *b, // I - Second block or `NULL` for none - size_t blen) // I - Length of second block or `0` for none - { -+#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS) - unsigned hashlen; // Length of hash - unsigned char hashtemp[64]; // Temporary hash buffer --#ifdef HAVE_OPENSSL -- const EVP_MD *md = NULL; // Message digest implementation -- EVP_MD_CTX *ctx; // Context --#else // HAVE_GNUTLS -- gnutls_digest_algorithm_t alg = GNUTLS_DIG_UNKNOWN; -- // Algorithm -- gnutls_hash_hd_t ctx; // Context --#endif // HAVE_OPENSSL -+#else -+ if (strcmp(algorithm, "md5") && (b || blen != 0)) -+ { -+ // Second block hashing is not supported without OpenSSL or GnuTLS -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unsupported without GnuTLS or OpenSSL/LibreSSL."), 1); - -+ return (-1); -+ } -+#endif - - if (!strcmp(algorithm, "md5")) - { -@@ -223,6 +229,10 @@ hash_data(const char *algorithm, // I - Algorithm - } - - #ifdef HAVE_OPENSSL -+ const EVP_MD *md = NULL; // Message digest implementation -+ EVP_MD_CTX *ctx; // Context -+ -+ - if (!strcmp(algorithm, "sha")) - { - // SHA-1 -@@ -244,6 +254,14 @@ hash_data(const char *algorithm, // I - Algorithm - { - md = EVP_sha512(); - } -+ else if (!strcmp(algorithm, "sha2-512_224")) -+ { -+ md = EVP_sha512_224(); -+ } -+ else if (!strcmp(algorithm, "sha2-512_256")) -+ { -+ md = EVP_sha512_256(); -+ } - - if (md) - { -@@ -262,7 +280,13 @@ hash_data(const char *algorithm, // I - Algorithm - return ((ssize_t)hashlen); - } - --#else // HAVE_GNUTLS -+#elif defined(HAVE_GNUTLS) -+ gnutls_digest_algorithm_t alg = GNUTLS_DIG_UNKNOWN; // Algorithm -+ gnutls_hash_hd_t ctx; // Context -+ unsigned char temp[64]; // Temporary hash buffer -+ size_t tempsize = 0; // Truncate to this size? -+ -+ - if (!strcmp(algorithm, "sha")) - { - // SHA-1 -@@ -284,9 +308,32 @@ hash_data(const char *algorithm, // I - Algorithm - { - alg = GNUTLS_DIG_SHA512; - } -+ else if (!strcmp(algorithm, "sha2-512_224")) -+ { -+ alg = GNUTLS_DIG_SHA512; -+ tempsize = 28; -+ } -+ else if (!strcmp(algorithm, "sha2-512_256")) -+ { -+ alg = GNUTLS_DIG_SHA512; -+ tempsize = 32; -+ } - - if (alg != GNUTLS_DIG_UNKNOWN) - { -+ if (tempsize > 0) -+ { -+ // Truncate result to tempsize bytes... -+ -+ if (hashsize < tempsize) -+ goto too_small; -+ -+ gnutls_hash_fast(alg, a, alen, temp); -+ memcpy(hash, temp, tempsize); -+ -+ return ((ssize_t)tempsize); -+ } -+ - hashlen = gnutls_hash_get_len(alg); - - if (hashlen > hashsize) -@@ -302,7 +349,209 @@ hash_data(const char *algorithm, // I - Algorithm - - return ((ssize_t)hashlen); - } --#endif // HAVE_OPENSSL -+ -+#elif __APPLE__ -+ if (!strcmp(algorithm, "sha")) -+ { -+ // SHA-1... -+ -+ CC_SHA1_CTX ctx; // SHA-1 context -+ -+ if (hashsize < CC_SHA1_DIGEST_LENGTH) -+ goto too_small; -+ -+ CC_SHA1_Init(&ctx); -+ CC_SHA1_Update(&ctx, a, (CC_LONG)alen); -+ CC_SHA1_Final(hash, &ctx); -+ -+ return (CC_SHA1_DIGEST_LENGTH); -+ } -+# ifdef CC_SHA224_DIGEST_LENGTH -+ else if (!strcmp(algorithm, "sha2-224")) -+ { -+ CC_SHA256_CTX ctx; // SHA-224 context -+ -+ if (hashsize < CC_SHA224_DIGEST_LENGTH) -+ goto too_small; -+ -+ CC_SHA224_Init(&ctx); -+ CC_SHA224_Update(&ctx, a, (CC_LONG)alen); -+ CC_SHA224_Final(hash, &ctx); -+ -+ return (CC_SHA224_DIGEST_LENGTH); -+ } -+# endif /* CC_SHA224_DIGEST_LENGTH */ -+ else if (!strcmp(algorithm, "sha2-256")) -+ { -+ CC_SHA256_CTX ctx; // SHA-256 context -+ -+ if (hashsize < CC_SHA256_DIGEST_LENGTH) -+ goto too_small; -+ -+ CC_SHA256_Init(&ctx); -+ CC_SHA256_Update(&ctx, a, (CC_LONG)alen); -+ CC_SHA256_Final(hash, &ctx); -+ -+ return (CC_SHA256_DIGEST_LENGTH); -+ } -+ else if (!strcmp(algorithm, "sha2-384")) -+ { -+ CC_SHA512_CTX ctx; // SHA-384 context -+ -+ if (hashsize < CC_SHA384_DIGEST_LENGTH) -+ goto too_small; -+ -+ CC_SHA384_Init(&ctx); -+ CC_SHA384_Update(&ctx, a, (CC_LONG)alen); -+ CC_SHA384_Final(hash, &ctx); -+ -+ return (CC_SHA384_DIGEST_LENGTH); -+ } -+ else if (!strcmp(algorithm, "sha2-512")) -+ { -+ CC_SHA512_CTX ctx; // SHA-512 context -+ -+ if (hashsize < CC_SHA512_DIGEST_LENGTH) -+ goto too_small; -+ -+ CC_SHA512_Init(&ctx); -+ CC_SHA512_Update(&ctx, a, (CC_LONG)alen); -+ CC_SHA512_Final(hash, &ctx); -+ -+ return (CC_SHA512_DIGEST_LENGTH); -+ } -+# ifdef CC_SHA224_DIGEST_LENGTH -+ else if (!strcmp(algorithm, "sha2-512_224")) -+ { -+ CC_SHA512_CTX ctx; // SHA-512 context -+ unsigned char temp[CC_SHA512_DIGEST_LENGTH]; -+ // SHA-512 hash -+ -+ // SHA2-512 truncated to 224 bits (28 bytes)... -+ -+ if (hashsize < CC_SHA224_DIGEST_LENGTH) -+ goto too_small; -+ -+ CC_SHA512_Init(&ctx); -+ CC_SHA512_Update(&ctx, a, (CC_LONG)alen); -+ CC_SHA512_Final(temp, &ctx); -+ -+ memcpy(hash, temp, CC_SHA224_DIGEST_LENGTH); -+ -+ return (CC_SHA224_DIGEST_LENGTH); -+ } -+# endif // CC_SHA224_DIGEST_LENGTH -+ else if (!strcmp(algorithm, "sha2-512_256")) -+ { -+ CC_SHA512_CTX ctx; // SHA-512 context -+ unsigned char temp[CC_SHA512_DIGEST_LENGTH]; -+ // SHA-512 hash -+ -+ // SHA2-512 truncated to 256 bits (32 bytes)... -+ -+ if (hashsize < CC_SHA256_DIGEST_LENGTH) -+ goto too_small; -+ -+ CC_SHA512_Init(&ctx); -+ CC_SHA512_Update(&ctx, a, (CC_LONG)alen); -+ CC_SHA512_Final(temp, &ctx); -+ -+ memcpy(hash, temp, CC_SHA256_DIGEST_LENGTH); -+ -+ return (CC_SHA256_DIGEST_LENGTH); -+ } -+ -+#elif _WIN32 -+ // Use Windows CNG APIs to perform hashing... -+ BCRYPT_ALG_HANDLE alg; // Algorithm handle -+ LPCWSTR algid = NULL; // Algorithm ID -+ ssize_t hashlen; // Hash length -+ NTSTATUS status; // Status of hash -+ unsigned char temp[64]; // Temporary hash buffer -+ size_t tempsize = 0; // Truncate to this size? -+ -+ -+ if (!strcmp(algorithm, "sha")) -+ { -+ algid = BCRYPT_SHA1_ALGORITHM; -+ hashlen = 20; -+ } -+ else if (!strcmp(algorithm, "sha2-256")) -+ { -+ algid = BCRYPT_SHA256_ALGORITHM; -+ hashlen = 32; -+ } -+ else if (!strcmp(algorithm, "sha2-384")) -+ { -+ algid = BCRYPT_SHA384_ALGORITHM; -+ hashlen = 48; -+ } -+ else if (!strcmp(algorithm, "sha2-512")) -+ { -+ algid = BCRYPT_SHA512_ALGORITHM; -+ hashlen = 64; -+ } -+ else if (!strcmp(algorithm, "sha2-512_224")) -+ { -+ algid = BCRYPT_SHA512_ALGORITHM; -+ hashlen = tempsize = 28; -+ } -+ else if (!strcmp(algorithm, "sha2-512_256")) -+ { -+ algid = BCRYPT_SHA512_ALGORITHM; -+ hashlen = tempsize = 32; -+ } -+ -+ if (algid) -+ { -+ if (hashsize < (size_t)hashlen) -+ goto too_small; -+ -+ if ((status = BCryptOpenAlgorithmProvider(&alg, algid, NULL, 0)) < 0) -+ { -+ DEBUG_printf(("2cupsHashData: BCryptOpenAlgorithmProvider returned %d.", status)); -+ -+ if (status == STATUS_INVALID_PARAMETER) -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad algorithm parameter."), 1); -+ else -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to access cryptographic provider."), 1); -+ -+ return (-1); -+ } -+ -+ if (tempsize > 0) -+ { -+ // Do a truncated SHA2-512 hash... -+ status = BCryptHash(alg, NULL, 0, (PUCHAR)a, (ULONG)alen, temp, sizeof(temp)); -+ memcpy(hash, temp, hashlen); -+ } -+ else -+ { -+ // Hash directly to buffer... -+ status = BCryptHash(alg, NULL, 0, (PUCHAR)a, (ULONG)alen, hash, (ULONG)hashlen); -+ } -+ -+ BCryptCloseAlgorithmProvider(alg, 0); -+ -+ if (status < 0) -+ { -+ DEBUG_printf(("2cupsHashData: BCryptHash returned %d.", status)); -+ -+ if (status == STATUS_INVALID_PARAMETER) -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad hashing parameter."), 1); -+ else -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Hashing failed."), 1); -+ -+ return (-1); -+ } -+ -+ return (hashlen); -+ } -+ -+#else -+ if (hashsize < 64) -+ goto too_small; -+#endif // __APPLE__ - - // Unknown hash algorithm... - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unknown hash algorithm."), 1); diff --git a/package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch b/package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch deleted file mode 100644 index be4c6b469de..00000000000 --- a/package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0dd97fcaeeb16ed836e8542d75e2396fb1d129d9 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Tue, 3 Oct 2023 14:39:33 +0200 -Subject: [PATCH] cups/hash.c: LibreSSL version does not support several hashes - -Upstream: https://github.com/OpenPrinting/cups/commit/0dd97fcaeeb16ed836e8542d75e2396fb1d129d9 -Signed-off-by: Fabrice Fontaine ---- - cups/hash.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/cups/hash.c b/cups/hash.c -index c447bab4e..5eefa1010 100644 ---- a/cups/hash.c -+++ b/cups/hash.c -@@ -254,14 +254,6 @@ hash_data(const char *algorithm, // I - Algorithm - { - md = EVP_sha512(); - } -- else if (!strcmp(algorithm, "sha2-512_224")) -- { -- md = EVP_sha512_224(); -- } -- else if (!strcmp(algorithm, "sha2-512_256")) -- { -- md = EVP_sha512_256(); -- } - - if (md) - { diff --git a/package/cups/cups.hash b/package/cups/cups.hash index 2d7bbf1aa97..f826f96fe7c 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c cups-2.4.7-source.tar.gz +sha256 9a88fe1da3a29a917c3fc67ce6eb3178399d68e1a548c6d86c70d9b13651fd71 cups-2.4.11-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 5d474d0fe59..31899114eff 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.7 +CUPS_VERSION = 2.4.11 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From 87cb2999c3ae700b1bb43fa7c920c9391b393b13 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 21 Sep 2024 18:32:58 +0200 Subject: [PATCH 2867/3013] docs/manual: do not instruct doctoring the saved defconfig Doctoring a defconfig is tedious, and it is not easy to update a defconfig, as it requires manual copy-pasting, adding comments and so on... Instead, just require defconfigs to be generated with 'savedefconfig'. Any details can/must be provided in the commit log. Reported-by: Edgar Bonet Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit 17bdd10cb350e9c45926c2a5a05f278d104ee4c9) Signed-off-by: Peter Korsgaard --- docs/manual/adding-board-support.adoc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/manual/adding-board-support.adoc b/docs/manual/adding-board-support.adoc index be7699668d1..0f7d5346039 100644 --- a/docs/manual/adding-board-support.adoc +++ b/docs/manual/adding-board-support.adoc @@ -22,11 +22,7 @@ selections are highly application-specific. Once you have a known working configuration, run +make savedefconfig+. This will generate a minimal +defconfig+ file at the root of the Buildroot source tree. Move this file into the +configs/+ -directory, and rename it +_defconfig+. If the configuration -is a bit more complicated, it is nice to manually reformat it and -separate it into sections, with a comment before each section. Typical -sections are _Architecture_, _Toolchain options_ (typically just linux -headers version), _Firmware_, _Bootloader_, _Kernel_, and _Filesystem_. +directory, and rename it +_defconfig+. Always use fixed versions or commit hashes for the different components, not the "latest" version. For example, set From cc54944e20e0b0ca1e238f9097581208cd0df13c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 25 Sep 2024 15:37:13 +0200 Subject: [PATCH 2868/3013] package/gnutls: bump to version 3.8.7 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 1bf483665d825007ac1a2853310841ff3d935bdc) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index d9f830ec925..35e842546e9 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz.sig -sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd gnutls-3.8.6.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.7.tar.xz.sig +sha256 fe302f2b6ad5a564bcb3678eb61616413ed5277aaf8e7bf7cdb9a95a18d9f477 gnutls-3.8.7.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 479922ee5dd..a5012b1b218 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).6 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).7 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From 8e8285236f39f6d926bb2d81ee5f6cbb8e5e171b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 25 Sep 2024 15:37:34 +0200 Subject: [PATCH 2869/3013] package/libarchive: security bump to version 3.7.6 3.7.5 fixed a number of security issues: fix multiple vulnerabilities identified by SAST (#2251, #2256) cpio: ignore out-of-range gid/uid/size/ino and harden AFIO parsing (#2258) lzop: prevent integer overflow (#2174) rar4: protect copy_from_lzss_window_to_unp() (#2172, CVE-2024-20696) rar4: fix CVE-2024-26256 (#2269, CVS-2024-26256) rar4: fix OOB in delta and audio filter (#2148, #2149) rar4: fix out of boundary access with large files (#2179) rar4: add boundary checks to rgb filter (#2210) rar4: fix OOB access with unicode filenames (#2203) rar5: clear 'data ready' cache on window buffer reallocs (#2265) rpm: calculate huge header sizes correctly (#2158) unzip: unify EOF handling (#2175) util: fix out of boundary access in mktemp functions (#2160) uu: stop processing if lines are too long (#2168) And 3.7.6 fixed a tar regression introduced in 3.7.5 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit ab3c84e5e2391a7832f6baa2f20b28661f55dd2c) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- ...1-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch | 2 +- .../0002-autotools-do-not-add-iconv-for-Requires.private.patch | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch index a4dd7dad5cc..e630c51feff 100644 --- a/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch +++ b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 93f7af94..204a4e69 100644 --- a/configure.ac +++ b/configure.ac -@@ -434,9 +434,7 @@ if test "x$with_iconv" != "xno"; then +@@ -449,9 +449,7 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch index 3cbd304109b..aca2dab9db3 100644 --- a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch +++ b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch @@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac index 99bff20d1..f245d0c55 100644 --- a/configure.ac +++ b/configure.ac -@@ -434,7 +434,6 @@ if test "x$with_iconv" != "xno"; then +@@ -449,7 +449,6 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index a2c6488731a..08920b61c5b 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735 libarchive-3.7.4.tar.xz +sha256 0a2efdcb185da2eb1e7cd8421434cb9a6119f72417a13335cca378d476fd3ba0 libarchive-3.7.6.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 7d58b5c69f3..d3a447552ef 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.4 +LIBARCHIVE_VERSION = 3.7.6 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From de77e894a688f8f5bbfdb92f06504d1cef8db1fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 26 Sep 2024 08:15:11 +0200 Subject: [PATCH 2870/3013] package/libilbc: switch to github The previous repo is not available anymore. Fixes: https://autobuild.buildroot.org/results/8c8b073ce163131763fca978b400e596fcf39e62 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4e5fd24c8b7438672c475d0559200ff72c4b1cc7) Signed-off-by: Peter Korsgaard --- package/libilbc/Config.in | 2 +- package/libilbc/libilbc.hash | 2 +- package/libilbc/libilbc.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/libilbc/Config.in b/package/libilbc/Config.in index 89d5db2fd65..db3486c1cba 100644 --- a/package/libilbc/Config.in +++ b/package/libilbc/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBILBC iLBC (internet Low Bitrate Codec) is a FREE speech codec suitable for robust voice communication over IP. - http://www.webrtc.org/license-rights/ilbc-freeware + https://github.com/freeswitch/libilbc diff --git a/package/libilbc/libilbc.hash b/package/libilbc/libilbc.hash index bd0bf89d421..be88d6f9c39 100644 --- a/package/libilbc/libilbc.hash +++ b/package/libilbc/libilbc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba11bc22e353887cd7c605a25a5b9bac464f11f8cb103f652e095ae7e0f04f77 libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07-git4.tar.gz +sha256 fe4827a548e96f0549dd8f30eb6a48c6c55fd4535de6c8e9c6e4f38bea6190bf libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07.tar.gz sha256 b7f4cbb4a12cd11a3d1aeda9bd17c99f59b054de4b3ee53045531cd2fa74dd2a gips_iLBClicense.pdf diff --git a/package/libilbc/libilbc.mk b/package/libilbc/libilbc.mk index 06d94eb36d2..d8139ba205f 100644 --- a/package/libilbc/libilbc.mk +++ b/package/libilbc/libilbc.mk @@ -5,8 +5,7 @@ ################################################################################ LIBILBC_VERSION = 829b08c7902ceb87a261279fabb36b6d523c6e07 -LIBILBC_SITE = https://freeswitch.org/stash/scm/sd/libilbc.git -LIBILBC_SITE_METHOD = git +LIBILBC_SITE = $(call github,freeswitch,libilbc,$(LIBILBC_VERSION)) LIBILBC_LICENSE = Global IP Sound iLBC Public License v2.0 LIBILBC_LICENSE_FILES = gips_iLBClicense.pdf LIBILBC_AUTORECONF = YES From e64dc2d46ad2de156b7ce34beb1c03fc8a1d4319 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Sun, 22 Sep 2024 17:05:54 +0200 Subject: [PATCH 2871/3013] package/aubio: fix build on big endian arch Fixes the following error happening on builds with big endian architecture target and libflac enabled. ``` [ 75/243] Linking build/tests/test-pitchshift /home/autobuild/autobuild/instance-16/output-1/per-package/aubio/host/bin/../lib/gcc/mips64-buildroot-linux-gnu/13.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: src/libaubio.so: undefined reference to `SWAPS' collect2: error: ld returned 1 exit status Waf: Leaving directory `/home/autobuild/autobuild/instance-16/output-1/build/aubio-152d6819b360c2e7b379ee3f373d444ab3df0895/build' Build failed ``` There is a missing definition of the `SWAPS` macro in `/src/io/sink_flac.c` file. This patch adds an out of tree patch that copy the `SWAPS` definition from the `/src/io/sink_wavwrite.c` file in `sink_flac.c` to fix this issue. Fixes: - https://autobuild.buildroot.org/results/b88/b8895a81411dc7622b0aba9f2f0eaa0aef5a1a10/ - https://autobuild.buildroot.org/results/bc7/bc733f5192b354cb960b6a4726efb597be4bb06c/ - https://autobuild.buildroot.org/results/ea5/ea52dbcc14c2bab300277053f0b9599a8e82294a/ - ... Signed-off-by: Thomas Perale Signed-off-by: Thomas Petazzoni (cherry picked from commit 295701f1ab56dbcd45f0d73e52f7c743a8984927) Signed-off-by: Peter Korsgaard --- ...1-sink_flac-missing-SWAPS-definition.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/aubio/0001-sink_flac-missing-SWAPS-definition.patch diff --git a/package/aubio/0001-sink_flac-missing-SWAPS-definition.patch b/package/aubio/0001-sink_flac-missing-SWAPS-definition.patch new file mode 100644 index 00000000000..5f321b53631 --- /dev/null +++ b/package/aubio/0001-sink_flac-missing-SWAPS-definition.patch @@ -0,0 +1,45 @@ +From aebf4fb23df2c4ec8857aef05a468991054a58c1 Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Thu, 19 Sep 2024 18:57:16 +0200 +Subject: [PATCH] [sink_flac] missing SWAPS definition + +On big endian architecture with libflac enabled the following error +would happen when cross-compiling aubio with buildroot. + +``` +[ 75/243] Linking build/tests/test-pitchshift +/home/autobuild/autobuild/instance-16/output-1/per-package/aubio/host/bin/../lib/gcc/mips64-buildroot-linux-gnu/13.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: src/libaubio.so: undefined reference to `SWAPS' +collect2: error: ld returned 1 exit status + +Waf: Leaving directory `/home/autobuild/autobuild/instance-16/output-1/build/aubio-152d6819b360c2e7b379ee3f373d444ab3df0895/build' +Build failed +``` + +Indeed there is a missing definition of the `SWAPS` macro in +`/src/io/sink_flac.c` file. +This commit copy the `SWAPS` definition from the +`/src/io/sink_wavwrite.c` file in `sink_flac.c` to fix this issue. + +Signed-off-by: Thomas Perale +Upstream: https://github.com/aubio/aubio/pull/407 +--- + src/io/sink_flac.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/io/sink_flac.c b/src/io/sink_flac.c +index 04144793..0a1cbc26 100644 +--- a/src/io/sink_flac.c ++++ b/src/io/sink_flac.c +@@ -36,6 +36,9 @@ + + #define MAX_WRITE_SIZE 4096 + ++// swap endian of a short ++#define SWAPS(x) ((x & 0xff) << 8) | ((x & 0xff00) >> 8) ++ + // swap host to little endian + #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + #define HTOLES(x) SWAPS(x) +-- +2.46.0 + From 039978541e828155eb863b3f8268f3d71ffb6181 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 20 Sep 2024 08:18:33 +0200 Subject: [PATCH 2872/3013] package/cairo: bump to 1.18.2 News: - https://www.cairographics.org/news/cairo-1.18.2/ Upstream patches have been dropped in this commit. Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 29888ab35e047099d239f266b7b565cd4023503e) Signed-off-by: Peter Korsgaard --- ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 41 ------------------- ...3-meson-only-require-cpp-for-windows.patch | 38 ----------------- package/cairo/cairo.hash | 4 +- package/cairo/cairo.mk | 2 +- 4 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch delete mode 100644 package/cairo/0003-meson-only-require-cpp-for-windows.patch diff --git a/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch deleted file mode 100644 index 5a5c438a97e..00000000000 --- a/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8d5037ed642b02cdb018e49866aa286f30a7b59a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 5 Feb 2024 17:47:07 +0100 -Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when - cross-compiling - -../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: -ERROR: Can not run test applications in this cross environment. - -Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define -ipc_rmid_deferred_release in a cross-compile config, but still kept -the default to auto, which anyhow results in an error when cross-compiling. - -There is only one usage of the ipc_rmid_deferred_release compile declarative -which was originally added in this commit: 5041b462d084de8552336275914d30c23bf5dd35. - -If ipc_rmid_deferred_release is set to FALSE, an additional XSync is performed. -This doesn't sound very harmful, so that is why this commit defaults to FALSE -and thus avoids any cross-compile errors. - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9efe91978..6a670bf94 100644 ---- a/meson.build -+++ b/meson.build -@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() - - # Can skip the run check by providing the result in a cross file or - # native file as bool property value. -- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto') - # We don't know the type of prop (bool, string) but need to differentiate - # between a set value (bool) or the fallback value (string), so convert to - # a string and check the string value. --- -2.34.1 diff --git a/package/cairo/0003-meson-only-require-cpp-for-windows.patch b/package/cairo/0003-meson-only-require-cpp-for-windows.patch deleted file mode 100644 index 3ce396f66f2..00000000000 --- a/package/cairo/0003-meson-only-require-cpp-for-windows.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e93ef3feb69994e3aa4e0ab66ccd66139b097e49 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Thu, 18 Jul 2024 12:16:51 +0200 -Subject: [PATCH] meson: only require cpp for windows - -Allow to compile cairo without c++ toolchain. - -Fixes: - - http://autobuild.buildroot.net/results/98b62ab7ed3092f9f9085f723baf7d6267451e5c/ - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/573 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9100152ee..297482b03 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('cairo', 'c', 'cpp', -+project('cairo', 'c', - meson_version: '>= 0.59.0', - version: run_command(find_program('version.py'), check: true).stdout().strip(), - default_options: ['warning_level=2'], -@@ -489,6 +489,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled() - endif - - if host_machine.system() == 'windows' -+ add_languages('cpp') -+ - add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp']) - - win32_extra_deps = [ --- -2.45.2 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index df9c693bad7..b2d384d01ae 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,5 +1,5 @@ -# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum -sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.2.tar.xz.sha256sum +sha256 a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a cairo-1.18.2.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index ba25620f8d5..c741c97853b 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAIRO_VERSION = 1.18.0 +CAIRO_VERSION = 1.18.2 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 From 3d4930311871bcf7db91080991159d2d8262eb4c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 29 Sep 2024 18:53:43 +0200 Subject: [PATCH 2873/3013] boot/grub2: replace host-python3 with BR2_PYTHON3_HOST_DEPENDENCY Commit 86bb1b236 "boot/grub2: needs host-python3" [1] introduced a dependency on host-python3. Since grub does not have any specific requirements on host Python modules, or recent host Python version, this commit replaces the host-python3 dependency with BR2_PYTHON3_HOST_DEPENDENCY. This will skip the host-python3 compilation if a sufficient version (3.4 or greater at the time of this commit) is already present on host. This will save build time. This optimization was suggested by Peter, in [2]. Note 1: this commit was checked to ensure that grub is building with Python 3.4. Note 2: BR2_PYTHON3_HOST_DEPENDENCY was introduced in commit b60729784 "support/dependencies: add a check for python3" [3]. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/86bb1b2360bdaed069cd087541f4edad1d5ce925 [2] https://lists.buildroot.org/pipermail/buildroot/2024-September/763967.html [3] https://gitlab.com/buildroot.org/buildroot/-/commit/b60729784ab1c2f75dca30f924f4dd3176713ae8 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit 8a71fda371c1785f9e4364f05ab0a632e1946c53) Signed-off-by: Peter Korsgaard --- boot/grub2/grub2.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 7c95adc739b..4df12774a38 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -9,8 +9,10 @@ GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING -GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-grub2 host-python3 -HOST_GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-python3 +GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-grub2 \ + $(BR2_PYTHON3_HOST_DEPENDENCY) +HOST_GRUB2_DEPENDENCIES = host-bison host-flex host-gawk \ + $(BR2_PYTHON3_HOST_DEPENDENCY) GRUB2_INSTALL_IMAGES = YES # CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which From 57094b432210cd9e543563a87fff7b9074de5897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damien=20Th=C3=A9bault?= Date: Sat, 5 Oct 2024 18:49:44 +0200 Subject: [PATCH 2874/3013] package/linux-pam: remove flex dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit linux-pam 1.2.0 removed the use of yywrap, so the flex dependency is not needed now (host-flex is still needed). Fixes: #47 Signed-off-by: Damien Thébault Signed-off-by: Arnout Vandecappelle (cherry picked from commit 600e273487baf76d4469bca43d42bd2c4b364db8) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 1 - package/linux-pam/linux-pam.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 1aa90453330..6b08a9c4c2a 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_LINUX_PAM depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h - select BR2_PACKAGE_FLEX select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help A Security Framework that Provides Authentication for diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 1433eb00b3d..a5b8c9151f0 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -16,7 +16,7 @@ LINUX_PAM_CONF_OPTS = \ --disable-regenerate-docu \ --enable-securedir=/lib/security \ --libdir=/lib -LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \ +LINUX_PAM_DEPENDENCIES = host-flex host-pkgconf \ $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) LINUX_PAM_LICENSE = BSD-3-Clause From 86c4680bebfc9d1266671f59121bd2ec8e58ec6e Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Sat, 5 Oct 2024 11:58:44 -0500 Subject: [PATCH 2875/3013] support/testing: add new test for dtc Add a test that runs the dtc commandline tools. To test devicetree compilation, we use an example devicetree from the dtc project. The example source is GPL-2.0+ licensed. Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9b690341602388b54c596c4510d770f58f4ad227) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_dtc.py | 39 +++++++++++++++ .../test_dtc/rootfs-overlay/test_tree1.dts | 48 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 support/testing/tests/package/test_dtc.py create mode 100644 support/testing/tests/package/test_dtc/rootfs-overlay/test_tree1.dts diff --git a/support/testing/tests/package/test_dtc.py b/support/testing/tests/package/test_dtc.py new file mode 100644 index 00000000000..47a1d759161 --- /dev/null +++ b/support/testing/tests/package/test_dtc.py @@ -0,0 +1,39 @@ +import os + +import infra.basetest + + +class TestDtc(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_DTC=y + BR2_PACKAGE_DTC_PROGRAMS=y + BR2_ROOTFS_OVERLAY="{}" + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_CPIO=y + """.format( + # overlay to add a bats test suite + infra.filepath("tests/package/test_dtc/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + + self.emulator.login() + + # Test 'dtc' + self.assertRunOk("dtc -I dts -O dtb -o /tmp/test_tree1.dtb /test_tree1.dts") + + # Test 'fdtdump' + self.assertRunOk("fdtdump /tmp/test_tree1.dtb") + + # Test 'fdtget' + out, exit_code = self.emulator.run("fdtget -t s /tmp/test_tree1.dtb / compatible") + self.assertEqual(out[0].strip(), "test_tree1") + + # Test 'fdtput' + self.assertRunOk("fdtput -t s /tmp/test_tree1.dtb / compatible 'test set compatible'") + out, exit_code = self.emulator.run("fdtget -t s /tmp/test_tree1.dtb / compatible") + self.assertEqual(out[0].strip(), "test set compatible") diff --git a/support/testing/tests/package/test_dtc/rootfs-overlay/test_tree1.dts b/support/testing/tests/package/test_dtc/rootfs-overlay/test_tree1.dts new file mode 100644 index 00000000000..6649e7cc0fe --- /dev/null +++ b/support/testing/tests/package/test_dtc/rootfs-overlay/test_tree1.dts @@ -0,0 +1,48 @@ +/* From https://git.kernel.org/pub/scm/utils/dtc/dtc.git/tree/tests/test_tree1.dts?id=99031e3a4a6e479466ae795790b44727434ca27d */ + +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-int64 = /bits/ 64 <0xdeadbeef01abcdef>; + prop-str = "hello world"; + #address-cells = <1>; + #size-cells = <0>; + + subnode@1 { + compatible = "subnode1"; + reg = <1>; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + placeholder = "this is a placeholder string", "string2"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + reg = <2>; + linux,phandle = <0x2000>; + prop-int = <123456789>; + #address-cells = <1>; + #size-cells = <0>; + + ssn0: subsubnode@0 { + reg = <0>; + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +}; From fc010c219e84832bcdd1dffb798dc9231a7ed9ea Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Sat, 5 Oct 2024 11:59:30 -0500 Subject: [PATCH 2876/3013] package/mtd: update to 2.2.1 See https://lore.kernel.org/buildroot/5dcaf594-e727-4ec3-af69-86e578029160@sigma-star.at/ Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5de5ef51b5a7bd3f47f82167b4d966706039a15c) Signed-off-by: Peter Korsgaard --- package/mtd/mtd.hash | 4 ++-- package/mtd/mtd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index 1efb06f4902..0eb90a5118b 100644 --- a/package/mtd/mtd.hash +++ b/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://infraroot.at/pub/mtd/mtd-utils-2.2.0.tar.bz2.asc -sha256 250d082f67375ca8451b5fcfc9a23a53ced3ebebd8312c288daf2507bbab1324 mtd-utils-2.2.0.tar.bz2 +# https://infraroot.at/pub/mtd/mtd-utils-2.2.1.tar.bz2.asc +sha256 f7ae20b2eb79ee83441468f0b99d897024cd96ff853eea59106fb1952065c803 mtd-utils-2.2.1.tar.bz2 sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index d3444c88f2f..77050e7e40b 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.2.0 +MTD_VERSION = 2.2.1 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = https://infraroot.at/pub/mtd MTD_LICENSE = GPL-2.0 From b85c174ab0be361ca45848e40e40e086a27d54fc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 6 Oct 2024 13:44:24 +0200 Subject: [PATCH 2877/3013] package/mosquitto: security bump to version 2.0.19 For change log, see: https://github.com/eclipse/mosquitto/blob/v2.0.19/ChangeLog.txt The change log mention 2 security related fixes. There is no allocated CVE. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit bd127d0c3ffc57646f4908264728da4ea074241b) Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.hash | 4 ++-- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 453c1934dd1..34f50906c1e 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.18.tar.gz.asc -sha256 d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a mosquitto-2.0.18.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.19.tar.gz.asc +sha256 33af3637f119a61c509c01d2f8f6cc3d8be76f49e850132f2860af142abf82a9 mosquitto-2.0.19.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 6b249c37fd6..dc7db75bb5c 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.18 +MOSQUITTO_VERSION = 2.0.19 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 From 9c2d88fd4e831c73e025ffa33a4a6b071d976dc9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 24 Sep 2024 08:24:11 +0300 Subject: [PATCH 2878/3013] package/libcurl: fix build failure with verbose disabled Add patch to fix build failure introduced in bump to version 8.10.0. Fixes: https://autobuild.buildroot.org/results/2d553687a32651f81813c82d7bbf9bb11fd3eca5/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 16ce77ad7d3a05addc1962b455242199a93f3811) Signed-off-by: Peter Korsgaard --- ...build-with-verbose-messages-disabled.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch diff --git a/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch b/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch new file mode 100644 index 00000000000..ffa44b87b64 --- /dev/null +++ b/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch @@ -0,0 +1,44 @@ +From 58d490091d097ba2ad108cc66c97e242e5aacb9c Mon Sep 17 00:00:00 2001 +Message-ID: <58d490091d097ba2ad108cc66c97e242e5aacb9c.1727153835.git.baruch@tkos.co.il> +From: Baruch Siach +Date: Tue, 24 Sep 2024 07:52:13 +0300 +Subject: [PATCH] curl_trc: fix build with verbose messages disabled + +Add empty definition of Curl_trc_ws() to fix this following build error: + +In file included from sendf.h:29, + from ws.c:35: +ws.c: In function 'Curl_ws_accept': +curl_trc.h:100:10: error: implicit declaration of function 'Curl_trc_ws'; did you mean 'Curl_trc_ftp'? [-Wimplicit-function-declaration] + 100 | Curl_trc_ws(data, __VA_ARGS__); } while(0) + | ^~~~~~~~~~~ +ws.c:779:5: note: in expansion of macro 'CURL_TRC_WS' + 779 | CURL_TRC_WS(data, "WS, using chunk size %zu", chunk_size); + | ^~~~~~~~~~~ + +Signed-off-by: Baruch Siach +Upstream: https://github.com/curl/curl/pull/15026 +--- + lib/curl_trc.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/lib/curl_trc.h b/lib/curl_trc.h +index 5f675b453fd3..1801d33cea7c 100644 +--- a/lib/curl_trc.h ++++ b/lib/curl_trc.h +@@ -226,6 +226,12 @@ static void Curl_trc_smtp(struct Curl_easy *data, const char *fmt, ...) + (void)data; (void)fmt; + } + #endif ++#if defined(USE_WEBSOCKETS) && !defined(CURL_DISABLE_HTTP) ++static void Curl_trc_ws(struct Curl_easy *data, const char *fmt, ...) ++{ ++ (void)data; (void)fmt; ++} ++#endif + + #endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */ + +-- +2.45.2 + From c7618236c133fd7ad4cca084968707629c8e2fd2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 20 Oct 2024 15:41:51 +0200 Subject: [PATCH 2879/3013] Update for 2024.08.1 Signed-off-by: Peter Korsgaard --- CHANGES | 38 ++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 544931921bb..5e6140efa0d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,41 @@ +2024.08.1, released October 20th, 2024 + + Important / security related fixes. + + Per-package-directories fixes for the .gdbinit file and RPATH + fixups for SDK. + + Legal-info: Ensure host-tar and redist directory exists when + using override-srcdir, as otherwise the tarball generation + (silently) fails. + + utils/check-package: Also check for correct indentation of + help lines. + + A large number of typo fixes. + + Defconfigs: imx6slevk: Bump Linux kernel to 6.6.51 to fix + build issue with GCC 13 + + Updated/fixed packages: asterisk, aubio, bind, busybox, cairo, + cryptsetup, cups, expat, ffmpeg, genpart, glibc, gnutls, go, + grub2, libarchive, libcurl, libilbc, libpcap, lighttpd, linux, + linux-pam, mosquitto, mtd, nginx, php, procps-ng, pure-ftpd, + python-django, python3, qt6core5compat, qt6svg, qt6tools, + rp-pppoe, samba4, sysklogd, wireplumber, wpewebkit, xenomai + + Issues resolved: + - procps-ng: build failure when linking to systemd + https://gitlab.com/buildroot.org/buildroot/-/issues/28 + - orange pi 2w does not boot + https://gitlab.com/buildroot.org/buildroot/-/issues/36 + - glibc configure fails on aarch64 with mathvec SVE ACLE error + https://gitlab.com/buildroot.org/buildroot/-/issues/40 + - Kernel Build from Custom Git Repo fails with hash-error + https://gitlab.com/buildroot.org/buildroot/-/issues/46 + - package/linux-pam: Remove unneeded flex dependency + https://gitlab.com/buildroot.org/buildroot/-/issues/47 + 2024.08, released September 6th, 2024 Various fixes. diff --git a/Makefile b/Makefile index a84b83c1a98..4afd15f2c90 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.08 +export BR2_VERSION := 2024.08.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1725627000 +BR2_VERSION_EPOCH = 1729431000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 1155026ee39..25a360d9768 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.08' +RELEASE='2024.08.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From db84c38c068af09105d35fc4572c2dcc6c41f6dd Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 10 Oct 2024 18:39:22 -0500 Subject: [PATCH 2880/3013] boot/uboot: update link to the U-Boot docs The denx.de/wiki/U-Boot link now redirects to docs.u-boot.org/en/latest Replace the link to the new location for the U-Boot documentation Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni (cherry picked from commit 164d9f0546372eb076506eebc8f88c6c4a544a36) Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index dd806936148..0a0487b4e9a 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -3,7 +3,7 @@ config BR2_TARGET_UBOOT help Build "Das U-Boot" Boot Monitor - https://www.denx.de/wiki/U-Boot + https://docs.u-boot.org/en/latest/ if BR2_TARGET_UBOOT choice From 61e995dc57bd0cc8ca90cb9296a16f473a35e28f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 13 Oct 2024 12:33:38 +0200 Subject: [PATCH 2881/3013] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 9a203208204cd9530337145fde6dcdf1e9b41b8f) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e8c0722de0f..9ecddd0dd96 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.10.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.10.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 8f369e5f36c..ea13ab0aebe 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 e687e735b5eb9efb6d67b42433c93fc9118106a995514f062652873b5e809bcd linux-6.10.10.tar.xz -sha256 1c0c9a14650879c4913efdbac428ba31a540c3d987155ddf34d33e11eca008b3 linux-6.6.51.tar.xz -sha256 9ebe34b4742f8c9104678f32a6bc20e91299ebac2ae607ff2ed137d928df8f6a linux-6.1.110.tar.xz +sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz +sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz +sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz sha256 f6a19a64785965b9fcac0bcb6fd2412b45ca449495bb03592d46f9a50be51ca6 linux-5.10.226.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 067c3b96aa3..dcc49d4b318 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -427,9 +427,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.284" if BR2_KERNEL_HEADERS_5_4 default "5.10.226" if BR2_KERNEL_HEADERS_5_10 default "5.15.167" if BR2_KERNEL_HEADERS_5_15 - default "6.1.110" if BR2_KERNEL_HEADERS_6_1 - default "6.6.51" if BR2_KERNEL_HEADERS_6_6 - default "6.10.10" if BR2_KERNEL_HEADERS_6_10 + default "6.1.112" if BR2_KERNEL_HEADERS_6_1 + default "6.6.56" if BR2_KERNEL_HEADERS_6_6 + default "6.10.14" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 00a9042f4d3206a6ff7eaff1b913bedddc27eeae Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 22 Oct 2024 22:51:03 +0200 Subject: [PATCH 2882/3013] package/libarchive: security bump to version 3.7.7 Security fixes: - gzip: prevent a hang when processing a malformed gzip inside a gzip (#2366, OSS-Fuzz) - tar: don't crash on truncated tar archives (#2364, OSS-Fuzz) - tar: fix two leaks in tar header parsing (#2377) Important bugfixes: - 7-zip: read/write symlink paths as UTF-8 (#2252) - cpio: exit with an error code if an entry could not be extracted (#2371) - rar5: report encrypted entries (#2096) - tar: fix truncation of entry pathnames in specific archives (#2360) Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 55d0c9a9a6f89ed5c4d2e0d25cf499f180a99ee1) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- ...1-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch | 2 +- .../0002-autotools-do-not-add-iconv-for-Requires.private.patch | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch index e630c51feff..31ac4b0b5a5 100644 --- a/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch +++ b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 93f7af94..204a4e69 100644 --- a/configure.ac +++ b/configure.ac -@@ -449,9 +449,7 @@ if test "x$with_iconv" != "xno"; then +@@ -455,9 +455,7 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch index aca2dab9db3..a5b4c86a2f3 100644 --- a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch +++ b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch @@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac index 99bff20d1..f245d0c55 100644 --- a/configure.ac +++ b/configure.ac -@@ -449,7 +449,6 @@ if test "x$with_iconv" != "xno"; then +@@ -455,7 +455,6 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 08920b61c5b..c0b04b0f4bb 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 0a2efdcb185da2eb1e7cd8421434cb9a6119f72417a13335cca378d476fd3ba0 libarchive-3.7.6.tar.xz +sha256 879acd83c3399c7caaee73fe5f7418e06087ab2aaf40af3e99b9e29beb29faee libarchive-3.7.7.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index d3a447552ef..70123ee2b19 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.6 +LIBARCHIVE_VERSION = 3.7.7 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From 807f5ab115686f4579b0bb867fd574b89f45c00f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 17 Sep 2024 05:29:46 +0200 Subject: [PATCH 2883/3013] package/bind: force shared build We got following error with --enable-static: checking whether to build static libraries... yes configure: error: Static linking is not supported as it disables dlopen() and certain security features (e.g. RELRO, ASLR) Fixes: http://autobuild.buildroot.org/results/b55/b553898381ff0fdf5dd705fbb11b469b7564c6e6 Signed-off-by: Waldemar Brodkorb Signed-off-by: Julien Olivain (cherry picked from commit 7b43e248180ad3b3dd1804687bc4457f29a88137) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 217c9916fd3..d594ab5e396 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -33,6 +33,7 @@ BIND_CONF_OPTS = \ --enable-epoll \ --disable-doh \ --disable-backtrace \ + --disable-static \ --with-openssl=$(STAGING_DIR)/usr BIND_DEPENDENCIES = host-pkgconf libuv openssl From 53c2f9ec2f759e4a7961d01aa67524841b37c030 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 17 Sep 2024 05:32:48 +0200 Subject: [PATCH 2884/3013] package/bind: update to 9.18.29 See here for a Changelog: https://downloads.isc.org/isc/bind9/9.18.29/doc/arm/html/notes.html#notes-for-bind-9-18-29 Signed-off-by: Waldemar Brodkorb Signed-off-by: Julien Olivain (cherry picked from commit e5dbcbf80435b4faddfad6b741c2dac06a7693dc) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index feb3430a738..2d4e2479320 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.18.28/bind-9.18.28.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.18.29/bind-9.18.29.tar.xz.asc # with key 706B6C28620E76F91D11F7DF510A642A06C52CEC -sha256 e7cce9a165f7b619eefc4832f0a8dc16b005d29e3890aed6008c506ea286a5e7 bind-9.18.28.tar.xz +sha256 c39ce5d09a8cb10108116fa533445de9f7fdfe0063e8d7c4c46ba1fd20d7bf6d bind-9.18.29.tar.xz sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index d594ab5e396..23687ec6203 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.18.28 +BIND_VERSION = 9.18.29 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From 56ca98a3b130acf9b04c3ca9dd09d1a01a4eeb80 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Sep 2024 03:15:30 +0200 Subject: [PATCH 2885/3013] package/bind: update to 9.18.30 See here for a Changelog: https://downloads.isc.org/isc/bind9/9.18.30/doc/arm/html/notes.html#notes-for-bind-9-18-30 Signed-off-by: Waldemar Brodkorb Signed-off-by: Julien Olivain (cherry picked from commit af27e44bb2a0fedd249b180989a300da58f52c1f) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 2d4e2479320..dbffff05ea6 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.18.29/bind-9.18.29.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.18.30/bind-9.18.30.tar.xz.asc # with key 706B6C28620E76F91D11F7DF510A642A06C52CEC -sha256 c39ce5d09a8cb10108116fa533445de9f7fdfe0063e8d7c4c46ba1fd20d7bf6d bind-9.18.29.tar.xz +sha256 9f6817640970267317e5aa143ecf70531040f2155636b1a63ea45379aa09034a bind-9.18.30.tar.xz sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 23687ec6203..81e608380d1 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.18.29 +BIND_VERSION = 9.18.30 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From 78e5db397e7bbcd7dc2bdca62ed4b7d60634ae75 Mon Sep 17 00:00:00 2001 From: Sen Hastings Date: Wed, 23 Oct 2024 02:52:52 -0700 Subject: [PATCH 2886/3013] support/scripts/pkg-stats: add unsure_cves to cve_total calculation When I initially made the CVE cells collapsible, I neglected to count the unsure CVEs. This patch adds unsure CVEs to the cell collapsing calcualation to ensure that cells with lots of unsure CVEs actually get collapsed. This patch also removes the "+ 1" from the cve_total calculation, which fixes the cve_total being off-by-one. I'm not sure *why* I did that in the first place. demo: https://sen-h.codeberg.page/pkg-stats-demos/@pages/add-unsure_cves-to-cve_total-calc.html Signed-off-by: Sen Hastings Signed-off-by: Thomas Petazzoni (cherry picked from commit 87b8428c4017b220afe950aae3a673870698d986) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index f143af64469..33c21e77b4f 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1043,7 +1043,8 @@ def dump_html_pkg(f, pkg): data_field_id = f'cves__{pkg_css_class}' div_class = ["centered cves data"] div_class.append(f'_{pkg_css_class}') - if len(pkg.cves) > 10: + cve_total = len(pkg.cves) + len(pkg.unsure_cves) + if cve_total > 10: div_class.append("collapse") if pkg.is_status_ok("cve"): div_class.append("cve-ok") @@ -1054,8 +1055,7 @@ def dump_html_pkg(f, pkg): else: div_class.append("cve-unknown") f.write(f'
      \n') - if len(pkg.cves) > 10: - cve_total = len(pkg.cves) + 1 + if cve_total > 10: f.write(f'
      see all ({cve_total}) ▾
      \n') if pkg.is_status_error("cve"): From d4202afc1acdd5b063e94cdd34e3ab6b95f0819f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 22 Oct 2024 19:43:45 +0200 Subject: [PATCH 2887/3013] support/testing: add iputils runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit eda78597eb4edef4f8cd842bbe3eb110fb2fb1b0) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_iputils.py | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 support/testing/tests/package/test_iputils.py diff --git a/DEVELOPERS b/DEVELOPERS index 8755ec77a70..faccdf60fbc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1886,6 +1886,7 @@ F: support/testing/tests/package/test_iperf.py F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_iproute2.py F: support/testing/tests/package/test_iptables.py +F: support/testing/tests/package/test_iputils.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ diff --git a/support/testing/tests/package/test_iputils.py b/support/testing/tests/package/test_iputils.py new file mode 100644 index 00000000000..5f4ba9873bc --- /dev/null +++ b/support/testing/tests/package/test_iputils.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestIputils(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPUTILS=y + BR2_SYSTEM_DHCP="eth0" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check all the main programs of iputils can execute and + # report their version. Note the "-V" option is not accepted + # and fails if the "ping" applet of BusyBox is used instead. + iputils_progs = ["arping", "clockdiff", "ping", "tracepath"] + for prog in iputils_progs: + self.assertRunOk(f"{prog} -V") + + # Qemu host IP, See: + # https://wiki.qemu.org/Documentation/Networking#User_Networking_(SLIRP) + qemu_host = "10.0.2.2" + + # We test the "arping" program, with 3 pings. + self.assertRunOk(f"arping -c 3 {qemu_host}", timeout=10) + + # We test the "ping" program. We use the option "-D" which + # shows a timestamp and is also not supported by the "ping" + # BusyBox applet. + self.assertRunOk(f"ping -D -c 3 {qemu_host}", timeout=10) + + # We test the "tracepath" program. We set the max hops to 2, + # since there is no intermediate routers. + self.assertRunOk(f"tracepath -m 2 {qemu_host}", timeout=10) + + # We test the "clockdiff" program. We cannot use the Qemu host + # IP for this program as the ICMP TIMESTAMP is used and is not + # responded. We use the local host instead. + self.assertRunOk("clockdiff 127.0.0.1", timeout=10) From 20f5ac1c7d3862a7a11d2337cfeefe8f4ed3c846 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Mon, 21 Oct 2024 12:09:22 +0200 Subject: [PATCH 2888/3013] package/libgit2: bump version to 1.8.2 Fixes a minor API issue. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni (cherry picked from commit 0c66981002e78a0f4adc5f4f29ab3b85bffb1d61) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index c02a149a683..ec2f89e57eb 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e libgit2-1.8.1.tar.gz +sha256 184699f0d9773f96eeeb5cb245ba2304400f5b74671f313240410f594c566a28 libgit2-1.8.2.tar.gz sha256 e3712465634e97cfd850822a4eb5ac7d2f8a10f753189366d5a2060046f28288 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index e817a5916aa..67c9901a387 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.8.1 +LIBGIT2_VERSION = 1.8.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From c33d41c4019cdb317b7cd6ceb12ec451e8bd6dd7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 21 Oct 2024 14:54:17 +0300 Subject: [PATCH 2889/3013] package/libcurl: ignore CVE-2024-32928 This vulnerability only affects libcurl deployments in Nest products because of incorrect use. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 7e739d49b235c1692edbb51dcc23671eaa79fd4f) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9bf7724e7d5..71fb6152c73 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -32,6 +32,10 @@ LIBCURL_CONF_OPTS = \ --disable-ldap \ --disable-ldaps +# Only affects Nest products. +# https://nvd.nist.gov/vuln/detail/CVE-2024-32928 +LIBCURL_IGNORE_CVES += CVE-2024-32928 + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver else From f92e435be398359b56c45e9170d8d3145a0cc624 Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Wed, 23 Oct 2024 22:28:14 +0200 Subject: [PATCH 2890/3013] DEVELOPERS: drop Anisse Astier I am no longer actively involved in Buildroot. Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni (cherry picked from commit 91696fbcf1cefe35bf7134b981cdcc3175eb0770) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index faccdf60fbc..8aee8d18ff4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -240,11 +240,6 @@ F: package/sysdig/ N: Andy Shevchenko F: package/fb-test-app/ -N: Anisse Astier -F: package/go/ -F: package/nghttp2/ -F: package/pkg-golang.mk - N: Anthony Viallard F: package/gnuplot/ From a29fdc342adefcceaf165d13a55a71c4363f51cc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 8 Oct 2024 19:48:22 +0200 Subject: [PATCH 2891/3013] package/intel-microcode: security bump version to 20240910 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240813 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240910 20240813 fixes CVE-2024-24853: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01083.html CVE-2024-25939: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01118.html CVE-2024-24980: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01100.html CVE-2023-42667: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01038.html CVE-2023-49141: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01046.html 20240910 fixes CVE-2024-23984: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01103.html CVE-2024-24968: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01097.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 6beab5b73993027643d5da3bbddca6f44d1ed6e4) Signed-off-by: Peter Korsgaard --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 742be5ae792..20dfaa41b47 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c29eb35fdbd39e3ed8587e6f0b1275cc03265f230c2fcaf88e2a1556451e773f intel-microcode-20240531.tar.gz +sha256 8b7582eac7e9a691356e18b3bdcbc7b2db09494e040ec980a4a5fb6d0da261bf intel-microcode-20240910.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 6862565bc8d..24729494d0a 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20240531 +INTEL_MICROCODE_VERSION = 20240910 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From 5ab51299c126d2e2357e16d1e23f81649650ccd2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 23 Oct 2024 19:04:47 +0200 Subject: [PATCH 2892/3013] package/trace-cmd: bump to version 3.3.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 43fb08c7b18b0a0403b9cd793c9ff51f71ff6ab0) Signed-off-by: Peter Korsgaard --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index ac30eae85fb..c1b52a51950 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 0671048dd2b8abdb8b2d0eb9cc91335c997620a7da72f858381ff4206f32065f trace-cmd-v3.3.tar.gz +sha256 2efe103389367e93c764c4a788880ba51018a65dec21b0411965a5f06a6338c1 trace-cmd-v3.3.1.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index 14a59b2cc8e..cf16ddcb17a 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 3.3 +TRACE_CMD_VERSION = 3.3.1 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot From 3e6603ec122a167f93b6901f7d77d00958a1047f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 23 Oct 2024 19:04:46 +0200 Subject: [PATCH 2893/3013] package/libtraceevent: bump to version 1.8.4 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 54c88416e85136ae3da1808ce17bf9641666ae1d) Signed-off-by: Peter Korsgaard --- package/libtraceevent/libtraceevent.hash | 2 +- package/libtraceevent/libtraceevent.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtraceevent/libtraceevent.hash b/package/libtraceevent/libtraceevent.hash index d59e0a9188a..c0738de4e79 100644 --- a/package/libtraceevent/libtraceevent.hash +++ b/package/libtraceevent/libtraceevent.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 233d88adf5bae6b4511980f0f6314f348326b55fdb3dc9c4212c810e1ab06789 libtraceevent-1.8.3.tar.gz +sha256 dc456d4d2bf4b4cd4d0c737d3374a8093f9e5ca18c1d7fc2279a4bf41e613121 libtraceevent-1.8.4.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtraceevent/libtraceevent.mk b/package/libtraceevent/libtraceevent.mk index 35e1152d373..8c3514f265b 100644 --- a/package/libtraceevent/libtraceevent.mk +++ b/package/libtraceevent/libtraceevent.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEEVENT_VERSION = 1.8.3 +LIBTRACEEVENT_VERSION = 1.8.4 LIBTRACEEVENT_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot LIBTRACEEVENT_LICENSE = GPL-2.0, LGPL-2.1 LIBTRACEEVENT_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 From 06046f9e960113215158d00b7ed5235a45939d2f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Oct 2024 13:49:35 +0200 Subject: [PATCH 2894/3013] package/ruby: update to 3.3.5 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 9208ee8467f48d55adf91eba86ba8374c30556ed) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 3831e701fb0..d6622909e56 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ -sha512 b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb ruby-3.3.4.tar.xz +# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ +sha512 dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883 ruby-3.3.5.tar.xz # License files, Locally calculated sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 08ecbf5941e..2e04cb3e926 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).4 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).5 RUBY_VERSION_EXT = 3.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From 761eb4ad9ec61660567c7dacb6e16f437aa80a1b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Oct 2024 13:51:36 +0200 Subject: [PATCH 2895/3013] package/asterisk: update to 20.10.0 See here for a changelog: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-20.10.0.md Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 5ed6aa0fe30319e250fbe700895cfcd603c495ff) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index fe3e3642a4e..61686d9fe44 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 a15099a5c776045e96b0da2534606c8dbd13bc1ffcbe325f7cfd74dc1d29decb asterisk-20.9.3.tar.gz +sha256 a8162085b7d16f10d5cd16fc2e2cb8399dbe42bd1c321b14eec229fc0ed12570 asterisk-20.10.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index c7b97a1ad45..e27aa2f760d 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.9.3 +ASTERISK_VERSION = 20.10.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From ab14d47d9a0808e10ef6f75706708b7a6cc6eeb8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Oct 2024 14:19:43 +0200 Subject: [PATCH 2896/3013] package/bind: update to 9.18.31 See here for a changelog: https://downloads.isc.org/isc/bind9/9.18.31/doc/arm/html/notes.html#notes-for-bind-9-18-31 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit abb6d4bddce4bd619f335efee70bae72e7adf779) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index dbffff05ea6..abcbf0a9380 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.18.30/bind-9.18.30.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.18.31/bind-9.18.31.tar.xz.asc # with key 706B6C28620E76F91D11F7DF510A642A06C52CEC -sha256 9f6817640970267317e5aa143ecf70531040f2155636b1a63ea45379aa09034a bind-9.18.30.tar.xz +sha256 51b258969275c5206ef745a5aac03dbe98f1c8031fefed378d53597e7987b1b3 bind-9.18.31.tar.xz sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 81e608380d1..52b1e56c40c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.18.30 +BIND_VERSION = 9.18.31 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From b9d4a86552cdc28cdbd2bd4dc9c4fb1757a0e597 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 8 Oct 2024 19:48:59 +0200 Subject: [PATCH 2897/3013] package/sqlite: bump version to 3.46.1 Release notes: https://sqlite.org/releaselog/3_46_1.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 0ce51e24e5ba0c708b61899c49d638f056f71e38) Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 5eae86f1597..e9017c48554 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d sqlite-autoconf-3460000.tar.gz +sha256 67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071 sqlite-autoconf-3460100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 8bd0a5cb4dc..614b4b8ed22 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.46.0 -SQLITE_TAR_VERSION = 3460000 +SQLITE_VERSION = 3.46.1 +SQLITE_TAR_VERSION = 3460100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2024 SQLITE_LICENSE = blessing From 29eb209010d48500f66c2f2b642beabcd1017eee Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Thu, 3 Oct 2024 17:25:23 +0200 Subject: [PATCH 2898/3013] DEVELOPERS: drop my packages I still follow Buildroot development and use it for some personal projects, but no longer have the time to be an active contributor. Some of these are important defconfigs and packages to have up-to-date in Buildroot, and mostly other developers have been doing that work, so I am dropping them so that someone from the active contributors can be the maintainer contact for them. Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni (cherry picked from commit 1dc370cc9009b5362aad5e2e481703f0ca76b4a2) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8aee8d18ff4..d5f5eb0f979 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -914,18 +914,6 @@ N: Eric Limpens F: package/pifmrds/ F: package/ympd/ -N: Erico Nunes -F: board/aarch64-efi/ -F: configs/aarch64_efi_defconfig -F: package/acpica/ -F: package/acpitool/ -F: package/efibootmgr/ -F: package/efivar/ -F: package/fwts/ -F: package/spi-tools/ -F: package/xdotool/ -F: configs/pc_x86_64_* - N: Erik Larsson F: package/imx-mkimage/ From 24df18a14879ac27bf72aac1e57b49e5d2d49432 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 24 Oct 2024 22:17:35 +0200 Subject: [PATCH 2899/3013] package/python3: bump version to 3.12.7 Release notes: https://blog.python.org/2024/10/python-3127-released.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b6bc0912720206fa22a250b67f6a4d75bcdf8141) Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 0cd852c3259..ad73a85a7f2 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3126/ -md5 cb669514937d3e894e74081627722aa5 Python-3.12.6.tar.xz +# From https://www.python.org/downloads/release/python-3127/ +md5 c6c933c1a0db52597cb45a7910490f93 Python-3.12.7.tar.xz # Locally computed -sha256 1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c Python-3.12.6.tar.xz +sha256 24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550 Python-3.12.7.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 4b328f70fb0..d029d3dbbc6 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From b39aef82bc2ef59319fb706c65a8b034f34bf3da Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 24 Oct 2024 22:15:30 +0200 Subject: [PATCH 2900/3013] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 6, 11}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 70359eaa0dfdb79f7566fdaf9b0adc81c27bfe1d) [Peter: drop 6.11.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 8 ++++---- package/linux-headers/Config.in.host | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index ea13ab0aebe..0c15064167c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,10 +1,10 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz -sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz -sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz +sha256 e7df81e588d70fab5ec3ec3bb04ac53d51f0860fc3b1ec45e0a4167a026899db linux-6.6.58.tar.xz +sha256 2286e4a02ea2fbe65023dbf779f20aa994ba2b8d37ed559049378089451aa256 linux-6.1.114.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz -sha256 f6a19a64785965b9fcac0bcb6fd2412b45ca449495bb03592d46f9a50be51ca6 linux-5.10.226.tar.xz +sha256 e618c6d845fd1bc89477508e8d084bbe791fc88bf7623adee2deb6ecb2275370 linux-5.15.169.tar.xz +sha256 76cc8d7f1528f87902e38697229661d0617a7d6ab86166be9f3ef9a613b17b72 linux-5.10.228.tar.xz sha256 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b linux-5.4.284.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 4e27cdf999359876a0ff489bff6ece7ba5798ff37c2289db0c9e9422a9014162 linux-4.19.322.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index dcc49d4b318..e44ba290eaf 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -425,10 +425,10 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "4.19.322" if BR2_KERNEL_HEADERS_4_19 default "5.4.284" if BR2_KERNEL_HEADERS_5_4 - default "5.10.226" if BR2_KERNEL_HEADERS_5_10 - default "5.15.167" if BR2_KERNEL_HEADERS_5_15 - default "6.1.112" if BR2_KERNEL_HEADERS_6_1 - default "6.6.56" if BR2_KERNEL_HEADERS_6_6 + default "5.10.228" if BR2_KERNEL_HEADERS_5_10 + default "5.15.169" if BR2_KERNEL_HEADERS_5_15 + default "6.1.114" if BR2_KERNEL_HEADERS_6_1 + default "6.6.58" if BR2_KERNEL_HEADERS_6_6 default "6.10.14" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 05bf32e2aa02070868d45f0b3b9b6b76935af838 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 23 Sep 2024 07:46:25 +0200 Subject: [PATCH 2901/3013] package/iproute2: fix building error using designated initializers This patch fixes the following error: arpd.c:442:17: error: initialization of 'int' from 'void *' makes integer from pointer without a cast [-Wint-conversion] 442 | NULL, 0, The analysis of socket.h [1] containing the msghdr structure shows that it has been modified with the addition of padding fields, which cause the compilation error: struct msghdr { void *msg_name; socklen_t msg_namelen; struct iovec *msg_iov; #if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN int __pad1; #endif int msg_iovlen; #if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN int __pad1; #endif void *msg_control; #if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN int __pad2; #endif socklen_t msg_controllen; #if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN int __pad2; #endif int msg_flags; }; The use of designated initializers allows the issue to be fixed. [1] iproute2/host/mips64-buildroot-linux-musl/sysroot/usr/include/sys/socket.h Fixes: - http://autobuild.buildroot.org/results/e4cdfa38ae9578992f1c0ff5c4edae3cc0836e3c Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 57d94b293b0b0826a17784d326c46f0bdc02f685) Signed-off-by: Peter Korsgaard --- ...ted-initializers-for-msghdr-structur.patch | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/iproute2/0003-arpd-use-designated-initializers-for-msghdr-structur.patch diff --git a/package/iproute2/0003-arpd-use-designated-initializers-for-msghdr-structur.patch b/package/iproute2/0003-arpd-use-designated-initializers-for-msghdr-structur.patch new file mode 100644 index 00000000000..fbe89bac2ad --- /dev/null +++ b/package/iproute2/0003-arpd-use-designated-initializers-for-msghdr-structur.patch @@ -0,0 +1,63 @@ +From 32da5f26dee03600a9ca72a99016d95f05c4f1ec Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sat, 28 Sep 2024 11:03:11 +0200 +Subject: [PATCH] arpd: use designated initializers for msghdr structure + +This patch fixes the following error: + +arpd.c:442:17: error: initialization of 'int' from 'void *' makes integer from pointer without a cast [-Wint-conversion] + 442 | NULL, 0, + +raised by Buildroot autobuilder [1]. + +In the case in question, the analysis of socket.h [2] containing the +msghdr structure shows that it has been modified with the addition of +padding fields, which cause the compilation error. The use of designated +initializers allows the issue to be fixed. + +struct msghdr { + void *msg_name; + socklen_t msg_namelen; + struct iovec *msg_iov; + int __pad1; + int msg_iovlen; + int __pad1; + void *msg_control; + int __pad2; + socklen_t msg_controllen; + int __pad2; + int msg_flags; +}; + +[1] http://autobuild.buildroot.org/results/e4cdfa38ae9578992f1c0ff5c4edae3cc0836e3c/ +[2] iproute2/host/mips64-buildroot-linux-musl/sysroot/usr/include/sys/socket.h + +Signed-off-by: Dario Binacchi +Signed-off-by: Stephen Hemminger +Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=9c9824bcaf092cb99988d59717674b73b5d0d19c +--- + misc/arpd.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/misc/arpd.c b/misc/arpd.c +index 3185620f..983e546d 100644 +--- a/misc/arpd.c ++++ b/misc/arpd.c +@@ -437,10 +437,10 @@ static void get_kern_msg(void) + struct iovec iov; + char buf[8192]; + struct msghdr msg = { +- (void *)&nladdr, sizeof(nladdr), +- &iov, 1, +- NULL, 0, +- 0 ++ .msg_name = &nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, + }; + + iov.iov_base = buf; +-- +2.46.1 + From 538354038337edde9b6540117b967fe9f865c360 Mon Sep 17 00:00:00 2001 From: Raimundo Sagarzazu Date: Mon, 30 Sep 2024 13:42:14 +0000 Subject: [PATCH 2902/3013] package/jailhouse: fix python helper scripts installation When compiling jailhouse with BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS=y, installation is failing with error: /bin/sh: -c: line 1: syntax error near unexpected token ')' This error is due to an extra ')' character in the macro JAILHOUSE_INSTALL_HELPER_SCRIPTS. This commit fixes this typo. Signed-off-by: Raimundo Sagarzazu [Julien: reworded the commit log] Signed-off-by: Julien Olivain (cherry picked from commit 10d25d98edbc75d47f6a8838d91d39e48b12c895) Signed-off-by: Peter Korsgaard --- package/jailhouse/jailhouse.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index b5a8b40fddb..1354acf600c 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -44,7 +44,7 @@ define JAILHOUSE_INSTALL_HELPER_SCRIPTS $(HOST_DIR)/bin/python setup.py \ install --no-compile \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(TARGET_DIR)) + --root=$(TARGET_DIR) endef endif From c5faf339e2ed1b5b5b18e3577b031d9b2dae7bf7 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 8 Oct 2024 15:57:50 +0000 Subject: [PATCH 2903/3013] docs/manual/adding-packages-tips: mention check-package requirements Call out the requirements to run check-package and mention that Docker can be used to run check-package without installing dependencies. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 68de69c4d7f61ab5da4dd9cad221fb82e9e1abce) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-tips.adoc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/manual/adding-packages-tips.adoc b/docs/manual/adding-packages-tips.adoc index b04b42b51f9..85400c0f31f 100644 --- a/docs/manual/adding-packages-tips.adoc +++ b/docs/manual/adding-packages-tips.adoc @@ -64,6 +64,19 @@ The tool can also be used for packages in a br2-external: $ check-package -b /path/to/br2-ext-tree/package/my-package/* ---- +The +check-package+ script requires you install +shellcheck+ and the +Python PyPi packages +flake8+ and +python-magic+. The Buildroot code +base is currently tested against version 0.7.1 of ShellCheck. If you +use a different version of ShellCheck, you may see additional, +unfixed, warnings. + +If you have Docker or Podman you can run +check-package+ without +installing dependencies: + +---- +$ ./utils/docker-run ./utils/check-package +---- + [[testing-package]] ==== How to test your package From dbe772104c54f2d308cf56706a6b5625ab64af6b Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 8 Oct 2024 15:57:51 +0000 Subject: [PATCH 2904/3013] utils/check-package: add inline script requirements The check-package tool requires some PyPi package to be installed before it can run. This is typically done by manually installing them into the user's global Python environment or setting up a virtual environment, then manually installing each dependency. Python recently defined a format for managing script dependencies as inline metadata[1]. This can be used with the `uv` tool to run a Python script and automatically install the minimum required version of Python and PyPi dependencies. With this change, it's now possible to run check-package with uv run -s ./utils/check-package Note that, because check-package does not have the '.py' file extension we must specify the `-s` or `--script` argument. That argument was added very recently in release 0.4.19[2]. I set the minimum python to 3.9 as that is the oldest version still supported[3]. I verified 3.9 works by running uv run -p 3.9 -s ./utils/check-package `git ls-tree -r --name-only HEAD` --ignore-list=.checkpackageignore [1] https://packaging.python.org/en/latest/specifications/inline-script-metadata/#script-type [2] https://github.com/astral-sh/uv/releases/tag/0.4.19 [3] https://devguide.python.org/versions/ Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 6ffcdb52e80b63e68c890aed52ff7f4d00e079b8) Signed-off-by: Peter Korsgaard --- utils/check-package | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/check-package b/utils/check-package index 872e66c126b..6a5e89daa3c 100755 --- a/utils/check-package +++ b/utils/check-package @@ -1,5 +1,12 @@ #!/usr/bin/env python3 # See utils/checkpackagelib/readme.txt before editing this file. +# /// script +# requires-python = ">=3.9" +# dependencies = [ +# "flake8", +# "python-magic", +# ] +# /// import argparse import inspect From 1992d651b8f76484d01868b1386a39df9c6502f0 Mon Sep 17 00:00:00 2001 From: Cody Green Date: Sat, 5 Oct 2024 15:15:39 +0100 Subject: [PATCH 2905/3013] package/sysvinit: add version number to SYSVINIT_MAKE_OPTS Version environment variable VERSION=$(VERSION) is set in the top level Makefile of the sysvinit: $(MAKE) VERSION=$(VERSION) -C src $@ Build command SYSVINIT_BUILD_CMDS doesn't use the top level Makefile, but src/Makefile instead without setting the VERSION variable, which leads to undefined VERSION macro in src/init.c. Add VERSION=$(SYSVINIT_VERSION) to SYSVINIT_MAKE_OPTS to make the VERSION environment variable available in the src/Makefile. Signed-off-by: Cody Green Signed-off-by: Thomas Petazzoni (cherry picked from commit 954098b1423d3095112f49a6ac236ddb98236292) Signed-off-by: Peter Korsgaard --- package/sysvinit/sysvinit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index 7f37cea1318..e05a6dee386 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -11,7 +11,7 @@ SYSVINIT_LICENSE = GPL-2.0+ SYSVINIT_LICENSE_FILES = COPYING SYSVINIT_CPE_ID_VALID = YES -SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) +SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) VERSION=$(SYSVINIT_VERSION) ifeq ($(BR2_PACKAGE_LIBSELINUX),y) SYSVINIT_DEPENDENCIES += libselinux From 1e94d7913a67c904b18b484d5e935dfe6771ba2c Mon Sep 17 00:00:00 2001 From: Ralf Dragon Date: Fri, 5 Apr 2024 19:54:53 +0200 Subject: [PATCH 2906/3013] package/python-pyqt5-sip: new package This packages adds the PyQt5.sip module. The official documentation [1] mentions that this module is needed during PyQt5 runtime. It is currently compiled without any dependencies to Qt or PyQt5, but it seems quite useless without it. The module was introduced together with PyQt 5.11 [2]. [1] https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html#building-and-installing-from-source [2] https://www.riverbankcomputing.com/static/Docs/PyQt5/incompatibilities.html#pyqt-v5-11 Signed-off-by: Ralf Dragon Signed-off-by: Julien Olivain (cherry picked from commit 0281a71fe91ff0598be409b261cb38eda1d609a0) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-pyqt5-sip/Config.in | 7 +++++++ package/python-pyqt5-sip/python-pyqt5-sip.hash | 7 +++++++ package/python-pyqt5-sip/python-pyqt5-sip.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/python-pyqt5-sip/Config.in create mode 100644 package/python-pyqt5-sip/python-pyqt5-sip.hash create mode 100644 package/python-pyqt5-sip/python-pyqt5-sip.mk diff --git a/DEVELOPERS b/DEVELOPERS index d5f5eb0f979..c3626100718 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2704,6 +2704,9 @@ F: package/gupnp-av/ F: package/let-me-create/ F: package/nanomsg/ +N: Ralf Dragon +F: package/python-pyqt5-sip/ + N: Ramon Fried F: package/bitwise/ diff --git a/package/Config.in b/package/Config.in index 74e63419d64..56158d5b07c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1305,6 +1305,7 @@ menu "External python modules" source "package/python-pypng/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" + source "package/python-pyqt5-sip/Config.in" source "package/python-pyratemp/Config.in" source "package/python-pyroute2/Config.in" source "package/python-pyrsistent/Config.in" diff --git a/package/python-pyqt5-sip/Config.in b/package/python-pyqt5-sip/Config.in new file mode 100644 index 00000000000..3eda2c8d1f2 --- /dev/null +++ b/package/python-pyqt5-sip/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYQT5_SIP + bool "python-pyqt5-sip" + help + This is the PyQt5.sip module which is needed at runtime for + the PyQt5 module from package python-pyqt5. + + https://pypi.org/project/PyQt5-sip/ diff --git a/package/python-pyqt5-sip/python-pyqt5-sip.hash b/package/python-pyqt5-sip/python-pyqt5-sip.hash new file mode 100644 index 00000000000..fb4a8cb04d4 --- /dev/null +++ b/package/python-pyqt5-sip/python-pyqt5-sip.hash @@ -0,0 +1,7 @@ +# from https://pypi.org/project/PyQt5-sip/12.30.0 +sha256 7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91 PyQt5_sip-12.13.0.tar.gz + +# Hash for license files: +md5 9cd437778ebd1c056a76b4ded73b3a6d LICENSE +md5 e91355d8a6f8bd8f7c699d62863c7303 LICENSE-GPL2 +md5 7ea41d866d6638e430db5287a3f66090 LICENSE-GPL3 diff --git a/package/python-pyqt5-sip/python-pyqt5-sip.mk b/package/python-pyqt5-sip/python-pyqt5-sip.mk new file mode 100644 index 00000000000..e52081ab457 --- /dev/null +++ b/package/python-pyqt5-sip/python-pyqt5-sip.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-SIP-QT5 +# +################################################################################ + +PYTHON_PYQT5_SIP_VERSION = 12.13.0 +PYTHON_PYQT5_SIP_SITE = https://files.pythonhosted.org/packages/ee/81/fce2a475aa56c1f49707d9306b930695b6ff078c2242c9f2fd72a3214e1f +PYTHON_PYQT5_SIP_SOURCE = PyQt5_sip-$(PYTHON_PYQT5_SIP_VERSION).tar.gz +PYTHON_PYQT5_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 +PYTHON_PYQT5_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 +PYTHON_PYQT5_SIP_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 4c4c1f54b3d9d3eb78aa9bda5612e464cf710eae Mon Sep 17 00:00:00 2001 From: Ralf Dragon Date: Fri, 5 Apr 2024 19:54:54 +0200 Subject: [PATCH 2907/3013] package/python-pyqt5: add missing SIP module This fixes the following runtime error when importing PyQt5 in python: from PyQt5.QtCore import * ModuleNotFoundError: No module named 'PyQt5.sip' The problem was likely triggered by the atomic upgrade from 5.7 to 5.15 in b36ce7e. This commit is part of the 2022-2024 LTS. Signed-off-by: Ralf Dragon Tested-by: Andreas Naumann Signed-off-by: Julien Olivain (cherry picked from commit ba09a448f1e2e3b3123384ddddeb62d18bfa9461) [Peter: reword commit summary] Signed-off-by: Peter Korsgaard --- package/python-pyqt5/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pyqt5/Config.in b/package/python-pyqt5/Config.in index 9fa7676f987..0b37f14317a 100644 --- a/package/python-pyqt5/Config.in +++ b/package/python-pyqt5/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_PYTHON_PYQT5 bool "python-pyqt5" depends on BR2_PACKAGE_QT5 select BR2_PACKAGE_PYTHON_SIP + select BR2_PACKAGE_PYTHON_PYQT5_SIP # runtime select BR2_PACKAGE_QT5BASE_GUI help Python bindings for Qt 5 From 4ed30dd7cb8505d040506087d9a62a8ac41cd3a3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 9 Mar 2024 22:33:48 +0100 Subject: [PATCH 2908/3013] support/testing: add python-pyqt5 test Signed-off-by: Julien Olivain (cherry picked from commit d8c2c2cb57b87035908e234c0fc2127a34cfcf0d) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + .../tests/package/test_python_pyqt5.py | 79 +++++++++++++++++++ .../test_python_pyqt5/linux-vkms.fragment | 1 + .../rootfs-overlay/root/pyqt5test.py | 60 ++++++++++++++ 4 files changed, 142 insertions(+) create mode 100644 support/testing/tests/package/test_python_pyqt5.py create mode 100644 support/testing/tests/package/test_python_pyqt5/linux-vkms.fragment create mode 100755 support/testing/tests/package/test_python_pyqt5/rootfs-overlay/root/pyqt5test.py diff --git a/DEVELOPERS b/DEVELOPERS index c3626100718..45ecd60011d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1936,6 +1936,8 @@ F: support/testing/tests/package/test_python_midiutil.py F: support/testing/tests/package/test_python_ml_dtypes.py F: support/testing/tests/package/test_python_mpmath.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_python_pyqt5.py +F: support/testing/tests/package/test_python_pyqt5/ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_python_sympy.py F: support/testing/tests/package/test_rdma_core.py diff --git a/support/testing/tests/package/test_python_pyqt5.py b/support/testing/tests/package/test_python_pyqt5.py new file mode 100644 index 00000000000..5f1952b5590 --- /dev/null +++ b/support/testing/tests/package/test_python_pyqt5.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestPythonPyQt5(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - using a kernel config fragment, to enable VKMS, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + kernel_fragment = \ + infra.filepath("tests/package/test_python_pyqt5/linux-vkms.fragment") + rootfs_overlay = \ + infra.filepath("tests/package/test_python_pyqt5/rootfs-overlay") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.81" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_PACKAGE_DEJAVU=y + BR2_PACKAGE_LIBDRM=y + BR2_PACKAGE_MESA3D=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_LLVM=y + BR2_PACKAGE_MESA3D_OPENGL_EGL=y + BR2_PACKAGE_MESA3D_OPENGL_ES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYQT5=y + BR2_PACKAGE_QT5=y + BR2_PACKAGE_QT5BASE_EGLFS=y + BR2_PACKAGE_QT5BASE_FONTCONFIG=y + BR2_PACKAGE_QT5BASE_WIDGETS=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # We run the test application with a customized message. + # NOTE: to manually debug this test, a Qemu emulator with + # virtio-gpu can be used by starting it the command line from + # the run log generated by this test, and by adding the + # arguments "-device virtio-gpu -display gtk". With this, the + # test application will be observable on the Qemu window. Once + # logged, we can use the "card1" DRM/KMS device (virtio-gpu, + # instead of card0, which is vkms on "card0") by using the + # command: + # echo '{"device":"/dev/dri/card1"}' > cfg.json + # export QT_QPA_EGLFS_KMS_CONFIG="$PWD/cfg.json" + # The Qt debug can also be enabled with the command: + # export QT_LOGGING_RULES=*=true + # Then, run the /root/pyqt5test.py application. + msg = "Hello Buildroot." + cmd = f'/root/pyqt5test.py "{msg}"' + self.assertRunOk(cmd, timeout=30) + + # We check the test message is present in the file created by + # the previous application execution. + cmd = f'grep -F "{msg}" /root/message.txt' + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_python_pyqt5/linux-vkms.fragment b/support/testing/tests/package/test_python_pyqt5/linux-vkms.fragment new file mode 100644 index 00000000000..ec2ed4460c7 --- /dev/null +++ b/support/testing/tests/package/test_python_pyqt5/linux-vkms.fragment @@ -0,0 +1 @@ +CONFIG_DRM_VKMS=y diff --git a/support/testing/tests/package/test_python_pyqt5/rootfs-overlay/root/pyqt5test.py b/support/testing/tests/package/test_python_pyqt5/rootfs-overlay/root/pyqt5test.py new file mode 100755 index 00000000000..3efeed76876 --- /dev/null +++ b/support/testing/tests/package/test_python_pyqt5/rootfs-overlay/root/pyqt5test.py @@ -0,0 +1,60 @@ +#! /usr/bin/env python3 +# +# This is a test application for PyQt5. It is showing a text label and +# a "quit" button. The text of the label can be set with the first +# (non-Qt) command line argument. A timer will send a click signal to +# the quit button after 3 seconds. When quitting, the text of the +# label is saved in a "message.txt" file in the current working +# directory. + +import sys + +from PyQt5.QtCore import PYQT_VERSION_STR, QFile, QIODevice, QT_VERSION_STR, QTextStream, QTimer, Qt +from PyQt5.QtWidgets import QApplication, QLabel, QPushButton, QVBoxLayout, QWidget + + +class TestApp(QWidget): + + def __init__(self, message, parent=None): + super(TestApp, self).__init__(parent) + + self.label = QLabel(message) + self.label.setAlignment(Qt.AlignCenter) + + self.button = QPushButton("Quit") + self.button.clicked.connect(self.on_button_clicked) + + self.layout = QVBoxLayout() + self.layout.addWidget(self.label) + self.layout.addWidget(self.button) + + self.setLayout(self.layout) + + self.timer = QTimer() + self.timer.timeout.connect(self.button.click) + + def on_button_clicked(self): + self.save_message() + app.quit() + + def save_message(self): + f = QFile("message.txt") + if f.open(QIODevice.WriteOnly): + QTextStream(f) << (self.label.text() + '\n') + f.close() + + +if __name__ == "__main__": + print("PyQt5 test for Buildroot") + print(f"Qt version {QT_VERSION_STR}") + print(f"PyQt version {PYQT_VERSION_STR}") + + msg = "Hello World" + app = QApplication(sys.argv) + args = app.arguments() + if len(args) > 1: + msg = args[1] + testApp = TestApp(message=msg) + testApp.show() + testApp.timer.start(3000) + sys.exit(app.exec()) From 53b14b7cee597a835ea05e132154b4150bf2499f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 30 Sep 2024 21:36:27 +0200 Subject: [PATCH 2909/3013] package/liblinear: fix _SITE url The package _SITE url only contains the latest version at a given point in time. When a new version is published, it is replacing the old one. This issue was not detected because the archive was downloaded from the sources.buildroot.org backup mirror, when the primary source became unavailable. Since commit 559bb33ae "support/testing: do not use s.b.o" [1], the runtime test infrastructure is disabling this backup mirror. This makes the nmap runtime test failing [2], which is using liblinear as a dependency. The liblinear package author confirmed in a private email that all the releases, including the latest version, are all kept in the "oldfiles" directory. This commit fixes this download issue by updating the _SITE url to that location. While at it, this commit also change the url to use https (since the http equivalent redirects to https). Fixes: - [2] [1] https://gitlab.com/buildroot.org/buildroot/-/commit/559bb33ae71dd2358ca2314ccb24b56cc3809fc1 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/7948008007 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 8b18c67f2651ac64e865a1dbd46de60ce8390959) Signed-off-by: Peter Korsgaard --- package/liblinear/liblinear.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/liblinear/liblinear.mk b/package/liblinear/liblinear.mk index 014f9e2de47..134673a230a 100644 --- a/package/liblinear/liblinear.mk +++ b/package/liblinear/liblinear.mk @@ -5,7 +5,7 @@ ################################################################################ LIBLINEAR_VERSION = 2.45 -LIBLINEAR_SITE = http://www.csie.ntu.edu.tw/~cjlin/liblinear +LIBLINEAR_SITE = https://www.csie.ntu.edu.tw/~cjlin/liblinear/oldfiles LIBLINEAR_LICENSE = BSD-3-Clause LIBLINEAR_LICENSE_FILES = COPYRIGHT LIBLINEAR_INSTALL_STAGING = YES From 5ab7b6f267313cbfef1042af959bc9b054a32278 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 30 Sep 2024 21:37:43 +0200 Subject: [PATCH 2910/3013] package/liblinear: change homepage url to use https The package homepage http url redirects to https. This commit updates this url to directly use https. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 5440d6c4464d8dd25c9315e49e97cd91884ccde2) Signed-off-by: Peter Korsgaard --- package/liblinear/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/liblinear/Config.in b/package/liblinear/Config.in index cabcba05add..8c112678cc8 100644 --- a/package/liblinear/Config.in +++ b/package/liblinear/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBLINEAR liblinear is a linear classifier for data with millions of instances and features. - http://www.csie.ntu.edu.tw/~cjlin/liblinear/ + https://www.csie.ntu.edu.tw/~cjlin/liblinear/ comment "liblinear needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP From 1b02ba29abe2bfe71db7f5e4c3affbcde08db3e1 Mon Sep 17 00:00:00 2001 From: He Haorui Date: Fri, 20 Sep 2024 16:30:37 +0800 Subject: [PATCH 2911/3013] package/openjdk: fix typo in help text of openjdk zero Signed-off-by: He Haorui Signed-off-by: Thomas Petazzoni (cherry picked from commit 9f3e805428302c16769da78ce6604d5db77fbc39) Signed-off-by: Peter Korsgaard --- package/openjdk/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 25d6960ecf1..78775370ca8 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -148,7 +148,7 @@ config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO select BR2_PACKAGE_LIBFFI help A non-assembler variant with wide arch support, however - performance is less then client/server. + performance is less than client/server. http://openjdk.java.net/projects/zero From a480672ef0a36c0ed4de47e9a2a6d7940b938b37 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 20 Sep 2024 12:39:00 +0200 Subject: [PATCH 2912/3013] package/nethogs: add patch to fix version generation This fixes nethogs being built with the (mangled) buildroot version name from the outer buildroot git repo. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 3d28ee3318dee87e4339e709a46ac1eac25810f6) Signed-off-by: Peter Korsgaard --- ...termineVersion-sh-prevent-traversing.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/nethogs/0001-determineVersion-sh-prevent-traversing.patch diff --git a/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch b/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch new file mode 100644 index 00000000000..6f39c53128d --- /dev/null +++ b/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch @@ -0,0 +1,31 @@ +From 6423bdf05d51efc5441c82248098f99e4c1f59c3 Mon Sep 17 00:00:00 2001 +From: Marcus Hoffmann +Date: Fri, 20 Sep 2024 12:06:26 +0200 +Subject: [PATCH] determineVersion.sh: prevent traversing into outer git repo + for git-describe call + +When building nethogs inside another git repo (as is i.e. done as part +of a buildroot build) the version is picked up from the outer git repo, +which is confusing as well as introducing reproducibility problems when +rebuilding the same nethogs version produces different results if the +outer repository changes. + +Upstream: https://github.com/raboof/nethogs/commit/6423bdf05d51efc5441c82248098f99e4c1f59c3 +Signed-off-by: Marcus Hoffmann +--- + determineVersion.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/determineVersion.sh b/determineVersion.sh +index 7c5f1de..3d80d9d 100755 +--- a/determineVersion.sh ++++ b/determineVersion.sh +@@ -1,3 +1,6 @@ + #!/bin/bash +- +-(git describe --tags 2>/dev/null || pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//") | tail -c +2 ++if [ $(git rev-parse --show-toplevel 2>/dev/null) == $(pwd) ]; then ++ git describe --tags 2>/dev/null | tail -c +2 ++else ++ pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//" | tail -c +2 ++fi From 7b062accfba12fd0d58030bfd69fee1a96178855 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Sep 2024 19:26:34 +0200 Subject: [PATCH 2913/3013] package/libxml2: bump version to 2.13.4 Release notes: https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.4.news Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit fb4d73973b7bae6c922ea88c18b24e09a11b6e7b) Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 7b9ffc5d47d..ed6c20e9488 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.3.sha256sum -sha256 0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138 libxml2-2.13.3.tar.xz +# From https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.4.sha256sum +sha256 65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650 libxml2-2.13.4.tar.xz # License files, locally calculated sha256 c99aae1afe013e50b8b3701e089222b351258043c3025b64053a233fd25b4be7 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 068ce157d50..8a5d703da6e 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.13 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From 2e056c4776997601774363e29d1a2d5526788640 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 19 Sep 2024 11:18:19 +0300 Subject: [PATCH 2914/3013] package/postgresql: fix build without BR2_TOOLCHAIN_HAS_THREADS_NPTL Since commit: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=52afe563206e753f4c45c014fee2459ad0855826 postgrsql fails to build with toolchains without threads support: misc.c: In function 'ecpg_gettext': misc.c:541:51: error: 'PTHREAD_MUTEX_INITIALIZER' undeclared (first use in this function) 541 | static pthread_mutex_t binddomain_mutex = PTHREAD_MUTEX_INITIALIZER; | ^~~~~~~~~~~~~~~~~~~~~~~~~ misc.c:541:51: note: each undeclared identifier is reported only once for each function it appears in misc.c:552:24: warning: implicit declaration of function 'pthread_mutex_lock' [-Wimplicit-function-declaration] 552 | (void) pthread_mutex_lock(&binddomain_mutex); | ^~~~~~~~~~~~~~~~~~ misc.c:569:24: warning: implicit declaration of function 'pthread_mutex_unlock' [-Wimplicit-function-declaration] 569 | (void) pthread_mutex_unlock(&binddomain_mutex); | ^~~~~~~~~~~~~~~~~~~~ Option "--disable-thread-safety" will be dropped in PG 17, so this patch is needed only for 16.x branch. Fixes: 73dd1d6b9666 ("package/postgresql: security bump version to 16.3") Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 747a41c19c3ab49981beff8166679a9f49acf0d8) Signed-off-by: Peter Korsgaard --- .../0001-Fix-compile-without-threads.patch | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/postgresql/0001-Fix-compile-without-threads.patch diff --git a/package/postgresql/0001-Fix-compile-without-threads.patch b/package/postgresql/0001-Fix-compile-without-threads.patch new file mode 100644 index 00000000000..a280df540f7 --- /dev/null +++ b/package/postgresql/0001-Fix-compile-without-threads.patch @@ -0,0 +1,87 @@ +From 6c71182dde4d37fd70ee8015f61935254ae6f9a6 Mon Sep 17 00:00:00 2001 +From: Maxim Kochetkov +Date: Thu, 19 Sep 2024 10:04:05 +0300 +Subject: [PATCH] Fix compile without threads + +All mutexes should be wrapped by #ifdef ENABLE_THREAD_SAFETY. + +Fixes: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=52afe563206e753f4c45c014fee2459ad0855826 +Signed-off-by: Maxim Kochetkov +Signed-off-by: Maxim Kochetkov +Upstream: N/A, as --disable-thread-safety will disappear in PostgreSQL 17. +--- + src/interfaces/ecpg/ecpglib/misc.c | 6 ++++++ + src/interfaces/libpq/fe-misc.c | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c +index 4b54322926..5a4d2e847e 100644 +--- a/src/interfaces/ecpg/ecpglib/misc.c ++++ b/src/interfaces/ecpg/ecpglib/misc.c +@@ -538,7 +538,9 @@ ecpg_gettext(const char *msgid) + * might as well do it the same way everywhere. + */ + static volatile bool already_bound = false; ++#ifdef ENABLE_THREAD_SAFETY + static pthread_mutex_t binddomain_mutex = PTHREAD_MUTEX_INITIALIZER; ++#endif + + if (!already_bound) + { +@@ -549,7 +551,9 @@ ecpg_gettext(const char *msgid) + int save_errno = errno; + #endif + ++#ifdef ENABLE_THREAD_SAFETY + (void) pthread_mutex_lock(&binddomain_mutex); ++#endif + + if (!already_bound) + { +@@ -566,7 +570,9 @@ ecpg_gettext(const char *msgid) + already_bound = true; + } + ++#ifdef ENABLE_THREAD_SAFETY + (void) pthread_mutex_unlock(&binddomain_mutex); ++#endif + + #ifdef WIN32 + SetLastError(save_errno); +diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c +index 488f7d6e55..2185e0ba7a 100644 +--- a/src/interfaces/libpq/fe-misc.c ++++ b/src/interfaces/libpq/fe-misc.c +@@ -1232,7 +1232,9 @@ libpq_binddomain(void) + * might as well do it the same way everywhere. + */ + static volatile bool already_bound = false; ++#ifdef ENABLE_THREAD_SAFETY + static pthread_mutex_t binddomain_mutex = PTHREAD_MUTEX_INITIALIZER; ++#endif + + if (!already_bound) + { +@@ -1243,7 +1245,9 @@ libpq_binddomain(void) + int save_errno = errno; + #endif + ++#ifdef ENABLE_THREAD_SAFETY + (void) pthread_mutex_lock(&binddomain_mutex); ++#endif + + if (!already_bound) + { +@@ -1260,7 +1264,9 @@ libpq_binddomain(void) + already_bound = true; + } + ++#ifdef ENABLE_THREAD_SAFETY + (void) pthread_mutex_unlock(&binddomain_mutex); ++#endif + + #ifdef WIN32 + SetLastError(save_errno); +-- +2.45.2 + From 312984bdbd044549cc36504e01ba3b60c94ed6f1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 13 Oct 2024 18:47:59 +0200 Subject: [PATCH 2915/3013] support/testing: package: bitcoin: fix test by increasing timeouts Generating Bitcoins to an address can take longer than the current timeout, on slow runners. This commit fixes this issue by increasing the timeout on specific commands. This issue was also observed more frequently on newer bitcoin-core version 28.0. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7782083081 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 859c4ea5f74f713777ffa980f1627b46a311bdd4) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_bitcoin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_bitcoin.py b/support/testing/tests/package/test_bitcoin.py index 93aa9383ab6..1f00345a12e 100644 --- a/support/testing/tests/package/test_bitcoin.py +++ b/support/testing/tests/package/test_bitcoin.py @@ -130,7 +130,7 @@ def test_run(self): # #1. We should receive the 50 BTC reward at this address. cmd = self.cli_cmd cmd += f" generatetoaddress {req_blk_count} {btc_addr1}" - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=30) # We should now see the previously created blocks. cur_blk_cnt = self.get_block_count() @@ -169,7 +169,7 @@ def test_run(self): # the previous transaction (but this will not give the 50 BTC # reward). cmd = f"{self.cli_cmd} generatetoaddress 1 {btc_addr2}" - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=30) # We should see one more block. cur_blk_cnt = self.get_block_count() From 0b32232cdeee7883a930e6f676fbc2d5a31d0cfe Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 15 Aug 2024 15:56:49 +0200 Subject: [PATCH 2916/3013] support/testing: add unbound runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 04c91340ffefbfd7d4293e6e0b5e40a0e10c48b8) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_unbound.py | 79 +++++++++++++++++++ .../rootfs-overlay/etc/unbound/unbound.conf | 17 ++++ 3 files changed, 98 insertions(+) create mode 100644 support/testing/tests/package/test_unbound.py create mode 100644 support/testing/tests/package/test_unbound/rootfs-overlay/etc/unbound/unbound.conf diff --git a/DEVELOPERS b/DEVELOPERS index 45ecd60011d..d6a50192f50 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1959,6 +1959,8 @@ F: support/testing/tests/package/test_tesseract_ocr.py F: support/testing/tests/package/test_thttpd.py F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ +F: support/testing/tests/package/test_unbound.py +F: support/testing/tests/package/test_unbound/ F: support/testing/tests/package/test_usbutils.py F: support/testing/tests/package/test_usbutils/ F: support/testing/tests/package/test_vorbis_tools.py diff --git a/support/testing/tests/package/test_unbound.py b/support/testing/tests/package/test_unbound.py new file mode 100644 index 00000000000..c92719badcd --- /dev/null +++ b/support/testing/tests/package/test_unbound.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestUnbound(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_unbound/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_UNBOUND=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("unbound -V") + + # Verify that the configuration checker validates our file. + self.assertRunOk("unbound-checkconf") + + # Our test configuration enabled the unbound remote + # control. The unbound server is supposed to be started by the + # sysv initscript. We should see the already running server. + out, ret = self.emulator.run("unbound-control status") + self.assertEqual(ret, 0) + self.assertRegex("\n".join(out), r"unbound \(pid \d+\) is running") + + # We check the "unbound-host" program is working with a simple + # query. Note: this local query succeed even if the unbound + # server is not running. We are only testing this program + # here. The server side will be tested with the BusyBox + # "nslookup" applet. + out, ret = self.emulator.run("unbound-host -t A localhost.") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "localhost. has address 127.0.0.1") + + # We test few other "unbound-control" commands. + self.assertRunOk("unbound-control stats") + self.assertRunOk("unbound-control list_local_zones") + + # We check we see our test IPv4 address record. + cmd = "nslookup -type=A somehost.buildroot.test." + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Address: 10.20.30.40", out) + + # We also check we see our reverse record. + cmd = "nslookup 10.20.30.40" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + expected = "40.30.20.10.in-addr.arpa\tname = somehost.buildroot.test" + self.assertIn(expected, out) + + # We check we see our test text record. + cmd = "nslookup -type=TXT sometext.buildroot.test." + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + expected = "sometext.buildroot.test\ttext = \"Hello Buildroot TXT\"" + self.assertIn(expected, out) + + # We add a new record with unbound-control. + record_data = "someotherhost.buildroot.test. IN A 10.99.99.99" + cmd = f"unbound-control local_data \"{record_data}\"" + self.assertRunOk(cmd) + + # We check we see our new IPv4 address record. + cmd = "nslookup -type=A someotherhost.buildroot.test." + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Address: 10.99.99.99", out) diff --git a/support/testing/tests/package/test_unbound/rootfs-overlay/etc/unbound/unbound.conf b/support/testing/tests/package/test_unbound/rootfs-overlay/etc/unbound/unbound.conf new file mode 100644 index 00000000000..4f8202d1275 --- /dev/null +++ b/support/testing/tests/package/test_unbound/rootfs-overlay/etc/unbound/unbound.conf @@ -0,0 +1,17 @@ +# +# Unbound configuration file for Buildroot runtime test. +# + +server: + do-ip6: no + local-zone: "test." nodefault + local-zone: "10.in-addr.arpa." nodefault + private-domain: "buildroot.test" + local-zone: "buildroot.test" static + local-data: "somehost.buildroot.test. IN A 10.20.30.40" + local-data: 'sometext.buildroot.test. TXT "Hello Buildroot TXT"' + local-data-ptr: "10.20.30.40 somehost.buildroot.test" + +remote-control: + control-enable: yes + control-use-cert: no From 18a325d3a468856363f7d04fd3f45c85e29939c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 26 Oct 2024 18:59:41 +0200 Subject: [PATCH 2917/3013] package/ltrace: mark as unavailable on musl Commit bf9583a50276f52edbc37d9f85df5f2cc7fdb5dc enabled elfutils on musl, as well as all its reverse dependencies, including ltrace. Turns out that even with elfutils fixed, ltrace doesn't build on musl. Fabrice proposed a patch to fix it, at: https://patchwork.ozlabs.org/project/buildroot/patch/20231104155857.110364-1-fontaine.fabrice@gmail.com/ but ltrace has no active upstream, and some aspects of the patch don't look correct. So err on the safe side and make ltrace unavailable for musl configurations. Fixes: http://autobuild.buildroot.org/results/a3a5c46e8562d3f091a9b4b205322168fbf9d16b Signed-off-by: Thomas Petazzoni (cherry picked from commit 859bd545821a838454577c4c1c9106837cda51cb) Signed-off-by: Peter Korsgaard --- package/ltrace/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in index 21d381db705..2dc969c4f1b 100644 --- a/package/ltrace/Config.in +++ b/package/ltrace/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_LTRACE depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS select BR2_PACKAGE_ELFUTILS help @@ -25,7 +26,8 @@ config BR2_PACKAGE_LTRACE http://ltrace.org -comment "ltrace needs a toolchain w/ wchar, dynamic library, threads" +comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) From bd1d78763755868680d0fcf42c55e357d9e2bbf9 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 16 Sep 2024 10:14:46 +0300 Subject: [PATCH 2918/3013] package/wpebackend-fdo: bump version to 1.14.3 This is a bugfix release which plugs a couple of small leaks, and includes patch "0001-Cast-to-EGLNativeWindowType-explicitly.patch", which can now be removed. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.14.3.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit ab3fb12c79e3edd809923f762cafcedd29b9df29) Signed-off-by: Peter Korsgaard --- ...st-to-EGLNativeWindowType-explicitly.patch | 36 ------------------- package/wpebackend-fdo/wpebackend-fdo.hash | 7 ++-- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 3 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch diff --git a/package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch b/package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch deleted file mode 100644 index eae0d22e308..00000000000 --- a/package/wpebackend-fdo/0001-Cast-to-EGLNativeWindowType-explicitly.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e56a2597eb66c2221b004aa3356b06c1b071b5b5 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Wed, 14 Aug 2024 00:51:26 +0300 -Subject: [PATCH] Cast to EGLNativeWindowType explicitly - -In order to avoid off build failures due to mismatching (but -compatible) declarations of wl_egl_window and EGLNativeWindowType, -add an explicit cast to EGLNativeWindowType inside the -TargetWayland::nativeWindow() function. - -Solves the following build issue found by the Buildroot autobuilders: - - http://autobuild.buildroot.net/results/92c5cc3134e92c263a0cbb4c05ef8956569e434b/ - -Signed-off-by: Adrian Perez de Castro -Upstream: https://github.com/Igalia/WPEBackend-fdo/commit/e56a2597eb66c2221b004aa3356b06c1b071b5b5 ---- - src/egl-client-wayland.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/egl-client-wayland.cpp b/src/egl-client-wayland.cpp -index 10e02f0..22bb212 100644 ---- a/src/egl-client-wayland.cpp -+++ b/src/egl-client-wayland.cpp -@@ -63,7 +63,7 @@ TargetWayland::~TargetWayland() - - EGLNativeWindowType TargetWayland::nativeWindow() const - { -- return m_egl.window; -+ return (EGLNativeWindowType) m_egl.window; - } - - void TargetWayland::resize(uint32_t width, uint32_t height) --- -2.46.0 - diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 26ba1217271..5055998ab7d 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,6 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.2.tar.xz.sums -sha1 f453f8d77e93f4ac6ac81c1874d4d6bdcb45c253 wpebackend-fdo-1.14.2.tar.xz -sha256 93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38 wpebackend-fdo-1.14.2.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.3.tar.xz.sums +md5 ab73398b1e35495977e50bee103969d2 wpebackend-fdo-1.14.3.tar.xz +sha1 2d2945df15cc1efa957657fa727f3bc4c6f580bb wpebackend-fdo-1.14.3.tar.xz +sha256 10121842595a850291db3e82f3db0b9984df079022d386ce42c2b8508159dc6c wpebackend-fdo-1.14.3.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index 7ef347b6221..dbabacf4984 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.14.2 +WPEBACKEND_FDO_VERSION = 1.14.3 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From e81be1b267f2ec8c92b1899aec8d689c9fbd65f7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Aug 2024 09:25:39 +0200 Subject: [PATCH 2919/3013] package/file: fix musl compile issue It is not totally clear which update is responsible for the breakage. The breakage has been occurring for as long as Jan 2022. Therefore it should be backported to older supported buildroot releases. Add a patch from Gentoo people, also reported Upstream to fix the issue. Fixes: http://autobuild.buildroot.org/results/abf/abfe66cec3680d396c5774ba492f34599e513edc/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 71f36ef9385f860683b5c39a2c3af9f821833c5a) Signed-off-by: Peter Korsgaard --- .../0001-file-seccomp-fstatat64-musl.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/file/0001-file-seccomp-fstatat64-musl.patch diff --git a/package/file/0001-file-seccomp-fstatat64-musl.patch b/package/file/0001-file-seccomp-fstatat64-musl.patch new file mode 100644 index 00000000000..ecb12fe44e1 --- /dev/null +++ b/package/file/0001-file-seccomp-fstatat64-musl.patch @@ -0,0 +1,32 @@ +From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 15 Jun 2021 16:08:22 -0400 +Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl + +sys/stat.h in musl does this: + + #define fstatat64 fstatat + +Counteract this with an #undef. + +Bug: https://bugs.gentoo.org/789336 +Bug: https://bugs.astron.com/view.php?id=473 +Signed-off-by: Mike Gilbert +Signed-off-by: Waldemar Brodkorb +Upstream: N/A under discussion +--- + src/seccomp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/seccomp.c b/src/seccomp.c +index 5a39ee45..d2a1139a 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -205,6 +205,7 @@ enable_sandbox_full(void) + #endif + ALLOW_RULE(fstat64); + #ifdef __NR_fstatat64 ++#undef fstatat64 + ALLOW_RULE(fstatat64); + #endif + ALLOW_RULE(futex); From 875a47470e4eb30ce702e54c7e9df78f61ac1ae6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 22:59:47 +0200 Subject: [PATCH 2920/3013] package/libldns: bump to version 1.8.4 Switched _SITE to https. Changelog: https://github.com/NLnetLabs/ldns/blob/1.8.4/Changelog Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d9db8cfd787526df7b328875038a658a3021579a) Signed-off-by: Peter Korsgaard --- package/libldns/libldns.hash | 8 ++++---- package/libldns/libldns.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash index ff86ae348ea..ffdfbedc137 100644 --- a/package/libldns/libldns.hash +++ b/package/libldns/libldns.hash @@ -1,7 +1,7 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz.sha1 -sha1 2796cc49636f68260c9662b60d5a7c9e6eed195c ldns-1.8.3.tar.gz -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz.sha256 -sha256 c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860 ldns-1.8.3.tar.gz +# From https://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.4-rc.1.tar.gz.sha1 +sha1 43d013b904e6df5ac5e28001cdc91bef537f3f6f ldns-1.8.4.tar.gz +# From https://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.4.tar.gz.sha256 +sha256 838b907594baaff1cd767e95466a7745998ae64bc74be038dccc62e2de2e4247 ldns-1.8.4.tar.gz # Hash for license file: sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index d6af6a2b97a..0740d09fab2 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBLDNS_VERSION = 1.8.3 +LIBLDNS_VERSION = 1.8.4 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz -LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns +LIBLDNS_SITE = https://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause LIBLDNS_LICENSE_FILES = LICENSE LIBLDNS_CPE_ID_VENDOR = nlnetlabs From 2d7514186bf1a4c8ce8b38bad4219d5f94376e76 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:00:33 +0200 Subject: [PATCH 2921/3013] package/libopenh264: bump version to 2.4.1 Release notes: https://github.com/cisco/openh264/releases/tag/v2.4.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit fe8a141a845762bfe3b3dc7d16bf81c5f0991761) Signed-off-by: Peter Korsgaard --- package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index fe98b7773f9..6eb78e2009d 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a44d1ccc348a790f9a272bba2d1c2eb9a9bbd0302e4e9b655d709e1c32f92691 libopenh264-2.4.0.tar.gz +sha256 8ffbe944e74043d0d3fb53d4a2a14c94de71f58dbea6a06d0dc92369542958ea libopenh264-2.4.1.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index 478c29d7a87..e371e4cdc04 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.4.0 +LIBOPENH264_VERSION = 2.4.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From 2f6c9f86326dbcc20fca7c2ad7e81f7e4719377b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:01:01 +0200 Subject: [PATCH 2922/3013] package/libpng: bump version to 1.6.44 Release notes: https://sourceforge.net/p/png-mng/mailman/message/58815959/ https://raw.githubusercontent.com/pnggroup/libpng/v1.6.44/ANNOUNCE Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 583bb434ffe1eec0dbf6887dd719c3f41a6253e9) Signed-off-by: Peter Korsgaard --- package/libpng/libpng.hash | 4 ++-- package/libpng/libpng.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index 356c0e3e5df..3fd4033f837 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/58741099/ -sha256 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c libpng-1.6.43.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/58815959/ +sha256 60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e libpng-1.6.44.tar.xz # Locally computed: sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index af38afde47f..3e7fc42d828 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.43 +LIBPNG_VERSION = 1.6.44 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) From 6b141aac099a6e4d7e9b86701cb59e14091384a8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:02:34 +0200 Subject: [PATCH 2923/3013] package/jsoncpp: bump version to 1.9.6 Release notes: https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d7dbcfb9826c92a9b1a73c0c842034eddd93250a) Signed-off-by: Peter Korsgaard --- package/jsoncpp/jsoncpp.hash | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jsoncpp/jsoncpp.hash b/package/jsoncpp/jsoncpp.hash index 99266ae42df..0fa9b89422b 100644 --- a/package/jsoncpp/jsoncpp.hash +++ b/package/jsoncpp/jsoncpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 jsoncpp-1.9.5.tar.gz +sha256 f93b6dd7ce796b13d02c108bc9f79812245a82e577581c4c9aabe57075c90ea2 jsoncpp-1.9.6.tar.gz sha256 cec0db5f6d7ed6b3a72647bd50aed02e13c3377fd44382b96dc2915534c042ad LICENSE diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 5ef62befbc3..9915907ea8c 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.9.5 +JSONCPP_VERSION = 1.9.6 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE From 1af9d61495b027d9f5492a565531e200d0248b0f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:03:04 +0200 Subject: [PATCH 2924/3013] package/ghostscript: security bump version to 10.04.0 Release notes: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/tag/gs10040 Fixes CVE-2024-46951, CVE-2024-46952, CVE-2024-46953, CVE-2024-46954, CVE-2024-46955 & CVE-2024-46956. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7e04066369cb836c380329434e37d24685cc7f81) Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index ed8e4cf7d9b..c64ab80eb0d 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10031/SHA512SUMS -sha512 59e071cd23aed246b51317d3cccd9ccf8e1e84c4ecf9b22fb938e561eff42cec61915b0bdd96a313a3ea27750579c54ca0d0862b65edd306a621731c0063ffd3 ghostscript-10.03.1.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10040/SHA512SUMS +sha512 2e711f8ba86491570684f13851190f41e6eee87dcfacce0a4adfd09a4523abf2e0b6727f0958ee2683834218f5705675b531fd2419cb7fc314ed4becf51f3ce3 ghostscript-10.04.0.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 80e2543d1c6..a29ab9b66e0 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.03.1 +GHOSTSCRIPT_VERSION = 10.04.0 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From bd5916988a6e4aeee162404bfee4baf495910e3f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:04:05 +0200 Subject: [PATCH 2925/3013] package/tor: bump version to 0.4.8.13 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes https://forum.torproject.org/t/new-tor-stable-release-0-4-8-13/15397 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3622321b17a86949d8a6ddc9fda77340ec1f1cd1) Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index bea590b133a..eb0ab728d27 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.12.tar.gz.sha256sum -sha256 ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874 tor-0.4.8.12.tar.gz +# From https://dist.torproject.org/tor-0.4.8.13.tar.gz.sha256sum +sha256 9baf26c387a2820b3942da572146e6eb77c2bc66862af6297cd02a074e6fba28 tor-0.4.8.13.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 4d7fabc79f4..042ed75a7bf 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.12 +TOR_VERSION = 0.4.8.13 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 817b3b756282c00c05df7f910fd40442ce3c5ed1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:06:02 +0200 Subject: [PATCH 2926/3013] package/php: bump version to 8.3.13 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://news-web.php.net/php.announce/442 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b0760d4485c986cbddd5de73b7922dd720c8d3eb) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 3110e205eff..9cbb600c98d 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f774e28633e26fc8c5197f4dae58ec9e3ff87d1b4311cbc61ab05a7ad24bd131 php-8.3.12.tar.xz +sha256 89adb978cca209124fe53fd6327bc4966ca21213a7fa2e9504f854e340873018 php-8.3.13.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 32029023221..17feb90d82b 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.12 +PHP_VERSION = 8.3.13 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 97b722418cfe253f5989daa11867a11bfecba791 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:32:25 +0200 Subject: [PATCH 2927/3013] package/heimdal: Fix build with autoconf-2.72 Fixes: http://autobuild.buildroot.net/results/175/175fb65f0151866cd2d83c91c23b453d8c4489f7/ https://bugs.busybox.net/show_bug.cgi?id=15991 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a79d0b467f60e7d198c25549166a1383bb978392) Signed-off-by: Peter Korsgaard --- ...file.m4-Fix-build-with-autoconf-2.72.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch diff --git a/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch b/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch new file mode 100644 index 00000000000..5b36c5a784f --- /dev/null +++ b/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch @@ -0,0 +1,27 @@ +From 1b57b62d82a478c1fade350f0fb1d57031a8734e Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 10 Feb 2024 09:33:48 +0100 +Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72 + +Fixes https://github.com/heimdal/heimdal/issues/1201 + +Upstream: https://github.com/heimdal/heimdal/commit/1b57b62d82a478c1fade350f0fb1d57031a8734e + +Signed-off-by: Bernd Kuhls +--- + cf/largefile.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cf/largefile.m4 b/cf/largefile.m4 +index 5c54897be4..cdbbc55431 100644 +--- a/cf/largefile.m4 ++++ b/cf/largefile.m4 +@@ -10,7 +10,7 @@ dnl with generated code, such as lex + if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then + CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files" + fi +-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then ++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then + CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" + fi + ]) From 938aa7413fa29d7e696b65ec742c5bce9af09bd5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 15 Sep 2024 14:37:27 +0200 Subject: [PATCH 2928/3013] utils/genrandconfig: handle BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y When BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y, BR2_LINUX_KERNEL_IMAGE_TARGET_NAME is supposed to be non-empty. But in the context of genraconfig, we don't know to what value BR2_LINUX_KERNEL_IMAGE_TARGET_NAME can be set, so let's avoid cases where BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y. By dropping this option, kconfig will revert back to the default image format for the selected architecture. Fixes: http://autobuild.buildroot.net/results/1d104a051c83bb31e98565369a2ec7badfa21eca/ Signed-off-by: Thomas Petazzoni (cherry picked from commit b07d21ab984d10cbabeb186fbd47d446e027c03b) Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 282a9ebdea9..0698cc5ff07 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -248,6 +248,10 @@ async def fixup_config(sysinfo, configfile): configlines.remove('BR2_LINUX_KERNEL_SIMPLEIMAGE=y\n') configlines.append('BR2_LINUX_KERNEL_VMLINUX=y\n') + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y') + if 'BR2_LINUX_KERNEL_EXT_AUFS=y\n' in configlines and \ 'BR2_LINUX_KERNEL_EXT_AUFS_VERSION=""\n' in configlines: configlines.remove('BR2_LINUX_KERNEL_EXT_AUFS=y\n') From 2461b54aa84f4e0ff2bbacacb6ae55c55c6ecd6d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 15 Sep 2024 14:37:28 +0200 Subject: [PATCH 2929/3013] linux: handle empty BR2_LINUX_KERNEL_IMAGE_TARGET_NAME situation When BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y, BR2_LINUX_KERNEL_IMAGE_TARGET_NAME should be set or the build will fail. Instead of miserably failing the build, let's catch this earlier and warn the user in a more informative way. Related to: http://autobuild.buildroot.net/results/1d104a051c83bb31e98565369a2ec7badfa21eca/ Signed-off-by: Thomas Petazzoni (cherry picked from commit cb4f11a6964902990ce774ff7144b24a1ffd635c) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 111a21f039d..50fed6d2655 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -648,6 +648,10 @@ $(error No kernel device tree source specified, check your \ BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings) endif +ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM):$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME)),y:) +$(error No image name specified in BR2_LINUX_KERNEL_IMAGE_TARGET_NAME despite BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y) +endif + endif # BR_BUILDING $(eval $(kconfig-package)) From f9e1b87fe112fa4ffc5f7dea4a5c9422978b3a1b Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 28 Oct 2024 13:44:13 +0100 Subject: [PATCH 2930/3013] package/criu: fix comment condition in e97fc89e7b a dependency on host-gcc >= 7 was added but for the comment the condition was not correctly inverted. Fixes: e97fc89e7b ("package/protobuf-c: bump to version 1.5.0") Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni (cherry picked from commit 84ef9bede635726542a72af5c61f84914acfe122) Signed-off-by: Peter Korsgaard --- package/criu/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/criu/Config.in b/package/criu/Config.in index 30b131cd30a..fc6897c4d0d 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -50,4 +50,4 @@ comment "criu needs a glibc or musl toolchain w/ threads, host gcc >= 7, gcc >= || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \ || BR2_TOOLCHAIN_USES_UCLIBC || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || BR2_HOST_GCC_AT_LEAST_7 + || !BR2_HOST_GCC_AT_LEAST_7 From 8d39a532b5ea511805514bc5fa025ab9321a53ab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Oct 2024 21:38:57 +0100 Subject: [PATCH 2931/3013] DEVELOPERS: remove Bernd Kuhls from libglfw I am not using this package anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 04141fdcab49608102e62aee3615dff7c5017ed1) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index d6a50192f50..639ed01cfaf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -414,7 +414,6 @@ F: package/libfreeglut/ F: package/libfribidi/ F: package/libg7221/ F: package/libglew/ -F: package/libglfw/ F: package/libglu/ F: package/libhdhomerun/ F: package/libheif/ From fd70ba89928c7073c50654a962187943237cdfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Sun, 27 Oct 2024 22:30:28 +0300 Subject: [PATCH 2932/3013] package/libmdbx: bump version to 0.12.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is bugfix release of stable libmdbx branch. The most significant fixes since v0.12.10 (the previous version pinned to buildroot): - Fixed the possibility of `SIGSEGV` inside the `coherence_check()` after changing the geometry by another process with an increase in the upper DB size above the previous in-process limit. - Fixed cursor(s) handling opened in parent transactions and closed before the completion of nested/child transactions. In such case, closed cursors were "resurrected", which led to a leak of memory allocated for such cursors. - Fixed a possibility of `SIGSEGV` when enabling logging of the `MDBX_LOG_TRACE` level in debug builds. - Correction of the missing `TXN_END_EOTDONE` in the case the start of a reading transaction fails. The mentioned bit-flag was missing in the transaction destruction/shutdown path on error its launch. Because of this, an attempt was made to destroy the cursors, which led to crash debug builds, since the corresponding array is intentionally filled with poison pointers. - Modification of `mdbx_close_by()` to return an error when trying to close the dbi descriptor of a table created and/or modified in a still-running transaction. Such premature closure of the descriptor is an incorrect use of the API and a violation of the contract/preconditions formulated in the description of `mdbx_close_dbi()`. However, instead of returning an error, an incorrect closure of the descriptor was performed, which could lead to the creation of a table with an empty name, leakage of database pages and/or corruption of a b-tree structure (wrong reference to the root of a table). The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: Леонид Юрьев (Leonid Yuriev) Signed-off-by: Thomas Petazzoni (cherry picked from commit 81e7806b9353ab403e202d3e3d1d2a5818eb390f) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 1dbdef7c69a..222e7caf5c2 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 4637e06768a9a8fc7577e6e458e045ad1f9a8baee74996a3c88bc0ad64cbcf67 libmdbx-amalgamated-0.12.10.tar.xz +sha256 19c0eb33e1ed43ca2a94dceb06dd31946432d16f30a9751d3701c67efa22eb1a libmdbx-amalgamated-0.12.12.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 6e0571ff240..c736945e927 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.12.10 +LIBMDBX_VERSION = 0.12.12 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From a1e40988a1c947ae7f964b9e6b34c1b1cc9cdcea Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 28 Oct 2024 21:09:01 +0100 Subject: [PATCH 2933/3013] package/fluidsynth: bump to version 2.3.7 For change log since v2.3.6, see: https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 84ff06d33e7df18034ba8fbcf01f53af831f6857) Signed-off-by: Peter Korsgaard --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 0f54ad254e2..787e97ce37d 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3340d73286b28fe6e5150fbe12648d4640e86c64c228878b572773bd08cac531 fluidsynth-2.3.6.tar.gz +sha256 38d1d910783ab67c07a4d859d1aa95525979ff352b927e25b1ae894c774bb4c4 fluidsynth-2.3.7.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 3105162bda9..98b56ba6962 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.6 +FLUIDSYNTH_VERSION = 2.3.7 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From 142d1f38b469f76390fce270ef9a26276f5db7f0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 28 Oct 2024 21:34:57 +0100 Subject: [PATCH 2934/3013] package/ntp: fix md5 related build issue Fixes: http://autobuild.buildroot.net/results/fb4/fb4a011f14e87d348a53695868bb5f3b69496fc8/ The build errors occured immediately after bumping ntp to 4.2.8p18 with buildroot commit 49bd6bb638ff73eae3b486b207201382d46a6c05. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4251fa12ee5aa32a73f77c6c0bb8e1ab7a343563) Signed-off-by: Peter Korsgaard --- package/ntp/0003-fix-md5update.patch | 209 +++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 package/ntp/0003-fix-md5update.patch diff --git a/package/ntp/0003-fix-md5update.patch b/package/ntp/0003-fix-md5update.patch new file mode 100644 index 00000000000..62bfef0fbb5 --- /dev/null +++ b/package/ntp/0003-fix-md5update.patch @@ -0,0 +1,209 @@ +Fix build with -Wincompatible-pointer-types -Werror + +Upstream: https://people.nwtime.org/hart/ntp-stable-3928-29.tar.gz + +Ported fix from updated tarball provided by upstream: +https://bugs.ntp.org/show_bug.cgi?id=3929#c9 + +Signed-off-by: Bernd Kuhls + +diff -uNr ntp-4.2.8p18.orig/include/ntp_md5.h ntp-4.2.8p18/include/ntp_md5.h +--- ntp-4.2.8p18.orig/include/ntp_md5.h 2024-05-07 13:21:16.000000000 +0200 ++++ ntp-4.2.8p18/include/ntp_md5.h 2024-07-24 01:26:46.000000000 +0200 +@@ -1,56 +1,73 @@ + /* + * ntp_md5.h: deal with md5.h headers + * +- * Use the system MD5 if available, otherwise libisc's. ++ * Use the system MD5 if available, otherwise use libisc's. ++ * Yes, MD5 has been deprecated. Nevertheless, ntpd IPv6 refid ++ * calculation uses MD5 to derive a 32-bit refid from a 128-bit ++ * IPv6 address. This use is retained to avoid breaking loop ++ * detection that would be triggered by such change, and because ++ * we are not depending on cryptographic strength for such use. + */ + #ifndef NTP_MD5_H + #define NTP_MD5_H + + /* Use the system MD5 or fall back on libisc's */ +-# if defined HAVE_MD5_H && defined HAVE_MD5INIT +-# include +-# else +-# include "isc/md5.h" +- typedef isc_md5_t MD5_CTX; +-# define MD5_DIGEST_LENGTH ISC_MD5_DIGESTLENGTH +-# define MD5Init(c) isc_md5_init(c) +-# define MD5Update(c, p, s) isc_md5_update(c, (const void *)p, s) +-# define MD5Final(d, c) isc_md5_final((c), (d)) /* swapped */ +-# endif +- +-# define KEY_TYPE_MD5 NID_md5 ++#if defined HAVE_MD5_H && defined HAVE_MD5INIT ++# include ++# define ntp_md5_init(c) MD5Init(c) ++# define ntp_md5_update(c, p, s) MD5Update(c, (const void *)(p), s) ++# define ntp_md5_final(d, c) MD5Final(d, c) ++#else ++# include "isc/md5.h" ++typedef isc_md5_t MD5_CTX; ++# define MD5_DIGEST_LENGTH ISC_MD5_DIGESTLENGTH ++# define ntp_md5_init(c) isc_md5_init(c) ++# define ntp_md5_update(c, p, s) isc_md5_update(c, (const void *)(p), s) ++# define ntp_md5_final(d, c) isc_md5_final((c), (d)) /* swapped */ ++#endif + + #ifdef OPENSSL + # include + # include "libssl_compat.h" + # ifdef HAVE_OPENSSL_CMAC_H + # include +-# define CMAC "AES128CMAC" +-# define AES_128_KEY_SIZE 16 +-# endif /*HAVE_OPENSSL_CMAC_H*/ ++# define CMAC "AES128CMAC" ++# define AES_128_KEY_SIZE 16 ++# endif + #else /* !OPENSSL follows */ + /* +- * Provide OpenSSL-alike MD5 API if we're not using OpenSSL ++ * Provide OpenSSL-alike MD5 API if we're not using OpenSSL. Most of this ++ * is used only by sntp when building it --without-crypto. + */ + +- typedef MD5_CTX EVP_MD_CTX; ++typedef MD5_CTX EVP_MD_CTX; + + # define NID_md5 4 /* from openssl/objects.h */ + # define EVP_MAX_MD_SIZE MD5_DIGEST_LENGTH ++ ++/* ++ * The following is used only by sntp configured --without-crypto as ntpd ++ * now uses explicit MD5 functions for MD5 uses which remain even where MD5 ++ * is unavailable in OpenSSL, such as FIPS OpenSSL. Note that FIPS may be ++ * available in the build environment but not at runtime, as is the case ++ * with packaged NTP binaries. ++ * The remaining uses of MD5 are IPv6 refids and mode 6 nonces. ntpd does ++ * go through OpenSSL when using MD5 for symmetric authentication. ++ */ + # define EVP_MD_CTX_free(c) free(c) + # define EVP_MD_CTX_new() calloc(1, sizeof(MD5_CTX)) + # define EVP_get_digestbynid(t) NULL + # define EVP_md5() NULL + # define EVP_MD_CTX_init(c) + # define EVP_MD_CTX_set_flags(c, f) +-# define EVP_DigestInit(c, dt) (MD5Init(c), 1) +-# define EVP_DigestInit_ex(c, dt, i) (MD5Init(c), 1) +-# define EVP_DigestUpdate(c, p, s) MD5Update(c, (const void *)(p), \ +- s) +-# define EVP_DigestFinal(c, d, pdl) \ +- do { \ +- MD5Final((d), (c)); \ +- *(pdl) = MD5_LENGTH; \ +- } while (0) +-# endif /* !OPENSSL */ ++# define EVP_DigestInit(c, dt) (ntp_md5_init(c), 1) ++# define EVP_DigestUpdate(c, p, s) ntp_md5_update(c, p, s) ++# define EVP_DigestFinal(c, d, pdl) \ ++ do { \ ++ ntp_md5_final((d), (c)); \ ++ *(pdl) = MD5_LENGTH; \ ++ } while (FALSE) ++ ++#endif /* OPENSSL */ ++ + #endif /* NTP_MD5_H */ +diff -uNr ntp-4.2.8p18.orig/libntp/a_md5encrypt.c ntp-4.2.8p18/libntp/a_md5encrypt.c +--- ntp-4.2.8p18.orig/libntp/a_md5encrypt.c 2024-05-07 13:21:31.000000000 +0200 ++++ ntp-4.2.8p18/libntp/a_md5encrypt.c 2024-07-24 01:26:46.000000000 +0200 +@@ -56,7 +56,7 @@ + static MD5_CTX md5_ctx; + + DEBUG_INSIST(NID_md5 == nid); +- MD5Init(&md5_ctx); ++ ntp_md5_init(&md5_ctx); + + return &md5_ctx; + #else +@@ -171,10 +171,10 @@ + if (digest->len < MD5_LENGTH) { + msyslog(LOG_ERR, "%s", "MAC encrypt: MAC md5 buf too small."); + } else { +- MD5Init(ctx); +- MD5Update(ctx, (const void *)key->buf, key->len); +- MD5Update(ctx, (const void *)msg->buf, msg->len); +- MD5Final(digest->buf, ctx); ++ ntp_md5_init(ctx); ++ ntp_md5_update(ctx, key->buf, key->len); ++ ntp_md5_update(ctx, msg->buf, msg->len); ++ ntp_md5_final(digest->buf, ctx); + retlen = MD5_LENGTH; + } + } else { +@@ -279,9 +279,9 @@ + return (NSRCADR(addr)); + } + /* MD5 is not used for authentication here. */ +- MD5Init(&md5_ctx); +- MD5Update(&md5_ctx, (void *)&SOCK_ADDR6(addr), sizeof(SOCK_ADDR6(addr))); +- MD5Final(u.digest, &md5_ctx); ++ ntp_md5_init(&md5_ctx); ++ ntp_md5_update(&md5_ctx, &SOCK_ADDR6(addr), sizeof(SOCK_ADDR6(addr))); ++ ntp_md5_final(u.digest, &md5_ctx); + #ifdef WORDS_BIGENDIAN + u.addr_refid = BYTESWAP32(u.addr_refid); + #endif +diff -uNr ntp-4.2.8p18.orig/libntp/authreadkeys.c ntp-4.2.8p18/libntp/authreadkeys.c +--- ntp-4.2.8p18.orig/libntp/authreadkeys.c 2024-05-07 13:21:20.000000000 +0200 ++++ ntp-4.2.8p18/libntp/authreadkeys.c 2024-07-24 01:26:46.000000000 +0200 +@@ -240,7 +240,7 @@ + keyno); + keytype = 0; + } else { +- keytype = KEY_TYPE_MD5; ++ keytype = NID_md5; + } + #endif /* !OPENSSL */ + +diff -uNr ntp-4.2.8p18.orig/ntpd/ntp_control.c ntp-4.2.8p18/ntpd/ntp_control.c +--- ntp-4.2.8p18.orig/ntpd/ntp_control.c 2024-05-07 13:21:15.000000000 +0200 ++++ ntp-4.2.8p18/ntpd/ntp_control.c 2024-07-24 01:26:46.000000000 +0200 +@@ -3663,18 +3663,18 @@ + last_salt_update = current_time; + } + +- MD5Init(&ctx); +- MD5Update(&ctx, salt, sizeof(salt)); +- MD5Update(&ctx, &ts_i, sizeof(ts_i)); +- MD5Update(&ctx, &ts_f, sizeof(ts_f)); ++ ntp_md5_init(&ctx); ++ ntp_md5_update(&ctx, salt, sizeof(salt)); ++ ntp_md5_update(&ctx, &ts_i, sizeof(ts_i)); ++ ntp_md5_update(&ctx, &ts_f, sizeof(ts_f)); + if (IS_IPV4(addr)) { +- MD5Update(&ctx, &SOCK_ADDR4(addr), sizeof(SOCK_ADDR4(addr))); ++ ntp_md5_update(&ctx, &SOCK_ADDR4(addr), sizeof(SOCK_ADDR4(addr))); + } else { +- MD5Update(&ctx, &SOCK_ADDR6(addr), sizeof(SOCK_ADDR6(addr))); ++ ntp_md5_update(&ctx, &SOCK_ADDR6(addr), sizeof(SOCK_ADDR6(addr))); + } +- MD5Update(&ctx, &NSRCPORT(addr), sizeof(NSRCPORT(addr))); +- MD5Update(&ctx, salt, sizeof(salt)); +- MD5Final(d.digest, &ctx); ++ ntp_md5_update(&ctx, &NSRCPORT(addr), sizeof(NSRCPORT(addr))); ++ ntp_md5_update(&ctx, salt, sizeof(salt)); ++ ntp_md5_final(d.digest, &ctx); + + return d.extract; + } +diff -uNr ntp-4.2.8p18.orig/ntpd/ntp_crypto.c ntp-4.2.8p18/ntpd/ntp_crypto.c +--- ntp-4.2.8p18.orig/ntpd/ntp_crypto.c 2024-05-07 13:21:32.000000000 +0200 ++++ ntp-4.2.8p18/ntpd/ntp_crypto.c 2024-07-24 01:26:46.000000000 +0200 +@@ -150,7 +150,7 @@ + * Global cryptodata in host byte order + */ + u_int32 crypto_flags = 0x0; /* status word */ +-int crypto_nid = KEY_TYPE_MD5; /* digest nid */ ++int crypto_nid = NID_md5; /* digest nid */ + char *sys_hostname = NULL; + char *sys_groupname = NULL; + static char *host_filename = NULL; /* host file name */ From 2c61a66f216a5d3de628dad89b2d986bd4f4868c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 28 Oct 2024 21:34:42 +0100 Subject: [PATCH 2935/3013] package/jailhouse: fix build when python helper scripts are enabled When compiling jailhouse with BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS=y, build is failing with error: Traceback (most recent call last): File "/buildroot/output/build/jailhouse-e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560/setup.py", line 18, in setup(name="pyjailhouse", version=version, File "/buildroot/output/host/lib/python3.12/site-packages/setuptools/__init__.py", line 108, in setup return distutils.core.setup(**attrs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ... File "/buildroot/output/host/lib/python3.12/sysconfig.py", line 549, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ValueError: Empty module name This is due to a missing dependency on the target python3 package. Jailhouse Python scripts are using setuptools with host-python3 which reads its sysconfig data from the target-python3. See: https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08.1/package/pkg-python.mk?ref_type=tags#L33 If the target python3 is not installed, this get expanded as an empty string, leading to this "ValueError: Empty module name" error. Pure Python packages which are using the python-package infrastructure usually get this dependency automatically from: https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08.1/package/pkg-python.mk?ref_type=tags#L295 Here, the jailhouse package rather uses the generic-package infrastructure, then installs the Python scripts (if enabled) with dedicated macros. This is why the target python3 is needed. This commit fixes the issue by adding this missing dependency. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit c808e271e3e487a46f23b144b44ace54f97f3aab) Signed-off-by: Peter Korsgaard --- package/jailhouse/jailhouse.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 1354acf600c..a1c86f0e91a 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -21,7 +21,8 @@ JAILHOUSE_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) JAILHOUSE_DEPENDENCIES += \ host-python-mako \ - host-python-setuptools + host-python-setuptools \ + python3 JAILHOUSE_MAKE_OPTS += \ HAS_PYTHON_MAKO="yes" \ PYTHON_PIP_USABLE="yes" From 4244da4fe4b1a13b935f60304ce18eda32a2dc76 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 28 Oct 2024 21:56:04 +0100 Subject: [PATCH 2936/3013] docs/website: fix the link to the mailman archives Signed-off-by: Thomas Petazzoni (cherry picked from commit b07ee5e41c806138dd8d214b842dabdb802dd64f) Signed-off-by: Peter Korsgaard --- docs/website/support.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/support.html b/docs/website/support.html index 6bcf4ffc22d..21c6e0a34ed 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -53,7 +53,7 @@ page. Only subscribers to the Buildroot mailing list are allowed to post to this list. Archives are available - from Mailman + from Mailman and lore.kernel.org.

      Search the List Archives

      From f5b935ada7e46ec201ba8f0ec2d8a225028825e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Oct 2024 23:23:09 +0200 Subject: [PATCH 2937/3013] package/procps-ng: fix ncurses.h include Fixes: http://autobuild.buildroot.net/results/7f1/7f1e0b3d99db07ea46c9cd1f51b320b461623c8d/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3c2f3c9039deb7e285e76391fdb28258c7312f9b) Signed-off-by: Peter Korsgaard --- .../0002-fix-ncurses-h-include.patch | 55 +++++++++++++++++++ package/procps-ng/procps-ng.mk | 1 + 2 files changed, 56 insertions(+) create mode 100644 package/procps-ng/0002-fix-ncurses-h-include.patch diff --git a/package/procps-ng/0002-fix-ncurses-h-include.patch b/package/procps-ng/0002-fix-ncurses-h-include.patch new file mode 100644 index 00000000000..619126b863f --- /dev/null +++ b/package/procps-ng/0002-fix-ncurses-h-include.patch @@ -0,0 +1,55 @@ +From 263fe04f9ed6f3f40fdb7ce249221e03dc926c9b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 24 Jul 2024 09:51:00 +0200 +Subject: [PATCH] fix ncurses.h include + +Commit 58559a5b64a3634460536d6397ca382a54b599f0 was not backported from +3.3.17 to 4.0.0 resulting in the following build failure when ncursesw +headers are not installed in ../usr/include/ncursesw/..: + +src/watch.c:56:11: fatal error: ncursesw/ncurses.h: No such file or directory + 56 | # include + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/b7573be2e78f3d224f48cb3f52087e3d227d58e3 + +Signed-off-by: Fabrice Fontaine + +Upstream: https://gitlab.com/procps-ng/procps/-/commit/263fe04f9ed6f3f40fdb7ce249221e03dc926c9b + +Signed-off-by: Bernd Kuhls +[Bernd: backported to version 4.0.4] +--- + configure.ac | 2 +- + src/watch.c | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d433901f..38350aaf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,7 +64,7 @@ PROCPS_PROG_PO4A + + # Checks for header files. + AC_HEADER_MAJOR +-AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) ++AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h ncursesw/ncurses.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_CHECK_HEADER_STDBOOL +diff --git a/src/watch.c b/src/watch.c +index ef638e00..7ec634b6 100644 +--- a/src/watch.c ++++ b/src/watch.c +@@ -53,6 +53,8 @@ + # define _XOPEN_SOURCE_EXTENDED 1 + # include + # include ++#endif ++#ifdef HAVE_NCURSESW_NCURSES_H + # include + #else + # include +-- +GitLab diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 1002d6340fc..4ac82cf6f93 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -15,6 +15,7 @@ PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) # Applying 0001-build-sys-Add-systemd-elogind-to-w.patch touches Makefile.am +# Applying 0002-fix-ncurses-h-include.patch touches configure.ac PROCPS_NG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_SYSTEMD),y) From 3382f699e7ce4f2ffbd65a61b45eb5a99f7deb90 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 26 Oct 2024 13:00:57 +0200 Subject: [PATCH 2938/3013] package/qemu: remove leftover QEMU_IGNORE_CVES from Qemu 8.1 Theses CVE are no longer listed by pkg-stats: https://nvd.nist.gov/vuln/detail/CVE-2023-4135 https://nvd.nist.gov/vuln/detail/CVE-2023-3354 https://nvd.nist.gov/vuln/detail/CVE-2023-3180 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 10b4c31b812128f255e8ea58050879b953d58f0e) Signed-off-by: Peter Korsgaard --- package/qemu/qemu.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 16cff13d180..a2d164d1895 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -17,12 +17,6 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB # individual source files. QEMU_CPE_ID_VENDOR = qemu -# Need to ignore the following CVEs because the CPE database does -# not have an entry for the 8.1.1 version yet. -QEMU_IGNORE_CVES += CVE-2023-4135 -QEMU_IGNORE_CVES += CVE-2023-3354 -QEMU_IGNORE_CVES += CVE-2023-3180 - #------------------------------------------------------------- # The build system is now partly based on Meson. From 3c94589006b9a3bb48ea959d242aac6bf9e42d6c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Aug 2024 12:38:53 +0200 Subject: [PATCH 2939/3013] package/cmake: bump to 3.30.2 This is minor release. According to https://cmake.org/cmake/help/latest/release/3.30.html#updates: 3.30.1, 3.30.2 These versions made no changes to documented features or interfaces. Some implementation updates were made to support ecosystem changes and/or fix regressions. Signed-off-by: Thomas Petazzoni (cherry picked from commit 1e9261d9b6388dc382e59f44174f1806d326ad15) Signed-off-by: Peter Korsgaard --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index ee6dab551ce..1a59c3fe894 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.30/cmake-3.30.0-SHA-256.txt -sha256 157e5be6055c154c34f580795fe5832f260246506d32954a971300ed7899f579 cmake-3.30.0.tar.gz +# From https://cmake.org/files/v3.30/cmake-3.30.2-SHA-256.txt +sha256 46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2 cmake-3.30.2.tar.gz # Locally calculated sha256 0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 842457eb34c..e7d2d867915 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -6,7 +6,7 @@ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.30 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From 48c3ea6fd7b1040c7438cb684eac83824a8f0bcb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 28 Oct 2024 23:41:32 +0100 Subject: [PATCH 2940/3013] package/cmake: bump to 3.30.5 Release notes: https://cmake.org/cmake/help/v3.30/release/3.30.html#id3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7ff8d5abd5b056ea38d83ceab6c5a2c35285b070) Signed-off-by: Peter Korsgaard --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 1a59c3fe894..f80b942103b 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.30/cmake-3.30.2-SHA-256.txt -sha256 46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2 cmake-3.30.2.tar.gz +# From https://cmake.org/files/v3.30/cmake-3.30.5-SHA-256.txt +sha256 9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d cmake-3.30.5.tar.gz # Locally calculated sha256 0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index e7d2d867915..0c5d46c23dd 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -6,7 +6,7 @@ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.30 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).5 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From 9a8e12341158b826a714aa0f43eb714fe787744d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 28 Oct 2024 23:21:01 +0100 Subject: [PATCH 2941/3013] package/apache: include ap_config_auto.h to define _GNU_SOURCE Fixes: http://autobuild.buildroot.net/results/2f6/2f6b7bbb4c97e4c91b3abd6bb205e237e57045fa/ and many more. The bug was introduced by bumping apache to 2.4.59 with buildroot commit e0bbfaea0e983c1ce42a9c3085f3ca3dd796852f which includes https://github.com/apache/httpd/commit/008e6afcfdae36bce1b5f3fc0cb9519375fd99cf Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 028d047cebf0cb2089063ee16bc48770ae277c61) Signed-off-by: Peter Korsgaard --- ...lude-ap_config_auto.h-to-define-_GNU.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/apache/0004-ap_log_error-Include-ap_config_auto.h-to-define-_GNU.patch diff --git a/package/apache/0004-ap_log_error-Include-ap_config_auto.h-to-define-_GNU.patch b/package/apache/0004-ap_log_error-Include-ap_config_auto.h-to-define-_GNU.patch new file mode 100644 index 00000000000..40386147cf2 --- /dev/null +++ b/package/apache/0004-ap_log_error-Include-ap_config_auto.h-to-define-_GNU.patch @@ -0,0 +1,40 @@ +From f7a85d0d2b76db75dc976e8dfa1101c954ea1a74 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 28 Oct 2024 23:13:05 +0100 +Subject: [PATCH] ap_log_error: Include ap_config_auto.h to define + _GNU_SOURCE + +gettid() needs _GNU_SOURCE defined which is provided by ap_config_auto.h + +Fixes buildroot error: +http://autobuild.buildroot.net/results/2f6/2f6b7bbb4c97e4c91b3abd6bb205e237e57045fa//build-end.log + +log.c: In function 'log_tid': +log.c:637:21: error: implicit declaration of function 'gettid'; did you mean 'getgid'? [-Wimplicit-function-declaration] + 637 | pid_t tid = gettid(); + +Upstream: https://github.com/apache/httpd/pull/496 + +Signed-off-by: Bernd Kuhls +--- + server/log.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/server/log.c b/server/log.c +index 91dcf2c3eb..e709288858 100644 +--- a/server/log.c ++++ b/server/log.c +@@ -21,6 +21,10 @@ + * + */ + ++#if !defined(WIN32) && !defined(NETWARE) ++#include "ap_config_auto.h" ++#endif ++ + #include "apr.h" + #include "apr_general.h" /* for signal stuff */ + #include "apr_strings.h" +-- +2.39.5 + From 43f9594c879361c5dfe8d974ba36e9db2f07e69f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 28 Oct 2024 23:37:54 +0100 Subject: [PATCH 2942/3013] package/libpng: fix arm soft-float build Bumping libpng to 1.6.44 with buildroot commit 583bb434ffe1eec0dbf6887dd719c3f41a6253e9 causes a build failure on arm because the NEON code is only available for softfp and hardfp ABIs, and not soft-float. Fixes: http://autobuild.buildroot.net/results/021/02158525203d8c7f16a4a32637d44d6c87b7f333/ Signed-off-by: Bernd Kuhls Co-authored-by: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit a100286aa1eff05db57230eceebbb6aa79c63d1a) Signed-off-by: Peter Korsgaard --- package/libpng/libpng.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 3e7fc42d828..9761993d791 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -17,7 +17,9 @@ HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config LIBPNG_CONF_OPTS = --disable-tools -ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) +ifeq ($(BR2_aarch64),y) +LIBPNG_CONF_OPTS += --enable-arm-neon +else ifeq ($(BR2_ARM_CPU_HAS_NEON):$(BR2_ARM_SOFT_FLOAT),y:) LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon From 046ba99e91c7be63a4997ac17ace9a0daee6e1b4 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Tue, 29 Oct 2024 10:45:09 +0100 Subject: [PATCH 2943/3013] package/libgit2: bump version to 1.8.3 Fixes a crash when using the libhttp-parser dependency, which is the configuration that we use in buildroot. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni (cherry picked from commit 21a72fb275aea38c1d82ce7b3b7f10e8cf4bb83d) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index ec2f89e57eb..0a34bedf794 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 184699f0d9773f96eeeb5cb245ba2304400f5b74671f313240410f594c566a28 libgit2-1.8.2.tar.gz +sha256 868810a5508d41dd7033d41bdc55312561f3f916d64f5b7be92bc1ff4dcae02a libgit2-1.8.3.tar.gz sha256 e3712465634e97cfd850822a4eb5ac7d2f8a10f753189366d5a2060046f28288 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 67c9901a387..22ba507acc7 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.8.2 +LIBGIT2_VERSION = 1.8.3 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From b4b4522e6353fa08be380837bedd41c75c92608c Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 29 Oct 2024 16:49:10 +0100 Subject: [PATCH 2944/3013] package/nghttp2: security bump to 1.64.0 Changelog: * https://github.com/nghttp2/nghttp2/releases/tag/v1.59.0 * https://github.com/nghttp2/nghttp2/releases/tag/v1.60.0 * https://github.com/nghttp2/nghttp2/releases/tag/v1.61.0 * https://github.com/nghttp2/nghttp2/releases/tag/v1.62.0 * https://github.com/nghttp2/nghttp2/releases/tag/v1.63.0 * https://github.com/nghttp2/nghttp2/releases/tag/v1.64.0 Fixes: CVE-2024-28182 [1] - Reading unbounded number of HTTP/2 CONTINUATION frames to cause excessive CPU usage [1] https://github.com/nghttp2/nghttp2/security/advisories/GHSA-x6x3-gv8h-m57q Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 55d48e866e471e0b704f3ae56300cca6e87d7559) Signed-off-by: Peter Korsgaard --- package/nghttp2/nghttp2.hash | 2 +- package/nghttp2/nghttp2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash index dddf6fe1bd6..4b60d6d1435 100644 --- a/package/nghttp2/nghttp2.hash +++ b/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4a68a3040da92fd9872c056d0f6b0cd60de8410de10b578f8ade9ecc14d297e0 nghttp2-1.58.0.tar.xz +sha256 88bb94c9e4fd1c499967f83dece36a78122af7d5fb40da2019c56b9ccc6eb9dd nghttp2-1.64.0.tar.xz sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk index 7a05e38fa99..98f837e28ee 100644 --- a/package/nghttp2/nghttp2.mk +++ b/package/nghttp2/nghttp2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGHTTP2_VERSION = 1.58.0 +NGHTTP2_VERSION = 1.64.0 NGHTTP2_SOURCE = nghttp2-$(NGHTTP2_VERSION).tar.xz NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT From a91b9c7400fcd7813668f2fe6342cbd762c849e6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 14 Nov 2024 11:28:39 +0100 Subject: [PATCH 2945/3013] Update for 2024.08.2 Signed-off-by: Peter Korsgaard --- CHANGES | 14 ++++++++++++++ Makefile | 2 +- support/misc/Vagrantfile | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 5e6140efa0d..b1a558adba7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +2024.08.2, released November 14th, 2024 + + Important / security related fixes. + + Updated/fixed packages: apache, asterisk, bind, cmake, criu, + file, fluidsynth, ghostscript, heimdal, intel-microcode, + iproute2, jailhouse, jsoncpp, libarchive, libcurl, libldns, + libgit2, liblinear, libmdbx, libopenh264, libpng, + libtraceevent, libxml2, ltrace, nethogs, nghttp2, ntp, + openjdk, php, postgresql,procps-ng, python-pyqt5, python3, + qemu, ruby, sqlite, sysvinit, tor, trace-cmd, wpebackend-fdo + + New packages: python-pyqt5-sip + 2024.08.1, released October 20th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index 4afd15f2c90..3d89449eeec 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.08.1 +export BR2_VERSION := 2024.08.2 # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1729431000 diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 25a360d9768..c3cb15d727c 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.08.1' +RELEASE='2024.08.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 4c53364d895bd1a605e23d5d5f8949b3e580f857 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 10 Oct 2024 15:53:09 +0200 Subject: [PATCH 2946/3013] package/gobject-introspection: update homepage The homepage has moved, the previous one links to the new URL. Signed-off-by: Fiona Klute (WIWA) [yann.morin.1998@free.fr: split into its own patch] Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 3ee7c891a0173417fbd4726928bd4d4689048b22) Signed-off-by: Peter Korsgaard --- package/gobject-introspection/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in index 42250eb7765..345118745ff 100644 --- a/package/gobject-introspection/Config.in +++ b/package/gobject-introspection/Config.in @@ -36,7 +36,7 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION language bindings can read this metadata and automatically provide bindings to call into the C library. - https://wiki.gnome.org/action/show/Projects/GObjectIntrospection + https://gi.readthedocs.io/ comment "gobject-introspection needs python3" depends on !BR2_PACKAGE_PYTHON3 From 35069b0ab586f85d141b157754348948fd47d141 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 10 Oct 2024 15:53:09 +0200 Subject: [PATCH 2947/3013] package/gobject-introspection: update homepage The homepage has moved, the previous one links to the new URL. Signed-off-by: Fiona Klute (WIWA) [yann.morin.1998@free.fr: split into its own patch] Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 3ee7c891a0173417fbd4726928bd4d4689048b22) Signed-off-by: Peter Korsgaard --- package/gobject-introspection/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in index 42250eb7765..345118745ff 100644 --- a/package/gobject-introspection/Config.in +++ b/package/gobject-introspection/Config.in @@ -36,7 +36,7 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION language bindings can read this metadata and automatically provide bindings to call into the C library. - https://wiki.gnome.org/action/show/Projects/GObjectIntrospection + https://gi.readthedocs.io/ comment "gobject-introspection needs python3" depends on !BR2_PACKAGE_PYTHON3 From 38065ea890737e4d8061d170106b1995632e7842 Mon Sep 17 00:00:00 2001 From: Hannah Kiekens Date: Sat, 21 Sep 2024 10:08:45 +0200 Subject: [PATCH 2948/3013] package/qt6/qt6base: remove -DFEATURE_concurrent=OFF from unconditional options Since commit a39e0b95e1d927599e212098d1db4d2fafb2a35c ("package/qt6/qt6base: add support for concurrent module"), we have an explicit option that enables/disables concurrent support, so it no longer makes sense to explicitly disable it unconditionally first. Signed-off-by: Hannah Kiekens Signed-off-by: Thomas Petazzoni (cherry picked from commit 2de79d7065bc27c94b654232b12acd0af582a0ad) Signed-off-by: Peter Korsgaard --- package/qt6/qt6base/qt6base.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 471edfb4f93..3c5747db369 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -59,7 +59,6 @@ QT6BASE_INSTALL_STAGING = YES QT6BASE_CONF_OPTS = \ -DQT_HOST_PATH=$(HOST_DIR) \ - -DFEATURE_concurrent=OFF \ -DFEATURE_xml=OFF \ -DFEATURE_sql=OFF \ -DFEATURE_testlib=OFF \ From 9ffb14ced94a106e05b81de4f3029ee711d127b2 Mon Sep 17 00:00:00 2001 From: Hannah Kiekens Date: Sat, 21 Sep 2024 10:08:45 +0200 Subject: [PATCH 2949/3013] package/qt6/qt6base: remove -DFEATURE_concurrent=OFF from unconditional options Since commit a39e0b95e1d927599e212098d1db4d2fafb2a35c ("package/qt6/qt6base: add support for concurrent module"), we have an explicit option that enables/disables concurrent support, so it no longer makes sense to explicitly disable it unconditionally first. Signed-off-by: Hannah Kiekens Signed-off-by: Thomas Petazzoni (cherry picked from commit 2de79d7065bc27c94b654232b12acd0af582a0ad) Signed-off-by: Peter Korsgaard --- package/qt6/qt6base/qt6base.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 4c0392f92d9..e3c8f8920a5 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -46,7 +46,6 @@ QT6BASE_INSTALL_STAGING = YES QT6BASE_CONF_OPTS = \ -DQT_HOST_PATH=$(HOST_DIR) \ -DINSTALL_ARCHDATADIR=lib/qt6 \ - -DFEATURE_concurrent=OFF \ -DFEATURE_xml=OFF \ -DFEATURE_sql=OFF \ -DFEATURE_testlib=OFF \ From d184ae6720fcfda2e3980e45f1c1f3de49a8e485 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Tue, 1 Oct 2024 11:20:55 +0200 Subject: [PATCH 2950/3013] package/linux-pam: adjust login pam file for lastlog when pam_lastlog.so is not installed login issues an error that it is not able to load it. Hence only enable the entry when pam_lastlog.so is installed. Fixes: login[649]: PAM unable to dlopen(/lib/security/pam_lastlog.so): /lib/security/pam_lastlog.so: cannot open shared object file: No such file or directory login[649]: PAM adding faulty module: /lib/security/pam_lastlog.so Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni (cherry picked from commit ee5c08aa88757c214172161b469437450880a7f8) Signed-off-by: Peter Korsgaard --- package/linux-pam/linux-pam.mk | 5 +++++ package/linux-pam/login.pam | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index a5b8c9151f0..23b09efbaea 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -56,6 +56,10 @@ endif ifeq ($(BR2_PACKAGE_LINUX_PAM_LASTLOG),y) LINUX_PAM_CONF_OPTS += --enable-lastlog +define LINUX_PAM_LASTLOG_PAMFILE_TWEAK + $(SED) 's/^# \(.*pam_lastlog.so.*\)$$/\1/' \ + $(TARGET_DIR)/etc/pam.d/login +endef else LINUX_PAM_CONF_OPTS += --disable-lastlog endif @@ -66,6 +70,7 @@ define LINUX_PAM_INSTALL_CONFIG $(TARGET_DIR)/etc/pam.d/login $(INSTALL) -m 0644 -D package/linux-pam/other.pam \ $(TARGET_DIR)/etc/pam.d/other + $(LINUX_PAM_LASTLOG_PAMFILE_TWEAK) $(LINUX_PAM_SELINUX_PAMFILE_TWEAK) endef diff --git a/package/linux-pam/login.pam b/package/linux-pam/login.pam index 5df7db628cb..21d2afb61e5 100644 --- a/package/linux-pam/login.pam +++ b/package/linux-pam/login.pam @@ -8,5 +8,5 @@ password required pam_unix.so nullok session required pam_limits.so session required pam_env.so session required pam_unix.so -session optional pam_lastlog.so +# session optional pam_lastlog.so # session required pam_selinux.so open From f15c0686ee0d8d2f638e9fa56df303a5f415b9b9 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Wed, 4 Sep 2024 04:49:03 -0700 Subject: [PATCH 2951/3013] package/ntp: add upstream-provided patch to fix regression This patch fixes a regression [1] introduced in ntpd 4.2.8p18 [2]. ntpd[200]: Listen normally on 3 lo [::1]:123 ntpd[200]: bind(20) AF_INET6 [fe80::bf3d:254d:dee0:d345%3]:123 flags 0x811 failed: Cannot assign requested address ntpd[200]: unable to create socket on enp0s3 (4) for [fe80::bf3d:254d:dee0:d345%3]:123 ntpd[192]: daemon control: got EOF ntpd[192]: daemon child died with signal 11 systemd[1]: ntpd.service: Control process exited, code=exited, status=70/SOFTWARE systemd[1]: ntpd.service: Failed with result 'exit-code'. systemd[1]: Failed to start Network Time Service. If the IPv6 link-local interface was not ready for binding on the first attempt, ntpd would segfault in update_interfaces(). The segfault would only occur when ntpd was started as part of the boot sequence. Most - but not all - boots were affected. Evidently it could happen that the timing of ntpd's start up was delayed enough that the IPv6 link-local interface was ready for the bind() call when it was first issued by open_socket() via create_interface(). [1]: https://bugs.ntp.org/show_bug.cgi?id=3928 [2]: https://bugs.ntp.org/show_bug.cgi?id=3913 Signed-off-by: TIAN Yuanhao Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 489e38fd2c16f9de2a187a4774df29f8c929bc30) Signed-off-by: Peter Korsgaard --- ...-Fix-crash-when-binding-IPv6-address.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch diff --git a/package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch b/package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch new file mode 100644 index 00000000000..b4e7378a326 --- /dev/null +++ b/package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch @@ -0,0 +1,38 @@ +Fix crash when binding IPv6 address + +Reference: + https://bugs.ntp.org/show_bug.cgi?id=3928 + +Upstream: https://people.nwtime.org/hart/ntp-stable-3928-29.tar.gz + +Ported fix from updated tarball provided by upstream: +https://bugs.ntp.org/show_bug.cgi?id=3928#c14 + +Signed-off-by: TIAN Yuanhao +--- + ntpd/ntp_io.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: ntp-4.2.8p18/ntpd/ntp_io.c +=================================================================== +--- ntp-4.2.8p18.orig/ntpd/ntp_io.c ++++ ntp-4.2.8p18/ntpd/ntp_io.c +@@ -1917,15 +1917,15 @@ update_interfaces( + } + new_interface_found = TRUE; + DPRINT_INTERFACE(3, +- (ep, "updating ", " new - created\n")); ++ (ep2, "updating ", " new - created\n")); + } + else { + DPRINT_INTERFACE(3, +- (ep, "updating ", " new - FAILED")); ++ (ep2, "updating ", " new - FAILED")); + + msyslog(LOG_ERR, + "cannot bind address %s", +- stoa(&ep->sin)); ++ stoa(&ep2->sin)); + } + free(ep2); + } From dfb9f3412ad6dffbed03a50790d2c005915909b6 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Wed, 4 Sep 2024 04:49:03 -0700 Subject: [PATCH 2952/3013] package/ntp: add upstream-provided patch to fix regression This patch fixes a regression [1] introduced in ntpd 4.2.8p18 [2]. ntpd[200]: Listen normally on 3 lo [::1]:123 ntpd[200]: bind(20) AF_INET6 [fe80::bf3d:254d:dee0:d345%3]:123 flags 0x811 failed: Cannot assign requested address ntpd[200]: unable to create socket on enp0s3 (4) for [fe80::bf3d:254d:dee0:d345%3]:123 ntpd[192]: daemon control: got EOF ntpd[192]: daemon child died with signal 11 systemd[1]: ntpd.service: Control process exited, code=exited, status=70/SOFTWARE systemd[1]: ntpd.service: Failed with result 'exit-code'. systemd[1]: Failed to start Network Time Service. If the IPv6 link-local interface was not ready for binding on the first attempt, ntpd would segfault in update_interfaces(). The segfault would only occur when ntpd was started as part of the boot sequence. Most - but not all - boots were affected. Evidently it could happen that the timing of ntpd's start up was delayed enough that the IPv6 link-local interface was ready for the bind() call when it was first issued by open_socket() via create_interface(). [1]: https://bugs.ntp.org/show_bug.cgi?id=3928 [2]: https://bugs.ntp.org/show_bug.cgi?id=3913 Signed-off-by: TIAN Yuanhao Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 489e38fd2c16f9de2a187a4774df29f8c929bc30) Signed-off-by: Peter Korsgaard --- ...-Fix-crash-when-binding-IPv6-address.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch diff --git a/package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch b/package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch new file mode 100644 index 00000000000..b4e7378a326 --- /dev/null +++ b/package/ntp/0004-Fix-crash-when-binding-IPv6-address.patch @@ -0,0 +1,38 @@ +Fix crash when binding IPv6 address + +Reference: + https://bugs.ntp.org/show_bug.cgi?id=3928 + +Upstream: https://people.nwtime.org/hart/ntp-stable-3928-29.tar.gz + +Ported fix from updated tarball provided by upstream: +https://bugs.ntp.org/show_bug.cgi?id=3928#c14 + +Signed-off-by: TIAN Yuanhao +--- + ntpd/ntp_io.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: ntp-4.2.8p18/ntpd/ntp_io.c +=================================================================== +--- ntp-4.2.8p18.orig/ntpd/ntp_io.c ++++ ntp-4.2.8p18/ntpd/ntp_io.c +@@ -1917,15 +1917,15 @@ update_interfaces( + } + new_interface_found = TRUE; + DPRINT_INTERFACE(3, +- (ep, "updating ", " new - created\n")); ++ (ep2, "updating ", " new - created\n")); + } + else { + DPRINT_INTERFACE(3, +- (ep, "updating ", " new - FAILED")); ++ (ep2, "updating ", " new - FAILED")); + + msyslog(LOG_ERR, + "cannot bind address %s", +- stoa(&ep->sin)); ++ stoa(&ep2->sin)); + } + free(ep2); + } From 96706bc7fe013b1f3f62199c4a63587282701322 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 27 Sep 2024 11:24:10 +0300 Subject: [PATCH 2953/3013] package/ebtables: remove KERNEL_64_USERSPACE_32 workaround This workaround breaks build with gcc 14. Upstream developers acknowledged[1] the 32/64 compatibility issue more than 3 years ago, but no proper fix has been applied. Specifically, for aarch64 we don't even enable BR2_KERNEL_64_USERLAND_32, so this workaround is not effective there. The least we can do is make ebtables depend on !BR2_KERNEL_64_USERLAND_32. [1] https://lore.kernel.org/all/20210518181730.13436-1-patrickdepinguin@gmail.com/ Fixes: http://autobuild.buildroot.net/results/680674c2b61209b505efa022a8fd9751ddc5fd47/ http://autobuild.buildroot.net/results/60f8f5f087111ec3f300dc7979363de5a9f64f08/ Cc: Thomas De Schampheleire Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit c5d6cde7b627f0f09320c0a431e186d78d6f931a) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...estore-KERNEL_64_USERSPACE_32-checks.patch | 105 ------------------ ...-option-enable-kernel-64-userland-32.patch | 51 --------- package/ebtables/Config.in | 2 + package/ebtables/ebtables.mk | 6 - package/libvirt/Config.in | 1 + 6 files changed, 3 insertions(+), 164 deletions(-) delete mode 100644 package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch delete mode 100644 package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch diff --git a/.checkpackageignore b/.checkpackageignore index b620280e166..78f05a47397 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -329,8 +329,6 @@ package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch Ups package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch Upstream package/earlyoom/S02earlyoom Indent Shellcheck package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch Upstream -package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch Upstream -package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch Upstream package/ecryptfs-utils/0001-musl.patch Upstream package/ecryptfs-utils/0002-openssl110.patch Upstream package/ecryptfs-utils/0003-fix-parallel-build-issue.patch Upstream diff --git a/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch b/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch deleted file mode 100644 index 84b4d0f392d..00000000000 --- a/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 7297a8ef3cab3b0faf1426622ee902a2144e2e89 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Wed, 24 Mar 2021 11:27:14 +0100 -Subject: [PATCH] ebtables.h: restore KERNEL_64_USERSPACE_32 checks - -Commit e6359eedfbf497e52d52451072aea4713ed80a88 replaced the file ebtables.h -but removed the usage of KERNEL_64_USERSPACE_32. This breaks boards where -such flag is relevant, with following messages: - -[ 6364.971346] kernel msg: ebtables bug: please report to author: Standard target size too big - -Unable to update the kernel. Two possible causes: -1. Multiple ebtables programs were executing simultaneously. The ebtables - userspace tool doesn't by default support multiple ebtables programs running - concurrently. The ebtables option --concurrent or a tool like flock can be - used to support concurrent scripts that update the ebtables kernel tables. -2. The kernel doesn't support a certain ebtables extension, consider - recompiling your kernel or insmod the extension. - -Analysis shows that the structure 'ebt_replace' passed from userspace -ebtables to the kernel, is too small, i.e 80 bytes instead of 120 in case of -64-bit kernel. - -Note that the ebtables build system seems to assume that 'sparc64' is the -only case where KERNEL_64_USERSPACE_32 is relevant, but this is not true. -This situation can happen on many architectures, especially in embedded -systems. For example, an Aarch64 processor with kernel in 64-bit but -userland build for 32-bit Arm. Or a 64-bit MIPS Octeon III processor, with -userland running in the 'n32' ABI. - -Signed-off-by: Thomas De Schampheleire -Upstream-Status: http://patchwork.ozlabs.org/project/netfilter-devel/patch/20210518181730.13436-1-patrickdepinguin@gmail.com/ ---- - include/linux/netfilter_bridge/ebtables.h | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h -index 5be75f2..3c2b61e 100644 ---- a/include/linux/netfilter_bridge/ebtables.h -+++ b/include/linux/netfilter_bridge/ebtables.h -@@ -49,12 +49,21 @@ struct ebt_replace { - /* total size of the entries */ - unsigned int entries_size; - /* start of the chains */ -+#ifdef KERNEL_64_USERSPACE_32 -+ uint64_t hook_entry[NF_BR_NUMHOOKS]; -+#else - struct ebt_entries *hook_entry[NF_BR_NUMHOOKS]; -+#endif - /* nr of counters userspace expects back */ - unsigned int num_counters; - /* where the kernel will put the old counters */ -+#ifdef KERNEL_64_USERSPACE_32 -+ uint64_t counters; -+ uint64_t entries; -+#else - struct ebt_counter *counters; - char *entries; -+#endif - }; - - struct ebt_replace_kernel { -@@ -129,6 +138,9 @@ struct ebt_entry_match { - } u; - /* size of data */ - unsigned int match_size; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); - }; - -@@ -142,6 +154,9 @@ struct ebt_entry_watcher { - } u; - /* size of data */ - unsigned int watcher_size; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); - }; - -@@ -155,6 +170,9 @@ struct ebt_entry_target { - } u; - /* size of data */ - unsigned int target_size; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); - }; - -@@ -162,6 +180,9 @@ struct ebt_entry_target { - struct ebt_standard_target { - struct ebt_entry_target target; - int verdict; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - }; - - /* one entry */ --- -2.26.2 - diff --git a/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch b/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch deleted file mode 100644 index cb57b395690..00000000000 --- a/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ebf0236270b977a62c522bc32810bc9f8edc72d1 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Wed, 24 Mar 2021 13:40:14 +0100 -Subject: [PATCH] configure.ac: add option --enable-kernel-64-userland-32 - -The ebtables build system seems to assume that 'sparc64' is the -only case where KERNEL_64_USERSPACE_32 is relevant, but this is not true. -This situation can happen on many architectures, especially in embedded -systems. For example, an Aarch64 processor with kernel in 64-bit but -userland build for 32-bit Arm. Or a 64-bit MIPS Octeon III processor, with -userland running in the 'n32' ABI. - -While it is possible to set CFLAGS in the environment when calling the -configure script, the caller would need to know to not only specify -KERNEL_64_USERSPACE_32 but also the EBT_MIN_ALIGN value. - -Instead, add a configure option. All internal details can then be handled by -the configure script. - -Signed-off-by: Thomas De Schampheleire -Upstream-Status: http://patchwork.ozlabs.org/project/netfilter-devel/patch/20210518181730.13436-2-patrickdepinguin@gmail.com/ ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c24ede3..3e89c0c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,10 +15,17 @@ AS_IF([test "x$LOCKFILE" = x], [LOCKFILE="/var/lib/ebtables/lock"]) - - regular_CFLAGS="-Wall -Wunused" - regular_CPPFLAGS="" -+ - case "$host" in - sparc64-*) -- regular_CPPFLAGS="$regular_CPPFLAGS -DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32";; -+ enable_kernel_64_userland_32=yes ;; - esac -+AC_ARG_ENABLE([kernel-64-userland-32], -+ AC_HELP_STRING([--enable-kernel-64-userland-32], [indicate that ebtables will be built as a 32-bit application but run under a 64-bit kernel]) -+) -+AS_IF([test "x$enable_kernel_64_userland_32" = xyes], -+ [regular_CPPFLAGS="$regular_CPPFLAGS -DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32"] -+) - - AC_SUBST([regular_CFLAGS]) - AC_SUBST([regular_CPPFLAGS]) --- -2.26.2 - diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in index 703e55a3c3c..ce5f67bc61f 100644 --- a/package/ebtables/Config.in +++ b/package/ebtables/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_EBTABLES bool "ebtables" depends on BR2_USE_MMU # fork() + # https://lore.kernel.org/all/20210518181730.13436-1-patrickdepinguin@gmail.com/ + depends on !BR2_KERNEL_64_USERLAND_32 help Ethernet bridge frame table administration diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 46c22dde9ba..09a9f4ba7db 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -11,12 +11,6 @@ EBTABLES_LICENSE_FILES = COPYING EBTABLES_CPE_ID_VENDOR = netfilter EBTABLES_SELINUX_MODULES = iptables -# for 0003-configure.ac-add-option-enable-kernel-64-userland-32.patch -EBTABLES_AUTORECONF = YES -ifeq ($(BR2_KERNEL_64_USERLAND_32),y) -EBTABLES_CONF_OPTS += --enable-kernel-64-userland-32 -endif - ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y) define EBTABLES_INSTALL_TARGET_UTILS_SAVE $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 3f4fc70e624..6e4de43f73c 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -45,6 +45,7 @@ config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y depends on BR2_INSTALL_LIBSTDCPP # nmap + depends on !BR2_KERNEL_64_USERLAND_32 # ebtables select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES From 673e83b1177b20b13366a48c9b4a2365657bee26 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 27 Sep 2024 11:24:10 +0300 Subject: [PATCH 2954/3013] package/ebtables: remove KERNEL_64_USERSPACE_32 workaround This workaround breaks build with gcc 14. Upstream developers acknowledged[1] the 32/64 compatibility issue more than 3 years ago, but no proper fix has been applied. Specifically, for aarch64 we don't even enable BR2_KERNEL_64_USERLAND_32, so this workaround is not effective there. The least we can do is make ebtables depend on !BR2_KERNEL_64_USERLAND_32. [1] https://lore.kernel.org/all/20210518181730.13436-1-patrickdepinguin@gmail.com/ Fixes: http://autobuild.buildroot.net/results/680674c2b61209b505efa022a8fd9751ddc5fd47/ http://autobuild.buildroot.net/results/60f8f5f087111ec3f300dc7979363de5a9f64f08/ Cc: Thomas De Schampheleire Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit c5d6cde7b627f0f09320c0a431e186d78d6f931a) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...estore-KERNEL_64_USERSPACE_32-checks.patch | 105 ------------------ ...-option-enable-kernel-64-userland-32.patch | 51 --------- package/ebtables/Config.in | 2 + package/ebtables/ebtables.mk | 6 - package/libvirt/Config.in | 1 + 6 files changed, 3 insertions(+), 164 deletions(-) delete mode 100644 package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch delete mode 100644 package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch diff --git a/.checkpackageignore b/.checkpackageignore index b2cce42ebdf..2665c713633 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -455,8 +455,6 @@ package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch lib package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch lib_patch.Upstream package/earlyoom/S02earlyoom Shellcheck lib_sysv.Indent package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch lib_patch.Upstream -package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch lib_patch.Upstream -package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch lib_patch.Upstream package/ecryptfs-utils/0001-musl.patch lib_patch.Upstream package/ecryptfs-utils/0002-openssl110.patch lib_patch.Upstream package/ecryptfs-utils/0003-fix-parallel-build-issue.patch lib_patch.Upstream diff --git a/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch b/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch deleted file mode 100644 index 84b4d0f392d..00000000000 --- a/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 7297a8ef3cab3b0faf1426622ee902a2144e2e89 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Wed, 24 Mar 2021 11:27:14 +0100 -Subject: [PATCH] ebtables.h: restore KERNEL_64_USERSPACE_32 checks - -Commit e6359eedfbf497e52d52451072aea4713ed80a88 replaced the file ebtables.h -but removed the usage of KERNEL_64_USERSPACE_32. This breaks boards where -such flag is relevant, with following messages: - -[ 6364.971346] kernel msg: ebtables bug: please report to author: Standard target size too big - -Unable to update the kernel. Two possible causes: -1. Multiple ebtables programs were executing simultaneously. The ebtables - userspace tool doesn't by default support multiple ebtables programs running - concurrently. The ebtables option --concurrent or a tool like flock can be - used to support concurrent scripts that update the ebtables kernel tables. -2. The kernel doesn't support a certain ebtables extension, consider - recompiling your kernel or insmod the extension. - -Analysis shows that the structure 'ebt_replace' passed from userspace -ebtables to the kernel, is too small, i.e 80 bytes instead of 120 in case of -64-bit kernel. - -Note that the ebtables build system seems to assume that 'sparc64' is the -only case where KERNEL_64_USERSPACE_32 is relevant, but this is not true. -This situation can happen on many architectures, especially in embedded -systems. For example, an Aarch64 processor with kernel in 64-bit but -userland build for 32-bit Arm. Or a 64-bit MIPS Octeon III processor, with -userland running in the 'n32' ABI. - -Signed-off-by: Thomas De Schampheleire -Upstream-Status: http://patchwork.ozlabs.org/project/netfilter-devel/patch/20210518181730.13436-1-patrickdepinguin@gmail.com/ ---- - include/linux/netfilter_bridge/ebtables.h | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h -index 5be75f2..3c2b61e 100644 ---- a/include/linux/netfilter_bridge/ebtables.h -+++ b/include/linux/netfilter_bridge/ebtables.h -@@ -49,12 +49,21 @@ struct ebt_replace { - /* total size of the entries */ - unsigned int entries_size; - /* start of the chains */ -+#ifdef KERNEL_64_USERSPACE_32 -+ uint64_t hook_entry[NF_BR_NUMHOOKS]; -+#else - struct ebt_entries *hook_entry[NF_BR_NUMHOOKS]; -+#endif - /* nr of counters userspace expects back */ - unsigned int num_counters; - /* where the kernel will put the old counters */ -+#ifdef KERNEL_64_USERSPACE_32 -+ uint64_t counters; -+ uint64_t entries; -+#else - struct ebt_counter *counters; - char *entries; -+#endif - }; - - struct ebt_replace_kernel { -@@ -129,6 +138,9 @@ struct ebt_entry_match { - } u; - /* size of data */ - unsigned int match_size; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); - }; - -@@ -142,6 +154,9 @@ struct ebt_entry_watcher { - } u; - /* size of data */ - unsigned int watcher_size; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); - }; - -@@ -155,6 +170,9 @@ struct ebt_entry_target { - } u; - /* size of data */ - unsigned int target_size; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); - }; - -@@ -162,6 +180,9 @@ struct ebt_entry_target { - struct ebt_standard_target { - struct ebt_entry_target target; - int verdict; -+#ifdef KERNEL_64_USERSPACE_32 -+ unsigned int pad; -+#endif - }; - - /* one entry */ --- -2.26.2 - diff --git a/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch b/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch deleted file mode 100644 index cb57b395690..00000000000 --- a/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ebf0236270b977a62c522bc32810bc9f8edc72d1 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Wed, 24 Mar 2021 13:40:14 +0100 -Subject: [PATCH] configure.ac: add option --enable-kernel-64-userland-32 - -The ebtables build system seems to assume that 'sparc64' is the -only case where KERNEL_64_USERSPACE_32 is relevant, but this is not true. -This situation can happen on many architectures, especially in embedded -systems. For example, an Aarch64 processor with kernel in 64-bit but -userland build for 32-bit Arm. Or a 64-bit MIPS Octeon III processor, with -userland running in the 'n32' ABI. - -While it is possible to set CFLAGS in the environment when calling the -configure script, the caller would need to know to not only specify -KERNEL_64_USERSPACE_32 but also the EBT_MIN_ALIGN value. - -Instead, add a configure option. All internal details can then be handled by -the configure script. - -Signed-off-by: Thomas De Schampheleire -Upstream-Status: http://patchwork.ozlabs.org/project/netfilter-devel/patch/20210518181730.13436-2-patrickdepinguin@gmail.com/ ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c24ede3..3e89c0c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,10 +15,17 @@ AS_IF([test "x$LOCKFILE" = x], [LOCKFILE="/var/lib/ebtables/lock"]) - - regular_CFLAGS="-Wall -Wunused" - regular_CPPFLAGS="" -+ - case "$host" in - sparc64-*) -- regular_CPPFLAGS="$regular_CPPFLAGS -DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32";; -+ enable_kernel_64_userland_32=yes ;; - esac -+AC_ARG_ENABLE([kernel-64-userland-32], -+ AC_HELP_STRING([--enable-kernel-64-userland-32], [indicate that ebtables will be built as a 32-bit application but run under a 64-bit kernel]) -+) -+AS_IF([test "x$enable_kernel_64_userland_32" = xyes], -+ [regular_CPPFLAGS="$regular_CPPFLAGS -DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32"] -+) - - AC_SUBST([regular_CFLAGS]) - AC_SUBST([regular_CPPFLAGS]) --- -2.26.2 - diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in index 703e55a3c3c..ce5f67bc61f 100644 --- a/package/ebtables/Config.in +++ b/package/ebtables/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_EBTABLES bool "ebtables" depends on BR2_USE_MMU # fork() + # https://lore.kernel.org/all/20210518181730.13436-1-patrickdepinguin@gmail.com/ + depends on !BR2_KERNEL_64_USERLAND_32 help Ethernet bridge frame table administration diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 46c22dde9ba..09a9f4ba7db 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -11,12 +11,6 @@ EBTABLES_LICENSE_FILES = COPYING EBTABLES_CPE_ID_VENDOR = netfilter EBTABLES_SELINUX_MODULES = iptables -# for 0003-configure.ac-add-option-enable-kernel-64-userland-32.patch -EBTABLES_AUTORECONF = YES -ifeq ($(BR2_KERNEL_64_USERLAND_32),y) -EBTABLES_CONF_OPTS += --enable-kernel-64-userland-32 -endif - ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y) define EBTABLES_INSTALL_TARGET_UTILS_SAVE $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 3f4fc70e624..6e4de43f73c 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -45,6 +45,7 @@ config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y depends on BR2_INSTALL_LIBSTDCPP # nmap + depends on !BR2_KERNEL_64_USERLAND_32 # ebtables select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES From ab3491e02e885acceae6cb7c50bd452ab9c6ee31 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 28 Oct 2024 14:46:00 +0100 Subject: [PATCH 2955/3013] package/musl-compat-headers: fix download of queue.h http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h?rev=1.70 now returns some HTML soup instead of the plain text version of the file, causing the hash check to fail. http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h?rev=1.70;content-type=text%2Fplain returns the correct data, but the ";" in the URL causes some issues with the parsing logic in Buildroot. So let's switch to https://raw.githubusercontent.com/NetBSD/src/03be82a6b173b3c62116b7a186067fed3004dd44/sys/sys/queue.h which delivers exactly the same file, but hopefully will be more stable. The file name changed to just queue.h, but the contents is the same. Fixes: http://autobuild.buildroot.net/results/57c8078f382f74859076512425b2f1c52f44e95a/ https://gitlab.com/buildroot.org/buildroot/-/jobs/8199992850 (and many other similar cases) Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour (cherry picked from commit ebcccdfbd625b2773de705f4519454c131561f17) Signed-off-by: Peter Korsgaard --- package/musl-compat-headers/musl-compat-headers.hash | 2 +- package/musl-compat-headers/musl-compat-headers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/musl-compat-headers/musl-compat-headers.hash b/package/musl-compat-headers/musl-compat-headers.hash index 626145df34f..27e0afb68ca 100644 --- a/package/musl-compat-headers/musl-compat-headers.hash +++ b/package/musl-compat-headers/musl-compat-headers.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h?rev=1.70 +sha256 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h diff --git a/package/musl-compat-headers/musl-compat-headers.mk b/package/musl-compat-headers/musl-compat-headers.mk index 1cfa894879a..865b0bae437 100644 --- a/package/musl-compat-headers/musl-compat-headers.mk +++ b/package/musl-compat-headers/musl-compat-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # No main site, just using extra downloads -MUSL_COMPAT_HEADERS_QUEUE_H = http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h?rev=1.70 +MUSL_COMPAT_HEADERS_QUEUE_H = https://raw.githubusercontent.com/NetBSD/src/03be82a6b173b3c62116b7a186067fed3004dd44/sys/sys/queue.h MUSL_COMPAT_HEADERS_EXTRA_DOWNLOADS = $(MUSL_COMPAT_HEADERS_QUEUE_H) From 2d8d9c45f5ea0730a502e59c629405e2400c37fc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 28 Oct 2024 14:46:00 +0100 Subject: [PATCH 2956/3013] package/musl-compat-headers: fix download of queue.h http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h?rev=1.70 now returns some HTML soup instead of the plain text version of the file, causing the hash check to fail. http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h?rev=1.70;content-type=text%2Fplain returns the correct data, but the ";" in the URL causes some issues with the parsing logic in Buildroot. So let's switch to https://raw.githubusercontent.com/NetBSD/src/03be82a6b173b3c62116b7a186067fed3004dd44/sys/sys/queue.h which delivers exactly the same file, but hopefully will be more stable. The file name changed to just queue.h, but the contents is the same. Fixes: http://autobuild.buildroot.net/results/57c8078f382f74859076512425b2f1c52f44e95a/ https://gitlab.com/buildroot.org/buildroot/-/jobs/8199992850 (and many other similar cases) Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour (cherry picked from commit ebcccdfbd625b2773de705f4519454c131561f17) Signed-off-by: Peter Korsgaard --- package/musl-compat-headers/musl-compat-headers.hash | 2 +- package/musl-compat-headers/musl-compat-headers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/musl-compat-headers/musl-compat-headers.hash b/package/musl-compat-headers/musl-compat-headers.hash index 626145df34f..27e0afb68ca 100644 --- a/package/musl-compat-headers/musl-compat-headers.hash +++ b/package/musl-compat-headers/musl-compat-headers.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h?rev=1.70 +sha256 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h diff --git a/package/musl-compat-headers/musl-compat-headers.mk b/package/musl-compat-headers/musl-compat-headers.mk index 1cfa894879a..865b0bae437 100644 --- a/package/musl-compat-headers/musl-compat-headers.mk +++ b/package/musl-compat-headers/musl-compat-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # No main site, just using extra downloads -MUSL_COMPAT_HEADERS_QUEUE_H = http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h?rev=1.70 +MUSL_COMPAT_HEADERS_QUEUE_H = https://raw.githubusercontent.com/NetBSD/src/03be82a6b173b3c62116b7a186067fed3004dd44/sys/sys/queue.h MUSL_COMPAT_HEADERS_EXTRA_DOWNLOADS = $(MUSL_COMPAT_HEADERS_QUEUE_H) From 09be912cdbefe362fdf98d1b3edceadb524928f0 Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Wed, 30 Oct 2024 01:19:36 +0200 Subject: [PATCH 2957/3013] package/sshguard: patch /usr/local/sbin/sshguard path in systemd service The systemd service deployed to the target is derived from an example hardcoded for the /usr/local/sbin/ path, but we install sshguard at /usr/sbin/. Thus, by default we get this error message: $ journalctl -b -u sshguard.service -f systemd[1]: Started SSHGuard - blocks brute-force login attempts. (sshguard)[612]: sshguard.service: Unable to locate executable '/usr/local/sbin/sshguard': No such file or directory (sshguard)[612]: sshguard.service: Failed at step EXEC spawning /usr/local/sbin/sshguard: No such file or directory systemd[1]: sshguard.service: Main process exited, code=exited, status=203/EXEC systemd[1]: sshguard.service: Failed with result 'exit-code'. systemd[1]: sshguard.service: Scheduled restart job, restart counter is at 5. systemd[1]: sshguard.service: Start request repeated too quickly. systemd[1]: sshguard.service: Failed with result 'exit-code'. systemd[1]: Failed to start SSHGuard - blocks brute-force login attempts. Fix up the path in the service after the $(INSTALL) command has run. Signed-off-by: Vladimir Oltean Signed-off-by: Thomas Petazzoni (cherry picked from commit 750d0e377d66b88fc7c976f492aeafc1def4b7dc) Signed-off-by: Peter Korsgaard --- package/sshguard/sshguard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sshguard/sshguard.mk b/package/sshguard/sshguard.mk index 8d036357438..97cbbb2bdd3 100644 --- a/package/sshguard/sshguard.mk +++ b/package/sshguard/sshguard.mk @@ -25,6 +25,8 @@ endef define SSHGUARD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/examples/sshguard.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshguard.service + $(SED) 's:/usr/local/sbin/sshguard:/usr/sbin/sshguard:g' \ + $(TARGET_DIR)/usr/lib/systemd/system/sshguard.service endef $(eval $(autotools-package)) From 026ad00c9961d77ff9cc277b19ee7f8f10933c40 Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Wed, 30 Oct 2024 01:19:36 +0200 Subject: [PATCH 2958/3013] package/sshguard: patch /usr/local/sbin/sshguard path in systemd service The systemd service deployed to the target is derived from an example hardcoded for the /usr/local/sbin/ path, but we install sshguard at /usr/sbin/. Thus, by default we get this error message: $ journalctl -b -u sshguard.service -f systemd[1]: Started SSHGuard - blocks brute-force login attempts. (sshguard)[612]: sshguard.service: Unable to locate executable '/usr/local/sbin/sshguard': No such file or directory (sshguard)[612]: sshguard.service: Failed at step EXEC spawning /usr/local/sbin/sshguard: No such file or directory systemd[1]: sshguard.service: Main process exited, code=exited, status=203/EXEC systemd[1]: sshguard.service: Failed with result 'exit-code'. systemd[1]: sshguard.service: Scheduled restart job, restart counter is at 5. systemd[1]: sshguard.service: Start request repeated too quickly. systemd[1]: sshguard.service: Failed with result 'exit-code'. systemd[1]: Failed to start SSHGuard - blocks brute-force login attempts. Fix up the path in the service after the $(INSTALL) command has run. Signed-off-by: Vladimir Oltean Signed-off-by: Thomas Petazzoni (cherry picked from commit 750d0e377d66b88fc7c976f492aeafc1def4b7dc) Signed-off-by: Peter Korsgaard --- package/sshguard/sshguard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sshguard/sshguard.mk b/package/sshguard/sshguard.mk index 8d036357438..97cbbb2bdd3 100644 --- a/package/sshguard/sshguard.mk +++ b/package/sshguard/sshguard.mk @@ -25,6 +25,8 @@ endef define SSHGUARD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/examples/sshguard.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshguard.service + $(SED) 's:/usr/local/sbin/sshguard:/usr/sbin/sshguard:g' \ + $(TARGET_DIR)/usr/lib/systemd/system/sshguard.service endef $(eval $(autotools-package)) From 60973b0e52f0517ff9d5bc504b5f4360dc602f70 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Wed, 30 Oct 2024 07:59:21 +0800 Subject: [PATCH 2959/3013] package/libmodbus: bump to version 3.1.11 Release notes: https://github.com/stephane/libmodbus/releases/tag/v3.1.11 Signed-off-by: Scott Fan Signed-off-by: Thomas Petazzoni (cherry picked from commit dc9c4e05761fa850403c8c2c21e1bfbe719aecc2) Signed-off-by: Peter Korsgaard --- package/libmodbus/libmodbus.hash | 2 +- package/libmodbus/libmodbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index a7b7e583a87..5c081d9710f 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 899be4e25ab7fe5799d43f9567510d6f063d2e8f56136dd726b6fd976f9b2253 libmodbus-3.1.10.tar.gz +sha256 15b4b2e0f68122c2da9b195de5c330489a9c97d40b4a95d2822378dc14d780e7 libmodbus-3.1.11.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 2fffa1e0e9a..4902d6257fa 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.10 +LIBMODBUS_VERSION = 3.1.11 LIBMODBUS_SITE = https://github.com/stephane/libmodbus/releases/download/v$(LIBMODBUS_VERSION) LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER From c807d5e4ec6d9db32028d701a51ef345793ad62b Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Wed, 30 Oct 2024 07:59:21 +0800 Subject: [PATCH 2960/3013] package/libmodbus: bump to version 3.1.11 Release notes: https://github.com/stephane/libmodbus/releases/tag/v3.1.11 Signed-off-by: Scott Fan Signed-off-by: Thomas Petazzoni (cherry picked from commit dc9c4e05761fa850403c8c2c21e1bfbe719aecc2) Signed-off-by: Peter Korsgaard --- package/libmodbus/libmodbus.hash | 2 +- package/libmodbus/libmodbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index a7b7e583a87..5c081d9710f 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 899be4e25ab7fe5799d43f9567510d6f063d2e8f56136dd726b6fd976f9b2253 libmodbus-3.1.10.tar.gz +sha256 15b4b2e0f68122c2da9b195de5c330489a9c97d40b4a95d2822378dc14d780e7 libmodbus-3.1.11.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 2fffa1e0e9a..4902d6257fa 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.10 +LIBMODBUS_VERSION = 3.1.11 LIBMODBUS_SITE = https://github.com/stephane/libmodbus/releases/download/v$(LIBMODBUS_VERSION) LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER From 8e382f90706741e2d6704789de2e901f21ea449b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 30 Oct 2024 22:27:00 +0100 Subject: [PATCH 2961/3013] package/checksec: fix download checksec-2.7.1.tar.gz archive was replaced or regenerated by upstream sometime between the 22 September 2024 [1] and the 29 September 2024 [2]. diffoscope report no changes in extracted files exept a different top directory name (checksec.sh-2.7.1/checksec-2.7.1): --- checksec-2.7.1.tar.gz a0d7a444d4603fb3d62fa25ef678e544ef39fa7b3c9bd5d22f1a8c526152cdde +++ checksec-2.7.1.tar.gz eba0616f4033385d6093608a2a2aad3c2debb847d6778c87346f89c80946684f Files identical despite different names --- checksec-2.7.1/ChangeLog +++ checksec.sh-2.7.1/ChangeLog Use the git hash of the 2.7.1 release to use a different archive name than the checksec-2.7.1.tar.gz archive previously released. [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/7888799855 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/7948006849 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7948006849 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit e82217622ea4778148de82a4b77972940b5e9a9e) Signed-off-by: Peter Korsgaard --- package/checksec/checksec.hash | 2 +- package/checksec/checksec.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/checksec/checksec.hash b/package/checksec/checksec.hash index 856662b193a..4ca38671149 100644 --- a/package/checksec/checksec.hash +++ b/package/checksec/checksec.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eba0616f4033385d6093608a2a2aad3c2debb847d6778c87346f89c80946684f checksec-2.7.1.tar.gz +sha256 59a351ac9b552a817329f2d2c1cd8ee76f6cf2ad8916e8eea56310154c0e31fc checksec-181cdfa84893a5d72695944efabfa5b56687379c.tar.gz sha256 55154b4be6dfcb3ff29d1e3648d0d07b3943a5fcc3af7c2e0e799b074734f722 LICENSE.txt diff --git a/package/checksec/checksec.mk b/package/checksec/checksec.mk index c1170e822ed..51a05c2a6bb 100644 --- a/package/checksec/checksec.mk +++ b/package/checksec/checksec.mk @@ -4,7 +4,8 @@ # ################################################################################ -CHECKSEC_VERSION = 2.7.1 +# git hash of 2.7.1 release. +CHECKSEC_VERSION = 181cdfa84893a5d72695944efabfa5b56687379c CHECKSEC_SITE = $(call github,slimm609,checksec.sh,$(CHECKSEC_VERSION)) CHECKSEC_LICENSE = BSD-3-Clause CHECKSEC_LICENSE_FILES = LICENSE.txt From 6239e449d15e6f714714353bf10f100e0397d3fa Mon Sep 17 00:00:00 2001 From: Cherniaev Andrei Date: Thu, 31 Oct 2024 20:04:41 +0900 Subject: [PATCH 2962/3013] configs/pc: fix grub root device in help The rootfs partition is the first partition, not the second one: the Grub configuration file already contains root=/dev/sda1 by default, and it should be changed to root=/dev/vda1 if Qemu emulation is used. Signed-off-by: Cherniaev Andrei Signed-off-by: Thomas Petazzoni (cherry picked from commit 9e3d572ff532df945fbc282fed22d10098e5718b) Signed-off-by: Peter Korsgaard --- board/pc/readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pc/readme.txt b/board/pc/readme.txt index 41aec50d361..99e8f442ead 100644 --- a/board/pc/readme.txt +++ b/board/pc/readme.txt @@ -42,8 +42,8 @@ Emulation in qemu (BIOS) 1. Edit grub-bios.cfg Since the driver will show up in the virtual machine as /dev/vda, - change board/pc/grub-bios.cfg to use root=/dev/vda2 instead of - root=/dev/sda2. Then rebuild grub2 and the image. + change board/pc/grub-bios.cfg to use root=/dev/vda1 instead of + root=/dev/sda1. Then rebuild grub2 and the image. 2. Run the emulation with: From 8a50eb162b4c339ccb5b310bf65c790973cf98e8 Mon Sep 17 00:00:00 2001 From: Cherniaev Andrei Date: Thu, 31 Oct 2024 20:04:41 +0900 Subject: [PATCH 2963/3013] configs/pc: fix grub root device in help The rootfs partition is the first partition, not the second one: the Grub configuration file already contains root=/dev/sda1 by default, and it should be changed to root=/dev/vda1 if Qemu emulation is used. Signed-off-by: Cherniaev Andrei Signed-off-by: Thomas Petazzoni (cherry picked from commit 9e3d572ff532df945fbc282fed22d10098e5718b) Signed-off-by: Peter Korsgaard --- board/pc/readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/pc/readme.txt b/board/pc/readme.txt index 41aec50d361..99e8f442ead 100644 --- a/board/pc/readme.txt +++ b/board/pc/readme.txt @@ -42,8 +42,8 @@ Emulation in qemu (BIOS) 1. Edit grub-bios.cfg Since the driver will show up in the virtual machine as /dev/vda, - change board/pc/grub-bios.cfg to use root=/dev/vda2 instead of - root=/dev/sda2. Then rebuild grub2 and the image. + change board/pc/grub-bios.cfg to use root=/dev/vda1 instead of + root=/dev/sda1. Then rebuild grub2 and the image. 2. Run the emulation with: From 22e818e66b242a6936126e3114d5bcc8256c6704 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 30 Oct 2024 12:45:38 +0100 Subject: [PATCH 2964/3013] package/systemd: bump to 256.7 Remove patch that was applied upstream. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 6ec14080cd20cfd4e265c37c85446f24a70b5db6) Signed-off-by: Peter Korsgaard --- ...g_loop.h-fix-missing-LOOP_SET_BLOCK_.patch | 38 ------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch diff --git a/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch b/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch deleted file mode 100644 index 0ab5a4e98d5..00000000000 --- a/package/systemd/0001-src-basic-missing_loop.h-fix-missing-LOOP_SET_BLOCK_.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 56ab1c54497d9fac74380ff9e11aaf931a917d2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= -Date: Fri, 14 Jun 2024 14:37:29 +0200 -Subject: [PATCH] src/basic/missing_loop.h: fix missing LOOP_SET_BLOCK_SIZE -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Builds with kernels headers < 4.14 fail with: - -../src/shared/loop-util.c: In function ‘loop_configure_fallback’: -../src/shared/loop-util.c:237:31: error: ‘LOOP_SET_BLOCK_SIZE’ undeclared (first use in this function); did you mean ‘LOOP_SET_DIRECT_IO’? - if (ioctl(fd, LOOP_SET_BLOCK_SIZE, (unsigned long) c->block_size) < 0) - ^~~~~~~~~~~~~~~~~~~ - LOOP_SET_DIRECT_IO - -Fixes: https://github.com/systemd/systemd/issues/33341 -Upstream: https://github.com/systemd/systemd/commit/56ab1c54497d9fac74380ff9e11aaf931a917d2b -Signed-off-by: Raphaël Mélotte ---- - src/basic/missing_loop.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h -index b88501d78b..f83a14c914 100644 ---- a/src/basic/missing_loop.h -+++ b/src/basic/missing_loop.h -@@ -29,3 +29,7 @@ assert_cc(LOOP_SET_DIRECT_IO == 0x4C08); - #ifndef LOOP_SET_STATUS_SETTABLE_FLAGS - # define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN) - #endif -+ -+#ifndef LOOP_SET_BLOCK_SIZE -+# define LOOP_SET_BLOCK_SIZE 0x4C09 -+#endif --- -2.34.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 399ac614920..976d88c1f5e 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 7861d544190f938cac1b242624d78c96fe2ebbc7b72f86166e88b50451c6fa58 systemd-256.4.tar.gz +sha256 896d76ff65c88f5fd9e42f90d152b0579049158a163431dd77cdc57748b1d7b0 systemd-256.7.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5dca8681bc7..87a8285b8aa 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 256.4 +SYSTEMD_VERSION = 256.7 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From d04f68826f842671d2c7433086057c5d6c447964 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 13 Oct 2024 00:15:29 +0200 Subject: [PATCH 2965/3013] support/testing: add rrdtool runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 8756b76a0f8d4844c7389c7fc45dbbfc880ebae1) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_rrdtool.py | 100 ++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 support/testing/tests/package/test_rrdtool.py diff --git a/DEVELOPERS b/DEVELOPERS index 639ed01cfaf..1e0862f1c02 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1941,6 +1941,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_python_sympy.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_rrdtool.py F: support/testing/tests/package/test_rt_tests.py F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py diff --git a/support/testing/tests/package/test_rrdtool.py b/support/testing/tests/package/test_rrdtool.py new file mode 100644 index 00000000000..431a867bf2c --- /dev/null +++ b/support/testing/tests/package/test_rrdtool.py @@ -0,0 +1,100 @@ +import os + +import infra.basetest + + +class TestRRDTool(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_RRDTOOL=y + BR2_PACKAGE_RRDTOOL_RRDGRAPH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can run. + self.assertRunOk("rrdtool --version") + + # This test sequence is inspired from parts of the RRDTool + # tutorial: + # https://oss.oetiker.ch/rrdtool/tut/rrdtutorial.en.html + + rrd_file = "test.rrd" + data_source = "speed" + + cmd = f"rrdtool create {rrd_file}" + cmd += " --start 920804400" + cmd += f" DS:{data_source}:COUNTER:600:U:U" + cmd += " RRA:AVERAGE:0.5:1:24" + cmd += " RRA:AVERAGE:0.5:6:10" + self.assertRunOk(cmd) + + # Some data to fill in our database, from the tutorial page. + data = [12345, 12357, 12363, 12363, 12363, + 12373, 12383, 12393, 12399, 12405, + 12411, 12415, 12420, 12422, 12423] + timestamp = 920804700 # timestamp of: Sun Mar 7 12:05:00 PM CET 1999 + + # We check we can put our data in the database. We start at + # our timestamp, then increase by 5 minutes. + for d in data: + cmd = f"rrdtool update {rrd_file} {timestamp}:{d}" + timestamp += 300 + self.assertRunOk(cmd) + + # We check we can read back our data. + cmd = f"rrdtool fetch {rrd_file}" + cmd += " AVERAGE --start 920804400 --end 920809200" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0].strip(), data_source) + # We check that at time=920805600 we have speed=0. + data_line = next(ln for ln in out if ln.strip().startswith('920805600:')) + speed = float(data_line.split(':')[1]) + self.assertAlmostEqual(speed, 0.) + + # We generate a first simple image graph. + cmd = "rrdtool graph speed.png" + cmd += " --start 920804400 --end 920808000" + cmd += f" DEF:myspeed={rrd_file}:{data_source}:AVERAGE" + cmd += " LINE2:myspeed#FF0000" + self.assertRunOk(cmd, timeout=20) + + # We check the output file exists and has a size + # greater than zero. + self.assertRunOk("test -s speed.png") + + # We generate a slightly more complex graph. + cmd = "rrdtool graph speed2.png" + cmd += " --start 920804400 --end 920808000" + cmd += " --vertical-label m/s" + cmd += f" DEF:myspeed={rrd_file}:{data_source}:AVERAGE" + cmd += " CDEF:realspeed=myspeed,1000,\\*" + cmd += " LINE2:realspeed#FF0000" + self.assertRunOk(cmd, timeout=20) + + # Again, we check the output file exists. + self.assertRunOk("test -s speed2.png") + + # Finally, we generate the last graph, with some rules. + cmd = "rrdtool graph speed3.png" + cmd += " --start 920804400 --end 920808000" + cmd += " --vertical-label km/h" + cmd += f" DEF:myspeed={rrd_file}:{data_source}:AVERAGE" + cmd += " \"CDEF:kmh=myspeed,3600,*\"" + cmd += " CDEF:fast=kmh,100,GT,kmh,0,IF" + cmd += " CDEF:good=kmh,100,GT,0,kmh,IF" + cmd += " HRULE:100#0000FF:\"Maximum allowed\"" + cmd += " AREA:good#00FF00:\"Good speed\"" + cmd += " AREA:fast#FF0000:\"Too fast\"" + self.assertRunOk(cmd, timeout=20) + + # And again, we check the output file exists. + self.assertRunOk("test -s speed3.png") From 17555734e88938afae7d0a332b17d04e384d4397 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 13 Oct 2024 00:15:29 +0200 Subject: [PATCH 2966/3013] support/testing: add rrdtool runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 8756b76a0f8d4844c7389c7fc45dbbfc880ebae1) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_rrdtool.py | 100 ++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 support/testing/tests/package/test_rrdtool.py diff --git a/DEVELOPERS b/DEVELOPERS index 0cbcac4c8b3..badb72007b1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1864,6 +1864,7 @@ F: support/testing/tests/package/test_python_pyqt5/ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_rrdtool.py F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py F: support/testing/tests/package/test_socat.py diff --git a/support/testing/tests/package/test_rrdtool.py b/support/testing/tests/package/test_rrdtool.py new file mode 100644 index 00000000000..431a867bf2c --- /dev/null +++ b/support/testing/tests/package/test_rrdtool.py @@ -0,0 +1,100 @@ +import os + +import infra.basetest + + +class TestRRDTool(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_RRDTOOL=y + BR2_PACKAGE_RRDTOOL_RRDGRAPH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can run. + self.assertRunOk("rrdtool --version") + + # This test sequence is inspired from parts of the RRDTool + # tutorial: + # https://oss.oetiker.ch/rrdtool/tut/rrdtutorial.en.html + + rrd_file = "test.rrd" + data_source = "speed" + + cmd = f"rrdtool create {rrd_file}" + cmd += " --start 920804400" + cmd += f" DS:{data_source}:COUNTER:600:U:U" + cmd += " RRA:AVERAGE:0.5:1:24" + cmd += " RRA:AVERAGE:0.5:6:10" + self.assertRunOk(cmd) + + # Some data to fill in our database, from the tutorial page. + data = [12345, 12357, 12363, 12363, 12363, + 12373, 12383, 12393, 12399, 12405, + 12411, 12415, 12420, 12422, 12423] + timestamp = 920804700 # timestamp of: Sun Mar 7 12:05:00 PM CET 1999 + + # We check we can put our data in the database. We start at + # our timestamp, then increase by 5 minutes. + for d in data: + cmd = f"rrdtool update {rrd_file} {timestamp}:{d}" + timestamp += 300 + self.assertRunOk(cmd) + + # We check we can read back our data. + cmd = f"rrdtool fetch {rrd_file}" + cmd += " AVERAGE --start 920804400 --end 920809200" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0].strip(), data_source) + # We check that at time=920805600 we have speed=0. + data_line = next(ln for ln in out if ln.strip().startswith('920805600:')) + speed = float(data_line.split(':')[1]) + self.assertAlmostEqual(speed, 0.) + + # We generate a first simple image graph. + cmd = "rrdtool graph speed.png" + cmd += " --start 920804400 --end 920808000" + cmd += f" DEF:myspeed={rrd_file}:{data_source}:AVERAGE" + cmd += " LINE2:myspeed#FF0000" + self.assertRunOk(cmd, timeout=20) + + # We check the output file exists and has a size + # greater than zero. + self.assertRunOk("test -s speed.png") + + # We generate a slightly more complex graph. + cmd = "rrdtool graph speed2.png" + cmd += " --start 920804400 --end 920808000" + cmd += " --vertical-label m/s" + cmd += f" DEF:myspeed={rrd_file}:{data_source}:AVERAGE" + cmd += " CDEF:realspeed=myspeed,1000,\\*" + cmd += " LINE2:realspeed#FF0000" + self.assertRunOk(cmd, timeout=20) + + # Again, we check the output file exists. + self.assertRunOk("test -s speed2.png") + + # Finally, we generate the last graph, with some rules. + cmd = "rrdtool graph speed3.png" + cmd += " --start 920804400 --end 920808000" + cmd += " --vertical-label km/h" + cmd += f" DEF:myspeed={rrd_file}:{data_source}:AVERAGE" + cmd += " \"CDEF:kmh=myspeed,3600,*\"" + cmd += " CDEF:fast=kmh,100,GT,kmh,0,IF" + cmd += " CDEF:good=kmh,100,GT,0,kmh,IF" + cmd += " HRULE:100#0000FF:\"Maximum allowed\"" + cmd += " AREA:good#00FF00:\"Good speed\"" + cmd += " AREA:fast#FF0000:\"Too fast\"" + self.assertRunOk(cmd, timeout=20) + + # And again, we check the output file exists. + self.assertRunOk("test -s speed3.png") From ae27b61496cd86423a625d0977f67a5e01255099 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Fri, 27 Sep 2024 14:09:01 +0200 Subject: [PATCH 2967/3013] package/gnuplot: fix build failures on undefined FE_UNDERFLOW Gnuplot carries the implicit assumption that, if the header fenv.h is available, then it must define FE_UNDERFLOW. This assumption fails on microblaze{,el}, mips{,64}{,el}, nios2 and or1k. Fixes: - https://autobuild.buildroot.org/results/aa177c4f4f7c7429f052cebbf54f7027e4b2cabd/ - https://autobuild.buildroot.org/results/868ca441daa2485b997f307edeede31dd229bfc2/ - https://autobuild.buildroot.org/results/0a152cbfe23703bc5012098864d7fd5608775882/ - https://autobuild.buildroot.org/results/d43be86091c9bd9163c145264151532f0f485528/ Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni (cherry picked from commit 5ab8eb3cac0c87c850c800d639004205807faf27) Signed-off-by: Peter Korsgaard --- .../0002-check-for-defined-FE_UNDERFLOW.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/gnuplot/0002-check-for-defined-FE_UNDERFLOW.patch diff --git a/package/gnuplot/0002-check-for-defined-FE_UNDERFLOW.patch b/package/gnuplot/0002-check-for-defined-FE_UNDERFLOW.patch new file mode 100644 index 00000000000..e84c72aaed2 --- /dev/null +++ b/package/gnuplot/0002-check-for-defined-FE_UNDERFLOW.patch @@ -0,0 +1,32 @@ +From 806641b5ef504488f871b5cbd9e5c356d67d0bd1 Mon Sep 17 00:00:00 2001 +From: Edgar Bonet +Date: Tue, 24 Sep 2024 20:03:18 -0700 +Subject: [PATCH] check for defined(FE_UNDERFLOW) + +According to fenv(3), the macro FE_UNDERFLOW is defined by fenv.h only +if the implementation supports handling of the underflow exception. Do +not assume the presence of fenv.h implies FE_UNDERFLOW is defined. + +Signed-off-by: Edgar Bonet +Upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/ci/926d2c26d31f4b69feda372c76a28643ef45359d/ +Upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/ci/806641b5ef504488f871b5cbd9e5c356d67d0bd1/ +--- + src/complexfun.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/complexfun.c b/src/complexfun.c +index 7a5d9a13f..7ddb4ed60 100644 +--- a/src/complexfun.c ++++ b/src/complexfun.c +@@ -86,7 +86,7 @@ + int_error(NO_CARET, "%s: error present on entry (errno %d %s)", who, errno, strerror(errno)); + #endif + +-#ifdef HAVE_FENV_H ++#if defined (HAVE_FENV_H) && defined (FE_UNDERFLOW) + #define handle_underflow( who, var ) \ + if (errno) { \ + if (fetestexcept(FE_UNDERFLOW)) { \ +-- +2.34.1 + From 91dcb8210c2ab46e0494bd18baf927d6bde65d39 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 8 Oct 2024 09:33:00 +0200 Subject: [PATCH 2968/3013] board/mender/x86_64: clean up post build and image scripts - Use function_name() {} instead of function function_name {} - Use consistent double newlines between methods. - Un-indent the comment aboe the mender_fixup method. - Remove "Consecutive empty lines" check-package warning Signed-off-by: Adam Duskett [Arnout: Remove "Consecutive empty lines" check-package warning] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 451470b7a5f2bf26954673a87e74b580735f2d6e) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - board/mender/x86_64/post-build.sh | 8 ++++---- board/mender/x86_64/post-image-efi.sh | 13 +++++-------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 2665c713633..c560372f67c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -45,7 +45,6 @@ board/lego/ev3/post-image.sh Shellcheck board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch lib_patch.Upstream board/lemaker/bananapro/post-build.sh Shellcheck board/lemaker/bananapro/post-image.sh Shellcheck -board/mender/x86_64/post-image-efi.sh lib_shellscript.ConsecutiveEmptyLines board/minnowboard/post-build.sh Shellcheck board/nexbox/a95x/post-build.sh Shellcheck board/nexbox/a95x/post-image.sh Shellcheck diff --git a/board/mender/x86_64/post-build.sh b/board/mender/x86_64/post-build.sh index 23d1120d45d..bc4f4b8f118 100755 --- a/board/mender/x86_64/post-build.sh +++ b/board/mender/x86_64/post-build.sh @@ -3,7 +3,7 @@ set -e DEVICE_TYPE="buildroot-x86_64" ARTIFACT_NAME="1.0" -function parse_args { +parse_args() { local o O opts o='a:o:d:' O='artifact-name:,data-part-size:,device-type:' @@ -28,8 +28,8 @@ function parse_args { done } - # Create a persistent directory to mount the data partition at. -function mender_fixup { +# Create a persistent directory to mount the data partition at. +mender_fixup() { pushd "${TARGET_DIR}" if [[ -L var/lib/mender ]]; then rm var/lib/mender @@ -44,7 +44,7 @@ function mender_fixup { popd } -function main { +main() { parse_args "${@}" mender_fixup echo "device_type=${DEVICE_TYPE}" > "${TARGET_DIR}/etc/mender/device_type" diff --git a/board/mender/x86_64/post-image-efi.sh b/board/mender/x86_64/post-image-efi.sh index 97b9e06d213..073b18c9724 100755 --- a/board/mender/x86_64/post-image-efi.sh +++ b/board/mender/x86_64/post-image-efi.sh @@ -5,9 +5,8 @@ DATA_PART_SIZE="32M" DEVICE_TYPE="buildroot-x86_64" ARTIFACT_NAME="1.0" - # Parse arguments. -function parse_args { +parse_args() { local o O opts o='a:o:d:' O='artifact-name:,data-part-size:,device-type:' @@ -32,7 +31,7 @@ function parse_args { } # Create the data partition -function make_data_partition { +make_data_partition() { "${HOST_DIR}/sbin/mkfs.ext4" \ -F \ -r 1 \ @@ -42,9 +41,8 @@ function make_data_partition { "${BINARIES_DIR}/data-part.ext4" "${DATA_PART_SIZE}" } - # Create a mender image. -function generate_mender_image { +generate_mender_image() { echo "Creating ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" "${HOST_DIR}/bin/mender-artifact" \ --compression lzma \ @@ -55,13 +53,12 @@ function generate_mender_image { -o "${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" } - -function generate_image { +generate_image() { sh support/scripts/genimage.sh -c "${BOARD_DIR}/genimage-efi.cfg" } # Main function. -function main { +main() { parse_args "${@}" make_data_partition generate_image From 9a3670d7d88e38b4374186c39256ea178a285f4d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 3 Nov 2024 15:37:51 +0100 Subject: [PATCH 2969/3013] board/mender/x86_64/post-image-efi.sh: use bash for genimage.sh mender_x86_64_efi_defconfig started failing to build since 2024.08 in our Gitlab-ci since the board/mender/x86_64/post-image-efi.sh is calling support/scripts/genimage.sh with the host default shell. There is no problem if the default shell is bash but our docker image uses dash as default shell. Since support/scripts/genimage.sh is actually a bash script it's not going to work if bashisms are used: support/scripts/genimage.sh: 57: Syntax error: redirection unexpected Indeed bashisms have been added recently in support/scripts/genimage.sh by the commit introducing bmap image support [1]. Remove "sh" before support/scripts/genimage.sh and rely on "/usr/bin/env bash" to find the bash interpreter. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/8233226891 [1] 6889056f1eb4293de67c28b1ff6ee34be05d2ee4 Signed-off-by: Romain Naour Signed-off-by: Julien Olivain (cherry picked from commit c146555faa3fe563e9848be562d129d08f561d7f) Signed-off-by: Peter Korsgaard --- board/mender/x86_64/post-image-efi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/mender/x86_64/post-image-efi.sh b/board/mender/x86_64/post-image-efi.sh index 073b18c9724..ab123860769 100755 --- a/board/mender/x86_64/post-image-efi.sh +++ b/board/mender/x86_64/post-image-efi.sh @@ -54,7 +54,7 @@ generate_mender_image() { } generate_image() { - sh support/scripts/genimage.sh -c "${BOARD_DIR}/genimage-efi.cfg" + support/scripts/genimage.sh -c "${BOARD_DIR}/genimage-efi.cfg" } # Main function. From d81cd0b488dd42fc00531cfec6968c4a1997e61a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 27 Oct 2024 22:27:32 +0100 Subject: [PATCH 2970/3013] support/testing: add audit runtime test This test was suggested by Thomas, in: https://lists.buildroot.org/pipermail/buildroot/2024-October/766091.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 60e0817ebec2a76a0c65b038092245642b31d52f) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_audit.py | 91 +++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 support/testing/tests/package/test_audit.py diff --git a/DEVELOPERS b/DEVELOPERS index 1e0862f1c02..d1694244f1f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1821,6 +1821,7 @@ F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_attr.py F: support/testing/tests/package/test_audio_codec_base.py +F: support/testing/tests/package/test_audit.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_bcc.py F: support/testing/tests/package/test_bcc/ diff --git a/support/testing/tests/package/test_audit.py b/support/testing/tests/package/test_audit.py new file mode 100644 index 00000000000..f68a4b6831c --- /dev/null +++ b/support/testing/tests/package/test_audit.py @@ -0,0 +1,91 @@ +import os + +import infra.basetest + + +class TestAudit(infra.basetest.BRTest): + # This test needs a Kernel with the audit support (the builtin + # test Kernel does not have this support). Since the audit support + # enabled by default, a kernel fragment is not required. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.58" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_AUDIT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # We check the program can run by showing its version. This + # invocation also checks the Kernel has the audit support + # enabled. + self.assertRunOk("auditctl -v") + + # We define a normal user name for this test. + user = "audit-test" + + # Audit rule inspired from auditctl manual page examples. + + # We add an audit rule logging write access on the + # system password file. + cmd = "auditctl -a always,exit -F path=/etc/shadow -F perm=wa" + self.assertRunOk(cmd) + + # We do a read-only access on this file, as the root user. + self.assertRunOk("cat /etc/shadow") + + # We check our previous read-only access did NOT generated an + # event record. + ausearch_cmd = "ausearch --format text" + out, ret = self.emulator.run(ausearch_cmd) + self.assertEqual(ret, 0) + open_shadow_str = "acting as root, successfully opened-file /etc/shadow" + self.assertNotIn(open_shadow_str, "\n".join(out)) + + # We create a normal user. This will modify the shadow password file. + cmd = f"adduser -D -h /tmp -H -s /bin/sh {user}" + self.assertRunOk(cmd) + + # We are now expecting an event record of this modification. + out, ret = self.emulator.run(ausearch_cmd) + self.assertEqual(ret, 0) + self.assertIn(open_shadow_str, "\n".join(out)) + + # We add a new audit rule, recording failed open of the system + # password file. + cmd = "auditctl -a always,exit -S openat -F success=0 -F path=/etc/shadow" + self.assertRunOk(cmd) + + # We attempt to read the system password file as our new + # normal user. This command is expected to fail (as only root + # can root is supposed to read this file). + cmd = f"su - {user} -c 'cat /etc/shadow'" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Our last failed read attempt is supposed to have generated + # an event. We check we can see it in the log. + out, ret = self.emulator.run(ausearch_cmd) + self.assertEqual(ret, 0) + evt_str = f"acting as {user}, unsuccessfully opened-file /etc/shadow" + self.assertIn(evt_str, "\n".join(out)) From ebd4fe2723521582c0ff6b5f53a98c66b6b3ea61 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 27 Oct 2024 22:27:32 +0100 Subject: [PATCH 2971/3013] support/testing: add audit runtime test This test was suggested by Thomas, in: https://lists.buildroot.org/pipermail/buildroot/2024-October/766091.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 60e0817ebec2a76a0c65b038092245642b31d52f) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_audit.py | 91 +++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 support/testing/tests/package/test_audit.py diff --git a/DEVELOPERS b/DEVELOPERS index badb72007b1..8c0d53e6d02 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1750,6 +1750,7 @@ F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_attr.py +F: support/testing/tests/package/test_audit.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_bitcoin.py F: support/testing/tests/package/test_brotli.py diff --git a/support/testing/tests/package/test_audit.py b/support/testing/tests/package/test_audit.py new file mode 100644 index 00000000000..f68a4b6831c --- /dev/null +++ b/support/testing/tests/package/test_audit.py @@ -0,0 +1,91 @@ +import os + +import infra.basetest + + +class TestAudit(infra.basetest.BRTest): + # This test needs a Kernel with the audit support (the builtin + # test Kernel does not have this support). Since the audit support + # enabled by default, a kernel fragment is not required. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.58" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_AUDIT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # We check the program can run by showing its version. This + # invocation also checks the Kernel has the audit support + # enabled. + self.assertRunOk("auditctl -v") + + # We define a normal user name for this test. + user = "audit-test" + + # Audit rule inspired from auditctl manual page examples. + + # We add an audit rule logging write access on the + # system password file. + cmd = "auditctl -a always,exit -F path=/etc/shadow -F perm=wa" + self.assertRunOk(cmd) + + # We do a read-only access on this file, as the root user. + self.assertRunOk("cat /etc/shadow") + + # We check our previous read-only access did NOT generated an + # event record. + ausearch_cmd = "ausearch --format text" + out, ret = self.emulator.run(ausearch_cmd) + self.assertEqual(ret, 0) + open_shadow_str = "acting as root, successfully opened-file /etc/shadow" + self.assertNotIn(open_shadow_str, "\n".join(out)) + + # We create a normal user. This will modify the shadow password file. + cmd = f"adduser -D -h /tmp -H -s /bin/sh {user}" + self.assertRunOk(cmd) + + # We are now expecting an event record of this modification. + out, ret = self.emulator.run(ausearch_cmd) + self.assertEqual(ret, 0) + self.assertIn(open_shadow_str, "\n".join(out)) + + # We add a new audit rule, recording failed open of the system + # password file. + cmd = "auditctl -a always,exit -S openat -F success=0 -F path=/etc/shadow" + self.assertRunOk(cmd) + + # We attempt to read the system password file as our new + # normal user. This command is expected to fail (as only root + # can root is supposed to read this file). + cmd = f"su - {user} -c 'cat /etc/shadow'" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Our last failed read attempt is supposed to have generated + # an event. We check we can see it in the log. + out, ret = self.emulator.run(ausearch_cmd) + self.assertEqual(ret, 0) + evt_str = f"acting as {user}, unsuccessfully opened-file /etc/shadow" + self.assertIn(evt_str, "\n".join(out)) From ec41522c2d771baaa3db008a600e3e562ff1af27 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 4 Nov 2024 20:58:23 +0100 Subject: [PATCH 2972/3013] package/mbedtls: security bump to 2.28.9 Fixes CVE-2024-45157: CTR_DRBG prioritized over HMAC_DRBG as the PSA DRBG https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-08-1/ Signed-off-by: Francois Perrad [Peter: add CVE / advisory details] Signed-off-by: Peter Korsgaard (cherry picked from commit 64884430074aa420be48d2e63665c36673aa5e4c) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 5466b0e7de4..9de7f731da5 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.8: -sha256 241c68402cef653e586be3ce28d57da24598eb0df13fcdea9d99bfce58717132 mbedtls-2.28.8.tar.bz2 +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.9: +sha256 e85ea97aaf78dd6c0a5ba2e54dd5932ffa15f39abfc189c26beef7684630c02b mbedtls-2.28.9.tar.bz2 # Locally calculated sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 9757b8b0804..2faa6dff558 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,8 +4,8 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.8 -MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/v$(MBEDTLS_VERSION) +MBEDTLS_VERSION = 2.28.9 +MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-$(MBEDTLS_VERSION) MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION).tar.bz2 MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ From f956d40c81a7fee80c42134a88c5b45d2dc6dac6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 4 Nov 2024 20:58:23 +0100 Subject: [PATCH 2973/3013] package/mbedtls: security bump to 2.28.9 Fixes CVE-2024-45157: CTR_DRBG prioritized over HMAC_DRBG as the PSA DRBG https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-08-1/ Signed-off-by: Francois Perrad [Peter: add CVE / advisory details] Signed-off-by: Peter Korsgaard (cherry picked from commit 64884430074aa420be48d2e63665c36673aa5e4c) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 5466b0e7de4..9de7f731da5 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.8: -sha256 241c68402cef653e586be3ce28d57da24598eb0df13fcdea9d99bfce58717132 mbedtls-2.28.8.tar.bz2 +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.9: +sha256 e85ea97aaf78dd6c0a5ba2e54dd5932ffa15f39abfc189c26beef7684630c02b mbedtls-2.28.9.tar.bz2 # Locally calculated sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 9757b8b0804..2faa6dff558 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,8 +4,8 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.8 -MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/v$(MBEDTLS_VERSION) +MBEDTLS_VERSION = 2.28.9 +MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-$(MBEDTLS_VERSION) MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION).tar.bz2 MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ From 687de602f5787e0cd42baa36d73f47f49cffac7d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 1 Nov 2024 23:55:29 +0100 Subject: [PATCH 2974/3013] {linux, linux-headers}: bump 5.15.x / 6.{1, 6, 11}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit c9d16e41e9e27b1da1315d2b89073dac96c76c14) [Peter: drop 6.11.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 0c15064167c..ee1371e61e4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz -sha256 e7df81e588d70fab5ec3ec3bb04ac53d51f0860fc3b1ec45e0a4167a026899db linux-6.6.58.tar.xz -sha256 2286e4a02ea2fbe65023dbf779f20aa994ba2b8d37ed559049378089451aa256 linux-6.1.114.tar.xz +sha256 23616808d8c08f12815ff898f4edb4c11397a2b2843d029ee62452d21833a76d linux-6.6.59.tar.xz +sha256 0fd8ba827e1f1888376d88fd1d1c80d707c587c75b0f18c26530824be437ba6f linux-6.1.115.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e618c6d845fd1bc89477508e8d084bbe791fc88bf7623adee2deb6ecb2275370 linux-5.15.169.tar.xz +sha256 fd596545a3d6d93196db3fa29e4926e60900b9c05b3b9ccdee9e35d8e376e7a9 linux-5.15.170.tar.xz sha256 76cc8d7f1528f87902e38697229661d0617a7d6ab86166be9f3ef9a613b17b72 linux-5.10.228.tar.xz sha256 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b linux-5.4.284.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e44ba290eaf..f96a8a7b499 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -426,9 +426,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.322" if BR2_KERNEL_HEADERS_4_19 default "5.4.284" if BR2_KERNEL_HEADERS_5_4 default "5.10.228" if BR2_KERNEL_HEADERS_5_10 - default "5.15.169" if BR2_KERNEL_HEADERS_5_15 - default "6.1.114" if BR2_KERNEL_HEADERS_6_1 - default "6.6.58" if BR2_KERNEL_HEADERS_6_6 + default "5.15.170" if BR2_KERNEL_HEADERS_5_15 + default "6.1.115" if BR2_KERNEL_HEADERS_6_1 + default "6.6.59" if BR2_KERNEL_HEADERS_6_6 default "6.10.14" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 45963b1c7c0390a3a59f7eab49b50fd8b695b218 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 1 Nov 2024 23:55:29 +0100 Subject: [PATCH 2975/3013] {linux, linux-headers}: bump 5.15.x / 6.{1, 6, 11}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit c9d16e41e9e27b1da1315d2b89073dac96c76c14) [Peter: drop 6.11.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 2f90a412983..eff45772357 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.58" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.59" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 9bd990123c6..ea50fa513cb 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,8 +1,8 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 e7df81e588d70fab5ec3ec3bb04ac53d51f0860fc3b1ec45e0a4167a026899db linux-6.6.58.tar.xz -sha256 2286e4a02ea2fbe65023dbf779f20aa994ba2b8d37ed559049378089451aa256 linux-6.1.114.tar.xz +sha256 23616808d8c08f12815ff898f4edb4c11397a2b2843d029ee62452d21833a76d linux-6.6.59.tar.xz +sha256 0fd8ba827e1f1888376d88fd1d1c80d707c587c75b0f18c26530824be437ba6f linux-6.1.115.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e618c6d845fd1bc89477508e8d084bbe791fc88bf7623adee2deb6ecb2275370 linux-5.15.169.tar.xz +sha256 fd596545a3d6d93196db3fa29e4926e60900b9c05b3b9ccdee9e35d8e376e7a9 linux-5.15.170.tar.xz sha256 76cc8d7f1528f87902e38697229661d0617a7d6ab86166be9f3ef9a613b17b72 linux-5.10.228.tar.xz sha256 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b linux-5.4.284.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7361dae8cd3..5912c7a95cd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -406,9 +406,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.322" if BR2_KERNEL_HEADERS_4_19 default "5.4.284" if BR2_KERNEL_HEADERS_5_4 default "5.10.228" if BR2_KERNEL_HEADERS_5_10 - default "5.15.169" if BR2_KERNEL_HEADERS_5_15 - default "6.1.114" if BR2_KERNEL_HEADERS_6_1 - default "6.6.58" if BR2_KERNEL_HEADERS_6_6 + default "5.15.170" if BR2_KERNEL_HEADERS_5_15 + default "6.1.115" if BR2_KERNEL_HEADERS_6_1 + default "6.6.59" if BR2_KERNEL_HEADERS_6_6 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From ba77d95931cb31f27dd7ac014fa1caa233a74020 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Nov 2024 10:36:04 +0100 Subject: [PATCH 2976/3013] package/fbv: fetch from sources.buildroot.net MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://gitlab.com/buildroot.org/buildroot/-/issues/73 Upstream is no longer accessible, and wget takes a long time (~7 minutes) before it times out and falls back to s.b.n, so use that instead right away: wget --passive-ftp -nd -t 3 -O '/home/peko/source/buildroot/output/build/.fbv-1.0b.tar.gz.GBHVap/output' 'http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz' --2024-11-21 17:06:55-- http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz Resolving s-tech.elsat.net.pl (s-tech.elsat.net.pl)... 85.11.67.252 Connecting to s-tech.elsat.net.pl (s-tech.elsat.net.pl)|85.11.67.252|:80... failed: Connection timed out. Retrying. --2024-11-21 17:09:07-- (try: 2) http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz Connecting to s-tech.elsat.net.pl (s-tech.elsat.net.pl)|85.11.67.252|:80... failed: Connection timed out. Retrying. --2024-11-21 17:11:19-- (try: 3) http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz Connecting to s-tech.elsat.net.pl (s-tech.elsat.net.pl)|85.11.67.252|:80... failed: Connection timed out. Giving up. wget --passive-ftp -nd -t 3 -O '/home/peko/source/buildroot/output/build/.fbv-1.0b.tar.gz.MxQ1k0/output' 'https://sources.buildroot.net/fbv/fbv-1.0b.tar.gz' --2024-11-21 17:13:30-- https://sources.buildroot.net/fbv/fbv-1.0b.tar.gz Resolving sources.buildroot.net (sources.buildroot.net)... 104.26.0.37, 104.26.1.37, 172.67.72.56, ... Connecting to sources.buildroot.net (sources.buildroot.net)|104.26.0.37|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 18989 (19K) [application/x-gtar-compressed] Saving to: ‘/home/peko/source/buildroot/output/build/.fbv-1.0b.tar.gz.MxQ1k0/output’ Signed-off-by: Peter Korsgaard --- package/fbv/fbv.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index a69e4ad518a..4edfcf0ed0f 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -5,8 +5,8 @@ ################################################################################ FBV_VERSION = 1.0b -FBV_SITE = http://s-tech.elsat.net.pl/fbv - +# upstream (http://s-tech.elsat.net.pl/fbv) dead +FBV_SITE = http://sources.buildroot.net/fbv FBV_LICENSE = GPL-2.0 FBV_LICENSE_FILES = COPYING From 985d126cd78e2b071a57532e5b18867ef3481378 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Nov 2024 10:36:04 +0100 Subject: [PATCH 2977/3013] package/fbv: fetch from sources.buildroot.net MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://gitlab.com/buildroot.org/buildroot/-/issues/73 Upstream is no longer accessible, and wget takes a long time (~7 minutes) before it times out and falls back to s.b.n, so use that instead right away: wget --passive-ftp -nd -t 3 -O '/home/peko/source/buildroot/output/build/.fbv-1.0b.tar.gz.GBHVap/output' 'http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz' --2024-11-21 17:06:55-- http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz Resolving s-tech.elsat.net.pl (s-tech.elsat.net.pl)... 85.11.67.252 Connecting to s-tech.elsat.net.pl (s-tech.elsat.net.pl)|85.11.67.252|:80... failed: Connection timed out. Retrying. --2024-11-21 17:09:07-- (try: 2) http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz Connecting to s-tech.elsat.net.pl (s-tech.elsat.net.pl)|85.11.67.252|:80... failed: Connection timed out. Retrying. --2024-11-21 17:11:19-- (try: 3) http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz Connecting to s-tech.elsat.net.pl (s-tech.elsat.net.pl)|85.11.67.252|:80... failed: Connection timed out. Giving up. wget --passive-ftp -nd -t 3 -O '/home/peko/source/buildroot/output/build/.fbv-1.0b.tar.gz.MxQ1k0/output' 'https://sources.buildroot.net/fbv/fbv-1.0b.tar.gz' --2024-11-21 17:13:30-- https://sources.buildroot.net/fbv/fbv-1.0b.tar.gz Resolving sources.buildroot.net (sources.buildroot.net)... 104.26.0.37, 104.26.1.37, 172.67.72.56, ... Connecting to sources.buildroot.net (sources.buildroot.net)|104.26.0.37|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 18989 (19K) [application/x-gtar-compressed] Saving to: ‘/home/peko/source/buildroot/output/build/.fbv-1.0b.tar.gz.MxQ1k0/output’ Signed-off-by: Peter Korsgaard --- package/fbv/fbv.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index a69e4ad518a..4edfcf0ed0f 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -5,8 +5,8 @@ ################################################################################ FBV_VERSION = 1.0b -FBV_SITE = http://s-tech.elsat.net.pl/fbv - +# upstream (http://s-tech.elsat.net.pl/fbv) dead +FBV_SITE = http://sources.buildroot.net/fbv FBV_LICENSE = GPL-2.0 FBV_LICENSE_FILES = COPYING From 7805e72284cf6df517efa62a5a419458ce78a7c6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Nov 2024 18:32:09 +0100 Subject: [PATCH 2978/3013] package/babeld: unbreak download hash Fixes https://autobuild.buildroot.org/results/9e35823ae09b8886c0fa193e903feb7bc69509a9/ Something went wrong when backporting commit 328a3b815d5a (package/babeld: update URL site) and updating the download hash, the permissions were wrong because of ACLs on the download directory leading to a wrong hash. Fix that. Signed-off-by: Peter Korsgaard --- package/babeld/babeld.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/babeld/babeld.hash b/package/babeld/babeld.hash index 5c33bc5ccf6..8dbd24d87b1 100644 --- a/package/babeld/babeld.hash +++ b/package/babeld/babeld.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 41a99b340b568a12ba58486cf07a63ab01b8dbbc8da1c4e833c30dc251340aaa babeld-babeld-1.9.2-br1.tar.gz +sha256 d1b41f246a437bdafa5551fb16ca957fc9402de1c53f3647ead9466d67fe3fe0 babeld-babeld-1.9.2-br1.tar.gz sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE From 35d3dd33dadb5d91c4c4f260def4078f75df6e3b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Nov 2024 19:34:37 +0100 Subject: [PATCH 2979/3013] package/gamin: fetch from sources.buildroot.net Fixes https://autobuild.buildroot.org/results/ef2/ef2b87da32c81fa635f795a99f352a18f535ec25/ Upstream is no longer accessible, so use s.b.n instead. Signed-off-by: Peter Korsgaard --- package/gamin/gamin.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk index 4621b1646f3..70bbde5f660 100644 --- a/package/gamin/gamin.mk +++ b/package/gamin/gamin.mk @@ -5,7 +5,8 @@ ################################################################################ GAMIN_VERSION = 0.1.10 -GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources +# upstream (http://www.gnome.org/~veillard/gamin/sources) dead +GAMIN_SITE = http://sources.buildroot.net/gamin GAMIN_AUTORECONF = YES GAMIN_INSTALL_STAGING = YES GAMIN_LICENSE = LGPL-2.0+ From 7babcd8937a15ae471af706aceb2203ff849127a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 3 Nov 2024 11:11:41 +0100 Subject: [PATCH 2980/3013] package/ffmpeg: fix build on riscv32 Ported patch from OpenEmbedded: https://github.com/openembedded/openembedded-core/commit/010b068bcc126dbbc1e2032997e8d83360a7de35 "ffmpeg 6.0 has added assembly routines which uses rv64i ISA unconditionally, ideally it should check for ISA before using those instructions." Fixes: https://autobuild.buildroot.org/results/8a7082a0f24ebcf264aeac5e0fea704dc6a6bb1c/ Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain (cherry picked from commit 9e84f38be87393f5b0d0298f762bfcaf0f76f120) Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index a010c0168c1..1e18b5e2da5 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -529,6 +529,11 @@ else FFMPEG_CONF_OPTS += --disable-altivec endif +# Fix build failure on several missing assembly instructions +ifeq ($(BR2_RISCV_32),y) +FFMPEG_CONF_OPTS += --disable-rvv --disable-asm +endif + # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) FFMPEG_CONF_OPTS += --extra-libs=-latomic From 1e0b9fb7cbfd17ac559217b15ab0cf059359d381 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 22 Oct 2024 22:43:33 +0200 Subject: [PATCH 2981/3013] package/x11vnc: add and rework compile patches Add the "Upstream" field to the patch message for: - 0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch - 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch Add a compile patch for GCC >= 10 which enables -fno-common by default. Fixes: - https://autobuild.buildroot.org/results/b2231fe06fe56036a5ddbe61cb8556b046e3a7b7 - https://autobuild.buildroot.org/results/8afbcc63818d3e1586731e178f16635e773d5600 - ... Signed-off-by: Thomas Devoogdt [Julien: simplified autobuild URLs] Signed-off-by: Julien Olivain (cherry picked from commit e5bb457d5d703aa327354236729dff1f261348ac) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...ld-on-32bit-arches-with-64bit-time_t.patch | 8 ++-- ...-to-shared-memory-segments-to-curre.patch} | 8 ++-- .../0003-Fix-build-with-fno-common.patch | 48 +++++++++++++++++++ 4 files changed, 58 insertions(+), 8 deletions(-) rename package/x11vnc/{0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch => 0002-scan-limit-access-to-shared-memory-segments-to-curre.patch} (81%) create mode 100644 package/x11vnc/0003-Fix-build-with-fno-common.patch diff --git a/.checkpackageignore b/.checkpackageignore index c560372f67c..6127411e37a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1393,8 +1393,6 @@ package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-ser package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Upstream package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables -package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream -package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch lib_patch.Upstream package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch lib_patch.Upstream package/xen/0002-Fix-build-with-64-bits-time_t.patch lib_patch.Upstream package/xen/0003-libs-light-fix-tv_sec-printf-format.patch lib_patch.Upstream diff --git a/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 87dc3c994f1..a9af88e55d2 100644 --- a/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From daecf59cc8b294265666482a4766aaa3148c308b Mon Sep 17 00:00:00 2001 +From 8ca0465fda181bd20e5d30c36fb2aea56ed27b6b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Nov 2019 11:43:32 -0800 Subject: [PATCH] Fix build on 32bit arches with 64bit time_t @@ -8,8 +8,7 @@ input.h [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f -[Retrieved from: -https://github.com/LibVNC/x11vnc/commit/daecf59cc8b294265666482a4766aaa3148c308b] +Upstream: https://github.com/LibVNC/x11vnc/commit/daecf59cc8b294265666482a4766aaa3148c308b Signed-off-by: Fabrice Fontaine --- src/uinput.c | 25 +++++++++++++++++++++---- @@ -107,3 +106,6 @@ index 28fbad3..d71bcde 100644 ev.type = EV_KEY; ev.code = (unsigned char) scancode; ev.value = down; +-- +2.43.0 + diff --git a/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch b/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-curre.patch similarity index 81% rename from package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch rename to package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-curre.patch index e4dbdf1894f..05977375d80 100644 --- a/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch +++ b/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-curre.patch @@ -1,10 +1,9 @@ -From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From 3870280eca9c10a3607440209e9caf6d7749e379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= Date: Wed, 18 Nov 2020 08:40:45 +0100 Subject: [PATCH] scan: limit access to shared memory segments to current user -[Retrieved from: -https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a] +Upstream: https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a Signed-off-by: Fabrice Fontaine --- src/scan.c | 2 +- @@ -23,3 +22,6 @@ index 43e00d2..12994d5 100644 if (shm->shmid == -1) { rfbErr("shmget(%s) failed.\n", name); +-- +2.43.0 + diff --git a/package/x11vnc/0003-Fix-build-with-fno-common.patch b/package/x11vnc/0003-Fix-build-with-fno-common.patch new file mode 100644 index 00000000000..eccfd3872a3 --- /dev/null +++ b/package/x11vnc/0003-Fix-build-with-fno-common.patch @@ -0,0 +1,48 @@ +From 08d57adf499264fcd32461a4092cd799c474d669 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 28 Jan 2020 22:21:01 +0300 +Subject: [PATCH] Fix build with -fno-common + +GCC 10 defaults to -fno-common + +Upstream: https://github.com/LibVNC/x11vnc/commit/a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 +Signed-off-by: Thomas Devoogdt +--- + src/util.c | 3 +++ + src/util.h | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/util.c b/src/util.c +index a82a1a4..6a52ebf 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -47,6 +47,9 @@ int hxl = 0; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + MUTEX(x11Mutex); + MUTEX(scrollMutex); ++MUTEX(clientMutex); ++MUTEX(inputMutex); ++MUTEX(pointerMutex); + #endif + + int nfix(int i, int n); +diff --git a/src/util.h b/src/util.h +index 35c1afd..99b5dd1 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + extern MUTEX(x11Mutex); + extern MUTEX(scrollMutex); +-MUTEX(clientMutex); +-MUTEX(inputMutex); +-MUTEX(pointerMutex); ++extern MUTEX(clientMutex); ++extern MUTEX(inputMutex); ++extern MUTEX(pointerMutex); + #endif + + #define X_INIT INIT_MUTEX(x11Mutex) +-- +2.43.0 + From fee127154a7bb889cff6c64046c05888f5257168 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 22 Oct 2024 22:43:33 +0200 Subject: [PATCH 2982/3013] package/x11vnc: add and rework compile patches Add the "Upstream" field to the patch message for: - 0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch - 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch Add a compile patch for GCC >= 10 which enables -fno-common by default. Fixes: - https://autobuild.buildroot.org/results/b2231fe06fe56036a5ddbe61cb8556b046e3a7b7 - https://autobuild.buildroot.org/results/8afbcc63818d3e1586731e178f16635e773d5600 - ... Signed-off-by: Thomas Devoogdt [Julien: simplified autobuild URLs] Signed-off-by: Julien Olivain (cherry picked from commit e5bb457d5d703aa327354236729dff1f261348ac) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...ld-on-32bit-arches-with-64bit-time_t.patch | 8 ++-- ...-to-shared-memory-segments-to-curre.patch} | 8 ++-- .../0003-Fix-build-with-fno-common.patch | 48 +++++++++++++++++++ 4 files changed, 58 insertions(+), 8 deletions(-) rename package/x11vnc/{0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch => 0002-scan-limit-access-to-shared-memory-segments-to-curre.patch} (81%) create mode 100644 package/x11vnc/0003-Fix-build-with-fno-common.patch diff --git a/.checkpackageignore b/.checkpackageignore index 78f05a47397..0096ed7d2f5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1375,8 +1375,6 @@ package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-ser package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob Upstream package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch Upstream package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables -package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch Upstream -package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch Upstream package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch Upstream package/xen/0002-Fix-build-with-64-bits-time_t.patch Upstream package/xen/0003-libs-light-fix-tv_sec-printf-format.patch Upstream diff --git a/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 87dc3c994f1..a9af88e55d2 100644 --- a/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From daecf59cc8b294265666482a4766aaa3148c308b Mon Sep 17 00:00:00 2001 +From 8ca0465fda181bd20e5d30c36fb2aea56ed27b6b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Nov 2019 11:43:32 -0800 Subject: [PATCH] Fix build on 32bit arches with 64bit time_t @@ -8,8 +8,7 @@ input.h [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f -[Retrieved from: -https://github.com/LibVNC/x11vnc/commit/daecf59cc8b294265666482a4766aaa3148c308b] +Upstream: https://github.com/LibVNC/x11vnc/commit/daecf59cc8b294265666482a4766aaa3148c308b Signed-off-by: Fabrice Fontaine --- src/uinput.c | 25 +++++++++++++++++++++---- @@ -107,3 +106,6 @@ index 28fbad3..d71bcde 100644 ev.type = EV_KEY; ev.code = (unsigned char) scancode; ev.value = down; +-- +2.43.0 + diff --git a/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch b/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-curre.patch similarity index 81% rename from package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch rename to package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-curre.patch index e4dbdf1894f..05977375d80 100644 --- a/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch +++ b/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-curre.patch @@ -1,10 +1,9 @@ -From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From 3870280eca9c10a3607440209e9caf6d7749e379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= Date: Wed, 18 Nov 2020 08:40:45 +0100 Subject: [PATCH] scan: limit access to shared memory segments to current user -[Retrieved from: -https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a] +Upstream: https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a Signed-off-by: Fabrice Fontaine --- src/scan.c | 2 +- @@ -23,3 +22,6 @@ index 43e00d2..12994d5 100644 if (shm->shmid == -1) { rfbErr("shmget(%s) failed.\n", name); +-- +2.43.0 + diff --git a/package/x11vnc/0003-Fix-build-with-fno-common.patch b/package/x11vnc/0003-Fix-build-with-fno-common.patch new file mode 100644 index 00000000000..eccfd3872a3 --- /dev/null +++ b/package/x11vnc/0003-Fix-build-with-fno-common.patch @@ -0,0 +1,48 @@ +From 08d57adf499264fcd32461a4092cd799c474d669 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 28 Jan 2020 22:21:01 +0300 +Subject: [PATCH] Fix build with -fno-common + +GCC 10 defaults to -fno-common + +Upstream: https://github.com/LibVNC/x11vnc/commit/a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 +Signed-off-by: Thomas Devoogdt +--- + src/util.c | 3 +++ + src/util.h | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/util.c b/src/util.c +index a82a1a4..6a52ebf 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -47,6 +47,9 @@ int hxl = 0; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + MUTEX(x11Mutex); + MUTEX(scrollMutex); ++MUTEX(clientMutex); ++MUTEX(inputMutex); ++MUTEX(pointerMutex); + #endif + + int nfix(int i, int n); +diff --git a/src/util.h b/src/util.h +index 35c1afd..99b5dd1 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + extern MUTEX(x11Mutex); + extern MUTEX(scrollMutex); +-MUTEX(clientMutex); +-MUTEX(inputMutex); +-MUTEX(pointerMutex); ++extern MUTEX(clientMutex); ++extern MUTEX(inputMutex); ++extern MUTEX(pointerMutex); + #endif + + #define X_INIT INIT_MUTEX(x11Mutex) +-- +2.43.0 + From 59256d02f802f93390d6851f5d870363f4d86b58 Mon Sep 17 00:00:00 2001 From: Cherniaev Andrei Date: Sun, 10 Nov 2024 02:09:00 +0900 Subject: [PATCH 2983/3013] package/picotool: fix Config.in comment dependencies Due to a bug in the Config.in comment dependencies, the comment "*** picotool needs a toolchain w/ C++, threads, gcc >= 4.9 ***" is always shown even if all features are enabled. Fixes: d30c1e3c582545a770d40a63be5b7b477d6b1cba ("package/picotool: fix libusb dependencies") Signed-off-by: Cherniaev Andrei Signed-off-by: Thomas Petazzoni (cherry picked from commit d2f5678f4217ab5cadbc4f32f7ca7a8efa8d2bc8) Signed-off-by: Peter Korsgaard --- package/picotool/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/picotool/Config.in b/package/picotool/Config.in index bbbcef405db..51c7c711880 100644 --- a/package/picotool/Config.in +++ b/package/picotool/Config.in @@ -1,6 +1,6 @@ comment "picotool needs a toolchain w/ C++, threads, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || \ - BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_PICOTOOL From 30a1d2196e0aa972031fa309308f37001cf2ffd8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 10 Nov 2024 00:39:05 +0100 Subject: [PATCH 2984/3013] package/irssi: bump version to 1.4.5 For change log, see: https://irssi.org/NEWS/#news-v1-4-5 This commit also adds the pgp key id used for the signature verification. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 525c1369bc76831e8f1722d9fdad94422ab89784) Signed-off-by: Peter Korsgaard --- package/irssi/irssi.hash | 5 +++-- package/irssi/irssi.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index df72ee4d767..f2798d14c81 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,4 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead irssi-1.4.4.tar.xz +# Locally calculated after checking pgp signature with key +# 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 +sha256 72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062 irssi-1.4.5.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 6790bf0c966..7c86569d62b 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.4.4 +IRSSI_VERSION = 1.4.5 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz IRSSI_SITE = https://codeberg.org/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPL-2.0+ From d5b713c266481ff10275fc7c6ade24bfac37dc05 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 10 Nov 2024 00:39:05 +0100 Subject: [PATCH 2985/3013] package/irssi: bump version to 1.4.5 For change log, see: https://irssi.org/NEWS/#news-v1-4-5 This commit also adds the pgp key id used for the signature verification. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 525c1369bc76831e8f1722d9fdad94422ab89784) Signed-off-by: Peter Korsgaard --- package/irssi/irssi.hash | 5 +++-- package/irssi/irssi.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index df72ee4d767..f2798d14c81 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,4 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead irssi-1.4.4.tar.xz +# Locally calculated after checking pgp signature with key +# 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 +sha256 72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062 irssi-1.4.5.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 6790bf0c966..7c86569d62b 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.4.4 +IRSSI_VERSION = 1.4.5 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz IRSSI_SITE = https://codeberg.org/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPL-2.0+ From e0a8550dc22ca5584fedbba7afe841ebf22c2f29 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 11 Nov 2024 12:05:39 +0100 Subject: [PATCH 2986/3013] package/boost: update download url boost moved its package hosting from jfrog to their own url provided by the C++ Alliance. According to [0] the old urls might cease to exist after December 2024. [0] https://lists.boost.org/Archives/boost/2024/05/256914.php Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni (cherry picked from commit 8d4a9afdd530c4957ce03b156bc6a0bf1b4ca507) Signed-off-by: Peter Korsgaard --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index bb73edfda61..367ec37f6ca 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -6,7 +6,7 @@ BOOST_VERSION = 1.83.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 -BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source +BOOST_SITE = https://archives.boost.io/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt From e21e65d49e23e0726750945dbd3588f3cfae4f54 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 11 Nov 2024 12:05:39 +0100 Subject: [PATCH 2987/3013] package/boost: update download url boost moved its package hosting from jfrog to their own url provided by the C++ Alliance. According to [0] the old urls might cease to exist after December 2024. [0] https://lists.boost.org/Archives/boost/2024/05/256914.php Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni (cherry picked from commit 8d4a9afdd530c4957ce03b156bc6a0bf1b4ca507) Signed-off-by: Peter Korsgaard --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index bb73edfda61..367ec37f6ca 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -6,7 +6,7 @@ BOOST_VERSION = 1.83.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 -BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source +BOOST_SITE = https://archives.boost.io/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt From 1b73bbbf7143e33c2a407029c45d2b927a2429c1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 10 Nov 2024 18:11:29 +0100 Subject: [PATCH 2988/3013] package/usbredir: fix package homepage URL The current homepage URL [1] redirects to its https and ends up to a HTTP 404 not found error. This commit fixes the issue by replacing it with the new URL [2]. [1] http://www.spice-space.org/page/UsbRedir [2] https://www.spice-space.org/usbredir.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 122a5e252911b2ebd84d59d802e7b28b2a499f24) Signed-off-by: Peter Korsgaard --- package/usbredir/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in index 6de6227e5c2..46ccac122dd 100644 --- a/package/usbredir/Config.in +++ b/package/usbredir/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_USBREDIR Note: only the library is installed, not the utilities. Say 'y' below if you want the tools too. - http://www.spice-space.org/page/UsbRedir + https://www.spice-space.org/usbredir.html if BR2_PACKAGE_USBREDIR From 2182134836d268e1df1448df1f936863cedd5979 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 10 Nov 2024 18:11:29 +0100 Subject: [PATCH 2989/3013] package/usbredir: fix package homepage URL The current homepage URL [1] redirects to its https and ends up to a HTTP 404 not found error. This commit fixes the issue by replacing it with the new URL [2]. [1] http://www.spice-space.org/page/UsbRedir [2] https://www.spice-space.org/usbredir.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 122a5e252911b2ebd84d59d802e7b28b2a499f24) Signed-off-by: Peter Korsgaard --- package/usbredir/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in index 6de6227e5c2..46ccac122dd 100644 --- a/package/usbredir/Config.in +++ b/package/usbredir/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_USBREDIR Note: only the library is installed, not the utilities. Say 'y' below if you want the tools too. - http://www.spice-space.org/page/UsbRedir + https://www.spice-space.org/usbredir.html if BR2_PACKAGE_USBREDIR From 625d8b8706c37f29d346a89d17a0644bd8a27c87 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Nov 2024 20:48:35 +0100 Subject: [PATCH 2990/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 11}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 323567552bef83a82caa4c6f1f7f29231ae31a59) [Peter: drop 6.11.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index ee1371e61e4..c9fe868df76 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz -sha256 23616808d8c08f12815ff898f4edb4c11397a2b2843d029ee62452d21833a76d linux-6.6.59.tar.xz -sha256 0fd8ba827e1f1888376d88fd1d1c80d707c587c75b0f18c26530824be437ba6f linux-6.1.115.tar.xz +sha256 52f9e32d5082ab94253447fd66670d0c3bb765cfcb99b0bf61d1b8eae25952ef linux-6.6.60.tar.xz +sha256 17eb68336ee2a8f34378bf6089ffe8f805b978eda314c299d2a63b0603833b81 linux-6.1.116.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 fd596545a3d6d93196db3fa29e4926e60900b9c05b3b9ccdee9e35d8e376e7a9 linux-5.15.170.tar.xz -sha256 76cc8d7f1528f87902e38697229661d0617a7d6ab86166be9f3ef9a613b17b72 linux-5.10.228.tar.xz -sha256 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b linux-5.4.284.tar.xz +sha256 2953e064d8123c4c22c4fd48011378d73c8b99a3bf3d989e33f4f5c8f82f2a3b linux-5.15.171.tar.xz +sha256 08a6b5e6bbff85ef017f67b722f6beec7f12fe36fc0f9043f27a91990b88cde0 linux-5.10.229.tar.xz +sha256 be32c37ef2f6f724fa13acf43cbc9aacfd3acef58964923dae5daa6206d3429c linux-5.4.285.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 4e27cdf999359876a0ff489bff6ece7ba5798ff37c2289db0c9e9422a9014162 linux-4.19.322.tar.xz +sha256 eec9215fbac649d826fda9d3421da47aebd3c4e69e060e5106d32e309a9b6a1c linux-4.19.323.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f96a8a7b499..3af23b1cab8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -423,12 +423,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.322" if BR2_KERNEL_HEADERS_4_19 - default "5.4.284" if BR2_KERNEL_HEADERS_5_4 - default "5.10.228" if BR2_KERNEL_HEADERS_5_10 - default "5.15.170" if BR2_KERNEL_HEADERS_5_15 - default "6.1.115" if BR2_KERNEL_HEADERS_6_1 - default "6.6.59" if BR2_KERNEL_HEADERS_6_6 + default "4.19.323" if BR2_KERNEL_HEADERS_4_19 + default "5.4.285" if BR2_KERNEL_HEADERS_5_4 + default "5.10.229" if BR2_KERNEL_HEADERS_5_10 + default "5.15.171" if BR2_KERNEL_HEADERS_5_15 + default "6.1.116" if BR2_KERNEL_HEADERS_6_1 + default "6.6.60" if BR2_KERNEL_HEADERS_6_6 default "6.10.14" if BR2_KERNEL_HEADERS_6_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 8be0c546aeb8a2dc135c82099f32d676ef736fee Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Nov 2024 20:48:35 +0100 Subject: [PATCH 2991/3013] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 11}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 323567552bef83a82caa4c6f1f7f29231ae31a59) [Peter: drop 6.11.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index eff45772357..9d1096269ea 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.59" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.60" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index ea50fa513cb..27c917ce27e 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 23616808d8c08f12815ff898f4edb4c11397a2b2843d029ee62452d21833a76d linux-6.6.59.tar.xz -sha256 0fd8ba827e1f1888376d88fd1d1c80d707c587c75b0f18c26530824be437ba6f linux-6.1.115.tar.xz +sha256 52f9e32d5082ab94253447fd66670d0c3bb765cfcb99b0bf61d1b8eae25952ef linux-6.6.60.tar.xz +sha256 17eb68336ee2a8f34378bf6089ffe8f805b978eda314c299d2a63b0603833b81 linux-6.1.116.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 fd596545a3d6d93196db3fa29e4926e60900b9c05b3b9ccdee9e35d8e376e7a9 linux-5.15.170.tar.xz -sha256 76cc8d7f1528f87902e38697229661d0617a7d6ab86166be9f3ef9a613b17b72 linux-5.10.228.tar.xz -sha256 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b linux-5.4.284.tar.xz +sha256 2953e064d8123c4c22c4fd48011378d73c8b99a3bf3d989e33f4f5c8f82f2a3b linux-5.15.171.tar.xz +sha256 08a6b5e6bbff85ef017f67b722f6beec7f12fe36fc0f9043f27a91990b88cde0 linux-5.10.229.tar.xz +sha256 be32c37ef2f6f724fa13acf43cbc9aacfd3acef58964923dae5daa6206d3429c linux-5.4.285.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 4e27cdf999359876a0ff489bff6ece7ba5798ff37c2289db0c9e9422a9014162 linux-4.19.322.tar.xz +sha256 eec9215fbac649d826fda9d3421da47aebd3c4e69e060e5106d32e309a9b6a1c linux-4.19.323.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 5912c7a95cd..3f23f14b817 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.322" if BR2_KERNEL_HEADERS_4_19 - default "5.4.284" if BR2_KERNEL_HEADERS_5_4 - default "5.10.228" if BR2_KERNEL_HEADERS_5_10 - default "5.15.170" if BR2_KERNEL_HEADERS_5_15 - default "6.1.115" if BR2_KERNEL_HEADERS_6_1 - default "6.6.59" if BR2_KERNEL_HEADERS_6_6 + default "4.19.323" if BR2_KERNEL_HEADERS_4_19 + default "5.4.285" if BR2_KERNEL_HEADERS_5_4 + default "5.10.229" if BR2_KERNEL_HEADERS_5_10 + default "5.15.171" if BR2_KERNEL_HEADERS_5_15 + default "6.1.116" if BR2_KERNEL_HEADERS_6_1 + default "6.6.60" if BR2_KERNEL_HEADERS_6_6 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 5001c63d7f25b4f9639c1a8c05ba4f34010e9910 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 12 Nov 2024 06:46:59 +0100 Subject: [PATCH 2992/3013] package/expat: security bump to version 2.6.4 fix CVE-2024-50602 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 856a7e96d55329ce0b0b0057baab2ce21112848e) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 2 +- package/expat/expat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index e40b250ba03..b0273c73e8f 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc expat-2.6.3.tar.xz +sha256 a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee expat-2.6.4.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index f5c6175f282..24cfa0a9d2e 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.3 +EXPAT_VERSION = 2.6.4 EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION)) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From cea73e726be21259e2288d20d802bd62a6d67bf4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 12 Nov 2024 06:46:59 +0100 Subject: [PATCH 2993/3013] package/expat: security bump to version 2.6.4 fix CVE-2024-50602 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 856a7e96d55329ce0b0b0057baab2ce21112848e) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 2 +- package/expat/expat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index e40b250ba03..b0273c73e8f 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc expat-2.6.3.tar.xz +sha256 a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee expat-2.6.4.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index f5c6175f282..24cfa0a9d2e 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.3 +EXPAT_VERSION = 2.6.4 EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION)) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From ed2f4b2addd62f92c4e59b2fa3043b41dfabee77 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Tue, 12 Nov 2024 11:35:29 +0100 Subject: [PATCH 2994/3013] package/libgit2: bump version to 1.8.4 upstream mistakenly based 1.8.3 on 1.8.1 so it didn't include the 1.8.2 fixes. 1.8.4 includes fixes from 1.8.2 and 1.8.3. Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard (cherry picked from commit 268d5145c8275889002a5255a2d134355015f426) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 0a34bedf794..536a0b7405b 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 868810a5508d41dd7033d41bdc55312561f3f916d64f5b7be92bc1ff4dcae02a libgit2-1.8.3.tar.gz +sha256 49d0fc50ab931816f6bfc1ac68f8d74b760450eebdb5374e803ee36550f26774 libgit2-1.8.4.tar.gz sha256 e3712465634e97cfd850822a4eb5ac7d2f8a10f753189366d5a2060046f28288 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 22ba507acc7..3bf3dbb6471 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.8.3 +LIBGIT2_VERSION = 1.8.4 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From f35c5ad48ce8a0ecc730697654f6394992ddb3a0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Nov 2024 21:37:57 +0100 Subject: [PATCH 2995/3013] package/libcurl: security bump version to 8.11.0 Changelog: https://curl.se/ch/8.11.0.html Fixes CVE-2024-9681: https://curl.se/docs/CVE-2024-9681.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ed4348d1c5657aae1b3f167471470f2eef82e7fa) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 4817ec11d60..93a0f85dee7 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.10.1.tar.xz.asc +# https://curl.se/download/curl-8.11.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee curl-8.10.1.tar.xz +sha256 db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb curl-8.11.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 71fb6152c73..1022abac852 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.10.1 +LIBCURL_VERSION = 8.11.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From b302c4bbd67ef65f4a1013a67deab4523dc72f42 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Nov 2024 21:37:57 +0100 Subject: [PATCH 2996/3013] package/libcurl: security bump version to 8.11.0 Changelog: https://curl.se/ch/8.11.0.html Fixes CVE-2024-9681: https://curl.se/docs/CVE-2024-9681.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ed4348d1c5657aae1b3f167471470f2eef82e7fa) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 4817ec11d60..93a0f85dee7 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.10.1.tar.xz.asc +# https://curl.se/download/curl-8.11.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee curl-8.10.1.tar.xz +sha256 db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb curl-8.11.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 71fb6152c73..1022abac852 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.10.1 +LIBCURL_VERSION = 8.11.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From c2da8dee8b8e21c4db46b3ac2d97c1e5619b7bbd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 13 Nov 2024 22:15:22 +0100 Subject: [PATCH 2997/3013] package/tiff: security bump to version 4.7.0 For the release note, see: http://www.simplesystems.org/libtiff/releases/v4.7.0.html This commit also adds the _SOURCE variable, to switch to the xz archive, which saves ~1.5MB. The _SITE url is also updated to switch to the https protocol. This commit also adds a comment in the hash file about pgp signature veritication. Fixes: - https://nvd.nist.gov/vuln/detail/CVE-2023-6277 - https://nvd.nist.gov/vuln/detail/CVE-2023-52356 - https://nvd.nist.gov/vuln/detail/CVE-2024-7006 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit d571951c67d63824fcdf96cba8b59c80876a827a) Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 6 ++++-- package/tiff/tiff.mk | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 3aae7dc4d5f..5e2dcca73c2 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a tiff-4.6.0.tar.gz +# Locally computed after checking pgp signature +# https://download.osgeo.org/libtiff/tiff-4.7.0.tar.xz.sig +# with key: B1FA7D81EEB8E66399178B9733EBBFC47B3DD87D +sha256 273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017 tiff-4.7.0.tar.xz sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 0e5e0dd48a3..5d7219d7da0 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,8 +4,9 @@ # ################################################################################ -TIFF_VERSION = 4.6.0 -TIFF_SITE = http://download.osgeo.org/libtiff +TIFF_VERSION = 4.7.0 +TIFF_SOURCE = tiff-$(TIFF_VERSION).tar.xz +TIFF_SITE = https://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = LICENSE.md TIFF_CPE_ID_VENDOR = libtiff From 48e79150bac997a7f7dbfd90be16a9cbb46d6775 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 13 Nov 2024 22:15:22 +0100 Subject: [PATCH 2998/3013] package/tiff: security bump to version 4.7.0 For the release note, see: http://www.simplesystems.org/libtiff/releases/v4.7.0.html This commit also adds the _SOURCE variable, to switch to the xz archive, which saves ~1.5MB. The _SITE url is also updated to switch to the https protocol. This commit also adds a comment in the hash file about pgp signature veritication. Fixes: - https://nvd.nist.gov/vuln/detail/CVE-2023-6277 - https://nvd.nist.gov/vuln/detail/CVE-2023-52356 - https://nvd.nist.gov/vuln/detail/CVE-2024-7006 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit d571951c67d63824fcdf96cba8b59c80876a827a) Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 6 ++++-- package/tiff/tiff.mk | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 3aae7dc4d5f..5e2dcca73c2 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a tiff-4.6.0.tar.gz +# Locally computed after checking pgp signature +# https://download.osgeo.org/libtiff/tiff-4.7.0.tar.xz.sig +# with key: B1FA7D81EEB8E66399178B9733EBBFC47B3DD87D +sha256 273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017 tiff-4.7.0.tar.xz sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 0e5e0dd48a3..5d7219d7da0 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,8 +4,9 @@ # ################################################################################ -TIFF_VERSION = 4.6.0 -TIFF_SITE = http://download.osgeo.org/libtiff +TIFF_VERSION = 4.7.0 +TIFF_SOURCE = tiff-$(TIFF_VERSION).tar.xz +TIFF_SITE = https://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = LICENSE.md TIFF_CPE_ID_VENDOR = libtiff From 0b26c8012ee1fd8fa702593d9ff7308eb9c63a3e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Nov 2024 21:11:40 +0100 Subject: [PATCH 2999/3013] package/intel-microcode: security bump version to 20241112 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases CVE-2024-21853 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01101.html CVE-2024-23918 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01079.html CVE-2024-24968 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01097.html CVE-2024-23984 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01103.html Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain (cherry picked from commit 649b31fc6d29d4fc5788ab13e32d704de63b2a0c) Signed-off-by: Peter Korsgaard --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 20dfaa41b47..81a45731100 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8b7582eac7e9a691356e18b3bdcbc7b2db09494e040ec980a4a5fb6d0da261bf intel-microcode-20240910.tar.gz +sha256 37246208ef68039be752438c72400a688a2238df13a7f5282497c80be2d8366d intel-microcode-20241112.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 24729494d0a..17f25edc83e 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20240910 +INTEL_MICROCODE_VERSION = 20241112 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From 674d55f9f582eefa5fa058209ed236f01500e214 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Nov 2024 21:11:40 +0100 Subject: [PATCH 3000/3013] package/intel-microcode: security bump version to 20241112 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases CVE-2024-21853 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01101.html CVE-2024-23918 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01079.html CVE-2024-24968 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01097.html CVE-2024-23984 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01103.html Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain (cherry picked from commit 649b31fc6d29d4fc5788ab13e32d704de63b2a0c) Signed-off-by: Peter Korsgaard --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 20dfaa41b47..81a45731100 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8b7582eac7e9a691356e18b3bdcbc7b2db09494e040ec980a4a5fb6d0da261bf intel-microcode-20240910.tar.gz +sha256 37246208ef68039be752438c72400a688a2238df13a7f5282497c80be2d8366d intel-microcode-20241112.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 24729494d0a..17f25edc83e 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20240910 +INTEL_MICROCODE_VERSION = 20241112 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From 90b0c694a1abe35539565e30841a79a925e130fc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 14 Nov 2024 22:09:52 +0100 Subject: [PATCH 3001/3013] package/libkrb5: security bump to version 1.21.3 For the change log, see [1]. The license hash file changed, due to the year update. See [2]. This commit also adds a comment in the hash file about the pgp signature file source and key id used for the verification. Fixes: - https://nvd.nist.gov/vuln/detail/CVE-2024-37370 - https://nvd.nist.gov/vuln/detail/CVE-2024-37371 [1] https://web.mit.edu/kerberos/www/krb5-1.21/ [2] https://github.com/krb5/krb5/commit/fec2c44ee93bfd3282bed99509a941d56a6e2c21 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit 0416ae0ed5853cd7da4b34e9f8cd17baabf503f0) Signed-off-by: Peter Korsgaard --- package/libkrb5/libkrb5.hash | 6 ++++-- package/libkrb5/libkrb5.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 02c0e3396e6..0403b3aed02 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,7 @@ # Locally calculated after checking pgp signature -sha256 9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491 krb5-1.21.2.tar.gz +# from https://web.mit.edu/kerberos/dist/krb5/1.21/krb5-1.21.3.tar.gz.asc +# with key C4493CB739F4A89F9852CBC20CBA08575F8372DF +sha256 b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35 krb5-1.21.3.tar.gz # Hash for license file: -sha256 0d5373486138cb176c063db98274b4c4ab6ef3518c4191360736384b780306c2 NOTICE +sha256 7601361a275aadbe35c90185519323c28730d60c553683e56fd06cf9c5f749a6 NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index def627d422d..e57a2b98a22 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -5,7 +5,7 @@ ################################################################################ LIBKRB5_VERSION_MAJOR = 1.21 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).2 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).3 LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src From 8952252da7bce5eccfdb79d9126f832d35677c11 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 14 Nov 2024 22:09:52 +0100 Subject: [PATCH 3002/3013] package/libkrb5: security bump to version 1.21.3 For the change log, see [1]. The license hash file changed, due to the year update. See [2]. This commit also adds a comment in the hash file about the pgp signature file source and key id used for the verification. Fixes: - https://nvd.nist.gov/vuln/detail/CVE-2024-37370 - https://nvd.nist.gov/vuln/detail/CVE-2024-37371 [1] https://web.mit.edu/kerberos/www/krb5-1.21/ [2] https://github.com/krb5/krb5/commit/fec2c44ee93bfd3282bed99509a941d56a6e2c21 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit 0416ae0ed5853cd7da4b34e9f8cd17baabf503f0) Signed-off-by: Peter Korsgaard --- package/libkrb5/libkrb5.hash | 6 ++++-- package/libkrb5/libkrb5.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 02c0e3396e6..0403b3aed02 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,7 @@ # Locally calculated after checking pgp signature -sha256 9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491 krb5-1.21.2.tar.gz +# from https://web.mit.edu/kerberos/dist/krb5/1.21/krb5-1.21.3.tar.gz.asc +# with key C4493CB739F4A89F9852CBC20CBA08575F8372DF +sha256 b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35 krb5-1.21.3.tar.gz # Hash for license file: -sha256 0d5373486138cb176c063db98274b4c4ab6ef3518c4191360736384b780306c2 NOTICE +sha256 7601361a275aadbe35c90185519323c28730d60c553683e56fd06cf9c5f749a6 NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index def627d422d..e57a2b98a22 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -5,7 +5,7 @@ ################################################################################ LIBKRB5_VERSION_MAJOR = 1.21 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).2 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).3 LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src From cd42b188bfb9c4432291b40f2ca471fac8b82121 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Nov 2024 20:13:12 +0100 Subject: [PATCH 3003/3013] package/libpng: fix arm build with NEON Fixes: http://autobuild.buildroot.net/results/52c/52c974e70f922e9d7efea4c538e4438a22faa846/ Signed-off-by: Bernd Kuhls Co-authored-by: Peter Korsgaard [https://lists.buildroot.org/pipermail/buildroot/2024-November/767661.html] Signed-off-by: Peter Korsgaard (cherry picked from commit 54cfff355c4011f3f049dc49bbac24ab66f905ea) Signed-off-by: Peter Korsgaard --- package/libpng/libpng.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 9761993d791..c0b3ad24d58 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -16,10 +16,12 @@ LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config LIBPNG_CONF_OPTS = --disable-tools +LIBPNG_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon else ifeq ($(BR2_ARM_CPU_HAS_NEON):$(BR2_ARM_SOFT_FLOAT),y:) +LIBPNG_CFLAGS += -mfpu=neon LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon @@ -31,5 +33,8 @@ else LIBPNG_CONF_OPTS += --disable-intel-sse endif +LIBPNG_CONF_ENV = \ + CFLAGS="$(LIBPNG_CFLAGS)" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 44ebe8ee2bcb42006885bfe27aa2d91fe0ebaced Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 19 Nov 2024 11:52:00 +0100 Subject: [PATCH 3004/3013] DEVELOPERS: drop Asaf Kahlon Asaf has privately requested to be removed from the DEVELOPERS file as he will no longer be contributing to Buildroot in the forseeable future. Signed-off-by: Thomas Petazzoni (cherry picked from commit 353a37b04d0da29b0dfda3c98381b24839a1adc9) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d1694244f1f..6081ef2ce0e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -278,18 +278,6 @@ F: package/python-bottle/ F: package/sqlcipher/ F: package/stress/ -N: Asaf Kahlon -F: package/collectd/ -F: package/libfuse3/ -F: package/libuv/ -F: package/python* -F: package/snmpclitools/ -F: package/spdlog/ -F: package/uftp/ -F: package/uftrace/ -F: package/uvw/ -F: package/zeromq/ - N: Ash Charles F: package/pru-software-support/ F: package/ti-cgt-pru/ From 326df39ca39f4cd8dc232707838ab53cd62497df Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 19 Nov 2024 11:52:00 +0100 Subject: [PATCH 3005/3013] DEVELOPERS: drop Asaf Kahlon Asaf has privately requested to be removed from the DEVELOPERS file as he will no longer be contributing to Buildroot in the forseeable future. Signed-off-by: Thomas Petazzoni (cherry picked from commit 353a37b04d0da29b0dfda3c98381b24839a1adc9) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8c0d53e6d02..a1915bfa804 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -262,18 +262,6 @@ F: package/python-bottle/ F: package/sqlcipher/ F: package/stress/ -N: Asaf Kahlon -F: package/collectd/ -F: package/libfuse3/ -F: package/libuv/ -F: package/python* -F: package/snmpclitools/ -F: package/spdlog/ -F: package/uftp/ -F: package/uftrace/ -F: package/uvw/ -F: package/zeromq/ - N: Ash Charles F: package/pru-software-support/ F: package/ti-cgt-pru/ From 61855e0bc784cbf9dc53b37452b3dcfd26b42118 Mon Sep 17 00:00:00 2001 From: Yu Chien Peter Lin Date: Tue, 19 Nov 2024 09:46:01 +0800 Subject: [PATCH 3006/3013] DEVELOPERS: update maintainer of Andes platform I will lose access to my email next week, so hand it over to Leo Yu-Chi Liang. Signed-off-by: Yu Chien Peter Lin Reviewed-by: Leo Yu-Chi Liang Signed-off-by: Julien Olivain (cherry picked from commit a359514630165fe03c7bd159af10b7d20d08334a) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index a1915bfa804..948a30b8c78 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2371,7 +2371,7 @@ F: package/dbus-broker/ F: package/systemd/ F: package/tcf-agent/ -N: Yu Chien Peter Lin +N: Leo Yu-Chi Liang F: board/andes F: configs/andes_ae350_45_defconfig From c61c66269389a839498af119e331d76498fac2a4 Mon Sep 17 00:00:00 2001 From: Yu Chien Peter Lin Date: Tue, 19 Nov 2024 09:46:01 +0800 Subject: [PATCH 3007/3013] DEVELOPERS: update maintainer of Andes platform I will lose access to my email next week, so hand it over to Leo Yu-Chi Liang. Signed-off-by: Yu Chien Peter Lin Reviewed-by: Leo Yu-Chi Liang Signed-off-by: Julien Olivain (cherry picked from commit a359514630165fe03c7bd159af10b7d20d08334a) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 6081ef2ce0e..aaa1e9e7113 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2465,7 +2465,7 @@ F: package/dbus-broker/ F: package/systemd/ F: package/tcf-agent/ -N: Yu Chien Peter Lin +N: Leo Yu-Chi Liang F: board/andes F: configs/andes_ae350_45_defconfig F: package/kmon/ From 8b83136326502b178886b8d0686e5aa4ddb4d93b Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 15 Jul 2024 14:50:39 +0000 Subject: [PATCH 3008/3013] support/testing/infra/emulator.py: support init=/bin/sh The TestInitSystemNone bypasses the normal init and instead launches directly into a shell. So it needs to bypass the login code and go directly to a shell. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 95e10430131fb524a27985b82ee70ae8d0fe71d9) Signed-off-by: Peter Korsgaard --- support/testing/infra/emulator.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 4be7e9598b4..d0f190b9247 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -137,6 +137,9 @@ def login(self, password=None, timeout=60): self.qemu.expect("Password:") self.qemu.sendline(password) + self.connect_shell() + + def connect_shell(self): extra_init_cmd = " && ".join([ 'export PAGER=cat', 'dmesg -n 1', From a210062ce2fd3c9c85cf21d0a8cd55da093fa816 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 15 Jul 2024 14:50:40 +0000 Subject: [PATCH 3009/3013] support/testing: fix TestInitSystemNone for non-login shell This test started failing at commit 0cad947b964be5612a182413da136fcf0dc5a1f2 "support/testing/infra/emulator.py: fix qemu prompt detection" with the error message AttributeError: 'NoneType' object has no attribute 'run_command' This is because we changed emulator.run() so that emulator.login() must be called first. But this test skips the login and goes directly to a shell. Use the new emulator.connect_shell() function which prepares the shell without logging in. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 5ed1fab018db9a001b072fd7bcb3dd3db280aabe) Signed-off-by: Peter Korsgaard --- support/testing/tests/init/test_none.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/support/testing/tests/init/test_none.py b/support/testing/tests/init/test_none.py index fc4a46efd9c..5bfcc3d5c9a 100644 --- a/support/testing/tests/init/test_none.py +++ b/support/testing/tests/init/test_none.py @@ -18,10 +18,8 @@ def test_run(self): if index != 0: self.emulator.logfile.write("==> System does not boot") raise SystemError("System does not boot") - index = self.emulator.qemu.expect(["#", pexpect.TIMEOUT], timeout=60) - if index != 0: - self.emulator.logfile.write("==> System does not boot") - raise SystemError("System does not boot") + + self.emulator.connect_shell() out, exit_code = self.emulator.run("sh -c 'echo $PPID'") self.assertEqual(exit_code, 0) From 4088777f7b972305749192ccb451676b95e9874e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 30 Nov 2024 10:25:33 +0100 Subject: [PATCH 3010/3013] package/systemd: fix bcachefs magic patch Commit 29409c9d345a2536f6b72c605cda0d13f306200f ("package/systemd: fix build with recent kernels") added a patch from upstream that adds the BCACHEFS_SUPER_MAGIC definition if not provided by the kernel headers. However, this commit from upstream was bogus: in the case BCACHEFS_SUPER_MAGIC was defined, it does an assert_cc() to verify that the value matches what we expect, but this assert_cc() statement lacks the final semi-colon, causing build breakage on host systems that do have BCACHEFS_SUPER_MAGIC defined in their kernel headers, with a weird error occuring in another header file... because only the next statement after assert_cc() was considered as having a syntax error. Fixes: http://autobuild.buildroot.net/results/9f99a97df2efd5e4ae4ad5cc5882607f0c8766bc/ This issue only exists in 2024.02.x at this point, because in master we have moved to systemd 256.x, which has dropped entirely this piece of code related to defining BCACHEFS_SUPER_MAGIC (and we wonder how systemd can then build with slightly older kernel headers, as BCACHEFS_SUPER_MAGIC is only in the public kernel headers since Linux 6.10). Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/systemd/0002-basic-add-bcachefs-magic.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/systemd/0002-basic-add-bcachefs-magic.patch b/package/systemd/0002-basic-add-bcachefs-magic.patch index e7f4b1cbb73..372066ebeff 100644 --- a/package/systemd/0002-basic-add-bcachefs-magic.patch +++ b/package/systemd/0002-basic-add-bcachefs-magic.patch @@ -1,4 +1,4 @@ -From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001 +From 48c1cd62de0339722fd3b72ef86aaaf1c38ff3dd Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Fri, 31 May 2024 09:51:38 +1200 Subject: [PATCH] basic: Add BCACHEFS magic @@ -34,7 +34,7 @@ index 1cd66b5a5f..c82fe98227 100644 binder, {BINDERFS_SUPER_MAGIC} binfmt_misc, {BINFMTFS_MAGIC} diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h -index 82d71c8ad1..b3d2ee9f57 100644 +index 82d71c8ad1..c8ecf44357 100644 --- a/src/basic/missing_magic.h +++ b/src/basic/missing_magic.h @@ -197,3 +197,10 @@ @@ -46,8 +46,8 @@ index 82d71c8ad1..b3d2ee9f57 100644 +#ifndef BCACHEFS_SUPER_MAGIC +# define BCACHEFS_SUPER_MAGIC 0xca451a4e +#else -+assert_cc(BCACHEFS_SUPER_MAGIC == 0xca451a4e) ++assert_cc(BCACHEFS_SUPER_MAGIC == 0xca451a4e); +#endif --- -2.45.1 +-- +2.47.0 From 5df174d69c4d01d6c5c181e8cf98c108d6a63fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juliano=20Dorig=C3=A3o?= Date: Thu, 5 Dec 2024 15:06:18 -0400 Subject: [PATCH 3011/3013] buildroot-2024.08.x: merge fix --- Config.in.legacy | 28 ---- .../arm-trusted-firmware.hash | 2 - .../patches/linux-headers/linux-headers.hash | 1 - .../stm32mp157a-dk1/patches/linux/linux.hash | 2 - .../stm32mp157a-dk1/patches/uboot/uboot.hash | 2 - linux/linux.mk | 11 +- package/Config.in | 2 - package/Config.in.host | 1 - package/asterisk/Config.in | 1 + .../0001-dont-add-dirty-to-version.patch | 2 +- .../0001-configure.ac-Fix-disable-cups.patch | 41 ----- ...e.ac-fix-sixaxis-build-without-tools.patch | 35 ----- package/bluez5_utils/bluez5_utils.mk | 3 - ...segmentation-fault-that-occurs-durin.patch | 50 ------- ...fix-parallel-build-with-GNU-Make-4.4.patch | 133 ----------------- package/gcc-bare-metal/13.3.0 | 1 - ...-gcc-13-cannot-use-uintptr_t-via-inc.patch | 30 ---- package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 9 +- ...ward-declare-open_temp_exec_file-764.patch | 49 ------ package/libglvnd/001-disable-tests.patch | 10 -- package/libopenmpt/libopenmpt.hash | 2 +- package/libopenmpt/libopenmpt.mk | 2 +- package/libpciaccess/libpciaccess.mk | 1 + ...ists-txt-Fix-HOST-variable-for-ppc64.patch | 26 ---- ...h.disable => 0001-uclinux-detection.patch} | 0 package/libserialport/Config.in | 1 - package/libserialport/libserialport.hash | 2 +- package/libserialport/libserialport.mk | 6 +- package/libusb/libusb.mk | 2 +- ...eLists.txt-fix-build-with-pkg-config.patch | 47 ------ package/llvm-project/libclc/libclc.mk | 4 +- ...ption-fix-unknown-linux-3.5-.patch.disable | 68 --------- package/mesa3d/Config.in | 4 +- package/mesa3d/mesa3d.mk | 4 +- ...tection-of-fzero-call-used-regs-used.patch | 32 ---- .../0002-sshsigdie-async-signal-unsafe.patch | 41 ----- package/patchelf/Config.in | 8 - package/pcmanfm/Config.in | 3 +- package/pcmanfm/pcmanfm.mk | 6 +- package/python-sip/python-sip.mk | 3 +- ...oss-compiles-when-host-and-target-us.patch | 140 ------------------ package/qt5/qt5tools/Config.in | 16 +- package/rust-bin/rust-bin.mk | 2 +- package/rust-bindgen/Config.in.host | 2 - package/spirv-llvm-translator/Config.in | 12 -- .../spirv-llvm-translator.mk | 15 +- .../0002-basic-add-bcachefs-magic.patch | 53 ------- package/tremor/tremor.mk | 4 +- .../0001-allow-to-use-sys-ucontext.h.patch | 35 ----- ...-specific-declarations-in-FELighting.patch | 68 --------- 51 files changed, 43 insertions(+), 983 deletions(-) delete mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash delete mode 120000 board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash delete mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash delete mode 100644 board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash delete mode 100644 package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch delete mode 100644 package/bluez5_utils/0002-configure.ac-fix-sixaxis-build-without-tools.patch delete mode 100644 package/bootgen/0001-verifyimage-Fix-segmentation-fault-that-occurs-durin.patch delete mode 100644 package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch delete mode 120000 package/gcc-bare-metal/13.3.0 delete mode 100644 package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch delete mode 100644 package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch delete mode 100644 package/libglvnd/001-disable-tests.patch delete mode 100644 package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch rename package/libserialport/{0001-uclinux-detection.patch.disable => 0001-uclinux-detection.patch} (100%) delete mode 100644 package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch delete mode 100644 package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch.disable delete mode 100644 package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch delete mode 100644 package/openssh/0002-sshsigdie-async-signal-unsafe.patch delete mode 100644 package/patchelf/Config.in delete mode 100644 package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch delete mode 100644 package/rust-bindgen/Config.in.host delete mode 100644 package/spirv-llvm-translator/Config.in delete mode 100644 package/systemd/0002-basic-add-bcachefs-magic.patch delete mode 100644 package/uclibc/0001-allow-to-use-sys-ucontext.h.patch delete mode 100644 package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch diff --git a/Config.in.legacy b/Config.in.legacy index 45fc7ae3be6..d1f892dded3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -415,34 +415,6 @@ config BR2_BINUTILS_VERSION_2_39_X comment "Legacy options removed in 2024.02" -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed" - select BR2_LEGACY - help - The Codescape IMG GNU Linux toolchain has been removed, use a - Bootlin toolchain instead. - -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - bool "Codescape MTI GNU Linux Toolchain 2018.09 has been removed" - select BR2_LEGACY - help - The Codescape MTI GNU Linux toolchain has been removed, use a - Bootlin toolchain instead. - -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11 has been removed" - select BR2_LEGACY - help - The Sourcery CodeBench AArch64 toolchain has been removed, - use an ARM/Bootlin/Linaro toolchain instead. - -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - bool "Sourcery CodeBench ARM 2014.05 has been removed" - select BR2_LEGACY - help - The Sourcery CodeBench ARM toolchain has been removed, use - an ARM/Bootlin/Linaro toolchain instead. - config BR2_PACKAGE_MYSQL bool "mysql virtual package removed" select BR2_LEGACY diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash deleted file mode 100644 index 97c4500711f..00000000000 --- a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 068325043b7c8ecc47ebb8b4f241f01e86d3f69dc49a63f340aa94bd41a9e6df arm-trusted-firmware/arm-trusted-firmware-lts-v2.8.16.tar.gz diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash deleted file mode 120000 index 5808d92afe8..00000000000 --- a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash +++ /dev/null @@ -1 +0,0 @@ -../linux/linux.hash \ No newline at end of file diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash deleted file mode 100644 index 8b7624cceb9..00000000000 --- a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9 linux-5.13.tar.xz diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash deleted file mode 100644 index 7cef5b688ec..00000000000 --- a/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 u-boot-2023.04.tar.bz2 diff --git a/linux/linux.mk b/linux/linux.mk index 3c81ab24ac9..50fed6d2655 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -78,9 +78,6 @@ LINUX_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) LINUX_MAKE = $(BR2_MAKE) -# Needed for Rust support -LINUX_DEPENDENCIES += host-libcurl host-rustc host-rust-bindgen - # The kernel CONFIG_EXTRA_FIRMWARE feature requires firmware files at build # time. Make sure they are available before the kernel builds. LINUX_DEPENDENCIES += \ @@ -166,7 +163,6 @@ endif LINUX_MAKE_FLAGS = \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ - KCFLAGS="$(LINUX_CFLAGS)" \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ WERROR=0 \ @@ -188,12 +184,7 @@ endif # sanitize the arguments passed from user space in registers. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82435 ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) -LINUX_CFLAGS += -Wno-attribute-alias -endif - -# Disable FDPIC if enabled by default in toolchain -ifeq ($(BR2_BINFMT_FDPIC),y) -LINUX_CFLAGS += -mno-fdpic +LINUX_MAKE_ENV += KCFLAGS=-Wno-attribute-alias endif ifeq ($(BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT),y) diff --git a/package/Config.in b/package/Config.in index 8e78d5fbbdc..56158d5b07c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -336,7 +336,6 @@ comment "Graphic applications" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" - source "package/spirv-llvm-translator/Config.in" source "package/spirv-tools/Config.in" source "package/stellarium/Config.in" source "package/sway/Config.in" @@ -2265,7 +2264,6 @@ endif source "package/openblas/Config.in" source "package/orc/Config.in" source "package/p11-kit/Config.in" - source "package/patchelf/Config.in" source "package/poco/Config.in" source "package/protobuf/Config.in" source "package/protobuf-c/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 6def99c4b9c..e4fbee4f2a8 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -100,7 +100,6 @@ menu "Host utilities" source "package/riscv-isa-sim/Config.in.host" source "package/runc/Config.in.host" source "package/rustc/Config.in.host" - source "package/rust-bindgen/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" source "package/sdbus-cpp/Config.in.host" diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index ba5a5740420..71c741acfd8 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBILBC select BR2_PACKAGE_LIBJWT select BR2_PACKAGE_LIBPJSIP + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX diff --git a/package/autoconf/0001-dont-add-dirty-to-version.patch b/package/autoconf/0001-dont-add-dirty-to-version.patch index e8d9f6a29d9..8df2276865b 100644 --- a/package/autoconf/0001-dont-add-dirty-to-version.patch +++ b/package/autoconf/0001-dont-add-dirty-to-version.patch @@ -17,7 +17,7 @@ Signed-off-by: Gustavo Zacarias diff -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen --- autoconf-2.69.orig/build-aux/git-version-gen 2013-06-27 11:31:02.340200154 -0300 +++ autoconf-2.69/build-aux/git-version-gen 2013-06-27 11:31:13.734577033 -0300 -@@ -203,7 +203,7 @@ +@@ -210,7 +210,7 @@ *) # Append the suffix only if there isn't one already. case $v in *-dirty) ;; diff --git a/package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch b/package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch deleted file mode 100644 index 2c6c46f6fd8..00000000000 --- a/package/bluez5_utils/0001-configure.ac-Fix-disable-cups.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cb0de49bc6f8a6bf8f01a24599b499aa4bf18032 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Tue, 16 Apr 2024 07:26:04 +0200 -Subject: [PATCH] configure.ac: Fix --disable-cups -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -or else we get: - configure: error: conditional "CUPS_SERVERBIN" was never defined. - Usually this means the macro was only invoked conditionally. - -Fixes: https://github.com/bluez/bluez/issues/773 - -Upstream: https://patchwork.kernel.org/project/bluetooth/list/?series=844910 -Signed-off-by: Jan Čermák ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9dea70d..dbba759 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -249,12 +249,12 @@ AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no") - if (test "${enable_cups}" != "no"); then - AC_MSG_CHECKING([cups directory]) - cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin` -- AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") -- if (test "${cups_serverbin}" != ""); then -- AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) -- fi - AC_MSG_RESULT([${cups_serverbin}]) - fi -+AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") -+AS_IF([test "${cups_serverbin}" != ""],[ -+ AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) -+]) - - AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], - [enable Mesh profile support]), [enable_mesh=${enableval}]) diff --git a/package/bluez5_utils/0002-configure.ac-fix-sixaxis-build-without-tools.patch b/package/bluez5_utils/0002-configure.ac-fix-sixaxis-build-without-tools.patch deleted file mode 100644 index 1e0e34cb8f3..00000000000 --- a/package/bluez5_utils/0002-configure.ac-fix-sixaxis-build-without-tools.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f4795bf64dbf8778fc765b7dad1b1bfb365b48d7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 8 May 2024 19:54:16 +0200 -Subject: configure.ac: fix sixaxis build without tools - -Fix the following build failure with --enable-sixaxis --enable-udev ---disable-tools raised since version 5.73 and -9f71892b63f6b65dab874a633d88ae2dcad93a16: - -sixaxis.c:(.text.sixaxis_init+0x23): undefined reference to `udev_new' - -Fixes: http://autobuild.buildroot.org/results/c337d0f473c5fbb3e6cda1317ba06f5e2b16a43e - -Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=f4795bf64dbf8778fc765b7dad1b1bfb365b48d7 -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9dea70ddc1..8b3cdb4e8f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,7 +226,7 @@ AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no") - - AC_ARG_ENABLE(udev, AS_HELP_STRING([--disable-udev], - [disable udev device support]), [enable_udev=${enableval}]) --if (test "${enable_tools}" != "no" && test "${enable_udev}" != "no"); then -+if (test "${enable_udev}" != "no"); then - PKG_CHECK_MODULES(UDEV, libudev >= 196) - AC_DEFINE(HAVE_UDEV, 1, [Define to 1 if udev is required]) - fi --- -cgit 1.2.3-korg - diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index e768db62bd2..717c10e870d 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -8,9 +8,6 @@ BLUEZ5_UTILS_VERSION = 5.78 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth -# 0001-configure.ac-Fix-disable-cups.patch -# 0002-configure.ac-fix-sixaxis-build-without-tools.patch -BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_INSTALL_STAGING = YES BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB diff --git a/package/bootgen/0001-verifyimage-Fix-segmentation-fault-that-occurs-durin.patch b/package/bootgen/0001-verifyimage-Fix-segmentation-fault-that-occurs-durin.patch deleted file mode 100644 index 096dbac27e6..00000000000 --- a/package/bootgen/0001-verifyimage-Fix-segmentation-fault-that-occurs-durin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f7825edbd1c85380cfb5ef0cf2c16c910954f57c Mon Sep 17 00:00:00 2001 -From: Charlie Johnston -Date: Mon, 5 Aug 2024 13:07:25 -0700 -Subject: [PATCH] verifyimage: Fix segmentation fault that occurs during - verifyimage. - -In commit d02322b, the behavior of ReadBinaryFile was changed such -that it no longer populated iHT. This caused VerifyAuthentication -to access a null iHT value resulting a segmentation fault. - -This fix changes VerifyAuthentication to call ReadHeaderTableDetails -instead, where the old functionality of ReadBinaryFile now lives. - -Signed-off-by: Charlie Johnston -Signed-off-by: Peter Korsgaard -Upstream: https://github.com/Xilinx/bootgen/pull/36 ---- - verifyimage-versal.cpp | 2 +- - verifyimage-zynqmp.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/verifyimage-versal.cpp b/verifyimage-versal.cpp -index 5490663..5656e50 100755 ---- a/verifyimage-versal.cpp -+++ b/verifyimage-versal.cpp -@@ -34,7 +34,7 @@ - /*******************************************************************************/ - void VersalReadImage::VerifyAuthentication(bool verifyImageOption) - { -- ReadBinaryFile(); -+ ReadHeaderTableDetails(); - - if (iHT->headerAuthCertificateWordOffset != 0) - { -diff --git a/verifyimage-zynqmp.cpp b/verifyimage-zynqmp.cpp -index d4812e6..d73272c 100755 ---- a/verifyimage-zynqmp.cpp -+++ b/verifyimage-zynqmp.cpp -@@ -50,7 +50,7 @@ static void RearrangeEndianess(uint8_t *array, uint32_t size) - /*******************************************************************************/ - void ZynqMpReadImage::VerifyAuthentication(bool verifyImageOption) - { -- ReadBinaryFile(); -+ ReadHeaderTableDetails(); - - if (iHT->headerAuthCertificateWordOffset != 0) - { --- -2.39.5 - diff --git a/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch b/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch deleted file mode 100644 index a5568d1fd9f..00000000000 --- a/package/fwts/0002-libfwtsiasl-fix-parallel-build-with-GNU-Make-4.4.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 65a89b6253ef527ab4bc951eb8f9deba12f0121a Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Mon, 20 May 2024 11:14:02 +0200 -Subject: [PATCH] libfwtsiasl: fix parallel build with GNU Make >= 4.4 - -When a build host has a large number of cores (like 20+) and GNU Make -version is >= 4.4, fwts randomly fail to build in parallel, with a -"make -j$(nproc)" command, with error: - - mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory - mv: cannot stat 'prparser.tab.c': No such file or directory - -This issue has been reported here: -https://github.com/fwts/fwts/issues/7 - -The Makefile.am of libfwtsiasl is using the GNU Make ".NOTPARALLEL" -special target with prerequisites to handle commands generating -multiple outputs (like lex/yacc invocations). See: -https://github.com/fwts/fwts/blob/V24.03.00/src/libfwtsiasl/Makefile.am#L61 - -First, the .NOTPARALLEL special target _with_ prerequisites is a -feature added in GNU Make 4.4. See: -https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 -https://lists.gnu.org/archive/html/help-make/2022-10/msg00020.html - -GNU Make version < 4.4 will interpret it as if it was written without -prerequisite (as a standalone ".NOTPARALLEL:"). The effect is that the -parallel compilation is disabled for the whole libfwtsiasl. The -standalone .NOTPARALLEL special target was introduced in GNU Make 3.79 -in 2000. This is why parallel builds are working with Make older than -version 4.4. - -Secondly, the reason why the build is failing on GNU Make >= 4.4 is -because the usage of .NOTPARALLEL in incorrect. - -Quoting the Make manual: -https://www.gnu.org/software/make/manual/html_node/Parallel-Disable.html -""" -If the .NOTPARALLEL special target has prerequisites, then each of those -prerequisites will be considered a target and all prerequisites of these -targets will be run serially. -""" - -Note the serialization will happen on the prerequisites of the targets -set as prerequisites of .NOTPARALLEL. - -The targets will not be correctly marked to disable parallel -execution. - -Thirdly, the use of multiple targets in a rule is incorrect here. See -Make manual: -https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html -The construct used in Makefile.am of libfwtsiasl for lex/yacc parsers -assumes they are independant targets (so they can be executed in -parallel). Finally, the "mv" command is failing, because there will be -one parallel execution per target, the first mv will suceed and the -other ones will fail. Multiple independant targets are often used in -Makefiles for lex/yacc, they are working because they are not using -"mv". Even in multiple execution, files are just overwritten. - -Fixing this .NOTPARALLEL usage with prerequisites would require Make -version 4.4 or greater. This is a strong requirement, as there is -still many Linux distros with older Make version (as an example Ubuntu -22.04 LTS has Make 4.3). - -The .WAIT special target could be used, but was also introduced in -Make version 4.4. See: -https://git.savannah.gnu.org/cgit/make.git/commit/?id=f6ea899d83bf00fe9201fde0ca9cf7af8e443677 - -GNU Make 4.3 also introduced "Grouped Targets" for that purpose. See: -https://www.gnu.org/software/make/manual/html_node/Multiple-Targets.html -But this would add a requirement on a recent Make version. - -This commit fixes the issue by declaring the first generated file as a -dependency of the other extra generated files. This has the effect of -completely solving the parallel build for all GNU Make versions. Also, -this enables parallel build for libfwtsiasl (except for the parser -generation) and makes the whole build faster. - -Signed-off-by: Julien Olivain -Upstream: https://github.com/fwts/fwts/commit/c0962cd74c725418523c46ca44101e0e70201f81 ---- - src/libfwtsiasl/Makefile.am | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am -index cb10bc58..ac54f621 100644 ---- a/src/libfwtsiasl/Makefile.am -+++ b/src/libfwtsiasl/Makefile.am -@@ -58,32 +58,32 @@ aslcompiler.y: $(ASL_PARSER) - aslcompilerlex.c: $(ASL_LEXER) - ${LEX} ${AM_LFLAGS} -PAslCompiler -o$@ $(top_srcdir)/src/acpica/source/compiler/aslcompiler.l - --.NOTPARALLEL: aslcompiler.c --aslcompiler.c aslcompiler.y.h: aslcompiler.y -+aslcompiler.c: aslcompiler.y - ${YACC} ${AM_YFLAGS} -d -baslcompiler -pAslCompiler $^ - mv aslcompiler.tab.c aslcompiler.c - cp aslcompiler.tab.h aslcompiler.y.h -+aslcompiler.y.h: aslcompiler.c - --.NOTPARALLEL: dtcompilerparserlex.c --dtcompilerparserlex.c dtcompilerparser.c dtcompilerparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y -+dtcompilerparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y - ${LEX} ${AM_LFLAGS} -PDtCompilerParser -odtcompilerparserlex.c $< - ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y - mv dtcompilerparser.tab.c dtcompilerparser.c - cp dtcompilerparser.tab.h dtcompilerparser.y.h -+dtcompilerparser.c dtcompilerparser.y.h: dtcompilerparserlex.c - --.NOTPARALLEL: dtparserlex.c --dtparserlex.c dtparser.c dtparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y -+dtparserlex.c: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y - ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c $< - ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser $(top_srcdir)/src/acpica/source/compiler/dtparser.y - mv dtparser.tab.c dtparser.c - cp dtparser.tab.h dtparser.y.h -+dtparser.c dtparser.y.h: dtparserlex.c - --.NOTPARALLEL: prparserlex.c --prparserlex.c prparser.c prparser.y.h: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y -+prparserlex.c: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y - ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c $< - ${YACC} ${AM_YFLAGS} -bprparser -pPrParser $(top_srcdir)/src/acpica/source/compiler/prparser.y - mv prparser.tab.c prparser.c - cp prparser.tab.h prparser.y.h -+prparser.c prparser.y.h: prparserlex.c - - pkglib_LTLIBRARIES = libfwtsiasl.la - --- -2.45.1 - diff --git a/package/gcc-bare-metal/13.3.0 b/package/gcc-bare-metal/13.3.0 deleted file mode 120000 index b7238b60c13..00000000000 --- a/package/gcc-bare-metal/13.3.0 +++ /dev/null @@ -1 +0,0 @@ -../gcc/13.3.0/ \ No newline at end of file diff --git a/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch b/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch deleted file mode 100644 index 2c3619b74b1..00000000000 --- a/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa Mon Sep 17 00:00:00 2001 -From: mingtaoxt xt -Date: Wed, 19 Oct 2022 19:36:13 +0800 -Subject: [PATCH] mainline version gcc-13 cannot use "uintptr_t" via "#include - " - -Change-Id: I0049bb92658b4226e32783ad4d8271787deef5f3 -Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166 -Reviewed-by: Mike Frysinger -Upstream: https://chromium.googlesource.com/breakpad/breakpad/+/7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa -Signed-off-by: Thomas Petazzoni ---- - src/client/linux/handler/minidump_descriptor.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h -index 4349b88f..d822c9d9 100644 ---- a/src/client/linux/handler/minidump_descriptor.h -+++ b/src/client/linux/handler/minidump_descriptor.h -@@ -32,6 +32,7 @@ - #include - #include - -+#include - #include - - #include "client/linux/handler/microdump_extra_info.h" --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 93a0f85dee7..fa325efd7de 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.11.0.tar.xz.asc +# https://curl.se/download/curl-8.9.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb curl-8.11.0.tar.xz +sha256 ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 curl-8.9.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index ff5bd224b53..342c46e459d 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.11.0 +LIBCURL_VERSION = 8.9.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -194,6 +194,11 @@ LIBCURL_CONF_OPTS += \ --disable-tftp endif +define LIBCURL_FIX_DOT_PC + printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in +endef +LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC) + ifeq ($(BR2_PACKAGE_LIBCURL_CURL),) define LIBCURL_TARGET_CLEANUP rm -rf $(TARGET_DIR)/usr/bin/curl @@ -201,7 +206,7 @@ endef LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP endif -# batocera - removing host-libcurl causes dependency problem on pipewire +# REGLinux - PCSX2 / VPINBALL / MANGOHUD HOST_LIBCURL_DEPENDENCIES = host-openssl HOST_LIBCURL_CONF_OPTS = \ --disable-manual \ diff --git a/package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch b/package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch deleted file mode 100644 index 341a2e4e43f..00000000000 --- a/package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Thu, 2 Feb 2023 14:46:29 +0000 -Subject: [PATCH] Forward declare open_temp_exec_file (#764) - -It's defined in closures.c and used in tramp.c. -Also declare it as an hidden symbol, as it should be. - -Co-authored-by: serge-sans-paille -Upstream: https://github.com/libffi/libffi/pull/764 -Signed-off-by: Roy Kollen Svendsen ---- - include/ffi_common.h | 4 ++++ - src/tramp.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/include/ffi_common.h b/include/ffi_common.h -index 2bd31b0..c53a794 100644 ---- a/include/ffi_common.h -+++ b/include/ffi_common.h -@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; - static trampoline. */ - int ffi_tramp_is_present (void *closure) FFI_HIDDEN; - -+/* Return a file descriptor of a temporary zero-sized file in a -+ writable and executable filesystem. */ -+int open_temp_exec_file(void) FFI_HIDDEN; -+ - /* Extended cif, used in callback from assembly routine */ - typedef struct - { -diff --git a/src/tramp.c b/src/tramp.c -index 7e005b0..5f19b55 100644 ---- a/src/tramp.c -+++ b/src/tramp.c -@@ -39,6 +39,10 @@ - #ifdef __linux__ - #define _GNU_SOURCE 1 - #endif -+ -+#include -+#include -+ - #include - #include - #include --- -2.45.1 - diff --git a/package/libglvnd/001-disable-tests.patch b/package/libglvnd/001-disable-tests.patch deleted file mode 100644 index 881f464ad87..00000000000 --- a/package/libglvnd/001-disable-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build 2024-04-04 00:22:57.786673495 +0200 -+++ b/meson.build 2024-04-04 00:23:09.266948370 +0200 -@@ -252,7 +252,6 @@ - - subdir('include') - subdir('src') --subdir('tests') - - pkg.generate( - name : 'libglvnd', diff --git a/package/libopenmpt/libopenmpt.hash b/package/libopenmpt/libopenmpt.hash index cc5519806c8..50902011337 100644 --- a/package/libopenmpt/libopenmpt.hash +++ b/package/libopenmpt/libopenmpt.hash @@ -1,3 +1,3 @@ # computed locally -sha256 0386e918d75d797e79d5b14edd0847165d8b359e9811ef57652c0a356a2dfcf4 libopenmpt-0.7.9+release.autotools.tar.gz +sha256 79ab3ce3672601e525b5cc944f026c80c03032f37d39caa84c8ca3fdd75e0c98 libopenmpt-0.7.12+release.autotools.tar.gz sha256 e3d7e76c6b441ddd9fff0a397e7b5e055a11678bd7c3b246a0ce13e352eb15e8 LICENSE diff --git a/package/libopenmpt/libopenmpt.mk b/package/libopenmpt/libopenmpt.mk index aff67f6935f..fd4e4cc98ab 100644 --- a/package/libopenmpt/libopenmpt.mk +++ b/package/libopenmpt/libopenmpt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENMPT_VERSION = 0.7.9 +LIBOPENMPT_VERSION = 0.7.12 LIBOPENMPT_SITE = https://lib.openmpt.org/files/libopenmpt/src LIBOPENMPT_SOURCE = libopenmpt-$(LIBOPENMPT_VERSION)+release.autotools.tar.gz LIBOPENMPT_LICENSE = BSD-3-Clause diff --git a/package/libpciaccess/libpciaccess.mk b/package/libpciaccess/libpciaccess.mk index cd35b270150..6f4f05e42c3 100644 --- a/package/libpciaccess/libpciaccess.mk +++ b/package/libpciaccess/libpciaccess.mk @@ -20,3 +20,4 @@ LIBPCIACCESS_CONF_OPTS += -Dzlib=disabled endif $(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch deleted file mode 100644 index 8da8fedae27..00000000000 --- a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Fri, 19 Jul 2024 11:41:46 +0200 -Subject: [PATCH] CMakeLists.txt: Fix HOST variable for ppc64 - -The code here defined HOST_PPC64, but the rest of the build system expects HOST_POWERPC64. - -Upstream: https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c496ad97b5..670aa9a1a0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -373,7 +373,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") - set(HOST_POWERPC true) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -- set(HOST_PPC64 true) -+ set(HOST_POWERPC64 true) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") - set(HOST_RISCV64 true) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64") diff --git a/package/libserialport/0001-uclinux-detection.patch.disable b/package/libserialport/0001-uclinux-detection.patch similarity index 100% rename from package/libserialport/0001-uclinux-detection.patch.disable rename to package/libserialport/0001-uclinux-detection.patch diff --git a/package/libserialport/Config.in b/package/libserialport/Config.in index 2670e2fa724..d8218309e91 100644 --- a/package/libserialport/Config.in +++ b/package/libserialport/Config.in @@ -7,4 +7,3 @@ config BR2_PACKAGE_LIBSERIALPORT that uses serial ports. http://sigrok.org/wiki/Libserialport - https://github.com/sigrokproject/libserialport diff --git a/package/libserialport/libserialport.hash b/package/libserialport/libserialport.hash index 00b99265ba8..39f0c8f1f0f 100644 --- a/package/libserialport/libserialport.hash +++ b/package/libserialport/libserialport.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8eedd07570c1c2e22e75ea3451829c733f9e09198b798a64ff0a47347eb47df5 libserialport-fd20b0fc5a34cd7f776e4af6c763f59041de223b.tar.gz +sha256 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d libserialport-0.1.1.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/libserialport/libserialport.mk b/package/libserialport/libserialport.mk index a293e6a7b22..84d7a5315b2 100644 --- a/package/libserialport/libserialport.mk +++ b/package/libserialport/libserialport.mk @@ -4,10 +4,8 @@ # ################################################################################ -# batocera - update to support vpinball - -LIBSERIALPORT_VERSION = fd20b0fc5a34cd7f776e4af6c763f59041de223b -LIBSERIALPORT_SITE = $(call github,sigrokproject,libserialport,$(LIBSERIALPORT_VERSION)) +LIBSERIALPORT_VERSION = 0.1.1 +LIBSERIALPORT_SITE = http://sigrok.org/download/source/libserialport LIBSERIALPORT_LICENSE = LGPL-3.0+ LIBSERIALPORT_LICENSE_FILES = COPYING LIBSERIALPORT_INSTALL_STAGING = YES diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index e871f86b543..15649a2ab11 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -3,7 +3,7 @@ # libusb # ################################################################################ -# batocera - bump + LIBUSB_VERSION_MAJOR = 1.0 LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).27 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 diff --git a/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch b/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch deleted file mode 100644 index 94d643e1322..00000000000 --- a/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 786ec9231e402cd4e7621483be6f1837de724e3c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 26 Dec 2023 22:38:18 +0100 -Subject: [PATCH] lib/tls/CMakeLists.txt: fix build with pkg-config - -Fix the following wolfssl build failure raised since -https://github.com/warmcat/libwebsockets/commit/079726c4b252e795b208209752077c1ae4504b5b: - --- Checking for one of the modules 'wolfssl' -CMake Error at lib/tls/CMakeLists.txt:79 (message): - You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when - LWS_WITH_WOLFSSL is turned on. - -Fixes: - - http://autobuild.buildroot.org/results/fe062b9f0b330e71309334d7605d64ea73761b59 - -Upstream: https://github.com/warmcat/libwebsockets/commit/f18fc2316f9743624ced9ba934595f7b9ba8cd05 -Signed-off-by: Fabrice Fontaine ---- - lib/tls/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt -index 80b46203..230b0d29 100644 ---- a/lib/tls/CMakeLists.txt -+++ b/lib/tls/CMakeLists.txt -@@ -72,12 +72,16 @@ if (LWS_WITH_SSL AND LWS_WITH_WOLFSSL) - include (FindPkgConfig) - PKG_SEARCH_MODULE(LWS_WOLFSSL wolfssl) - -- if (NOT WOLFSSL_FOUND) -+ if (NOT LWS_WOLFSSL_FOUND) - if (LWS_WITH_CYASSL) - message(FATAL_ERROR "You must set LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS when LWS_WITH_CYASSL is turned on.") - else() - message(FATAL_ERROR "You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_WITH_WOLFSSL is turned on.") - endif() -+ else() -+ set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES}) -+ set(WOLFSSL_INCLUDE_DIRS ${LWS_WOLFSSL_INCLUDE_DIRS}) -+ set(WOLFSSL_FOUND 1) - endif() - else() - set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES}) --- -2.43.0 - diff --git a/package/llvm-project/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk index 27f14e72408..1a552523bba 100644 --- a/package/llvm-project/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -10,7 +10,7 @@ LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT -LIBCLC_DEPENDENCIES = host-clang host-llvm spirv-tools host-spirv-tools spirv-llvm-translator +LIBCLC_DEPENDENCIES = host-clang host-llvm spirv-tools host-spirv-tools host-spirv-llvm-translator LIBCLC_INSTALL_STAGING = YES # CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes @@ -41,6 +41,6 @@ LIBCLC_CONF_OPTS = \ $(eval $(cmake-package)) -HOST_LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-tools host-spirv-llvm-translator +HOST_LIBCLC_DEPENDENCIES = host-clang host-llvm spirv-tools host-spirv-tools host-spirv-llvm-translator $(eval $(host-cmake-package)) diff --git a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch.disable b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch.disable deleted file mode 100644 index c011580f6b3..00000000000 --- a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch.disable +++ /dev/null @@ -1,68 +0,0 @@ -From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 17 Aug 2021 11:54:49 +0200 -Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5 - syscall SYS_kcmp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://man7.org/linux/man-pages/man2/kcmp.2.html - -The kcmp() system call first appeared in Linux 3.5. - -But was probably also not supported by all major platforms -at that time. So fallback to the check that is done for windows. - -Signed-off-by: Thomas Devoogdt -Acked-by: Yonggang Luo -Acked-by: Michel Dänzer -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95 -Signed-off-by: Thomas Devoogdt ---- - src/util/os_file.c | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/src/util/os_file.c b/src/util/os_file.c -index 5fb30f2d908..464425a9b87 100644 ---- a/src/util/os_file.c -+++ b/src/util/os_file.c -@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size) - /* copied from */ - #define KCMP_FILE 0 - -+#endif -+ - int - os_same_file_description(int fd1, int fd2) - { -+#ifdef SYS_kcmp - pid_t pid = getpid(); -+#endif - - /* Same file descriptor trivially implies same file description */ - if (fd1 == fd2) - return 0; - -+#ifdef SYS_kcmp - return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); --} -- - #else -- --int --os_same_file_description(int fd1, int fd2) --{ -- /* Same file descriptor trivially implies same file description */ -- if (fd1 == fd2) -- return 0; -- - /* Otherwise we can't tell */ - return -1; --} -- - #endif -+} --- -2.34.1 - diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7796e295b41..a4b7b36e819 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -35,7 +35,7 @@ config BR2_PACKAGE_MESA3D_LLVM depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring - depends on BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_HOST_GCC_AT_LEAST_7 select BR2_PACKAGE_LLVM comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" @@ -175,8 +175,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ASAHI select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_OPENGL_EGL select BR2_PACKAGE_MESA3D_LLVM - select BR2_PACKAGE_HOST_SPIRV_LLVM_TRANSLATOR - select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_CLANG select BR2_PACKAGE_SPIRV_TOOLS diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5559730c28b..41a8108fcbc 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -83,10 +83,10 @@ MESA3D_DEPENDENCIES += clang libclc host-clang host-libclc host-python-ply MESA3D_CONF_OPTS += -Dintel-clc=system endif -#REG: asahi needs libclc spirv-tools and host-spirv-llvm-translator +#REG: asahi needs libclc spirv-tools #REG: specify extra binaries to cross-compile asahi clc ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ASAHI),y) -MESA3D_DEPENDENCIES += host-qemu host-libclc libclc spirv-tools spirv-llvm-translator clang host-glslang #host-spirv-llvm-translator +MESA3D_DEPENDENCIES += host-qemu host-libclc libclc spirv-tools spirv-llvm-translator clang host-glslang MESA3D_MESON_EXTRA_BINARIES += exe_wrapper='$(HOST_DIR)/bin/qemu-aarch64' endif diff --git a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch deleted file mode 100644 index 1b91b15a798..00000000000 --- a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f9193f03db0029fc9c31fbdb5c66a2737446bd8f Mon Sep 17 00:00:00 2001 -From: Darren Tucker -Date: Mon, 25 Mar 2024 09:28:02 +1100 -Subject: [PATCH] Improve detection of -fzero-call-used-regs=used. - -Should better detect problems with gcc 13 on m68k. bz#3673 from Colin -Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 - -Signed-off-by: Darren Tucker -Upstream: https://github.com/openssh/openssh-portable/commit/f9193f03db0029fc9c31fbdb5c66a2737446bd8f ---- - m4/openssh.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/m4/openssh.m4 b/m4/openssh.m4 -index 033df501c3d8..176a8d1c9282 100644 ---- a/m4/openssh.m4 -+++ b/m4/openssh.m4 -@@ -20,7 +20,10 @@ char *f2(char *s, ...) { - va_end(args); - return strdup(ret); - } -+int i; -+double d; - const char *f3(int s) { -+ i = (int)d; - return s ? "good" : "gooder"; - } - int main(int argc, char **argv) { --- -2.43.0 - diff --git a/package/openssh/0002-sshsigdie-async-signal-unsafe.patch b/package/openssh/0002-sshsigdie-async-signal-unsafe.patch deleted file mode 100644 index 70a890e4694..00000000000 --- a/package/openssh/0002-sshsigdie-async-signal-unsafe.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7f4a743171f9e6b283207d448de6562219774fbf Mon Sep 17 00:00:00 2001 -From: Salvatore Bonaccorso -Date: Tue, 25 Jun 2024 12:24:29 +0100 -Subject: Disable async-signal-unsafe code from the sshsigdie() function - -Address signal handler race condition: if a client does not authenticate -within LoginGraceTime seconds (120 by default, 600 in old OpenSSH -versions), then sshd's SIGALRM handler is called asynchronously, but -this signal handler calls various functions that are not -async-signal-safe (for example, syslog()). - -This is a regression from CVE-2006-5051 ("Signal handler race condition -in OpenSSH before 4.4 allows remote attackers to cause a denial of -service (crash), and possibly execute arbitrary code") - -Signed-off-by: Salvatore Bonaccorso -Upstream: https://salsa.debian.org/ssh-team/openssh/-/blob/525bb16e45edac4c03b95e106380d70aecbaf27e/debian/patches/sshsigdie-async-signal-unsafe.patch -Patch-Name: sshsigdie-async-signal-unsafe.patch ---- - log.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/log.c b/log.c -index 6a8b1fc4a..57256660f 100644 ---- a/log.c -+++ b/log.c -@@ -452,12 +452,14 @@ void - sshsigdie(const char *file, const char *func, int line, int showfunc, - LogLevel level, const char *suffix, const char *fmt, ...) - { -+#if 0 - va_list args; - - va_start(args, fmt); - sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, - suffix, fmt, args); - va_end(args); -+#endif - _exit(1); - } - diff --git a/package/patchelf/Config.in b/package/patchelf/Config.in deleted file mode 100644 index 1cde7553e11..00000000000 --- a/package/patchelf/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PATCHELF - bool - default y - help - PatchELF is a small utility to modify the dynamic linker - and RPATH of ELF executables. - - http://nixos.org/patchelf.html diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in index d78a4ce06af..73b8c7c04ce 100644 --- a/package/pcmanfm/Config.in +++ b/package/pcmanfm/Config.in @@ -10,8 +10,7 @@ config BR2_PACKAGE_PCMANFM select BR2_PACKAGE_LIBFM select BR2_PACKAGE_MENU_CACHE select BR2_PACKAGE_LIBGLIB2 - #REG force GTK3 - select BR2_PACKAGE_LIBGTK3 + select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11 help PCMan File Manager (PCManFM) is a file manager application developed by Hong Jen Yee from Taiwan which is meant to be a diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk index f3185343515..9b233f614d8 100644 --- a/package/pcmanfm/pcmanfm.mk +++ b/package/pcmanfm/pcmanfm.mk @@ -13,8 +13,12 @@ PCMANFM_LICENSE_FILES = COPYING PCMANFM_CPE_ID_VALID = YES PCMANFM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) -# REG force GTK3 +ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) PCMANFM_CONF_OPTS += --with-gtk=3 PCMANFM_DEPENDENCIES += libgtk3 +else +PCMANFM_CONF_OPTS += --with-gtk=2 +PCMANFM_DEPENDENCIES += libgtk2 +endif $(eval $(autotools-package)) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 4b699361b02..392928f01e7 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -42,9 +42,8 @@ define PYTHON_SIP_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef -# J1MAKE is a batocera hack to force make -j1 while it randomly fails on this package with parallelism define PYTHON_SIP_INSTALL_TARGET_CMDS - J1MAKE=$$(echo $(MAKE) | sed -e s+'-j[0-9]*'+'-j1'+); echo using $$J1MAKE; $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $$J1MAKE install -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) endef $(eval $(generic-package)) diff --git a/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch b/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch deleted file mode 100644 index 4d5afeb3cb7..00000000000 --- a/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 8d8cc9087fd44c097775ca0a9ebb6c877605baec Mon Sep 17 00:00:00 2001 -From: Vincent Fazio <5265893+vfazio@users.noreply.github.com> -Date: Wed, 28 Feb 2024 13:55:04 -0600 -Subject: [PATCH] gh-115382: Fix cross compiles when host and target use same - SOABI - -Previously, when a build was configured to use a host interpreter via ---with-build-python, the PYTHON_FOR_BUILD config value included a path -in PYTHONPATH that pointed to the target's built external modules. - -For "normal" foreign architecture cross compiles, when loading compiled -external libraries, the target libraries were processed first due to -their precedence in sys.path. These libraries were then ruled out due to -a mismatch in the SOABI so the import mechanism continued searching -until it found the host's native modules. - -However, if the host interpreter and the target python were on the same -version + SOABI combination, the host interpreter would attempt to load -the target's external modules due to their precedence in sys.path. - -Despite the "match", the target build may have been linked against a -different libc or may include unsupported instructions so loading or -executing the target's external modules can lead to crashes. - -Now, the path to the target's external modules is no longer defined in -PYTHONPATH to prevent accidentally loading these foreign modules. - -One caveat is that during certain build stages, the target's sysconfig -module requires higher precedence than the host's version in order to -accurately query the target build's configuration. - -This worked previously due to the target's sysconfig data module having -precedence over the host's (see above). In order to keep this desired -behavior, a new environment variable, _PYTHON_SYSCONFIGDATA_PATH, has -been defined so sysconfig can search this directory for the target's -sysconfig data. - -Signed-off-by: Vincent Fazio -Upstream-issue: https://github.com/python/cpython/issues/115382 -Upstream: https://github.com/python/cpython/pull/116294 ---- - Lib/sysconfig.py | 15 ++++++++++++++- - Lib/test/libregrtest/main.py | 1 + - Lib/test/pythoninfo.py | 1 + - Tools/scripts/run_tests.py | 1 + - configure | 2 +- - configure.ac | 2 +- - 6 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 6328ec41af..744f715fe2 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -535,7 +535,20 @@ def _init_posix(vars): - """Initialize the module as appropriate for POSIX systems.""" - # _sysconfigdata is generated at build time, see _generate_posix_vars() - name = _get_sysconfigdata_name() -- _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) -+ -+ # For cross builds, the path to the target's sysconfigdata must be specified -+ # so it can be imported. It cannot be in PYTHONPATH, as foreign modules in -+ # sys.path can cause crashes when loaded by the host interpreter. -+ # Rely on truthiness as a valueless env variable is still an empty string. -+ # See OS X note in _generate_posix_vars re _sysconfigdata. -+ if (path := os.environ.get('_PYTHON_SYSCONFIGDATA_PATH')): -+ from importlib.machinery import FileFinder, SourceFileLoader, SOURCE_SUFFIXES -+ from importlib.util import module_from_spec -+ spec = FileFinder(path, (SourceFileLoader, SOURCE_SUFFIXES)).find_spec(name) -+ _temp = module_from_spec(spec) -+ spec.loader.exec_module(_temp) -+ else: -+ _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) - build_time_vars = _temp.build_time_vars - vars.update(build_time_vars) - -diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py -index a9725fa967..121e2e7393 100644 ---- a/Lib/test/libregrtest/main.py -+++ b/Lib/test/libregrtest/main.py -@@ -519,6 +519,7 @@ def _add_cross_compile_opts(self, regrtest_opts): - '_PYTHON_PROJECT_BASE', - '_PYTHON_HOST_PLATFORM', - '_PYTHON_SYSCONFIGDATA_NAME', -+ "_PYTHON_SYSCONFIGDATA_PATH", - 'PYTHONPATH' - } - old_environ = os.environ -diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py -index 74ebb5e5b8..fa7fbca34e 100644 ---- a/Lib/test/pythoninfo.py -+++ b/Lib/test/pythoninfo.py -@@ -326,6 +326,7 @@ def format_groups(groups): - "_PYTHON_HOST_PLATFORM", - "_PYTHON_PROJECT_BASE", - "_PYTHON_SYSCONFIGDATA_NAME", -+ "_PYTHON_SYSCONFIGDATA_PATH", - "__PYVENV_LAUNCHER__", - - # Sanitizer options -diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py -index 445a34ae3e..4077a83424 100644 ---- a/Tools/scripts/run_tests.py -+++ b/Tools/scripts/run_tests.py -@@ -42,6 +42,7 @@ def main(regrtest_args): - '_PYTHON_PROJECT_BASE', - '_PYTHON_HOST_PLATFORM', - '_PYTHON_SYSCONFIGDATA_NAME', -+ "_PYTHON_SYSCONFIGDATA_PATH", - 'PYTHONPATH' - } - environ = { -diff --git a/configure b/configure -index a1ad0ae251..0657162d1a 100755 ---- a/configure -+++ b/configure -@@ -3262,7 +3262,7 @@ fi - fi - ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python - PYTHON_FOR_FREEZE="$with_build_python" -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5 - $as_echo "$with_build_python" >&6; } - -diff --git a/configure.ac b/configure.ac -index e5fb8bd99e..d444f5ec09 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -162,7 +162,7 @@ AC_ARG_WITH( - dnl Build Python interpreter is used for regeneration and freezing. - ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python - PYTHON_FOR_FREEZE="$with_build_python" -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python - AC_MSG_RESULT([$with_build_python]) - ], [ - AS_VAR_IF([cross_compiling], [yes], --- -2.34.1 - diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in index 8af696208bc..47a9ad0f5fc 100644 --- a/package/qt5/qt5tools/Config.in +++ b/package/qt5/qt5tools/Config.in @@ -22,14 +22,14 @@ config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL # Needs llvm-config and libclang for the host, which is not # currently supported in Buildroot, unless the target is # already supported by llvm. - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR - depends on BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # llvm, clang + depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang + depends on BR2_INSTALL_LIBSTDCPP # llvm, clang + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang + depends on !BR2_STATIC_LIBS # llvm, clang + depends on BR2_USE_WCHAR # llvm, clang + depends on BR2_HOST_GCC_AT_LEAST_7 # llvm, clang help This option enables the qdoc host tool. diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 301d395a7c2..1c9b0466b3f 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -3,7 +3,7 @@ # rust-bin # ################################################################################ -# REG - bump + # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. RUST_BIN_VERSION = 1.79.0 diff --git a/package/rust-bindgen/Config.in.host b/package/rust-bindgen/Config.in.host deleted file mode 100644 index 2b9ee6b0da1..00000000000 --- a/package/rust-bindgen/Config.in.host +++ /dev/null @@ -1,2 +0,0 @@ -config BR2_PACKAGE_HOST_RUST_BINDGEN - bool "host-rust-bindgen" diff --git a/package/spirv-llvm-translator/Config.in b/package/spirv-llvm-translator/Config.in deleted file mode 100644 index f72db469bd0..00000000000 --- a/package/spirv-llvm-translator/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR - bool "spirv-llvm-translator" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem - select BR2_PACKAGE_SPIRV_HEADERS - help - spirv-llvm-translator - -comment "spirv-llvm-translator needs a toolchain w/ C++, dynamic library, gcc >= 8" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk index 1236a4df2cb..32ed899d19e 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -11,20 +11,6 @@ SPIRV_LLVM_TRANSLATOR_VERSION = v18.1.6 SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT -SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES - - -SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm spirv-headers host-spirv-llvm-translator -SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ - -DLLVM_BUILD_TOOLS=ON \ - -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ - -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ - -DLLVM_SPIRV_INCLUDE_TESTS=OFF \ - -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ - -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(STAGING_DIR)/include - -$(eval $(cmake-package)) - HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_BUILD_TOOLS=ON \ @@ -33,4 +19,5 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_SPIRV_INCLUDE_TESTS=OFF \ -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include + $(eval $(host-cmake-package)) diff --git a/package/systemd/0002-basic-add-bcachefs-magic.patch b/package/systemd/0002-basic-add-bcachefs-magic.patch deleted file mode 100644 index e7f4b1cbb73..00000000000 --- a/package/systemd/0002-basic-add-bcachefs-magic.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e5ff9b585d7dc54f50085d518d7d588c250b0690 Mon Sep 17 00:00:00 2001 -From: Chris Packham -Date: Fri, 31 May 2024 09:51:38 +1200 -Subject: [PATCH] basic: Add BCACHEFS magic - -Import magic.h from Linux 6.9 to get the definition of -BCACHEFS_SUPER_MAGIC. Update filesystems-gperf.gperf to add knowledge of -bcachefs. - -This fixes the following error building against a bleeding edge kernel. -``` -src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers: - -Filesystem found in kernel header but not in filesystems-gperf.gperf: BCACHEFS_SUPER_MAGIC -``` - -Upstream: https://github.com/systemd/systemd/commit/201148b08de65de004d10679a8c3d201cc08fb28 -Signed-off-by: Jarkko Sakkinen ---- - src/basic/filesystems-gperf.gperf | 1 + - src/basic/missing_magic.h | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf -index 1cd66b5a5f..c82fe98227 100644 ---- a/src/basic/filesystems-gperf.gperf -+++ b/src/basic/filesystems-gperf.gperf -@@ -28,6 +28,7 @@ afs, {AFS_FS_MAGIC, AFS_SUPER_MAGIC} - anon_inodefs, {ANON_INODE_FS_MAGIC} - autofs, {AUTOFS_SUPER_MAGIC} - balloon-kvm, {BALLOON_KVM_MAGIC} -+bcachefs, {BCACHEFS_SUPER_MAGIC} - bdev, {BDEVFS_MAGIC} - binder, {BINDERFS_SUPER_MAGIC} - binfmt_misc, {BINFMTFS_MAGIC} -diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h -index 82d71c8ad1..b3d2ee9f57 100644 ---- a/src/basic/missing_magic.h -+++ b/src/basic/missing_magic.h -@@ -197,3 +197,10 @@ - #ifndef NTFS3_SUPER_MAGIC - #define NTFS3_SUPER_MAGIC 0x7366746e - #endif -+ -+/* Added in Linux commit e2f48c48090dea172c0c571101041de64634dae5. Remove when next sync'd */ -+#ifndef BCACHEFS_SUPER_MAGIC -+# define BCACHEFS_SUPER_MAGIC 0xca451a4e -+#else -+assert_cc(BCACHEFS_SUPER_MAGIC == 0xca451a4e) -+#endif --- -2.45.1 - diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk index 5b8b894afb6..a865e681df3 100644 --- a/package/tremor/tremor.mk +++ b/package/tremor/tremor.mk @@ -4,8 +4,8 @@ # ################################################################################ -TREMOR_VERSION = 91decb5f1b11a84a2157a6326d9135b22627024b -TREMOR_SITE = https://github.com/sezero/tremor.git +TREMOR_VERSION = 7c30a66346199f3f09017a09567c6c8a3a0eedc8 +TREMOR_SITE = https://gitlab.xiph.org/xiph/tremor.git TREMOR_SITE_METHOD = git TREMOR_LICENSE = BSD-3-Clause TREMOR_LICENSE_FILES = COPYING diff --git a/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch deleted file mode 100644 index b6bd5602d94..00000000000 --- a/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 903da45dde43836e35a295226c5b1efccd413c08 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 17 Jul 2024 15:41:40 +0200 -Subject: [PATCH] allow to use - -For architectures without ucontext implementation it is possible -to use libucontext with this small adaptation. - -Signed-off-by: Waldemar Brodkorb -Upstream: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/MZCPGG56TL7SVOZY2L3AGHLREJ76BYZE/ ---- - include/ucontext.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/ucontext.h b/include/ucontext.h -index 4ce114ef1..76b4f375e 100644 ---- a/include/ucontext.h -+++ b/include/ucontext.h -@@ -23,11 +23,11 @@ - - #include - --#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ -- - /* Get machine dependent definition of data structures. */ - #include - -+#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ -+ - __BEGIN_DECLS - - /* Get user context and store it in variable pointed to by UCP. */ --- -2.30.2 - diff --git a/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch b/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch deleted file mode 100644 index 9e2bc86fef0..00000000000 --- a/package/wpewebkit/0001-Remove-ARM-specific-declarations-in-FELighting.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Mon, 27 May 2024 02:09:58 +0300 -Subject: [PATCH] Cherry-pick 279334@main (36d1b5d7c0ef). - - Remove ARM-specific declarations in FELighting.h unneeded after 272873@main - - Unreviewed build fix. - - * Source/WebCore/platform/graphics/filters/FELighting.h: Remove unneeded - declarations for the getPowerCoefficients() and platformApplyNeon() - functions, which are now defined elsewhere; and were causing a build - failure due to usage of the protected LightingData type. - * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp: - (WebCore::FELightingNeonParallelApplier::applyPlatformParallel const): - Add missing LightType:: namespace to uses of LS_POINT and LS_SPOT. - - Canonical link: https://commits.webkit.org/279334@main - -Canonical link: https://commits.webkit.org/274313.261@webkitglib/2.44 - -Signed-off-by: Adrian Perez de Castro -Upstream: https://github.com/WebKit/WebKit/commit/8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 ---- - .../cpu/arm/filters/FELightingNeonParallelApplier.cpp | 4 ++-- - Source/WebCore/platform/graphics/filters/FELighting.h | 5 ----- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp -index 04d855fa6d71..5f4250d87b61 100644 ---- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp -+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp -@@ -542,14 +542,14 @@ void FELightingNeonParallelApplier::applyPlatformParallel(const LightingData& da - floatArguments.colorBlue = color.blue; - floatArguments.padding4 = 0; - -- if (data.lightSource->type() == LS_POINT) { -+ if (data.lightSource->type() == LightType::LS_POINT) { - neonData.flags |= FLAG_POINT_LIGHT; - auto& pointLightSource = downcast(*data.lightSource); - floatArguments.lightX = pointLightSource.position().x(); - floatArguments.lightY = pointLightSource.position().y(); - floatArguments.lightZ = pointLightSource.position().z(); - floatArguments.padding2 = 0; -- } else if (data.lightSource->type() == LS_SPOT) { -+ } else if (data.lightSource->type() == LightType::LS_SPOT) { - neonData.flags |= FLAG_SPOT_LIGHT; - auto& spotLightSource = downcast(*data.lightSource); - floatArguments.lightX = spotLightSource.position().x(); -diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 4efab920b1c3..dcd80b6f42b7 100644 ---- a/Source/WebCore/platform/graphics/filters/FELighting.h -+++ b/Source/WebCore/platform/graphics/filters/FELighting.h -@@ -68,11 +68,6 @@ protected: - - std::unique_ptr createSoftwareApplier() const override; - --#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) -- static int getPowerCoefficients(float exponent); -- inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); --#endif -- - Color m_lightingColor; - float m_surfaceScale; - float m_diffuseConstant; --- -2.45.2 - From 56a731ab20119afb79f979b4d837a0d50388739d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juliano=20Dorig=C3=A3o?= Date: Thu, 5 Dec 2024 22:50:02 -0400 Subject: [PATCH 3012/3013] Revert "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" This reverts commit 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016. --- support/scripts/apply-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 2acaa63e9fd..73aa6c8e5fe 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -116,7 +116,7 @@ function apply_patch { exit 1 fi echo "${path}/${patch}" >> ${builddir}/.applied_patches_list - ${uncomp} "${path}/$patch" | patch -F0 -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent + ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 From 0ee089d94301d429636bfa48452bffc67df9b1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juliano=20Dorig=C3=A3o?= Date: Fri, 6 Dec 2024 08:53:46 -0400 Subject: [PATCH 3013/3013] kernel: bump 6.11/6.12 --- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index d888668f04a..296d98dab3e 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 0193b1d86dd372ec891bae799f6da20deef16fc199f30080a4ea9de8cef0c619 linux-6.12.1.tar.xz -sha256 4bc184915290629d61f935aa1eb1b6e711b8e47d8f289a39f0d584ecbdb4fe77 linux-6.11.10.tar.xz +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz +sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz sha256 d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 linux-6.6.63.tar.xz sha256 aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278 linux-6.1.119.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index c1a4cc4ce59..e74d8a3ba23 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -457,8 +457,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.171" if BR2_KERNEL_HEADERS_5_15 default "6.1.119" if BR2_KERNEL_HEADERS_6_1 default "6.6.63" if BR2_KERNEL_HEADERS_6_6 - default "6.11.10" if BR2_KERNEL_HEADERS_6_11 - default "6.12.1" if BR2_KERNEL_HEADERS_6_12 + default "6.11.11" if BR2_KERNEL_HEADERS_6_11 + default "6.12.3" if BR2_KERNEL_HEADERS_6_12 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \